Run3-gex83J Make new style instantiation of SD's for many forward detectors

SimG4CMS/Forward/interface/BHMSD.h

@@ -15,11 +15,7 @@ class BHMNumberingScheme;
 
 class BHMSD : public TimingSD {
 public:
-  BHMSD(const std::string &,
-        const edm::EventSetup &,
-        const SensitiveDetectorCatalog &,
-        edm::ParameterSet const &,
-        const SimTrackManager *);
+  BHMSD(const std::string &, const SensitiveDetectorCatalog &, edm::ParameterSet const &, const SimTrackManager *);
 
   ~BHMSD() override;
 

SimG4CMS/Forward/interface/Bcm1fSD.h

@@ -12,11 +12,7 @@ class G4Step;
 
 class Bcm1fSD : public TimingSD {
 public:
-  Bcm1fSD(const std::string &,
-          const edm::EventSetup &,
-          const SensitiveDetectorCatalog &,
-          edm::ParameterSet const &,
-          const SimTrackManager *);
+  Bcm1fSD(const std::string &, const SensitiveDetectorCatalog &, edm::ParameterSet const &, const SimTrackManager *);
   ~Bcm1fSD() override;
 
   uint32_t setDetUnitId(const G4Step *) override;

SimG4CMS/Forward/interface/BscSD.h

@@ -14,11 +14,7 @@ class BscNumberingScheme;
 
 class BscSD : public TimingSD {
 public:
-  BscSD(const std::string &,
-        const edm::EventSetup &,
-        const SensitiveDetectorCatalog &,
-        edm::ParameterSet const &,
-        const SimTrackManager *);
+  BscSD(const std::string &, const SensitiveDetectorCatalog &, edm::ParameterSet const &, const SimTrackManager *);
 
   ~BscSD() override;
 

SimG4CMS/Forward/interface/BscTest.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"

SimG4CMS/Forward/interface/MtdSD.h

@@ -18,11 +18,7 @@ class SimTrackManager;
 
 class MtdSD : public TimingSD {
 public:
-  MtdSD(const std::string &,
-        const edm::EventSetup &,
-        const SensitiveDetectorCatalog &,
-        edm::ParameterSet const &,
-        const SimTrackManager *);
+  MtdSD(const std::string &, const SensitiveDetectorCatalog &, edm::ParameterSet const &, const SimTrackManager *);
 
   ~MtdSD() override;
 

SimG4CMS/Forward/interface/PltSD.h

@@ -12,11 +12,7 @@ class SimTrackManager;
 
 class PltSD : public TimingSD {
 public:
-  PltSD(const std::string &,
-        const edm::EventSetup &,
-        const SensitiveDetectorCatalog &,
-        edm::ParameterSet const &,
-        const SimTrackManager *);
+  PltSD(const std::string &, const SensitiveDetectorCatalog &, edm::ParameterSet const &, const SimTrackManager *);
   ~PltSD() override;
 
   uint32_t setDetUnitId(const G4Step *) override;

SimG4CMS/Forward/interface/TotemT2ScintSD.h

@@ -9,7 +9,6 @@
 class TotemT2ScintSD : public CaloSD {
 public:
   TotemT2ScintSD(const std::string &,
-                 const edm::EventSetup &,
                  const SensitiveDetectorCatalog &,
                  edm::ParameterSet const &,
                  const SimTrackManager *);

SimG4CMS/Forward/plugins/BCM1FSensitiveDetectorBuilder.cc

@@ -0,0 +1,34 @@
+// system include files
+
+// user include files
+#include "SimG4Core/SensitiveDetector/interface/SensitiveDetectorMakerBase.h"
+#include "SimG4Core/Notification/interface/SimActivityRegistryEnroller.h"
+#include "SimG4Core/SensitiveDetector/interface/SensitiveDetectorPluginFactory.h"
+
+#include "SimG4CMS/Forward/interface/Bcm1fSD.h"
+
+#include "FWCore/Framework/interface/EventSetup.h"
+#include "FWCore/Framework/interface/ConsumesCollector.h"
+#include "FWCore/Utilities/interface/ESGetToken.h"
+#include "FWCore/PluginManager/interface/ModuleDef.h"
+#include "FWCore/ParameterSet/interface/ParameterSet.h"
+
+class BCM1FSensitiveDetectorBuilder : public SensitiveDetectorMakerBase {
+public:
+  explicit BCM1FSensitiveDetectorBuilder(edm::ParameterSet const& p, edm::ConsumesCollector cc) {}
+
+  void beginRun(const edm::EventSetup& es) final {}
+
+  std::unique_ptr<SensitiveDetector> make(const std::string& iname,
+                                          const SensitiveDetectorCatalog& clg,
+                                          const edm::ParameterSet& p,
+                                          const SimTrackManager* man,
+                                          SimActivityRegistry& reg) const final {
+    auto sd = std::make_unique<Bcm1fSD>(iname, clg, p, man);
+    SimActivityRegistryEnroller::enroll(reg, sd.get());
+    return sd;
+  }
+};
+
+typedef Bcm1fSD BCM1FSensitiveDetector;
+DEFINE_SENSITIVEDETECTORBUILDER(BCM1FSensitiveDetectorBuilder, BCM1FSensitiveDetector);

SimG4CMS/Forward/plugins/BHMSensitiveDetectorBuilder.cc

@@ -0,0 +1,34 @@
+// system include files
+
+// user include files
+#include "SimG4Core/SensitiveDetector/interface/SensitiveDetectorMakerBase.h"
+#include "SimG4Core/Notification/interface/SimActivityRegistryEnroller.h"
+#include "SimG4Core/SensitiveDetector/interface/SensitiveDetectorPluginFactory.h"
+
+#include "SimG4CMS/Forward/interface/BHMSD.h"
+
+#include "FWCore/Framework/interface/EventSetup.h"
+#include "FWCore/Framework/interface/ConsumesCollector.h"
+#include "FWCore/Utilities/interface/ESGetToken.h"
+#include "FWCore/PluginManager/interface/ModuleDef.h"
+#include "FWCore/ParameterSet/interface/ParameterSet.h"
+
+class BHMSensitiveDetectorBuilder : public SensitiveDetectorMakerBase {
+public:
+  explicit BHMSensitiveDetectorBuilder(edm::ParameterSet const& p, edm::ConsumesCollector cc) {}
+
+  void beginRun(const edm::EventSetup& es) final {}
+
+  std::unique_ptr<SensitiveDetector> make(const std::string& iname,
+                                          const SensitiveDetectorCatalog& clg,
+                                          const edm::ParameterSet& p,
+                                          const SimTrackManager* man,
+                                          SimActivityRegistry& reg) const final {
+    auto sd = std::make_unique<BHMSD>(iname, clg, p, man);
+    SimActivityRegistryEnroller::enroll(reg, sd.get());
+    return sd;
+  }
+};
+
+typedef BHMSD BHMSensitiveDetector;
+DEFINE_SENSITIVEDETECTORBUILDER(BHMSensitiveDetectorBuilder, BHMSensitiveDetector);

SimG4CMS/Forward/plugins/BSCSensitiveDetectorBuilder.cc

@@ -0,0 +1,34 @@
+// system include files
+
+// user include files
+#include "SimG4Core/SensitiveDetector/interface/SensitiveDetectorMakerBase.h"
+#include "SimG4Core/Notification/interface/SimActivityRegistryEnroller.h"
+#include "SimG4Core/SensitiveDetector/interface/SensitiveDetectorPluginFactory.h"
+
+#include "SimG4CMS/Forward/interface/BscSD.h"
+
+#include "FWCore/Framework/interface/EventSetup.h"
+#include "FWCore/Framework/interface/ConsumesCollector.h"
+#include "FWCore/Utilities/interface/ESGetToken.h"
+#include "FWCore/PluginManager/interface/ModuleDef.h"
+#include "FWCore/ParameterSet/interface/ParameterSet.h"
+
+class BSCSensitiveDetectorBuilder : public SensitiveDetectorMakerBase {
+public:
+  explicit BSCSensitiveDetectorBuilder(edm::ParameterSet const& p, edm::ConsumesCollector cc) {}
+
+  void beginRun(const edm::EventSetup& es) final {}
+
+  std::unique_ptr<SensitiveDetector> make(const std::string& iname,
+                                          const SensitiveDetectorCatalog& clg,
+                                          const edm::ParameterSet& p,
+                                          const SimTrackManager* man,
+                                          SimActivityRegistry& reg) const final {
+    auto sd = std::make_unique<BscSD>(iname, clg, p, man);
+    SimActivityRegistryEnroller::enroll(reg, sd.get());
+    return sd;
+  }
+};
+
+typedef BscSD BSCSensitiveDetector;
+DEFINE_SENSITIVEDETECTORBUILDER(BSCSensitiveDetectorBuilder, BSCSensitiveDetector);

SimG4CMS/Forward/plugins/MtdSensitiveDetectorBuilder.cc

@@ -0,0 +1,34 @@
+// system include files
+
+// user include files
+#include "SimG4Core/SensitiveDetector/interface/SensitiveDetectorMakerBase.h"
+#include "SimG4Core/Notification/interface/SimActivityRegistryEnroller.h"
+#include "SimG4Core/SensitiveDetector/interface/SensitiveDetectorPluginFactory.h"
+
+#include "SimG4CMS/Forward/interface/MtdSD.h"
+
+#include "FWCore/Framework/interface/EventSetup.h"
+#include "FWCore/Framework/interface/ConsumesCollector.h"
+#include "FWCore/Utilities/interface/ESGetToken.h"
+#include "FWCore/PluginManager/interface/ModuleDef.h"
+#include "FWCore/ParameterSet/interface/ParameterSet.h"
+
+class MtdSensitiveDetectorBuilder : public SensitiveDetectorMakerBase {
+public:
+  explicit MtdSensitiveDetectorBuilder(edm::ParameterSet const& p, edm::ConsumesCollector cc) {}
+
+  void beginRun(const edm::EventSetup& es) final {}
+
+  std::unique_ptr<SensitiveDetector> make(const std::string& iname,
+                                          const SensitiveDetectorCatalog& clg,
+                                          const edm::ParameterSet& p,
+                                          const SimTrackManager* man,
+                                          SimActivityRegistry& reg) const final {
+    auto sd = std::make_unique<MtdSD>(iname, clg, p, man);
+    SimActivityRegistryEnroller::enroll(reg, sd.get());
+    return sd;
+  }
+};
+
+typedef MtdSD MtdSensitiveDetector;
+DEFINE_SENSITIVEDETECTORBUILDER(MtdSensitiveDetectorBuilder, MtdSensitiveDetector);

SimG4CMS/Forward/plugins/PLTSensitiveDetectorBuilder.cc

@@ -0,0 +1,34 @@
+// system include files
+
+// user include files
+#include "SimG4Core/SensitiveDetector/interface/SensitiveDetectorMakerBase.h"
+#include "SimG4Core/Notification/interface/SimActivityRegistryEnroller.h"
+#include "SimG4Core/SensitiveDetector/interface/SensitiveDetectorPluginFactory.h"
+
+#include "SimG4CMS/Forward/interface/PltSD.h"
+
+#include "FWCore/Framework/interface/EventSetup.h"
+#include "FWCore/Framework/interface/ConsumesCollector.h"
+#include "FWCore/Utilities/interface/ESGetToken.h"
+#include "FWCore/PluginManager/interface/ModuleDef.h"
+#include "FWCore/ParameterSet/interface/ParameterSet.h"
+
+class PLTSensitiveDetectorBuilder : public SensitiveDetectorMakerBase {
+public:
+  explicit PLTSensitiveDetectorBuilder(edm::ParameterSet const& p, edm::ConsumesCollector cc) {}
+
+  void beginRun(const edm::EventSetup& es) final {}
+
+  std::unique_ptr<SensitiveDetector> make(const std::string& iname,
+                                          const SensitiveDetectorCatalog& clg,
+                                          const edm::ParameterSet& p,
+                                          const SimTrackManager* man,
+                                          SimActivityRegistry& reg) const final {
+    auto sd = std::make_unique<PltSD>(iname, clg, p, man);
+    SimActivityRegistryEnroller::enroll(reg, sd.get());
+    return sd;
+  }
+};
+
+typedef PltSD PLTSensitiveDetector;
+DEFINE_SENSITIVEDETECTORBUILDER(PLTSensitiveDetectorBuilder, PLTSensitiveDetector);

SimG4CMS/Forward/plugins/TotemT2ScintSensitiveDetectorBuilder.cc

@@ -0,0 +1,34 @@
+// system include files
+
+// user include files
+#include "SimG4Core/SensitiveDetector/interface/SensitiveDetectorMakerBase.h"
+#include "SimG4Core/Notification/interface/SimActivityRegistryEnroller.h"
+#include "SimG4Core/SensitiveDetector/interface/SensitiveDetectorPluginFactory.h"
+
+#include "SimG4CMS/Forward/interface/TotemT2ScintSD.h"
+
+#include "FWCore/Framework/interface/EventSetup.h"
+#include "FWCore/Framework/interface/ConsumesCollector.h"
+#include "FWCore/Utilities/interface/ESGetToken.h"
+#include "FWCore/PluginManager/interface/ModuleDef.h"
+#include "FWCore/ParameterSet/interface/ParameterSet.h"
+
+class TotemT2ScintSensitiveDetectorBuilder : public SensitiveDetectorMakerBase {
+public:
+  explicit TotemT2ScintSensitiveDetectorBuilder(edm::ParameterSet const& p, edm::ConsumesCollector cc) {}
+
+  void beginRun(const edm::EventSetup& es) final {}
+
+  std::unique_ptr<SensitiveDetector> make(const std::string& iname,
+                                          const SensitiveDetectorCatalog& clg,
+                                          const edm::ParameterSet& p,
+                                          const SimTrackManager* man,
+                                          SimActivityRegistry& reg) const final {
+    auto sd = std::make_unique<TotemT2ScintSD>(iname, clg, p, man);
+    SimActivityRegistryEnroller::enroll(reg, sd.get());
+    return sd;
+  }
+};
+
+typedef TotemT2ScintSD TotemT2ScintSensitiveDetector;
+DEFINE_SENSITIVEDETECTORBUILDER(TotemT2ScintSensitiveDetectorBuilder, TotemT2ScintSensitiveDetector);

SimG4CMS/Forward/plugins/module.cc

@@ -2,33 +2,12 @@
 #include "SimG4CMS/Forward/interface/CastorTestAnalysis.h"
 #include "SimG4CMS/Forward/interface/ZdcTestAnalysis.h"
 #include "SimG4CMS/Forward/interface/DoCastorAnalysis.h"
-#include "SimG4CMS/Forward/interface/PltSD.h"
-#include "SimG4CMS/Forward/interface/MtdSD.h"
-#include "SimG4CMS/Forward/interface/TotemT2ScintSD.h"
-
 #include "SimG4CMS/Forward/interface/BscTest.h"
-#include "SimG4CMS/Forward/interface/BscSD.h"
-#include "SimG4CMS/Forward/interface/BHMSD.h"
-#include "SimG4CMS/Forward/interface/Bcm1fSD.h"
-
 #include "SimG4CMS/Forward/plugins/SimG4FluxProducer.h"
 
-#include "SimG4Core/SensitiveDetector/interface/SensitiveDetectorPluginFactory.h"
 #include "SimG4Core/Watcher/interface/SimWatcherFactory.h"
 #include "FWCore/PluginManager/interface/ModuleDef.h"
 
-typedef BscSD BSCSensitiveDetector;
-DEFINE_SENSITIVEDETECTOR(BSCSensitiveDetector);
-typedef BHMSD BHMSensitiveDetector;
-DEFINE_SENSITIVEDETECTOR(BHMSensitiveDetector);
-typedef MtdSD MtdSensitiveDetector;
-DEFINE_SENSITIVEDETECTOR(MtdSensitiveDetector);
-typedef PltSD PLTSensitiveDetector;
-DEFINE_SENSITIVEDETECTOR(PLTSensitiveDetector);
-typedef Bcm1fSD BCM1FSensitiveDetector;
-DEFINE_SENSITIVEDETECTOR(BCM1FSensitiveDetector);
-typedef TotemT2ScintSD TotemT2ScintSensitiveDetector;
-DEFINE_SENSITIVEDETECTOR(TotemT2ScintSensitiveDetector);
 DEFINE_SIMWATCHER(CastorTestAnalysis);
 DEFINE_SIMWATCHER(ZdcTestAnalysis);
 DEFINE_SIMWATCHER(DoCastorAnalysis);

SimG4CMS/Forward/src/BHMSD.cc

@@ -1,19 +1,15 @@
 #include "SimG4CMS/Forward/interface/BHMSD.h"
 #include "SimG4CMS/Forward/interface/BHMNumberingScheme.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"
 
 #include "G4Step.hh"
 
 #include <iostream>
 
-//#define debug
 //-------------------------------------------------------------------
 BHMSD::BHMSD(const std::string& name,
-             const edm::EventSetup& es,
              const SensitiveDetectorCatalog& clg,
              edm::ParameterSet const& p,
              const SimTrackManager* manager)
@@ -25,7 +21,7 @@ BHMSD::BHMSD(const std::string& name,
   SetVerboseLevel(verbn);
 
   if (verbn > 0) {
-    edm::LogInfo("BHMSim") << "name = " << name << " and new BHMNumberingScheme";
+    edm::LogVerbatim("BHMSim") << "name = " << name << " and new BHMNumberingScheme";
   }
   numberingScheme = new BHMNumberingScheme();
 }

SimG4CMS/Forward/src/Bcm1fSD.cc

@@ -12,9 +12,6 @@
 
 #include "SimG4Core/Notification/interface/TrackInformation.h"
 
-#include "FWCore/Framework/interface/ESTransientHandle.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"
 
@@ -32,7 +29,6 @@
 #include "CLHEP/Units/GlobalSystemOfUnits.h"
 
 Bcm1fSD::Bcm1fSD(const std::string& name,
-                 const edm::EventSetup& es,
                  const SensitiveDetectorCatalog& clg,
                  edm::ParameterSet const& p,
                  const SimTrackManager* manager)