* Use Tracker topology record

lgray · Apr 7, 2015 · f4bbaa1 · f4bbaa1
1 parent 961cf43
commit f4bbaa1
Show file tree

Hide file tree

Showing 9 changed files with 15 additions and 15 deletions.
diff --git a/FastSimulation/EgammaElectronAlgos/src/FastElectronSeedProducer.cc b/FastSimulation/EgammaElectronAlgos/src/FastElectronSeedProducer.cc
@@ -28,6 +28,7 @@
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
 
 #include "Geometry/Records/interface/CaloGeometryRecord.h"
+#include "Geometry/Records/interface/TrackerTopologyRcd.h"
 #include "Geometry/CaloGeometry/interface/CaloSubdetectorGeometry.h"
 #include "Geometry/CaloGeometry/interface/CaloGeometry.h"
 
@@ -129,7 +130,7 @@ FastElectronSeedProducer::produce(edm::Event& e, const edm::EventSetup& iSetup)
 
   //Retrieve tracker topology from geometry
   edm::ESHandle<TrackerTopology> tTopoHand;
-  iSetup.get<IdealGeometryRecord>().get(tTopoHand);
+  iSetup.get<TrackerTopologyRcd>().get(tTopoHand);
   const TrackerTopology *tTopo=tTopoHand.product();
 
 

diff --git a/FastSimulation/EventProducer/src/FamosProducer.cc b/FastSimulation/EventProducer/src/FamosProducer.cc
@@ -20,7 +20,7 @@
 #include "FastSimulation/Calorimetry/interface/CalorimetryManager.h"
 #include "FastSimulation/TrajectoryManager/interface/TrajectoryManager.h"
 #include "FastSimulation/Utilities/interface/RandomEngineAndDistribution.h"
-#include "Geometry/Records/interface/IdealGeometryRecord.h"
+#include "Geometry/Records/interface/TrackerTopologyRcd.h"
 
 #include "HepMC/GenVertex.h"
 #include "HepMC/GenEvent.h"
@@ -88,7 +88,7 @@ void FamosProducer::produce(edm::Event & iEvent, const edm::EventSetup & es)
 
    //Retrieve tracker topology from geometry
    edm::ESHandle<TrackerTopology> tTopoHand;
-   es.get<IdealGeometryRecord>().get(tTopoHand);
+   es.get<TrackerTopologyRcd>().get(tTopoHand);
    const TrackerTopology *tTopo=tTopoHand.product();
 
 

diff --git a/FastSimulation/Tracking/interface/TrajectorySeedHitCandidate.h b/FastSimulation/Tracking/interface/TrajectorySeedHitCandidate.h
@@ -4,7 +4,6 @@
 #include "Geometry/CommonDetUnit/interface/GeomDetUnit.h"
 #include "DataFormats/DetId/interface/DetId.h"
 #include "DataFormats/SiStripDetId/interface/StripSubdetector.h"
-#include "Geometry/Records/interface/IdealGeometryRecord.h"
 #include "DataFormats/TrackerRecHit2D/interface/SiTrackerGSRecHit2D.h" 
 #include "DataFormats/TrackerRecHit2D/interface/SiTrackerGSMatchedRecHit2D.h" 
 #include "DataFormats/GeometryVector/interface/GlobalPoint.h"

diff --git a/FastSimulation/Tracking/plugins/TrackCandidateProducer.cc b/FastSimulation/Tracking/plugins/TrackCandidateProducer.cc
@@ -16,6 +16,7 @@
 
 #include "Geometry/TrackerGeometryBuilder/interface/TrackerGeometry.h"
 #include "Geometry/Records/interface/TrackerDigiGeometryRecord.h"
+#include "Geometry/Records/interface/TrackerTopologyRcd.h"
 
 #include "FastSimulation/Tracking/interface/TrajectorySeedHitCandidate.h"
 //#include "FastSimulation/Tracking/interface/TrackerRecHitSplit.h"
