run MET monitoring even if doMissingET is false (but doJetMissingETTag must be...

run MET monitoring even if doMissingET is false (but doJetMissingETTag must be true) (AthenaMonitoring-02-01-13-02)

	* run MET monitoring even if doMissingET is false (but doJetMissingETTag must be true)
	* Tagged as AthenaMonitoring-02-01-13-02 (accidental -01 tag)

2014-10-20 David Quarrie <David.Quarrie@cern.ch>
	* cmt/requirements
		Specify the required ROOT components for cmake (transparent to CMT)
	* Tagged as AthenaMonitoring-02-01-13

2014-10-07 Peter Onyisi
	* merge changes from AthenaMonitoring-02-01-09-branch

2014-09-23 Walter Lampl <walter.lampl@ cern.ch>
	* don't run METMonitoring if rec.doMet is false
	* tag AthenaMonitoring-02-01-12

2014-09-11 Peter Onyisi

Control/AthenaMonitoring/cmt/requirements

@@ -23,6 +23,9 @@ use SGAudCore             SGAudCore-*              Control/SGMon
 use AtlasCORAL            AtlasCORAL-*             External
 use LWHists               LWHists-*                Tools
 
+# Specify required ROOT components for cmake (transparent to CMT)
+apply_pattern cmake_add_command command="find_package(ROOT COMPONENTS MathCore)"
+
 #Get this lib in debug mode:
 #macro cppdebugflags '$(cppdebugflags_s)'
 #macro_remove componentshr_linkopts "-Wl,-s"

Control/AthenaMonitoring/python/BadLBFilterTool.py

@@ -9,8 +9,24 @@ def _resolve_db_tag(origDbTag):
     else:
         dbtag = globalflags.ConditionsTag()
         dbtag = dbtag if dbtag != '' else 'HEAD'
+    print "RESOLVED AS TAG", dbtag
     return dbtag
 
+#decide database instance based on project tag dataXX_
+def _InstanceFromProjectName():
+    from RecExConfig.RecFlags import rec
+    projectName=rec.projectName()
+    try:
+        year=int(projectName[4:6]);
+    except:
+        self.msg.error("Failed to extract year from project tag "+ projectName+". Guessing run1")
+        return "COMP200"
+       
+    if (year>13):
+        return "CONDBR2"
+    else:
+        return "COMP200"
+
 # Set up the bad lb filter tool
 # Cache instances that are already created
 @memoize
@@ -46,7 +62,8 @@ def GetBadLBFilterTool(name, defects, alwaysReturnTrue=False, ignoreRecoverable=
     from AthenaMonitoring.AthenaMonitoringConf import DQBadLBFilterTool
     from DQDefects import DefectsDB
     dbtag = _resolve_db_tag(origDbTag)
-    ddb = DefectsDB('COOLOFL_GLOBAL/COMP200', tag=dbtag)
+    dbname=_InstanceFromProjectName()
+    ddb = DefectsDB('COOLOFL_GLOBAL/' + dbname, tag=dbtag)
 
     primary_defects = set()
     for defect in defects:
@@ -96,7 +113,8 @@ def GetLArBadLBFilterTool(origDbTag=None):
     else:
         from DQDefects import DefectsDB
         dbtag = _resolve_db_tag(origDbTag)
-        ddb = DefectsDB('COOLOFL_GLOBAL/COMP200', tag=dbtag)
+        dbname = _InstanceFromProjectName()
+        ddb = DefectsDB('COOLOFL_GLOBAL/'+dbname, tag=dbtag)
         defects = ddb.defect_names
         defectliststr = []
         defectlist = []

Control/AthenaMonitoring/share/DQMonFlagsConfig_jobOptions.py

@@ -12,6 +12,8 @@ if not 'DQMonFlags' in dir():
 if not 'rec' in dir():
    from RecExConfig.RecFlags import rec
 
+from RecExConfig.RecAlgsFlags import recAlgs
+
 if rec.doTrigger() == False:
    DQMonFlags.useTrigger=False     # steers trigger-awareness
    DQMonFlags.doLVL1CaloMon=False
@@ -193,9 +195,10 @@ if rec.readRDO():
    from MuonRecExample.MuonRecFlags import muonRecFlags
    from MuonCombinedRecExample.MuonCombinedRecFlags import muonCombinedRecFlags
    from egammaRec.egammaRecFlags import jobproperties
-   from JetRec.JetRecFlags import jobproperties
    from tauRec.tauRecFlags import jobproperties
 
+from JetRec.JetRecFlags import jobproperties
+
 if (not rec.doCalo()) or (rec.readRDO() and not jobproperties.CaloRecFlags.Enabled()):
    DQMonFlags.doCaloMon=False
    DQMonFlags.doTileMon=False
@@ -226,13 +229,19 @@ if (not rec.doEgamma()) or (rec.readRDO() and not jobproperties.egammaRecFlags.E
    DQMonFlags.doEgammaMon=False
 
 #if (not rec.doJetRec()) or (rec.readRDO() and not jobproperties.JetRecFlags.Enabled()):
-if (rec.readRDO() and not jobproperties.JetRecFlags.Enabled()):
+if (not rec.doJetMissingETTag() or (rec.readRDO() and not jobproperties.JetRecFlags.Enabled())):
    DQMonFlags.doJetMon=False
+   DQMonFlags.doMissingEtMon=False
+   DQMonFlags.doJetTagMon=False
 
 #if (not rec.doTau()) or (rec.readRDO() and not jobproperties.TauRecFlags.Enabled()):
 if (not rec.doTau()):
    DQMonFlags.doTauMon=False
 
+# covered now by doJetMissingETTag
+#if (not recAlgs.doMissingET()):
+#   DQMonFlags.doMissingEtMon=False
+
 #
 # Stream Aware Monitoring
 # Turn off tools on a stream basis to save cpu
@@ -315,22 +324,12 @@ if DQMonFlags.doStreamAwareMon:
       DQMonFlags.doJetMon=False
       DQMonFlags.doMissingEtMon=False
       DQMonFlags.doTauMon=False
-      HLTMonFlags.doBjet=False
-      HLTMonFlags.doEgamma=False
-      HLTMonFlags.doTau=False
-      HLTMonFlags.doJet=False
-      HLTMonFlags.doCalo=False
-      HLTMonFlags.doMuon=False
       DQMonFlags.doTileMon=False
-      DQMonFlags.doPixelMon=False
-      DQMonFlags.doSCTMon=False
       DQMonFlags.doMuonRawMon=False
       DQMonFlags.doMuonTrackMon=False
       DQMonFlags.doMuonAlignMon=False
-      DQMonFlags.doMuonCombinedMon=False
       DQMonFlags.doMuonSegmentMon=False
       DQMonFlags.doMuonPhysicsMon=False
-      DQMonFlags.doMuonTrkPhysMon=False
       DQMonFlags.doCaloMon=False
       DQMonFlags.doJetTagMon=False
       LArMonFlags.doLArRawChannelMon=False
@@ -392,7 +391,7 @@ else:
    local_logger.info("Stream-Aware monitoring is turned OFF")
 
 # disabled until further notice 20140401 - PUEO
-DQMonFlags.doMuonRawMon=False
+# DQMonFlags.doMuonRawMon=False
 
 DQMonFlags.lock_JobProperties()
 DQMonFlags.print_JobProperties()

Control/AthenaMonitoring/share/DataQualitySteering_jobOptions.py

@@ -209,21 +209,6 @@ if DQMonFlags.doMonitoring():
      except Exception:
         treatException("DataQualitySteering_jobOptions.py: exception when setting up Muon detector monitoring")
   
-   #--------------------------#
-   # Combined muon monitoring #
-   #--------------------------#
-   if DQMonFlags.doMuonCombinedMon():
-      try:
-         monManMuonCombined = AthenaMonManager(name="MuonCombinedMonManager",
-                                  FileKey             = DQMonFlags.monManFileKey(),
-                                  Environment         = DQMonFlags.monManEnvironment(),
-                                  ManualDataTypeSetup = DQMonFlags.monManManualDataTypeSetup(),
-                                  DataType            = DQMonFlags.monManDataType())
-         topSequence += monManMuonCombined
-         include("MuonCombinedDQA/MuonCombinedMonitoring_jobOptions.py")
-      except Exception:
-         treatException("DataQualitySteering_jobOptions.py: exception when setting up Muon combined performance monitoring")
-
    #------------------#
    # LUCID monitoring #
    #------------------#