Merge branch 'main' into ex-fix-sequencer-timing-csv

CI/physmon/workflows/physmon_simulation.py

@@ -98,7 +98,6 @@
     )
 
     s.run()
-    del s
 
     for file, name in [
         (tp / "fatras" / "particles_simulation.root", "particles_fatras.root"),
@@ -134,7 +133,6 @@
     )
 
     s.run()
-    del s
 
     for file, name in [
         (tp / "pythia8_particles.root", "particles_ttbar.root"),

CI/physmon/workflows/physmon_trackfinding_1muon.py

@@ -150,7 +150,6 @@ def run_ckf_tracking(label, seeding):
         )
 
         s.run()
-        del s
 
         for file in (
             ["performance_seeding.root"]

CI/physmon/workflows/physmon_trackfinding_4muon_50vertices.py

@@ -187,7 +187,6 @@
     )
 
     s.run()
-    del s
 
     shutil.move(
         tp / "performance_ambi.root",

CI/physmon/workflows/physmon_trackfinding_ttbar_pu200.py

@@ -167,7 +167,6 @@
     )
 
     s.run()
-    del s
 
     shutil.move(
         tp / "performance_ambi.root",

CI/physmon/workflows/physmon_trackfitting_gsf.py

@@ -28,7 +28,6 @@
     )
 
     s.run()
-    del s
 
     perf_file = tp / "performance_gsf.root"
     assert perf_file.exists(), "Performance file not found"

CI/physmon/workflows/physmon_trackfitting_gx2f.py

@@ -28,7 +28,6 @@
     )
 
     s.run()
-    del s
 
     perf_file = tp / "performance_gx2f.root"
     assert perf_file.exists(), "Performance file not found"

CI/physmon/workflows/physmon_trackfitting_kf.py

@@ -28,7 +28,6 @@
     )
 
     s.run()
-    del s
 
     perf_file = tp / "performance_kf.root"
     assert perf_file.exists(), "Performance file not found"

Examples/Algorithms/Geant4/src/DDG4DetectorConstruction.cpp

@@ -42,11 +42,11 @@ G4VPhysicalVolume* ActsExamples::DDG4DetectorConstruction::Construct() {
     dd4hep::sim::Geant4Mapping& g4map = dd4hep::sim::Geant4Mapping::instance();
     auto conv = dd4hep::sim::Geant4Converter(dd4hepDetector(),
                                              dd4hep::PrintLevel::VERBOSE);
-    dd4hep::sim::Geant4GeometryInfo* geo_info =
+    dd4hep::sim::Geant4GeometryInfo* geoInfo =
         conv.create(dd4hepDetector().world()).detach();
-    g4map.attach(geo_info);
+    g4map.attach(geoInfo);
     // All volumes are deleted in ~G4PhysicalVolumeStore()
-    m_world = geo_info->world();
+    m_world = geoInfo->world();
     // Create Geant4 volume manager
     g4map.volumeManager();
 

Examples/Detectors/DD4hepDetector/CMakeLists.txt

@@ -3,16 +3,15 @@ add_library(
   src/DD4hepDetector.cpp
   src/DD4hepGeometryService.cpp)
 
-
 target_include_directories(
   ActsExamplesDetectorDD4hep
   PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>)
 target_link_libraries(
   ActsExamplesDetectorDD4hep
   PUBLIC
-    ActsCore ActsPluginDD4hep
-    ActsExamplesFramework
-    ROOT::Geom ROOT::GenVector)
+    ActsCore
+    ActsPluginDD4hep
+    ActsExamplesFramework)
 
 if(${DD4hep_VERSION} VERSION_LESS 1.11)
   target_include_directories(ActsExamplesDetectorDD4hep PUBLIC ${DD4hep_INCLUDE_DIRS})

Examples/Detectors/DD4hepDetector/include/ActsExamples/DD4hepDetector/DD4hepDetector.hpp

@@ -1,6 +1,6 @@
 // This file is part of the Acts project.
 //
-// Copyright (C) 2018-2019 CERN for the benefit of the Acts project
+// Copyright (C) 2018-2024 CERN for the benefit of the Acts project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -59,9 +59,6 @@ struct DD4hepDetector {
   /// @brief The DD4hep geometry service
   std::shared_ptr<DD4hepGeometryService> geometryService = nullptr;
 
-  // @brief the compact file names
-  std::vector<std::string> compactFiles = {};
-
   /// @brief Build the tracking geometry from the DD4hep geometry
   ///
   /// @param config is the configuration of the geometry service
@@ -87,6 +84,8 @@ struct DD4hepDetector {
       const Acts::GeometryContext& gctx,
       const Acts::Experimental::DD4hepDetectorStructure::Options& options = {});
 
