Merge branch 'main' into gx2f-root-nupdate

acts-project · Nov 22, 2023 · db1956b · db1956b
2 parents a8e1f81 + a560e7c
commit db1956b
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 4 deletions.
diff --git a/Core/src/Detector/MultiWireStructureBuilder.cpp b/Core/src/Detector/MultiWireStructureBuilder.cpp
@@ -116,14 +116,15 @@ Acts::Experimental::MultiWireStructureBuilder::MultiWireStructureBuilder(
 Acts::Experimental::DetectorComponent
 Acts::Experimental::MultiWireStructureBuilder::construct(
     const Acts::GeometryContext& gctx) {
-  if (mCfg.mlBounds.size() != 3u) {
+  if (mCfg.mlBounds.size() != 4u) {
     throw std::invalid_argument(
-        "MultiWireStructureBuilder: Invalid dimension for bounds.");
+        "MultiWireStructureBuilder: Invalid dimension for bounds. Trapezoid "
+        "Volume Bounds are supported.");
   }
 
   // Configure the external structure builder for the internal structure
   Acts::Experimental::VolumeStructureBuilder::Config vsConfig;
-  vsConfig.boundsType = Acts::VolumeBounds::eCuboid;
+  vsConfig.boundsType = Acts::VolumeBounds::eTrapezoid;
   vsConfig.transform = mCfg.transform;
   vsConfig.boundValues = mCfg.mlBounds;
   vsConfig.auxiliary = "Construct External Structure";

diff --git a/Tests/UnitTests/Core/Detector/MultiWireStructureBuilderTests.cpp b/Tests/UnitTests/Core/Detector/MultiWireStructureBuilderTests.cpp
@@ -63,6 +63,7 @@ BOOST_AUTO_TEST_CASE(Multi_Wire_Structure_Builder_StrawSurfacesCreation) {
   }
 
   std::vector<ActsScalar> vBounds = {0.5 * nSurfacesX * 2 * radius,
+                                     0.5 * nSurfacesX * 2 * radius,
                                      0.5 * nSurfacesY * 2 * radius, halfZ};
 
   MultiWireStructureBuilder::Config mlCfg;

diff --git a/Tests/UnitTests/Core/Navigation/MultiWireNavigationTests.cpp b/Tests/UnitTests/Core/Navigation/MultiWireNavigationTests.cpp
@@ -71,6 +71,7 @@ BOOST_AUTO_TEST_CASE(Navigation_in_Indexed_Surfaces) {
   }
 
   std::vector<ActsScalar> vBounds = {0.5 * nSurfacesX * 2 * radius,
+                                     0.5 * nSurfacesX * 2 * radius,
                                      0.5 * nSurfacesY * 2 * radius, halfZ};
 
   MultiWireStructureBuilder::Config mlCfg;
@@ -89,7 +90,7 @@ BOOST_AUTO_TEST_CASE(Navigation_in_Indexed_Surfaces) {
 
   Acts::Experimental::NavigationState nState;
   nState.position = Acts::Vector3(0., -60., 0.);
-  nState.direction = Acts::Vector3(-1., 1., 0.);
+  nState.direction = Acts::Vector3(0., 1., 0.);
 
   nState.currentVolume = volumes.front().get();
   nState.currentVolume->updateNavigationState(tContext, nState);