Switch to new DQ monitoring by default

Control/AthenaMonitoring/python/DQConfigFlags.py

@@ -45,6 +45,10 @@ def createDQConfigFlags():
         arg = True
         if flag == 'doJetTagMon':
             arg = lambda x: x.DQ.DataType != 'cosmics' # noqa: E731
+        if flag == 'doHLTMon':
+            # new HLT monitoring not yet compatible with pre-Run 3 data
+            arg = lambda x: x.Trigger.EDMDecodingVersion == 3 # noqa: E731
+
         acf.addFlag('DQ.Steering.' + flag, arg)
 
     # HLT steering ...

Control/AthenaMonitoring/python/DQMonFlags.py

-# Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
 
 ##
 ## @file DataQualityTools/python/DQMonFlags.py
@@ -418,7 +418,7 @@ class doNewMonitoring(JobProperty):
     """ Global switch for monitoring """
     statusOn=True
     allowedTypes=['bool']
-    StoredValue=False
+    StoredValue=True
 list+=[doNewMonitoring]
 
 ##-----------------------------------------------------------------------------

Control/AthenaMonitoring/share/DQMonFlagsConfig_jobOptions.py

@@ -17,6 +17,12 @@ if not 'rec' in dir():
 
 from RecExConfig.RecAlgsFlags import recAlgs
 
+# if we are not in MT mode, do not run new-style monitoring
+# if you really want to override, use set_Value_and_Lock(True) on the relevant flags below
+from TriggerJobOpts.TriggerFlags import TriggerFlags
+if not TriggerFlags.doMT():
+   DQMonFlags.doNewMonitoring=False
+
 # Set the data type based on beamType/HI flag
 if globalflags.DataSource.get_Value() == 'geant4':
    DQMonFlags.monManDataType = 'monteCarlo'
@@ -66,7 +72,6 @@ else:
    local_logger.warning("invalid DQMonFlags.monType: %s, using default monManEnvironment", DQMonFlags.monType())
 
 # the meaning of this flag has changed in MT
-from TriggerJobOpts.TriggerFlags import TriggerFlags
 if (rec.doTrigger() == False and 
     not (TriggerFlags.doMT() and DQMonFlags.monManEnvironment=='tier0ESD' and DQMonFlags.useTrigger())):
    DQMonFlags.useTrigger=False     # steers trigger-awareness

Control/AthenaMonitoring/share/DataQualitySteering_jobOptions.py

@@ -351,12 +351,14 @@ if DQMonFlags.doMonitoring():
       from AthenaMonitoring.AthenaMonitoringCfg import AthenaMonitoringCfg
       from AthenaMonitoring.DQConfigFlags import allSteeringFlagsOff
       from AthenaMonitoring import AthenaMonitoringConf
+      from TriggerJobOpts.TriggerFlags import TriggerFlags
 
       Steering = ConfigFlags.DQ.Steering
       Steering.doGlobalMon=DQMonFlags.doGlobalMon()
       Steering.doLVL1CaloMon=DQMonFlags.doLVL1CaloMon()
       Steering.doCTPMon=DQMonFlags.doCTPMon()
-      Steering.doHLTMon=DQMonFlags.doHLTMon()
+      # do not enable new HLT monitoring if we are not in Run 3 EDM
+      Steering.doHLTMon=DQMonFlags.doHLTMon() and TriggerFlags.EDMDecodingVersion() == 3
       Steering.doPixelMon=DQMonFlags.doPixelMon()
       Steering.doSCTMon=DQMonFlags.doSCTMon()
       Steering.doTRTMon=DQMonFlags.doTRTMon()