Skip to content

Commit 021a0e0

Browse files
committed
Removed unused code related to OwnVector
1 parent 93f14ae commit 021a0e0

File tree

10 files changed

+3
-109
lines changed

10 files changed

+3
-109
lines changed

DataFormats/TrackerRecHit2D/interface/MTDTrackingRecHit.h

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,6 @@ class MTDTrackingRecHit : public TrackerSingleRecHit {
3030

3131
// Instantiations and specializations for FTLRecHitRef and reco::CaloClusterPtr
3232
#include "DataFormats/Common/interface/DetSetVector.h"
33-
#include "DataFormats/Common/interface/OwnVector.h"
3433
typedef edmNew::DetSetVector<MTDTrackingRecHit> MTDTrackingDetSetVector;
35-
typedef edm::OwnVector<MTDTrackingRecHit> MTDTrackingOwnVector;
3634

3735
#endif

DataFormats/TrackerRecHit2D/interface/SiStripRecHit1DCollection.h

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2,16 +2,8 @@
22
#define DATAFORMATS_SISTRIPRECHIT1DCOLLECTION_H
33

44
#include "DataFormats/TrackerRecHit2D/interface/SiStripRecHit1D.h"
5-
#include "DataFormats/Common/interface/RangeMap.h"
6-
#include "DataFormats/DetId/interface/DetId.h"
7-
#include <vector>
8-
#include "DataFormats/Common/interface/ClonePolicy.h"
9-
#include "DataFormats/Common/interface/OwnVector.h"
10-
11-
typedef edm::RangeMap<DetId, edm::OwnVector<SiStripRecHit1D> > SiStripRecHit1DCollectionOld;
12-
13-
// new collection(for some far indetermined future)
145
#include "DataFormats/Common/interface/DetSetVectorNew.h"
6+
157
typedef edmNew::DetSetVector<SiStripRecHit1D> SiStripRecHit1DCollection;
168
typedef SiStripRecHit1DCollection SiStripRecHit1DCollectionNew;
179

DataFormats/TrackerRecHit2D/interface/SiStripRecHit2DCollection.h

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2,16 +2,8 @@
22
#define DATAFORMATS_SISTRIPRECHIT2DCOLLECTION_H
33

44
#include "DataFormats/TrackerRecHit2D/interface/SiStripRecHit2D.h"
5-
#include "DataFormats/Common/interface/RangeMap.h"
6-
#include "DataFormats/DetId/interface/DetId.h"
7-
#include <vector>
8-
#include "DataFormats/Common/interface/ClonePolicy.h"
9-
#include "DataFormats/Common/interface/OwnVector.h"
10-
11-
typedef edm::RangeMap<DetId, edm::OwnVector<SiStripRecHit2D> > SiStripRecHit2DCollectionOld;
12-
13-
// new collection(for some far indetermined future)
145
#include "DataFormats/Common/interface/DetSetVectorNew.h"
6+
157
typedef edmNew::DetSetVector<SiStripRecHit2D> SiStripRecHit2DCollection;
168
typedef SiStripRecHit2DCollection SiStripRecHit2DCollectionNew;
179

DataFormats/TrackerRecHit2D/src/classes_def.xml

Lines changed: 0 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -60,50 +60,19 @@
6060
<version ClassVersion="10" checksum="414205262"/>
6161
</class>
6262

63-
<class name="std::vector<SiStripRecHit2D*>"/>
64-
<class name="std::vector<SiStripRecHit1D*>"/>
6563
<class name="std::vector<SiStripMatchedRecHit2D*>"/>
66-
<class name="std::vector<SiTrackerMultiRecHit*>"/>
6764
<class name="edm::OwnVector<SiStripMatchedRecHit2D,edm::ClonePolicy<SiStripMatchedRecHit2D> >"/>
6865
<class name="edm::OwnVector<SiStripMatchedRecHit2D,edm::ClonePolicy<SiStripMatchedRecHit2D> >::const_iterator"/>
69-
<class name="edm::OwnVector<SiStripRecHit2D,edm::ClonePolicy<SiStripRecHit2D> >"/>
70-
<class name="edm::OwnVector<SiStripRecHit1D,edm::ClonePolicy<SiStripRecHit1D> >"/>
71-
72-
<class name="edm::OwnVector<SiTrackerMultiRecHit,edm::ClonePolicy<SiTrackerMultiRecHit> >"/>
73-
<class name="edm::OwnVector<SiStripRecHit2D,edm::ClonePolicy<SiStripRecHit2D> >::const_iterator"/>
74-
<class name="edm::OwnVector<SiStripRecHit1D,edm::ClonePolicy<SiStripRecHit1D> >::const_iterator"/>
75-
76-
<class name="edm::OwnVector<SiTrackerMultiRecHit,edm::ClonePolicy<SiTrackerMultiRecHit> >::const_iterator"/>
7766

7867
<class name="edm::OwnVector<BaseTrackerRecHit>" persistent="false"/>
7968
<class name="edm::Wrapper<edm::OwnVector<BaseTrackerRecHit> >" persistent="false"/>
8069

81-
<class name="edm::RangeMap<DetId, edm::OwnVector<SiStripRecHit2D, edm::ClonePolicy<SiStripRecHit2D> >, edm::ClonePolicy<SiStripRecHit2D> >"/>
82-
<class name="edm::RangeMap<DetId, edm::OwnVector<SiStripRecHit1D, edm::ClonePolicy<SiStripRecHit1D> >, edm::ClonePolicy<SiStripRecHit1D> >"/>
83-
84-
<class name="edm::RangeMap<DetId, edm::OwnVector<SiStripRecHit2D, edm::ClonePolicy<SiStripRecHit2D> >, edm::ClonePolicy<SiStripRecHit2D> >::id_iterator"/>
85-
<class name="edm::RangeMap<DetId, edm::OwnVector<SiStripRecHit1D, edm::ClonePolicy<SiStripRecHit1D> >, edm::ClonePolicy<SiStripRecHit1D> >::id_iterator"/>
86-
87-
<class name="edm::Wrapper<edm::RangeMap<DetId, edm::OwnVector<SiStripRecHit2D, edm::ClonePolicy<SiStripRecHit2D> >, edm::ClonePolicy<SiStripRecHit2D> > >"/>
88-
<class name="edm::Wrapper<edm::RangeMap<DetId, edm::OwnVector<SiStripRecHit1D, edm::ClonePolicy<SiStripRecHit1D> >, edm::ClonePolicy<SiStripRecHit1D> > >"/>
89-
9070
<class name="edm::RangeMap<DetId, edm::OwnVector<SiStripMatchedRecHit2D, edm::ClonePolicy<SiStripMatchedRecHit2D> >, edm::ClonePolicy<SiStripMatchedRecHit2D> >"/>
9171
<class name="edm::RangeMap<DetId, edm::OwnVector<SiStripMatchedRecHit2D, edm::ClonePolicy<SiStripMatchedRecHit2D> >, edm::ClonePolicy<SiStripMatchedRecHit2D> >::id_iterator"/>
9272

9373
<class name="edm::Wrapper<edm::RangeMap<DetId, edm::OwnVector<SiStripMatchedRecHit2D, edm::ClonePolicy<SiStripMatchedRecHit2D> >, edm::ClonePolicy<SiStripMatchedRecHit2D> > >"/>
9474

95-
<class name="std::vector<SiPixelRecHit*>"/>
9675
<class name="std::vector<SiPixelRecHit>"/>
97-
<class name="edm::OwnVector<SiPixelRecHit,edm::ClonePolicy<SiPixelRecHit> >"/>
98-
<class name="edm::OwnVector<SiPixelRecHit,edm::ClonePolicy<SiPixelRecHit> >::const_iterator"/>
99-
<class name="edm::RangeMap<DetId, edm::OwnVector<SiPixelRecHit, edm::ClonePolicy<SiPixelRecHit> >, edm::ClonePolicy<SiPixelRecHit> >"/>
100-
<class name="edm::RangeMap<DetId, edm::OwnVector<SiPixelRecHit, edm::ClonePolicy<SiPixelRecHit> >, edm::ClonePolicy<SiPixelRecHit> >::id_iterator"/>
101-
<class name="edm::Wrapper<edm::RangeMap<DetId, edm::OwnVector<SiPixelRecHit, edm::ClonePolicy<SiPixelRecHit> >, edm::ClonePolicy<SiPixelRecHit> > >"/>
102-
<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> >"/>
103-
<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> >"/>
104-
105-
<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> >"/>
106-
<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> >"/>
10776

10877
<class name="std::vector<SiStripRecHit2D>"/>
10978
<class name="std::vector<SiStripRecHit1D>"/>
@@ -187,8 +156,6 @@
187156
<class name="std::vector<MTDTrackingRecHit>"/>
188157
<class name="MTDTrackingDetSetVector"/>
189158
<class name="edm::Wrapper< MTDTrackingDetSetVector >"/>
190-
<class name="MTDTrackingOwnVector"/>
191-
<class name="edm::Wrapper< MTDTrackingOwnVector >"/>
192159
<class name="VectorHit" ClassVersion="3">
193160
<version ClassVersion="3" checksum="1631967306"/>
194161
</class>

FastSimDataFormats/External/doc/External.doc

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@ Definition of a few DataFormats needed in Fast Simulation
2525
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>
2626

2727
- FastTrackerCluster <br>
28-
- FastTrackerClusterCollection <br>
2928

3029
Data Formats for Tracker Clusters, to be used in FastSim specific Tracker RecHits production. <br>
3130

FastSimDataFormats/External/interface/FastTrackerClusterCollection.h

Lines changed: 0 additions & 12 deletions
This file was deleted.
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
#include "FastSimDataFormats/External/interface/FastL1BitInfo.h"
2-
#include "FastSimDataFormats/External/interface/FastTrackerClusterCollection.h"
2+
#include "FastSimDataFormats/External/interface/FastTrackerCluster.h"
33
#include "DataFormats/Common/interface/Wrapper.h"

FastSimDataFormats/External/src/classes_def.xml

Lines changed: 0 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -11,27 +11,6 @@
1111
<version ClassVersion="11" checksum="325524572"/>
1212
<version ClassVersion="10" checksum="2829380995"/>
1313
</class>
14-
<class name="std::vector<FastTrackerCluster*>"/>
15-
<class name="edm::OwnVector<FastTrackerCluster,edm::ClonePolicy<FastTrackerCluster> >"/>
16-
17-
<class name="edm::RangeMap <unsigned int,
18-
edm::OwnVector<FastTrackerCluster,
19-
edm::ClonePolicy<FastTrackerCluster> >,
20-
edm::ClonePolicy<FastTrackerCluster> >" />
21-
22-
<class name="edm::Wrapper< edm::RangeMap <unsigned int,
23-
edm::OwnVector<FastTrackerCluster,
24-
edm::ClonePolicy<FastTrackerCluster> >,
25-
edm::ClonePolicy<FastTrackerCluster> > > " />
26-
27-
<class name="edm::Ref<edm::RangeMap<unsigned int,edm::OwnVector<FastTrackerCluster,edm::ClonePolicy<FastTrackerCluster> >,
28-
edm::ClonePolicy<FastTrackerCluster> >,FastTrackerCluster,
29-
edm::refhelper::FindUsingAdvance<edm::RangeMap<unsigned int,edm::OwnVector<FastTrackerCluster,edm::ClonePolicy<FastTrackerCluster> >,
30-
edm::ClonePolicy<FastTrackerCluster> >,FastTrackerCluster> >" />
31-
3214

3315
</selection>
34-
35-
36-
3716
</lcgdict>

RecoLocalMuon/CSCRecHitD/src/CSCRecHitDBuilder.cc

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
#include <RecoLocalMuon/CSCRecHitD/src/CSCHitFromWireOnly.h>
66
#include <RecoLocalMuon/CSCRecHitD/src/CSCMake2DRecHit.h>
77
#include <RecoLocalMuon/CSCRecHitD/src/CSCWireHitCollection.h>
8-
#include <RecoLocalMuon/CSCRecHitD/src/CSCStripHitCollection.h>
98
#include <RecoLocalMuon/CSCRecHitD/src/CSCRangeMapForRecHit.h>
109

1110
#include <Geometry/CSCGeometry/interface/CSCChamberSpecs.h>

RecoLocalMuon/CSCRecHitD/src/CSCStripHitCollection.h

Lines changed: 0 additions & 20 deletions
This file was deleted.

0 commit comments

Comments
 (0)