Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
acts-core
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Iterations
Wiki
Requirements
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Test cases
Artifacts
Deploy
Releases
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD 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
This is an archived project. Repository and other project resources are read-only.
Show more breadcrumbs
acts
acts-core
Commits
96d5cafe
Commit
96d5cafe
authored
5 years ago
by
Xiaocong Ai
Committed by
Paul Gessinger
5 years ago
Browse files
Options
Downloads
Patches
Plain Diff
Adapt materialInteractor in KF for no material case
parent
9b544814
No related branches found
No related tags found
1 merge request
!793
Fix kf surface check
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
Core/include/Acts/Fitter/KalmanFitter.hpp
+34
-21
34 additions, 21 deletions
Core/include/Acts/Fitter/KalmanFitter.hpp
with
34 additions
and
21 deletions
Core/include/Acts/Fitter/KalmanFitter.hpp
+
34
−
21
View file @
96d5cafe
...
...
@@ -747,27 +747,40 @@ class KalmanFitter {
void
materialInteractor
(
const
Surface
*
surface
,
propagator_state_t
&
state
,
stepper_t
&
stepper
,
const
MaterialUpdateStage
&
updateStage
=
fullUpdate
)
const
{
// Prepare relevant input particle properties
detail
::
PointwiseMaterialInteraction
interaction
(
surface
,
state
,
stepper
);
// Evaluate the material properties
if
(
interaction
.
evaluateMaterialProperties
(
state
,
updateStage
))
{
// Evaluate the material effects
interaction
.
evaluatePointwiseMaterialInteraction
(
multipleScattering
,
energyLoss
);
ACTS_VERBOSE
(
"Material effects on surface: "
<<
surface
->
geoID
()
<<
" at update stage: "
<<
updateStage
<<
" are :"
);
ACTS_VERBOSE
(
"eLoss = "
<<
interaction
.
Eloss
<<
", "
<<
"variancePhi = "
<<
interaction
.
variancePhi
<<
", "
<<
"varianceTheta = "
<<
interaction
.
varianceTheta
<<
", "
<<
"varianceQoverP = "
<<
interaction
.
varianceQoverP
);
// Update the state and stepper with material effects
interaction
.
updateState
(
state
,
stepper
);
}
else
{
// Indicator if having material
bool
hasMaterial
=
false
;
if
(
surface
and
surface
->
surfaceMaterial
())
{
// Prepare relevant input particle properties
detail
::
PointwiseMaterialInteraction
interaction
(
surface
,
state
,
stepper
);
// Evaluate the material properties
if
(
interaction
.
evaluateMaterialProperties
(
state
,
updateStage
))
{
// Surface has material at this stage
hasMaterial
=
true
;
// Evaluate the material effects
interaction
.
evaluatePointwiseMaterialInteraction
(
multipleScattering
,
energyLoss
);
// Screen out material effects info
ACTS_VERBOSE
(
"Material effects on surface: "
<<
surface
->
geoID
()
<<
" at update stage: "
<<
updateStage
<<
" are :"
);
ACTS_VERBOSE
(
"eLoss = "
<<
interaction
.
Eloss
<<
", "
<<
"variancePhi = "
<<
interaction
.
variancePhi
<<
", "
<<
"varianceTheta = "
<<
interaction
.
varianceTheta
<<
", "
<<
"varianceQoverP = "
<<
interaction
.
varianceQoverP
);
// Update the state and stepper with material effects
interaction
.
updateState
(
state
,
stepper
);
}
}
if
(
not
hasMaterial
)
{
// Screen out message
ACTS_VERBOSE
(
"No material effects on surface: "
<<
surface
->
geoID
()
<<
" at update stage: "
<<
updateStage
);
...
...
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