fix: Copy whole trackstate did not copy calibrated (#3693)

Know your defaults...
acts-project · Oct 9, 2024 · 94698b3 · 94698b3
1 parent 464fd46
commit 94698b3
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 1 deletion.
diff --git a/Core/include/Acts/EventData/TrackStateProxy.hpp b/Core/include/Acts/EventData/TrackStateProxy.hpp
@@ -1043,8 +1043,9 @@ class TrackStateProxy {
         jacobian() = other.jacobian();
       }
 
+      // NOTE: we should not check hasCalibrated on this, since it
+      // may be not yet allocated
       if (ACTS_CHECK_BIT(mask, PM::Calibrated) &&
-          has<hashString("calibrated")>() &&
           other.template has<hashString("calibrated")>()) {
         allocateCalibrated(other.calibratedSize());
 

diff --git a/Tests/UnitTests/Core/EventData/TrackTestsExtra.cpp b/Tests/UnitTests/Core/EventData/TrackTestsExtra.cpp
@@ -447,4 +447,24 @@ BOOST_AUTO_TEST_CASE(ReverseTrackStates) {
   }
 }
 
+BOOST_AUTO_TEST_CASE(CopyTrackProxyCalibrated) {
+  VectorTrackContainer vtc{};
+  VectorMultiTrajectory mtj{};
+  TrackContainer tc{vtc, mtj};
+
+  constexpr static std::size_t kMeasurementSize = 3;
+
+  auto track1 = tc.makeTrack();
+  auto ts = track1.appendTrackState(TrackStatePropMask::Calibrated);
+  ts.allocateCalibrated(kMeasurementSize);
+  ts.calibrated<kMeasurementSize>() = Vector3::Ones();
+  ts.calibratedCovariance<kMeasurementSize>() = SquareMatrix3::Identity();
+  ts.setSubspaceIndices(BoundSubspaceIndices{});
+
+  auto tsCopy = track1.appendTrackState(TrackStatePropMask::Calibrated);
+  tsCopy.copyFrom(ts, TrackStatePropMask::Calibrated, false);
+
+  BOOST_CHECK_EQUAL(ts.calibratedSize(), tsCopy.calibratedSize());
+}
+
 BOOST_AUTO_TEST_SUITE_END()