feat: make layer envelope configurable in Gen1 geometry building (#4067)

Add a possibililty to configure layer envelopes in the `LayerCreator`. Since this is gonna be deprecated anyways rather soon, not big effort wrt consistent configuration was made.
acts-project · Feb 4, 2025 · 51ed39b · 51ed39b
1 parent 58f34e2
commit 51ed39b
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 2 deletions.
diff --git a/Core/include/Acts/Geometry/LayerCreator.hpp b/Core/include/Acts/Geometry/LayerCreator.hpp
@@ -51,8 +51,10 @@ class LayerCreator {
     double cylinderZtolerance{10.};
     /// cylinder module phi tolerance: it counts as same phi, if ...
     double cylinderPhiTolerance{0.1};
-    /// standard constructor
-    Config() = default;
+    /// Default z envelope. Can be overridden by proto layer
+    Envelope defaultEnvelopeZ = zeroEnvelope;
+    /// Default r envelope. Can be overridden by proto layer
+    Envelope defaultEnvelopeR = zeroEnvelope;
   };
 
   /// Constructor

diff --git a/Core/src/Geometry/LayerCreator.cpp b/Core/src/Geometry/LayerCreator.cpp
@@ -57,6 +57,10 @@ Acts::MutableLayerPtr Acts::LayerCreator::cylinderLayer(
     const Transform3& transform, std::unique_ptr<ApproachDescriptor> ad) const {
   ProtoLayer protoLayer =
       _protoLayer ? *_protoLayer : ProtoLayer(gctx, surfaces);
+  if (!_protoLayer) {
+    protoLayer.envelope[AxisDirection::AxisR] = m_cfg.defaultEnvelopeR;
+    protoLayer.envelope[AxisDirection::AxisZ] = m_cfg.defaultEnvelopeZ;
+  }
 
   // Remaining layer parameters - they include the envelopes
   double layerR = protoLayer.medium(AxisDirection::AxisR);
@@ -130,6 +134,10 @@ Acts::MutableLayerPtr Acts::LayerCreator::cylinderLayer(
     const Transform3& transform, std::unique_ptr<ApproachDescriptor> ad) const {
   ProtoLayer protoLayer =
       _protoLayer ? *_protoLayer : ProtoLayer(gctx, surfaces);
+  if (!_protoLayer) {
+    protoLayer.envelope[AxisDirection::AxisR] = m_cfg.defaultEnvelopeR;
+    protoLayer.envelope[AxisDirection::AxisZ] = m_cfg.defaultEnvelopeZ;
+  }
 
   // remaining layer parameters
   double layerR = protoLayer.medium(AxisDirection::AxisR);
@@ -204,6 +212,10 @@ Acts::MutableLayerPtr Acts::LayerCreator::discLayer(
     const Transform3& transform, std::unique_ptr<ApproachDescriptor> ad) const {
   ProtoLayer protoLayer =
       _protoLayer ? *_protoLayer : ProtoLayer(gctx, surfaces);
+  if (!_protoLayer) {
+    protoLayer.envelope[AxisDirection::AxisR] = m_cfg.defaultEnvelopeR;
+    protoLayer.envelope[AxisDirection::AxisZ] = m_cfg.defaultEnvelopeZ;
+  }
 
   double layerZ = protoLayer.medium(AxisDirection::AxisZ);
   double layerThickness = protoLayer.range(AxisDirection::AxisZ);
@@ -270,6 +282,10 @@ Acts::MutableLayerPtr Acts::LayerCreator::discLayer(
     const Transform3& transform, std::unique_ptr<ApproachDescriptor> ad) const {
   ProtoLayer protoLayer =
       _protoLayer ? *_protoLayer : ProtoLayer(gctx, surfaces);
+  if (!_protoLayer) {
+    protoLayer.envelope[AxisDirection::AxisR] = m_cfg.defaultEnvelopeR;
+    protoLayer.envelope[AxisDirection::AxisZ] = m_cfg.defaultEnvelopeZ;
+  }
 
   double layerZ = protoLayer.medium(AxisDirection::AxisZ);
   double layerThickness = protoLayer.range(AxisDirection::AxisZ);
@@ -334,6 +350,10 @@ Acts::MutableLayerPtr Acts::LayerCreator::planeLayer(
     std::unique_ptr<ApproachDescriptor> ad) const {
   ProtoLayer protoLayer =
       _protoLayer ? *_protoLayer : ProtoLayer(gctx, surfaces);
+  if (!_protoLayer) {
+    protoLayer.envelope[AxisDirection::AxisR] = m_cfg.defaultEnvelopeR;
+    protoLayer.envelope[AxisDirection::AxisZ] = m_cfg.defaultEnvelopeZ;
+  }
 
   // remaining layer parameters
   double layerHalf1 = 0, layerHalf2 = 0, layerThickness = 0;

diff --git a/Examples/Python/src/GeometryBuildingGen1.cpp b/Examples/Python/src/GeometryBuildingGen1.cpp
@@ -58,6 +58,8 @@ void addGeometryBuildingGen1(Context &ctx) {
     ACTS_PYTHON_MEMBER(surfaceArrayCreator);
     ACTS_PYTHON_MEMBER(cylinderZtolerance);
     ACTS_PYTHON_MEMBER(cylinderPhiTolerance);
+    ACTS_PYTHON_MEMBER(defaultEnvelopeR);
+    ACTS_PYTHON_MEMBER(defaultEnvelopeZ);
     ACTS_PYTHON_STRUCT_END();
   }