From 1825d493a9baab9f92c750d51ac0ab63f745c515 Mon Sep 17 00:00:00 2001 From: Ianna Osborne Date: Fri, 6 Mar 2015 17:35:15 +0100 Subject: [PATCH] * Use Tracker topology record --- PhysicsTools/RecoUtils/src/CheckHitPattern.cc | 4 ++-- RecoEgamma/EgammaElectronAlgos/src/ElectronSeedGenerator.cc | 3 ++- .../plugins/SiStripElectronProducer.cc | 3 ++- RecoEgamma/Examples/plugins/ElectronSeedAnalyzer.cc | 4 ++-- RecoEgamma/Examples/plugins/SiStripElectronAnalyzer.cc | 4 ++-- 5 files changed, 10 insertions(+), 8 deletions(-) diff --git a/PhysicsTools/RecoUtils/src/CheckHitPattern.cc b/PhysicsTools/RecoUtils/src/CheckHitPattern.cc index c7f313f39f9b8..c1409fa123c92 100644 --- a/PhysicsTools/RecoUtils/src/CheckHitPattern.cc +++ b/PhysicsTools/RecoUtils/src/CheckHitPattern.cc @@ -11,7 +11,7 @@ #include "DataFormats/SiPixelDetId/interface/PixelSubdetector.h" //#include "DataFormats/SiStripDetId/interface/SiStripDetId.h" #include "DataFormats/TrackerCommon/interface/TrackerTopology.h" -#include "Geometry/Records/interface/IdealGeometryRecord.h" +#include "Geometry/Records/interface/TrackerTopologyRcd.h" #include "TrackingTools/Records/interface/TransientTrackRecord.h" #include "DataFormats/Math/interface/deltaPhi.h" @@ -26,7 +26,7 @@ void CheckHitPattern::init(const edm::EventSetup& iSetup) { //Retrieve tracker topology from geometry edm::ESHandle tTopoHandle; - iSetup.get().get(tTopoHandle); + iSetup.get().get(tTopoHandle); const TrackerTopology* const tTopo = tTopoHandle.product(); // diff --git a/RecoEgamma/EgammaElectronAlgos/src/ElectronSeedGenerator.cc b/RecoEgamma/EgammaElectronAlgos/src/ElectronSeedGenerator.cc index 798c3901bd78b..bbc58c5c57ba8 100644 --- a/RecoEgamma/EgammaElectronAlgos/src/ElectronSeedGenerator.cc +++ b/RecoEgamma/EgammaElectronAlgos/src/ElectronSeedGenerator.cc @@ -33,6 +33,7 @@ #include "MagneticField/Records/interface/IdealMagneticFieldRecord.h" #include "Geometry/Records/interface/TrackerDigiGeometryRecord.h" +#include "Geometry/Records/interface/TrackerTopologyRcd.h" #include "TrackingTools/KalmanUpdators/interface/KFUpdator.h" #include "TrackingTools/Records/interface/TrackingComponentsRecord.h" @@ -232,7 +233,7 @@ void ElectronSeedGenerator::run //Retrieve tracker topology from geometry edm::ESHandle tTopoHand; - setup.get().get(tTopoHand); + setup.get().get(tTopoHand); const TrackerTopology *tTopo=tTopoHand.product(); theSetup= &setup; diff --git a/RecoEgamma/EgammaElectronProducers/plugins/SiStripElectronProducer.cc b/RecoEgamma/EgammaElectronProducers/plugins/SiStripElectronProducer.cc index 36738e8a7eec2..84bf2188c1010 100644 --- a/RecoEgamma/EgammaElectronProducers/plugins/SiStripElectronProducer.cc +++ b/RecoEgamma/EgammaElectronProducers/plugins/SiStripElectronProducer.cc @@ -28,6 +28,7 @@ #include "DataFormats/EgammaReco/interface/SuperCluster.h" #include "DataFormats/TrackerRecHit2D/interface/SiStripRecHit2DCollection.h" #include "DataFormats/TrackerRecHit2D/interface/SiStripMatchedRecHit2DCollection.h" +#include "Geometry/Records/interface/TrackerTopologyRcd.h" #include "MagneticField/Engine/interface/MagneticField.h" #include "MagneticField/Records/interface/IdealMagneticFieldRecord.h" @@ -141,7 +142,7 @@ SiStripElectronProducer::produce(edm::Event& iEvent, const edm::EventSetup& iSet //Retrieve tracker topology from geometry edm::ESHandle tTopoHand; - iSetup.get().get(tTopoHand); + iSetup.get().get(tTopoHand); const TrackerTopology *tTopo=tTopoHand.product(); // counter for electron candidates diff --git a/RecoEgamma/Examples/plugins/ElectronSeedAnalyzer.cc b/RecoEgamma/Examples/plugins/ElectronSeedAnalyzer.cc index d8f76d87c9255..8d5ba4bdc374b 100644 --- a/RecoEgamma/Examples/plugins/ElectronSeedAnalyzer.cc +++ b/RecoEgamma/Examples/plugins/ElectronSeedAnalyzer.cc @@ -34,7 +34,7 @@ #include "TrackingTools/MaterialEffects/interface/PropagatorWithMaterial.h" #include "DataFormats/TrackerCommon/interface/TrackerTopology.h" -#include "Geometry/Records/interface/IdealGeometryRecord.h" +#include "Geometry/Records/interface/TrackerTopologyRcd.h" #include "MagneticField/Engine/interface/MagneticField.h" #include "MagneticField/Records/interface/IdealMagneticFieldRecord.h" @@ -184,7 +184,7 @@ void ElectronSeedAnalyzer::analyze( const edm::Event& e, const edm::EventSetup& { //Retrieve tracker topology from geometry edm::ESHandle tTopo; - iSetup.get().get(tTopo); + iSetup.get().get(tTopo); diff --git a/RecoEgamma/Examples/plugins/SiStripElectronAnalyzer.cc b/RecoEgamma/Examples/plugins/SiStripElectronAnalyzer.cc index e5b8471be8d4d..233c3e85cb660 100644 --- a/RecoEgamma/Examples/plugins/SiStripElectronAnalyzer.cc +++ b/RecoEgamma/Examples/plugins/SiStripElectronAnalyzer.cc @@ -48,7 +48,7 @@ #include "Geometry/Records/interface/TrackerDigiGeometryRecord.h" #include "DataFormats/GeometryVector/interface/GlobalPoint.h" #include "DataFormats/TrackerCommon/interface/TrackerTopology.h" -#include "Geometry/Records/interface/IdealGeometryRecord.h" +#include "Geometry/Records/interface/TrackerTopologyRcd.h" #include "DataFormats/SiStripDetId/interface/StripSubdetector.h" #include "DataFormats/TrackerRecHit2D/interface/SiStripRecHit2DCollection.h" @@ -326,7 +326,7 @@ SiStripElectronAnalyzer::analyze(const edm::Event& iEvent, const edm::EventSetup { //Retrieve tracker topology from geometry edm::ESHandle tTopo; - iSetup.get().get(tTopo); + iSetup.get().get(tTopo); using namespace std; // so you can say "cout" and "endl"