Merge pull request cms-sw#34031 from Dr15Jones/MuonSensitiveDetectorBuilder

Template for migrating Sensitive Detectors to esConsumes

Author: cmsbuild

SimG4CMS/Calo/interface/CaloSD.h

@@ -20,6 +20,7 @@
 #include "SimG4Core/SensitiveDetector/interface/SensitiveCaloDetector.h"
 
 #include "FWCore/MessageLogger/interface/MessageLogger.h"
+#include "FWCore/ParameterSet/interface/ParameterSetfwd.h"
 
 #include "G4VPhysicalVolume.hh"
 #include "G4Track.hh"
@@ -44,7 +45,6 @@ class CaloSD : public SensitiveCaloDetector,
                public Observer<const EndOfEvent*> {
 public:
   CaloSD(const std::string& aSDname,
-         const edm::EventSetup& es,
          const SensitiveDetectorCatalog& clg,
          edm::ParameterSet const& p,
          const SimTrackManager*,

SimG4CMS/Calo/interface/CaloTrkProcessing.h

@@ -4,6 +4,8 @@
 #include "SimG4Core/Notification/interface/Observer.h"
 #include "SimG4Core/SensitiveDetector/interface/SensitiveCaloDetector.h"
 
+#include "FWCore/Framework/interface/Frameworkfwd.h"
+#include "FWCore/ParameterSet/interface/ParameterSetfwd.h"
 #include "FWCore/MessageLogger/interface/MessageLogger.h"
 
 #include "G4VTouchable.hh"

SimG4CMS/Calo/interface/ECalSD.h

@@ -14,6 +14,8 @@
 #include "Geometry/EcalCommonData/interface/EcalNumberingScheme.h"
 #include "CondFormats/GeometryObjects/interface/EcalSimulationParameters.h"
 #include "DataFormats/DetId/interface/DetId.h"
+#include "FWCore/Framework/interface/Frameworkfwd.h"
+#include "FWCore/ParameterSet/interface/ParameterSetfwd.h"
 #include "FWCore/MessageLogger/interface/MessageLogger.h"
 
 #ifdef plotDebug

SimG4CMS/Calo/src/CaloSD.cc

@@ -11,6 +11,7 @@
 #include "Geometry/Records/interface/HcalParametersRcd.h"
 #include "CondFormats/GeometryObjects/interface/CaloSimulationParameters.h"
 #include "FWCore/Framework/interface/ESHandle.h"
+#include "FWCore/ParameterSet/interface/ParameterSet.h"
 #include "FWCore/Utilities/interface/Exception.h"
 
 #include "G4EventManager.hh"
@@ -33,13 +34,12 @@
 //#define EDM_ML_DEBUG
 
 CaloSD::CaloSD(const std::string& name,
-               const edm::EventSetup& es,
                const SensitiveDetectorCatalog& clg,
                edm::ParameterSet const& p,
                const SimTrackManager* manager,
                float timeSliceUnit,
                bool ignoreTkID)
-    : SensitiveCaloDetector(name, es, clg, p),
+    : SensitiveCaloDetector(name, clg),
       G4VGFlashSensitiveDetector(),
       eminHit(0.),
       currentHit(nullptr),

SimG4CMS/Calo/src/CaloTrkProcessing.cc

@@ -9,6 +9,7 @@
 #include "Geometry/Records/interface/HcalParametersRcd.h"
 #include "CondFormats/GeometryObjects/interface/CaloSimulationParameters.h"
 #include "FWCore/Framework/interface/ESHandle.h"
+#include "FWCore/ParameterSet/interface/ParameterSet.h"
 #include "FWCore/Utilities/interface/Exception.h"
 
 #include "G4EventManager.hh"
@@ -27,7 +28,7 @@ CaloTrkProcessing::CaloTrkProcessing(const std::string& name,
                                      const SensitiveDetectorCatalog& clg,
                                      edm::ParameterSet const& p,
                                      const SimTrackManager*)
-    : SensitiveCaloDetector(name, es, clg, p), lastTrackID_(-1) {
+    : SensitiveCaloDetector(name, clg), lastTrackID_(-1) {
   //Initialise the parameter set
   bool dd4hep = p.getParameter<bool>("g4GeometryDD4hepSource");
   int addlevel = dd4hep ? 1 : 0;

SimG4CMS/Calo/src/ECalSD.cc

@@ -45,7 +45,6 @@ ECalSD::ECalSD(const std::string& name,
                edm::ParameterSet const& p,
                const SimTrackManager* manager)
     : CaloSD(name,
-             es,
              clg,
              p,
              manager,

SimG4CMS/Calo/src/HCalSD.cc

@@ -50,7 +50,6 @@ HCalSD::HCalSD(const std::string& name,
                edm::ParameterSet const& p,
                const SimTrackManager* manager)
     : CaloSD(name,
-             es,
              clg,
              p,
              manager,

SimG4CMS/Calo/src/HFNoseSD.cc

@@ -33,7 +33,6 @@ HFNoseSD::HFNoseSD(const std::string& name,
                    edm::ParameterSet const& p,
                    const SimTrackManager* manager)
     : CaloSD(name,
-             es,
              clg,
              p,
              manager,

SimG4CMS/Calo/src/HGCSD.cc

@@ -38,7 +38,6 @@ HGCSD::HGCSD(const std::string& name,
              edm::ParameterSet const& p,
              const SimTrackManager* manager)
     : CaloSD(name,
-             es,
              clg,
              p,
              manager,

SimG4CMS/Calo/src/HGCScintSD.cc

@@ -36,7 +36,6 @@ HGCScintSD::HGCScintSD(const std::string& name,
                        edm::ParameterSet const& p,
                        const SimTrackManager* manager)
     : CaloSD(name,
-             es,
              clg,
              p,
              manager,