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
Merge requests
!793
Fix kf surface check
Code
Review changes
Check out branch
Download
Patches
Plain diff
Merged
Fix kf surface check
fix-KF-surface-check
into
master
Overview
0
Commits
3
Pipelines
2
Changes
1
Merged
Xiaocong Ai
requested to merge
fix-KF-surface-check
into
master
5 years ago
Overview
0
Commits
3
Pipelines
2
Changes
1
Expand
This minor MR removes the requirement that a measurement has to be on a surface with material in KF.
0
0
Merge request reports
Viewing commit
96d5cafe
Prev
Next
Show latest version
1 file
+
34
−
21
Inline
Compare changes
Side-by-side
Inline
Show whitespace changes
Show one file at a time
96d5cafe
Adapt materialInteractor in KF for no material case
· 96d5cafe
Xiaocong Ai
authored
5 years ago
Core/include/Acts/Fitter/KalmanFitter.hpp
+
34
−
21
Options
@@ -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
);
Loading