Merge pull request #34447 from bsunanda/Run3-sim89

Run3-sim89 Avoid accessing ESHandle without ESGetToken
cms-sw · Jul 13, 2021 · 29db216 · 29db216
2 parents 639903d + 947d212
commit 29db216
Show file tree

Hide file tree

Showing 9 changed files with 0 additions and 12 deletions.
diff --git a/Geometry/EcalTestBeam/plugins/EcalTBGeometryBuilder.cc b/Geometry/EcalTestBeam/plugins/EcalTBGeometryBuilder.cc
@@ -43,8 +43,6 @@ EcalTBGeometryBuilder::~EcalTBGeometryBuilder() {}
 
 // ------------ method called to produce the data  ------------
 EcalTBGeometryBuilder::ReturnType EcalTBGeometryBuilder::produce(const IdealGeometryRecord& iRecord) {
-  edm::ESHandle<CaloSubdetectorGeometry> pG;
-
   auto pCaloGeom = std::make_unique<CaloGeometry>();
 
   // TODO: Look for ECAL parts

diff --git a/Geometry/EcalTestBeam/plugins/EcalTBGeometryBuilder.h b/Geometry/EcalTestBeam/plugins/EcalTBGeometryBuilder.h
@@ -22,7 +22,6 @@
 // user include files
 #include "FWCore/Framework/interface/ESProducer.h"
 
-#include "FWCore/Framework/interface/ESHandle.h"
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
 #include "FWCore/Utilities/interface/ESGetToken.h"
 #include "Geometry/Records/interface/IdealGeometryRecord.h"

diff --git a/SimG4CMS/EcalTestBeam/interface/EcalTBMCInfoProducer.h b/SimG4CMS/EcalTestBeam/interface/EcalTBMCInfoProducer.h
@@ -6,7 +6,6 @@
  *
  */
 #include "DataFormats/Common/interface/Handle.h"
-#include "FWCore/Framework/interface/ESHandle.h"
 #include "FWCore/Framework/interface/Event.h"
 #include "FWCore/Framework/interface/EventSetup.h"
 #include "FWCore/Framework/interface/MakerMacros.h"

diff --git a/SimG4CMS/EcalTestBeam/interface/FakeTBEventHeaderProducer.h b/SimG4CMS/EcalTestBeam/interface/FakeTBEventHeaderProducer.h
@@ -10,7 +10,6 @@
  */
 
 #include "DataFormats/Common/interface/Handle.h"
-#include "FWCore/Framework/interface/ESHandle.h"
 #include "FWCore/Framework/interface/Event.h"
 #include "FWCore/Framework/interface/EventSetup.h"
 #include "FWCore/Framework/interface/MakerMacros.h"

diff --git a/SimG4CMS/EcalTestBeam/interface/FakeTBHodoscopeRawInfoProducer.h b/SimG4CMS/EcalTestBeam/interface/FakeTBHodoscopeRawInfoProducer.h
@@ -10,7 +10,6 @@
  */
 
 #include "DataFormats/Common/interface/Handle.h"
-#include "FWCore/Framework/interface/ESHandle.h"
 #include "FWCore/Framework/interface/Event.h"
 #include "FWCore/Framework/interface/EventSetup.h"
 #include "FWCore/Framework/interface/MakerMacros.h"

diff --git a/SimG4CMS/EcalTestBeam/interface/TBHodoActiveVolumeRawInfoProducer.h b/SimG4CMS/EcalTestBeam/interface/TBHodoActiveVolumeRawInfoProducer.h
@@ -7,7 +7,6 @@
  */
 
 #include "DataFormats/Common/interface/Handle.h"
-#include "FWCore/Framework/interface/ESHandle.h"
 #include "FWCore/Framework/interface/Event.h"
 #include "FWCore/Framework/interface/EventSetup.h"
 #include "FWCore/Framework/interface/MakerMacros.h"

diff --git a/SimG4CMS/FP420/interface/FP420Test.h b/SimG4CMS/FP420/interface/FP420Test.h
@@ -12,9 +12,6 @@
 #include "FWCore/Framework/interface/EDAnalyzer.h"
 #include "FWCore/Framework/interface/MakerMacros.h"
 
-// necessary objects:
-#include "FWCore/Framework/interface/ESHandle.h"
-
 //
 //
 #include "SimG4Core/Notification/interface/Observer.h"

diff --git a/SimG4CMS/FP420/plugins/FP420SD.cc b/SimG4CMS/FP420/plugins/FP420SD.cc
@@ -19,7 +19,6 @@
 #include "SimG4CMS/FP420/interface/FP420G4HitCollection.h"
 #include "SimG4CMS/FP420/interface/FP420NumberingScheme.h"
 
-#include "FWCore/Framework/interface/ESHandle.h"
 #include "FWCore/Framework/interface/EventSetup.h"
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
 #include "FWCore/MessageLogger/interface/MessageLogger.h"

diff --git a/SimG4CMS/Tracker/test/SimHitTrackerAnalyzer.cc b/SimG4CMS/Tracker/test/SimHitTrackerAnalyzer.cc
@@ -25,7 +25,6 @@
 
 #include "FWCore/Framework/interface/Event.h"
 #include "FWCore/Framework/interface/EventSetup.h"
-#include "FWCore/Framework/interface/ESHandle.h"
 #include "FWCore/Framework/interface/MakerMacros.h"
 
 #include "FWCore/ParameterSet/interface/ParameterSet.h"