From d57d970951ce6af6c9793a1390b9f8aad5c94732 Mon Sep 17 00:00:00 2001 From: Miroslav Saur Date: Sun, 27 Jul 2025 13:37:57 +0000 Subject: [PATCH] Merge branch 'msaur_2024-patches_backport_LHCb4739' into '2024-patches' Adding exclusions for FSR for LHCb!5141 See merge request lhcb/Moore!5055 (cherry picked from commit 06a0aa2c8cf4935c13bf2d8960cf0a73ecb834bf) 0238f564 Adding exclusions for FSR c98c2932 Adding 'write_decoding_keys_to_git' to... Co-authored-by: Miroslav Saur --- .../lbexec_yamls/spruce_example_realtime_extraoutputs.yaml | 3 ++- .../lbexec_yamls/spruce_example_realtime_persistreco.yaml | 3 ++- Hlt/Moore/python/Moore/qmtest/exclusions.py | 3 +++ 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/Hlt/Hlt2Conf/options/sprucing/lbexec_yamls/spruce_example_realtime_extraoutputs.yaml b/Hlt/Hlt2Conf/options/sprucing/lbexec_yamls/spruce_example_realtime_extraoutputs.yaml index 792a1ffefe3..84cc8d99eaa 100644 --- a/Hlt/Hlt2Conf/options/sprucing/lbexec_yamls/spruce_example_realtime_extraoutputs.yaml +++ b/Hlt/Hlt2Conf/options/sprucing/lbexec_yamls/spruce_example_realtime_extraoutputs.yaml @@ -15,4 +15,5 @@ conddb_tag: sim-20231017-vc-mu100 output_file : 'spruce_realtimereco_extraoutputs.dst' output_type : 'ROOT' output_manifest_file : "spruce_example_realtime_extraoutputs.tck.json" -input_process: Hlt2 \ No newline at end of file +write_decoding_keys_to_git : True +input_process: Hlt2 diff --git a/Hlt/Hlt2Conf/options/sprucing/lbexec_yamls/spruce_example_realtime_persistreco.yaml b/Hlt/Hlt2Conf/options/sprucing/lbexec_yamls/spruce_example_realtime_persistreco.yaml index 73bf000dc70..a416c5a44cf 100644 --- a/Hlt/Hlt2Conf/options/sprucing/lbexec_yamls/spruce_example_realtime_persistreco.yaml +++ b/Hlt/Hlt2Conf/options/sprucing/lbexec_yamls/spruce_example_realtime_persistreco.yaml @@ -15,4 +15,5 @@ conddb_tag: sim-20231017-vc-mu100 output_file : 'spruce_realtimereco_persistreco.dst' output_type : 'ROOT' output_manifest_file : "spruce_example_realtime_persistreco.tck.json" -input_process: Hlt2 \ No newline at end of file +write_decoding_keys_to_git : True +input_process: Hlt2 diff --git a/Hlt/Moore/python/Moore/qmtest/exclusions.py b/Hlt/Moore/python/Moore/qmtest/exclusions.py index 9492e8af2af..b369a5fa17d 100644 --- a/Hlt/Moore/python/Moore/qmtest/exclusions.py +++ b/Hlt/Moore/python/Moore/qmtest/exclusions.py @@ -67,6 +67,9 @@ remove_known_warnings = LineSkipper( r".*Monitoring_Hlt1KsLine_InclKsKs.*WARNING.*Too many composites. Stopping the combination.*", # Warning due to Kalman fit observed in Allen!1444, to be resolved by Rec!3663 r"TrackBestTrackCreator_.*WARNING Kalman fit error, check debug level", + r"HltANNSvc.*WARNING key 0x[0-9a-f]+ has been found in FSR -- using that.*", + r"HltANNSvc.*WARNING ignoring key 0x[0-9a-f]+ from FSR because an explicit Overrule has been configured -- .*", + r"HltANNSvc.*WARNING ignoring key 0x[0-9a-f]+ from FSR because an explicit Overrule has been configured -- are you sure that Overrule is really needed?", ]) remove_known_packing_errors_and_warnings = remove_known_warnings + LineSkipper(regexps=[ -- GitLab