Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

refactor: use time info in Kalman vertex fit #2544

Closed
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
57 commits
Select commit Hold shift + click to select a range
441b25c
update KalmanVertexUpdater
felix-russo Oct 14, 2023
fbeefbb
update KalmanVertexTrackFinder
felix-russo Oct 14, 2023
cc68241
update unit test
felix-russo Oct 14, 2023
a8931de
fill entire covariance
felix-russo Oct 15, 2023
4955128
update AMVFinder unit test
felix-russo Oct 16, 2023
ee3f317
enable debug mode for unit test
felix-russo Oct 17, 2023
2cc3b4b
initialize fullCovariance as 0 in unit test
felix-russo Oct 17, 2023
5a25270
disable debug mode
felix-russo Oct 17, 2023
f9625fc
temporary modification of physmon
felix-russo Oct 23, 2023
cdac024
Revert "temporary modification of physmon"
felix-russo Oct 23, 2023
c8773b3
Merge branch 'main' of https://github.com/acts-project/acts into alwa…
felix-russo Oct 23, 2023
600f200
use eTime
felix-russo Oct 24, 2023
1b4fb49
update histo ranges
felix-russo Oct 24, 2023
8e29ab5
try fixing vertexing_config
felix-russo Oct 24, 2023
7ecb649
try more
felix-russo Oct 24, 2023
136d9f7
improve comments
felix-russo Oct 25, 2023
896cbd7
add inline again
felix-russo Oct 25, 2023
694ecb2
try multiplying the track parameter weight matrix with the track weight
felix-russo Oct 25, 2023
322d403
improve comments
felix-russo Oct 25, 2023
63c59d0
try more
felix-russo Oct 25, 2023
6943605
Merge branch 'main' of https://github.com/acts-project/acts into alwa…
felix-russo Oct 25, 2023
392a90e
Revert "try more"
felix-russo Oct 25, 2023
68d8595
Revert "improve comments"
felix-russo Oct 25, 2023
1b4f454
Revert "try multiplying the track parameter weight matrix with the tr…
felix-russo Oct 25, 2023
a5099ec
small improvements
felix-russo Oct 30, 2023
6e14fec
better handling of invalid arguments
felix-russo Oct 30, 2023
256a196
rename
felix-russo Oct 30, 2023
63979d4
improve comments and function names
felix-russo Oct 31, 2023
3e01656
remove KalmanVertexTrackUpdater
felix-russo Oct 31, 2023
a91cca1
refactor updateTrack
felix-russo Oct 31, 2023
5867231
continue
felix-russo Oct 31, 2023
af99054
remove duplicate code
felix-russo Oct 31, 2023
68c3c38
remove duplicate code
felix-russo Oct 31, 2023
0cc2d23
clang-tidy suggestions
felix-russo Oct 31, 2023
fc37946
Merge branch 'main' of https://github.com/acts-project/acts into alwa…
felix-russo Oct 31, 2023
c294438
improve comments
felix-russo Nov 1, 2023
b31e486
Merge branch 'main' of https://github.com/acts-project/acts into alwa…
felix-russo Nov 6, 2023
ae0d471
Merge branch 'main' into always-d-time-fitting
paulgessinger Nov 8, 2023
3f2a139
Update Tests/UnitTests/Core/Vertexing/KalmanVertexUpdaterTests.cpp
felix-russo Nov 9, 2023
2134ebb
merge branch main in
felix-russo Nov 12, 2023
b8b84c6
format
felix-russo Nov 12, 2023
eadd4d5
Merge branch 'always-d-time-fitting' of github.com:felix-russo/acts i…
felix-russo Nov 12, 2023
2bec6a9
delete outdated unit test file
felix-russo Nov 12, 2023
cad253a
set histo ranges to original vals
felix-russo Nov 13, 2023
933ae56
set useTime to true
felix-russo Nov 13, 2023
0d0576a
weight time down
felix-russo Nov 13, 2023
4a7ab4e
don't weight time down
felix-russo Nov 14, 2023
43e9317
inflate time weight manually
felix-russo Nov 14, 2023
872aac0
forgot indices
felix-russo Nov 14, 2023
0c07959
disable unit test
felix-russo Nov 14, 2023
316a29c
modify unit test
felix-russo Nov 14, 2023
84b0144
revert last 7 commits
felix-russo Nov 15, 2023
a69af4c
Merge branch 'main' of https://github.com/acts-project/acts into alwa…
felix-russo Nov 17, 2023
f17b6ae
Merge branch 'main' of https://github.com/acts-project/acts into alwa…
felix-russo Nov 17, 2023
d276cf8
copy double
felix-russo Nov 20, 2023
0948069
introduce separate loose constraint value for time
felix-russo Nov 21, 2023
989cebd
merge branch main in
felix-russo Nov 21, 2023
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion CI/physmon/vertexing_config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@ histograms:
min: -6
max: 6


