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
e8a2b3de
Commit
e8a2b3de
authored
4 years ago
by
Bastian Schlag
Browse files
Options
Downloads
Patches
Plain Diff
update FullBilloirVertexFitter to correctly initialize all variables
parent
1d4128f2
No related branches found
Branches containing commit
No related tags found
Tags containing commit
1 merge request
!802
Remove propagator options from vertexing configs and performance upgrades
Pipeline
#1511767
passed
4 years ago
Stage: check
Stage: build
Stage: test
Stage: analysis
Changes
1
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
Core/include/Acts/Vertexing/FullBilloirVertexFitter.ipp
+11
-22
11 additions, 22 deletions
Core/include/Acts/Vertexing/FullBilloirVertexFitter.ipp
with
11 additions
and
22 deletions
Core/include/Acts/Vertexing/FullBilloirVertexFitter.ipp
+
11
−
22
View file @
e8a2b3de
...
@@ -196,14 +196,9 @@ Acts::FullBilloirVertexFitter<input_track_t, linearizer_t>::fit(
...
@@ -196,14 +196,9 @@ Acts::FullBilloirVertexFitter<input_track_t, linearizer_t>::fit(
billoirVertex
.
Amat
-
billoirVertex
.
Amat
-
billoirVertex
.
BCBmat
;
// VwgtMat = Amat-sum{BiMat*Ci^-1*BiMat^T}
billoirVertex
.
BCBmat
;
// VwgtMat = Amat-sum{BiMat*Ci^-1*BiMat^T}
if
(
isConstraintFit
)
{
if
(
isConstraintFit
)
{
SpacePointVector
posInBilloirFrame
;
// this will be 0 for first iteration but != 0 from second on
// this will be 0 for first iteration but != 0 from second on
posInBilloirFrame
[
0
]
=
SpacePointVector
posInBilloirFrame
=
vertexingOptions
.
vertexConstraint
.
position
()[
0
]
-
linPoint
[
0
];
vertexingOptions
.
vertexConstraint
.
fullPosition
()
-
linPoint
;
posInBilloirFrame
[
1
]
=
vertexingOptions
.
vertexConstraint
.
position
()[
1
]
-
linPoint
[
1
];
posInBilloirFrame
[
2
]
=
vertexingOptions
.
vertexConstraint
.
position
()[
2
]
-
linPoint
[
2
];
Vdel
+=
vertexingOptions
.
vertexConstraint
.
fullCovariance
().
inverse
()
*
Vdel
+=
vertexingOptions
.
vertexConstraint
.
fullCovariance
().
inverse
()
*
posInBilloirFrame
;
posInBilloirFrame
;
...
@@ -225,9 +220,7 @@ Acts::FullBilloirVertexFitter<input_track_t, linearizer_t>::fit(
...
@@ -225,9 +220,7 @@ Acts::FullBilloirVertexFitter<input_track_t, linearizer_t>::fit(
(
bTrack
.
CiInv
)
*
(
bTrack
.
UiVec
-
bTrack
.
BiMat
.
transpose
()
*
deltaV
);
(
bTrack
.
CiInv
)
*
(
bTrack
.
UiVec
-
bTrack
.
BiMat
.
transpose
()
*
deltaV
);
// update track momenta
// update track momenta
trackMomenta
[
iTrack
][
0
]
+=
deltaP
[
0
];
trackMomenta
[
iTrack
]
+=
deltaP
;
trackMomenta
[
iTrack
][
1
]
+=
deltaP
[
1
];
trackMomenta
[
iTrack
][
2
]
+=
deltaP
[
2
];
// correct for 2PI / PI periodicity
// correct for 2PI / PI periodicity
auto
correctedPhiTheta
=
detail
::
ensureThetaBounds
(
auto
correctedPhiTheta
=
detail
::
ensureThetaBounds
(
...
@@ -286,23 +279,19 @@ Acts::FullBilloirVertexFitter<input_track_t, linearizer_t>::fit(
...
@@ -286,23 +279,19 @@ Acts::FullBilloirVertexFitter<input_track_t, linearizer_t>::fit(
}
}
if
(
isConstraintFit
)
{
if
(
isConstraintFit
)
{
Vector3D
deltaTrk
;
// last term will also be 0 again but only in the first iteration
// last term will also be 0 again but only in the first iteration
// = calc. vtx in billoir frame - ( isConstraintFit pos. in billoir
// = calc. vtx in billoir frame - ( isConstraintFit pos. in billoir
// frame )
// frame )
deltaTrk
[
0
]
=
deltaV
[
0
]
-
SpacePointVector
deltaTrk
=
(
vertexingOptions
.
vertexConstraint
.
position
()[
0
]
-
linPoint
[
0
]);
deltaV
-
deltaTrk
[
1
]
=
(
vertexingOptions
.
vertexConstraint
.
fullPosition
()
-
linPoint
);
deltaV
[
1
]
-
(
vertexingOptions
.
vertexConstraint
.
position
()[
1
]
-
linPoint
[
1
]);
deltaTrk
[
2
]
=
deltaV
[
2
]
-
(
vertexingOptions
.
vertexConstraint
.
position
()[
2
]
-
linPoint
[
2
]);
newChi2
+=
newChi2
+=
(
deltaTrk
.
transpose
())
(
deltaTrk
.
transpose
())
.
dot
(
vertexingOptions
.
vertexConstraint
.
covariance
().
inverse
()
*
.
dot
(
deltaTrk
);
vertexingOptions
.
vertexConstraint
.
fullCovariance
().
inverse
()
*
deltaTrk
);
}
}
if
(
!
std
::
isnormal
(
newChi2
))
{
if
(
!
std
::
isnormal
(
newChi2
))
{
...
...
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