From 1f74dff8d00b55f6ec2e55566c70dbd709af8faf Mon Sep 17 00:00:00 2001
From: Peter Onyisi <ponyisi@utexas.edu>
Date: Tue, 30 Oct 2018 23:25:00 +0100
Subject: [PATCH] Modify PhysVal joboptions to handle private monitoring tools
---
.../PhysValMonitoring/share/PhysValBtag_jobOptions.py | 3 ---
.../PhysValMonitoring/share/PhysValEgamma_jobOptions.py | 3 ---
.../PhysValMonitoring/share/PhysValExample_jobOptions.py | 2 --
.../PhysValMonitoring/share/PhysValInDet_jobOptions.py | 5 -----
.../PhysValMonitoring/share/PhysValJet_jobOptions.py | 3 ---
.../PhysValMonitoring/share/PhysValMET_jobOptions.py | 2 --
.../PhysValMonitoring/share/PhysValMuon_jobOptions.py | 3 ---
.../PhysValMonitoring/share/PhysValPFlow_jobOptions.py | 3 ---
.../PhysValMonitoring/share/PhysValSUSY_jobOptions.py | 3 +--
.../PhysValMonitoring/share/PhysValSlowMuon_jobOptions.py | 3 ---
.../PhysValMonitoring/share/PhysValTau_jobOptions.py | 3 ---
.../PhysValMonitoring/share/PhysValTop_jobOptions.py | 3 ---
.../PhysValMonitoring/share/PhysValTopoCluster_jobOptions.py | 3 ---
.../PhysValMonitoring/share/PhysValTrigBjet_jobOptions.py | 4 +---
.../PhysValMonitoring/share/PhysValTrigBphys_jobOptions.py | 4 +---
.../PhysValMonitoring/share/PhysValTrigCalo_jobOptions.py | 4 +---
.../PhysValMonitoring/share/PhysValTrigEgamma_jobOptions.py | 4 +---
.../share/PhysValTrigHLTResult_jobOptions.py | 4 +---
.../PhysValMonitoring/share/PhysValTrigIDtrk_jobOptions.py | 4 +---
.../PhysValMonitoring/share/PhysValTrigJet_jobOptions.py | 4 +---
.../PhysValMonitoring/share/PhysValTrigMET_jobOptions.py | 4 +---
.../PhysValMonitoring/share/PhysValTrigMinBias_jobOptions.py | 4 +---
.../PhysValMonitoring/share/PhysValTrigMuon_jobOptions.py | 4 +---
.../PhysValMonitoring/share/PhysValTrigTau_jobOptions.py | 4 +---
.../PhysValMonitoring/share/PhysValZee_jobOptions.py | 3 ---
25 files changed, 12 insertions(+), 74 deletions(-)
diff --git a/PhysicsAnalysis/PhysicsValidation/PhysValMonitoring/share/PhysValBtag_jobOptions.py b/PhysicsAnalysis/PhysicsValidation/PhysValMonitoring/share/PhysValBtag_jobOptions.py
index 05c0f7974c7..a80752ae56d 100644
--- a/PhysicsAnalysis/PhysicsValidation/PhysValMonitoring/share/PhysValBtag_jobOptions.py
+++ b/PhysicsAnalysis/PhysicsValidation/PhysValMonitoring/share/PhysValBtag_jobOptions.py
@@ -5,8 +5,5 @@ tool1.OutputLevel = WARNING
tool1.DetailLevel = 10
tool1.isData = True
-from AthenaCommon.AppMgr import ToolSvc
-ToolSvc += tool1
-
monMan = CfgMgr.AthenaMonManager("PhysValMonManager")
monMan.AthenaMonTools += [ tool1 ]
diff --git a/PhysicsAnalysis/PhysicsValidation/PhysValMonitoring/share/PhysValEgamma_jobOptions.py b/PhysicsAnalysis/PhysicsValidation/PhysValMonitoring/share/PhysValEgamma_jobOptions.py
index afeeb95b93a..d776e035223 100644
--- a/PhysicsAnalysis/PhysicsValidation/PhysValMonitoring/share/PhysValEgamma_jobOptions.py
+++ b/PhysicsAnalysis/PhysicsValidation/PhysValMonitoring/share/PhysValEgamma_jobOptions.py
@@ -9,8 +9,5 @@ tool1.ElectronContainerName = "Electrons"
tool1.ElectronContainerFrwdName = "ForwardElectrons"
tool1.TruthParticleContainerName = "TruthParticles"
-from AthenaCommon.AppMgr import ToolSvc
-ToolSvc += tool1
-
monMan = CfgMgr.AthenaMonManager("PhysValMonManager")
monMan.AthenaMonTools += [ tool1 ]
diff --git a/PhysicsAnalysis/PhysicsValidation/PhysValMonitoring/share/PhysValExample_jobOptions.py b/PhysicsAnalysis/PhysicsValidation/PhysValMonitoring/share/PhysValExample_jobOptions.py
index 8f139ae8472..52af3a6811b 100644
--- a/PhysicsAnalysis/PhysicsValidation/PhysValMonitoring/share/PhysValExample_jobOptions.py
+++ b/PhysicsAnalysis/PhysicsValidation/PhysValMonitoring/share/PhysValExample_jobOptions.py
@@ -8,8 +8,6 @@ tool1.TauContainerName = "TauJets"
tool1.PhotonContainerName = "Photons"
tool1.ElectronContainerName = "Electrons"
tool1.METContainerName = "MET_Reference_AntiKt4LCTopo"
-from AthenaCommon.AppMgr import ToolSvc
-ToolSvc += tool1
monMan = CfgMgr.AthenaMonManager("PhysValMonManager")
monMan.AthenaMonTools += [ tool1 ]
diff --git a/PhysicsAnalysis/PhysicsValidation/PhysValMonitoring/share/PhysValInDet_jobOptions.py b/PhysicsAnalysis/PhysicsValidation/PhysValMonitoring/share/PhysValInDet_jobOptions.py
index f6180f2d7f9..d31b7b96e22 100644
--- a/PhysicsAnalysis/PhysicsValidation/PhysValMonitoring/share/PhysValInDet_jobOptions.py
+++ b/PhysicsAnalysis/PhysicsValidation/PhysValMonitoring/share/PhysValInDet_jobOptions.py
@@ -7,25 +7,20 @@ from InDetPhysValMonitoring.InDetPhysValMonitoringTool import InDetPhysValMonito
from InDetPhysValMonitoring.InDetPhysValJobProperties import InDetPhysValFlags
indet_mon_tool = InDetPhysValMonitoringTool.InDetPhysValMonitoringTool()
-ToolSvc += [indet_mon_tool]
monMan.AthenaMonTools += [indet_mon_tool]
if InDetPhysValFlags.doValidateDBMTracks():
indet_mon_tool_DBM = InDetPhysValMonitoringTool.InDetPhysValMonitoringToolDBM()
- ToolSvc += [ indet_mon_tool_DBM ]
monMan.AthenaMonTools += [ indet_mon_tool_DBM ]
if InDetPhysValFlags.doValidateGSFTracks():
indet_mon_tool_GSF = InDetPhysValMonitoringTool.InDetPhysValMonitoringToolGSF()
- ToolSvc += [ indet_mon_tool_GSF ]
monMan.AthenaMonTools += [ indet_mon_tool_GSF ]
if InDetPhysValFlags.doValidateLooseTracks():
indet_mon_tool_Loose = InDetPhysValMonitoringTool.InDetPhysValMonitoringToolLoose()
- ToolSvc += [ indet_mon_tool_Loose ]
monMan.AthenaMonTools += [ indet_mon_tool_Loose ]
if InDetPhysValFlags.doValidateTightPrimaryTracks():
indet_mon_tool_TightPrimary = InDetPhysValMonitoringTool.InDetPhysValMonitoringToolTightPrimary()
- ToolSvc += [ indet_mon_tool_TightPrimary ]
monMan.AthenaMonTools += [ indet_mon_tool_TightPrimary ]
diff --git a/PhysicsAnalysis/PhysicsValidation/PhysValMonitoring/share/PhysValJet_jobOptions.py b/PhysicsAnalysis/PhysicsValidation/PhysValMonitoring/share/PhysValJet_jobOptions.py
index 5a238ea1f7f..c530ceb649d 100644
--- a/PhysicsAnalysis/PhysicsValidation/PhysValMonitoring/share/PhysValJet_jobOptions.py
+++ b/PhysicsAnalysis/PhysicsValidation/PhysValMonitoring/share/PhysValJet_jobOptions.py
@@ -4,8 +4,5 @@ tool1.EnableLumi = False
tool1.OutputLevel = WARNING
tool1.DetailLevel = 10
-from AthenaCommon.AppMgr import ToolSvc
-ToolSvc += tool1
-
monMan = CfgMgr.AthenaMonManager("PhysValMonManager")
monMan.AthenaMonTools += [ tool1 ]
diff --git a/PhysicsAnalysis/PhysicsValidation/PhysValMonitoring/share/PhysValMET_jobOptions.py b/PhysicsAnalysis/PhysicsValidation/PhysValMonitoring/share/PhysValMET_jobOptions.py
index 20d4b9a6888..c9df20d9990 100644
--- a/PhysicsAnalysis/PhysicsValidation/PhysValMonitoring/share/PhysValMET_jobOptions.py
+++ b/PhysicsAnalysis/PhysicsValidation/PhysValMonitoring/share/PhysValMET_jobOptions.py
@@ -49,7 +49,5 @@ tauseltool = CfgMgr.TauAnalysisTools__TauSelectionTool("TauSelectionTool")
ToolSvc += tauseltool
tool1.TauSelectionTool = tauseltool
-ToolSvc += tool1
-
monMan = CfgMgr.AthenaMonManager("PhysValMonManager")
monMan.AthenaMonTools += [ tool1 ]
diff --git a/PhysicsAnalysis/PhysicsValidation/PhysValMonitoring/share/PhysValMuon_jobOptions.py b/PhysicsAnalysis/PhysicsValidation/PhysValMonitoring/share/PhysValMuon_jobOptions.py
index 2ac9ba91276..f58c0931798 100644
--- a/PhysicsAnalysis/PhysicsValidation/PhysValMonitoring/share/PhysValMuon_jobOptions.py
+++ b/PhysicsAnalysis/PhysicsValidation/PhysValMonitoring/share/PhysValMuon_jobOptions.py
@@ -67,8 +67,5 @@ tool1.EnableLumi = False
tool1.OutputLevel = WARNING
tool1.DetailLevel = 10
-from AthenaCommon.AppMgr import ToolSvc
-ToolSvc += tool1
-
monMan = CfgMgr.AthenaMonManager("PhysValMonManager")
monMan.AthenaMonTools += [ tool1 ]
diff --git a/PhysicsAnalysis/PhysicsValidation/PhysValMonitoring/share/PhysValPFlow_jobOptions.py b/PhysicsAnalysis/PhysicsValidation/PhysValMonitoring/share/PhysValPFlow_jobOptions.py
index fd721e9239e..24f437a6f85 100644
--- a/PhysicsAnalysis/PhysicsValidation/PhysValMonitoring/share/PhysValPFlow_jobOptions.py
+++ b/PhysicsAnalysis/PhysicsValidation/PhysValMonitoring/share/PhysValPFlow_jobOptions.py
@@ -9,8 +9,6 @@ PhysValPFO_charged.OutputLevel = WARNING
PhysValPFO_charged.DetailLevel = 10
PhysValPFO_charged.EnableLumi = False
-from AthenaCommon.AppMgr import ToolSvc
-ToolSvc += PhysValPFO_charged
monMan.AthenaMonTools += [ PhysValPFO_charged ]
PhysValPFO_neutral_EM = PhysValPFO("PhysValPFO_neutral")
@@ -20,5 +18,4 @@ PhysValPFO_neutral_EM.EnableLumi = False
PhysValPFO_neutral_EM.PFOContainerName="JetETMissNeutralParticleFlowObjects";
PhysValPFO_neutral_EM.useNeutralPFO = True
-ToolSvc += PhysValPFO_neutral_EM
monMan.AthenaMonTools += [ PhysValPFO_neutral_EM ]
diff --git a/PhysicsAnalysis/PhysicsValidation/PhysValMonitoring/share/PhysValSUSY_jobOptions.py b/PhysicsAnalysis/PhysicsValidation/PhysValMonitoring/share/PhysValSUSY_jobOptions.py
index 35e75db8b1b..e0e5a93a857 100644
--- a/PhysicsAnalysis/PhysicsValidation/PhysValMonitoring/share/PhysValSUSY_jobOptions.py
+++ b/PhysicsAnalysis/PhysicsValidation/PhysValMonitoring/share/PhysValSUSY_jobOptions.py
@@ -41,7 +41,6 @@ if run_default_rel19:
tool1.UseTruthInformation = True
from AthenaCommon.AppMgr import ToolSvc
- ToolSvc += tool1
monMan = CfgMgr.AthenaMonManager("PhysValMonManager")
monMan.AthenaMonTools += [ tool1 ]
@@ -123,4 +122,4 @@ if run_migrated_rel17_tools:
else:
SusyPlot.susyTool.HistBaseDirectory = "/PhysVal/SUSY/ETmiss/"
-
\ No newline at end of file
+
diff --git a/PhysicsAnalysis/PhysicsValidation/PhysValMonitoring/share/PhysValSlowMuon_jobOptions.py b/PhysicsAnalysis/PhysicsValidation/PhysValMonitoring/share/PhysValSlowMuon_jobOptions.py
index bb94b735a8b..6cbc6cc47b3 100644
--- a/PhysicsAnalysis/PhysicsValidation/PhysValMonitoring/share/PhysValSlowMuon_jobOptions.py
+++ b/PhysicsAnalysis/PhysicsValidation/PhysValMonitoring/share/PhysValSlowMuon_jobOptions.py
@@ -35,8 +35,5 @@ tool1.EnableLumi = False
tool1.OutputLevel = ERROR
tool1.DetailLevel = 10
-from AthenaCommon.AppMgr import ToolSvc
-ToolSvc += tool1
-
monMan = CfgMgr.AthenaMonManager("PhysValMonManager")
monMan.AthenaMonTools += [ tool1 ]
diff --git a/PhysicsAnalysis/PhysicsValidation/PhysValMonitoring/share/PhysValTau_jobOptions.py b/PhysicsAnalysis/PhysicsValidation/PhysValMonitoring/share/PhysValTau_jobOptions.py
index 4c1439e64ec..00e0c47bd5a 100644
--- a/PhysicsAnalysis/PhysicsValidation/PhysValMonitoring/share/PhysValTau_jobOptions.py
+++ b/PhysicsAnalysis/PhysicsValidation/PhysValMonitoring/share/PhysValTau_jobOptions.py
@@ -10,9 +10,6 @@ if recFlags.doTruth():
tool1.TauContainerName = "TauJets"
tool1.TruthParticleContainerName = "TruthParticles"
-from AthenaCommon.AppMgr import ToolSvc
-ToolSvc += tool1
-
monMan = CfgMgr.AthenaMonManager("PhysValMonManager")
monMan.AthenaMonTools += [ tool1 ]
diff --git a/PhysicsAnalysis/PhysicsValidation/PhysValMonitoring/share/PhysValTop_jobOptions.py b/PhysicsAnalysis/PhysicsValidation/PhysValMonitoring/share/PhysValTop_jobOptions.py
index aca93a0920d..fd7c036b7bf 100644
--- a/PhysicsAnalysis/PhysicsValidation/PhysValMonitoring/share/PhysValTop_jobOptions.py
+++ b/PhysicsAnalysis/PhysicsValidation/PhysValMonitoring/share/PhysValTop_jobOptions.py
@@ -10,8 +10,5 @@ tool1.PhotonContainerName = "Photons"
tool1.ElectronContainerName = "Electrons"
tool1.TauContainerName = "TauJets"
-from AthenaCommon.AppMgr import ToolSvc
-ToolSvc += tool1
-
monMan = CfgMgr.AthenaMonManager("PhysValMonManager")
monMan.AthenaMonTools += [ tool1 ]
diff --git a/PhysicsAnalysis/PhysicsValidation/PhysValMonitoring/share/PhysValTopoCluster_jobOptions.py b/PhysicsAnalysis/PhysicsValidation/PhysValMonitoring/share/PhysValTopoCluster_jobOptions.py
index 21af5fb9edc..57f4db49180 100644
--- a/PhysicsAnalysis/PhysicsValidation/PhysValMonitoring/share/PhysValTopoCluster_jobOptions.py
+++ b/PhysicsAnalysis/PhysicsValidation/PhysValMonitoring/share/PhysValTopoCluster_jobOptions.py
@@ -6,8 +6,6 @@ PhysValCluster_LC.DetailLevel = 10
PhysValCluster_LC.EnableLumi = False
PhysValCluster_LC.ClusterContainerName="CaloCalTopoClusters"
-from AthenaCommon.AppMgr import ToolSvc
-ToolSvc += PhysValCluster_LC
monMan.AthenaMonTools += [ PhysValCluster_LC ]
# new origin corrected clusters
@@ -18,5 +16,4 @@ PhysValCluster_origin.DetailLevel = 10
PhysValCluster_origin.EnableLumi = False
PhysValCluster_origin.ClusterContainerName="LCOriginTopoClusters"
-ToolSvc += PhysValCluster_origin
monMan.AthenaMonTools += [ PhysValCluster_origin ]
diff --git a/PhysicsAnalysis/PhysicsValidation/PhysValMonitoring/share/PhysValTrigBjet_jobOptions.py b/PhysicsAnalysis/PhysicsValidation/PhysValMonitoring/share/PhysValTrigBjet_jobOptions.py
index 1ba48316170..5e3fa8582d0 100644
--- a/PhysicsAnalysis/PhysicsValidation/PhysValMonitoring/share/PhysValTrigBjet_jobOptions.py
+++ b/PhysicsAnalysis/PhysicsValidation/PhysValMonitoring/share/PhysValTrigBjet_jobOptions.py
@@ -1,10 +1,8 @@
from TrigBjetMonitoring.TrigBjetMonitoringConfig import TrigBjetMonitoringConfig
-for toolname in TrigBjetMonitoringConfig():
- tool1 = getattr(ToolSvc, toolname.split('/')[-1])
+for tool1 in TrigBjetMonitoringConfig():
tool1.EnableLumi = False
tool1.OutputLevel = WARNING
#tool1.DetailLevel = 10
tool1.EnableLumi = False
- ToolSvc += tool1
monMan.AthenaMonTools += [tool1]
diff --git a/PhysicsAnalysis/PhysicsValidation/PhysValMonitoring/share/PhysValTrigBphys_jobOptions.py b/PhysicsAnalysis/PhysicsValidation/PhysValMonitoring/share/PhysValTrigBphys_jobOptions.py
index 860ea75d3e0..16d425a0aea 100644
--- a/PhysicsAnalysis/PhysicsValidation/PhysValMonitoring/share/PhysValTrigBphys_jobOptions.py
+++ b/PhysicsAnalysis/PhysicsValidation/PhysValMonitoring/share/PhysValTrigBphys_jobOptions.py
@@ -1,10 +1,8 @@
from TrigBphysMonitoring.TrigBphysMonitoringConfig import TrigBphysMonitoringTool
-for toolname in TrigBphysMonitoringTool():
- tool1 = getattr(ToolSvc, toolname.split('/')[-1])
+for tool1 in TrigBphysMonitoringTool():
tool1.EnableLumi = False
tool1.OutputLevel = WARNING
#tool1.DetailLevel = 10
tool1.EnableLumi = False
- ToolSvc += tool1
monMan.AthenaMonTools += [tool1]
diff --git a/PhysicsAnalysis/PhysicsValidation/PhysValMonitoring/share/PhysValTrigCalo_jobOptions.py b/PhysicsAnalysis/PhysicsValidation/PhysValMonitoring/share/PhysValTrigCalo_jobOptions.py
index 327a968dd31..0d78310cea6 100644
--- a/PhysicsAnalysis/PhysicsValidation/PhysValMonitoring/share/PhysValTrigCalo_jobOptions.py
+++ b/PhysicsAnalysis/PhysicsValidation/PhysValMonitoring/share/PhysValTrigCalo_jobOptions.py
@@ -1,10 +1,8 @@
from TrigCaloMonitoring.TrigCaloMonitoringConfig import HLTCaloMonitoringTool
-for toolname in HLTCaloMonitoringTool():
- tool1 = getattr(ToolSvc, toolname.split('/')[-1])
+for tool1 in HLTCaloMonitoringTool():
tool1.EnableLumi = False
tool1.OutputLevel = WARNING
#tool1.DetailLevel = 10
tool1.EnableLumi = False
- ToolSvc += tool1
monMan.AthenaMonTools += [tool1]
diff --git a/PhysicsAnalysis/PhysicsValidation/PhysValMonitoring/share/PhysValTrigEgamma_jobOptions.py b/PhysicsAnalysis/PhysicsValidation/PhysValMonitoring/share/PhysValTrigEgamma_jobOptions.py
index 88ff7965476..e7d5cfca434 100644
--- a/PhysicsAnalysis/PhysicsValidation/PhysValMonitoring/share/PhysValTrigEgamma_jobOptions.py
+++ b/PhysicsAnalysis/PhysicsValidation/PhysValMonitoring/share/PhysValTrigEgamma_jobOptions.py
@@ -1,10 +1,8 @@
from TrigEgammaMonitoring.TrigEgammaMonitoringConfig import TrigEgammaMonitoringTool
-for toolname in TrigEgammaMonitoringTool():
- tool1 = getattr(ToolSvc, toolname.split('/')[-1])
+for tool1 in TrigEgammaMonitoringTool():
tool1.EnableLumi = False
tool1.OutputLevel = WARNING
#tool1.DetailLevel = 10
tool1.EnableLumi = False
- ToolSvc += tool1
monMan.AthenaMonTools += [tool1]
diff --git a/PhysicsAnalysis/PhysicsValidation/PhysValMonitoring/share/PhysValTrigHLTResult_jobOptions.py b/PhysicsAnalysis/PhysicsValidation/PhysValMonitoring/share/PhysValTrigHLTResult_jobOptions.py
index 78c56894314..b1c41209005 100644
--- a/PhysicsAnalysis/PhysicsValidation/PhysValMonitoring/share/PhysValTrigHLTResult_jobOptions.py
+++ b/PhysicsAnalysis/PhysicsValidation/PhysValMonitoring/share/PhysValTrigHLTResult_jobOptions.py
@@ -1,6 +1,5 @@
from TrigHLTMonitoring.TrigHLTMonitoringConfig import HLTGeneralTool
-for toolname in HLTGeneralTool():
- tool1 = getattr(ToolSvc, toolname.split('/')[-1])
+for tool1 in HLTGeneralTool():
# tool1.histoPathBase = "/Trigger/HLT"
# tool1.OutputLevel = WARNING
#tool1.DetailLevel = 10
@@ -16,5 +15,4 @@ for toolname in HLTGeneralTool():
# 'Jets' : 'HLT_(FJ|j)[0-9]+.*',
# }
tool1.EnableLumi = False
- ToolSvc += tool1
monMan.AthenaMonTools += [tool1]
diff --git a/PhysicsAnalysis/PhysicsValidation/PhysValMonitoring/share/PhysValTrigIDtrk_jobOptions.py b/PhysicsAnalysis/PhysicsValidation/PhysValMonitoring/share/PhysValTrigIDtrk_jobOptions.py
index 7030040a8a6..6dd1b7099eb 100644
--- a/PhysicsAnalysis/PhysicsValidation/PhysValMonitoring/share/PhysValTrigIDtrk_jobOptions.py
+++ b/PhysicsAnalysis/PhysicsValidation/PhysValMonitoring/share/PhysValTrigIDtrk_jobOptions.py
@@ -1,10 +1,8 @@
from TrigIDtrkMonitoring.TrigIDPhysValMonitoringConfig import TrigIDPhysValMonitoringTool
-for toolname in TrigIDPhysValMonitoringTool():
- tool1 = getattr(ToolSvc, toolname.split('/')[-1])
+for tool1 in TrigIDPhysValMonitoringTool():
tool1.EnableLumi = False
tool1.OutputLevel = WARNING
#tool1.DetailLevel = 10
tool1.EnableLumi = False
- ToolSvc += tool1
monMan.AthenaMonTools += [tool1]
diff --git a/PhysicsAnalysis/PhysicsValidation/PhysValMonitoring/share/PhysValTrigJet_jobOptions.py b/PhysicsAnalysis/PhysicsValidation/PhysValMonitoring/share/PhysValTrigJet_jobOptions.py
index cb8461351a0..10ece92771c 100644
--- a/PhysicsAnalysis/PhysicsValidation/PhysValMonitoring/share/PhysValTrigJet_jobOptions.py
+++ b/PhysicsAnalysis/PhysicsValidation/PhysValMonitoring/share/PhysValTrigJet_jobOptions.py
@@ -1,10 +1,8 @@
from TrigJetMonitoring.TrigJetMonitoringConfig import TrigJetMonitoringTool
-for toolname in TrigJetMonitoringTool():
- tool1 = getattr(ToolSvc, toolname.split('/')[-1])
+for tool1 in TrigJetMonitoringTool():
tool1.EnableLumi = False
tool1.OutputLevel = WARNING
#tool1.DetailLevel = 10
tool1.EnableLumi = False
- ToolSvc += tool1
monMan.AthenaMonTools += [tool1]
diff --git a/PhysicsAnalysis/PhysicsValidation/PhysValMonitoring/share/PhysValTrigMET_jobOptions.py b/PhysicsAnalysis/PhysicsValidation/PhysValMonitoring/share/PhysValTrigMET_jobOptions.py
index fef83e5ab0c..0b1b45bbec5 100644
--- a/PhysicsAnalysis/PhysicsValidation/PhysValMonitoring/share/PhysValTrigMET_jobOptions.py
+++ b/PhysicsAnalysis/PhysicsValidation/PhysValMonitoring/share/PhysValTrigMET_jobOptions.py
@@ -1,10 +1,8 @@
from TrigMETMonitoring.TrigMETMonitoringConfig import HLTMETMonitoringTool
-for toolname in HLTMETMonitoringTool():
- tool1 = getattr(ToolSvc, toolname.split('/')[-1])
+for tool1 in HLTMETMonitoringTool():
tool1.EnableLumi = False
tool1.OutputLevel = WARNING
#tool1.DetailLevel = 10
tool1.EnableLumi = False
- ToolSvc += tool1
monMan.AthenaMonTools += [tool1]
diff --git a/PhysicsAnalysis/PhysicsValidation/PhysValMonitoring/share/PhysValTrigMinBias_jobOptions.py b/PhysicsAnalysis/PhysicsValidation/PhysValMonitoring/share/PhysValTrigMinBias_jobOptions.py
index c8055bf3dca..09a854835de 100644
--- a/PhysicsAnalysis/PhysicsValidation/PhysValMonitoring/share/PhysValTrigMinBias_jobOptions.py
+++ b/PhysicsAnalysis/PhysicsValidation/PhysValMonitoring/share/PhysValTrigMinBias_jobOptions.py
@@ -1,10 +1,8 @@
from TrigMinBiasMonitoring.TrigMinBiasMonitoringConfig import TrigMinBiasMonitoringTool
-for toolname in TrigMinBiasMonitoringTool():
- tool1 = getattr(ToolSvc, toolname.split('/')[-1])
+for tool1 in TrigMinBiasMonitoringTool():
tool1.EnableLumi = False
tool1.OutputLevel = WARNING
#tool1.DetailLevel = 10
tool1.EnableLumi = False
- ToolSvc += tool1
monMan.AthenaMonTools += [tool1]
diff --git a/PhysicsAnalysis/PhysicsValidation/PhysValMonitoring/share/PhysValTrigMuon_jobOptions.py b/PhysicsAnalysis/PhysicsValidation/PhysValMonitoring/share/PhysValTrigMuon_jobOptions.py
index 8a02e5d19ef..aef145a6c0b 100644
--- a/PhysicsAnalysis/PhysicsValidation/PhysValMonitoring/share/PhysValTrigMuon_jobOptions.py
+++ b/PhysicsAnalysis/PhysicsValidation/PhysValMonitoring/share/PhysValTrigMuon_jobOptions.py
@@ -1,10 +1,8 @@
from TrigMuonMonitoring.TrigMuonMonitoringConfig import TrigMuonMonitoringTool
-for toolname in TrigMuonMonitoringTool():
- tool1 = getattr(ToolSvc, toolname.split('/')[-1])
+for tool1 in TrigMuonMonitoringTool():
tool1.EnableLumi = False
tool1.OutputLevel = WARNING
#tool1.DetailLevel = 10
tool1.EnableLumi = False
- ToolSvc += tool1
monMan.AthenaMonTools += [tool1]
diff --git a/PhysicsAnalysis/PhysicsValidation/PhysValMonitoring/share/PhysValTrigTau_jobOptions.py b/PhysicsAnalysis/PhysicsValidation/PhysValMonitoring/share/PhysValTrigTau_jobOptions.py
index 64e289ae250..02514b0a94c 100644
--- a/PhysicsAnalysis/PhysicsValidation/PhysValMonitoring/share/PhysValTrigTau_jobOptions.py
+++ b/PhysicsAnalysis/PhysicsValidation/PhysValMonitoring/share/PhysValTrigTau_jobOptions.py
@@ -1,10 +1,8 @@
from TrigTauMonitoring.TrigTauMonitoringConfig import TrigTauMonitoringTool
-for toolname in TrigTauMonitoringTool():
- tool1 = getattr(ToolSvc, toolname.split('/')[-1])
+for tool1 in TrigTauMonitoringTool():
tool1.EnableLumi = False
tool1.OutputLevel = WARNING
#tool1.DetailLevel = 10
tool1.EnableLumi = False
- ToolSvc += tool1
monMan.AthenaMonTools += [tool1]
diff --git a/PhysicsAnalysis/PhysicsValidation/PhysValMonitoring/share/PhysValZee_jobOptions.py b/PhysicsAnalysis/PhysicsValidation/PhysValMonitoring/share/PhysValZee_jobOptions.py
index 7c0013f5c79..3db5195f9c7 100644
--- a/PhysicsAnalysis/PhysicsValidation/PhysValMonitoring/share/PhysValZee_jobOptions.py
+++ b/PhysicsAnalysis/PhysicsValidation/PhysValMonitoring/share/PhysValZee_jobOptions.py
@@ -12,8 +12,5 @@ tool1.ElectronContainerName = "Electrons"
tool1.ElectronContainerFrwdName = "ForwardElectrons"
tool1.TruthParticleContainerName = "TruthParticles"
-from AthenaCommon.AppMgr import ToolSvc
-ToolSvc += tool1
-
monMan = CfgMgr.AthenaMonManager("PhysValMonManager")
monMan.AthenaMonTools += [ tool1 ]
--
GitLab