Merge branch 'rjhunter-bw-tests-add-missing-lines' into 'master'

Add missing charmonium_to_dimuon_detached lines to WG-streamed HLT2 bandwidth test and fix raw bank persistency

See merge request !2767

Hlt/Hlt2Conf/CMakeLists.txt

@@ -60,7 +60,8 @@ if(BUILD_TESTING AND USE_DD4HEP)
             Hlt2Conf.test_hlt2_2or3bodytopo_realtime
             Hlt2Conf.test_hlt2_2or3bodytopo_realtime_dst
             Hlt2Conf.test_hlt2_all_lines
-            Hlt2Conf.test_hlt2_bandwidth_5streams
+            Hlt2Conf.test_hlt2_bandwidth_production_streams
+            Hlt2Conf.test_hlt2_bandwidth_wg_streams
             Hlt2Conf.test_hlt2_flavourtagging_flavourtaggers
             Hlt2Conf.test_persistreco_check_flavourtags
             Hlt2Conf.test_hlt2_flavourtagging_sskaontagger

Hlt/Hlt2Conf/tests/options/bandwidth/hlt2_bandwidth_wg_streams.py

@@ -15,7 +15,7 @@ from RecoConf.reconstruction_objects import reconstruction
 from RecoConf.hlt2_global_reco import reconstruction as hlt2_reconstruction
 from RecoConf.hlt2_global_reco import make_fastest_reconstruction
 import Moore
-from Moore.streams_hlt2 import DETECTOR_RAW_BANK_TYPES, HLT2_REPORT_RAW_BANK_TYPES
+from Moore.streams_hlt2 import DETECTOR_RAW_BANK_TYPES
 from PRConfig.bandwidth_helpers import FileNameHelper
 import json
 import re
@@ -33,28 +33,28 @@ from Hlt2Conf.lines import (
     semileptonic,
     monitoring,
     charmonium_to_dimuon,
+    charmonium_to_dimuon_detached,
     bnoc,
     trackeff,
     ift,
 )
 
 MODULES = dict(
-    b_to_open_charm=b_to_open_charm,
-    dilepton=inclusive_detached_dilepton,
-    rd=rd,
-    bandq=bandq,
-    topo_b=topological_b,
-    pid=pid,
-    qee=qee,
-    charm=charm,
-    b_to_charmonia=b_to_charmonia,
-    slepton=semileptonic,
-    monitoring=monitoring,
-    c_to_dimuon=charmonium_to_dimuon,
-    bnoc=bnoc,
-    trackeff=trackeff,
-    ift=ift,
-)
+    b_to_open_charm=[b_to_open_charm],
+    dilepton=[inclusive_detached_dilepton],
+    rd=[rd],
+    bandq=[bandq],
+    topo_b=[topological_b],
+    pid=[pid],
+    qee=[qee],
+    charm=[charm],
+    b_to_charmonia=[b_to_charmonia],
+    slepton=[semileptonic],
+    monitoring=[monitoring],
+    c_to_dimuon=[charmonium_to_dimuon, charmonium_to_dimuon_detached],
+    bnoc=[bnoc],
+    trackeff=[trackeff],
+    ift=[ift])
 
 fname_helper = FileNameHelper(process="hlt2")
 fname_helper.make_tmp_dirs()
@@ -106,11 +106,12 @@ def make_module_lines(mod):
 
 def make_module_streams():
 
