From fa8ac48e58115b56adab6275812f8db9dd895eb3 Mon Sep 17 00:00:00 2001 From: Andreas Stefl Date: Wed, 2 Oct 2024 17:41:40 +0200 Subject: [PATCH 1/7] fix: Guarantee angle periodicity with KF filtering and smoothing --- .../TrackFitting/detail/GainMatrixUpdaterImpl.hpp | 5 +++++ Core/include/Acts/Utilities/detail/periodic.hpp | 12 ++++++++++++ Core/src/TrackFitting/GainMatrixSmoother.cpp | 4 ++++ Core/src/TrackFitting/MbfSmoother.cpp | 6 ++++++ 4 files changed, 27 insertions(+) diff --git a/Core/include/Acts/TrackFitting/detail/GainMatrixUpdaterImpl.hpp b/Core/include/Acts/TrackFitting/detail/GainMatrixUpdaterImpl.hpp index 7a6e1ec6434..c32aa1a3ba9 100644 --- a/Core/include/Acts/TrackFitting/detail/GainMatrixUpdaterImpl.hpp +++ b/Core/include/Acts/TrackFitting/detail/GainMatrixUpdaterImpl.hpp @@ -8,8 +8,10 @@ #pragma once +#include "Acts/Definitions/TrackParametrization.hpp" #include "Acts/TrackFitting/GainMatrixUpdater.hpp" #include "Acts/Utilities/Logger.hpp" +#include "Acts/Utilities/detail/periodic.hpp" #include #include @@ -60,6 +62,9 @@ std::tuple GainMatrixUpdater::visitMeasurementImpl( trackState.filtered = trackState.predicted + K * (calibrated - H * trackState.predicted); + // Normalize phi and theta + detail::normalizePhiThetaInplace(trackState.filtered[eBoundPhi], + trackState.filtered[eBoundTheta]); trackState.filteredCovariance = (BoundSquareMatrix::Identity() - K * H) * trackState.predictedCovariance; ACTS_VERBOSE("Filtered parameters: " << trackState.filtered.transpose()); diff --git a/Core/include/Acts/Utilities/detail/periodic.hpp b/Core/include/Acts/Utilities/detail/periodic.hpp index b128a1e7cc4..25d66bb93b4 100644 --- a/Core/include/Acts/Utilities/detail/periodic.hpp +++ b/Core/include/Acts/Utilities/detail/periodic.hpp @@ -9,6 +9,7 @@ #pragma once #include +#include namespace Acts::detail { @@ -90,4 +91,15 @@ inline std::pair normalizePhiTheta(T phi, T theta) { return {radian_sym(phi), theta}; } +/// Ensure both phi and theta direction angles are within the allowed range. +/// +/// See `normalizePhiTheta` for details. +/// +/// @param[in,out] phi Transverse direction angle +/// @param[in,out] theta Longitudinal direction angle +template +inline void normalizePhiThetaInplace(T& phi, T& theta) { + std::tie(phi, theta) = normalizePhiTheta(phi, theta); +} + } // namespace Acts::detail diff --git a/Core/src/TrackFitting/GainMatrixSmoother.cpp b/Core/src/TrackFitting/GainMatrixSmoother.cpp index 19d54bdcf4b..19506841c67 100644 --- a/Core/src/TrackFitting/GainMatrixSmoother.cpp +++ b/Core/src/TrackFitting/GainMatrixSmoother.cpp @@ -11,6 +11,7 @@ #include "Acts/Definitions/TrackParametrization.hpp" #include "Acts/EventData/detail/CovarianceHelper.hpp" #include "Acts/TrackFitting/KalmanFitterError.hpp" +#include "Acts/Utilities/detail/periodic.hpp" #include #include @@ -58,6 +59,9 @@ Result GainMatrixSmoother::calculate( // Calculate the smoothed parameters smoothed(ts) = filtered(ts) + G * (smoothed(prev_ts) - predicted(prev_ts)); + // Normalize phi and theta + detail::normalizePhiThetaInplace(smoothed(ts)[eBoundPhi], + smoothed(ts)[eBoundTheta]); ACTS_VERBOSE("Smoothed parameters are: " << smoothed(ts).transpose()); ACTS_VERBOSE("Calculate smoothed covariance:"); diff --git a/Core/src/TrackFitting/MbfSmoother.cpp b/Core/src/TrackFitting/MbfSmoother.cpp index 8ed74106bfb..b57ff675b31 100644 --- a/Core/src/TrackFitting/MbfSmoother.cpp +++ b/Core/src/TrackFitting/MbfSmoother.cpp @@ -8,6 +8,9 @@ #include "Acts/TrackFitting/MbfSmoother.hpp" +#include "Acts/Definitions/TrackParametrization.hpp" +#include "Acts/Utilities/detail/periodic.hpp" + namespace Acts { void MbfSmoother::calculateSmoothed(InternalTrackState& ts, @@ -17,6 +20,9 @@ void MbfSmoother::calculateSmoothed(InternalTrackState& ts, bigLambdaHat * ts.filteredCovariance; ts.smoothed = ts.filtered - ts.filteredCovariance * smallLambdaHat; + // Normalize phi and theta + detail::normalizePhiThetaInplace(ts.smoothed[eBoundPhi], + ts.smoothed[eBoundTheta]); } void MbfSmoother::visitNonMeasurement(const InternalTrackState& ts, From a96d7d97932ee01f50e2e67ecac6e8dd456726cc Mon Sep 17 00:00:00 2001 From: Andreas Stefl Date: Wed, 2 Oct 2024 21:38:00 +0200 Subject: [PATCH 2/7] more periodic treatment --- Core/src/TrackFitting/GainMatrixSmoother.cpp | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/Core/src/TrackFitting/GainMatrixSmoother.cpp b/Core/src/TrackFitting/GainMatrixSmoother.cpp index 19506841c67..91fe34d7be0 100644 --- a/Core/src/TrackFitting/GainMatrixSmoother.cpp +++ b/Core/src/TrackFitting/GainMatrixSmoother.cpp @@ -57,8 +57,14 @@ Result GainMatrixSmoother::calculate( ACTS_VERBOSE( "Prev. predicted parameters: " << predicted(prev_ts).transpose()); + BoundVector smoothedMinusPredicted = smoothed(prev_ts) - predicted(prev_ts); + smoothedMinusPredicted[eBoundPhi] = detail::difference_periodic( + smoothed(prev_ts)[eBoundPhi], predicted(prev_ts)[eBoundPhi], 2 * M_PI); + smoothedMinusPredicted[eBoundTheta] = detail::difference_periodic( + smoothed(prev_ts)[eBoundTheta], predicted(prev_ts)[eBoundTheta], M_PI); + // Calculate the smoothed parameters - smoothed(ts) = filtered(ts) + G * (smoothed(prev_ts) - predicted(prev_ts)); + smoothed(ts) = filtered(ts) + G * smoothedMinusPredicted; // Normalize phi and theta detail::normalizePhiThetaInplace(smoothed(ts)[eBoundPhi], smoothed(ts)[eBoundTheta]); From e4585d8068e47eb7a54d464ca547ca78293594b9 Mon Sep 17 00:00:00 2001 From: Andreas Stefl Date: Thu, 3 Oct 2024 09:10:22 +0200 Subject: [PATCH 3/7] create helper --- .../Acts/EventData/TrackParameterHelpers.hpp | 32 +++++++++++++++++++ .../detail/GainMatrixUpdaterImpl.hpp | 4 +-- .../Acts/Utilities/detail/periodic.hpp | 11 ------- Core/src/TrackFitting/GainMatrixSmoother.cpp | 13 +++----- Core/src/TrackFitting/MbfSmoother.cpp | 4 +-- 5 files changed, 40 insertions(+), 24 deletions(-) create mode 100644 Core/include/Acts/EventData/TrackParameterHelpers.hpp diff --git a/Core/include/Acts/EventData/TrackParameterHelpers.hpp b/Core/include/Acts/EventData/TrackParameterHelpers.hpp new file mode 100644 index 00000000000..d3b7b00686f --- /dev/null +++ b/Core/include/Acts/EventData/TrackParameterHelpers.hpp @@ -0,0 +1,32 @@ +// This file is part of the ACTS project. +// +// Copyright (C) 2016 CERN for the benefit of the ACTS project +// +// This Source Code Form is subject to the terms of the Mozilla Public +// License, v. 2.0. If a copy of the MPL was not distributed with this +// file, You can obtain one at https://mozilla.org/MPL/2.0/. + +#pragma once + +#include "Acts/Definitions/Algebra.hpp" +#include "Acts/Definitions/TrackParametrization.hpp" +#include "Acts/Utilities/detail/periodic.hpp" + +namespace Acts { + +inline BoundVector normalizeBoundParameters(const BoundVector& boundParams) { + BoundVector result = boundParams; + std::tie(result[eBoundPhi], result[eBoundTheta]) = + detail::normalizePhiTheta(result[eBoundPhi], result[eBoundTheta]); + return result; +} + +inline BoundVector subtractBoundParameters(const BoundVector& lhs, + const BoundVector& rhs) { + BoundVector result = lhs - rhs; + result[eBoundPhi] = + detail::difference_periodic(lhs[eBoundPhi], rhs[eBoundPhi], 2 * M_PI); + return result; +} + +} // namespace Acts diff --git a/Core/include/Acts/TrackFitting/detail/GainMatrixUpdaterImpl.hpp b/Core/include/Acts/TrackFitting/detail/GainMatrixUpdaterImpl.hpp index c32aa1a3ba9..8208a2d87b5 100644 --- a/Core/include/Acts/TrackFitting/detail/GainMatrixUpdaterImpl.hpp +++ b/Core/include/Acts/TrackFitting/detail/GainMatrixUpdaterImpl.hpp @@ -9,6 +9,7 @@ #pragma once #include "Acts/Definitions/TrackParametrization.hpp" +#include "Acts/EventData/TrackParameterHelpers.hpp" #include "Acts/TrackFitting/GainMatrixUpdater.hpp" #include "Acts/Utilities/Logger.hpp" #include "Acts/Utilities/detail/periodic.hpp" @@ -63,8 +64,7 @@ std::tuple GainMatrixUpdater::visitMeasurementImpl( trackState.filtered = trackState.predicted + K * (calibrated - H * trackState.predicted); // Normalize phi and theta - detail::normalizePhiThetaInplace(trackState.filtered[eBoundPhi], - trackState.filtered[eBoundTheta]); + trackState.filtered = normalizeBoundParameters(trackState.filtered); trackState.filteredCovariance = (BoundSquareMatrix::Identity() - K * H) * trackState.predictedCovariance; ACTS_VERBOSE("Filtered parameters: " << trackState.filtered.transpose()); diff --git a/Core/include/Acts/Utilities/detail/periodic.hpp b/Core/include/Acts/Utilities/detail/periodic.hpp index 25d66bb93b4..a9853c571ca 100644 --- a/Core/include/Acts/Utilities/detail/periodic.hpp +++ b/Core/include/Acts/Utilities/detail/periodic.hpp @@ -91,15 +91,4 @@ inline std::pair normalizePhiTheta(T phi, T theta) { return {radian_sym(phi), theta}; } -/// Ensure both phi and theta direction angles are within the allowed range. -/// -/// See `normalizePhiTheta` for details. -/// -/// @param[in,out] phi Transverse direction angle -/// @param[in,out] theta Longitudinal direction angle -template -inline void normalizePhiThetaInplace(T& phi, T& theta) { - std::tie(phi, theta) = normalizePhiTheta(phi, theta); -} - } // namespace Acts::detail diff --git a/Core/src/TrackFitting/GainMatrixSmoother.cpp b/Core/src/TrackFitting/GainMatrixSmoother.cpp index 91fe34d7be0..47f902e162b 100644 --- a/Core/src/TrackFitting/GainMatrixSmoother.cpp +++ b/Core/src/TrackFitting/GainMatrixSmoother.cpp @@ -9,6 +9,7 @@ #include "Acts/TrackFitting/GainMatrixSmoother.hpp" #include "Acts/Definitions/TrackParametrization.hpp" +#include "Acts/EventData/TrackParameterHelpers.hpp" #include "Acts/EventData/detail/CovarianceHelper.hpp" #include "Acts/TrackFitting/KalmanFitterError.hpp" #include "Acts/Utilities/detail/periodic.hpp" @@ -57,17 +58,11 @@ Result GainMatrixSmoother::calculate( ACTS_VERBOSE( "Prev. predicted parameters: " << predicted(prev_ts).transpose()); - BoundVector smoothedMinusPredicted = smoothed(prev_ts) - predicted(prev_ts); - smoothedMinusPredicted[eBoundPhi] = detail::difference_periodic( - smoothed(prev_ts)[eBoundPhi], predicted(prev_ts)[eBoundPhi], 2 * M_PI); - smoothedMinusPredicted[eBoundTheta] = detail::difference_periodic( - smoothed(prev_ts)[eBoundTheta], predicted(prev_ts)[eBoundTheta], M_PI); - // Calculate the smoothed parameters - smoothed(ts) = filtered(ts) + G * smoothedMinusPredicted; + smoothed(ts) = filtered(ts) + G * subtractBoundParameters(smoothed(prev_ts), + predicted(prev_ts)); // Normalize phi and theta - detail::normalizePhiThetaInplace(smoothed(ts)[eBoundPhi], - smoothed(ts)[eBoundTheta]); + smoothed(ts) = normalizeBoundParameters(smoothed(ts)); ACTS_VERBOSE("Smoothed parameters are: " << smoothed(ts).transpose()); ACTS_VERBOSE("Calculate smoothed covariance:"); diff --git a/Core/src/TrackFitting/MbfSmoother.cpp b/Core/src/TrackFitting/MbfSmoother.cpp index b57ff675b31..a33a5dc251e 100644 --- a/Core/src/TrackFitting/MbfSmoother.cpp +++ b/Core/src/TrackFitting/MbfSmoother.cpp @@ -9,6 +9,7 @@ #include "Acts/TrackFitting/MbfSmoother.hpp" #include "Acts/Definitions/TrackParametrization.hpp" +#include "Acts/EventData/TrackParameterHelpers.hpp" #include "Acts/Utilities/detail/periodic.hpp" namespace Acts { @@ -21,8 +22,7 @@ void MbfSmoother::calculateSmoothed(InternalTrackState& ts, ts.filteredCovariance; ts.smoothed = ts.filtered - ts.filteredCovariance * smallLambdaHat; // Normalize phi and theta - detail::normalizePhiThetaInplace(ts.smoothed[eBoundPhi], - ts.smoothed[eBoundTheta]); + ts.smoothed = normalizeBoundParameters(ts.smoothed); } void MbfSmoother::visitNonMeasurement(const InternalTrackState& ts, From 977f00561da3a1f4135bb67583141d027f3303f4 Mon Sep 17 00:00:00 2001 From: Andreas Stefl Date: Fri, 18 Oct 2024 09:52:22 +0200 Subject: [PATCH 4/7] doc and clean --- .../include/Acts/EventData/TrackParameterHelpers.hpp | 12 ++++++++++++ .../TrackFitting/detail/GainMatrixUpdaterImpl.hpp | 2 -- Core/include/Acts/Utilities/detail/periodic.hpp | 1 - Core/src/TrackFitting/GainMatrixSmoother.cpp | 1 - Core/src/TrackFitting/MbfSmoother.cpp | 2 -- 5 files changed, 12 insertions(+), 6 deletions(-) diff --git a/Core/include/Acts/EventData/TrackParameterHelpers.hpp b/Core/include/Acts/EventData/TrackParameterHelpers.hpp index d3b7b00686f..cd68b5ae6a4 100644 --- a/Core/include/Acts/EventData/TrackParameterHelpers.hpp +++ b/Core/include/Acts/EventData/TrackParameterHelpers.hpp @@ -14,6 +14,11 @@ namespace Acts { +/// Normalize the bound parameter angles +/// +/// @param boundParams The bound parameters to normalize +/// +/// @return The normalized bound parameters inline BoundVector normalizeBoundParameters(const BoundVector& boundParams) { BoundVector result = boundParams; std::tie(result[eBoundPhi], result[eBoundTheta]) = @@ -21,6 +26,13 @@ inline BoundVector normalizeBoundParameters(const BoundVector& boundParams) { return result; } +/// Subtract bound parameters and take care of angle periodicity for phi and +/// theta. +/// +/// @param lhs The left hand side bound parameters +/// @param rhs The right hand side bound parameters +/// +/// @return The difference of the bound parameters inline BoundVector subtractBoundParameters(const BoundVector& lhs, const BoundVector& rhs) { BoundVector result = lhs - rhs; diff --git a/Core/include/Acts/TrackFitting/detail/GainMatrixUpdaterImpl.hpp b/Core/include/Acts/TrackFitting/detail/GainMatrixUpdaterImpl.hpp index 8208a2d87b5..0dce3c2ba21 100644 --- a/Core/include/Acts/TrackFitting/detail/GainMatrixUpdaterImpl.hpp +++ b/Core/include/Acts/TrackFitting/detail/GainMatrixUpdaterImpl.hpp @@ -8,11 +8,9 @@ #pragma once -#include "Acts/Definitions/TrackParametrization.hpp" #include "Acts/EventData/TrackParameterHelpers.hpp" #include "Acts/TrackFitting/GainMatrixUpdater.hpp" #include "Acts/Utilities/Logger.hpp" -#include "Acts/Utilities/detail/periodic.hpp" #include #include diff --git a/Core/include/Acts/Utilities/detail/periodic.hpp b/Core/include/Acts/Utilities/detail/periodic.hpp index a9853c571ca..b128a1e7cc4 100644 --- a/Core/include/Acts/Utilities/detail/periodic.hpp +++ b/Core/include/Acts/Utilities/detail/periodic.hpp @@ -9,7 +9,6 @@ #pragma once #include -#include namespace Acts::detail { diff --git a/Core/src/TrackFitting/GainMatrixSmoother.cpp b/Core/src/TrackFitting/GainMatrixSmoother.cpp index 47f902e162b..711540ff0bf 100644 --- a/Core/src/TrackFitting/GainMatrixSmoother.cpp +++ b/Core/src/TrackFitting/GainMatrixSmoother.cpp @@ -12,7 +12,6 @@ #include "Acts/EventData/TrackParameterHelpers.hpp" #include "Acts/EventData/detail/CovarianceHelper.hpp" #include "Acts/TrackFitting/KalmanFitterError.hpp" -#include "Acts/Utilities/detail/periodic.hpp" #include #include diff --git a/Core/src/TrackFitting/MbfSmoother.cpp b/Core/src/TrackFitting/MbfSmoother.cpp index a33a5dc251e..2614834aadb 100644 --- a/Core/src/TrackFitting/MbfSmoother.cpp +++ b/Core/src/TrackFitting/MbfSmoother.cpp @@ -8,9 +8,7 @@ #include "Acts/TrackFitting/MbfSmoother.hpp" -#include "Acts/Definitions/TrackParametrization.hpp" #include "Acts/EventData/TrackParameterHelpers.hpp" -#include "Acts/Utilities/detail/periodic.hpp" namespace Acts { From 68002cfc868d038d5976f2c18ba2ba34fea3e21b Mon Sep 17 00:00:00 2001 From: Andreas Stefl Date: Fri, 18 Oct 2024 09:52:56 +0200 Subject: [PATCH 5/7] update hashes --- Examples/Python/tests/root_file_hashes.txt | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/Examples/Python/tests/root_file_hashes.txt b/Examples/Python/tests/root_file_hashes.txt index 6ddb1a405cd..2b7f935043e 100644 --- a/Examples/Python/tests/root_file_hashes.txt +++ b/Examples/Python/tests/root_file_hashes.txt @@ -20,7 +20,7 @@ test_propagation__propagation_summary.root: 280c1a6fcfe71974ac39587b4afad27a3164 test_material_recording__geant4_material_tracks.root: c022b9362249b29f57a07926b20644e3ab4ab8ebcf03f773fbf46c446fc1a0a1 test_truth_tracking_gsf[generic]__trackstates_gsf.root: 4df2c69d5dd7d5446a547651e4e962daf17924f5c8617165a93a3223c8ba18fd test_truth_tracking_gsf[generic]__tracksummary_gsf.root: 8c01d139cb865afa1959c62dbca76f3a1fb8b684c57ea4c2968baa6ffedadb6f -test_truth_tracking_gsf[odd]__trackstates_gsf.root: 8e6559aaec4fada8b82cfcad5801f3a609c6c905c3172fc044473cef7de77870 +test_truth_tracking_gsf[odd]__trackstates_gsf.root: c7397e53ea093f2432943ae263fc99bc9aa774504ea6152c6907066a06d21caf test_truth_tracking_gsf[odd]__tracksummary_gsf.root: 4562341f12a61ea0d5e25872b6bf466b79a73781dc95fc18ef9c6515f0a47916 test_particle_gun__particles.root: 5fe7dda2933ee6b9615b064d192322fe07831133cd998e5ed99a3b992b713a10 test_material_mapping__material-map_tracks.root: 938b1a855369e9304401cb10d2751df3fd7acf32a2573f2057eb1691cd94edf3 @@ -33,21 +33,21 @@ 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: 63ec81635979058fb8976f94455bf490cf92b7b142c4a05cc39de6225f5de2fb -test_ckf_tracks_example[generic-full_seeding]__trackstates_ckf.root: 35249a79237804bce337d797986e1082c6987f0700e30877f6f217f9ac91d36a +test_ckf_tracks_example[generic-full_seeding]__trackstates_ckf.root: 7c48ec32a2cb1723416a9791a8067ef09825fcf71a6cf561c1f6d2ab9dc1c1ad test_ckf_tracks_example[generic-full_seeding]__tracksummary_ckf.root: e6b9e539998ba007e9b7d2c8d9d022c47726a39e8ab9b1724c52b1d78234be03 test_ckf_tracks_example[generic-full_seeding]__performance_seeding_trees.root: 0e0676ffafdb27112fbda50d1cf627859fa745760f98073261dcf6db3f2f991e -test_ckf_tracks_example[generic-truth_estimated]__trackstates_ckf.root: a8c5c6f6c1e6303b887d47b509b7f71a2ffa5f38638fe46ce5bce76fd20d64ca +test_ckf_tracks_example[generic-truth_estimated]__trackstates_ckf.root: df730fd00a7e6a0941f5f94c07ea9cffdb763853272d284d25bec0eb2072bb2e test_ckf_tracks_example[generic-truth_estimated]__tracksummary_ckf.root: 417f7326e1e1bb4519f1378145ac733bdda6653eb9871fd69e455e0269d996a6 test_ckf_tracks_example[generic-truth_estimated]__performance_seeding.root: 1facb05c066221f6361b61f015cdf0918e94d9f3fce2269ec7b6a4dffeb2bc7e -test_ckf_tracks_example[generic-truth_smeared]__trackstates_ckf.root: de11c0868a70ade0dcc80465d4e6dcf1dd7fcf8149603b47ee7d87d862a6534a +test_ckf_tracks_example[generic-truth_smeared]__trackstates_ckf.root: a50d54ba11926b71e1bc338827ffac007e4951f8341a8b5f9d7cfffe593c4c57 test_ckf_tracks_example[generic-truth_smeared]__tracksummary_ckf.root: f18e9ecce6d9585fd150c5aafc9ac225a5bab342aaab50a28283ba879691af1f -test_ckf_tracks_example[odd-full_seeding]__trackstates_ckf.root: 463d6aaed4d869652b5b184940e789cde0fb441bdd135813b85462a515e6480a +test_ckf_tracks_example[odd-full_seeding]__trackstates_ckf.root: 7b4232c6bea130f86d54c0d1a80dff071fccaabe3be3b1503559e53aaa430ed4 test_ckf_tracks_example[odd-full_seeding]__tracksummary_ckf.root: a8ad83a07b48d4cfcf70d0e6fdc3c8997eb03c1f8c2a7be27ea888b099000d79 test_ckf_tracks_example[odd-full_seeding]__performance_seeding_trees.root: 43c58577aafe07645e5660c4f43904efadf91d8cda45c5c04c248bbe0f59814f -test_ckf_tracks_example[odd-truth_estimated]__trackstates_ckf.root: 247dd581cc177625c0286718261c004e2149536d70c8281dfaf697879a84d76d +test_ckf_tracks_example[odd-truth_estimated]__trackstates_ckf.root: ae7dd1260cc7f19ec66cb778b25a1f3fc344f354598d9dbe4de0a1ef32043c2d test_ckf_tracks_example[odd-truth_estimated]__tracksummary_ckf.root: 1b08a80e73aedf5cf38a3a407794b82297bec37f556ad4efcda3489a1b17d4d2 test_ckf_tracks_example[odd-truth_estimated]__performance_seeding.root: 1a36b7017e59f1c08602ef3c2cb0483c51df248f112e3780c66594110719c575 -test_ckf_tracks_example[odd-truth_smeared]__trackstates_ckf.root: 7adfc2bf5ee35a126b713187dd8b11f4497cf864a4a83e57a40885688974413e +test_ckf_tracks_example[odd-truth_smeared]__trackstates_ckf.root: f88910e18e4c70cad4fda6d1359a65323e7b584a577f9464bb6338a9392fcbb1 test_ckf_tracks_example[odd-truth_smeared]__tracksummary_ckf.root: 7a9de8a8bd1c09f7b4d1c547f824af6c8123afb044dd429180b0d13e47d6f975 test_vertex_fitting_reading[Truth-False-100]__performance_vertexing.root: 76ef6084d758dfdfc0151ddec2170e12d73394424e3dac4ffe46f0f339ec8293 test_vertex_fitting_reading[Iterative-False-100]__performance_vertexing.root: 60372210c830a04f95ceb78c6c68a9b0de217746ff59e8e73053750c837b57eb From 5e25b0dc0b84a525e7ab86a60c7756696ff4957e Mon Sep 17 00:00:00 2001 From: Andreas Stefl Date: Fri, 18 Oct 2024 16:34:11 +0200 Subject: [PATCH 6/7] update hashes --- Examples/Python/tests/root_file_hashes.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Examples/Python/tests/root_file_hashes.txt b/Examples/Python/tests/root_file_hashes.txt index dbf4021ea53..31124684a27 100644 --- a/Examples/Python/tests/root_file_hashes.txt +++ b/Examples/Python/tests/root_file_hashes.txt @@ -39,15 +39,15 @@ test_ckf_tracks_example[generic-full_seeding]__performance_seeding_trees.root: 0 test_ckf_tracks_example[generic-truth_estimated]__trackstates_ckf.root: df730fd00a7e6a0941f5f94c07ea9cffdb763853272d284d25bec0eb2072bb2e test_ckf_tracks_example[generic-truth_estimated]__tracksummary_ckf.root: 417f7326e1e1bb4519f1378145ac733bdda6653eb9871fd69e455e0269d996a6 test_ckf_tracks_example[generic-truth_estimated]__performance_seeding.root: 1facb05c066221f6361b61f015cdf0918e94d9f3fce2269ec7b6a4dffeb2bc7e -test_ckf_tracks_example[generic-truth_smeared]__trackstates_ckf.root: edf0b06ce9ee0e4fcb153e41859af7b5153271de18f49a6842a23ad2d66b7e09 +test_ckf_tracks_example[generic-truth_smeared]__trackstates_ckf.root: 82a6744980553e6274df78eea15f0dec22676b1c04e14afc3828bff9bbf5e1b1 test_ckf_tracks_example[generic-truth_smeared]__tracksummary_ckf.root: 06d6ae1d05cb611b19df3c59531997c9b0108f5ef6027d76c4827bd2d9edb921 -test_ckf_tracks_example[odd-full_seeding]__trackstates_ckf.root: 463d6aaed4d869652b5b184940e789cde0fb441bdd135813b85462a515e6480a +test_ckf_tracks_example[odd-full_seeding]__trackstates_ckf.root: 7b4232c6bea130f86d54c0d1a80dff071fccaabe3be3b1503559e53aaa430ed4 test_ckf_tracks_example[odd-full_seeding]__tracksummary_ckf.root: a8ad83a07b48d4cfcf70d0e6fdc3c8997eb03c1f8c2a7be27ea888b099000d79 test_ckf_tracks_example[odd-full_seeding]__performance_seeding_trees.root: 43c58577aafe07645e5660c4f43904efadf91d8cda45c5c04c248bbe0f59814f test_ckf_tracks_example[odd-truth_estimated]__trackstates_ckf.root: ae7dd1260cc7f19ec66cb778b25a1f3fc344f354598d9dbe4de0a1ef32043c2d test_ckf_tracks_example[odd-truth_estimated]__tracksummary_ckf.root: 1b08a80e73aedf5cf38a3a407794b82297bec37f556ad4efcda3489a1b17d4d2 test_ckf_tracks_example[odd-truth_estimated]__performance_seeding.root: 1a36b7017e59f1c08602ef3c2cb0483c51df248f112e3780c66594110719c575 -test_ckf_tracks_example[odd-truth_smeared]__trackstates_ckf.root: a9621b535ea2912d172142394f51f68e4e7dc255b32d479d6305fa599152b420 +test_ckf_tracks_example[odd-truth_smeared]__trackstates_ckf.root: 6363c957b783da233b433380a0006d62256fda71d11d5ac0ae4910f8bd3f35e5 test_ckf_tracks_example[odd-truth_smeared]__tracksummary_ckf.root: af1a6bb16a070db7ed8043e2188d56f0034843099fc3c332731c4cf86ba39c57 test_vertex_fitting_reading[Truth-False-100]__performance_vertexing.root: 76ef6084d758dfdfc0151ddec2170e12d73394424e3dac4ffe46f0f339ec8293 test_vertex_fitting_reading[Iterative-False-100]__performance_vertexing.root: 60372210c830a04f95ceb78c6c68a9b0de217746ff59e8e73053750c837b57eb From 1965702fa576b6a06e70a2723821412f57b58a5d Mon Sep 17 00:00:00 2001 From: Andreas Stefl Date: Fri, 18 Oct 2024 22:02:51 +0200 Subject: [PATCH 7/7] update hashes --- Examples/Python/tests/root_file_hashes.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Examples/Python/tests/root_file_hashes.txt b/Examples/Python/tests/root_file_hashes.txt index cde2565f410..21306d5c43f 100644 --- a/Examples/Python/tests/root_file_hashes.txt +++ b/Examples/Python/tests/root_file_hashes.txt @@ -41,13 +41,13 @@ test_ckf_tracks_example[generic-truth_estimated]__tracksummary_ckf.root: 417f732 test_ckf_tracks_example[generic-truth_estimated]__performance_seeding.root: 1facb05c066221f6361b61f015cdf0918e94d9f3fce2269ec7b6a4dffeb2bc7e test_ckf_tracks_example[generic-truth_smeared]__trackstates_ckf.root: 82a6744980553e6274df78eea15f0dec22676b1c04e14afc3828bff9bbf5e1b1 test_ckf_tracks_example[generic-truth_smeared]__tracksummary_ckf.root: 06d6ae1d05cb611b19df3c59531997c9b0108f5ef6027d76c4827bd2d9edb921 -test_ckf_tracks_example[odd-full_seeding]__trackstates_ckf.root: 6411378b31c1612120318773f8b807ce83a76e07c90a5f308ea86c6b34d02661 +test_ckf_tracks_example[odd-full_seeding]__trackstates_ckf.root: 0fb43661cc3a7973c28940a283dc168ceb13bc60badf1f520096edaa5982a039 test_ckf_tracks_example[odd-full_seeding]__tracksummary_ckf.root: c2e029e462d4ca77df2c7f8963093da43be66c8279ca2cc9aee8c0bc35259eec test_ckf_tracks_example[odd-full_seeding]__performance_seeding_trees.root: 43c58577aafe07645e5660c4f43904efadf91d8cda45c5c04c248bbe0f59814f -test_ckf_tracks_example[odd-truth_estimated]__trackstates_ckf.root: 465bb9e982982eb2e79fc97cae9f513ff5937041da546081281f1f959d8173ea +test_ckf_tracks_example[odd-truth_estimated]__trackstates_ckf.root: 39ac67c47f371c576d7094bca987a04e0315bd286dc79503a63a5f568b58ac97 test_ckf_tracks_example[odd-truth_estimated]__tracksummary_ckf.root: 59e2c75e9524653a80a9fd62fe99e958f73f80aa09240dcbb4ea469372e4811d test_ckf_tracks_example[odd-truth_estimated]__performance_seeding.root: 1a36b7017e59f1c08602ef3c2cb0483c51df248f112e3780c66594110719c575 -test_ckf_tracks_example[odd-truth_smeared]__trackstates_ckf.root: 9cbf99353d71ee4e6779bffb231043b41db6219c9544a80fe5172f4a4fe60cbe +test_ckf_tracks_example[odd-truth_smeared]__trackstates_ckf.root: 35a65e15a6f479f628a96f56ee78e1ac371d71a686ee0c974944d681499fe6bd test_ckf_tracks_example[odd-truth_smeared]__tracksummary_ckf.root: 3e257de624674fa9a19dcc72598c78c29a52633821acaa56dc2aa39a1395f1b5 test_vertex_fitting_reading[Truth-False-100]__performance_vertexing.root: 76ef6084d758dfdfc0151ddec2170e12d73394424e3dac4ffe46f0f339ec8293 test_vertex_fitting_reading[Iterative-False-100]__performance_vertexing.root: 60372210c830a04f95ceb78c6c68a9b0de217746ff59e8e73053750c837b57eb