Skip to content

Commit

Permalink
fix: Handle holes after measurement selection in Core CKF (#3413)
Browse files Browse the repository at this point in the history
After the refactoring of the measurement selector it is possible that we end up with no measurements after selection. That case was not handled by the Core CKF yet.

The current solution carries some duplication with the other hole handling. I do not see a great way to unify them. Potentially a combination of source link accessor and track state creator could solve this.

blocked by
- #3426
- #3427
- #3428
- #3438
  • Loading branch information
andiwand authored Jul 29, 2024
1 parent 29589b7 commit b2fb7fd
Show file tree
Hide file tree
Showing 19 changed files with 230 additions and 187 deletions.
Binary file modified CI/physmon/reference/performance_ambi_orthogonal.root
Binary file not shown.
Binary file modified CI/physmon/reference/performance_ambi_seeded.root
Binary file not shown.
Binary file modified CI/physmon/reference/performance_ambi_ttbar.root
Binary file not shown.
Binary file modified CI/physmon/reference/performance_amvf_gridseeder_ttbar_hist.root
Binary file not shown.
Binary file modified CI/physmon/reference/performance_amvf_truth_estimated_hist.root
Binary file not shown.
Binary file modified CI/physmon/reference/performance_amvf_ttbar_hist.root
Binary file not shown.
Binary file modified CI/physmon/reference/performance_ckf_orthogonal.root
Binary file not shown.
Binary file modified CI/physmon/reference/performance_ckf_seeded.root
Binary file not shown.
Binary file modified CI/physmon/reference/performance_ckf_truth_estimated.root
Binary file not shown.
Binary file modified CI/physmon/reference/performance_ckf_truth_smeared.root
Binary file not shown.
Binary file modified CI/physmon/reference/performance_ckf_ttbar.root
Binary file not shown.
Binary file modified CI/physmon/reference/tracksummary_ckf_orthogonal_hist.root
Binary file not shown.
Binary file modified CI/physmon/reference/tracksummary_ckf_seeded_hist.root
Binary file not shown.
Binary file modified CI/physmon/reference/tracksummary_ckf_truth_estimated_hist.root
Binary file not shown.
Binary file modified CI/physmon/reference/tracksummary_ckf_truth_smeared_hist.root
Binary file not shown.
Binary file modified CI/physmon/reference/tracksummary_ckf_ttbar_hist.root
Binary file not shown.
391 changes: 216 additions & 175 deletions Core/include/Acts/TrackFinding/CombinatorialKalmanFilter.hpp

Large diffs are not rendered by default.

24 changes: 12 additions & 12 deletions Examples/Python/tests/root_file_hashes.txt
Original file line number Diff line number Diff line change
Expand Up @@ -44,22 +44,22 @@ test_digitization_example_input[smeared]__particles.root: 5fe7dda2933ee6b9615b06
test_digitization_example_input[smeared]__measurements.root: 243c2f69b7b0db9dbeaa7494d4ea0f3dd1691dc90f16e10df6c0491ff4dc7d62
test_digitization_example_input[geometric]__particles.root: 5fe7dda2933ee6b9615b064d192322fe07831133cd998e5ed99a3b992b713a10
test_digitization_example_input[geometric]__measurements.root: 393e5d0278dceedb9be0efccafc5fceb024e2ef8ed919f351910c60606399f88
test_ckf_tracks_example[generic-full_seeding]__trackstates_ckf.root: 506ac5761480a1288237de04090c889be56ba67ac32ebd4c3e9c3685f01159c5
test_ckf_tracks_example[generic-full_seeding]__tracksummary_ckf.root: f55551fccb8fb7fd859725a8b5398a40d80d62c790dcc2f2676343000f9165cd
test_ckf_tracks_example[generic-full_seeding]__trackstates_ckf.root: 8cd6dc0ad6037bd6d1ab205f263f5ebe8fc86e8c773d0629728c22d0fbb5d066
test_ckf_tracks_example[generic-full_seeding]__tracksummary_ckf.root: 5984798e8c402a0dab3f9ae5b7ac233ea4a52c321b1102f8755aeb6758b4f698
test_ckf_tracks_example[generic-full_seeding]__performance_seeding_trees.root: 0e0676ffafdb27112fbda50d1cf627859fa745760f98073261dcf6db3f2f991e
test_ckf_tracks_example[generic-truth_estimated]__trackstates_ckf.root: e3a3412df2169c321ce76454e5c9fa21563d3abe8b0743170d7003462879b6f3
test_ckf_tracks_example[generic-truth_estimated]__tracksummary_ckf.root: 2fab4f59cc4c919cb2449b1a335701d2a417782dfa38b233f68495c002308a64
test_ckf_tracks_example[generic-truth_estimated]__trackstates_ckf.root: 5b97e5c48d871673ffe293f78a90337020023829d4206bcfdc9e48817e9bc012
test_ckf_tracks_example[generic-truth_estimated]__tracksummary_ckf.root: b9810fd18e5b9624edde9c7073b176422ade6369a33b35a56f453a05e4a7c9f9
test_ckf_tracks_example[generic-truth_estimated]__performance_seeding.root: 1facb05c066221f6361b61f015cdf0918e94d9f3fce2269ec7b6a4dffeb2bc7e
test_ckf_tracks_example[generic-truth_smeared]__trackstates_ckf.root: f53e94c4e074470af29ca92989466f80ee502bbf087347d70e6043ae47b674bf
test_ckf_tracks_example[generic-truth_smeared]__tracksummary_ckf.root: 9c43bdbb40b798bd56a11c4583640b680109aed57fa40d27f1217de5f85acd47
test_ckf_tracks_example[odd-full_seeding]__trackstates_ckf.root: 3e924c1a9375712e81315241dfa73d5fdbe2a7319c5b1e3db0a07762024a1fb6
test_ckf_tracks_example[odd-full_seeding]__tracksummary_ckf.root: 5d4baf4c33c2fbb4c6b86925f13485c523f27b1efb6cfa4fa966ae77ae222df4
test_ckf_tracks_example[generic-truth_smeared]__trackstates_ckf.root: 1453ee28e9106b461b0ee2562117e4c05d708f4f9c50ca1001a4997dd6a809bf
test_ckf_tracks_example[generic-truth_smeared]__tracksummary_ckf.root: 361ac63df407626dad07e7b48391e3afabd5a34e7d2ac17fedfc5dd866844a74
test_ckf_tracks_example[odd-full_seeding]__trackstates_ckf.root: 753f44b7c918a0968f37c09d226176c040f125b1af85afd2329301be1e59df87
test_ckf_tracks_example[odd-full_seeding]__tracksummary_ckf.root: 518808b69b6cba928b05feb871887ae6a17c74e7345d79057b3f2629274c805f
test_ckf_tracks_example[odd-full_seeding]__performance_seeding_trees.root: 43c58577aafe07645e5660c4f43904efadf91d8cda45c5c04c248bbe0f59814f
test_ckf_tracks_example[odd-truth_estimated]__trackstates_ckf.root: 17e793123839dbb881580e4790f67803347d18012634404b2260b7a0651afbbd
test_ckf_tracks_example[odd-truth_estimated]__tracksummary_ckf.root: d41383352928c20df319800026f1a01a09d0f3027c514b1c90513057c5779ee1
test_ckf_tracks_example[odd-truth_estimated]__trackstates_ckf.root: 6acb0865750353a256dca5cb965ac0d885a784f3397b0598de1945c0d9b5d7a1
test_ckf_tracks_example[odd-truth_estimated]__tracksummary_ckf.root: 5f9a791e0b067f01966786a5cc600965dad021f8ffb2fb79bdc5d90536cd3c2e
test_ckf_tracks_example[odd-truth_estimated]__performance_seeding.root: 1a36b7017e59f1c08602ef3c2cb0483c51df248f112e3780c66594110719c575
test_ckf_tracks_example[odd-truth_smeared]__trackstates_ckf.root: 9dbd4b23e05914b50c981d9d0f73314cc8527b80d26b238a385dbdeec45c87e5
test_ckf_tracks_example[odd-truth_smeared]__tracksummary_ckf.root: e2aaf2bdafb5757698ee7a1db542c4612ab35ea305dbfb7908dc204974a85ffe
test_ckf_tracks_example[odd-truth_smeared]__trackstates_ckf.root: 43c0fc84b285c8acb2a4b3a1bfa2b5e9196253ac46c3c59e37dc5811beae331b
test_ckf_tracks_example[odd-truth_smeared]__tracksummary_ckf.root: dc0092eaf2fd1159a08eba22b483bdc45c8bc27d57ad758fa80e7820e3e97e86
test_vertex_fitting_reading[Truth-False-100]__performance_vertexing.root: 76ef6084d758dfdfc0151ddec2170e12d73394424e3dac4ffe46f0f339ec8293
test_vertex_fitting_reading[Iterative-False-100]__performance_vertexing.root: 60372210c830a04f95ceb78c6c68a9b0de217746ff59e8e73053750c837b57eb
test_vertex_fitting_reading[Iterative-True-100]__performance_vertexing.root: e34f217d524a5051dbb04a811d3407df3ebe2cc4bb7f54f6bda0847dbd7b52c3
Expand Down
2 changes: 2 additions & 0 deletions Examples/Scripts/Python/full_chain_odd.py
Original file line number Diff line number Diff line change
Expand Up @@ -348,6 +348,8 @@
maxOutliers=2,
),
CkfConfig(
chi2CutOff=15,
numMeasurementsCutOff=10,
seedDeduplication=True,
stayOnSeed=True,
pixelVolumes={16, 17, 18},
Expand Down

0 comments on commit b2fb7fd

Please sign in to comment.