From cf0838931c1ffe63dc429db371d626697caa9ef6 Mon Sep 17 00:00:00 2001
From: Paul Gessinger <hello@paulgessinger.com>
Date: Thu, 18 Jan 2024 17:57:55 +0100
Subject: [PATCH] BasePropagator interface fixup

---
 .../Acts/Vertexing/HelicalTrackLinearizer.ipp        |  2 +-
 Core/include/Acts/Vertexing/ImpactPointEstimator.ipp | 12 ++++++++----
 .../Acts/Vertexing/NumericalTrackLinearizer.ipp      |  4 ++--
 3 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/Core/include/Acts/Vertexing/HelicalTrackLinearizer.ipp b/Core/include/Acts/Vertexing/HelicalTrackLinearizer.ipp
index 6aac65383df..a236037e1ef 100644
--- a/Core/include/Acts/Vertexing/HelicalTrackLinearizer.ipp
+++ b/Core/include/Acts/Vertexing/HelicalTrackLinearizer.ipp
@@ -45,7 +45,7 @@ Acts::Result<Acts::LinearizedTrack> Acts::
     // return result.error();
   // }
   // const auto& endParams = *result->endParameters;
-  const auto res = m_cfg.propagator->propagate(params, perigeeSurface, pOptions);
+  const auto res = m_cfg.propagator->propagateToSurface(params, perigeeSurface, pOptions);
   if(!res.ok()) {return res.error();}
   const auto& endParams = *res;
 
diff --git a/Core/include/Acts/Vertexing/ImpactPointEstimator.ipp b/Core/include/Acts/Vertexing/ImpactPointEstimator.ipp
index 1f3fe899fa2..94acd0ae35e 100644
--- a/Core/include/Acts/Vertexing/ImpactPointEstimator.ipp
+++ b/Core/include/Acts/Vertexing/ImpactPointEstimator.ipp
@@ -92,7 +92,8 @@ Acts::ImpactPointEstimator::
 
   // Propagate to the surface; intersection corresponds to an estimate of the 3D
   // PCA. If deltaR and momDir were orthogonal the calculation would be exact.
-  auto result = m_cfg.propagator->propagate(trkParams, *planeSurface, pOptions);
+  auto result =
+      m_cfg.propagator->propagateToSurface(trkParams, *planeSurface, pOptions);
   if (result.ok()) {
     return *result;
   } else {
@@ -384,7 +385,8 @@ Acts::ImpactPointEstimator::
       Direction::fromScalarZeroAsPositive(intersection.pathLength());
 
   // Do the propagation to linPoint
-  auto result = m_cfg.propagator->propagate(track, *perigeeSurface, pOptions);
+  auto result =
+      m_cfg.propagator->propagateToSurface(track, *perigeeSurface, pOptions);
 
   if (!result.ok()) {
     ACTS_ERROR("Error during propagation in getImpactParameters.");
@@ -464,7 +466,8 @@ Acts::ImpactPointEstimator::getLifetimeSignOfTrack(const BoundTrackParameters& t
   pOptions.direction = Direction::Backward;
 
   // Do the propagation to the perigeee
-  auto result = m_cfg.propagator->propagate(track, *perigeeSurface, pOptions);
+  auto result =
+      m_cfg.propagator->propagateToSurface(track, *perigeeSurface, pOptions);
 
   if (!result.ok()) {
     return result.error();
@@ -505,7 +508,8 @@ Acts::ImpactPointEstimator::
   pOptions.direction = Direction::Backward;
 
   // Do the propagation to the perigeee
-  auto result = m_cfg.propagator->propagate(track, *perigeeSurface, pOptions);
+  auto result =
+      m_cfg.propagator->propagateToSurface(track, *perigeeSurface, pOptions);
 
   if (!result.ok()) {
     return result.error();
diff --git a/Core/include/Acts/Vertexing/NumericalTrackLinearizer.ipp b/Core/include/Acts/Vertexing/NumericalTrackLinearizer.ipp
index 30ad09b938e..311beb4b4e2 100644
--- a/Core/include/Acts/Vertexing/NumericalTrackLinearizer.ipp
+++ b/Core/include/Acts/Vertexing/NumericalTrackLinearizer.ipp
@@ -42,7 +42,7 @@ Acts::NumericalTrackLinearizer::
       Direction::fromScalarZeroAsPositive(intersection.pathLength());
 
   // Propagate to the PCA of the reference point
-  auto result = m_cfg.propagator->propagate(params, perigeeSurface, pOptions);
+  auto result = m_cfg.propagator->propagateToSurface(params, perigeeSurface, pOptions);
   if (!result.ok()) {
     return result.error();
   }
@@ -124,7 +124,7 @@ Acts::NumericalTrackLinearizer::
         Direction::fromScalarZeroAsPositive(intersection.pathLength());
 
     // Propagate to the new PCA and extract Perigee parameters
-    auto newResult = m_cfg.propagator->propagate(wiggledCurvilinearParams,
+    auto newResult = m_cfg.propagator->propagateToSurface(wiggledCurvilinearParams,
                                                  perigeeSurface, pOptions);
     if (!newResult.ok()) {
       return newResult.error();