diff --git a/DataFormats/TrackerRecHit2D/interface/MTDTrackingRecHit.h b/DataFormats/TrackerRecHit2D/interface/MTDTrackingRecHit.h index 795c982969f78..bf6566148a219 100644 --- 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 MTDTrackingDetSetVector; -typedef edm::OwnVector MTDTrackingOwnVector; #endif diff --git a/DataFormats/TrackerRecHit2D/interface/SiStripRecHit1DCollection.h b/DataFormats/TrackerRecHit2D/interface/SiStripRecHit1DCollection.h index 519d9f281ac79..9c1e51e149626 100644 --- 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 -#include "DataFormats/Common/interface/ClonePolicy.h" -#include "DataFormats/Common/interface/OwnVector.h" - -typedef edm::RangeMap > SiStripRecHit1DCollectionOld; - -// new collection(for some far indetermined future) #include "DataFormats/Common/interface/DetSetVectorNew.h" + typedef edmNew::DetSetVector SiStripRecHit1DCollection; typedef SiStripRecHit1DCollection SiStripRecHit1DCollectionNew; diff --git a/DataFormats/TrackerRecHit2D/interface/SiStripRecHit2DCollection.h b/DataFormats/TrackerRecHit2D/interface/SiStripRecHit2DCollection.h index 9916d5908762a..a7d653d9a11ac 100644 --- 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 -#include "DataFormats/Common/interface/ClonePolicy.h" -#include "DataFormats/Common/interface/OwnVector.h" - -typedef edm::RangeMap > SiStripRecHit2DCollectionOld; - -// new collection(for some far indetermined future) #include "DataFormats/Common/interface/DetSetVectorNew.h" + typedef edmNew::DetSetVector SiStripRecHit2DCollection; typedef SiStripRecHit2DCollection SiStripRecHit2DCollectionNew; diff --git a/DataFormats/TrackerRecHit2D/src/classes_def.xml b/DataFormats/TrackerRecHit2D/src/classes_def.xml index 5de054ebdfa8f..415e37feec5c1 100644 --- a/DataFormats/TrackerRecHit2D/src/classes_def.xml +++ b/DataFormats/TrackerRecHit2D/src/classes_def.xml @@ -60,50 +60,19 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -187,8 +156,6 @@ - - diff --git a/FastSimDataFormats/External/doc/External.doc b/FastSimDataFormats/External/doc/External.doc index f5fbe570e8347..468d52c3d29ca 100644 --- 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.
- FastTrackerCluster
-- FastTrackerClusterCollection
Data Formats for Tracker Clusters, to be used in FastSim specific Tracker RecHits production.
diff --git a/FastSimDataFormats/External/interface/FastTrackerClusterCollection.h b/FastSimDataFormats/External/interface/FastTrackerClusterCollection.h deleted file mode 100644 index 345c6507223c1..0000000000000 --- a/FastSimDataFormats/External/interface/FastTrackerClusterCollection.h +++ /dev/null @@ -1,12 +0,0 @@ -#ifndef FASTSIMDATAFORMATS_FastTrackerClusterCollection_H -#define FASTSIMDATAFORMATS_FastTrackerClusterCollection_H - -#include "FastSimDataFormats/External/interface/FastTrackerCluster.h" -#include "DataFormats/Common/interface/RangeMap.h" -#include -#include "DataFormats/Common/interface/ClonePolicy.h" -#include "DataFormats/Common/interface/OwnVector.h" - -typedef edm::RangeMap > FastTrackerClusterCollection; - -#endif diff --git a/FastSimDataFormats/External/src/classes.h b/FastSimDataFormats/External/src/classes.h index db37e20e78f96..6f70fc46d54be 100644 --- 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 index ebbd727fd4cf8..612475634411f 100644 --- a/FastSimDataFormats/External/src/classes_def.xml +++ b/FastSimDataFormats/External/src/classes_def.xml @@ -11,27 +11,6 @@
- - - - - - - - - - - - diff --git a/RecoLocalMuon/CSCRecHitD/src/CSCRecHitDBuilder.cc b/RecoLocalMuon/CSCRecHitD/src/CSCRecHitDBuilder.cc index 3601fdd8864d5..0ce0c8ee44cc3 100644 --- a/RecoLocalMuon/CSCRecHitD/src/CSCRecHitDBuilder.cc +++ b/RecoLocalMuon/CSCRecHitD/src/CSCRecHitDBuilder.cc @@ -5,7 +5,6 @@ #include #include #include -#include #include #include diff --git a/RecoLocalMuon/CSCRecHitD/src/CSCStripHitCollection.h b/RecoLocalMuon/CSCRecHitD/src/CSCStripHitCollection.h deleted file mode 100644 index 5a163f615c193..0000000000000 --- a/RecoLocalMuon/CSCRecHitD/src/CSCStripHitCollection.h +++ /dev/null @@ -1,20 +0,0 @@ -#ifndef CSCRecHitD_CSCStripHitCollection_H -#define CSCRecHitD_CSCStripHitCollection_H - -/** \class CSCStripHitCollection - * - * The collection of CSCStripHit's. - * - */ - -#include - -#include - -#include -#include -#include - -typedef edm::RangeMap > CSCStripHitCollection; - -#endif