Merge branch 'rm-calomon' into 'master'

Adapt CaloMon to recent Moore changes

See merge request !218

MooreOnlineConf/options/calo.py

@@ -34,12 +34,9 @@ def calo_moni():
     hcal_raw = default_raw_banks("Calo", default_raw_event)
     hcal_raw_error = default_raw_banks("CaloError", default_raw_event)
 
-    digitsEcal = make_digits(ecal_raw, ecal_raw_error)["digitsEcal"]
-    digitsHcal = make_digits(hcal_raw, hcal_raw_error)["digitsHcal"]
-    ecalClusters = make_clusters(digitsEcal)
-    calo = {
-        "digitsEcal": digitsEcal,
-        "digitsHcal": digitsHcal,
+    digits = make_digits(calo_raw_bank=True)
+    ecalClusters = make_clusters(digits["digitsEcal"])
+    calo = digits | {
         "ecalClusters": ecalClusters,
     }
 

MooreScripts/job/runCaloMon.sh

@@ -15,7 +15,7 @@ source "$DIR/setupTask.sh"
 
 setup_options_path MONITORING
 exec_gaudirun \
-    $MOOREONLINECONFROOT/options/tags.py \
+    $MOOREONLINECONFROOT/options/tags-master.py \
     $MOOREONLINECONFROOT/options/verbosity.py \
     $MOOREONLINECONFROOT/options/calo.py \
     $MOOREONLINECONFROOT/options/online.py