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.

Sign up for GitHub

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!: remove division of vertex covariance with weight #2551

Merged
merged 10 commits into from
Oct 25, 2023
Merged

refactor!: remove division of vertex covariance with weight #2551

Show file tree
Hide file tree
Changes from 7 commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
173bbfc
check that surfaceOrigin is at vertexPosition
felix-russo Oct 9, 2023
1bbe544
continue
felix-russo Oct 9, 2023
da69e29
try
felix-russo Oct 9, 2023
14a15a9
Revert "check that surfaceOrigin is at vertexPosition"
felix-russo Oct 9, 2023
aa354a6
Revert "continue"
felix-russo Oct 9, 2023
febbadf
disable unit test
felix-russo Oct 10, 2023
ace02ef
use close_or_small in unit test
felix-russo Oct 10, 2023
7781aa4
Merge branch 'main' of https://github.com/acts-project/acts into remo…
felix-russo Oct 23, 2023
09f4d8e
merge branch main in
felix-russo Oct 25, 2023
d4af6a6
Merge branch 'main' into remove-vtx-weight
kodiakhq[bot] Oct 25, 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
3 changes: 0 additions & 3 deletions Core/include/Acts/Vertexing/AdaptiveMultiVertexFitter.ipp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,9 +81,6 @@ Acts::AdaptiveMultiVertexFitter<input_track_t, linearizer_t>::fitImpl(
} else if (currentVtx->fullCovariance() == SquareMatrix4::Zero()) {
return VertexingError::NoCovariance;
}
double weight =
1. / m_cfg.annealingTool.getWeight(state.annealingState, 1.);
currentVtx->setFullCovariance(currentVtx->fullCovariance() * weight);

// Set vertexCompatibility for all TrackAtVertex objects
// at current vertex
Expand Down
28 changes: 18 additions & 10 deletions Tests/UnitTests/Core/Vertexing/AdaptiveMultiVertexFinderTests.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -189,15 +189,19 @@ BOOST_AUTO_TEST_CASE(adaptive_multi_vertex_finder_test) {

BOOST_CHECK_EQUAL(allVertices.size(), expNRecoVertices);

double relTol = 1e-2;
double small = 1e-3;
for (int i = 0; i < expNRecoVertices; i++) {
auto recoVtx = allVertices[i];
auto expVtx = verticesInfo[i];
CHECK_CLOSE_ABS(recoVtx.position(), expVtx.position, 0.001_mm);
CHECK_CLOSE_ABS(recoVtx.covariance(), expVtx.covariance, 0.001_mm);
CHECK_CLOSE_OR_SMALL(recoVtx.position(), expVtx.position, relTol, small);
CHECK_CLOSE_OR_SMALL(recoVtx.covariance(), expVtx.covariance, relTol,
small);
BOOST_CHECK_EQUAL(recoVtx.tracks().size(), expVtx.nTracks);
CHECK_CLOSE_ABS(recoVtx.tracks()[0].trackWeight, expVtx.trk1Weight, 0.003);
CHECK_CLOSE_ABS(recoVtx.tracks()[0].vertexCompatibility, expVtx.trk1Comp,
0.003);
CHECK_CLOSE_OR_SMALL(recoVtx.tracks()[0].trackWeight, expVtx.trk1Weight,
relTol, small);
CHECK_CLOSE_OR_SMALL(recoVtx.tracks()[0].vertexCompatibility,
expVtx.trk1Comp, relTol, small);
}
}

Expand Down Expand Up @@ -347,15 +351,19 @@ BOOST_AUTO_TEST_CASE(adaptive_multi_vertex_finder_usertype_test) {

BOOST_CHECK_EQUAL(allVertices.size(), expNRecoVertices);

double relTol = 1e-2;
double small = 1e-3;
for (int i = 0; i < expNRecoVertices; i++) {
auto recoVtx = allVertices[i];
auto expVtx = verticesInfo[i];
CHECK_CLOSE_ABS(recoVtx.position(), expVtx.position, 0.001_mm);
CHECK_CLOSE_ABS(recoVtx.covariance(), expVtx.covariance, 0.001_mm);
CHECK_CLOSE_OR_SMALL(recoVtx.position(), expVtx.position, relTol, small);
CHECK_CLOSE_OR_SMALL(recoVtx.covariance(), expVtx.covariance, relTol,
small);
BOOST_CHECK_EQUAL(recoVtx.tracks().size(), expVtx.nTracks);
CHECK_CLOSE_ABS(recoVtx.tracks()[0].trackWeight, expVtx.trk1Weight, 0.003);
CHECK_CLOSE_ABS(recoVtx.tracks()[0].vertexCompatibility, expVtx.trk1Comp,
0.003);
CHECK_CLOSE_OR_SMALL(recoVtx.tracks()[0].trackWeight, expVtx.trk1Weight,
relTol, small);
CHECK_CLOSE_OR_SMALL(recoVtx.tracks()[0].vertexCompatibility,
expVtx.trk1Comp, relTol, small);
}
}

Expand Down
Loading