Fixes for online histograms and HLT2 support

MooreOnlineConf/options/online.py

@@ -53,13 +53,31 @@ flow.BarrierAlgNames = cfm.BarrierAlgNames
 ExecutionReportsWriter().Scheduler = flow
 
 application.setup_monitoring(task_type)
-application.monSvc.DimUpdateInterval = 1
+application.updateAndReset.saveHistograms = 1
+application.updateAndReset.saveSetDir = "/hist/Savesets"
+# Never update the "bulk" DIM histogram service for HLT2 and monitoring tasks.
+# (For HLT1 it has to be done since the adders rely on it)
+application.monSvc.DimUpdateInterval = 1000000  # timer interval in seconds
+application.monSvc.HistUpdateOnStop = False  # do not update on stop
+# prevent duplicated entries in the output...
+application.monSvc.disableDeclareInfoHistos = True
 if task_type != "HLT2":
-    application.updateAndReset.saveHistograms = 1
+    # intermediate saveset period in seconds
     application.updateAndReset.saverCycle = 600
-    application.updateAndReset.saveSetDir = "/hist/Savesets"
-    if OnlineEnv.PartitionName.startswith("TEST"):
-        application.updateAndReset.saveSetDir = "Savesets"
+else:
+    # TODO AdditionalAlgs / PreambleAlgs should be used for all tasks...
+    from MooreOnlineConf.utils import update_and_reset
+    uar_config = update_and_reset().configuration()
+    uar_algs = uar_config.apply()[0]
+    flow.AdditionalAlgs = uar_algs
+    application.updateAndReset.saveSetFilePrefix = (
+        "ByRun/${TASKNAME}/ToMerge/" +
+        "${RUN10000}/${RUN1000}/${RUN}/${UTGID}-${RUN}-${TIME}")
+    # big number such that we don't save intermediate savesets:
+    application.updateAndReset.saverCycle = 3600 * 24 * 7
+if OnlineEnv.PartitionName.startswith("TEST"):
+    application.updateAndReset.saveSetDir = "Savesets"
+    # application.updateAndReset.saverCycle = 20
 
 try:
     n_threads = int(os.environ["NBOFTHREADS"])