fixes and ref updates

acts-project · Dec 19, 2024 · c6a4219 · c6a4219
1 parent 5727270
commit c6a4219
Show file tree

Hide file tree

Showing 3 changed files with 395 additions and 385 deletions.
diff --git a/Core/include/Acts/Surfaces/BoundaryTolerance.hpp b/Core/include/Acts/Surfaces/BoundaryTolerance.hpp
@@ -72,6 +72,10 @@ class BoundaryTolerance {
         throw std::invalid_argument(
             "AbsoluteBound: Tolerance must be non-negative");
       }
+      if ((tolerance0 == 0) != (tolerance1 == 0)) {
+        throw std::invalid_argument(
+            "AbsoluteBound: Both tolerances must be zero or non-zero");
+      }
     }
   };
 

diff --git a/Core/src/Surfaces/TrapezoidBounds.cpp b/Core/src/Surfaces/TrapezoidBounds.cpp
@@ -75,12 +75,17 @@ Vector2 TrapezoidBounds::closestPoint(
   const double hlXnY = get(TrapezoidBounds::eHalfLengthXnegY);
   const double hlXpY = get(TrapezoidBounds::eHalfLengthXposY);
   const double hlY = get(TrapezoidBounds::eHalfLengthY);
+  const double rotAngle = get(TrapezoidBounds::eRotationAngle);
+
+  const Vector2 extPosition = Eigen::Rotation2Dd(rotAngle) * lposition;
 
   Vector2 vertices[] = {
       {-hlXnY, -hlY}, {hlXnY, -hlY}, {hlXpY, hlY}, {-hlXpY, hlY}};
 
-  return detail::VerticesHelper::computeClosestPointOnPolygon(
-      lposition, vertices, metric.value_or(SquareMatrix2::Identity()));
+  Vector2 extClosest = detail::VerticesHelper::computeClosestPointOnPolygon(
+      extPosition, vertices, metric.value_or(SquareMatrix2::Identity()));
+
+  return Eigen::Rotation2Dd(-rotAngle) * extClosest;
 }
 
 std::vector<Vector2> TrapezoidBounds::vertices(