Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Removed unused code related to OwnVector #43931

Merged
merged 1 commit into from
Feb 13, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions DataFormats/TrackerRecHit2D/interface/MTDTrackingRecHit.h
Original file line number Diff line number Diff line change
Expand Up @@ -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
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
33 changes: 0 additions & 33 deletions DataFormats/TrackerRecHit2D/src/classes_def.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>"/>
Expand Down Expand Up @@ -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>
Expand Down
1 change: 0 additions & 1 deletion FastSimDataFormats/External/doc/External.doc
Original file line number Diff line number Diff line change
Expand Up @@ -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>

Expand Down

This file was deleted.

2 changes: 1 addition & 1 deletion FastSimDataFormats/External/src/classes.h
Original file line number Diff line number Diff line change
@@ -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"
21 changes: 0 additions & 21 deletions FastSimDataFormats/External/src/classes_def.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>
1 change: 0 additions & 1 deletion RecoLocalMuon/CSCRecHitD/src/CSCRecHitDBuilder.cc
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
20 changes: 0 additions & 20 deletions RecoLocalMuon/CSCRecHitD/src/CSCStripHitCollection.h

This file was deleted.