Skip to content
Snippets Groups Projects
Commit 6c701c6e authored by Tomasz Bold's avatar Tomasz Bold Committed by Tadej Novak
Browse files

Use ForcedSurfaceReached only in case of Perigee

Use ForcedSurfaceReached only in case of Perigee
parent d3325dd5
No related branches found
No related tags found
No related merge requests found
...@@ -240,9 +240,13 @@ ActsExtrapolationTool::propagationSteps(const EventContext& ctx, ...@@ -240,9 +240,13 @@ ActsExtrapolationTool::propagationSteps(const EventContext& ctx,
using Options = typename Propagator::template Options<ActorList>; using Options = typename Propagator::template Options<ActorList>;
Options options = prepareOptions<Options>(anygctx, mctx, startParameters, navDir, pathLimit); Options options = prepareOptions<Options>(anygctx, mctx, startParameters, navDir, pathLimit);
auto result = target.type() == Acts::Surface::Perigee ?
propagator.template propagate<Acts::BoundTrackParameters, Options,
Acts::ForcedSurfaceReached, Acts::PathLimitReached>(startParameters, target, options) :
propagator.template propagate<Acts::BoundTrackParameters, Options,
Acts::SurfaceReached, Acts::PathLimitReached>(startParameters, target, options);
auto result = propagator.template propagate<Acts::BoundTrackParameters, Options,
Acts::ForcedSurfaceReached, Acts::PathLimitReached>(startParameters, target, options);
if (!result.ok()) { if (!result.ok()) {
return result.error(); return result.error();
} }
...@@ -292,9 +296,11 @@ ActsExtrapolationTool::propagate(const EventContext& ctx, ...@@ -292,9 +296,11 @@ ActsExtrapolationTool::propagate(const EventContext& ctx,
using Options = typename Propagator::template Options<ActorList>; using Options = typename Propagator::template Options<ActorList>;
Options options = prepareOptions<Options>(anygctx, mctx, startParameters, navDir, pathLimit); Options options = prepareOptions<Options>(anygctx, mctx, startParameters, navDir, pathLimit);
auto result = target.type() == Acts::Surface::Perigee ?
auto result = propagator.template propagate<Acts::BoundTrackParameters, Options, propagator.template propagate<Acts::BoundTrackParameters, Options,
Acts::ForcedSurfaceReached, Acts::PathLimitReached>(startParameters, target, options); Acts::ForcedSurfaceReached, Acts::PathLimitReached>(startParameters, target, options) :
propagator.template propagate<Acts::BoundTrackParameters, Options,
Acts::SurfaceReached, Acts::PathLimitReached>(startParameters, target, options);
if (!result.ok()) { if (!result.ok()) {
ATH_MSG_ERROR("Got error during propagation: " << result.error() ATH_MSG_ERROR("Got error during propagation: " << result.error()
<< ". Returning empty parameters."); << ". Returning empty parameters.");
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment