From 8ec9dd94b11b4ab2be8484de52668bebd90d50cc Mon Sep 17 00:00:00 2001
From: Paul Gessinger <paul.gessinger@cern.ch>
Date: Mon, 25 Nov 2019 10:12:32 +0100
Subject: [PATCH] s/trackState/trackStateProxy/g
---
Core/include/Acts/Fitter/KalmanFitter.hpp | 28 ++++++++++++-----------
1 file changed, 15 insertions(+), 13 deletions(-)
diff --git a/Core/include/Acts/Fitter/KalmanFitter.hpp b/Core/include/Acts/Fitter/KalmanFitter.hpp
index 9e88e797a..d3138ef9f 100644
--- a/Core/include/Acts/Fitter/KalmanFitter.hpp
+++ b/Core/include/Acts/Fitter/KalmanFitter.hpp
@@ -307,45 +307,47 @@ class KalmanFitter {
TrackStatePropMask::All, result.trackTip);
// now get track state proxy back
- auto trackState = result.fittedStates.getTrackState(result.trackTip);
+ auto trackStateProxy =
+ result.fittedStates.getTrackState(result.trackTip);
// assign the source link to the track state
- trackState.uncalibrated() = sourcelink_it->second;
+ trackStateProxy.uncalibrated() = sourcelink_it->second;
// Transport & bind the state to the current surface
auto [boundParams, jacobian, pathLength] =
stepper.boundState(state.stepping, *surface, true);
// Fill the track state
- trackState.predicted() = boundParams.parameters();
- trackState.predictedCovariance() = *boundParams.covariance();
- trackState.jacobian() = jacobian;
- trackState.pathLength() = pathLength;
+ trackStateProxy.predicted() = boundParams.parameters();
+ trackStateProxy.predictedCovariance() = *boundParams.covariance();
+ trackStateProxy.jacobian() = jacobian;
+ trackStateProxy.pathLength() = pathLength;
// We have predicted parameters, so calibrate the uncalibrated input
// measuerement
std::visit(
[&](const auto& calibrated) {
- trackState.setCalibrated(calibrated);
+ trackStateProxy.setCalibrated(calibrated);
},
- m_calibrator(trackState.uncalibrated(), trackState.predicted()));
+ m_calibrator(trackStateProxy.uncalibrated(),
+ trackStateProxy.predicted()));
// If the update is successful, set covariance and
- auto updateRes = m_updater(state.geoContext, trackState);
+ auto updateRes = m_updater(state.geoContext, trackStateProxy);
if (!updateRes.ok()) {
ACTS_ERROR("Update step failed: " << updateRes.error());
return updateRes.error();
} else {
// Update the stepping state
ACTS_VERBOSE("Filtering step successful, updated parameters are : \n"
- << trackState.filtered().transpose());
+ << trackStateProxy.filtered().transpose());
// update stepping state using filtered parameters after kalman update
// We need to (re-)construct a BoundParameters instance here, which is
// a bit awkward.
// @TODO: Make this unnecessary
- BoundParameters bPars(state.options.geoContext,
- trackState.filteredCovariance(),
- trackState.filtered(), surface->getSharedPtr());
+ BoundParameters bPars(
+ state.options.geoContext, trackStateProxy.filteredCovariance(),
+ trackStateProxy.filtered(), surface->getSharedPtr());
stepper.update(state.stepping, bPars);
}
// We count the processed state
--
GitLab