Merge pull request #43931 from wddgit/removedUnusedCodeRelatedToOwnVe…

…ctor Removed unused code related to OwnVector
cms-sw · Feb 13, 2024 · 3143a05 · 3143a05
2 parents a26bc2e + 021a0e0
commit 3143a05
Show file tree

Hide file tree

Showing 10 changed files with 3 additions and 109 deletions.
diff --git a/DataFormats/TrackerRecHit2D/interface/MTDTrackingRecHit.h b/DataFormats/TrackerRecHit2D/interface/MTDTrackingRecHit.h
@@ -30,8 +30,6 @@ class MTDTrackingRecHit : public TrackerSingleRecHit {
 
 // Instantiations and specializations for FTLRecHitRef and reco::CaloClusterPtr
 #include "DataFormats/Common/interface/DetSetVector.h"
-#include "DataFormats/Common/interface/OwnVector.h"
 typedef edmNew::DetSetVector<MTDTrackingRecHit> MTDTrackingDetSetVector;
-typedef edm::OwnVector<MTDTrackingRecHit> MTDTrackingOwnVector;
 
 #endif
diff --git a/DataFormats/TrackerRecHit2D/interface/SiStripRecHit1DCollection.h b/DataFormats/TrackerRecHit2D/interface/SiStripRecHit1DCollection.h
@@ -2,16 +2,8 @@
 #define DATAFORMATS_SISTRIPRECHIT1DCOLLECTION_H
 
 #include "DataFormats/TrackerRecHit2D/interface/SiStripRecHit1D.h"
-#include "DataFormats/Common/interface/RangeMap.h"
-#include "DataFormats/DetId/interface/DetId.h"
-#include <vector>
-#include "DataFormats/Common/interface/ClonePolicy.h"
-#include "DataFormats/Common/interface/OwnVector.h"
-
-typedef edm::RangeMap<DetId, edm::OwnVector<SiStripRecHit1D> > SiStripRecHit1DCollectionOld;
-
-// new collection(for some far indetermined future)
 #include "DataFormats/Common/interface/DetSetVectorNew.h"
+
 typedef edmNew::DetSetVector<SiStripRecHit1D> SiStripRecHit1DCollection;
 typedef SiStripRecHit1DCollection SiStripRecHit1DCollectionNew;
 

diff --git a/DataFormats/TrackerRecHit2D/interface/SiStripRecHit2DCollection.h b/DataFormats/TrackerRecHit2D/interface/SiStripRecHit2DCollection.h
@@ -2,16 +2,8 @@
 #define DATAFORMATS_SISTRIPRECHIT2DCOLLECTION_H
 
 #include "DataFormats/TrackerRecHit2D/interface/SiStripRecHit2D.h"
-#include "DataFormats/Common/interface/RangeMap.h"
-#include "DataFormats/DetId/interface/DetId.h"
-#include <vector>
-#include "DataFormats/Common/interface/ClonePolicy.h"
-#include "DataFormats/Common/interface/OwnVector.h"
-
-typedef edm::RangeMap<DetId, edm::OwnVector<SiStripRecHit2D> > SiStripRecHit2DCollectionOld;
-
-// new collection(for some far indetermined future)
 #include "DataFormats/Common/interface/DetSetVectorNew.h"
+
 typedef edmNew::DetSetVector<SiStripRecHit2D> SiStripRecHit2DCollection;
 typedef SiStripRecHit2DCollection SiStripRecHit2DCollectionNew;
 

diff --git a/DataFormats/TrackerRecHit2D/src/classes_def.xml b/DataFormats/TrackerRecHit2D/src/classes_def.xml
@@ -60,50 +60,19 @@
    <version ClassVersion="10" checksum="414205262"/>
   </class>
 
-  <class name="std::vector<SiStripRecHit2D*>"/>
-  <class name="std::vector<SiStripRecHit1D*>"/>
   <class name="std::vector<SiStripMatchedRecHit2D*>"/>
-  <class name="std::vector<SiTrackerMultiRecHit*>"/>
   <class name="edm::OwnVector<SiStripMatchedRecHit2D,edm::ClonePolicy<SiStripMatchedRecHit2D> >"/>
   <class name="edm::OwnVector<SiStripMatchedRecHit2D,edm::ClonePolicy<SiStripMatchedRecHit2D> >::const_iterator"/>
-  <class name="edm::OwnVector<SiStripRecHit2D,edm::ClonePolicy<SiStripRecHit2D> >"/>
-  <class name="edm::OwnVector<SiStripRecHit1D,edm::ClonePolicy<SiStripRecHit1D> >"/>
-
-  <class name="edm::OwnVector<SiTrackerMultiRecHit,edm::ClonePolicy<SiTrackerMultiRecHit> >"/>
-  <class name="edm::OwnVector<SiStripRecHit2D,edm::ClonePolicy<SiStripRecHit2D> >::const_iterator"/>
-  <class name="edm::OwnVector<SiStripRecHit1D,edm::ClonePolicy<SiStripRecHit1D> >::const_iterator"/>
-
-  <class name="edm::OwnVector<SiTrackerMultiRecHit,edm::ClonePolicy<SiTrackerMultiRecHit> >::const_iterator"/>
 
   <class name="edm::OwnVector<BaseTrackerRecHit>" persistent="false"/>
   <class name="edm::Wrapper<edm::OwnVector<BaseTrackerRecHit> >" persistent="false"/>
 
-  <class name="edm::RangeMap<DetId, edm::OwnVector<SiStripRecHit2D, edm::ClonePolicy<SiStripRecHit2D> >, edm::ClonePolicy<SiStripRecHit2D> >"/>
-  <class name="edm::RangeMap<DetId, edm::OwnVector<SiStripRecHit1D, edm::ClonePolicy<SiStripRecHit1D> >, edm::ClonePolicy<SiStripRecHit1D> >"/>
-
-  <class name="edm::RangeMap<DetId, edm::OwnVector<SiStripRecHit2D, edm::ClonePolicy<SiStripRecHit2D> >, edm::ClonePolicy<SiStripRecHit2D> >::id_iterator"/>
-  <class name="edm::RangeMap<DetId, edm::OwnVector<SiStripRecHit1D, edm::ClonePolicy<SiStripRecHit1D> >, edm::ClonePolicy<SiStripRecHit1D> >::id_iterator"/>
-
-  <class name="edm::Wrapper<edm::RangeMap<DetId, edm::OwnVector<SiStripRecHit2D, edm::ClonePolicy<SiStripRecHit2D> >, edm::ClonePolicy<SiStripRecHit2D> > >"/>
-  <class name="edm::Wrapper<edm::RangeMap<DetId, edm::OwnVector<SiStripRecHit1D, edm::ClonePolicy<SiStripRecHit1D> >, edm::ClonePolicy<SiStripRecHit1D> > >"/>
-
   <class name="edm::RangeMap<DetId, edm::OwnVector<SiStripMatchedRecHit2D, edm::ClonePolicy<SiStripMatchedRecHit2D> >, edm::ClonePolicy<SiStripMatchedRecHit2D> >"/>
   <class name="edm::RangeMap<DetId, edm::OwnVector<SiStripMatchedRecHit2D, edm::ClonePolicy<SiStripMatchedRecHit2D> >, edm::ClonePolicy<SiStripMatchedRecHit2D> >::id_iterator"/>
 
   <class name="edm::Wrapper<edm::RangeMap<DetId, edm::OwnVector<SiStripMatchedRecHit2D, edm::ClonePolicy<SiStripMatchedRecHit2D> >, edm::ClonePolicy<SiStripMatchedRecHit2D> > >"/>
 
-  <class name="std::vector<SiPixelRecHit*>"/>
   <class name="std::vector<SiPixelRecHit>"/>
-  <class name="edm::OwnVector<SiPixelRecHit,edm::ClonePolicy<SiPixelRecHit> >"/>
-  <class name="edm::OwnVector<SiPixelRecHit,edm::ClonePolicy<SiPixelRecHit> >::const_iterator"/>
-  <class name="edm::RangeMap<DetId, edm::OwnVector<SiPixelRecHit, edm::ClonePolicy<SiPixelRecHit> >, edm::ClonePolicy<SiPixelRecHit> >"/>
-  <class name="edm::RangeMap<DetId, edm::OwnVector<SiPixelRecHit, edm::ClonePolicy<SiPixelRecHit> >, edm::ClonePolicy<SiPixelRecHit> >::id_iterator"/>
-  <class name="edm::Wrapper<edm::RangeMap<DetId, edm::OwnVector<SiPixelRecHit, edm::ClonePolicy<SiPixelRecHit> >, edm::ClonePolicy<SiPixelRecHit> > >"/>
-  <class name="edm::Ref<edm::RangeMap<DetId,edm::OwnVector<SiStripRecHit2D,edm::ClonePolicy<SiStripRecHit2D> >,edm::ClonePolicy<SiStripRecHit2D> >,SiStripRecHit2D,edm::refhelper::FindUsingAdvance<edm::RangeMap<DetId,edm::OwnVector<SiStripRecHit2D,edm::ClonePolicy<SiStripRecHit2D> >,edm::ClonePolicy<SiStripRecHit2D> >,SiStripRecHit2D> >"/>
-  <class name="edm::Ref<edm::RangeMap<DetId,edm::OwnVector<SiStripRecHit1D,edm::ClonePolicy<SiStripRecHit1D> >,edm::ClonePolicy<SiStripRecHit1D> >,SiStripRecHit1D,edm::refhelper::FindUsingAdvance<edm::RangeMap<DetId,edm::OwnVector<SiStripRecHit1D,edm::ClonePolicy<SiStripRecHit1D> >,edm::ClonePolicy<SiStripRecHit1D> >,SiStripRecHit1D> >"/>
-
-  <class name="edm::RefVector<edm::RangeMap<DetId,edm::OwnVector<SiStripRecHit2D,edm::ClonePolicy<SiStripRecHit2D> >,edm::ClonePolicy<SiStripRecHit2D> >,SiStripRecHit2D,edm::refhelper::FindUsingAdvance<edm::RangeMap<DetId,edm::OwnVector<SiStripRecHit2D,edm::ClonePolicy<SiStripRecHit2D> >,edm::ClonePolicy<SiStripRecHit2D> >,SiStripRecHit2D> >"/>
-  <class name="edm::RefVector<edm::RangeMap<DetId,edm::OwnVector<SiStripRecHit1D,edm::ClonePolicy<SiStripRecHit1D> >,edm::ClonePolicy<SiStripRecHit1D> >,SiStripRecHit1D,edm::refhelper::FindUsingAdvance<edm::RangeMap<DetId,edm::OwnVector<SiStripRecHit1D,edm::ClonePolicy<SiStripRecHit1D> >,edm::ClonePolicy<SiStripRecHit1D> >,SiStripRecHit1D> >"/>
 
  <class name="std::vector<SiStripRecHit2D>"/>
  <class name="std::vector<SiStripRecHit1D>"/>
@@ -187,8 +156,6 @@
   <class name="std::vector<MTDTrackingRecHit>"/>
   <class name="MTDTrackingDetSetVector"/>
   <class name="edm::Wrapper< MTDTrackingDetSetVector >"/>
-  <class name="MTDTrackingOwnVector"/>
-  <class name="edm::Wrapper< MTDTrackingOwnVector >"/>
   <class name="VectorHit" ClassVersion="3">
    <version ClassVersion="3" checksum="1631967306"/>
   </class>

diff --git a/FastSimDataFormats/External/doc/External.doc b/FastSimDataFormats/External/doc/External.doc
@@ -25,7 +25,6 @@ Definition of a few DataFormats needed in Fast Simulation
 It defines FastSim specific quantities to be used by the L1 Calo Trigger emulator. It is regulated by the DoBitInfo logical variable set in the FastSimulation/L1CaloTriggerProducer/python/fastl1calosim_cfi.py configuration. <br>
 
 - FastTrackerCluster <br>
-- FastTrackerClusterCollection <br>
 
 Data Formats for Tracker Clusters, to be used in FastSim specific Tracker RecHits production. <br>
 

diff --git a/FastSimDataFormats/External/interface/FastTrackerClusterCollection.h b/FastSimDataFormats/External/interface/FastTrackerClusterCollection.h
diff --git a/FastSimDataFormats/External/src/classes.h b/FastSimDataFormats/External/src/classes.h
@@ -1,3 +1,3 @@
 #include "FastSimDataFormats/External/interface/FastL1BitInfo.h"
-#include "FastSimDataFormats/External/interface/FastTrackerClusterCollection.h"
+#include "FastSimDataFormats/External/interface/FastTrackerCluster.h"
 #include "DataFormats/Common/interface/Wrapper.h"
diff --git a/FastSimDataFormats/External/src/classes_def.xml b/FastSimDataFormats/External/src/classes_def.xml
@@ -11,27 +11,6 @@
   <version ClassVersion="11" checksum="325524572"/>
   <version ClassVersion="10" checksum="2829380995"/>
  </class>
- <class name="std::vector<FastTrackerCluster*>"/>
- <class name="edm::OwnVector<FastTrackerCluster,edm::ClonePolicy<FastTrackerCluster> >"/>
-
- <class name="edm::RangeMap <unsigned int, 
-edm::OwnVector<FastTrackerCluster,
-edm::ClonePolicy<FastTrackerCluster> >,
-edm::ClonePolicy<FastTrackerCluster> >" />
-
- <class name="edm::Wrapper< edm::RangeMap <unsigned int, 
-edm::OwnVector<FastTrackerCluster, 
-edm::ClonePolicy<FastTrackerCluster> >,
-edm::ClonePolicy<FastTrackerCluster> > > " />
-
-<class name="edm::Ref<edm::RangeMap<unsigned int,edm::OwnVector<FastTrackerCluster,edm::ClonePolicy<FastTrackerCluster> >,
-edm::ClonePolicy<FastTrackerCluster> >,FastTrackerCluster,
-edm::refhelper::FindUsingAdvance<edm::RangeMap<unsigned int,edm::OwnVector<FastTrackerCluster,edm::ClonePolicy<FastTrackerCluster> >,
-edm::ClonePolicy<FastTrackerCluster> >,FastTrackerCluster> >" />
-
 
 </selection>
-
-
-
 </lcgdict>
diff --git a/RecoLocalMuon/CSCRecHitD/src/CSCRecHitDBuilder.cc b/RecoLocalMuon/CSCRecHitD/src/CSCRecHitDBuilder.cc
@@ -5,7 +5,6 @@
 #include <RecoLocalMuon/CSCRecHitD/src/CSCHitFromWireOnly.h>
 #include <RecoLocalMuon/CSCRecHitD/src/CSCMake2DRecHit.h>
 #include <RecoLocalMuon/CSCRecHitD/src/CSCWireHitCollection.h>
-#include <RecoLocalMuon/CSCRecHitD/src/CSCStripHitCollection.h>
 #include <RecoLocalMuon/CSCRecHitD/src/CSCRangeMapForRecHit.h>
 
 #include <Geometry/CSCGeometry/interface/CSCChamberSpecs.h>

diff --git a/RecoLocalMuon/CSCRecHitD/src/CSCStripHitCollection.h b/RecoLocalMuon/CSCRecHitD/src/CSCStripHitCollection.h