From e8d85d51f6da13c09b9be9d0ccf8500ceeac12d7 Mon Sep 17 00:00:00 2001
From: Paul Gessinger <paul.gessinger@cern.ch>
Date: Mon, 14 Oct 2019 13:08:24 +0200
Subject: [PATCH] fixes after rebase
---
Core/include/Acts/Fitter/GainMatrixSmoother.hpp | 6 +++---
Core/include/Acts/Fitter/KalmanFitter.hpp | 3 +--
Tests/Core/Fitter/GainMatrixUpdaterTests.cpp | 5 ++---
3 files changed, 6 insertions(+), 8 deletions(-)
diff --git a/Core/include/Acts/Fitter/GainMatrixSmoother.hpp b/Core/include/Acts/Fitter/GainMatrixSmoother.hpp
index b650a3d3a..0ab4479bb 100644
--- a/Core/include/Acts/Fitter/GainMatrixSmoother.hpp
+++ b/Core/include/Acts/Fitter/GainMatrixSmoother.hpp
@@ -87,9 +87,9 @@ class GainMatrixSmoother {
});
// construct parameters from last track state
- parameters_t lastSmoothed(
- gctx, std::make_unique<CovMatrix_t>(prev_ts.smoothedCovariance()),
- prev_ts.smoothed(), prev_ts.referenceSurface().getSharedPtr());
+ parameters_t lastSmoothed(gctx, prev_ts.smoothedCovariance(),
+ prev_ts.smoothed(),
+ prev_ts.referenceSurface().getSharedPtr());
return lastSmoothed;
}
diff --git a/Core/include/Acts/Fitter/KalmanFitter.hpp b/Core/include/Acts/Fitter/KalmanFitter.hpp
index d25faf902..c2cbf99df 100644
--- a/Core/include/Acts/Fitter/KalmanFitter.hpp
+++ b/Core/include/Acts/Fitter/KalmanFitter.hpp
@@ -342,8 +342,7 @@ class KalmanFitter {
// a bit awkward.
// @TODO: Make this unnecessary
BoundParameters bPars(state.options.geoContext,
- std::make_unique<BoundParameters::CovMatrix_t>(
- trackState.filteredCovariance()),
+ trackState.filteredCovariance(),
trackState.filtered(), surface->getSharedPtr());
stepper.update(state.stepping, bPars);
}
diff --git a/Tests/Core/Fitter/GainMatrixUpdaterTests.cpp b/Tests/Core/Fitter/GainMatrixUpdaterTests.cpp
index 396f1c5f0..d7c9aca9b 100644
--- a/Tests/Core/Fitter/GainMatrixUpdaterTests.cpp
+++ b/Tests/Core/Fitter/GainMatrixUpdaterTests.cpp
@@ -91,9 +91,8 @@ BOOST_AUTO_TEST_CASE(gain_matrix_updater) {
Vector3D expMomentum;
expMomentum << 0.0000000, 80.9016994, 58.7785252;
- BoundParameters filtered(
- tgContext, std::make_unique<Covariance>(ts.filteredCovariance()),
- ts.filtered(), cylinder);
+ BoundParameters filtered(tgContext, ts.filteredCovariance(), ts.filtered(),
+ cylinder);
double expChi2 = 1.33958;
--
GitLab