refactor options; fix detector creation

acts-project · Nov 22, 2024 · a13e204 · a13e204
1 parent 7d92a2e
commit a13e204
Show file tree

Hide file tree

Showing 12 changed files with 30 additions and 31 deletions.
diff --git a/Examples/Algorithms/Geant4/include/ActsExamples/Geant4/GdmlDetectorConstruction.hpp b/Examples/Algorithms/Geant4/include/ActsExamples/Geant4/GdmlDetectorConstruction.hpp
@@ -49,8 +49,7 @@ class GdmlDetectorConstructionFactory final
   explicit GdmlDetectorConstructionFactory(std::string path);
 
   std::unique_ptr<G4VUserDetectorConstruction> factorize(
-      const std::vector<std::shared_ptr<Geant4::RegionCreator>>& regionCreators)
-      const override;
+      const Options& options) const override;
 
  private:
   /// Path to the Gdml file

diff --git a/Examples/Algorithms/Geant4/src/GdmlDetectorConstruction.cpp b/Examples/Algorithms/Geant4/src/GdmlDetectorConstruction.cpp
@@ -41,10 +41,9 @@ GdmlDetectorConstructionFactory::GdmlDetectorConstructionFactory(
     : m_path(std::move(path)) {}
 
 std::unique_ptr<G4VUserDetectorConstruction>
-GdmlDetectorConstructionFactory::factorize(
-    const std::vector<std::shared_ptr<Geant4::RegionCreator>>& regionCreators)
-    const {
-  return std::make_unique<GdmlDetectorConstruction>(m_path, regionCreators);
+GdmlDetectorConstructionFactory::factorize(const Options& options) const {
+  return std::make_unique<GdmlDetectorConstruction>(m_path,
+                                                    options.regionCreators);
 }
 
 }  // namespace ActsExamples
diff --git a/Examples/Algorithms/Geant4/src/Geant4Simulation.cpp b/Examples/Algorithms/Geant4/src/Geant4Simulation.cpp
@@ -83,7 +83,8 @@ void Geant4SimulationBase::commonInitialization() {
     // G4RunManager will take care of deletion
     m_detectorConstruction =
         config()
-            .detectorConstructionFactory->factorize(config().regionCreators)
+            .detectorConstructionFactory
+            ->factorize({.regionCreators = config().regionCreators})
             .release();
     runManager().SetUserInitialization(m_detectorConstruction);
     runManager().InitializeGeometry();

diff --git a/Examples/Algorithms/Geant4HepMC/src/EventRecording.cpp b/Examples/Algorithms/Geant4HepMC/src/EventRecording.cpp
@@ -53,7 +53,8 @@ EventRecording::EventRecording(const EventRecording::Config& config,
 
   // G4RunManager deals with the lifetime of these objects
   m_runManager->SetUserInitialization(
-      m_cfg.detectorConstructionFactory->factorize(m_cfg.regionCreators)
+      m_cfg.detectorConstructionFactory
+          ->factorize({.regionCreators = m_cfg.regionCreators})
           .release());
   m_runManager->SetUserInitialization(new FTFP_BERT);
   m_runManager->SetUserAction(new Geant4::HepMC3::RunAction());

diff --git a/...tectors/Common/include/ActsExamples/DetectorCommons/Geant4DetectorConstructionFactory.hpp b/...tectors/Common/include/ActsExamples/DetectorCommons/Geant4DetectorConstructionFactory.hpp
@@ -21,11 +21,14 @@ namespace ActsExamples {
 
 class Geant4DetectorConstructionFactory {
  public:
+  struct Options {
+    std::vector<std::shared_ptr<Geant4::RegionCreator>> regionCreators;
+  };
+
   virtual ~Geant4DetectorConstructionFactory() = default;
 
   virtual std::unique_ptr<G4VUserDetectorConstruction> factorize(
-      const std::vector<std::shared_ptr<Geant4::RegionCreator>>& regionCreators)
-      const = 0;
+      const Options& options) const = 0;
 };
 
 }  // namespace ActsExamples
diff --git a/...Detectors/DD4hepDetector/include/ActsExamples/DD4hepDetector/DDG4DetectorConstruction.hpp b/...Detectors/DD4hepDetector/include/ActsExamples/DD4hepDetector/DDG4DetectorConstruction.hpp
@@ -52,8 +52,7 @@ class DDG4DetectorConstructionFactory final
       std::shared_ptr<DD4hepDetector> detector);
 
   std::unique_ptr<G4VUserDetectorConstruction> factorize(
-      const std::vector<std::shared_ptr<Geant4::RegionCreator>>& regionCreators)
-      const override;
+      const Options& options) const override;
 
  private:
   std::shared_ptr<DD4hepDetector> m_detector;

