clean

acts-project · Nov 20, 2024 · 6be1b04 · 6be1b04
1 parent a917f1c
commit 6be1b04
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 7 deletions.
diff --git a/Examples/Algorithms/Digitization/include/ActsExamples/Digitization/DigitizationConfig.hpp b/Examples/Algorithms/Digitization/include/ActsExamples/Digitization/DigitizationConfig.hpp
@@ -8,6 +8,7 @@
 
 #pragma once
 
+#include "Acts/Geometry/GeometryHierarchyMap.hpp"
 #include "ActsExamples/Digitization/GeometricConfig.hpp"
 #include "ActsExamples/Digitization/SmearingConfig.hpp"
 
@@ -23,4 +24,6 @@ struct DigiComponentsConfig {
   SmearingConfig smearingDigiConfig;
 };
 
+using DigiConfigContainer = Acts::GeometryHierarchyMap<DigiComponentsConfig>;
+
 }  // namespace ActsExamples
diff --git a/Examples/Io/Json/include/ActsExamples/Io/Json/JsonDigitizationConfig.hpp b/Examples/Io/Json/include/ActsExamples/Io/Json/JsonDigitizationConfig.hpp
@@ -42,7 +42,6 @@ void writeDigiConfigToJson(
     const Acts::GeometryHierarchyMap<DigiComponentsConfig>& cfg,
     const std::string& path);
 
-using DigiConfigContainer = Acts::GeometryHierarchyMap<DigiComponentsConfig>;
 using DigiConfigConverter =
     Acts::GeometryHierarchyMapJsonConverter<DigiComponentsConfig>;
 

diff --git a/Examples/Python/src/Digitization.cpp b/Examples/Python/src/Digitization.cpp
@@ -77,8 +77,7 @@ void addDigitization(Context& ctx) {
     ACTS_PYTHON_MEMBER(smearingDigiConfig);
     ACTS_PYTHON_STRUCT_END();
 
-    py::class_<Acts::GeometryHierarchyMap<ActsExamples::DigiComponentsConfig>>(
-        mex, "GeometryHierarchyMap_DigiComponentsConfig")
+    py::class_<DigiConfigContainer>(mex, "DigiConfigContainer")
         .def(py::init<std::vector<
                  std::pair<GeometryIdentifier, DigiComponentsConfig>>>());
   }

diff --git a/Examples/Scripts/Python/digitization_config.py b/Examples/Scripts/Python/digitization_config.py
@@ -7,7 +7,7 @@
     DigitizationConfigurator,
     writeDigiConfigToJson,
     GenericDetector,
-    GeometryHierarchyMap_DigiComponentsConfig,
+    DigiConfigContainer,
 )
 
 
@@ -27,9 +27,7 @@ def runDigitizationConfig(
 
     trackingGeometry.visitSurfaces(digiConfigurator)
 
-    outputConfig = GeometryHierarchyMap_DigiComponentsConfig(
-        digiConfigurator.outputDigiComponents
-    )
+    outputConfig = DigiConfigContainer(digiConfigurator.outputDigiComponents)
 
     writeDigiConfigToJson(outputConfig, str(output))