add safer filling

AJPfleger · Oct 9, 2023 · f8012c2 · f8012c2
1 parent d2d7310
commit f8012c2
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 3 deletions.
diff --git a/Core/include/Acts/EventData/TrackStatePropMask.hpp b/Core/include/Acts/EventData/TrackStatePropMask.hpp
@@ -31,7 +31,6 @@ enum struct TrackStatePropMask : std::uint8_t {
   Filtered = 1 << 1,
   Smoothed = 1 << 2,
   Jacobian = 1 << 3,
-
   Calibrated = 1 << 4,
 
   All = std::numeric_limits<std::uint8_t>::max(),  // should be all ones

diff --git a/Core/include/Acts/TrackFitting/detail/FitterHelpers.hpp b/Core/include/Acts/TrackFitting/detail/FitterHelpers.hpp
@@ -71,12 +71,19 @@ auto getTrackStateProxy(propagator_state_t &state, const stepper_t &stepper,
   auto &[boundParams, jacobian, pathLength] = *res;
 
   // Fill the track state
-  trackStateProxy.predicted() = std::move(boundParams.parameters());
+  if ((mask & TrackStatePropMask::Predicted) != TrackStatePropMask::None) {
+    trackStateProxy.predicted() = std::move(boundParams.parameters());
+  }
+
   if (boundParams.covariance().has_value()) {
     trackStateProxy.predictedCovariance() =
         std::move(*boundParams.covariance());
   }
-  trackStateProxy.jacobian() = std::move(jacobian);
+
+  if ((mask & TrackStatePropMask::Jacobian) != TrackStatePropMask::None) {
+    trackStateProxy.jacobian() = std::move(jacobian);
+  }
+
   trackStateProxy.pathLength() = std::move(pathLength);
 
   return trackStateProxy;