Merge branch 'master' of ssh://gitlab.cern.ch:7999/lhcb/Moore into alopezhu_testbrem

CMakeLists.txt

@@ -11,7 +11,7 @@
 
 cmake_minimum_required(VERSION 3.15)
 
-project(Moore VERSION 54.19
+project(Moore VERSION 54.21
         LANGUAGES CXX)
 
 # Enable testing with CTest/CDash

CODEOWNERS

@@ -167,7 +167,7 @@
 /Hlt/Hlt2Conf/python/Hlt2Conf/lines/rd/builders/baryonic_builders.py @vlisovsk @msaur
 
 # QEE
-/Hlt/Hlt2Conf/python/Hlt2Conf/lines/qee/ @wbarter @ncooke @jideng @rjhunter @olupton @yqiu @cvazquez @hyin @dzuliani
+/Hlt/Hlt2Conf/python/Hlt2Conf/lines/qee/ @wbarter @ncooke @jideng @rjhunter @cvazquez @hyin @dzuliani @lugrazet
 # Selection framework testbed
 /Hlt/Hlt2Conf/python/Hlt2Conf/lines/generic.py @nnolte @vrenaudi
 /Hlt/Hlt2Conf/python/Hlt2Conf/lines/dplus_hhh_test.py @nnolte @vrenaudi

Hlt/Moore/tests/options/digi_input_and_conds_for_ut_v4r2_decoding_newGeo.py → Hlt/Hlt1Conf/options/allen_hlt1_PbPb.py

 ###############################################################################
-# (c) Copyright 2021 CERN for the benefit of the LHCb Collaboration           #
+# (c) Copyright 2000-2022 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".   #
@@ -8,7 +8,8 @@
 # granted to it by virtue of its status as an Intergovernmental Organization  #
 # or submit itself to any jurisdiction.                                       #
 ###############################################################################
-from Moore import options
-from RecoConf.decoders import default_ft_decoding_version
-options.set_input_and_conds_from_testfiledb('upgrade-baseline-ut-new-geo-digi')
-default_ft_decoding_version.global_bind(value=6)
+from Moore import (options, run_allen)
+from RecoConf.hlt1_allen import (allen_gaudi_config)
+
+with allen_gaudi_config.bind(sequence="hlt1_PbPb_default"):
+    run_allen(options)

Hlt/Moore/tests/options/digi_input_and_conds_for_ut_v4r2_decoding.py → Hlt/Hlt1Conf/options/allen_hlt1_PbPb_minimal.py

 ###############################################################################
-# (c) Copyright 2021 CERN for the benefit of the LHCb Collaboration           #
+# (c) Copyright 2000-2022 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".   #
@@ -8,9 +8,8 @@
 # granted to it by virtue of its status as an Intergovernmental Organization  #
 # or submit itself to any jurisdiction.                                       #
 ###############################################################################
-from Moore import options
-from RecoConf.decoders import default_ft_decoding_version
-from RecoConf.calorimeter_reconstruction import make_digits
-options.set_input_and_conds_from_testfiledb('upgrade-TELL40-UT-miniBias')
-default_ft_decoding_version.global_bind(value=6)
-make_digits.global_bind(calo_raw_bank=False)
+from Moore import (options, run_allen)
+from RecoConf.hlt1_allen import (allen_gaudi_config)
+
+with allen_gaudi_config.bind(sequence="hlt1_PbPb_minimal"):
+    run_allen(options)

Hlt/Hlt1Conf/tests/options/bandwidth/hlt1_bandwidth_input.py

+###############################################################################
+# (c) Copyright 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.                                       #
+###############################################################################
+'''
+Configure input files for the Hlt1 bandwidth tests
+
+This is needed for the qmtest in Moore.
+For the test in LHCbPR, the input files are configured by
+$PRCONFIGROOT/python/MooreTests/run_bandwidth_test_jobs.py
+
+If updating, please also update hlt1_bandwidth.yaml
+'''
+
+from Moore import options
+
+options.input_type = 'MDF'
+options.set_input_and_conds_from_testfiledb(
+    'upgrade_Sept2022_minbias_0fb_md_mdf')
+options.evt_max = 100

Hlt/Hlt1Conf/tests/options/bandwidth/hlt1_bandwidth_input.yaml

+# Periodic BW tests input config for using nominal-conditions min. bias
+testfiledb_key: upgrade_Sept2022_minbias_0fb_md_mdf
+input_raw_format: 0.5
+input_rate: 30000 # in kHz
+nu: 7.6
+velo_radial_opening: 5.1 # Upgrade - Baseline detector
+filtering_info_links: 
+  - 'https://its.cern.ch/jira/browse/LHCBGAUSS-2635'
+input_type: 'MDF'
\ No newline at end of file

Hlt/Hlt1Conf/tests/options/bandwidth/hlt1_bandwidth_streamless_streams.py

+###############################################################################
+# (c) Copyright 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.                                       #
+###############################################################################
+'''
+Test option for the Hlt1 bandwidth test in LHCbPR
+
+The streaming configuration in this test is `production`,
+which means one stream.
+
+To launch it in Moore, run with
+    ./run gaudirun.py hlt1_bandwidth_input.py hlt1_bandwidth.py
+'''
+from Moore.options import options
+from Moore.config import allen_control_flow
+from RecoConf.hlt1_allen import allen_gaudi_config, get_allen_line_names
+from AllenCore.gaudi_allen_generator import allen_runtime_options
+from PyConf.application import configure_input, configure
+from PRConfig.bandwidth_helpers import FileNameHelper
+from DDDB.CheckDD4Hep import UseDD4Hep
+from Configurables import DDDBConf
+import json
+
+fname_helper = FileNameHelper(process="hlt1")
+fname_helper.make_tmp_dirs()
+options.output_file = fname_helper.mdf_fname_for_Moore(
+    stream_config="streamless").format(stream="streamless")
+options.output_type = 'MDF'
+options.output_manifest_file = fname_helper.tck(stream_config="streamless")
+options.use_iosvc = False
+
+if UseDD4Hep:
+    DDDBConf().GeometryVersion = 'run3/before-rich1-geom-update-26052022'
+
+config = configure_input(options)
+with (allen_gaudi_config.bind(
+        sequence="hlt1_pp_forward_then_matching_no_ut_no_gec"),
+      allen_runtime_options.bind(
+          filename="allen_write_hlt1_bandwidth_test_monitor.root")):
+    line_names = get_allen_line_names()
+    allen_node = allen_control_flow(options)
+    config.update(configure(options, allen_node))
+
+# Write out stream configuration to JSON file for use later in the test
+with open(fname_helper.stream_config_json_path('streamless'), 'w') as f:
+    hlt1_linenames = [
+        linename.replace("Decision", "") for linename in line_names
+    ]
+    json.dump({"streamless": hlt1_linenames}, f)

Hlt/Hlt1Conf/tests/qmtest/persistency.qms/allen_dst_write.qmt

@@ -33,7 +33,7 @@ import re
 #   4. We make a positive decision with the TwoTrackMVA line on at least one event
 #   5. We make a negative decision with the TwoTrackMVA line on at least one event
 
-pattern = re.compile(r'\s+\|\*"Selected by Hlt1TrackMVA.*Decision"\s+\|\s+(\d+)\s+\|\s+(\d+)')
+pattern = re.compile(r'\s+\|\*"Selected by Hlt1TrackMVADecision"\s+\|\s+(\d+)\s+\|\s+(\d+)')
 nread = nselected = -1
 for line in stdout.split('\n'):
     m = re.match(pattern, line)
@@ -52,7 +52,7 @@ if nselected < 1:
 if nselected == nread:
     causes.append('expected at least one event to be filtered out by TrackMVA')
 
-pattern = re.compile(r'\s+\|\*"Selected by Hlt1TwoTrackMVA.*Decision"\s+\|\s+(\d+)\s+\|\s+(\d+)')
+pattern = re.compile(r'\s+\|\*"Selected by Hlt1TwoTrackMVADecision"\s+\|\s+(\d+)\s+\|\s+(\d+)')
 nread = nselected = -1
 for line in stdout.split('\n'):
     m = re.match(pattern, line)

Hlt/Hlt1Conf/tests/qmtest/persistency.qms/allen_mdf_write.qmt

@@ -32,7 +32,7 @@ import re
 #   4. We make a positive decision with the TwoTrackMVA line on at least one event
 #   5. We make a negative decision with the TwoTrackMVA line on at least one event
 
-pattern = re.compile(r'\s+\|\*"Selected by Hlt1TrackMVA.*Decision"\s+\|\s+(\d+)\s+\|\s+(\d+)')
+pattern = re.compile(r'\s+\|\*"Selected by Hlt1TrackMVADecision"\s+\|\s+(\d+)\s+\|\s+(\d+)')
 nread = nselected = -1
 for line in stdout.split('\n'):
     m = re.match(pattern, line)
@@ -51,7 +51,7 @@ if nselected < 1:
 if nselected == nread:
     causes.append('expected at least one event to be filtered out by TrackMVA')
 
-pattern = re.compile(r'\s+\|\*"Selected by Hlt1TwoTrackMVA.*Decision"\s+\|\s+(\d+)\s+\|\s+(\d+)')
+pattern = re.compile(r'\s+\|\*"Selected by Hlt1TwoTrackMVADecision"\s+\|\s+(\d+)\s+\|\s+(\d+)')
 nread = nselected = -1
 for line in stdout.split('\n'):
     m = re.match(pattern, line)

Hlt/Hlt1Conf/tests/refs/dump_for_standalone_allen.ref.detdesc

-LHCb__MDFWriter_3fc8bc15               INFO Size:85771348 MD5 sum:6968eb5bcd49d4a20b6590c933c6d0b4
+LHCb__MDFWriter_3fc8bc15               INFO Size:85771348 MD5 sum:a0a0c376bc92a137c92bddbcaa4b8e98
 ApplicationMgr                         INFO Application Manager Finalized successfully
 ApplicationMgr                         INFO Application Manager Terminated successfully
 AllenTESProducer_ECal                  INFO Number of counters : 1
  |    Counter                                      |     #     |    sum     | mean/eff^* | rms/err^*  |     min     |     max     |
- | "BytesWritten_EcalGeometry"                     |    194788 |
+ | "BytesWritten_EcalGeometry"                     |    198628 |
 AllenTESProducer_FTCluster             INFO Number of counters : 1
  |    Counter                                      |     #     |    sum     | mean/eff^* | rms/err^*  |     min     |     max     |
  | "BytesWritten_SciFiGeometry"                    |     81064 |
@@ -15,7 +15,7 @@ AllenTESProducer_VP                    INFO Number of counters : 1
  | "BytesWritten_VeloGeometry"                     |     16376 |
 DumpBeamline                           INFO Number of counters : 1
  |    Counter                                      |     #     |    sum     | mean/eff^* | rms/err^*  |     min     |     max     |
- | "BytesWritten_Beamline"                         |         8 |
+ | "BytesWritten_Beamline"                         |        40 |
 DumpMuonGeometry                       INFO Number of counters : 1
  |    Counter                                      |     #     |    sum     | mean/eff^* | rms/err^*  |     min     |     max     |
  | "BytesWritten_MuonGeometry"                     |     79964 |

Hlt/Hlt1Conf/tests/refs/dump_for_standalone_allen.ref.x86_64_v3-detdesc-opt

-LHCb__MDFWriter_3fc8bc15               INFO Size:85771348 MD5 sum:a8164ec01c5d800e07908d58a74283c0
+LHCb__MDFWriter_3fc8bc15               INFO Size:85771348 MD5 sum:6cdf57403b1fe4c7dcf1434087b3be9e
 ApplicationMgr                         INFO Application Manager Finalized successfully
 ApplicationMgr                         INFO Application Manager Terminated successfully
 AllenTESProducer_ECal                  INFO Number of counters : 1
  |    Counter                                      |     #     |    sum     | mean/eff^* | rms/err^*  |     min     |     max     |
- | "BytesWritten_EcalGeometry"                     |    194788 |
+ | "BytesWritten_EcalGeometry"                     |    198628 |
 AllenTESProducer_FTCluster             INFO Number of counters : 1
  |    Counter                                      |     #     |    sum     | mean/eff^* | rms/err^*  |     min     |     max     |
  | "BytesWritten_SciFiGeometry"                    |     81064 |
@@ -15,7 +15,7 @@ AllenTESProducer_VP                    INFO Number of counters : 1
  | "BytesWritten_VeloGeometry"                     |     16376 |
 DumpBeamline                           INFO Number of counters : 1
  |    Counter                                      |     #     |    sum     | mean/eff^* | rms/err^*  |     min     |     max     |
- | "BytesWritten_Beamline"                         |         8 |
+ | "BytesWritten_Beamline"                         |        40 |
 DumpMuonGeometry                       INFO Number of counters : 1
  |    Counter                                      |     #     |    sum     | mean/eff^* | rms/err^*  |     min     |     max     |
  | "BytesWritten_MuonGeometry"                     |     79964 |

Hlt/Hlt1Conf/tests/refs/dump_for_standalone_allen_Sim10aU1.ref

@@ -3,7 +3,7 @@ ApplicationMgr                         INFO Application Manager Finalized succes
 ApplicationMgr                         INFO Application Manager Terminated successfully
 AllenTESProducer_ECal                  INFO Number of counters : 1
  |    Counter                                      |     #     |    sum     | mean/eff^* | rms/err^*  |     min     |     max     |
- | "BytesWritten_EcalGeometry"                     |    198684 |
+ | "BytesWritten_EcalGeometry"                     |    202524 |
 AllenTESProducer_FTCluster             INFO Number of counters : 1
  |    Counter                                      |     #     |    sum     | mean/eff^* | rms/err^*  |     min     |     max     |
  | "BytesWritten_SciFiGeometry"                    |    104104 |
@@ -15,7 +15,7 @@ AllenTESProducer_VP                    INFO Number of counters : 1
  | "BytesWritten_VeloGeometry"                     |     16376 |
 DumpBeamline                           INFO Number of counters : 1
  |    Counter                                      |     #     |    sum     | mean/eff^* | rms/err^*  |     min     |     max     |
- | "BytesWritten_Beamline"                         |         8 |
+ | "BytesWritten_Beamline"                         |        40 |
 DumpMuonGeometry                       INFO Number of counters : 1
  |    Counter                                      |     #     |    sum     | mean/eff^* | rms/err^*  |     min     |     max     |
  | "BytesWritten_MuonGeometry"                     |    211468 |

Hlt/Hlt1Conf/tests/refs/dump_for_standalone_allen_Sim10aU1.ref.detdesc

@@ -3,7 +3,7 @@ ApplicationMgr                         INFO Application Manager Finalized succes
 ApplicationMgr                         INFO Application Manager Terminated successfully
 AllenTESProducer_ECal                  INFO Number of counters : 1
  |    Counter                                      |     #     |    sum     | mean/eff^* | rms/err^*  |     min     |     max     |
- | "BytesWritten_EcalGeometry"                     |    198684 |
+ | "BytesWritten_EcalGeometry"                     |    202524 |
 AllenTESProducer_FTCluster             INFO Number of counters : 1
  |    Counter                                      |     #     |    sum     | mean/eff^* | rms/err^*  |     min     |     max     |
  | "BytesWritten_SciFiGeometry"                    |    104104 |
@@ -15,7 +15,7 @@ AllenTESProducer_VP                    INFO Number of counters : 1
  | "BytesWritten_VeloGeometry"                     |     16376 |
 DumpBeamline                           INFO Number of counters : 1
  |    Counter                                      |     #     |    sum     | mean/eff^* | rms/err^*  |     min     |     max     |
- | "BytesWritten_Beamline"                         |         8 |
+ | "BytesWritten_Beamline"                         |        40 |
 DumpMuonGeometry                       INFO Number of counters : 1
  |    Counter                                      |     #     |    sum     | mean/eff^* | rms/err^*  |     min     |     max     |
  | "BytesWritten_MuonGeometry"                     |    211468 |

Hlt/Hlt2Conf/CMakeLists.txt

@@ -34,6 +34,7 @@ if(BINARY_TAG MATCHES "san$")
             Hlt2Conf.streaming.test_hlt2_streaming
             Hlt2Conf.streaming.test_hlt2_streaming_check_A
             Hlt2Conf.streaming.test_hlt2_streaming_check_B
+            Hlt2Conf.streaming.test_hlt2_streaming_check_Lumi
             Hlt2Conf.streaming.test_sprucing_streaming
             Hlt2Conf.streaming.test_sprucing_streaming_check_A
             Hlt2Conf.streaming.test_sprucing_streaming_check_B
@@ -54,6 +55,7 @@ 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.streaming.test_hlt2_streaming_check_Lumi
             Hlt2Conf.streaming.test_sprucing_streaming
             Hlt2Conf.streaming.test_sprucing_streaming_check_A
             Hlt2Conf.streaming.test_sprucing_streaming_check_B

Hlt/Hlt2Conf/options/FlavourTagging/hlt2_sskaon_tagger_on_example_bs2jpsiphi_lines.py

@@ -112,7 +112,7 @@ options.simulation = True
 options.data_type = 'Upgrade'
 options.dddb_tag = 'dddb-20210617'
 options.conddb_tag = 'sim-20210617-vc-md100'
-options.geometry_version = 'trunk'
+options.geometry_version = 'run3/trunk'
 options.conditions_version = 'master'
 options.input_raw_format = 0.3
 make_digits.global_bind(calo_raw_bank=False)

Hlt/Hlt2Conf/options/fest/hlt2_all_lines_with_reco_with_streams.py

@@ -57,9 +57,7 @@ def make_streams():
 
 # Modify stream dictionaries for testing purposes
 import Moore.streams_hlt2
-DETECTOR_RAW_BANK_TYPES = [
-    'ODIN', 'VP', 'UT', 'FTCluster', 'Rich', 'EcalPacked', 'HcalPacked', 'Muon'
-]
+DETECTOR_RAW_BANK_TYPES = ['VP', 'UT', 'FT', 'Rich', 'Calo', 'Muon']
 Moore.streams_hlt2.DETECTOR_RAW_BANK_TYPES_PER_STREAM = {
     "sprucing": DETECTOR_RAW_BANK_TYPES,
     "turbo": DETECTOR_RAW_BANK_TYPES,

Hlt/Hlt2Conf/options/fest/hlt2_all_lines_with_reco_with_streams_mdf.py

@@ -45,9 +45,7 @@ def make_streams():
 
 # Modify stream dictionaries for testing purposes
 import Moore.streams_hlt2
-DETECTOR_RAW_BANK_TYPES = [
-    'ODIN', 'VP', 'UT', 'FTCluster', 'Rich', 'EcalPacked', 'HcalPacked', 'Muon'
-]
+DETECTOR_RAW_BANK_TYPES = ['VP', 'UT', 'FT', 'Rich', 'Calo', 'Muon']
 Moore.streams_hlt2.DETECTOR_RAW_BANK_TYPES_PER_STREAM = {
     "sprucing": DETECTOR_RAW_BANK_TYPES,
     "turbo": DETECTOR_RAW_BANK_TYPES,

Hlt/Hlt2Conf/options/hlt2_2or3bodytopo_fromfile.py

@@ -36,7 +36,7 @@ options.simulation = True
 options.data_type = 'Upgrade'
 options.dddb_tag = 'dddb-20171126'
 options.conddb_tag = 'sim-20171127-vc-md100'
-options.geometry_version = 'trunk'
+options.geometry_version = 'run3/trunk'
 options.conditions_version = 'master'
 options.persistreco_version = 0.0
 

Hlt/Hlt2Conf/options/hlt2_2or3bodytopo_realtime.py

@@ -39,7 +39,7 @@ options.simulation = True
 options.data_type = 'Upgrade'
 options.dddb_tag = 'dddb-20171126'
 options.conddb_tag = 'sim-20171127-vc-md100'
-options.geometry_version = 'trunk'
+options.geometry_version = 'run3/trunk'
 options.conditions_version = 'master'
 
 options.output_file = 'hlt2_2or3bodytopo_realtime.mdf'

Hlt/Hlt2Conf/options/hlt2_2or3bodytopo_realtime_dst.py

@@ -38,7 +38,7 @@ options.simulation = True
 options.data_type = 'Upgrade'
 options.dddb_tag = 'dddb-20171126'
 options.conddb_tag = 'sim-20171127-vc-md100'
-options.geometry_version = 'trunk'
+options.geometry_version = 'run3/trunk'
 options.conditions_version = 'master'
 
 options.output_file = 'hlt2_2or3bodytopo_realtime_dst.dst'