Hlt/Hlt1Conf/tests/options/allen_vtxs_tos.py

@@ -45,7 +45,6 @@ def run_test():
     """
     Final configuration for the test application
     """
-    non_event_data_node = setup_allen_non_event_data_service()
     config = configure_input(options)
 
     # Get Allen configuration

Hlt/Hlt1Conf/tests/refs/dump_for_standalone_allen.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"                     |    194788 |
+ | "BytesWritten_EcalGeometry"                     |    198628 |
 AllenTESProducer_FTCluster             INFO Number of counters : 1
  |    Counter                                      |     #     |    sum     | mean/eff^* | rms/err^*  |     min     |     max     |
  | "BytesWritten_SciFiGeometry"                    |     81064 |

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

@@ -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"                     |    194788 |
+ | "BytesWritten_EcalGeometry"                     |    198628 |
 AllenTESProducer_FTCluster             INFO Number of counters : 1
  |    Counter                                      |     #     |    sum     | mean/eff^* | rms/err^*  |     min     |     max     |
  | "BytesWritten_SciFiGeometry"                    |     81064 |

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 |

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 |

Hlt/Hlt2Conf/CMakeLists.txt

@@ -34,7 +34,6 @@ 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
@@ -55,7 +54,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.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/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_PbPb_without_UT.py

@@ -18,6 +18,7 @@ from RecoConf.hlt2_global_reco import reconstruction as reco
 from RecoConf.event_filters import require_gec
 from Hlt2Conf.lines.iftPbPb import all_lines as ift_lines
 from PyConf.Algorithms import PrHybridSeeding
+from PyConf.packing import persistreco_writing_version
 
 from Configurables import LHCb__Det__LbDD4hep__DD4hepSvc as DD4hepSvc
 
@@ -31,7 +32,6 @@ options.output_file = 'hlt2_ion_data.dst'
 options.output_type = 'ROOT'
 options.output_manifest_file = "hlt2_ion_data.tck.json"
 options.histo_file = "hlt2_ion_data.root"
-options.persistreco_version = 1.1
 public_tools = []
 
 
@@ -60,5 +60,6 @@ with reconstruction.bind(from_file=False),\
     make_reco_pvs.bind(make_pvs_from_velo_tracks=make_PatPV3DFuture_pvs),\
     make_TrackBestTrackCreator_tracks.bind(max_ghost_prob=0.8),\
     get_UpgradeGhostId_tool_no_UT.bind(for_PbPb=True),\
-    make_muon_hits.bind(geometry_version=3):
+    make_muon_hits.bind(geometry_version=3),\
+    persistreco_writing_version.bind(version=1.1):
     config = run_moore(options, make_lines, public_tools)

Hlt/Hlt2Conf/options/hlt2_PbPb_without_UT_retina.py

@@ -22,6 +22,7 @@ from RecoConf.hlt2_global_reco import reconstruction as reco
 from RecoConf.event_filters import require_gec
 from Hlt2Conf.lines.iftPbPb import all_lines as ift_lines
 from PyConf.Algorithms import PrHybridSeeding
+from PyConf.packing import persistreco_writing_version
 
 from Configurables import LHCb__Det__LbDD4hep__DD4hepSvc as DD4hepSvc
 