"trk_pull.*":
nbins: 50
min: -10
Expand Down
10 changes: 7 additions & 3 deletions Core/include/Acts/Vertexing/AdaptiveMultiVertexFinder.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -143,9 +143,13 @@ class AdaptiveMultiVertexFinder {
// Use seed vertex as a constraint for the fit
bool useSeedConstraint = true;

// Diagonal constraint covariance entries in case
// no beamspot constraint is provided
double looseConstrValue = 1e+8;
// Initial variance of the vertex position in case no beamspot constraint is
// provided
double initialSpatialVariance = 1e+8;

// Initial variance of the vertex time in case no beamspot constraint is
// provided
double initialTemporalVariance = 1e+8;

// Default fitQuality for constraint vertex in case no beamspot
// constraint is provided
Expand Down
8 changes: 6 additions & 2 deletions Core/include/Acts/Vertexing/AdaptiveMultiVertexFinder.ipp
Original file line number Diff line number Diff line change
Expand Up @@ -185,8 +185,12 @@ auto Acts::AdaptiveMultiVertexFinder<vfitter_t, sfinder_t>::
}
} else {
currentConstraint.setFullPosition(seedVertex.fullPosition());
currentConstraint.setFullCovariance(SquareMatrix4::Identity() *
m_cfg.looseConstrValue);
// Default initial variances (i.e., diagonal elements of the covariance
// matrix)
Vector4 variances(
m_cfg.initialSpatialVariance, m_cfg.initialSpatialVariance,
m_cfg.initialSpatialVariance, m_cfg.initialTemporalVariance);
currentConstraint.setFullCovariance(variances.asDiagonal());
currentConstraint.setFitQuality(m_cfg.defaultConstrFitQuality);
}
}
Expand Down
5 changes: 3 additions & 2 deletions Core/include/Acts/Vertexing/AdaptiveMultiVertexFitter.ipp
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@
// License, v. 2.0. If a copy of the MPL was not distributed with this
// file, You can obtain one at http://mozilla.org/MPL/2.0/.

#include "Acts/Vertexing/KalmanVertexTrackUpdater.hpp"
#include "Acts/Vertexing/KalmanVertexUpdater.hpp"
#include "Acts/Vertexing/VertexingError.hpp"

Expand Down Expand Up @@ -369,7 +368,9 @@ void Acts::AdaptiveMultiVertexFitter<
for (const auto trk : state.vtxInfoMap[vtx].trackLinks) {
auto& trkAtVtx = state.tracksAtVerticesMap.at(std::make_pair(trk, vtx));
if (trkAtVtx.trackWeight > m_cfg.minWeight) {
KalmanVertexTrackUpdater::update<input_track_t>(trkAtVtx, *vtx);
// Update the track parameters using the final estimate of the vertex
// position. This also updates their chi2 values using a symmetric test.
KalmanVertexUpdater::updateTrack<input_track_t>(trkAtVtx, *vtx);
}
}
}
Expand Down
52 changes: 0 additions & 52 deletions Core/include/Acts/Vertexing/KalmanVertexTrackUpdater.hpp

This file was deleted.

155 changes: 0 additions & 155 deletions Core/include/Acts/Vertexing/KalmanVertexTrackUpdater.ipp

This file was deleted.

Loading