diff --git a/Examples/Detectors/DD4hepDetector/src/DDG4DetectorConstruction.cpp b/Examples/Detectors/DD4hepDetector/src/DDG4DetectorConstruction.cpp
@@ -54,10 +54,9 @@ DDG4DetectorConstructionFactory::DDG4DetectorConstructionFactory(
     : m_detector(std::move(detector)) {}
 
 std::unique_ptr<G4VUserDetectorConstruction>
-DDG4DetectorConstructionFactory::factorize(
-    const std::vector<std::shared_ptr<Geant4::RegionCreator>>& regionCreators)
-    const {
-  return std::make_unique<DDG4DetectorConstruction>(m_detector, regionCreators);
+DDG4DetectorConstructionFactory::factorize(const Options& options) const {
+  return std::make_unique<DDG4DetectorConstruction>(m_detector,
+                                                    options.regionCreators);
 }
 
 }  // namespace ActsExamples
diff --git a/...odelDetector/include/ActsExamples/GeoModelDetector/GeoModelGeant4DetectorConstruction.hpp b/...odelDetector/include/ActsExamples/GeoModelDetector/GeoModelGeant4DetectorConstruction.hpp
@@ -50,8 +50,7 @@ class GeoModelGeant4DetectorConstructionFactory final
       const Acts::GeoModelTree& geoModelTree);
 
   std::unique_ptr<G4VUserDetectorConstruction> factorize(
-      const std::vector<std::shared_ptr<Geant4::RegionCreator>>& regionCreators)
-      const override;
+      const Options& options) const override;
 
  private:
   /// The GeoModel tree

diff --git a/Examples/Detectors/GeoModelDetector/src/GeoModelGeant4DetectorConstruction.cpp b/Examples/Detectors/GeoModelDetector/src/GeoModelGeant4DetectorConstruction.cpp
@@ -53,10 +53,9 @@ GeoModelGeant4DetectorConstructionFactory::
 
 std::unique_ptr<G4VUserDetectorConstruction>
 GeoModelGeant4DetectorConstructionFactory::factorize(
-    const std::vector<std::shared_ptr<Geant4::RegionCreator>>& regionCreators)
-    const {
-  return std::make_unique<GeoModelGeant4DetectorConstruction>(m_geoModelTree,
-                                                              regionCreators);
+    const Options& options) const {
+  return std::make_unique<GeoModelGeant4DetectorConstruction>(
+      m_geoModelTree, options.regionCreators);
 }
 
 }  // namespace ActsExamples
diff --git a/...escopeDetector/include/ActsExamples/TelescopeDetector/TelescopeG4DetectorConstruction.hpp b/...escopeDetector/include/ActsExamples/TelescopeDetector/TelescopeG4DetectorConstruction.hpp
@@ -44,8 +44,7 @@ class TelescopeG4DetectorConstructionFactory final
       const TelescopeDetector::Config& cfg);
 
   std::unique_ptr<G4VUserDetectorConstruction> factorize(
-      const std::vector<std::shared_ptr<Geant4::RegionCreator>>& regionCreators)
-      const override;
+      const Options& options) const override;
 
  private:
   /// The configuration of the telescope detector

diff --git a/Examples/Detectors/TelescopeDetector/src/TelescopeG4DetectorConstruction.cpp b/Examples/Detectors/TelescopeDetector/src/TelescopeG4DetectorConstruction.cpp
@@ -168,10 +168,9 @@ TelescopeG4DetectorConstructionFactory::TelescopeG4DetectorConstructionFactory(
 
 std::unique_ptr<G4VUserDetectorConstruction>
 TelescopeG4DetectorConstructionFactory::factorize(
-    const std::vector<std::shared_ptr<Geant4::RegionCreator>>& regionCreators)
-    const {
-  return std::make_unique<TelescopeG4DetectorConstruction>(m_cfg,
-                                                           regionCreators);
+    const Options& options) const {
+  return std::make_unique<TelescopeG4DetectorConstruction>(
+      m_cfg, options.regionCreators);
 }
 
 }  // namespace ActsExamples
diff --git a/Examples/Python/python/acts/_adapter.py b/Examples/Python/python/acts/_adapter.py
@@ -114,8 +114,10 @@ def create(*args, mdecorator=None, **kwargs):
             setattr(cfg, k, v)
         if hasattr(cfg, "materialDecorator"):
             setattr(cfg, "materialDecorator", mdecorator)
-        det = cls(cfg)
-        tg, deco, _ = det.trackingGeometry()
+        detector = cls(cfg)
+        gen1holder = detector.buildGen1Geometry()
+        trackingGeometry = gen1holder.trackingGeometry
+        decorators = gen1holder.contextDecorators
         Detector = namedtuple(
             "Detector", ["detector", "trackingGeometry", "decorators"]
         )
@@ -132,7 +134,7 @@ def __enter__(self):
             def __exit__(self, *args):
                 pass
 
-        return DetectorContextManager(det, tg, deco)
+        return DetectorContextManager(detector, trackingGeometry, decorators)
 
     return create