+  void drop();
+
   /// @brief Access to the DD4hep field
   /// @return a shared pointer to the DD4hep field
   std::shared_ptr<Acts::DD4hepFieldAdapter> field() const;

Examples/Detectors/DD4hepDetector/include/ActsExamples/DD4hepDetector/DD4hepGeometryService.hpp

@@ -1,6 +1,6 @@
 // This file is part of the Acts project.
 //
-// Copyright (C) 2017 CERN for the benefit of the Acts project
+// Copyright (C) 2017-2024 CERN for the benefit of the Acts project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -56,7 +56,7 @@ class DD4hepGeometryService {
     /// XML-file with the detector description
     std::vector<std::string> xmlFileNames;
     /// The name of the service
-    std::string name;
+    std::string name = "default";
     /// Binningtype in phi
     Acts::BinningType bTypePhi = Acts::equidistant;
     /// Binningtype in r
@@ -88,7 +88,11 @@ class DD4hepGeometryService {
   };
 
   DD4hepGeometryService(const Config& cfg);
+  DD4hepGeometryService(const DD4hepGeometryService&) = delete;
+  DD4hepGeometryService(DD4hepGeometryService&&) = delete;
   ~DD4hepGeometryService();
+  DD4hepGeometryService& operator=(const DD4hepGeometryService&) = delete;
+  DD4hepGeometryService& operator=(DD4hepGeometryService&&) = delete;
 
   /// Interface method to access to the DD4hep geometry
   dd4hep::Detector& detector();
@@ -107,6 +111,8 @@ class DD4hepGeometryService {
   std::shared_ptr<const Acts::TrackingGeometry> trackingGeometry(
       const Acts::GeometryContext& gctx);
 
+  void drop();
+
  private:
   /// Private method to initiate building of the DD4hep geometry
   ActsExamples::ProcessCode buildDD4hepGeometry();

Examples/Detectors/DD4hepDetector/src/DD4hepDetector.cpp

@@ -1,6 +1,6 @@
 // This file is part of the Acts project.
 //
-// Copyright (C) 2019 CERN for the benefit of the Acts project
+// Copyright (C) 2019-2024 CERN for the benefit of the Acts project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -75,6 +75,10 @@ auto DD4hepDetector::finalize(
   return {detector, contextDecorators, detectorElements};
 }
 
+void DD4hepDetector::drop() {
+  geometryService->drop();
+}
+
 std::shared_ptr<Acts::DD4hepFieldAdapter> DD4hepDetector::field() const {
   const auto& detector = geometryService->detector();
 

Examples/Detectors/DD4hepDetector/src/DD4hepGeometryService.cpp

@@ -1,6 +1,6 @@
 // This file is part of the Acts project.
 //
-// Copyright (C) 2017 CERN for the benefit of the Acts project
+// Copyright (C) 2017-2024 CERN for the benefit of the Acts project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -35,9 +35,7 @@ ActsExamples::DD4hep::DD4hepGeometryService::DD4hepGeometryService(
 }
 
 ActsExamples::DD4hep::DD4hepGeometryService::~DD4hepGeometryService() {
-  if (m_detector != nullptr) {
-    m_detector->destroyInstance();
-  }
+  drop();
 }
 
 ActsExamples::ProcessCode
@@ -133,6 +131,16 @@ ActsExamples::DD4hep::DD4hepGeometryService::trackingGeometry(
   return m_trackingGeometry;
 }
 
