Merge branch 'rm-lumimon' into 'master'

Fix LumiMon config and add test

See merge request !243

MooreOnlineConf/options/lumi.py

@@ -8,8 +8,7 @@
 # granted to it by virtue of its status as an Intergovernmental Organization  #
 # or submit itself to any jurisdiction.                                       #
 ###############################################################################
-from PyConf.application import default_raw_event, default_raw_banks, make_odin
-from PyConf.application import metainfo_repos
+from PyConf.application import default_raw_banks, make_odin
 from Moore import options, run_reconstruction
 from Moore.config import Reconstruction
 from PyConf.Algorithms import (
@@ -25,19 +24,21 @@ from PyConf.Algorithms import (
 def lumi():
     odin = make_odin()
     rb_filter = HltRoutingBitsFilter(
-        RawEventLocations=default_raw_event(["HltRoutingBits"]),
+        RawBanks=default_raw_banks('HltRoutingBits'),
         RequireMask=(1 << 1, 0, 0),
         PassOnError=False)
     summary = HltLumiSummaryDecoder(
-        RawEventLocations=default_raw_event(
-            ["HltLumiSummary"]), ).OutputContainerName
-    monitor = HltLumiSummaryMonitor(Input=summary, ODIN=odin)
+        RawBanks=default_raw_banks("HltLumiSummary")).OutputContainerName
+    monitor = HltLumiSummaryMonitor(
+        name="HltLumiSummaryMonitor", Input=summary, ODIN=odin)
 
     hlt1_dec_reports = HltDecReportsDecoder(
-        RawEventLocations=default_raw_event(["HltDecReports"]),
+        RawBanks=default_raw_banks("HltDecReports"),
         SourceID="Hlt1").OutputHltDecReportsLocation
-    dr_monitor = HltDecReportsMonitor(Input=hlt1_dec_reports)
+    dr_monitor = HltDecReportsMonitor(
+        name="HltDecReportsMonitor", Input=hlt1_dec_reports)
     rb_monitor = HltRoutingBitsMonitor(
+        name="HltRoutingBitsMonitor",
         RawBanks=default_raw_banks("HltRoutingBits"))
 
     filters = []
@@ -50,21 +51,4 @@ def lumi():
         'lumi', [monitor], filters=[dr_monitor, rb_monitor] + filters)
 
 
-metainfo_repos.global_bind(
-    extra_central_tags=['commissioning'])  # add commissioning branch
-
 run_reconstruction(options, lumi)
-
-# TODO remove once CaloActivity_prescaled_1-10 is updated to the latest stack
-import json
-from Configurables import GitANNSvc
-d = {
-    "Hlt1SelectionID": {
-        3: "Hlt1ODINLumi",
-        2: "Hlt1Passthrough",
-        1: "Hlt1SingleCaloCluster",
-    },
-    "InfoID": {},
-    "version": "0",
-}
-GitANNSvc("HltANNSvc", Overrule={0: json.dumps(d)})

MooreScripts/tests/qmtest/lumimon.qmt

+<?xml version="1.0" ?><!DOCTYPE extension  PUBLIC '-//QM/2.3/Extension//EN'  'http://www.codesourcery.com/qm/dtds/2.3/-//qm/2.3/extension//en.dtd'>
+<!--
+    (c) Copyright 2021 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.
+-->
+<!--
+Run an LumiMon job in the Online testbench
+-->
+<extension class="GaudiTest.GaudiExeTest" kind="test">
+<argument name="program"><text>$MOORESCRIPTSROOT/scripts/testbench.py</text></argument>
+<argument name="args"><set>
+  <text>$MOORESCRIPTSROOT/tests/options/LumiMon/Arch.xml</text>
+  <text>--working-dir=lumimon</text>
+  <text>--partition=TESTLUMIMON</text>
+  <text>--test-file-db-key=2022_raw_hlt1_253597</text>
+</set></argument>
+<argument name="use_temp_dir"><enumeral>true</enumeral></argument>
+<argument name="validator"><text>
+
+# No validator for now: only check the exit code
+
+import glob
+workdir = self._common_tmpdir
+for fn in glob.glob(workdir + "/lumimon/*.*"):
+    if not fn.endswith(".mdf"):
+        result[os.path.basename(fn)] = open(fn).read()
+
+</text></argument>
+</extension>