Skip to content

Commit

Permalink
BasePropagator interface fixup
Browse files Browse the repository at this point in the history
  • Loading branch information
paulgessinger committed Feb 8, 2024
1 parent 18521b0 commit cf08389
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 7 deletions.
2 changes: 1 addition & 1 deletion Core/include/Acts/Vertexing/HelicalTrackLinearizer.ipp
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
12 changes: 8 additions & 4 deletions Core/include/Acts/Vertexing/ImpactPointEstimator.ipp
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down Expand Up @@ -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.");
Expand Down Expand Up @@ -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();
Expand Down Expand Up @@ -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();
Expand Down
4 changes: 2 additions & 2 deletions Core/include/Acts/Vertexing/NumericalTrackLinearizer.ipp
Original file line number Diff line number Diff line change
Expand Up @@ -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();
}
Expand Down Expand Up @@ -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();
Expand Down

0 comments on commit cf08389

Please sign in to comment.