Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
athena
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Requirements
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Locked files
Deploy
Releases
Package Registry
Container Registry
Model registry
Operate
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
Repository analytics
Code review analytics
Issue analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Philipp Windischhofer
athena
Commits
6c701c6e
Commit
6c701c6e
authored
3 months ago
by
Tomasz Bold
Committed by
Tadej Novak
3 months ago
Browse files
Options
Downloads
Patches
Plain Diff
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
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
Tracking/Acts/ActsGeometry/src/ActsExtrapolationTool.cxx
+11
-5
11 additions, 5 deletions
Tracking/Acts/ActsGeometry/src/ActsExtrapolationTool.cxx
with
11 additions
and
5 deletions
Tracking/Acts/ActsGeometry/src/ActsExtrapolationTool.cxx
+
11
−
5
View file @
6c701c6e
...
@@ -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."
);
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment