feat: Support negative tolerance for euclidean + chi2 tests (#4000)

acts-project · Dec 19, 2024 · 8e430f8 · 8e430f8
1 parent 72145fc
commit 8e430f8
Show file tree

Hide file tree

Showing 6 changed files with 597 additions and 156 deletions.
diff --git a/Core/include/Acts/Surfaces/BoundaryTolerance.hpp b/Core/include/Acts/Surfaces/BoundaryTolerance.hpp
@@ -67,7 +67,12 @@ class BoundaryTolerance {
 
     AbsoluteBound() = default;
     AbsoluteBound(double tolerance0_, double tolerance1_)
-        : tolerance0(tolerance0_), tolerance1(tolerance1_) {}
+        : tolerance0(tolerance0_), tolerance1(tolerance1_) {
+      if (tolerance0 < 0 || tolerance1 < 0) {
+        throw std::invalid_argument(
+            "AbsoluteBound: Tolerance must be non-negative");
+      }
+    }
   };
 
   /// Absolute tolerance in Cartesian coordinates
@@ -77,7 +82,12 @@ class BoundaryTolerance {
 
     AbsoluteCartesian() = default;
     AbsoluteCartesian(double tolerance0_, double tolerance1_)
-        : tolerance0(tolerance0_), tolerance1(tolerance1_) {}
+        : tolerance0(tolerance0_), tolerance1(tolerance1_) {
+      if (tolerance0 < 0 || tolerance1 < 0) {
+        throw std::invalid_argument(
+            "AbsoluteCartesian: Tolerance must be non-negative");
+      }
+    }
   };
 
   /// Absolute tolerance in Euclidean distance
@@ -98,6 +108,12 @@ class BoundaryTolerance {
         : maxChi2(maxChi2_), weight(weight_) {}
   };
 
+  enum class ToleranceMode {
+    Extend,  // Extend the boundary
+    None,    // No tolerance
+    Shrink   // Shrink the boundary
+  };
+
   /// Underlying variant type
   using Variant = std::variant<Infinite, None, AbsoluteBound, AbsoluteCartesian,
                                AbsoluteEuclidean, Chi2Bound>;
@@ -132,7 +148,7 @@ class BoundaryTolerance {
   bool hasChi2Bound() const;
 
   /// Check if any tolerance is set.
-  bool hasTolerance() const;
+  ToleranceMode toleranceMode() const;
 
   /// Get the tolerance as absolute bound.
   AbsoluteBound asAbsoluteBound(bool isCartesian = false) const;

diff --git a/Core/include/Acts/Surfaces/detail/BoundaryCheckHelper.hpp b/Core/include/Acts/Surfaces/detail/BoundaryCheckHelper.hpp
@@ -29,16 +29,22 @@ inline bool insideAlignedBox(const Vector2& lowerLeft,
                              const BoundaryTolerance& tolerance,
                              const Vector2& point,
                              const std::optional<SquareMatrix2>& jacobianOpt) {
+  using enum BoundaryTolerance::ToleranceMode;
+
   if (tolerance.isInfinite()) {
     return true;
   }
 
-  if (detail::VerticesHelper::isInsideRectangle(point, lowerLeft, upperRight)) {
-    return true;
+  BoundaryTolerance::ToleranceMode mode = tolerance.toleranceMode();
+  bool insideRectangle =
+      detail::VerticesHelper::isInsideRectangle(point, lowerLeft, upperRight);
+
+  if (mode == None) {
+    return insideRectangle;
   }
 
-  if (!tolerance.hasTolerance()) {
-    return false;
+  if (mode == Extend && insideRectangle) {
+    return true;
   }
 
   Vector2 closestPoint;
@@ -64,7 +70,11 @@ inline bool insideAlignedBox(const Vector2& lowerLeft,
 
   Vector2 distance = closestPoint - point;
 
-  return tolerance.isTolerated(distance, jacobianOpt);
+  if (mode == Extend) {
+    return tolerance.isTolerated(distance, jacobianOpt);
+  } else {
+    return tolerance.isTolerated(distance, jacobianOpt) && insideRectangle;
+  }
 }
 
 /// Check if a point is inside a polygon.
@@ -79,23 +89,27 @@ inline bool insidePolygon(std::span<const Vector2> vertices,
                           const BoundaryTolerance& tolerance,
                           const Vector2& point,
                           const std::optional<SquareMatrix2>& jacobianOpt) {
+  using enum BoundaryTolerance::ToleranceMode;
   if (tolerance.isInfinite()) {
     // The null boundary check always succeeds
     return true;
   }
 
-  if (detail::VerticesHelper::isInsidePolygon(point, vertices)) {
-    // If the point falls inside the polygon, the check always succeeds
-    return true;
-  }
+  BoundaryTolerance::ToleranceMode mode = tolerance.toleranceMode();
+  bool insidePolygon = detail::VerticesHelper::isInsidePolygon(point, vertices);
 
-  if (!tolerance.hasTolerance()) {
+  if (mode == None) {
+    // If the point falls inside the polygon, the check always succeeds
     // Outside of the polygon, since we've eliminated the case of an absence of
     // check above, we know we'll always fail if the tolerance is zero.
     //
     // This allows us to avoid the expensive computeClosestPointOnPolygon
     // computation in this simple case.
-    return false;
+    return insidePolygon;
+  }
+
+  if (mode == Extend && insidePolygon) {
+    return true;
   }
 
   // TODO: When tolerance is not 0, we could also avoid this computation in
@@ -112,7 +126,12 @@ inline bool insidePolygon(std::span<const Vector2> vertices,
 
   Vector2 distance = closestPoint - point;
 
-  return tolerance.isTolerated(distance, jacobianOpt);
+  if (mode == Extend) {
+    return tolerance.isTolerated(distance, jacobianOpt);
+  } else {
+    // @TODO: Check sign
+    return tolerance.isTolerated(-distance, jacobianOpt) && insidePolygon;
+  }
 }
 
 }  // namespace Acts::detail