+void ActsExamples::DD4hep::DD4hepGeometryService::drop() {
+  if (m_detector == nullptr) {
+    return;
+  }
+  dd4hep::Detector::destroyInstance(m_cfg.name);
+  m_detector = nullptr;
+  m_geometry = dd4hep::DetElement();
+  m_trackingGeometry = nullptr;
+}
+
 void ActsExamples::DD4hep::sortFCChhDetElements(
     std::vector<dd4hep::DetElement>& det) {
   std::vector<dd4hep::DetElement> tracker;

Examples/Python/python/acts/_adapter.py

@@ -2,6 +2,7 @@
 import functools
 from typing import Optional, Callable, Dict, Any
 from pathlib import Path
+from collections import namedtuple
 
 import acts
 
@@ -117,7 +118,23 @@ def create(*args, mdecorator=None, **kwargs):
                 _kwargs[k] = v
         det = cls()
         tg, deco = det.finalize(cfg, mdecorator, *args, **_kwargs)
-        return det, tg, deco
+        Detector = namedtuple(
+            "Detector", ["detector", "trackingGeometry", "decorators"]
+        )
+
+        class DetectorContextManager(Detector):
+            def __new__(cls, detector, trackingGeometry, decorators):
+                return super(DetectorContextManager, cls).__new__(
+                    cls, detector, trackingGeometry, decorators
+                )
+
+            def __enter__(self):
+                return self
+
+            def __exit__(self, *args):
+                pass
+
+        return DetectorContextManager(det, tg, deco)
 
     return create
 

Examples/Python/python/acts/examples/dd4hep.py

@@ -12,10 +12,11 @@
     print("Error encountered importing DD4hep. Likely you need to set LD_LIBRARY_PATH.")
     sys.exit(1)
 
-from acts._adapter import _patch_config, _detector_create
+from acts._adapter import _patch_config, _detector_create, _patch_detectors
 from acts import ActsPythonBindingsDD4hep
 
 _patch_config(ActsPythonBindingsDD4hep)
+_patch_detectors(ActsPythonBindingsDD4hep)
 ActsPythonBindingsDD4hep.DD4hepDetector.create = _detector_create(
     ActsPythonBindingsDD4hep.DD4hepDetector,
     ActsPythonBindingsDD4hep.DD4hepGeometryService.Config,

Examples/Python/python/acts/examples/odd.py

@@ -1,6 +1,7 @@
 import os
 import sys
 import math
+from collections import namedtuple
 from pathlib import Path
 from typing import Optional
 import acts
@@ -99,6 +100,22 @@ def geoid_hook(geoid, surface):
             level=customLogLevel(minLevel=acts.logging.WARNING),
         )
 
-    trackingGeometry, deco = detector.finalize(dd4hepConfig, mdecorator)
+    trackingGeometry, decorators = detector.finalize(dd4hepConfig, mdecorator)
 
-    return detector, trackingGeometry, deco
+    OpenDataDetector = namedtuple(
+        "OpenDataDetector", ["detector", "trackingGeometry", "decorators"]
+    )
+
+    class OpenDataDetectorContextManager(OpenDataDetector):
+        def __new__(cls, detector, trackingGeometry, decorators):
+            return super(OpenDataDetectorContextManager, cls).__new__(
+                cls, detector, trackingGeometry, decorators
+            )
+
+        def __enter__(self):
+            return self
+
+        def __exit__(self, *args):
+            self.detector.drop()
+
+    return OpenDataDetectorContextManager(detector, trackingGeometry, decorators)

Examples/Python/src/DD4hepComponent.cpp

@@ -1,6 +1,6 @@
 // This file is part of the Acts project.
 //
-// Copyright (C) 2021 CERN for the benefit of the Acts project
+// Copyright (C) 2021-2024 CERN for the benefit of the Acts project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -36,11 +36,12 @@ using namespace Acts::Python;
 
 PYBIND11_MODULE(ActsPythonBindingsDD4hep, m) {
   {
-    using Config = ActsExamples::DD4hep::DD4hepGeometryService::Config;
+    using Config = DD4hep::DD4hepGeometryService::Config;
     auto s = py::class_<DD4hep::DD4hepGeometryService,
                         std::shared_ptr<DD4hep::DD4hepGeometryService>>(
                  m, "DD4hepGeometryService")
-                 .def(py::init<const Config&>());
+                 .def(py::init<const Config&>())
+                 .def("drop", &DD4hep::DD4hepGeometryService::drop);
 
     auto c = py::class_<Config>(s, "Config").def(py::init<>());
     ACTS_PYTHON_STRUCT_BEGIN(c, Config);
@@ -88,7 +89,7 @@ PYBIND11_MODULE(ActsPythonBindingsDD4hep, m) {
                 const auto* dd4hepDetElement =
                     dynamic_cast<const Acts::DD4hepDetectorElement*>(dde);
                 // Check if it is valid
-                if (dd4hepDetElement) {
+                if (dd4hepDetElement != nullptr) {
                   dd4hep::DDSegmentation::VolumeID dd4hepID =
                       dd4hepDetElement->sourceElement().volumeID();
                   auto geoID = surface->geometryId();
@@ -167,6 +168,7 @@ PYBIND11_MODULE(ActsPythonBindingsDD4hep, m) {
                  const Acts::GeometryContext&,
                  const Acts::Experimental::DD4hepDetectorStructure::Options&>(
                  &DD4hep::DD4hepDetector::finalize))
+        .def("drop", &DD4hep::DD4hepDetector::drop)
         .def_property_readonly("field", &DD4hep::DD4hepDetector::field);
   }
 }

Examples/Python/src/Geant4DD4hepComponent.cpp

@@ -6,7 +6,6 @@
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-#include "Acts/Utilities/TypeTraits.hpp"
 #include "ActsExamples/DD4hepDetector/DD4hepDetector.hpp"
 #include "ActsExamples/DDG4/DDG4DetectorConstruction.hpp"
 #include "ActsExamples/Framework/ProcessCode.hpp"