@@ -32,7 +33,6 @@ dd4hepSvc.DetectorList = [
 dd4hepSvc.ConditionsLocation = 'git:/cvmfs/lhcb.cern.ch/lib/lhcb/git-conddb/lhcb-conditions-database.git'
 
 options.output_type = 'ROOT'
-options.persistreco_version = 1.1
 public_tools = []
 
 
@@ -64,5 +64,6 @@ with reconstruction.bind(from_file=False),\
     get_UpgradeGhostId_tool_no_UT.bind(velo_hits=make_RetinaClusters, for_PbPb=True),\
     get_global_measurement_provider.bind(velo_hits=make_RetinaClusters),\
     make_TrackBestTrackCreator_tracks.bind(max_ghost_prob=0.8),\
-    make_muon_hits.bind(geometry_version=3):
+    make_muon_hits.bind(geometry_version=3),\
+    persistreco_writing_version.bind(version=1.1):
     config = run_moore(options, make_lines, public_tools)

Hlt/Hlt2Conf/options/hlt2_example.py

@@ -15,8 +15,7 @@ Run like any other options file:
     ./Moore/run gaudirun.py hlt2_example.py
 """
 from Moore import options, run_moore
-
-from Hlt2Conf.lines.charm.d0_to_hh import all_lines
+from Hlt2Conf.lines.test.hlt2_test import dzero2kpkm_line, dstarp2dzeropip_dzero2kpkm_line, b2d0mu_dzero2kpkm_line
 from RecoConf.global_tools import stateProvider_with_simplified_geom
 # TODO stateProvider_with_simplified_geom must go away from option files
 
@@ -53,7 +52,11 @@ options.output_manifest_file = "hlt2_example.tck.json"
 
 
 def make_lines():
-    return [builder() for builder in all_lines.values()]
+    return [
+        dzero2kpkm_line(),
+        dstarp2dzeropip_dzero2kpkm_line(),
+        b2d0mu_dzero2kpkm_line()
+    ]
 
 
 public_tools = [stateProvider_with_simplified_geom()]

Hlt/Hlt2Conf/options/hlt2_lines_reco_mix.py

@@ -24,10 +24,11 @@ import json
 from Moore import options, run_moore
 from RecoConf.global_tools import stateProvider_with_simplified_geom
 from RecoConf.reconstruction_objects import reconstruction
-from Hlt2Conf.lines.charm.d0_to_hh import all_lines
+from Hlt2Conf.lines.test.hlt2_test import dzero2kpi_line
 
 options.set_input_and_conds_from_testfiledb('upgrade_minbias_hlt1_filtered')
 
+options.persistreco_version = 0.0
 options.input_raw_format = 4.3
 options.evt_max = 200
 
@@ -39,10 +40,10 @@ def make_lines():
     lines = []
     # Instantiate lines taking the reconstruction from the file
     with reconstruction.bind(from_file=True):
-        lines += [builder() for builder in all_lines.values()]
+        lines += [dzero2kpi_line()]
     # Instantiate the same lines, but running the reconstruction on demand
     with reconstruction.bind(from_file=False):
-        for default_name, builder in all_lines.items():
+        for default_name, builder in dzero2kpi_line():
             # Lines must have unique names
             line = builder(name=default_name + "RecoFromRaw")
             lines.append(line)

Hlt/Hlt2Conf/options/hlt2_lines_reco_mix_full_mc.py

@@ -20,10 +20,11 @@ from Moore import options, run_moore
 from Moore import persistence
 from RecoConf.global_tools import stateProvider_with_simplified_geom
 from RecoConf.reconstruction_objects import reconstruction
-from Hlt2Conf.lines.charm.d0_to_hh import all_lines
+from Hlt2Conf.lines.test.hlt2_test import dzero2kpi_line
 
 options.set_input_and_conds_from_testfiledb('upgrade_minbias_hlt1_filtered')
 
+options.persistreco_version = 0.0
 options.input_raw_format = 4.3
 options.evt_max = 200
 
@@ -35,10 +36,10 @@ def make_lines():
     lines = []
     # Instantiate lines taking the reconstruction from the file
     with reconstruction.bind(from_file=True):
-        lines += [builder() for builder in all_lines.values()]
+        lines += [dzero2kpi_line()]
     # Instantiate the same lines, but running the reconstruction on demand
     with reconstruction.bind(from_file=False):
-        for default_name, builder in all_lines.items():
+        for default_name, builder in dzero2kpi_line():
             # Lines must have unique names
             line = builder(name=default_name + "RecoFromRaw")
             lines.append(line)

Hlt/Hlt2Conf/options/streaming/hlt2_activity_trigger_2022.py

@@ -78,14 +78,8 @@ def make_lines():
 # Modify stream dictionaries for testing purposes
 import Moore.streams_hlt2
 Moore.streams_hlt2.DETECTOR_RAW_BANK_TYPES_PER_STREAM = {
-    "stream_A": [
-        'ODIN', 'VP', 'UT', 'FTCluster', 'Rich', 'EcalPacked', 'HcalPacked',
-        'Muon'
-    ],
-    "stream_B": [
-        'ODIN', 'VP', 'UT', 'FTCluster', 'Rich', 'EcalPacked', 'HcalPacked',
-        'Muon'
-    ]
+    "stream_A": ['VP', 'UT', 'FT', 'Rich', 'Calo', 'Muon'],
+    "stream_B": ['VP', 'UT', 'FT', 'Rich', 'Calo', 'Muon']
 }
 Moore.streams_hlt2.stream_bits = dict(stream_A=87, stream_B=88)
 

Hlt/Hlt2Conf/options/streaming/hlt2_test_streaming.py

@@ -111,7 +111,7 @@ def test_B_line(name='Hlt2_test_stream_B_line', prescale=1):
         name=name,
         algs=upfront_reconstruction() + [require_pvs(make_pvs())] + [dzeros],
         prescale=prescale,
-        raw_banks=['FTCluster'])
+        raw_banks=['FT'])
 
 
 def test_lumi_line():
@@ -120,10 +120,14 @@ def test_lumi_line():
 
 
 def make_streams():
+    lumi_line = test_lumi_line()
+    # TODO this streaming test should probably be obsoleted in favour of
+    #      something like hlt2_lumi_events. We need to understand what this
+    #      test test checks in addition to hlt2_lumi_events
     linedict = dict(
-        test_stream_A=[test_A_line(), test_lumi_line()],
-        test_stream_B=[test_B_line(), test_lumi_line()],
-        test_stream_Lumi=[test_lumi_line()])
+        test_stream_A=[test_A_line(), lumi_line],
+        test_stream_B=[test_B_line(), lumi_line],
+        test_stream_Lumi=[lumi_line])
     pprint(linedict)
     return linedict
 
@@ -131,17 +135,11 @@ def make_streams():
 # Modify stream dictionaries for testing purposes
 import Moore.streams_hlt2
 Moore.streams_hlt2.DETECTOR_RAW_BANK_TYPES_PER_STREAM = {
-    "test_stream_A": [
-        'ODIN', 'VP', 'UT', 'FTCluster', 'Rich', 'EcalPacked', 'HcalPacked',
-        'Muon'
-    ],
+    "test_stream_A": ['VP', 'UT', 'FT', 'Rich', 'Calo', 'Muon'],
     "test_stream_B": [
-        'ODIN', 'VP', 'UT', 'EcalPacked', 'HcalPacked', 'Muon'
+        'VP', 'UT', 'Calo', 'Muon'
     ],  # Remove RICH raw bank and FTCluster bank which is then requested using raw banks SP functionality
-    "test_stream_Lumi": [
-        'ODIN', 'VP', 'UT', 'FTCluster', 'Rich', 'EcalPacked', 'HcalPacked',
-        'Muon'
-    ]
+    "test_stream_Lumi": ['VP', 'UT', 'FT', 'Rich', 'Calo', 'Muon']
 }
 Moore.streams_hlt2.stream_bits = dict(
     test_stream_A=85, test_stream_B=90, test_stream_Lumi=93)

Hlt/Hlt2Conf/options/streaming/spruce_test_streaming.py

@@ -54,13 +54,8 @@ def make_streams():
 # Modify stream dictionaries for testing purposes
 import Moore.streams_spruce
 Moore.streams_spruce.stream_banks = {
-    "test_stream_A": [
-        'ODIN', 'VP', 'UT', 'FTCluster', 'Rich', 'EcalPacked', 'HcalPacked',
-        'Muon'
-    ],
-    "test_stream_B":
-    ['ODIN', 'VP', 'UT', 'FTCluster', 'EcalPacked', 'HcalPacked',
-     'Muon']  # Remove RICH raw bank
+    "test_stream_A": ['VP', 'UT', 'FT', 'Rich', 'Calo', 'Muon'],
+    "test_stream_B": ['VP', 'UT', 'FT', 'Calo', 'Muon']  # Remove RICH raw bank
 }
 
 print("Moore.streams_spruce.stream_banks")

Hlt/Hlt2Conf/python/Hlt2Conf/Sprucing_tests.py

@@ -27,7 +27,7 @@ public_tools = [stateProvider_with_simplified_geom()]
 
 def spruce_streaming(options: Options):
     """
-    Test streaming of sprucing lines. Produces two spruce_streaming.dst files prepended by stream name
+    Test streaming of sprucing lines. Produces two spruce_streaming.dst files prepended by stream name. RawBankSP functionality is tested via stream B.
     """
 
     def make_streams():
@@ -36,8 +36,7 @@ def spruce_streaming(options: Options):
                 Test_sprucing_line(name="Spruce_test_stream_A_line")
             ],
             test_stream_B=[
-                Test_extraoutputs_sprucing_line(
-                    name="Spruce_test_stream_B_line")
+                Test_sprucing_rawbank_sp_line(name="Spruce_test_stream_B_line")
             ])
         pprint(linedict)
         return linedict
@@ -45,13 +44,10 @@ def spruce_streaming(options: Options):
     ###Custom rawbanks not implemented for sprucing yet
     # Modify stream dictionaries for testing purposes
     streams_spruce.stream_banks = {
-        "test_stream_A": [
-            'ODIN', 'VP', 'UT', 'FTCluster', 'Rich', 'EcalPacked',
-            'HcalPacked', 'Muon'
-        ],
-        "test_stream_B":
-        ['ODIN', 'VP', 'UT', 'FTCluster', 'EcalPacked', 'HcalPacked',
-         'Muon']  # Remove RICH raw bank
+        "test_stream_A": ['VP', 'UT', 'FT', 'Rich', 'Calo', 'Muon'],
+        "test_stream_B": [
+            'VP', 'UT', 'Calo', 'Muon'
+        ]  # Remove RICH raw bank; FT banks are added using RawBanks SP functionality
     }
 
     print("streams_spruce.stream_banks")
@@ -198,24 +194,6 @@ def spruce_example_realtime_persistreco(options: Options):
     return config
 
 
-def spruce_example_realtime_rawbank_sp(options: Options):
-    """Test Sprucing line with rawbank selective persistency on output of topo{2,3} persistreco hlt2 lines (original reco real time). Produces spruce_realtimereco_persistreco.dst
-    """
-
-    def make_streams():
-        linedict = dict(stream_A=[
-            Test_sprucing_rawbank_sp_line(
-                name="Spruce_rawbank_sp_stream_A_line")
-        ])
-        pprint(linedict)
-        return linedict
-
-    streams_spruce.stream_banks = {"stream_A": ['ODIN']}
-
-    config = run_moore(options, make_streams, public_tools)
-    return config
-
-
 def spruce_all_lines_realtime_test_old_json(options: Options):
     """Test running all Sprucing lines on topo{2,3} persistreco hlt2 output (use real time reco). Produces spruce_all_lines_realtimereco_newPacking.dst
 

Hlt/Hlt2Conf/python/Hlt2Conf/lines/__init__.py

@@ -33,6 +33,7 @@ from . import (
     charmonium_to_dimuon,
     bnoc,
     trackeff,
+    luminosity,
 )
 
 __all__ = [
@@ -88,6 +89,7 @@ modules = [
     charmonium_to_dimuon,
     bnoc,
     trackeff,
+    luminosity,
 ]
 
 all_lines = _get_all_lines(modules)

Hlt/Hlt2Conf/python/Hlt2Conf/lines/charm/hyperons.py

@@ -1265,7 +1265,7 @@ def xi_to_lpi_match(name="Hlt2Charm_XimToL0Pim_VeloMatch_PR"):
         name=name,
         algs=charm_prefilters() + [dd_lambdas, ddd_xis, matched_xis],
         persistreco=True,
-        raw_banks=["VPRetinaCluster", "VP"])
+        raw_banks=["VP"])
 
 
 # Omega- -> L K- with matched Velo track
@@ -1280,7 +1280,7 @@ def om_to_lk_match(name="Hlt2Charm_OmToL0Km_VeloMatch_PR"):
         name=name,
         algs=charm_prefilters() + [dd_lambdas, ddd_omegas, matched_omegas],
         persistreco=True,
-        raw_banks=["VPRetinaCluster", "VP"])
+        raw_banks=["VP"])
 
 
 #######################

Hlt/Moore/tests/options/digi_input_and_conds_for_ut_v4r2_decoding_newGeo.py → Hlt/Hlt2Conf/python/Hlt2Conf/lines/luminosity/__init__.py

@@ -8,7 +8,7 @@
 # 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 .luminosity import lumi_nanofy_line, calibration_lines  # noqa
+
+all_lines = {}