-    linedict = {}
-    for mod_name, module in MODULES.items():
-        builders = make_module_lines(module)
-        if builders:
-            linedict[mod_name] = builders
+    linedict = {mod_name: [] for mod_name in MODULES.keys()}
+    for mod_name, module_list in MODULES.items():
+        for module in module_list:
+            builders = make_module_lines(module)
+            if builders:
+                linedict[mod_name] += builders
 
     # Write out stream configuration to JSON file for use later in the test
     with open(fname_helper.stream_config_json_path(stream_config="wg"),
@@ -121,8 +122,8 @@ def make_module_streams():
     return linedict
 
 
-banks_default = list(HLT2_REPORT_RAW_BANK_TYPES)
-banks_turcal = list(DETECTOR_RAW_BANK_TYPES) + list(HLT2_REPORT_RAW_BANK_TYPES)
+banks_default = []
+banks_turcal = DETECTOR_RAW_BANK_TYPES
 
 Moore.streams_hlt2.DETECTOR_RAW_BANK_TYPES_PER_STREAM = {
     'b_to_open_charm': banks_default,

Hlt/Hlt2Conf/tests/qmtest/test_hlt2_bandwidth_2023_5streams.qmt → Hlt/Hlt2Conf/tests/qmtest/test_hlt2_bandwidth_2023_production_streams.qmt

@@ -10,7 +10,7 @@
     or submit itself to any jurisdiction.
 -->
 <!--
-Make sure the HLT2 bandwidth test runs without errors for the 5-stream configuration.
+Make sure the HLT2 bandwidth test runs without errors for the production-stream configuration.
 -->
 <extension class="GaudiTest.GaudiExeTest" kind="test">
 <argument name="program"><text>gaudirun.py</text></argument>

Hlt/Hlt2Conf/tests/qmtest/test_hlt2_bandwidth_5streams.qmt → Hlt/Hlt2Conf/tests/qmtest/test_hlt2_bandwidth_production_streams.qmt

@@ -10,7 +10,7 @@
     or submit itself to any jurisdiction.
 -->
 <!--
-Make sure the HLT2 bandwidth test runs without errors for the 5-stream configuration.
+Make sure the HLT2 bandwidth test runs without errors for the production-stream configuration.
 -->
 <extension class="GaudiTest.GaudiExeTest" kind="test">
 <argument name="program"><text>gaudirun.py</text></argument>

Hlt/Hlt2Conf/tests/qmtest/test_hlt2_bandwidth_wg_streams.qmt

+<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE extension  PUBLIC '-//QM/2.3/Extension//EN'  'http://www.codesourcery.com/qm/dtds/2.3/-//qm/2.3/extension//en.dtd'>
+<!--
+    (c) Copyright 2000-2023 CERN for the benefit of the LHCb Collaboration
+
+    This software is distributed under the terms of the GNU General Public
+    Licence version 3 (GPL Version 3), copied verbatim in the file "COPYING".
+
+    In applying this licence, CERN does not waive the privileges and immunities
+    granted to it by virtue of its status as an Intergovernmental Organization
+    or submit itself to any jurisdiction.
+-->
+<!--
+Make sure the HLT2 bandwidth test runs without errors for the WG-stream configuration.
+-->
+<extension class="GaudiTest.GaudiExeTest" kind="test">
+<argument name="program"><text>gaudirun.py</text></argument>
+<argument name="timeout"><integer>6000</integer></argument>
+<argument name="args"><set>
+  <text>$HLT2CONFROOT/tests/options/bandwidth/hlt2_bandwidth_input.py</text>
+  <text>$MOOREROOT/options/muon_geometry_v2.py</text>
+  <text>$HLT2CONFROOT/tests/options/bandwidth/hlt2_bandwidth_wg_streams.py</text>
+</set></argument>
+<argument name="options"><text>
+from Configurables import HiveDataBrokerSvc
+HiveDataBrokerSvc().OutputLevel = 5
+</text></argument>
+<argument name="use_temp_dir"><enumeral>true</enumeral></argument>
+<argument name="validator"><text>
+from GaudiTesting.BaseTest import LineSkipper
+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.",
+])
+countErrorLines({"FATAL": 0, "ERROR": 0, "WARNING": 0},
+                stdout=remove_known_warnings(stdout))
+
+import re
+matches = re.findall('LAZY_AND: (Hlt2[A-Za-z0-9_]+) .*Sum=(\d+)', stdout)
+if not matches:
+    causes.append('no line decisions found')
+
+</text></argument>
+<argument name="unsupported_platforms"><set>
+  <text>^(?!.*detdesc).*$</text>
+</set></argument>
+</extension>