fix: Add envelope to CuboidVolumeBuilder (#2542)

I noticed that the `CuboidVolumeBuilder` is not generating any envelope around the generated layer which results in overlapping surfaces which does not play nicely with navigation. discovered in #2532
acts-project · Oct 13, 2023 · 98f36a0 · 98f36a0
1 parent 43411f1
commit 98f36a0
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 3 deletions.
diff --git a/Core/src/Geometry/CuboidVolumeBuilder.cpp b/Core/src/Geometry/CuboidVolumeBuilder.cpp
@@ -169,6 +169,9 @@ std::shared_ptr<Acts::TrackingVolume> Acts::CuboidVolumeBuilder::buildVolume(
 
     LayerConfig lCfg;
     lCfg.surfaceCfg = {sCfg};
+    lCfg.envelopeX = {0.1 * UnitConstants::mm, 0.1 * UnitConstants::mm};
+    lCfg.envelopeY = {0.1 * UnitConstants::mm, 0.1 * UnitConstants::mm};
+    lCfg.envelopeZ = {0.1 * UnitConstants::mm, 0.1 * UnitConstants::mm};
 
     cfg.layerCfg.push_back(lCfg);
   }

diff --git a/Core/src/Geometry/LayerCreator.cpp b/Core/src/Geometry/LayerCreator.cpp
@@ -87,7 +87,6 @@ Acts::MutableLayerPtr Acts::LayerCreator::cylinderLayer(
   // correctly defined using the halflength
   Translation3 addTranslation(0., 0., 0.);
   if (transform.isApprox(Transform3::Identity())) {
-    // double shift = -(layerZ + envZShift);
     addTranslation = Translation3(0., 0., layerZ);
     ACTS_VERBOSE(" - layer z shift  = " << -layerZ);
   }
@@ -344,11 +343,14 @@ Acts::MutableLayerPtr Acts::LayerCreator::planeLayer(
       layerThickness = (protoLayer.max(binY) - protoLayer.min(binY));
       break;
     }
-    default: {
+    case BinningValue::binZ: {
       layerHalf1 = 0.5 * (protoLayer.max(binX) - protoLayer.min(binX));
       layerHalf2 = 0.5 * (protoLayer.max(binY) - protoLayer.min(binY));
       layerThickness = (protoLayer.max(binZ) - protoLayer.min(binZ));
+      break;
     }
+    default:
+      throw std::invalid_argument("Invalid binning value");
   }
 
   double centerX = 0.5 * (protoLayer.max(binX) + protoLayer.min(binX));
@@ -363,13 +365,15 @@ Acts::MutableLayerPtr Acts::LayerCreator::planeLayer(
   ACTS_VERBOSE(" - from Y min/max   = " << protoLayer.min(binY) << " / "
                                         << protoLayer.max(binY));
   ACTS_VERBOSE(" - with Z thickness = " << layerThickness);
+  ACTS_VERBOSE("   - incl envelope  = " << protoLayer.envelope[bValue][0u]
+                                        << " / "
+                                        << protoLayer.envelope[bValue][1u]);
 
   // create the layer transforms if not given
   // we need to transform in case centerX/centerY/centerZ != 0, so that the
   // layer will be correctly defined
   Translation3 addTranslation(0., 0., 0.);
   if (transform.isApprox(Transform3::Identity())) {
-    // double shift = (layerZ + envZShift);
     addTranslation = Translation3(centerX, centerY, centerZ);
     ACTS_VERBOSE(" - layer shift  = "
                  << "(" << centerX << ", " << centerY << ", " << centerZ