portal: PR feedback round 2

acts-project · Aug 28, 2024 · 0292e99 · 0292e99
1 parent 15462e8
commit 0292e99
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/Core/include/Acts/Definitions/Algebra.hpp b/Core/include/Acts/Definitions/Algebra.hpp
@@ -100,4 +100,6 @@ using AngleAxis3 = Eigen::AngleAxis<ActsScalar>;
 using Transform2 = Eigen::Transform<ActsScalar, 2, Eigen::AffineCompact>;
 using Transform3 = Eigen::Transform<ActsScalar, 3, Eigen::Affine>;
 
+constexpr ActsScalar s_transformEquivalentTolerance = 1e-9;
+
 }  // namespace Acts
diff --git a/Core/src/Geometry/Portal.cpp b/Core/src/Geometry/Portal.cpp
@@ -8,6 +8,7 @@
 
 #include "Acts/Geometry/Portal.hpp"
 
+#include "Acts/Definitions/Algebra.hpp"
 #include "Acts/Geometry/GeometryContext.hpp"
 #include "Acts/Geometry/PortalLinkBase.hpp"
 #include "Acts/Geometry/TrivialPortalLink.hpp"
@@ -143,7 +144,7 @@ Result<const TrackingVolume*> Portal::resolveVolume(
     const Vector3& direction) const {
   assert(m_surface != nullptr);
   const Vector3 normal = m_surface->normal(gctx, position);
-  Direction side = Direction::fromScalar(normal.dot(direction));
+  Direction side = Direction::fromScalarZeroAsPositive(normal.dot(direction));
 
   const PortalLinkBase* link = side == Direction::AlongNormal
                                    ? m_alongNormal.get()
@@ -303,7 +304,8 @@ bool Portal::isSameSurface(const GeometryContext& gctx, const Surface& a,
     return false;
   }
 
-  if (!a.transform(gctx).isApprox(b.transform(gctx), 1e-9)) {
+  if (!a.transform(gctx).isApprox(b.transform(gctx),
+                                  s_transformEquivalentTolerance)) {
     return false;
   }