@@ -134,7 +135,7 @@ TrackCandidateProducer::produce(edm::Event& e, const edm::EventSetup& es) {
 
   //Retrieve tracker topology from geometry
   edm::ESHandle<TrackerTopology> tTopoHand;
-  es.get<IdealGeometryRecord>().get(tTopoHand);
+  es.get<TrackerTopologyRcd>().get(tTopoHand);
   const TrackerTopology *tTopo=tTopoHand.product();
 
 

diff --git a/FastSimulation/Tracking/plugins/TrajectorySeedProducer.cc b/FastSimulation/Tracking/plugins/TrajectorySeedProducer.cc
@@ -13,6 +13,7 @@
 
 #include "Geometry/TrackerGeometryBuilder/interface/TrackerGeometry.h"
 #include "Geometry/Records/interface/TrackerDigiGeometryRecord.h"
+#include "Geometry/Records/interface/TrackerTopologyRcd.h"
 
 #include "FastSimulation/ParticlePropagator/interface/MagneticFieldMapRecord.h"
 
@@ -157,7 +158,7 @@ TrajectorySeedProducer::beginRun(edm::Run const&, const edm::EventSetup & es)
     es.get<IdealMagneticFieldRecord>().get(magneticFieldHandle);
     es.get<TrackerDigiGeometryRecord>().get(trackerGeometryHandle);
     es.get<MagneticFieldMapRecord>().get(magneticFieldMapHandle);
-    es.get<IdealGeometryRecord>().get(trackerTopologyHandle);
+    es.get<TrackerTopologyRcd>().get(trackerTopologyHandle);
 
     magneticField = &(*magneticFieldHandle);
     trackerGeometry = &(*trackerGeometryHandle);

diff --git a/FastSimulation/Tracking/src/TrackingLayer.cc b/FastSimulation/Tracking/src/TrackingLayer.cc
@@ -1,8 +1,6 @@
 #include "FastSimulation/Tracking/interface/TrackingLayer.h"
 
-const TrackingLayer::eqfct TrackingLayer::_eqfct;
-const TrackingLayer::hashfct TrackingLayer::_hashfct;
-
+
 TrackingLayer::TrackingLayer():
     _subDet(Det::UNKNOWN),
     _side(Side::BARREL),

diff --git a/FastSimulation/Tracking/test/FastTrackAnalyzer.cc b/FastSimulation/Tracking/test/FastTrackAnalyzer.cc
@@ -25,7 +25,7 @@
 
 // Numbering scheme
 #include "DataFormats/TrackerCommon/interface/TrackerTopology.h"
-#include "Geometry/Records/interface/IdealGeometryRecord.h"
+#include "Geometry/Records/interface/TrackerTopologyRcd.h"
 
 #include "TH1F.h"
 #include "TFile.h"
@@ -319,7 +319,7 @@ void FastTrackAnalyzer::analyze(const edm::Event& event, const edm::EventSetup&
 
     //Retrieve tracker topology from geometry
     edm::ESHandle<TrackerTopology> tTopoHand;
-    setup.get<IdealGeometryRecord>().get(tTopoHand);
+    setup.get<TrackerTopologyRcd>().get(tTopoHand);
     const TrackerTopology *tTopo=tTopoHand.product();
 
     std::cout << "\nEvent ID = "<< event.id() << std::endl ;

diff --git a/FastSimulation/Tracking/test/testGeneralTracks.cc b/FastSimulation/Tracking/test/testGeneralTracks.cc
@@ -9,8 +9,6 @@
 #include "Geometry/CommonDetUnit/interface/GeomDetUnit.h"
 #include "DataFormats/DetId/interface/DetId.h"
 #include "DataFormats/SiStripDetId/interface/StripSubdetector.h"
-#include "DataFormats/TrackerCommon/interface/TrackerTopology.h"
-#include "Geometry/Records/interface/IdealGeometryRecord.h"
 
 #include "SimDataFormats/Track/interface/SimTrackContainer.h"
 
@@ -50,6 +48,7 @@ public :
   // See RecoParticleFlow/PFProducer/interface/PFProducer.h
   edm::ParameterSet particleFilter_;
   std::vector<edm::InputTag> allTracks;
+  bool saveNU;
   std::vector<FSimEvent*> mySimEvent;
   std::string simModuleLabel_;
   // Histograms

diff --git a/FastSimulation/Tracking/test/testTrackingIterations.cc b/FastSimulation/Tracking/test/testTrackingIterations.cc
@@ -10,7 +10,7 @@
 #include "DataFormats/DetId/interface/DetId.h"
 #include "DataFormats/SiStripDetId/interface/StripSubdetector.h"
 #include "DataFormats/TrackerCommon/interface/TrackerTopology.h"
-#include "Geometry/Records/interface/IdealGeometryRecord.h"
+#include "Geometry/Records/interface/TrackerTopologyRcd.h"
 
 #include "SimDataFormats/Track/interface/SimTrackContainer.h"
 #include "DataFormats/TrackerRecHit2D/interface/SiTrackerGSRecHit2DCollection.h" 
@@ -57,6 +57,7 @@ public :
   std::vector<edm::InputTag> thirdTracks;
   std::vector<edm::InputTag> fourthTracks;
   std::vector<edm::InputTag> fifthTracks;
+  bool saveNU;
   std::vector<FSimEvent*> mySimEvent;
   std::string simModuleLabel_;
   // Histograms
@@ -347,7 +348,7 @@ testTrackingIterations::analyze(const edm::Event& iEvent, const edm::EventSetup&
 
   //Retrieve tracker topology from geometry
   edm::ESHandle<TrackerTopology> tTopoHand;
-  iSetup.get<IdealGeometryRecord>().get(tTopoHand);
+  iSetup.get<TrackerTopologyRcd>().get(tTopoHand);
   const TrackerTopology *tTopo=tTopoHand.product();