Merge branch 'main' into feat/trk-vol-surface-storage

acts-project · Oct 2, 2024 · f2a8640 · f2a8640
2 parents 79eda1c + 661ab12
commit f2a8640
Show file tree

Hide file tree

Showing 3 changed files with 36 additions and 4 deletions.
diff --git a/Core/include/Acts/TrackFitting/GlobalChiSquareFitter.hpp b/Core/include/Acts/TrackFitting/GlobalChiSquareFitter.hpp
@@ -610,10 +610,10 @@ class Gx2Fitter {
 
       // Check if we can stop to propagate
       if (result.measurementStates == inputMeasurements->size()) {
-        ACTS_INFO("Actor: finish: All measurements have been found.");
+        ACTS_DEBUG("Actor: finish: All measurements have been found.");
         result.finished = true;
       } else if (state.navigation.navigationBreak) {
-        ACTS_INFO("Actor: finish: navigationBreak.");
+        ACTS_DEBUG("Actor: finish: navigationBreak.");
         result.finished = true;
       }
 
@@ -1218,7 +1218,7 @@ class Gx2Fitter {
 
         // We only consider states with a measurement (and/or material)
         if (!stateHasMeasurement && !doMaterial) {
-          ACTS_INFO("    Skip state.");
+          ACTS_DEBUG("    Skip state.");
           continue;
         }
 
@@ -1388,6 +1388,9 @@ class Gx2Fitter {
 
     // Propagate again with the final covariance matrix. This is necessary to
     // obtain the propagated covariance for each state.
+    // We also need to recheck the result and find the tipIndex, because at this
+    // step, we will not ignore the boundary checks for measurement surfaces. We
+    // want to create trackstates only on surfaces, that we actually hit.
     if (gx2fOptions.nUpdateMax > 0) {
       ACTS_VERBOSE("final deltaParams:\n" << deltaParams);
       ACTS_VERBOSE("Propagate with the final covariance.");
@@ -1413,7 +1416,33 @@ class Gx2Fitter {
       auto& r = propagatorState.template get<Gx2FitterResult<traj_t>>();
       r.fittedStates = &trackContainer.trackStateContainer();
 
-      m_propagator.template propagate(propagatorState);
+      auto propagationResult = m_propagator.template propagate(propagatorState);
+
+      // Run the fitter
+      auto result = m_propagator.template makeResult(std::move(propagatorState),
+                                                     propagationResult,
+                                                     propagatorOptions, false);
+
+      if (!result.ok()) {
+        ACTS_ERROR("Propagation failed: " << result.error());
+        return result.error();
+      }
+
+      auto& propRes = *result;
+      GX2FResult gx2fResult = std::move(propRes.template get<GX2FResult>());
+
+      if (!gx2fResult.result.ok()) {
+        ACTS_INFO("GlobalChiSquareFitter failed in actor: "
+                  << gx2fResult.result.error() << ", "
+                  << gx2fResult.result.error().message());
+        return gx2fResult.result.error();
+      }
+
+      if (tipIndex != gx2fResult.lastMeasurementIndex) {
+        ACTS_INFO("Final fit used unreachable measurements.");
+        return Experimental::GlobalChiSquareFitterError::
+            UsedUnreachableMeasurements;
+      }
     }
 
     if (!trackContainer.hasColumn(

diff --git a/Core/include/Acts/TrackFitting/GlobalChiSquareFitterError.hpp b/Core/include/Acts/TrackFitting/GlobalChiSquareFitterError.hpp
@@ -19,6 +19,7 @@ enum class GlobalChiSquareFitterError {
   DidNotConverge = 2,
   NotEnoughMeasurements = 3,
   UpdatePushedToNewVolume = 4,
+  UsedUnreachableMeasurements = 5,
 };
 
 std::error_code make_error_code(

diff --git a/Core/src/TrackFitting/GlobalChiSquareFitterError.cpp b/Core/src/TrackFitting/GlobalChiSquareFitterError.cpp
@@ -32,6 +32,8 @@ class GlobalChiSquareFitterErrorCategory : public std::error_category {
         return "Gx2f: Not enough measurements.";
       case GlobalChiSquareFitterError::UpdatePushedToNewVolume:
         return "Gx2f: Update pushed the parameters to a new volume.";
+      case GlobalChiSquareFitterError::UsedUnreachableMeasurements:
+        return "Gx2f: Final fit used unreachable measurements.";
       default:
         return "unknown";
     }