Merge branch 'main' into feat/obj-objects

acts-project · Oct 7, 2024 · 8535403 · 8535403
2 parents 6187dbc + 26a4a8f
commit 8535403
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/Examples/Python/src/Geant4Component.cpp b/Examples/Python/src/Geant4Component.cpp
@@ -334,7 +334,8 @@ PYBIND11_MODULE(ActsPythonBindingsGeant4, mod) {
                                   const std::vector<std::string>&
                                       sensitiveMatches,
                                   const std::vector<std::string>&
-                                      passiveMatches) {
+                                      passiveMatches,
+                                  bool convertMaterial) {
       // Initiate the detector construction & retrieve world
       ActsExamples::GdmlDetectorConstruction gdmlContruction(gdmlFileName);
       const auto* world = gdmlContruction.Construct();
@@ -351,6 +352,7 @@ PYBIND11_MODULE(ActsPythonBindingsGeant4, mod) {
       Acts::Geant4DetectorSurfaceFactory::Options options;
       options.sensitiveSurfaceSelector = sensitiveSelectors;
       options.passiveSurfaceSelector = passiveSelectors;
+      options.convertMaterial = convertMaterial;
 
       G4Transform3D nominal;
       Acts::Geant4DetectorSurfaceFactory factory;

diff --git a/Plugins/Geant4/include/Acts/Plugins/Geant4/Geant4DetectorSurfaceFactory.hpp b/Plugins/Geant4/include/Acts/Plugins/Geant4/Geant4DetectorSurfaceFactory.hpp
@@ -67,7 +67,7 @@ class Geant4DetectorSurfaceFactory {
     /// Convert the length scale
     ActsScalar scaleConversion = 1.;
     /// Convert the material
-    bool convertMaterial = true;
+    bool convertMaterial = false;
     /// Converted material thickness (< 0 indicates keeping original thickness)
     ActsScalar convertedMaterialThickness = -1;
     /// A selector for sensitive surfaces