diff --git a/Hlt/Hlt2Conf/CMakeLists.txt b/Hlt/Hlt2Conf/CMakeLists.txt index 0c740436b5c2a275cdd7697789702ff387f16389..07f74da6a3129cb4a80cf3861b641f25119e5fae 100644 --- a/Hlt/Hlt2Conf/CMakeLists.txt +++ b/Hlt/Hlt2Conf/CMakeLists.txt @@ -57,7 +57,6 @@ if(BUILD_TESTING AND USE_DD4HEP) Hlt2Conf.streaming.test_hlt2_streaming Hlt2Conf.streaming.test_hlt2_streaming_check_A Hlt2Conf.streaming.test_hlt2_streaming_check_B - Hlt2Conf.test_hlt2_and_spruce_bandwidth_SMOG2 Hlt2Conf.test_persistreco_realtime Hlt2Conf.test_persistreco_output_realtime Hlt2Conf.test_hlt2_btracking_reco_plus_lines @@ -119,6 +118,7 @@ if(BUILD_TESTING AND NOT USE_DD4HEP) Hlt2Conf.sprucing.test_spruce_turbooverlap_check_streamtwo Hlt2Conf.sprucing.test_turbo_turbooverlap Hlt2Conf.sprucing.test_turbo_turbooverlap_check + Hlt2Conf.test_hlt2_and_spruce_bandwidth_SMOG2 PROPERTY DISABLED TRUE diff --git a/Hlt/Hlt2Conf/tests/options/bandwidth/hlt2_bandwidth_input_2024_withSMOG2.yaml b/Hlt/Hlt2Conf/tests/options/bandwidth/hlt2_bandwidth_input_2024_withSMOG2.yaml index 9d35a06795bc5b87c2749f6770821dfedc3ef075..6529991204da169d2903cbaacececa9b967839d5 100644 --- a/Hlt/Hlt2Conf/tests/options/bandwidth/hlt2_bandwidth_input_2024_withSMOG2.yaml +++ b/Hlt/Hlt2Conf/tests/options/bandwidth/hlt2_bandwidth_input_2024_withSMOG2.yaml @@ -1,22 +1,12 @@ # Periodic BW tests input config for using 2024 conditions HLT1-filtered min. bias pp with additional min. bias SMOG2 pAr collisions -testfiledb_key: hlt1-filtered-expected-2024-MB-pAr-nu0_37-pp-nu7_6 +testfiledb_key: Run303372_HLT1processedMEPs_mupp4_Ar_injected input_raw_format: 0.5 input_type: 'MDF' -input_rate: 1610 # kHz +input_rate: 1250 # kHz production_bookkeeping_path: "" -nu: 7.6 +mu: 4.5 velo_radial_opening: 5.1 # in mm -simulation: True +simulation: False filtering_info_links: - # HLT1 bandwidth division was the "post-patch unweighted scenario" described here - - https://indico.cern.ch/event/1332271/contributions/5710654/attachments/2778230/4842174/HLT1_BW_Division_LHCb_UK_Update.pdf - # v2 update in March 2024, input rate 1 MHz - #pp nu = 7.6, SMOG2 pAr nu = 0.37. Details of the event mixing for pp and pAr collisions can be found here: - - https://gitlab.cern.ch/lhcb-datapkg/PRConfig/-/merge_requests/411 - - https://indico.cern.ch/event/1401366/contributions/5904530/attachments/2834974/4953942/PileUp_SMOG2_IFTApril10.pdf -# As dddb_tag a branch with a newer particle table version is used here, -# as some new hlt2 lines rely on new/renamed particles only introduced in dddb-20240427. -# This workaround is temporary and can be removed, once newer simulation samples, -# based on dddb-20240427 directly, are available for these tests. -dddb_tag: 'upgrade/dddb-20231017-new-particle-table' + - see https://gitlab.cern.ch/lhcb-datapkg/PRConfig/-/merge_requests/515/diffs#96d08b762933ade4b32af9f58931aa9aad179d3f_9116_9116 write_streams_attributes_to_json: True diff --git a/Hlt/Hlt2Conf/tests/qmtest/test_hlt2_and_spruce_bandwidth_SMOG2.qmt b/Hlt/Hlt2Conf/tests/qmtest/test_hlt2_and_spruce_bandwidth_SMOG2.qmt index e4b27ae808700e39ad1557a9c92db77c66ab60b8..5171a1fa1a86692f47abbda44ca80fde0a59d244 100644 --- a/Hlt/Hlt2Conf/tests/qmtest/test_hlt2_and_spruce_bandwidth_SMOG2.qmt +++ b/Hlt/Hlt2Conf/tests/qmtest/test_hlt2_and_spruce_bandwidth_SMOG2.qmt @@ -26,7 +26,9 @@ from Moore.qmtest.exclusions import remove_known_warnings _remove_known_warnings = remove_known_warnings + LineSkipper([ "WARNING Lifetime fit did not converge. Aborting.", "WARNING Negative variance produced in lifetime fit iteration.", - "WARNING Empty Buffers -- presumably DstData bank has no payload" + "WARNING Empty Buffers -- presumably DstData bank has no payload", + "WARNING DstData raw bank seems to only contain a header, no other data", + "WARNING No HltPackedData raw bank (the DstData bank) in raw event." ]) countErrorLines({"FATAL": 0, "ERROR": 0, "WARNING": 0}, stdout=_remove_known_warnings(stdout))