draft

acts-project · May 18, 2022 · 82ee21c · 82ee21c
1 parent 1915fad
commit 82ee21c
Show file tree

Hide file tree

Showing 16 changed files with 38 additions and 28 deletions.
diff --git a/Examples/Detectors/DD4hepDetector/include/ActsExamples/DD4hepDetector/DD4hepDetector.hpp b/Examples/Detectors/DD4hepDetector/include/ActsExamples/DD4hepDetector/DD4hepDetector.hpp
@@ -15,15 +15,23 @@
 #include <memory>
 #include <vector>
 
-struct DD4hepDetector : public ActsExamples::IBaseDetector {
+namespace ActsExamples {
+namespace DD4hep {
+
+struct DD4hepDetector : public IBaseDetector {
+  std::shared_ptr<DD4hepGeometryService> geometryService;
+
   void addOptions(
       boost::program_options::options_description& opt) const override;
 
-  std::pair<ActsExamples::IBaseDetector::TrackingGeometryPtr, ContextDecorators>
+  std::pair<IBaseDetector::TrackingGeometryPtr, ContextDecorators>
   finalize(const boost::program_options::variables_map& vm,
            std::shared_ptr<const Acts::IMaterialDecorator> mdecorator) override;
 
-  std::pair<ActsExamples::IBaseDetector::TrackingGeometryPtr, ContextDecorators>
-  finalize(ActsExamples::DD4hep::DD4hepGeometryService::Config cfg,
+  std::pair<IBaseDetector::TrackingGeometryPtr, ContextDecorators>
+  finalize(DD4hepGeometryService::Config cfg,
            std::shared_ptr<const Acts::IMaterialDecorator> mdecorator);
 };
+
+}
+}
diff --git a/Examples/Detectors/DD4hepDetector/src/DD4hepDetector.cpp b/Examples/Detectors/DD4hepDetector/src/DD4hepDetector.cpp
@@ -16,6 +16,9 @@
 
 #include <boost/program_options.hpp>
 
+namespace ActsExamples {
+namespace DD4hep {
+
 void DD4hepDetector::addOptions(
     boost::program_options::options_description& opt) const {
   ActsExamples::Options::addDD4hepOptions(opt);
@@ -37,10 +40,10 @@ auto DD4hepDetector::finalize(
     -> std::pair<TrackingGeometryPtr, ContextDecorators> {
   Acts::GeometryContext dd4HepContext;
   config.matDecorator = mdecorator;
-  auto geometrySvc =
+  geometryService =
       std::make_shared<ActsExamples::DD4hep::DD4hepGeometryService>(config);
   TrackingGeometryPtr dd4tGeometry =
-      geometrySvc->trackingGeometry(dd4HepContext);
+      geometryService->trackingGeometry(dd4HepContext);
   if (!dd4tGeometry) {
     throw std::runtime_error{
         "Did not receive tracking geometry from DD4hep geometry service"};
@@ -50,3 +53,6 @@ auto DD4hepDetector::finalize(
   return std::make_pair<TrackingGeometryPtr, ContextDecorators>(
       std::move(dd4tGeometry), std::move(dd4ContextDeocrators));
 }
+
+}
+}
diff --git a/Examples/Io/EDM4hep/include/ActsExamples/Io/EDM4hep/EDM4hepSimHitReader.hpp b/Examples/Io/EDM4hep/include/ActsExamples/Io/EDM4hep/EDM4hepSimHitReader.hpp
@@ -29,7 +29,7 @@ class EDM4hepSimHitReader final : public IReader {
     std::string inputPath;
     /// Output simulated (truth) hits collection.
     std::string outputSimHits;
-
+    /// DD4hep geometry service for cellID resolution.
     std::shared_ptr<DD4hep::DD4hepGeometryService> dd4hepGeometryService;
   };
 

diff --git a/Examples/Io/EDM4hep/src/EDM4hepSimHitReader.cpp b/Examples/Io/EDM4hep/src/EDM4hepSimHitReader.cpp
@@ -49,13 +49,6 @@ ActsFatras::Hit convertEDM4hepSimHit(
     ActsExamples::DD4hep::DD4hepGeometryService &geometryService) {
   std::ofstream debug("/home/andreas/debug.txt", std::ios::app);
 
-  try {
-    auto test = geometryService.lcdd()->volumeManager().lookupDetElement(1250572);
-    debug << "EDM4hep found test " << test.volumeID() << std::endl;
-  } catch (...) {
-    debug << "EDM4hep test failed" << std::endl;
-  }
-
   debug << "EDM4hep convert cell id " << sth.getCellID() << std::endl;
 
   try {

diff --git a/Examples/Python/src/DD4hepComponent.cpp b/Examples/Python/src/DD4hepComponent.cpp
@@ -46,13 +46,16 @@ PYBIND11_MODULE(ActsPythonBindingsDD4hep, m) {
   }
 
   {
-    auto gd = py::class_<DD4hepDetector, std::shared_ptr<DD4hepDetector>>(
+    auto gd = py::class_<DD4hep::DD4hepDetector, std::shared_ptr<DD4hep::DD4hepDetector>>(
                   m, "DD4hepDetector")
                   .def(py::init<>())
                   .def("finalize",
                        py::overload_cast<
                            DD4hep::DD4hepGeometryService::Config,
                            std::shared_ptr<const Acts::IMaterialDecorator>>(
-                           &DD4hepDetector::finalize));
+                           &DD4hep::DD4hepDetector::finalize));
+    ACTS_PYTHON_STRUCT_BEGIN(gd, DD4hep::DD4hepDetector);
+    ACTS_PYTHON_MEMBER(geometryService);
+    ACTS_PYTHON_STRUCT_END();
   }
-}
+}
diff --git a/Examples/Python/tests/test_reader.py b/Examples/Python/tests/test_reader.py
@@ -327,7 +327,7 @@ def test_edm4hep_simhits_reader(conf_const):
             EDM4hepSimHitReader,
             level=acts.logging.INFO,
             inputPath=str(  # TODO
-                "/home/andreas/cern/source/OpenDataDetector/output_edm4hep.root"
+                "/home/andreas/cern/output_edm4hep.root"
             ),
             outputSimHits="simhits",
             dd4hepGeometryService=geometryService,

diff --git a/Examples/Run/Digitization/DD4hep/DD4hepDigitizationConfigExample.cpp b/Examples/Run/Digitization/DD4hep/DD4hepDigitizationConfigExample.cpp
@@ -12,5 +12,5 @@
 
 int main(int argc, char* argv[]) {
   return runDigitizationConfigExample(argc, argv,
-                                      std::make_shared<DD4hepDetector>());
+                                      std::make_shared<ActsExamples::DD4hep::DD4hepDetector>());
 }
diff --git a/Examples/Run/Digitization/DD4hep/DD4hepDigitizationExample.cpp b/Examples/Run/Digitization/DD4hep/DD4hepDigitizationExample.cpp
@@ -11,5 +11,5 @@
 #include "DigitizationExample.hpp"
 
 int main(int argc, char* argv[]) {
-  return runDigitizationExample(argc, argv, std::make_shared<DD4hepDetector>());
+  return runDigitizationExample(argc, argv, std::make_shared<ActsExamples::DD4hep::DD4hepDetector>());
 }
diff --git a/Examples/Run/Fatras/DD4hep/DD4hepFatrasExample.cpp b/Examples/Run/Fatras/DD4hep/DD4hepFatrasExample.cpp
@@ -11,5 +11,5 @@
 #include "Fatras.hpp"
 
 int main(int argc, char* argv[]) {
-  return runFatras(argc, argv, std::make_shared<DD4hepDetector>());
+  return runFatras(argc, argv, std::make_shared<ActsExamples::DD4hep::DD4hepDetector>());
 }
diff --git a/Examples/Run/Geometry/DD4hep/DD4hepGeometryExample.cpp b/Examples/Run/Geometry/DD4hep/DD4hepGeometryExample.cpp
@@ -15,7 +15,7 @@
 /// @param argv The argument list
 int main(int argc, char* argv[]) {
   // --------------------------------------------------------------------------------
-  DD4hepDetector detector;
+  ActsExamples::DD4hep::DD4hepDetector detector;
   // now process it
   return processGeometry(argc, argv, detector);
 }
diff --git a/Examples/Run/MaterialMapping/DD4hep/DD4hepMaterialMapping.cpp b/Examples/Run/MaterialMapping/DD4hep/DD4hepMaterialMapping.cpp
@@ -15,7 +15,7 @@
 /// @param argv The argument list
 int main(int argc, char* argv[]) {
   // --------------------------------------------------------------------------------
-  DD4hepDetector detector;
+  ActsExamples::DD4hep::DD4hepDetector detector;
   // now process it
   return runMaterialMapping(argc, argv, detector);
 }
diff --git a/Examples/Run/MaterialMapping/DD4hep/DD4hepMaterialValidation.cpp b/Examples/Run/MaterialMapping/DD4hep/DD4hepMaterialValidation.cpp
@@ -15,7 +15,7 @@
 /// @param argv The argument list
 int main(int argc, char* argv[]) {
   // --------------------------------------------------------------------------------
-  DD4hepDetector detector;
+  ActsExamples::DD4hep::DD4hepDetector detector;
   // now process it
   return materialValidationExample(argc, argv, detector);
 }
diff --git a/Examples/Run/Propagation/DD4hep/DD4hepPropagationExample.cpp b/Examples/Run/Propagation/DD4hep/DD4hepPropagationExample.cpp
@@ -15,7 +15,7 @@
 /// @param argv The argument list
 int main(int argc, char* argv[]) {
   // --------------------------------------------------------------------------------
-  DD4hepDetector detector;
+  ActsExamples::DD4hep::DD4hepDetector detector;
 
   // now process it
   return propagationExample(argc, argv, detector);

diff --git a/Examples/Run/Reconstruction/DD4hep/DD4hepRecCKFTracks.cpp b/Examples/Run/Reconstruction/DD4hep/DD4hepRecCKFTracks.cpp
@@ -11,5 +11,5 @@
 #include "RecCKFTracks.hpp"
 
 int main(int argc, char* argv[]) {
-  return runRecCKFTracks(argc, argv, std::make_shared<DD4hepDetector>());
+  return runRecCKFTracks(argc, argv, std::make_shared<ActsExamples::DD4hep::DD4hepDetector>());
 }
diff --git a/Examples/Run/Reconstruction/DD4hep/DD4hepRecTruthTracks.cpp b/Examples/Run/Reconstruction/DD4hep/DD4hepRecTruthTracks.cpp
@@ -11,5 +11,5 @@
 #include "RecTruthTracks.hpp"
 
 int main(int argc, char* argv[]) {
-  return runRecTruthTracks(argc, argv, std::make_shared<DD4hepDetector>());
+  return runRecTruthTracks(argc, argv, std::make_shared<ActsExamples::DD4hep::DD4hepDetector>());
 }
diff --git a/Examples/Run/Reconstruction/DD4hep/DD4hepSeedingExample.cpp b/Examples/Run/Reconstruction/DD4hep/DD4hepSeedingExample.cpp
@@ -11,5 +11,5 @@
 #include "SeedingExample.hpp"
 
 int main(int argc, char* argv[]) {
-  return runSeedingExample(argc, argv, std::make_shared<DD4hepDetector>());
+  return runSeedingExample(argc, argv, std::make_shared<ActsExamples::DD4hep::DD4hepDetector>());
 }