diff --git a/InnerDetector/InDetExample/InDetRecExample/share/InDetMonitoringSCT.py b/InnerDetector/InDetExample/InDetRecExample/share/InDetMonitoringSCT.py index f05b2a437c5371ef3773cb56b1f08cd53a85c39b..d59a3351917d792a1f591bccabc8d13374f272db 100755 --- a/InnerDetector/InDetExample/InDetRecExample/share/InDetMonitoringSCT.py +++ b/InnerDetector/InDetExample/InDetRecExample/share/InDetMonitoringSCT.py @@ -1,33 +1,33 @@ -from AthenaMonitoring.DQMonFlags import DQMonFlags -from AthenaCommon.AthenaCommonFlags import athenaCommonFlags +useNewAlgs = True # Use new AthenaMT friendly DQ algorithms instead of DQ tools + +if useNewAlgs: + include("SCT_Monitoring/SCTErrMonAlg_jobOptions.py") + include("SCT_Monitoring/SCTHitEffMonAlg_jobOptions.py") + include("SCT_Monitoring/SCTLorentzMonAlg_jobOptions.py") + include("SCT_Monitoring/SCTTracksMonAlg_jobOptions.py") + include("SCT_Monitoring/SCTHitsNoiseMonAlg_jobOptions.py") -######################################################################## -# Conditions access -# These lines were previously in SCT_Monitoring_ConditionsAccess.py -######################################################################## +else: + from AthenaMonitoring.DQMonFlags import DQMonFlags + tracksName = (InDetKeys.SCTTracks() if InDetFlags.doTrackSegmentsSCT() else InDetKeys.UnslimmedTracks()) + + doTriggger = False + TrigDecisionTool_InDetSCTHitsTool = "" + if globalflags.DataSource == "data": + from RecExConfig.RecFlags import rec + if rec.doTrigger(): + doTriggger = True + TrigDecisionTool_InDetSCTHitsTool = DQMonFlags.nameTrigDecTool() + from SCT_Monitoring.SCT_MonitoringConf import SCTHitsNoiseMonTool + InDetSCTHitsTool = SCTHitsNoiseMonTool ( name = "InDetSCTHitsNoiseMonTool", + OutputLevel = 4, + doTrigger = doTriggger, + TrigDecisionTool = TrigDecisionTool_InDetSCTHitsTool, + tracksName = tracksName ) -useNewAlgs = True # Use new AthenaMT friendly DQ algorithms instead of DQ tools + if (InDetFlags.doPrintConfigurables()): + printfunc (InDetSCTHitsTool) -tracksName = (InDetKeys.SCTTracks() if InDetFlags.doTrackSegmentsSCT() else InDetKeys.UnslimmedTracks()) - -doTriggger = False -TrigDecisionTool_InDetSCTHitsTool = "" -if globalflags.DataSource == "data": - from RecExConfig.RecFlags import rec - if rec.doTrigger(): - doTriggger = True - TrigDecisionTool_InDetSCTHitsTool = DQMonFlags.nameTrigDecTool() -from SCT_Monitoring.SCT_MonitoringConf import SCTHitsNoiseMonTool -InDetSCTHitsTool = SCTHitsNoiseMonTool ( name = "InDetSCTHitsNoiseMonTool", - OutputLevel = 4, - doTrigger = doTriggger, - TrigDecisionTool = TrigDecisionTool_InDetSCTHitsTool, - tracksName = tracksName ) - -if (InDetFlags.doPrintConfigurables()): - printfunc (InDetSCTHitsTool) - -if not useNewAlgs: from SCT_Monitoring.SCT_MonitoringConf import SCTErrMonTool InDetSCTErrMonTool = SCTErrMonTool ( name = "InDetSCTErrMonTool", OutputLevel = 4, @@ -105,33 +105,22 @@ if not useNewAlgs: if (InDetFlags.doPrintConfigurables()): printfunc (InDetSCTHitEffMonTool) -from AthenaMonitoring.AthenaMonitoringConf import AthenaMonManager - -InDetSCTMonMan = AthenaMonManager("InDetSCTMonManager", - FileKey = DQMonFlags.monManFileKey(), - ManualDataTypeSetup = DQMonFlags.monManManualDataTypeSetup(), - ManualRunLBSetup = DQMonFlags.monManManualRunLBSetup(), - DataType = DQMonFlags.monManDataType(), - Environment = DQMonFlags.monManEnvironment(), - Run = DQMonFlags.monManRun(), - LumiBlock = DQMonFlags.monManLumiBlock(), - AthenaMonTools = [ ] ) - -if useNewAlgs: - include("SCT_Monitoring/SCTErrMonAlg_jobOptions.py") - include("SCT_Monitoring/SCTHitEffMonAlg_jobOptions.py") - include("SCT_Monitoring/SCTLorentzMonAlg_jobOptions.py") - include("SCT_Monitoring/SCTTracksMonAlg_jobOptions.py") - include("SCT_Monitoring/SCTHitsNoiseMonAlg_jobOptions.py") - -else: - InDetSCTMonMan.AthenaMonTools += [ InDetSCTErrMonTool ] - InDetSCTMonMan.AthenaMonTools += [ InDetSCTHitEffMonTool ] - InDetSCTMonMan.AthenaMonTools += [ InDetSCTLorentzMonTool ] - InDetSCTMonMan.AthenaMonTools += [ InDetSCTTracksMonTool ] - InDetSCTMonMan.AthenaMonTools += [ InDetSCTHitsTool ] - - -topSequence += InDetSCTMonMan -if (InDetFlags.doPrintConfigurables()): - printfunc (InDetSCTMonMan) + from AthenaMonitoring.AthenaMonitoringConf import AthenaMonManager + + InDetSCTMonMan = AthenaMonManager("InDetSCTMonManager", + FileKey = DQMonFlags.monManFileKey(), + ManualDataTypeSetup = DQMonFlags.monManManualDataTypeSetup(), + ManualRunLBSetup = DQMonFlags.monManManualRunLBSetup(), + DataType = DQMonFlags.monManDataType(), + Environment = DQMonFlags.monManEnvironment(), + Run = DQMonFlags.monManRun(), + LumiBlock = DQMonFlags.monManLumiBlock(), + AthenaMonTools = [ InDetSCTErrMonTool, + InDetSCTHitEffMonTool, + InDetSCTLorentzMonTool, + InDetSCTTracksMonTool, + InDetSCTHitsTool ] ) + + topSequence += InDetSCTMonMan + if (InDetFlags.doPrintConfigurables()): + printfunc (InDetSCTMonMan)