rebase

cms-sw · Oct 20, 2021 · 7e93281 · 7e93281
1 parent 687591e
commit 7e93281
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 81 deletions.
diff --git a/Alignment/MuonAlignment/plugins/MuonGeometrySanityCheck.cc b/Alignment/MuonAlignment/plugins/MuonGeometrySanityCheck.cc
@@ -584,10 +584,8 @@ std::string MuonGeometrySanityCheckPoint::detName() const {
 
 // ------------ method called to for each event  ------------
 void MuonGeometrySanityCheck::analyze(const edm::Event &iEvent, const edm::EventSetup &iSetup) {
-  edm::ESHandle<DTGeometry> dtGeometry;
-  edm::ESHandle<CSCGeometry> cscGeometry;
-  dtGeometry = iSetup.getHandle(dtGeomToken_);
-  cscGeometry = iSetup.getHandle(cscGeomToken_);
+  const DTGeometry *dtGeometry = &iSetup.getData(dtGeomToken_);
+  const CSCGeometry *cscGeometry = &iSetup.getData(cscGeomToken_);
 
   int num_transformed = 0;
   int num_tested = 0;

diff --git a/Alignment/MuonAlignmentAlgorithms/plugins/CSCOverlapsTrackPreparation.cc b/Alignment/MuonAlignmentAlgorithms/plugins/CSCOverlapsTrackPreparation.cc
@@ -113,12 +113,9 @@ void CSCOverlapsTrackPreparation::produce(edm::Event& iEvent, const edm::EventSe
   edm::Handle<reco::TrackCollection> tracks;
   iEvent.getByLabel(m_src, tracks);
 
-  edm::ESHandle<CSCGeometry> cscGeometry;
-  edm::ESHandle<MagneticField> magneticField;
-  edm::ESHandle<GlobalTrackingGeometry> globalGeometry;
-  cscGeometry = iSetup.getHandle(cscGeomToken_);
-  magneticField = iSetup.getHandle(magneticFieldToken_);
-  globalGeometry = iSetup.getHandle(globalGeomToken_);
+  const CSCGeometry* cscGeometry = &iSetup.getData(cscGeomToken_);
+  const MagneticField* magneticField = &iSetup.getData(magneticFieldToken_);
+  const GlobalTrackingGeometry* globalGeometry = &iSetup.getData(globalGeomToken_);
 
   MuonTransientTrackingRecHitBuilder muonTransBuilder;
 

diff --git a/Alignment/MuonAlignmentAlgorithms/test/standAloneTest_cfg.py b/Alignment/MuonAlignmentAlgorithms/test/standAloneTest_cfg.py
diff --git a/Alignment/SurveyAnalysis/plugins/DTSurveyConvert.cc b/Alignment/SurveyAnalysis/plugins/DTSurveyConvert.cc
@@ -79,13 +79,9 @@ void DTSurveyConvert::analyze(const edm::Event &, const edm::EventSetup &iSetup)
 
   if (WriteToDB == true) {
     // Instantiate the helper class
-    edm::ESHandle<DTGeometry> dtGeometry;
-    edm::ESHandle<CSCGeometry> cscGeometry;
-    edm::ESHandle<GEMGeometry> gemGeometry;
-
-    dtGeometry = iSetup.getHandle(dtGeomToken_);
-    cscGeometry = iSetup.getHandle(cscGeomToken_);
-    gemGeometry = iSetup.getHandle(gemGeomToken_);
+    const DTGeometry *dtGeometry = &iSetup.getData(dtGeomToken_);
+    const CSCGeometry *cscGeometry = &iSetup.getData(cscGeomToken_);
+    const GEMGeometry *gemGeometry = &iSetup.getData(gemGeomToken_);
 
     MuonAlignment align(&*dtGeometry, &*cscGeometry, &*gemGeometry);
     std::ifstream inFile(outputFileName.c_str());