From d92d4bf0065df98232e7de86fe9f3216a0a02c63 Mon Sep 17 00:00:00 2001
From: Peter Onyisi <ponyisi@utexas.edu>
Date: Tue, 23 Oct 2018 00:08:56 +0000
Subject: [PATCH] Make AthenaMonitoring tools private
---
.../share/CaloBaselineMon_jobOpt.py | 2 +-
.../share/CaloCellVecMonCollisions_jobOpt.py | 4 +-
.../share/CaloCellVecMonCosmics_jobOpt.py | 4 +-
.../CaloClusterVecMonCollisions_jobOpt.py | 2 +-
.../share/CaloClusterVecMonCosmics_jobOpt.py | 2 +-
.../CaloTowerVecMonCollisions_jobOptions.py | 2 +-
.../CaloTowerVecMonCosmics_jobOptions.py | 2 +-
...verseBalanceVecMonCollisions_jobOptions.py | 2 +-
.../share/EMClusterVecMonCollisions_jobOpt.py | 2 +-
.../share/EMClusterVecMonCosmics_jobOpt.py | 2 +-
.../LArMuIDClusterVecMonCosmics_jobOpt.py | 2 +-
.../share/DataQualitySteering_jobOptions.py | 19 +--
.../AthenaMonitoring/src/AthenaMonManager.cxx | 4 +-
.../share/DataQualityMon_All_jobOptions.py | 131 ------------------
.../share/DataQualityMon_jobOptions.py | 119 +---------------
.../share/AFPMonitoring_jobOptions.py | 4 +-
.../share/LUCIDMon_jobOptions.py | 2 +-
.../ErrorScaling/InDetMonitoringAlignment.py | 58 ++++----
.../InDetAlignExample/share/GenericTracks.py | 46 +++---
...InDetMonitoringAlignment_TRTAlignTracks.py | 10 +-
.../share/NewInDetAlignMonitoring.py | 60 ++++----
.../share/MonitoringFragment.py | 8 +-
.../share/InDetMonitoringAlignment.py | 48 +++----
.../share/InDetMonitoringGlobal.py | 32 ++---
.../share/InDetMonitoringPixel.py | 8 +-
.../share/InDetMonitoringSCT.py | 20 +--
.../share/InDetMonitoringTRT.py | 4 +-
.../share/InDetRecNtupleCreation.py | 4 +-
.../share/InDetMonitoringTRTCosmics.py | 12 +-
.../share/InDetDiMuMon_jobOptions.py | 24 ++--
.../share/IDPerfMon_jobOptions.py | 18 +--
..._Monitoring_RecExCommonAddOn_jobOptions.py | 2 +-
.../share/TrackMonitoring.py | 8 +-
.../share/runJPsiMonitoring.py | 2 +-
.../share/runJPsiMonitoring_data.py | 2 +-
.../share/runJPsiMonitoring_data_grid.py | 2 +-
.../share/runKShortValidation.py | 2 +-
.../share/runKShortValidation_grid.py | 2 +-
.../share/runMonitoringZmumuValidation.py | 2 +-
.../runMonitoringZmumuValidation_data.py | 2 +-
.../share/runzmumu_runallmonitoring.py | 2 +-
.../share/SCTMonitor_topOptions.py | 10 +-
.../run/PhysValITk_jobOptions.py | 2 +-
.../share/PixelRTT_DigitizationValidation.py | 2 +-
.../share/PixelRTT_SimulationValidation.py | 2 +-
.../share/skeleton.LArNoise_fromraw.py | 2 +-
.../share/LArAffectedRegions_jobOptions.py | 2 +-
.../LArCollisionTimeMonTool_jobOptions.py | 2 +-
.../share/LArCosmicsMonTool_jobOptions.py | 2 +-
.../share/LArCoverage_jobOptions.py | 6 +-
.../share/LArDigitMon_jobOptions.py | 2 +-
.../share/LArFEBMon_calibEMB_jobOptions.py | 4 +-
.../share/LArFEBMon_calibPS_jobOptions.py | 4 +-
.../LArMonTools/share/LArFEBMon_jobOptions.py | 4 +-
.../LArHVCorrectionMonTool_jobOptions.py | 2 +-
.../share/LArNoiseMonTools_jobOptions.py | 4 +-
.../share/LArNoisyROMon_jobOptions.py | 2 +-
.../share/LArNoisyROMon_standalone.py | 2 +-
.../share/LArOddCellsMonTool_jobOptions.py | 4 +-
.../share/LArRODMonTool_jobOptions.py | 2 +-
.../share/LArRawChannelMonTool_jobOptions.py | 2 +-
.../CscCalibAlgs/share/CscCalcPedMon.py | 2 +-
.../CscCalibAlgs/share/CscCalcSlopeMon.py | 4 +-
.../scripts/muondqamonitoring.sh | 20 +--
.../share/MuonDQAMonitoring_CommRunsTier0.py | 56 ++++----
.../share/MuonEventInfoMonitoring_options.py | 2 +-
.../share/CscRawBS_MonitoringOptions.py | 2 +-
.../share/CscRawESD_MonitoringOptions.py | 6 +-
.../share/MdtRaw_MonitoringOptions.py | 4 +-
.../share/MdtVsRpcRaw_MonitoringOptions.py | 2 +-
.../share/MdtVsTgcRaw_MonitoringOptions.py | 2 +-
.../share/RpcRawBS_MonitoringOptions.py | 4 +-
.../share/RpcRawESD_MonitoringOptions.py | 6 +-
.../share/TgcRaw_MonitoringOptions.py | 4 +-
.../share/MuonTrackDQA_options.py | 8 +-
.../share/MuonTrackMonitoring_options.py | 36 ++---
.../share/JetTagMonitoring_jobOptions.py | 2 +-
.../share/HIMonitoringSteering_jo.py | 10 +-
.../python/HIJetMonitoringHistos.py | 6 +-
.../python/JetMonitoringHistos.py | 6 +-
.../JetMonitoring_jobOptions_standalone.py | 2 +-
.../python/PhysicsValidationHistos.py | 2 +-
.../share/MissingET_Monitoring.py | 68 ++++-----
.../share/egammaMonitoring_jobOptions.py | 58 ++++----
.../share/egammaMonitoring_jobOptions_aod.py | 56 ++++----
.../share/egamma_MonitorTool.py | 32 ++---
.../share/tauMonitoring_jobOptions.py | 4 +-
.../share/jobOptions_TileCalibRec.py | 54 ++++----
.../share/TileMon_jobOptions.py | 60 ++++----
.../share/Tile_JetMonTool_time.py | 2 +-
.../python/TrigEgammaMonToolConfig.py | 4 +-
.../python/TrigEgammaMonToolConfig50ns.py | 4 +-
.../python/TrigEgammaPhysValMonToolConfig.py | 4 +-
.../share/testTrigEgammaAnalysisTools.py | 8 +-
.../share/testTrigEgammaAnalysisToolsGRL.py | 16 +--
.../python/TrigEgammaEmulationToolConfig.py | 4 +-
...st_TrigEgammaAnalysisToolsWithEmulation.py | 8 +-
.../run/tida_athanarun2.py | 4 +-
.../run/tida_autoconf.py | 4 +-
.../TrigInDetAnalysisExample/run/tida_dc14.py | 4 +-
.../TrigInDetAnalysisExample/run/tida_run2.py | 4 +-
.../python/TrigBjetMonitoringConfig.py | 6 +-
.../TrigBjetMonitoring/src/HLTBjetMonTool.cxx | 1 +
.../python/TrigBphysMonitoringConfig.py | 4 +-
.../share/testBphysMonitoring.py | 4 +-
.../python/TrigCaloMonitoringConfig.py | 20 +--
.../python/TrigEgammaMonitoringConfig.py | 18 +--
.../python/TrigHLTMonitoringConfig.py | 6 +-
.../share/HLTIDtrkMon_DumpTDT.py | 8 +-
.../python/TrigIDJpsiMonitoringConfig.py | 4 +-
.../TrigIDJpsiMonitoring/run/RunJpsimumu.py | 4 +-
.../run/TrigIDJpsiMonitoring_topOptions.py | 4 +-
...InDetValidation_RTT_topOptions_Bphysics.py | 4 +-
.../grid_TrigIDJpsiMonitoring_topOptions.py | 4 +-
.../python/TrigIDPhysValMonitoringConfig.py | 8 +-
.../python/TrigIDtrkMonitoringConfig.py | 80 +++++------
.../python/TrigJetMonitoringConfig.py | 4 +-
.../python/TrigJetMonitoringConfig_cosmics.py | 6 +-
.../python/TrigJetMonitoringConfig_physics.py | 6 +-
.../python/TrigMETMonitoringConfig.py | 4 +-
.../python/TrigMinBiasMonitoringConfig.py | 4 +-
.../python/TrigMuonMonitoringConfig.py | 4 +-
.../python/TrigTauMonitoringConfig.py | 4 +-
.../share/TrigT1CTMonitoringJobOptions.py | 2 +-
...MonitoringJobOptions_forRecExCommission.py | 2 +-
...1CaloMonitoring_forRecExCommission_Run1.py | 38 ++---
...1CaloMonitoring_forRecExCommission_Run2.py | 28 ++--
...T1CaloMonitoring_forRecExCommission_cpu.py | 44 +++---
.../TrigT1CaloMonitoring_runStandalone.py | 14 +-
...rigT1Monitoring_forRecExCommission_Run2.py | 10 +-
...TrigT1Monitoring_forRecExCommission_cpu.py | 12 +-
...henaTrigAOD_xTrigDecision_HLTMonitoring.py | 4 +-
.../share/testAthenaTrigESD_HLTMonitoring.py | 4 +-
.../share/TrigEgammaAnalysisTools_RTT.py | 4 +-
.../share/TrigInDetValidation_RTT_Common.py | 4 +-
...InDetValidation_RTT_topOptions_Bphysics.py | 4 +-
136 files changed, 737 insertions(+), 969 deletions(-)
delete mode 100644 DataQuality/DataQualityTools/share/DataQualityMon_All_jobOptions.py
diff --git a/Calorimeter/CaloMonitoring/share/CaloBaselineMon_jobOpt.py b/Calorimeter/CaloMonitoring/share/CaloBaselineMon_jobOpt.py
index 8fdbd564f344..a363ce96e208 100644
--- a/Calorimeter/CaloMonitoring/share/CaloBaselineMon_jobOpt.py
+++ b/Calorimeter/CaloMonitoring/share/CaloBaselineMon_jobOpt.py
@@ -53,5 +53,5 @@ CaloBaseline = CaloBaselineMon(
bcidtoolMon_BCIDmax = tmp_CaloBaselineMon["bcidtoolMon_BCIDmax"],
)
-ToolSvc += CaloBaseline
+#ToolSvc += CaloBaseline
CaloMon.AthenaMonTools += [ CaloBaseline ]
diff --git a/Calorimeter/CaloMonitoring/share/CaloCellVecMonCollisions_jobOpt.py b/Calorimeter/CaloMonitoring/share/CaloCellVecMonCollisions_jobOpt.py
index ed1acda36945..2891da86e2ed 100644
--- a/Calorimeter/CaloMonitoring/share/CaloCellVecMonCollisions_jobOpt.py
+++ b/Calorimeter/CaloMonitoring/share/CaloCellVecMonCollisions_jobOpt.py
@@ -207,8 +207,8 @@ else:
-ToolSvc+=LArCellMon
-ToolSvc+=TileCalCellMon
+#ToolSvc+=LArCellMon
+#ToolSvc+=TileCalCellMon
CaloMon.AthenaMonTools += [LArCellMon,TileCalCellMon]
diff --git a/Calorimeter/CaloMonitoring/share/CaloCellVecMonCosmics_jobOpt.py b/Calorimeter/CaloMonitoring/share/CaloCellVecMonCosmics_jobOpt.py
index b21aba6cf568..9e0866c50f97 100755
--- a/Calorimeter/CaloMonitoring/share/CaloCellVecMonCosmics_jobOpt.py
+++ b/Calorimeter/CaloMonitoring/share/CaloCellVecMonCosmics_jobOpt.py
@@ -190,8 +190,8 @@ else:
-ToolSvc+=LArCellMon
-ToolSvc+=TileCalCellMon
+#ToolSvc+=LArCellMon
+#ToolSvc+=TileCalCellMon
CaloMon.AthenaMonTools += [LArCellMon,TileCalCellMon]
diff --git a/Calorimeter/CaloMonitoring/share/CaloClusterVecMonCollisions_jobOpt.py b/Calorimeter/CaloMonitoring/share/CaloClusterVecMonCollisions_jobOpt.py
index f2c7566a6721..7fb007a8c1db 100644
--- a/Calorimeter/CaloMonitoring/share/CaloClusterVecMonCollisions_jobOpt.py
+++ b/Calorimeter/CaloMonitoring/share/CaloClusterVecMonCollisions_jobOpt.py
@@ -77,6 +77,6 @@ CaloClusterMonNoTA = CaloClusterVecMon(
hiEthresh = 20.0,
)
-ToolSvc += CaloClusterMonNoTA
+#ToolSvc += CaloClusterMonNoTA
CaloMon.AthenaMonTools += [ CaloClusterMonNoTA ]
diff --git a/Calorimeter/CaloMonitoring/share/CaloClusterVecMonCosmics_jobOpt.py b/Calorimeter/CaloMonitoring/share/CaloClusterVecMonCosmics_jobOpt.py
index 59a52cc99b65..40dfea3b48a1 100755
--- a/Calorimeter/CaloMonitoring/share/CaloClusterVecMonCosmics_jobOpt.py
+++ b/Calorimeter/CaloMonitoring/share/CaloClusterVecMonCosmics_jobOpt.py
@@ -79,6 +79,6 @@ CaloClustMonCosmicsNoTA = CaloClusterVecMon(
hiEthresh = 20.0,
)
-ToolSvc += CaloClustMonCosmicsNoTA
+#ToolSvc += CaloClustMonCosmicsNoTA
CaloMon.AthenaMonTools += [ CaloClustMonCosmicsNoTA ]
diff --git a/Calorimeter/CaloMonitoring/share/CaloTowerVecMonCollisions_jobOptions.py b/Calorimeter/CaloMonitoring/share/CaloTowerVecMonCollisions_jobOptions.py
index 1bc31c506c73..b41074e56439 100755
--- a/Calorimeter/CaloMonitoring/share/CaloTowerVecMonCollisions_jobOptions.py
+++ b/Calorimeter/CaloMonitoring/share/CaloTowerVecMonCollisions_jobOptions.py
@@ -68,5 +68,5 @@ CaloTowerMonNoTA = CaloTowerVecMon(
fill_TotalE=True,
)
-ToolSvc += CaloTowerMonNoTA
+#ToolSvc += CaloTowerMonNoTA
CaloMon.AthenaMonTools += [ CaloTowerMonNoTA ]
diff --git a/Calorimeter/CaloMonitoring/share/CaloTowerVecMonCosmics_jobOptions.py b/Calorimeter/CaloMonitoring/share/CaloTowerVecMonCosmics_jobOptions.py
index 0096c14360cc..1658dd6c0c69 100755
--- a/Calorimeter/CaloMonitoring/share/CaloTowerVecMonCosmics_jobOptions.py
+++ b/Calorimeter/CaloMonitoring/share/CaloTowerVecMonCosmics_jobOptions.py
@@ -67,5 +67,5 @@ CaloTowerMonCosmicsNoTA = CaloTowerVecMon(
fill_TotalE=True,
)
-ToolSvc += CaloTowerMonCosmicsNoTA
+#ToolSvc += CaloTowerMonCosmicsNoTA
CaloMon.AthenaMonTools += [ CaloTowerMonCosmicsNoTA ]
diff --git a/Calorimeter/CaloMonitoring/share/CaloTransverseBalanceVecMonCollisions_jobOptions.py b/Calorimeter/CaloMonitoring/share/CaloTransverseBalanceVecMonCollisions_jobOptions.py
index 6d7101155f33..b807bd8b58b1 100644
--- a/Calorimeter/CaloMonitoring/share/CaloTransverseBalanceVecMonCollisions_jobOptions.py
+++ b/Calorimeter/CaloMonitoring/share/CaloTransverseBalanceVecMonCollisions_jobOptions.py
@@ -25,7 +25,7 @@ Calo_LArNoisyAlg = TRUE,
photonPTCut = 20*GeV,
)
-ToolSvc += CaloTransverseBalanceMonNoTA
+#ToolSvc += CaloTransverseBalanceMonNoTA
CaloMon.AthenaMonTools += [ CaloTransverseBalanceMonNoTA ]
diff --git a/Calorimeter/CaloMonitoring/share/EMClusterVecMonCollisions_jobOpt.py b/Calorimeter/CaloMonitoring/share/EMClusterVecMonCollisions_jobOpt.py
index 47c89be682c0..72386e7ff3a1 100644
--- a/Calorimeter/CaloMonitoring/share/EMClusterVecMonCollisions_jobOpt.py
+++ b/Calorimeter/CaloMonitoring/share/EMClusterVecMonCollisions_jobOpt.py
@@ -85,5 +85,5 @@ EMCaloClusterMonNoTA = CaloClusterVecMon(
hiEthresh = 20.0,
)
-ToolSvc += EMCaloClusterMonNoTA
+#ToolSvc += EMCaloClusterMonNoTA
CaloMon.AthenaMonTools += [ EMCaloClusterMonNoTA ]
diff --git a/Calorimeter/CaloMonitoring/share/EMClusterVecMonCosmics_jobOpt.py b/Calorimeter/CaloMonitoring/share/EMClusterVecMonCosmics_jobOpt.py
index e67dd87077c5..9c98ab45a86b 100755
--- a/Calorimeter/CaloMonitoring/share/EMClusterVecMonCosmics_jobOpt.py
+++ b/Calorimeter/CaloMonitoring/share/EMClusterVecMonCosmics_jobOpt.py
@@ -85,6 +85,6 @@ EMCaloClusterMonCosmicsNoTA = CaloClusterVecMon(
hiEthresh = 20.0,
)
-ToolSvc += EMCaloClusterMonCosmicsNoTA
+#ToolSvc += EMCaloClusterMonCosmicsNoTA
CaloMon.AthenaMonTools += [ EMCaloClusterMonCosmicsNoTA ]
diff --git a/Calorimeter/CaloMonitoring/share/LArMuIDClusterVecMonCosmics_jobOpt.py b/Calorimeter/CaloMonitoring/share/LArMuIDClusterVecMonCosmics_jobOpt.py
index df66aa7a679e..69c569f1dc7d 100755
--- a/Calorimeter/CaloMonitoring/share/LArMuIDClusterVecMonCosmics_jobOpt.py
+++ b/Calorimeter/CaloMonitoring/share/LArMuIDClusterVecMonCosmics_jobOpt.py
@@ -65,5 +65,5 @@ LArCosmicsClusterMon = CaloClusterVecMon(
hiEthresh = 5.0,
)
-ToolSvc += LArCosmicsClusterMon
+#ToolSvc += LArCosmicsClusterMon
CaloMon.AthenaMonTools += [ LArCosmicsClusterMon]
diff --git a/Control/AthenaMonitoring/share/DataQualitySteering_jobOptions.py b/Control/AthenaMonitoring/share/DataQualitySteering_jobOptions.py
index 57d87b85bb61..226531f5e14d 100644
--- a/Control/AthenaMonitoring/share/DataQualitySteering_jobOptions.py
+++ b/Control/AthenaMonitoring/share/DataQualitySteering_jobOptions.py
@@ -37,11 +37,6 @@ if DQMonFlags.doMonitoring():
include("AthenaMonitoring/AtlasReadyFilterTool_jobOptions.py")
include("AthenaMonitoring/FilledBunchFilterTool_jobOptions.py")
- # Ugly hack to get list of tools in job at this point
- # We will compare the list at the end of the script to get the monitoring
- # tools
- monToolSet_before = set(ToolSvc.getChildren())
-
#---------------------------#
# Inner detector monitoring #
#---------------------------#
@@ -254,9 +249,17 @@ if DQMonFlags.doMonitoring():
#--------------------------#
if rec.triggerStream()=='express':
include("AthenaMonitoring/AtlasReadyFilterTool_jobOptions.py")
- monToolSet_after = set(ToolSvc.getChildren())
+
local_logger.debug('DQ Post-Setup Configuration')
- for tool in monToolSet_after-monToolSet_before:
+
+ # now the DQ tools are private, extract them from the set of monitoring algorithms
+ toolset = set()
+ from AthenaMonitoring.AthenaMonitoringConf import AthenaMonManager
+ for _ in topSequence:
+ if isinstance(_, AthenaMonManager):
+ toolset.update(_.AthenaMonTools)
+
+ for tool in toolset:
# stop lumi access if we're in MC or enableLumiAccess == False
if 'EnableLumi' in dir(tool):
if globalflags.DataSource.get_Value() == 'geant4' or not DQMonFlags.enableLumiAccess():
@@ -282,6 +285,4 @@ if DQMonFlags.doMonitoring():
postprocfunc(tool)
del postprocfunc
- del monToolSet_before, monToolSet_after
-
del local_logger
diff --git a/Control/AthenaMonitoring/src/AthenaMonManager.cxx b/Control/AthenaMonitoring/src/AthenaMonManager.cxx
index a030c385383e..fc5ca4cc79dd 100755
--- a/Control/AthenaMonitoring/src/AthenaMonManager.cxx
+++ b/Control/AthenaMonitoring/src/AthenaMonManager.cxx
@@ -219,7 +219,9 @@ std::string strToLower( const std::string& str );
AthenaMonManager::
AthenaMonManager( const std::string& name, ISvcLocator* pSvcLocator )
- : AthAlgorithm( name, pSvcLocator ), m_THistSvc(0), m_d(new Imp(this, name))
+ : AthAlgorithm( name, pSvcLocator ), m_THistSvc(0)
+ , m_monTools( this )
+ , m_d(new Imp(this, name))
{
declareProperty( "AthenaMonTools", m_monTools );
declareProperty( "CheckEveryNoEvents", m_d->m_everyNevents );
diff --git a/DataQuality/DataQualityTools/share/DataQualityMon_All_jobOptions.py b/DataQuality/DataQualityTools/share/DataQualityMon_All_jobOptions.py
deleted file mode 100644
index 9b63f1c9fdd6..000000000000
--- a/DataQuality/DataQualityTools/share/DataQualityMon_All_jobOptions.py
+++ /dev/null
@@ -1,131 +0,0 @@
-# ****************************************
-# Application configuration for monitoring
-# ****************************************
-
-doAlign=True
-doMet=True
-doJet=True
-doEgamma=True
-doPixel=False
-doTile=False
-
-
-
-## get a handle on the top sequence of algorithms
-from AthenaCommon.AlgSequence import AlgSequence
-topSequence = AlgSequence()
-
-## add an AthenaMonManager algorithm to the list of algorithms to be ran
-from AthenaMonitoring.AthenaMonitoringConf import AthenaMonManager
-topSequence += AthenaMonManager( "PrimaryManager" )
-
-from AthenaCommon.AppMgr import ServiceMgr as svcMgr
-svcMgr.MessageSvc.OutputLevel = OutputLevel
-
-svcMgr.MessageSvc.OutputLevel = WARNING
-
-# ************************
-# Monitoring configuration
-# ************************
-
-if not hasattr(svcMgr, 'THistSvc'):
- from GaudiSvc.GaudiSvcConf import THistSvc
- ServiceMgr += THistSvc()
-
-## Setup the output file(s):
-THistSvc = Service( "THistSvc" )
-
-## The string "TestMon" in the argument below is the 'FileKey'
-## used by Athena to access the output file internally
-THistSvc.Output += ["MonHist DATAFILE='Monitor.root' OPT='RECREATE'"]
-
-
-from TrkExTools.AtlasExtrapolator import AtlasExtrapolator
-AtlasExtrapolator = AtlasExtrapolator()
-ToolSvc += AtlasExtrapolator
-
-from AthenaCommon.AppMgr import ToolSvc as toolSvc
-
-## AthenaMonManager is the Algorithm that manages many classes inheriting
-## from ManagedMonitorToolBase
-monMan = Algorithm( "PrimaryManager" )
-
-## FileKey must match that given to THistSvc
-monMan.FileKey = "MonHist"
-
-## Set global monitoring parameters: see the AthenaMonManager class
-## in the Control/AthenaMonitoring package
-monMan.ManualDataTypeSetup = True
-monMan.DataType = "userDefined"
-monMan.Environment = "user"
-monMan.ManualRunLBSetup = True
-monMan.Run = 1
-monMan.LumiBlock = 1
-
-#------------------#
-# MET monitoring #
-#------------------#
-if (doMet):
- monMan.AthenaMonTools += [ "METMonTool/METMonTool" ]
- toolSvc.METMonTool.ProcessNEvents = 1000
- toolSvc.METMonTool.PreScale = 0
- toolSvc.METMonTool.jetColKey = "Cone4TowerJets"
-
-#------------------#
-# Jet monitoring #
-#------------------#
-if (doJet):
- include("DataQualityTools/JetMonitoring.py")
-
-
-#-------------------#
-# egamma monitoring #
-#-------------------#
-if (doEgamma):
- monMan.AthenaMonTools += [ "egammaMonTool/egMonTool" ]
-## set the monitored containers
- toolSvc.egMonTool.ElectronContainer = "ElectronCollection"
- toolSvc.egMonTool.PhotonContainer = "PhotonCollection"
- toolSvc.egMonTool.EMTrackMatchContainer = "egDetailContainer"
- toolSvc.egMonTool.EMShowerContainer = "egDetailContainer"
- toolSvc.egMonTool.EMConvertContainer = "egDetailContainer"
-
-#----------------------#
-# Alignment Monitoring #
-#----------------------#
-if (doAlign):
- monMan.AthenaMonTools += [ "IDAlignMonGenericTracks"]
- monMan.AthenaMonTools += [ "IDAlignMonZmumu"]
- monMan.AthenaMonTools += [ "IDAlignMonEfficiencies"]
- monMan.AthenaMonTools += [ "IDAlignMonTruthComparison"]
- monMan.AthenaMonTools += [ "IDAlignMonResiduals"]
- #monMan.AthenaMonTools += [ "IDAlignMonCosmics"]
- #monMan.AthenaMonTools += [ "IDAlignMonElectrons"]
- #monMan.AthenaMonTools += [ "IDAlignMonJpsiUpsilon"]
-
-if (doTile):
- monMan.AthenaMonTools += [ "TileMonitoring" ]
-
-#------------------#
-# pixel monitoring #
-#------------------#
-if (doPixel):
-# monMan.AthenaMonTools += [ "PixelSpacePointsMon" ]
- monMan.AthenaMonTools += [ "PixelRDOMon" ]
- monMan.AthenaMonTools += [ "PixelClusterMon" ]
- monMan.AthenaMonTools += [ "PixelTrackMon" ]
- monMan.AthenaMonTools += [ "PixelTimingMon" ]
-# toolSvc.PixelSpacePointsMon.Pixel_SpacePointContainerName = "PixelSpacePoints"
- toolSvc.PixelRDOMon.RDOName = "PixelRDOs"
- toolSvc.PixelRDOMon.doA = True
- toolSvc.PixelRDOMon.doB = True
- toolSvc.PixelRDOMon.doC = True
- toolSvc.PixelClusterMon.Pixel_SiClusterContainerName = "PixelClusters"
-# toolSvc.TrackTool.TrackName = "SCT_Cosmic_Tracks"
- toolSvc.PixelTrackMon.TrackName = "Tracks"
- toolSvc.PixelTimingMon.RDOName = "PixelRDOs"
- toolSvc.PixelTimingMon.EvtMax = 15000 #number of events to show in the time profile
- toolSvc.PixelTimingMon.TimeStep = 100 #number of events per bin
-
-
-
diff --git a/DataQuality/DataQualityTools/share/DataQualityMon_jobOptions.py b/DataQuality/DataQualityTools/share/DataQualityMon_jobOptions.py
index ffa3aa481033..da955be17dfd 100644
--- a/DataQuality/DataQualityTools/share/DataQualityMon_jobOptions.py
+++ b/DataQuality/DataQualityTools/share/DataQualityMon_jobOptions.py
@@ -57,12 +57,6 @@ from AthenaCommon.JobProperties import jobproperties
if not 'InDetKeys' in dir():
from InDetRecExample.InDetKeys import InDetKeys
-#if (jobproperties.Beam.beamType()=="collisions"):
-# IDTrkContNames = [ InDetKeys.UnslimmedTracks() ]
-#
-#else:
-# IDTrkContNames = [ InDetKeys.TRTTracks() ]
-
IDTrkContNames = [ InDetKeys.Tracks() ]
isCosmics=False
@@ -73,44 +67,6 @@ if jobproperties.Beam.beamType()=='cosmics':
isBeam=False
if DQMonFlags.monManEnvironment != 'tier0ESD':
- from TrkExTools.AtlasExtrapolator import AtlasExtrapolator
- DefaultExtrapolator = AtlasExtrapolator()
- ToolSvc += DefaultExtrapolator
-
- # Import Muon Trk Eff tool ---> Obsolete
- #from DataQualityTools.DataQualityToolsConf import DQTMuTrkEff
- #DQTMuTrkMon = DQTMuTrkEff(name = 'DQTMuTrkMon',
- # doInDet = rec.doInDet(),
- # doMuons = rec.doMuon(),
- # doTile = rec.doTile(),
- # doCalo = muonCombinedRecFlags.doCaloTrkMuId(),
- # applyCaloCuts = True,
- # caloCutOpen = 0.0,
- # caloCutLow = 25.0,
- # caloCutNormal = 50.0,
- # trackName = IDTrkContNames,
- # trackTag = ["indet" ],
- # trackPostfix = ["" ], #eventually it can be "Up" "Low"
- # mooreMuContainerNameVec = ["MooreTracks", "ConvertedMBoyTracks"],
- # caloMuContainerNameVec = ["CaloESDMuonCollection"],
- # tileMuContainerName = "TileCosmicMuonHT",
- # setVertexLimit = True,
- # maxD0 = 100.0,
- # maxZ0 = 200.0,
- # histoPathBase = "/GLOBAL/DQTEff",
- # maxConeSize = 0.01,
- # doRunCosmics = isCosmics,
- # doRunBeam = isBeam,
- # doOfflineHists = isOffline,
- # doOnlineHists = isOnline
- # );
- #
- #
- #DQTMuTrkMon.extrapolator = DefaultExtrapolator
- #
- #ToolSvc += DQTMuTrkMon;
- #ManagedAthenaGlobalMon.AthenaMonTools += [ DQTMuTrkMon ];
-
# Import Det Synch tool
if DQMonFlags.monManEnvironment in ('tier0Raw', 'tier0') and globalflags.DataSource.get_Value() != 'geant4':
from DataQualityTools.DataQualityToolsConf import DQTDetSynchMonTool
@@ -122,7 +78,7 @@ if DQMonFlags.monManEnvironment != 'tier0ESD':
doOnlineHists = isOnline
);
- ToolSvc += DQTDetSynchMon;
+ #ToolSvc += DQTDetSynchMon;
ManagedAthenaGlobalMon.AthenaMonTools += [ DQTDetSynchMon ];
if rec.doCalo and CALOCLUSTER:
@@ -136,23 +92,10 @@ if DQMonFlags.monManEnvironment != 'tier0ESD':
doOnlineHists = isOnline
);
- ToolSvc += DQTCaloClusterTool;
+ #ToolSvc += DQTCaloClusterTool;
ManagedAthenaGlobalMon.AthenaMonTools += [ DQTCaloClusterTool ];
- # Import GlobalWFinder tool ---> Obsolete
- #from DataQualityTools.DataQualityToolsConf import DQTGlobalWFinderTool
- #DQTGlobalWFinderTool = DQTGlobalWFinderTool(name = 'DQTGlobalWFinderTool',
- # histoPathBase = "/GLOBAL/DQTGlobalWFinder",
- # doOfflineHists = isOffline,
- # doOnlineHists = isOnline,
- # doRunCosmics = isCosmics,
- # doRunBeam = isBeam
- # );
- #
- #ToolSvc += DQTGlobalWFinderTool;
- #ManagedAthenaGlobalMon.AthenaMonTools += [ DQTGlobalWFinderTool ];
-
# Import BackgroundMon tool
if DQMonFlags.useTrigger():
@@ -168,7 +111,7 @@ if DQMonFlags.monManEnvironment != 'tier0ESD':
doTrigger = rec.doTrigger()
);
- ToolSvc += DQTBackgroundMon;
+ #ToolSvc += DQTBackgroundMon;
ManagedAthenaGlobalMon.AthenaMonTools += [ DQTBackgroundMon ];
@@ -181,54 +124,6 @@ if DQMonFlags.monManEnvironment != 'tier0ESD':
MinSCTHits=0
MinPtCut=500
- # Import MuonID tool
- #from DataQualityTools.DataQualityToolsConf import DQTMuonIDTrackTool
- #DQTMuonIDTrackMon = DQTMuonIDTrackTool(name = 'DQTMuonIDTrackMon',
- # histoPathBase = "/GLOBAL/DQTMuonVsInDet",
- # doOfflineHists = isOffline,
- # doOnlineHists = isOnline,
- # doRunCosmics = isCosmics,
- # doRunBeam = isBeam,
- # MinSCTHits = MinSCTHits,
- # MinPtCut = MinPtCut
- # );
-
- #DQTMuonIDTrackMon.ExtrapolationTool = DefaultExtrapolator
- #ToolSvc += DQTMuonIDTrackMon;
- #ManagedAthenaGlobalMon.AthenaMonTools += [ DQTMuonIDTrackMon ];
-
- # Import ElectronQuality Tool ---> Obsolete
- #from DataQualityTools.DataQualityToolsConf import DQTElectronQualityTool
- #DQTElectronQualityTool = DQTElectronQualityTool(name = 'DQTElectronQualityTool',
- # histoPathBase = "/GLOBAL/DQTElectronQuality",
- # doRunCosmics = isCosmics,
- # doRunBeam = isBeam,
- # doOfflineHists = isOffline,
- # doOnlineHists = isOnline
- # );
- #
- #ToolSvc += DQTElectronQualityTool;
- #ManagedAthenaGlobalMon.AthenaMonTools += [ DQTElectronQualityTool ];
-
- # Import Rate Mon Tool ---> Obsolete
- #from DataQualityTools.DataQualityToolsConf import DQTRateMonTool
- #DQTRateMonTool = DQTRateMonTool(name = 'DQTRateMonTool',
- # histoPathBase = "/GLOBAL/DQTRateMon",
- # doOfflineHists = isOffline,
- # doOnlineHists = isOnline,
- # doRunCosmics = isCosmics,
- # doRunBeam = isBeam,
- # doTrigger = rec.doTrigger(),
- # JetCollectionName = JetCollectionKey,
- # triggerList = listOfTriggers
- # );
- #ToolSvc += DQTRateMonTool;
- #ManagedAthenaGlobalMon.AthenaMonTools += [ DQTRateMonTool ];
-
-
- #This does not seem needed anymore
- #include( "MuonCommRecExample/ReadMuCTPI_jobOptions.py" )
-
if not rec.doMuon:
try:
svcMgr.ByteStreamAddressProviderSvc.TypeNames.remove("RpcPadContainer/RPCPAD")
@@ -246,11 +141,9 @@ DQTDataFlowMon = DQTDataFlowMonTool(name = 'DQTDataFlowMon',
histoPathBase = '/GLOBAL/DQTDataFlow',
releaseString = releaseString
);
-ToolSvc += DQTDataFlowMon
+#ToolSvc += DQTDataFlowMon
ManagedAthenaGlobalMon.AthenaMonTools += [ DQTDataFlowMon ]
-#print ManagedAthenaGlobalMon;
-#if isBeam==True and (DQMonFlags.monManEnvironment == 'tier0ESD' or DQMonFlags.monManEnvironment == 'online' or DQMonFlags.monManEnvironment == 'tier0' or DQMonFlags.monManEnvironment == 'tier0Raw' ) and rec.doInDet():
if isBeam==True and (DQMonFlags.monManEnvironment != 'tier0Raw') and rec.doInDet() and DQMonFlags.useTrigger():
topSequence += AthenaMonManager( "GlobalMonPhysicsManager" )
@@ -277,7 +170,7 @@ if isBeam==True and (DQMonFlags.monManEnvironment != 'tier0Raw') and rec.doInDet
MuonSelectionTool = ToolSvc.DQTMuonSelectionTool,
IsolationSelectionTool = ToolSvc.DQTIsoGradientTool
)
- ToolSvc += MyDQTGlobalWZFinderTool;
+ #ToolSvc += MyDQTGlobalWZFinderTool;
ManagedAthenaGlobalPhysMon.AthenaMonTools += [ MyDQTGlobalWZFinderTool ];
from DataQualityTools.DataQualityToolsConf import DQTLumiMonTool
@@ -297,6 +190,6 @@ if isBeam==True and (DQMonFlags.monManEnvironment != 'tier0Raw') and rec.doInDet
TriggerChain = 'CATEGORY_primary_single_ele',
TrigDecisionTool = monTrigDecTool if DQMonFlags.useTrigger() else "",
)
- ToolSvc += [DQTLumiMonToolAnyTrigger, DQTLumiMonToolMu, DQTLumiMonToolEl]
+ #ToolSvc += [DQTLumiMonToolAnyTrigger, DQTLumiMonToolMu, DQTLumiMonToolEl]
ManagedAthenaGlobalPhysMon.AthenaMonTools += [ DQTLumiMonToolAnyTrigger, DQTLumiMonToolMu, DQTLumiMonToolEl]
diff --git a/ForwardDetectors/AFP/AFP_Monitoring/share/AFPMonitoring_jobOptions.py b/ForwardDetectors/AFP/AFP_Monitoring/share/AFPMonitoring_jobOptions.py
index b2d3d5dd05cc..92b729122473 100644
--- a/ForwardDetectors/AFP/AFP_Monitoring/share/AFPMonitoring_jobOptions.py
+++ b/ForwardDetectors/AFP/AFP_Monitoring/share/AFPMonitoring_jobOptions.py
@@ -19,7 +19,7 @@ PreScale = 0,
EnableLumi = True
)
-ToolSvc += AFPSiHitsMonTool
+#ToolSvc += AFPSiHitsMonTool
AFPMonManager.AthenaMonTools += [ AFPSiHitsMonTool ]
from AFP_Monitoring.AFP_MonitoringConf import AFPTechnicalMonitorTool
@@ -29,5 +29,5 @@ PreScale = 0,
EnableLumi = True
)
-ToolSvc += AFPTechnicalMonTool
+#ToolSvc += AFPTechnicalMonTool
AFPMonManager.AthenaMonTools += [ AFPTechnicalMonTool ]
diff --git a/ForwardDetectors/LUCID/LUCID_Monitoring/share/LUCIDMon_jobOptions.py b/ForwardDetectors/LUCID/LUCID_Monitoring/share/LUCIDMon_jobOptions.py
index 24a3f6b78d3b..50923284a0b2 100755
--- a/ForwardDetectors/LUCID/LUCID_Monitoring/share/LUCIDMon_jobOptions.py
+++ b/ForwardDetectors/LUCID/LUCID_Monitoring/share/LUCIDMon_jobOptions.py
@@ -14,6 +14,6 @@ from LUCID_Monitoring.LUCID_MonitoringConf import LUCID_HitsMoniTool
LUCID_TestTool = LUCID_HitsMoniTool (name = "LUCID_HitsMoniTool")
-ToolSvc += LUCID_TestTool
+#ToolSvc += LUCID_TestTool
LucidMon.AthenaMonTools += [ LUCID_TestTool ]
diff --git a/InnerDetector/InDetExample/InDetAlignExample/ErrorScaling/InDetMonitoringAlignment.py b/InnerDetector/InDetExample/InDetAlignExample/ErrorScaling/InDetMonitoringAlignment.py
index ee5428b469a4..1a43536a99b3 100755
--- a/InnerDetector/InDetExample/InDetAlignExample/ErrorScaling/InDetMonitoringAlignment.py
+++ b/InnerDetector/InDetExample/InDetAlignExample/ErrorScaling/InDetMonitoringAlignment.py
@@ -65,8 +65,8 @@ if not jobproperties.Beam.beamType()=='cosmics':
#Adding the tools to the Tool Service
- ToolSvc += m_alignMonTrackSelectorTool[0]
- ToolSvc += m_alignMonTrackSelectorTool[1]
+ #ToolSvc += m_alignMonTrackSelectorTool[0]
+ #ToolSvc += m_alignMonTrackSelectorTool[1]
#Here we start creating the custom Track Selection tools.
@@ -83,8 +83,8 @@ if not jobproperties.Beam.beamType()=='cosmics':
#Adding the TrackSelectionTools to the Tool Service
- ToolSvc += m_alignMonTrackSelectionTool[0]
- ToolSvc += m_alignMonTrackSelectionTool[1]
+ #ToolSvc += m_alignMonTrackSelectionTool[0]
+ #ToolSvc += m_alignMonTrackSelectionTool[1]
#if (InDetFlags.doPrintConfigurables()):
print m_alignMonTrackSelectionTool[0]
@@ -100,7 +100,7 @@ if not jobproperties.Beam.beamType()=='cosmics':
InDetAlignMonSivsTRT_noTrig = IDAlignMonSivsTRT (name = "InDetAlignMonSivsTRT_noTrig",
trackSelection = m_alignMonTrackSelectionTool[0])
- ToolSvc += InDetAlignMonSivsTRT_noTrig
+ #ToolSvc += InDetAlignMonSivsTRT_noTrig
if (InDetFlags.doPrintConfigurables()):
print InDetAlignMonSivsTRT_noTrig
@@ -111,7 +111,7 @@ if not jobproperties.Beam.beamType()=='cosmics':
vxContainerName = InDetKeys.PrimaryVertices(),
vxContainerWithBeamConstraint = InDetFlags.useBeamConstraint())
- ToolSvc += InDetAlignMonBeamSpot_noTrig
+ #ToolSvc += InDetAlignMonBeamSpot_noTrig
if (InDetFlags.doPrintConfigurables()):
print InDetAlignMonBeamSpot_noTrig
@@ -159,7 +159,7 @@ else:
CutLevel = "LoosePrimary",
TrackSummaryTool = InDetTrackSummaryTool,
Extrapolator = InDetExtrapolator))
- ToolSvc += m_alignMonTrackSelectorTool[i]
+ #ToolSvc += m_alignMonTrackSelectorTool[i]
if (InDetFlags.doPrintConfigurables()):
print m_alignMonTrackSelectorTool[i]
@@ -176,7 +176,7 @@ else:
if jobproperties.Beam.beamType()=='singlebeam':
m_alignMonTrackSelectionTool[i].PassAllTracks = True
- ToolSvc += m_alignMonTrackSelectionTool[i]
+ #ToolSvc += m_alignMonTrackSelectionTool[i]
if (InDetFlags.doPrintConfigurables()):
print m_alignMonTrackSelectionTool[i]
@@ -200,7 +200,7 @@ else:
if InDetAlignMonReadESD and InDetFlags.doRefit: #use refitted tracks if reading ESD
InDetAlignMonResiduals_noTrig.tracksName = InDetKeys.RefittedTracks()
-ToolSvc += InDetAlignMonResiduals_noTrig
+#ToolSvc += InDetAlignMonResiduals_noTrig
if (InDetFlags.doPrintConfigurables()):
print InDetAlignMonResiduals_noTrig
@@ -222,7 +222,7 @@ else:
if InDetAlignMonReadESD and InDetFlags.doRefit:#use refitted tracks if reading ESD
InDetAlignMonEfficiencies_noTrig.tracksName = InDetKeys.RefittedTracks()
-ToolSvc += InDetAlignMonEfficiencies_noTrig
+#ToolSvc += InDetAlignMonEfficiencies_noTrig
if (InDetFlags.doPrintConfigurables()):
print InDetAlignMonEfficiencies_noTrig
@@ -242,7 +242,7 @@ else:
if InDetAlignMonReadESD and InDetFlags.doRefit: #use refitted tracks if reading ESD
InDetAlignMonGenericTracks_noTrig.tracksName = InDetKeys.RefittedTracks()
-ToolSvc += InDetAlignMonGenericTracks_noTrig
+#ToolSvc += InDetAlignMonGenericTracks_noTrig
if (InDetFlags.doPrintConfigurables()):
print InDetAlignMonGenericTracks_noTrig
@@ -282,7 +282,7 @@ if jobproperties.Beam.beamType()=='cosmics':
OutputUpperTracksName = m_upperTracksName[i],
OutputLowerTracksName = m_lowerTracksName[i]))
- ToolSvc += m_trackSplitter[i]
+ #ToolSvc += m_trackSplitter[i]
if (InDetFlags.doPrintConfigurables()):
print m_trackSplitter[i]
@@ -303,7 +303,7 @@ if jobproperties.Beam.beamType()=='cosmics':
DeltaQoverPtRange2D = m_deltaQoverPt2D[i],
D0Range = m_d0Range[i]))
- ToolSvc += m_trackSegmentsUpLow[i]
+ #ToolSvc += m_trackSegmentsUpLow[i]
if (InDetFlags.doPrintConfigurables()):
print m_trackSegmentsUpLow[i]
@@ -341,7 +341,7 @@ if jobproperties.Beam.beamType()=='cosmics':
DeltaQoverPtRange2D = m_deltaQoverPt2D_Sub[i],
D0Range = m_d0Range_Sub[i]))
- ToolSvc += m_trackSegments_Sub[i]
+ #ToolSvc += m_trackSegments_Sub[i]
if (InDetFlags.doPrintConfigurables()):
print m_trackSegments_Sub[i]
@@ -382,11 +382,11 @@ else:
vxContainerWithBeamConstraint = InDetFlags.useBeamConstraint())
if jobproperties.Beam.beamType()=='collisions' and hasattr(ToolSvc, 'DQFilledBunchFilterTool'):
- InDetAlignMonSivsTRT.FilterTools.append(monFilledBunchFilterTool)
- InDetAlignMonResiduals.FilterTools.append(monFilledBunchFilterTool)
- InDetAlignMonEfficiencies.FilterTools.append(monFilledBunchFilterTool)
- InDetAlignMonGenericTracks.FilterTools.append(monFilledBunchFilterTool)
- InDetAlignMonBeamSpot.FilterTools.append(monFilledBunchFilterTool)
+ InDetAlignMonSivsTRT.FilterTools += [monFilledBunchFilterTool]
+ InDetAlignMonResiduals.FilterTools += [monFilledBunchFilterTool]
+ InDetAlignMonEfficiencies.FilterTools += [monFilledBunchFilterTool]
+ InDetAlignMonGenericTracks.FilterTools += [monFilledBunchFilterTool]
+ InDetAlignMonBeamSpot.FilterTools += [monFilledBunchFilterTool]
InDetAlignMonSivsTRT.TrigDecisionTool = monTrigDecTool
InDetAlignMonResiduals.TrigDecisionTool = monTrigDecTool
@@ -406,19 +406,19 @@ else:
InDetAlignMonGenericTracks.triggerChainName = "Jet_MinBias_Trigger"
InDetAlignMonBeamSpot.histFolder = "IDAlignMon/BeamSpot/Jet_MinBias_Trigger"
- ToolSvc += InDetAlignMonResiduals
+ #ToolSvc += InDetAlignMonResiduals
if (InDetFlags.doPrintConfigurables()):
print InDetAlignMonResiduals
- ToolSvc += InDetAlignMonEfficiencies
+ #ToolSvc += InDetAlignMonEfficiencies
if (InDetFlags.doPrintConfigurables()):
print InDetAlignMonEfficiencies
- ToolSvc += InDetAlignMonGenericTracks
+ #ToolSvc += InDetAlignMonGenericTracks
if (InDetFlags.doPrintConfigurables()):
print InDetAlignMonGenericTracks
- ToolSvc += InDetAlignMonBeamSpot
+ #ToolSvc += InDetAlignMonBeamSpot
if (InDetFlags.doPrintConfigurables()):
print InDetAlignMonBeamSpot
- ToolSvc += InDetAlignMonSivsTRT
+ #ToolSvc += InDetAlignMonSivsTRT
if (InDetFlags.doPrintConfigurables()):
print InDetAlignMonSivsTRT
@@ -452,11 +452,11 @@ InDetAlignMonManager.AthenaMonTools += [ InDetAlignMonEfficiencies_noTri
InDetAlignMonManager.AthenaMonTools += [ InDetAlignMonGenericTracks_noTrig ]
if jobproperties.Beam.beamType()=='collisions' and hasattr(ToolSvc, 'DQFilledBunchFilterTool'):
- InDetAlignMonSivsTRT_noTrig.FilterTools.append(monFilledBunchFilterTool)
- InDetAlignMonResiduals_noTrig.FilterTools.append(monFilledBunchFilterTool)
- InDetAlignMonEfficiencies_noTrig.FilterTools.append(monFilledBunchFilterTool)
- InDetAlignMonGenericTracks_noTrig.FilterTools.append(monFilledBunchFilterTool)
- InDetAlignMonBeamSpot_noTrig.FilterTools.append(monFilledBunchFilterTool)
+ InDetAlignMonSivsTRT_noTrig.FilterTools += [monFilledBunchFilterTool]
+ InDetAlignMonResiduals_noTrig.FilterTools += [monFilledBunchFilterTool]
+ InDetAlignMonEfficiencies_noTrig.FilterTools += [monFilledBunchFilterTool]
+ InDetAlignMonGenericTracks_noTrig.FilterTools += [monFilledBunchFilterTool]
+ InDetAlignMonBeamSpot_noTrig.FilterTools += [monFilledBunchFilterTool]
if InDetAlignMonDoTruth:
diff --git a/InnerDetector/InDetExample/InDetAlignExample/share/GenericTracks.py b/InnerDetector/InDetExample/InDetAlignExample/share/GenericTracks.py
index 0716c1e49c1c..e166be906dff 100644
--- a/InnerDetector/InDetExample/InDetAlignExample/share/GenericTracks.py
+++ b/InnerDetector/InDetExample/InDetAlignExample/share/GenericTracks.py
@@ -37,8 +37,8 @@ m_TrackSelectorTool_LoosePrimary = InDet__InDetTrackSelectionTool(name =
CutLevel = "LoosePrimary",
TrackSummaryTool = InDetTrackSummaryTool,
Extrapolator = InDetExtrapolator)
-ToolSvc += m_allSelection
-ToolSvc += m_TrackSelectorTool_LoosePrimary
+#ToolSvc += m_allSelection
+#ToolSvc += m_TrackSelectorTool_LoosePrimary
#m_TrackSelectorTool_AlignTracks = InDet__InDetTrackSelectionTool(name = "InDetTrackSelectorAlignTracks",
@@ -80,7 +80,7 @@ LPSelection = InDetAlignMon__TrackSelectionTool(
PrimVtxContainerName = InDetKeys.xAODVertexContainer(),
UseIDTrackSelectionTool = True,
IDTrackSelectionTool = m_TrackSelectorTool_LoosePrimary)
-ToolSvc += LPSelection
+#ToolSvc += LPSelection
#AlignSelection = InDetAlignMon__TrackSelectionTool(
@@ -99,7 +99,7 @@ if newInDetAlignAlg_Options["useTrackSelector"]:
#PassAllTracks = True, ## Uncomment this line to bypass track slection
IDTrackSelectionTool = trackSelectorNew)
- ToolSvc += alignTrackSelection
+ #ToolSvc += alignTrackSelection
from InDetAlignmentMonitoring.InDetAlignmentMonitoringConf import IDAlignMonGenericTracks
@@ -132,7 +132,7 @@ InDetAlignMonResiduals = IDAlignMonResiduals(
)
print InDetAlignMonResiduals
-ToolSvc += InDetAlignMonResiduals
+#ToolSvc += InDetAlignMonResiduals
InDetAlignMonManager.AthenaMonTools += [ InDetAlignMonResiduals ]
InDetAlignMonGenericTracks = IDAlignMonGenericTracks(
@@ -146,7 +146,7 @@ InDetAlignMonGenericTracks = IDAlignMonGenericTracks(
#NTracksRange = 10,
VxPrimContainerName = InDetKeys.xAODVertexContainer()
)
-ToolSvc += InDetAlignMonGenericTracks
+#ToolSvc += InDetAlignMonGenericTracks
InDetAlignMonManager.AthenaMonTools += [ InDetAlignMonGenericTracks ]
if Cosmics:
InDetAlignMonGenericTracks.d0Range = 500
@@ -164,7 +164,7 @@ InDetAlignMonSelectedTracksEfficiencies = IDAlignMonEfficiencies (
TRT_Manager = InDetKeys.TRT_Manager()
)
-ToolSvc += InDetAlignMonSelectedTracksEfficiencies
+#ToolSvc += InDetAlignMonSelectedTracksEfficiencies
InDetAlignMonManager.AthenaMonTools += [ InDetAlignMonSelectedTracksEfficiencies ]
@@ -194,7 +194,7 @@ InDetAlignMonResiduals = IDAlignMonResiduals(
)
print InDetAlignMonResiduals
-ToolSvc += InDetAlignMonResiduals
+#ToolSvc += InDetAlignMonResiduals
InDetAlignMonManager.AthenaMonTools += [ InDetAlignMonResiduals ]
InDetAlignMonGenericTracks = IDAlignMonGenericTracks(
@@ -208,7 +208,7 @@ InDetAlignMonGenericTracks = IDAlignMonGenericTracks(
#NTracksRange = 10,
VxPrimContainerName = InDetKeys.xAODVertexContainer()
)
-ToolSvc += InDetAlignMonGenericTracks
+#ToolSvc += InDetAlignMonGenericTracks
InDetAlignMonManager.AthenaMonTools += [ InDetAlignMonGenericTracks ]
if Cosmics:
InDetAlignMonGenericTracks.d0Range = 500
@@ -226,7 +226,7 @@ InDetAlignMonSelectedTracksEfficiencies = IDAlignMonEfficiencies (
TRT_Manager = InDetKeys.TRT_Manager()
)
-ToolSvc += InDetAlignMonSelectedTracksEfficiencies
+#ToolSvc += InDetAlignMonSelectedTracksEfficiencies
InDetAlignMonManager.AthenaMonTools += [ InDetAlignMonSelectedTracksEfficiencies ]
@@ -256,7 +256,7 @@ InDetAlignMonResiduals = IDAlignMonResiduals(
)
print InDetAlignMonResiduals
-ToolSvc += InDetAlignMonResiduals
+#ToolSvc += InDetAlignMonResiduals
InDetAlignMonManager.AthenaMonTools += [ InDetAlignMonResiduals ]
InDetAlignMonGenericTracks = IDAlignMonGenericTracks(
@@ -270,7 +270,7 @@ InDetAlignMonGenericTracks = IDAlignMonGenericTracks(
#NTracksRange = 10,
VxPrimContainerName = InDetKeys.xAODVertexContainer()
)
-ToolSvc += InDetAlignMonGenericTracks
+#ToolSvc += InDetAlignMonGenericTracks
InDetAlignMonManager.AthenaMonTools += [ InDetAlignMonGenericTracks ]
if Cosmics:
InDetAlignMonGenericTracks.d0Range = 500
@@ -288,7 +288,7 @@ InDetAlignMonSelectedTracksEfficiencies = IDAlignMonEfficiencies (
TRT_Manager = InDetKeys.TRT_Manager()
)
-ToolSvc += InDetAlignMonSelectedTracksEfficiencies
+#ToolSvc += InDetAlignMonSelectedTracksEfficiencies
InDetAlignMonManager.AthenaMonTools += [ InDetAlignMonSelectedTracksEfficiencies ]
#TriggerChainName is only the name passed to the monitoring folder
@@ -299,7 +299,7 @@ if not Cosmics:
extrapolator = InDetExtrapolator,
vxContainerName = InDetKeys.PrimaryVertices(),
vxContainerWithBeamConstraint = InDetFlags.useBeamConstraint())
- ToolSvc += InDetAlignMonBeamSpot_noTrig
+ #ToolSvc += InDetAlignMonBeamSpot_noTrig
InDetAlignMonManager.AthenaMonTools += [ InDetAlignMonBeamSpot_noTrig ]
###############################################
@@ -316,7 +316,7 @@ if Cosmics:
OutputUpperTracksName = "TracksUpperSplit",
OutputLowerTracksName = "TracksLowerSplit",
OutputLevel = INFO)
- ToolSvc += splittertoolcomb
+ #ToolSvc += splittertoolcomb
print splittertoolcomb
# tool to convert to xAOD::TrackParticles
@@ -327,7 +327,7 @@ if Cosmics:
ForceTrackSummaryUpdate = False,
KeepParameters = True,
OutputLevel = DEBUG)
- ToolSvc += InDetxAODSplitParticleCreatorTool
+ #ToolSvc += InDetxAODSplitParticleCreatorTool
#----- tools for track splliting ---- COMPLETED ----
#
@@ -363,7 +363,7 @@ if Cosmics:
nSharedSct = 0,
TrackSummaryTool = InDetTrackSummaryTool,
Extrapolator = InDetExtrapolator))
- ToolSvc += m_alignMonTrackSelectorTool[i]
+ #ToolSvc += m_alignMonTrackSelectorTool[i]
if (InDetFlags.doPrintConfigurables()):
print m_alignMonTrackSelectorTool[i]
@@ -374,7 +374,7 @@ if Cosmics:
#DoEventPhaseCut = True,
TrackSelectorTool = m_alignMonTrackSelectorTool[i]))
- ToolSvc += m_alignMonTrackSelectionTool[i]
+ #ToolSvc += m_alignMonTrackSelectionTool[i]
if (InDetFlags.doPrintConfigurables()):
print " <NewInDetAlignMonitoring> ** SELECTION ** m_alignMonTrackSelectionTool[",i,"] =", m_alignMonTrackSelectionToolName[i]
print m_alignMonTrackSelectionTool[i]
@@ -408,7 +408,7 @@ if Cosmics:
OutputUpperTracksName = m_upperTracksName[i],
OutputLowerTracksName = m_lowerTracksName[i],
OutputLevel = INFO))
- ToolSvc += m_trackSplitter[i] # add the track splitter to the ToolSvc
+ #ToolSvc += m_trackSplitter[i] # add the track splitter to the ToolSvc
if (InDetFlags.doPrintConfigurables()): print m_trackSplitter[i]
print " "
print " **** WARNING **** "
@@ -440,7 +440,7 @@ if Cosmics:
D0Range = m_d0Range[i],
OutputLevel = WARNING))
- ToolSvc += m_trackSegmentsUpLow[i]
+ #ToolSvc += m_trackSegmentsUpLow[i]
InDetAlignMonManager.AthenaMonTools += [ m_trackSegmentsUpLow[i] ]
print " <NewInDetAlignMonitoring> step ",i, m_trackSegmentsUpLowName[i]," added to the ToolSvc"
@@ -526,7 +526,7 @@ if Cosmics:
RangeOfPullHistos = 5.00,
OutputLevel = WARNING
)
- ToolSvc += InDetAlignMonResiduals
+ #ToolSvc += InDetAlignMonResiduals
InDetAlignMonManager.AthenaMonTools += [ InDetAlignMonResiduals ]
InDetAlignMonGenericTracks = IDAlignMonGenericTracks(
@@ -539,7 +539,7 @@ if Cosmics:
z0Range = 1000,
VxPrimContainerName = InDetKeys.xAODVertexContainer()
)
- ToolSvc += InDetAlignMonGenericTracks
+ #ToolSvc += InDetAlignMonGenericTracks
InDetAlignMonManager.AthenaMonTools += [ InDetAlignMonGenericTracks ]
InDetAlignMonSelectedTracksEfficiencies = IDAlignMonEfficiencies (
@@ -553,7 +553,7 @@ if Cosmics:
SCT_Manager = InDetKeys.SCT_Manager(),
TRT_Manager = InDetKeys.TRT_Manager()
)
- ToolSvc += InDetAlignMonSelectedTracksEfficiencies
+ #ToolSvc += InDetAlignMonSelectedTracksEfficiencies
InDetAlignMonManager.AthenaMonTools += [ InDetAlignMonSelectedTracksEfficiencies ]
diff --git a/InnerDetector/InDetExample/InDetAlignExample/share/InDetMonitoringAlignment_TRTAlignTracks.py b/InnerDetector/InDetExample/InDetAlignExample/share/InDetMonitoringAlignment_TRTAlignTracks.py
index 8fcb4c46ed41..533fb0018bce 100644
--- a/InnerDetector/InDetExample/InDetAlignExample/share/InDetMonitoringAlignment_TRTAlignTracks.py
+++ b/InnerDetector/InDetExample/InDetAlignExample/share/InDetMonitoringAlignment_TRTAlignTracks.py
@@ -9,7 +9,7 @@ InDetAlignMonResidualsTRTAlign = IDAlignMonResiduals (name = 'InDetAlignMonResid
trackSelection = InDetAlignMonTrackSelectionTool,
TRT_Manager = InDetKeys.TRT_Manager())
-ToolSvc += InDetAlignMonResidualsTRTAlign
+#ToolSvc += InDetAlignMonResidualsTRTAlign
if (InDetFlags.doPrintConfigurables()):
print InDetAlignMonResidualsTRTAlign
@@ -22,7 +22,7 @@ InDetAlignMonEfficienciesTRTAlign = IDAlignMonEfficiencies (name = 'InDetAlignMo
OutputLevel = ERROR,
TRT_Manager = InDetKeys.TRT_Manager())
-ToolSvc += InDetAlignMonEfficienciesTRTAlign
+#ToolSvc += InDetAlignMonEfficienciesTRTAlign
if (InDetFlags.doPrintConfigurables()):
print InDetAlignMonEfficienciesTRTAlign
@@ -31,7 +31,7 @@ InDetAlignMonGenericTracksTRTAlign = IDAlignMonGenericTracks (name = 'InDetAlign
trackSelection = InDetAlignMonTrackSelectionTool,
VxPrimContainerName = InDetKeys.PrimaryVertices())
-ToolSvc += InDetAlignMonGenericTracksTRTAlign
+#ToolSvc += InDetAlignMonGenericTracksTRTAlign
if (InDetFlags.doPrintConfigurables()):
print InDetAlignMonGenericTracksTRTAlign
@@ -41,7 +41,7 @@ InDetTrackSplitterToolTRTAlign = InDet__InDetTrackSplitterTool(name = 'TrackSpli
OutputLowerTracksName = 'TRTAlign_Lower',
OutputLevel = ERROR)
-ToolSvc += InDetTrackSplitterToolTRTAlign
+#ToolSvc += InDetTrackSplitterToolTRTAlign
if (InDetFlags.doPrintConfigurables()):
print InDetTrackSplitterToolTRTAlign
@@ -59,7 +59,7 @@ InDetAlignMonTrackSegmentsTRTAlign = IDAlignMonTrackSegments ( name = 'InDetAlig
DeltaPhiRange2D = 0.05,
OutputLevel = ERROR,
D0Range = 800 )
-ToolSvc += InDetAlignMonTrackSegmentsTRTAlign
+#ToolSvc += InDetAlignMonTrackSegmentsTRTAlign
if (InDetFlags.doPrintConfigurables()):
print InDetAlignMonTrackSegmentsTRTAlign
diff --git a/InnerDetector/InDetExample/InDetAlignExample/share/NewInDetAlignMonitoring.py b/InnerDetector/InDetExample/InDetAlignExample/share/NewInDetAlignMonitoring.py
index d0a82bfdcb49..4fb06e79ac65 100644
--- a/InnerDetector/InDetExample/InDetAlignExample/share/NewInDetAlignMonitoring.py
+++ b/InnerDetector/InDetExample/InDetAlignExample/share/NewInDetAlignMonitoring.py
@@ -61,7 +61,7 @@ InDetDetailedTrackSelector_Default = InDet__InDetDetailedTrackSelectorTool(name
TrackSummaryTool = InDetTrackSummaryTool,
Extrapolator = InDetExtrapolator)
-ToolSvc += InDetDetailedTrackSelector_Default
+#ToolSvc += InDetDetailedTrackSelector_Default
# All tracks selection
@@ -93,7 +93,7 @@ m_TrackSelectorTool_LoosePrimary = InDet__InDetTrackSelectionTool(name =
-ToolSvc += m_TrackSelectorTool_LoosePrimary
+#ToolSvc += m_TrackSelectorTool_LoosePrimary
LPSelection = InDetAlignMon__TrackSelectionTool(
@@ -105,8 +105,8 @@ LPSelection = InDetAlignMon__TrackSelectionTool(
)
-ToolSvc += allSelection
-ToolSvc += LPSelection
+#ToolSvc += allSelection
+#ToolSvc += LPSelection
#Track selector: Defined in NewInDetAlignAlgSetup
#trackSelector = The cuts are:
@@ -135,7 +135,7 @@ if newInDetAlignAlg_Options["useTrackSelector"]:
IDTrackSelectionTool = trackSelectorNew,
UseIDTrackSelectionTool = True
)
- ToolSvc += alignTrackSelection
+ #ToolSvc += alignTrackSelection
from InDetAlignmentMonitoring.InDetAlignmentMonitoringConf import IDAlignMonResiduals
@@ -170,7 +170,7 @@ for trackCollection in trackCollections:
)
print InDetAlignMonResiduals
- ToolSvc += InDetAlignMonResiduals
+ #ToolSvc += InDetAlignMonResiduals
InDetAlignMonManager.AthenaMonTools += [ InDetAlignMonResiduals ]
InDetAlignMonGenericTracks = IDAlignMonGenericTracks(
@@ -190,7 +190,7 @@ for trackCollection in trackCollections:
InDetAlignMonGenericTracks.d0Range = 500
InDetAlignMonGenericTracks.z0Range = 1000
- ToolSvc += InDetAlignMonGenericTracks
+ #ToolSvc += InDetAlignMonGenericTracks
InDetAlignMonManager.AthenaMonTools += [ InDetAlignMonGenericTracks ]
InDetAlignMonSelectedTracksEfficiencies = IDAlignMonEfficiencies (
@@ -205,7 +205,7 @@ for trackCollection in trackCollections:
TRT_Manager = InDetKeys.TRT_Manager()
)
- ToolSvc += InDetAlignMonSelectedTracksEfficiencies
+ #ToolSvc += InDetAlignMonSelectedTracksEfficiencies
InDetAlignMonManager.AthenaMonTools += [ InDetAlignMonSelectedTracksEfficiencies ]
@@ -233,7 +233,7 @@ if True:
)
print InDetAlignMonResiduals
- ToolSvc += InDetAlignMonResiduals
+ #ToolSvc += InDetAlignMonResiduals
InDetAlignMonManager.AthenaMonTools += [ InDetAlignMonResiduals ]
InDetAlignMonGenericTracks = IDAlignMonGenericTracks(
@@ -247,7 +247,7 @@ if True:
#NTracksRange = 10,
VxPrimContainerName = InDetKeys.PrimaryVertices()
)
- ToolSvc += InDetAlignMonGenericTracks
+ #ToolSvc += InDetAlignMonGenericTracks
InDetAlignMonManager.AthenaMonTools += [ InDetAlignMonGenericTracks ]
InDetAlignMonSelectedTracksEfficiencies = IDAlignMonEfficiencies (
@@ -262,7 +262,7 @@ if True:
TRT_Manager = InDetKeys.TRT_Manager()
)
- ToolSvc += InDetAlignMonSelectedTracksEfficiencies
+ #ToolSvc += InDetAlignMonSelectedTracksEfficiencies
InDetAlignMonManager.AthenaMonTools += [ InDetAlignMonSelectedTracksEfficiencies ]
@@ -297,7 +297,7 @@ if newInDetAlignAlg_Options["useTrackSelector"]:
)
print InDetAlignMonResiduals
- ToolSvc += InDetAlignMonResiduals
+ #ToolSvc += InDetAlignMonResiduals
InDetAlignMonManager.AthenaMonTools += [ InDetAlignMonResiduals ]
InDetAlignMonGenericTracks = IDAlignMonGenericTracks(
@@ -309,7 +309,7 @@ if newInDetAlignAlg_Options["useTrackSelector"]:
#doIPmaps = True,
VxPrimContainerName = InDetKeys.PrimaryVertices()
)
- ToolSvc += InDetAlignMonGenericTracks
+ #ToolSvc += InDetAlignMonGenericTracks
InDetAlignMonManager.AthenaMonTools += [ InDetAlignMonGenericTracks ]
InDetAlignMonSelectedTracksEfficiencies = IDAlignMonEfficiencies (
@@ -323,7 +323,7 @@ if newInDetAlignAlg_Options["useTrackSelector"]:
SCT_Manager = InDetKeys.SCT_Manager(),
TRT_Manager = InDetKeys.TRT_Manager()
)
- ToolSvc += InDetAlignMonSelectedTracksEfficiencies
+ #ToolSvc += InDetAlignMonSelectedTracksEfficiencies
InDetAlignMonManager.AthenaMonTools += [ InDetAlignMonSelectedTracksEfficiencies ]
if not Cosmics:
@@ -332,7 +332,7 @@ if not Cosmics:
extrapolator = InDetExtrapolator,
vxContainerName = InDetKeys.PrimaryVertices(),
vxContainerWithBeamConstraint = InDetFlags.useBeamConstraint())
- ToolSvc += InDetAlignMonBeamSpot_noTrig
+ #ToolSvc += InDetAlignMonBeamSpot_noTrig
InDetAlignMonManager.AthenaMonTools += [ InDetAlignMonBeamSpot_noTrig ]
@@ -374,7 +374,7 @@ RefitAlignTrackSelection = InDetAlignMon__TrackSelectionTool(
name = "InDetAlignMonAlignTrackSelectionTool",
TrackSelectorTool = RefitTrackSelector),
PrimVtxContainerName = InDetKeys.xAODVertexContainer(),
-ToolSvc+= RefitAlignTrackSelection
+#ToolSvc+= RefitAlignTrackSelection
for trackCollection in RefitTrackCollections:
@@ -400,7 +400,7 @@ for trackCollection in RefitTrackCollections:
NSplitMap = 1,
RangeOfPullHistos = 5
)
- ToolSvc += InDetAlignMonResiduals
+ #ToolSvc += InDetAlignMonResiduals
InDetAlignMonManager.AthenaMonTools += [ InDetAlignMonResiduals ]
InDetAlignMonGenericTracks = IDAlignMonGenericTracks(
name = "InDetAlignMonGenericTracks_"+trackCollection,
@@ -410,7 +410,7 @@ for trackCollection in RefitTrackCollections:
triggerChainName = "all",
VxPrimContainerName = InDetKeys.PrimaryVertices()
)
- ToolSvc += InDetAlignMonGenericTracks
+ #ToolSvc += InDetAlignMonGenericTracks
InDetAlignMonManager.AthenaMonTools += [ InDetAlignMonGenericTracks ]
InDetAlignMonSelectedTracksEfficiencies = IDAlignMonEfficiencies (
@@ -423,7 +423,7 @@ for trackCollection in RefitTrackCollections:
SCT_Manager = InDetKeys.SCT_Manager(),
TRT_Manager = InDetKeys.TRT_Manager()
)
- ToolSvc += InDetAlignMonSelectedTracksEfficiencies
+ #ToolSvc += InDetAlignMonSelectedTracksEfficiencies
InDetAlignMonManager.AthenaMonTools += [ InDetAlignMonSelectedTracksEfficiencies ]
'''
@@ -469,7 +469,7 @@ if Cosmics:
nSharedSct = 0,
TrackSummaryTool = InDetTrackSummaryTool,
Extrapolator = InDetExtrapolator))
- ToolSvc += m_alignMonTrackSelectorTool[i]
+ #ToolSvc += m_alignMonTrackSelectorTool[i]
if (InDetFlags.doPrintConfigurables()):
print m_alignMonTrackSelectorTool[i]
@@ -480,7 +480,7 @@ if Cosmics:
#DoEventPhaseCut = True,
TrackSelectorTool = m_alignMonTrackSelectorTool[i]))
- ToolSvc += m_alignMonTrackSelectionTool[i]
+ #ToolSvc += m_alignMonTrackSelectionTool[i]
if (InDetFlags.doPrintConfigurables()):
print " <NewInDetAlignMonitoring> m_alignMonTrackSelectionTool[",i,"] =", m_alignMonTrackSelectionToolName[i]
print m_alignMonTrackSelectionTool[i]
@@ -518,7 +518,7 @@ if Cosmics:
OutputLowerTracksName = m_lowerTracksName[i],
OutputLevel = WARNING))
- ToolSvc += m_trackSplitter[i]
+ #ToolSvc += m_trackSplitter[i]
if (InDetFlags.doPrintConfigurables()):
print m_trackSplitter[i]
print " <NewInDetAlignMonitoring> step ",i," -> defined track segment monitoring for",m_trackSegmentsUpLowName[i],"using", m_upperTracksName[i],"and", m_lowerTracksName[i], " 2*i+1=",2*i+1," m_alignMonTrackSelectionTool ? length=",len(m_alignMonTrackSelectionTool)
@@ -540,7 +540,7 @@ if Cosmics:
D0Range = m_d0Range[i],
OutputLevel = WARNING))
- ToolSvc += m_trackSegmentsUpLow[i]
+ #ToolSvc += m_trackSegmentsUpLow[i]
InDetAlignMonManager.AthenaMonTools += [ m_trackSegmentsUpLow[i] ]
print " <NewInDetAlignMonitoring> step ",i, m_trackSegmentsUpLowName[i]," added to the ToolSvc"
@@ -572,7 +572,7 @@ if Cosmics:
OutputLevel = WARNING
)
- ToolSvc += InDetAlignMonResiduals
+ #ToolSvc += InDetAlignMonResiduals
InDetAlignMonManager.AthenaMonTools += [ InDetAlignMonResiduals ]
print InDetAlignMonResiduals
@@ -595,7 +595,7 @@ if Cosmics:
InDetAlignMonGenericTracks.d0Range = 500
InDetAlignMonGenericTracks.z0Range = 1000
- ToolSvc += InDetAlignMonGenericTracks
+ #ToolSvc += InDetAlignMonGenericTracks
InDetAlignMonManager.AthenaMonTools += [ InDetAlignMonGenericTracks ]
print " <NewInDetAlignMonitoring> going to define InDetAlignMonSelectedTracksEfficiencies for track collection: ",trackCollection
InDetAlignMonSelectedTracksEfficiencies = IDAlignMonEfficiencies (
@@ -610,7 +610,7 @@ if Cosmics:
TRT_Manager = InDetKeys.TRT_Manager()
)
- ToolSvc += InDetAlignMonSelectedTracksEfficiencies
+ #ToolSvc += InDetAlignMonSelectedTracksEfficiencies
InDetAlignMonManager.AthenaMonTools += [ InDetAlignMonSelectedTracksEfficiencies ]
# Lower track segments
@@ -640,7 +640,7 @@ if Cosmics:
OutputLevel = WARNING
)
- ToolSvc += InDetAlignMonResiduals
+ #ToolSvc += InDetAlignMonResiduals
InDetAlignMonManager.AthenaMonTools += [ InDetAlignMonResiduals ]
print InDetAlignMonResiduals
@@ -663,7 +663,7 @@ if Cosmics:
InDetAlignMonGenericTracks.d0Range = 500
InDetAlignMonGenericTracks.z0Range = 1000
- ToolSvc += InDetAlignMonGenericTracks
+ #ToolSvc += InDetAlignMonGenericTracks
InDetAlignMonManager.AthenaMonTools += [ InDetAlignMonGenericTracks ]
print " <NewInDetAlignMonitoring> going to define InDetAlignMonSelectedTracksEfficiencies for track collection: ",trackCollection
InDetAlignMonSelectedTracksEfficiencies = IDAlignMonEfficiencies (
@@ -678,7 +678,7 @@ if Cosmics:
TRT_Manager = InDetKeys.TRT_Manager()
)
- ToolSvc += InDetAlignMonSelectedTracksEfficiencies
+ #ToolSvc += InDetAlignMonSelectedTracksEfficiencies
InDetAlignMonManager.AthenaMonTools += [ InDetAlignMonSelectedTracksEfficiencies ]
# ^^^
@@ -720,7 +720,7 @@ if Cosmics:
DeltaQoverPtRange2D = m_deltaQoverPt2D_Sub[i],
D0Range = m_d0Range_Sub[i]))
- ToolSvc += m_trackSegments_Sub[i]
+ #ToolSvc += m_trackSegments_Sub[i]
if (InDetFlags.doPrintConfigurables()):
print m_trackSegments_Sub[i]
diff --git a/InnerDetector/InDetExample/InDetBeamSpotExample/share/MonitoringFragment.py b/InnerDetector/InDetExample/InDetBeamSpotExample/share/MonitoringFragment.py
index 730a4fd8b151..8e83700844ad 100644
--- a/InnerDetector/InDetExample/InDetBeamSpotExample/share/MonitoringFragment.py
+++ b/InnerDetector/InDetExample/InDetBeamSpotExample/share/MonitoringFragment.py
@@ -37,7 +37,7 @@ if not 'jobpostprocsteps' in jobConfig: jobConfig['jobpostprocsteps
if not jobConfig['doMonitoringGlobal']:
# Beam spot monitoring tool from GlobalMonitoring
#from InDetGlobalMonitoring.InDetGlobalMonitoringConf import InDetGlobalBeamSpotMonTool
- ToolSvc += CfgMgr.InDetGlobalBeamSpotMonTool(name = "InDetGlobalBeamSpotMonTool",
+ InDetGlobalBeamSpotMonTool = CfgMgr.InDetGlobalBeamSpotMonTool(name = "InDetGlobalBeamSpotMonTool",
trackContainerName = jobConfig['TrackContainer'],
vxContainerName = jobConfig['VertexContainer'],
vxContainerWithBeamConstraint = jobConfig['VertexContainerWithBeamConstraint'],
@@ -56,8 +56,8 @@ if not jobConfig['doMonitoringGlobal']:
from AthenaMonitoring.AthenaMonitoringConf import DQFilledBunchFilterTool
monFilledBunchFilterTool = DQFilledBunchFilterTool()
monFilledBunchFilterTool.bunchCrossingTool = bunchCrossingTool
- ToolSvc += monFilledBunchFilterTool
- ToolSvc.InDetGlobalBeamSpotMonTool.FilterTools.append(monFilledBunchFilterTool)
+ #ToolSvc += monFilledBunchFilterTool
+ InDetGlobalBeamSpotMonTool.FilterTools.append(monFilledBunchFilterTool)
print ToolSvc.InDetGlobalBeamSpotMonTool
@@ -74,7 +74,7 @@ if not jobConfig['doMonitoringGlobal']:
Run = 1,
LumiBlock = 1)
#topSequence.BeamSpotMonManager.AthenaMonTools += [ ToolSvc.InDetAlignMonBeamSpot ]
- topSequence.BeamSpotMonManager.AthenaMonTools += [ ToolSvc.InDetGlobalBeamSpotMonTool ]
+ topSequence.BeamSpotMonManager.AthenaMonTools += [ InDetGlobalBeamSpotMonTool ]
print topSequence.BeamSpotMonManager
diff --git a/InnerDetector/InDetExample/InDetRecExample/share/InDetMonitoringAlignment.py b/InnerDetector/InDetExample/InDetRecExample/share/InDetMonitoringAlignment.py
index 11d103a3851b..333d2a5810e5 100755
--- a/InnerDetector/InDetExample/InDetRecExample/share/InDetMonitoringAlignment.py
+++ b/InnerDetector/InDetExample/InDetRecExample/share/InDetMonitoringAlignment.py
@@ -101,7 +101,7 @@ if not jobproperties.Beam.beamType()=='cosmics':
InDetAlignMonSivsTRT_noTrig = IDAlignMonSivsTRT (name = "InDetAlignMonSivsTRT_noTrig",
trackSelection = m_alignMonTrackSelectionTool[0])
- ToolSvc += InDetAlignMonSivsTRT_noTrig
+ #ToolSvc += InDetAlignMonSivsTRT_noTrig
if (InDetFlags.doPrintConfigurables()):
print InDetAlignMonSivsTRT_noTrig
@@ -112,7 +112,7 @@ if not jobproperties.Beam.beamType()=='cosmics':
vxContainerName = InDetKeys.PrimaryVertices(),
vxContainerWithBeamConstraint = InDetFlags.useBeamConstraint())
- ToolSvc += InDetAlignMonBeamSpot_noTrig
+ #ToolSvc += InDetAlignMonBeamSpot_noTrig
if (InDetFlags.doPrintConfigurables()):
print InDetAlignMonBeamSpot_noTrig
@@ -160,7 +160,7 @@ else:
CutLevel = "LoosePrimary",
TrackSummaryTool = InDetTrackSummaryTool,
Extrapolator = InDetExtrapolator))
- ToolSvc += m_alignMonTrackSelectorTool[i]
+ #ToolSvc += m_alignMonTrackSelectorTool[i]
if (InDetFlags.doPrintConfigurables()):
print m_alignMonTrackSelectorTool[i]
@@ -201,7 +201,7 @@ else:
if InDetAlignMonReadESD and InDetFlags.doRefit: #use refitted tracks if reading ESD
InDetAlignMonResiduals_noTrig.tracksName = InDetKeys.RefittedTracks()
-ToolSvc += InDetAlignMonResiduals_noTrig
+#ToolSvc += InDetAlignMonResiduals_noTrig
if (InDetFlags.doPrintConfigurables()):
print InDetAlignMonResiduals_noTrig
@@ -223,7 +223,7 @@ else:
if InDetAlignMonReadESD and InDetFlags.doRefit:#use refitted tracks if reading ESD
InDetAlignMonEfficiencies_noTrig.tracksName = InDetKeys.RefittedTracks()
-ToolSvc += InDetAlignMonEfficiencies_noTrig
+#ToolSvc += InDetAlignMonEfficiencies_noTrig
if (InDetFlags.doPrintConfigurables()):
print InDetAlignMonEfficiencies_noTrig
@@ -243,7 +243,7 @@ else:
if InDetAlignMonReadESD and InDetFlags.doRefit: #use refitted tracks if reading ESD
InDetAlignMonGenericTracks_noTrig.tracksName = InDetKeys.RefittedTracks()
-ToolSvc += InDetAlignMonGenericTracks_noTrig
+#ToolSvc += InDetAlignMonGenericTracks_noTrig
if (InDetFlags.doPrintConfigurables()):
print InDetAlignMonGenericTracks_noTrig
@@ -283,7 +283,7 @@ if jobproperties.Beam.beamType()=='cosmics':
OutputUpperTracksName = m_upperTracksName[i],
OutputLowerTracksName = m_lowerTracksName[i]))
- ToolSvc += m_trackSplitter[i]
+ #ToolSvc += m_trackSplitter[i]
if (InDetFlags.doPrintConfigurables()):
print m_trackSplitter[i]
@@ -304,7 +304,7 @@ if jobproperties.Beam.beamType()=='cosmics':
DeltaQoverPtRange2D = m_deltaQoverPt2D[i],
D0Range = m_d0Range[i]))
- ToolSvc += m_trackSegmentsUpLow[i]
+ #ToolSvc += m_trackSegmentsUpLow[i]
if (InDetFlags.doPrintConfigurables()):
print m_trackSegmentsUpLow[i]
@@ -342,7 +342,7 @@ if jobproperties.Beam.beamType()=='cosmics':
DeltaQoverPtRange2D = m_deltaQoverPt2D_Sub[i],
D0Range = m_d0Range_Sub[i]))
- ToolSvc += m_trackSegments_Sub[i]
+ #ToolSvc += m_trackSegments_Sub[i]
if (InDetFlags.doPrintConfigurables()):
print m_trackSegments_Sub[i]
@@ -383,11 +383,11 @@ else:
vxContainerWithBeamConstraint = InDetFlags.useBeamConstraint())
if jobproperties.Beam.beamType()=='collisions' and hasattr(ToolSvc, 'DQFilledBunchFilterTool'):
- InDetAlignMonSivsTRT.FilterTools.append(monFilledBunchFilterTool)
- InDetAlignMonResiduals.FilterTools.append(monFilledBunchFilterTool)
- InDetAlignMonEfficiencies.FilterTools.append(monFilledBunchFilterTool)
- InDetAlignMonGenericTracks.FilterTools.append(monFilledBunchFilterTool)
- InDetAlignMonBeamSpot.FilterTools.append(monFilledBunchFilterTool)
+ InDetAlignMonSivsTRT.FilterTools += [monFilledBunchFilterTool]
+ InDetAlignMonResiduals.FilterTools += [monFilledBunchFilterTool]
+ InDetAlignMonEfficiencies.FilterTools += [monFilledBunchFilterTool]
+ InDetAlignMonGenericTracks.FilterTools += [monFilledBunchFilterTool]
+ InDetAlignMonBeamSpot.FilterTools += [monFilledBunchFilterTool]
InDetAlignMonSivsTRT.TrigDecisionTool = monTrigDecTool
InDetAlignMonResiduals.TrigDecisionTool = monTrigDecTool
@@ -415,19 +415,19 @@ else:
InDetAlignMonGenericTracks.triggerChainName = "TriggerAwareMon"
InDetAlignMonBeamSpot.histFolder = "IDAlignMon/BeamSpot/TriggerAwareMon"
- ToolSvc += InDetAlignMonResiduals
+ #ToolSvc += InDetAlignMonResiduals
if (InDetFlags.doPrintConfigurables()):
print InDetAlignMonResiduals
- ToolSvc += InDetAlignMonEfficiencies
+ #ToolSvc += InDetAlignMonEfficiencies
if (InDetFlags.doPrintConfigurables()):
print InDetAlignMonEfficiencies
- ToolSvc += InDetAlignMonGenericTracks
+ #ToolSvc += InDetAlignMonGenericTracks
if (InDetFlags.doPrintConfigurables()):
print InDetAlignMonGenericTracks
- ToolSvc += InDetAlignMonBeamSpot
+ #ToolSvc += InDetAlignMonBeamSpot
if (InDetFlags.doPrintConfigurables()):
print InDetAlignMonBeamSpot
- ToolSvc += InDetAlignMonSivsTRT
+ #ToolSvc += InDetAlignMonSivsTRT
if (InDetFlags.doPrintConfigurables()):
print InDetAlignMonSivsTRT
@@ -461,11 +461,11 @@ InDetAlignMonManager.AthenaMonTools += [ InDetAlignMonEfficiencies_noTri
InDetAlignMonManager.AthenaMonTools += [ InDetAlignMonGenericTracks_noTrig ]
if jobproperties.Beam.beamType()=='collisions' and hasattr(ToolSvc, 'DQFilledBunchFilterTool'):
- InDetAlignMonSivsTRT_noTrig.FilterTools.append(monFilledBunchFilterTool)
- InDetAlignMonResiduals_noTrig.FilterTools.append(monFilledBunchFilterTool)
- InDetAlignMonEfficiencies_noTrig.FilterTools.append(monFilledBunchFilterTool)
- InDetAlignMonGenericTracks_noTrig.FilterTools.append(monFilledBunchFilterTool)
- InDetAlignMonBeamSpot_noTrig.FilterTools.append(monFilledBunchFilterTool)
+ InDetAlignMonSivsTRT_noTrig.FilterTools += [monFilledBunchFilterTool]
+ InDetAlignMonResiduals_noTrig.FilterTools += [monFilledBunchFilterTool]
+ InDetAlignMonEfficiencies_noTrig.FilterTools += [monFilledBunchFilterTool]
+ InDetAlignMonGenericTracks_noTrig.FilterTools += [monFilledBunchFilterTool]
+ InDetAlignMonBeamSpot_noTrig.FilterTools += [monFilledBunchFilterTool]
if InDetAlignMonDoTruth:
diff --git a/InnerDetector/InDetExample/InDetRecExample/share/InDetMonitoringGlobal.py b/InnerDetector/InDetExample/InDetRecExample/share/InDetMonitoringGlobal.py
index 6e767c3f993f..ed01c9192e03 100644
--- a/InnerDetector/InDetExample/InDetRecExample/share/InDetMonitoringGlobal.py
+++ b/InnerDetector/InDetExample/InDetRecExample/share/InDetMonitoringGlobal.py
@@ -37,9 +37,9 @@ if InDetFlags.doMonitoringGlobal():
checkRate = 2000)
if jobproperties.Beam.beamType()=='collisions' and hasattr(ToolSvc, 'DQFilledBunchFilterTool'):
- InDetGlobalSynchMonTool.FilterTools.append(monFilledBunchFilterTool)
+ InDetGlobalSynchMonTool.FilterTools += [monFilledBunchFilterTool]
- ToolSvc += InDetGlobalSynchMonTool
+ #ToolSvc += InDetGlobalSynchMonTool
if (InDetFlags.doPrintConfigurables()):
print InDetGlobalSynchMonTool
@@ -52,7 +52,7 @@ if InDetFlags.doMonitoringGlobal():
from InDetGlobalMonitoring.InDetGlobalMonitoringConf import InDetGlobalErrorMonTool
InDetGlobalErrorMonTool=InDetGlobalErrorMonTool( name = "InDetGlobalErrorMonTool" )
- ToolSvc += InDetGlobalErrorMonTool
+ #ToolSvc += InDetGlobalErrorMonTool
if (InDetFlags.doPrintConfigurables()):
print InDetGlobalErrorMonTool
@@ -86,8 +86,8 @@ if InDetFlags.doMonitoringGlobal():
TrackSummaryTool = InDetTrackSummaryTool,
Extrapolator = InDetExtrapolator)
- ToolSvc += InDetTrackSelectionToolGlobalMon_Baseline
- ToolSvc += InDetTrackSelectionToolGlobalMon_TightPrimary
+ #ToolSvc += InDetTrackSelectionToolGlobalMon_Baseline
+ #ToolSvc += InDetTrackSelectionToolGlobalMon_TightPrimary
InDetGlobalTrackMonTool.Baseline_SelTool = InDetTrackSelectionToolGlobalMon_Baseline
InDetGlobalTrackMonTool.Tight_SelTool = InDetTrackSelectionToolGlobalMon_TightPrimary
@@ -101,9 +101,9 @@ if InDetFlags.doMonitoringGlobal():
InDetGlobalTrackMonTool.trackBin = 10
if jobproperties.Beam.beamType()=='collisions' and hasattr(ToolSvc, 'DQFilledBunchFilterTool'):
- InDetGlobalTrackMonTool.FilterTools.append(monFilledBunchFilterTool)
+ InDetGlobalTrackMonTool.FilterTools += [monFilledBunchFilterTool]
- ToolSvc += InDetGlobalTrackMonTool
+ #ToolSvc += InDetGlobalTrackMonTool
if (InDetFlags.doPrintConfigurables()):
print InDetGlobalTrackMonTool
@@ -117,8 +117,8 @@ if InDetFlags.doMonitoringGlobal():
InDetGlobalPixelTool=InDetGlobalPixelTool( name = "InDetGlobalPixelTool")
if jobproperties.Beam.beamType()=='collisions' and hasattr(ToolSvc, 'DQFilledBunchFilterTool'):
- InDetGlobalPixelTool.FilterTools.append(monFilledBunchFilterTool)
- ToolSvc += InDetGlobalPixelTool
+ InDetGlobalPixelTool.FilterTools += [monFilledBunchFilterTool]
+ #ToolSvc += InDetGlobalPixelTool
if (InDetFlags.doPrintConfigurables()):
print InDetGlobalPixelTool
@@ -131,7 +131,7 @@ if InDetFlags.doMonitoringGlobal():
# InDetGlobalBCMTool=InDetGlobalBCMTool( name = "InDetGlobalBCMTool")
# if jobproperties.Beam.beamType()=='collisions' and hasattr(ToolSvc, 'DQFilledBunchFilterTool'):
- # InDetGlobalBCMTool.FilterTools.append(monFilledBunchFilterTool)
+ # InDetGlobalBCMTool.FilterTools += [monFilledBunchFilterTool]
# ToolSvc += InDetGlobalBCMTool
# if (InDetFlags.doPrintConfigurables()):
# print InDetGlobalBCMTool
@@ -150,8 +150,8 @@ if InDetFlags.doMonitoringGlobal():
useBeamspot = InDetFlags.useBeamConstraint())
if jobproperties.Beam.beamType()=='collisions' and hasattr(ToolSvc, 'DQFilledBunchFilterTool'):
- InDetGlobalBeamSpotMonTool.FilterTools.append(monFilledBunchFilterTool)
- ToolSvc += InDetGlobalBeamSpotMonTool
+ InDetGlobalBeamSpotMonTool.FilterTools += [monFilledBunchFilterTool]
+ #ToolSvc += InDetGlobalBeamSpotMonTool
if (InDetFlags.doPrintConfigurables()):
print InDetGlobalBeamSpotMonTool
@@ -190,9 +190,9 @@ if InDetFlags.doMonitoringGlobal() or InDetFlags.doMonitoringPrimaryVertexingEnh
vxContainerNameSplit = InDetKeys.PrimaryVerticesSplitStream(),
doEnhancedMonitoring = InDetFlags.doMonitoringPrimaryVertexingEnhanced())
if jobproperties.Beam.beamType()=='collisions' and hasattr(ToolSvc, 'DQFilledBunchFilterTool'):
- InDetGlobalPrimaryVertexMonTool.FilterTools.append(monFilledBunchFilterTool)
+ InDetGlobalPrimaryVertexMonTool.FilterTools += [monFilledBunchFilterTool]
- ToolSvc += InDetGlobalPrimaryVertexMonTool
+ #ToolSvc += InDetGlobalPrimaryVertexMonTool
if (InDetFlags.doPrintConfigurables()):
print InDetGlobalPrimaryVertexMonTool
@@ -219,13 +219,13 @@ if InDetFlags.doMonitoringGlobal():
OutputLevel=ERROR,
PublicChainGroups = {"EFRandom": "EF_rd0_filled_NoAlg"}
)
- ToolSvc += monTrigDecTool
+ #ToolSvc += monTrigDecTool
if rec.doTrigger == True:
InDetVertexMonitoring.TrigDecisionTool = monTrigDecTool
InDetVertexMonitoring.TriggerChain = "EF_rd0_filled_NoAlg"
- ToolSvc += InDetVertexMonitoring
+ #ToolSvc += InDetVertexMonitoring
InDetGlobalManager.AthenaMonTools += [ InDetVertexMonitoring]
diff --git a/InnerDetector/InDetExample/InDetRecExample/share/InDetMonitoringPixel.py b/InnerDetector/InDetExample/InDetRecExample/share/InDetMonitoringPixel.py
index 8e079eb5984c..620e21a5e481 100644
--- a/InnerDetector/InDetExample/InDetRecExample/share/InDetMonitoringPixel.py
+++ b/InnerDetector/InDetExample/InDetRecExample/share/InDetMonitoringPixel.py
@@ -49,9 +49,9 @@ if doAllHits:
##Other parameters
if jobproperties.Beam.beamType()=='collisions' and hasattr(ToolSvc, 'DQFilledBunchFilterTool'):
- InDetPixelMainsMon.FilterTools.append(monFilledBunchFilterTool)
+ InDetPixelMainsMon.FilterTools += [monFilledBunchFilterTool]
- ToolSvc += InDetPixelMainsMon
+ #ToolSvc += InDetPixelMainsMon
if (InDetFlags.doPrintConfigurables()):
print InDetPixelMainsMon
@@ -115,9 +115,9 @@ if doHitsOnTrack:
##Other parameters
if jobproperties.Beam.beamType()=='collisions' and hasattr(ToolSvc, 'DQFilledBunchFilterTool'):
- InDetPixelMainsMonOnTrack.FilterTools.append(monFilledBunchFilterTool)
+ InDetPixelMainsMonOnTrack.FilterTools += [monFilledBunchFilterTool]
- ToolSvc += InDetPixelMainsMonOnTrack
+ #ToolSvc += InDetPixelMainsMonOnTrack
if (InDetFlags.doPrintConfigurables()):
print InDetPixelMainsMonOnTrack
diff --git a/InnerDetector/InDetExample/InDetRecExample/share/InDetMonitoringSCT.py b/InnerDetector/InDetExample/InDetRecExample/share/InDetMonitoringSCT.py
index 2f3957b4acaf..f096a7097ca7 100755
--- a/InnerDetector/InDetExample/InDetRecExample/share/InDetMonitoringSCT.py
+++ b/InnerDetector/InDetExample/InDetRecExample/share/InDetMonitoringSCT.py
@@ -25,7 +25,7 @@ InDetSCTHitsTool = SCTHitsNoiseMonTool ( name = "InDetSC
InDetSCTHitsTool.tracksName = InDetKeys.SCTTracks() if InDetFlags.doTrackSegmentsSCT() else InDetKeys.UnslimmedTracks()
-ToolSvc += InDetSCTHitsTool
+#ToolSvc += InDetSCTHitsTool
if (InDetFlags.doPrintConfigurables()):
print InDetSCTHitsTool
@@ -41,9 +41,9 @@ InDetSCTTracksMonTool = SCTTracksMonTool ( name = "InDetSCTTracksMon
InDetSCTTracksMonTool.tracksName = InDetKeys.SCTTracks() if InDetFlags.doTrackSegmentsSCT() else InDetKeys.UnslimmedTracks()
if jobproperties.Beam.beamType()=='collisions' and hasattr(ToolSvc, 'DQFilledBunchFilterTool'):
- InDetSCTTracksMonTool.FilterTools.append(monFilledBunchFilterTool)
+ InDetSCTTracksMonTool.FilterTools += [monFilledBunchFilterTool]
-ToolSvc += InDetSCTTracksMonTool
+#ToolSvc += InDetSCTTracksMonTool
if (InDetFlags.doPrintConfigurables()):
print InDetSCTTracksMonTool
@@ -57,9 +57,9 @@ InDetSCTErrMonTool = SCTErrMonTool ( name = "InDetSCTErrMonTool",
doNegativeEndcap = True)
if jobproperties.Beam.beamType()=='collisions' and hasattr(ToolSvc, 'DQFilledBunchFilterTool'):
- InDetSCTErrMonTool.FilterTools.append(monFilledBunchFilterTool)
+ InDetSCTErrMonTool.FilterTools += [monFilledBunchFilterTool]
-ToolSvc += InDetSCTErrMonTool
+#ToolSvc += InDetSCTErrMonTool
if (InDetFlags.doPrintConfigurables()):
print InDetSCTErrMonTool
@@ -92,9 +92,9 @@ InDetSCTHitEffMonTool = SCTHitEffMonTool(name = "InDetSCTHitEffMonTool",
InDetSCTHitEffMonTool.TrackName = InDetKeys.SCTTracks() if InDetFlags.doTrackSegmentsSCT() else InDetKeys.UnslimmedTracks()
if jobproperties.Beam.beamType()=='collisions' and hasattr(ToolSvc, 'DQFilledBunchFilterTool'):
- InDetSCTHitEffMonTool.FilterTools.append(monFilledBunchFilterTool)
+ InDetSCTHitEffMonTool.FilterTools += [monFilledBunchFilterTool]
-ToolSvc += InDetSCTHitEffMonTool
+#ToolSvc += InDetSCTHitEffMonTool
if (InDetFlags.doPrintConfigurables()):
print InDetSCTHitEffMonTool
@@ -110,9 +110,9 @@ InDetSCTLorentzMonTool = SCTLorentzMonTool ( name = "InDetSCTLorentz
InDetSCTLorentzMonTool.tracksName = InDetKeys.SCTTracks() if InDetFlags.doTrackSegmentsSCT() else InDetKeys.UnslimmedTracks()
if jobproperties.Beam.beamType()=='collisions' and hasattr(ToolSvc, 'DQFilledBunchFilterTool'):
- InDetSCTLorentzMonTool.FilterTools.append(monFilledBunchFilterTool)
+ InDetSCTLorentzMonTool.FilterTools += [monFilledBunchFilterTool]
-ToolSvc += InDetSCTLorentzMonTool
+#ToolSvc += InDetSCTLorentzMonTool
if (InDetFlags.doPrintConfigurables()):
print InDetSCTLorentzMonTool
@@ -127,7 +127,7 @@ from RecExConfig.RecFlags import rec
if not rec.doTrigger():
InDetSCTRatioNoiseMonTool.doTrigger=False
-ToolSvc += InDetSCTRatioNoiseMonTool
+#ToolSvc += InDetSCTRatioNoiseMonTool
if (InDetFlags.doPrintConfigurables()):
print InDetSCTRatioNoiseMonTool
diff --git a/InnerDetector/InDetExample/InDetRecExample/share/InDetMonitoringTRT.py b/InnerDetector/InDetExample/InDetRecExample/share/InDetMonitoringTRT.py
index fba45670ca97..bfcfda5ad39a 100644
--- a/InnerDetector/InDetExample/InDetRecExample/share/InDetMonitoringTRT.py
+++ b/InnerDetector/InDetExample/InDetRecExample/share/InDetMonitoringTRT.py
@@ -92,9 +92,9 @@ InDetTRT_Monitoring_Tool = TRT_Monitoring_Tool (name = "
)
if jobproperties.Beam.beamType()=='collisions' and hasattr(ToolSvc, 'DQFilledBunchFilterTool'):
- InDetTRT_Monitoring_Tool.FilterTools.append(monFilledBunchFilterTool)
+ InDetTRT_Monitoring_Tool.FilterTools += [monFilledBunchFilterTool]
-ToolSvc += InDetTRT_Monitoring_Tool
+#ToolSvc += InDetTRT_Monitoring_Tool
if (InDetFlags.doPrintConfigurables()):
print InDetTRT_Monitoring_Tool
diff --git a/InnerDetector/InDetExample/InDetRecExample/share/InDetRecNtupleCreation.py b/InnerDetector/InDetExample/InDetRecExample/share/InDetRecNtupleCreation.py
index 815a8b850baf..627f02078af9 100644
--- a/InnerDetector/InDetExample/InDetRecExample/share/InDetRecNtupleCreation.py
+++ b/InnerDetector/InDetExample/InDetRecExample/share/InDetRecNtupleCreation.py
@@ -494,7 +494,7 @@ if InDetFlags.doPhysValMon():
# ToolSvc += InDetPhysValMonToolDBM
# InDetPhysValMonManager.AthenaMonTools += [InDetPhysValMonToolDBM]
- ToolSvc += InDetPhysValMonTool
+ #ToolSvc += InDetPhysValMonTool
InDetPhysValMonManager.AthenaMonTools += [InDetPhysValMonTool]
if (InDetFlags.doPrintConfigurables()):
print InDetPhysValMonTool
@@ -505,7 +505,7 @@ if InDetFlags.doPhysValMon():
InDetPhysValMonToolPU = InDetPhysValMonitoringTool (useTrackSelection = True,
TrackSelectionTool = InDetTrackSelectorTool,
TruthParticleContainerName = "SpclMCPU")
- ToolSvc += InDetPhysValMonToolPU
+ #ToolSvc += InDetPhysValMonToolPU
InDetPhysValMonManager.AthenaMonTools += [InDetPhysValMonToolPU]
if (InDetFlags.doPrintConfigurables()):
print InDetPhysValMonToolPU
diff --git a/InnerDetector/InDetMonitoring/InDetAlignmentMonitoring/share/InDetMonitoringTRTCosmics.py b/InnerDetector/InDetMonitoring/InDetAlignmentMonitoring/share/InDetMonitoringTRTCosmics.py
index 9bc957cf259a..827a13ad1d2d 100644
--- a/InnerDetector/InDetMonitoring/InDetAlignmentMonitoring/share/InDetMonitoringTRTCosmics.py
+++ b/InnerDetector/InDetMonitoring/InDetAlignmentMonitoring/share/InDetMonitoringTRTCosmics.py
@@ -151,7 +151,7 @@ for i in range(5):
trackSelection = InDetAlignMonTrackSelectionTool,
TRT_Manager = InDetKeys.TRT_Manager()) )
- ToolSvc += InDetAlignMonResidualsList[i]
+ #ToolSvc += InDetAlignMonResidualsList[i]
if (InDetFlags.doPrintConfigurables()):
print InDetAlignMonResidualsList[i]
@@ -164,7 +164,7 @@ for i in range(5):
trackSelection = InDetAlignMonTrackSelectionTool,
TRT_Manager = InDetKeys.TRT_Manager()) )
- ToolSvc += InDetAlignMonEfficienciesList[i]
+ #ToolSvc += InDetAlignMonEfficienciesList[i]
if (InDetFlags.doPrintConfigurables()):
print InDetAlignMonEfficienciesList[i]
@@ -174,7 +174,7 @@ for i in range(5):
trackSelection = InDetAlignMonTrackSelectionTool,
VxPrimContainerName = InDetKeys.PrimaryVertices()) )
- ToolSvc += InDetAlignMonGenericTracksList[i]
+ #ToolSvc += InDetAlignMonGenericTracksList[i]
if (InDetFlags.doPrintConfigurables()):
print InDetAlignMonGenericTracksList[i]
@@ -185,7 +185,7 @@ for i in range(5):
OutputLowerTracksName = m_trkSplitterName[i]+"_Lower",
OutputLevel = ERROR) )
- ToolSvc += InDetTrackSplitterToolList[i]
+ #ToolSvc += InDetTrackSplitterToolList[i]
if (InDetFlags.doPrintConfigurables()):
print InDetTrackSplitterToolList[i]
@@ -204,7 +204,7 @@ for i in range(5):
DeltaQoverPtRange = m_deltaQoverPt[i],
OutputLevel = ERROR,
D0Range = m_d0Range[i] ))
- ToolSvc += InDetAlignMonTrackSegmentsList[i]
+ #ToolSvc += InDetAlignMonTrackSegmentsList[i]
if (InDetFlags.doPrintConfigurables()):
print InDetAlignMonTrackSegmentsList[i]
#==============================================================
@@ -237,7 +237,7 @@ for i in range(5):
if InDetAlignMonDoTruth:
InDetAlignMonManager.AthenaMonTools += [ InDetAlignMonTruthComparison ]
-if not hasattr(ToolSvc, 'monTrigDecTool'):
+if not hasattr(#ToolSvc, 'monTrigDecTool'):
print "InDetAlignmentMonitoring_InDetRec_jobOptions.py: trigger decision tool not found: don't run trigger-aware monitoring"
elif jobproperties.Beam.beamType()=='cosmics' or jobproperties.Beam.beamType()=='singlebeam':
print "singlebeam or cosmics: don't run trigger-aware monitoring"
diff --git a/InnerDetector/InDetMonitoring/InDetDiMuonMonitoring/share/InDetDiMuMon_jobOptions.py b/InnerDetector/InDetMonitoring/InDetDiMuonMonitoring/share/InDetDiMuMon_jobOptions.py
index 5e6a2fc35940..519dcb87adda 100644
--- a/InnerDetector/InDetMonitoring/InDetDiMuonMonitoring/share/InDetDiMuMon_jobOptions.py
+++ b/InnerDetector/InDetMonitoring/InDetDiMuonMonitoring/share/InDetDiMuMon_jobOptions.py
@@ -55,7 +55,7 @@ if not rec.doHeavyIon():
# OutputLevel = 1)
- ToolSvc += JpsiMon_NoTrig
+ #ToolSvc += JpsiMon_NoTrig
if (InDetFlags.doPrintConfigurables()):
print JpsiMon_NoTrig
InDetDiMuMonManager.AthenaMonTools += [ JpsiMon_NoTrig ]
@@ -75,7 +75,7 @@ if not rec.doHeavyIon():
doSaveFits = doSaveFits)
# OutputLevel = 1)
- ToolSvc += ZmumuMon_NoTrig
+ #ToolSvc += ZmumuMon_NoTrig
if (InDetFlags.doPrintConfigurables()):
print ZmumuMon_NoTrig
InDetDiMuMonManager.AthenaMonTools += [ ZmumuMon_NoTrig ]
@@ -100,7 +100,7 @@ if not rec.doHeavyIon():
doSaveFits = doSaveFits)
JpsiMon_XpressTrig_idperf.TriggerChain = "HLT_mu4_mu4_idperf_bJpsimumu_noid"
JpsiMon_XpressTrig_idperf.TrigDecisionTool = monTrigDecTool
- ToolSvc += JpsiMon_XpressTrig_idperf
+ #ToolSvc += JpsiMon_XpressTrig_idperf
if (InDetFlags.doPrintConfigurables()):
print JpsiMon_XpressTrig_idperf
InDetDiMuMonManager.AthenaMonTools += [ JpsiMon_XpressTrig_idperf ]
@@ -119,7 +119,7 @@ if not rec.doHeavyIon():
doSaveFits = doSaveFits)
JpsiMon_XpressTrig_2mu.TriggerChain = "HLT_2mu4"
JpsiMon_XpressTrig_2mu.TrigDecisionTool = monTrigDecTool
- ToolSvc += JpsiMon_XpressTrig_2mu
+ #ToolSvc += JpsiMon_XpressTrig_2mu
if (InDetFlags.doPrintConfigurables()):
print JpsiMon_XpressTrig_2mu
InDetDiMuMonManager.AthenaMonTools += [ JpsiMon_XpressTrig_2mu ]
@@ -140,7 +140,7 @@ if not rec.doHeavyIon():
doSaveFits = doSaveFits)
ZmumuMon_XpressTrig_idperf.TriggerChain = "HLT_mu13_mu13_idperf_Zmumu"
ZmumuMon_XpressTrig_idperf.TrigDecisionTool = monTrigDecTool
- ToolSvc += ZmumuMon_XpressTrig_idperf
+ #ToolSvc += ZmumuMon_XpressTrig_idperf
if (InDetFlags.doPrintConfigurables()):
print ZmumuMon_XpressTrig_idperf
InDetDiMuMonManager.AthenaMonTools += [ ZmumuMon_XpressTrig_idperf ]
@@ -160,7 +160,7 @@ if not rec.doHeavyIon():
doSaveFits = doSaveFits)
ZmumuMon_XpressTrig_2mu.TriggerChain = "HLT_2mu14"
ZmumuMon_XpressTrig_2mu.TrigDecisionTool = monTrigDecTool
- ToolSvc += ZmumuMon_XpressTrig_2mu
+ #ToolSvc += ZmumuMon_XpressTrig_2mu
if (InDetFlags.doPrintConfigurables()):
print ZmumuMon_XpressTrig_2mu
InDetDiMuMonManager.AthenaMonTools += [ ZmumuMon_XpressTrig_2mu ]
@@ -216,7 +216,7 @@ if rec.doHeavyIon():
# OutputLevel = 1)
- ToolSvc += JpsiMon_NoTrig
+ #ToolSvc += JpsiMon_NoTrig
if (InDetFlags.doPrintConfigurables()):
print JpsiMon_NoTrig
InDetDiMuMonManager.AthenaMonTools += [ JpsiMon_NoTrig ]
@@ -236,7 +236,7 @@ if rec.doHeavyIon():
doSaveFits = doSaveFits)
# OutputLevel = 1)
- ToolSvc += ZmumuMon_NoTrig
+ #ToolSvc += ZmumuMon_NoTrig
if (InDetFlags.doPrintConfigurables()):
print ZmumuMon_NoTrig
InDetDiMuMonManager.AthenaMonTools += [ ZmumuMon_NoTrig ]
@@ -261,7 +261,7 @@ if rec.doHeavyIon():
doSaveFits = doSaveFits)
JpsiMon_XpressTrig_idperf.TriggerChain = "HLT_mu4_mu4_idperf_bJpsimumu_noid"
JpsiMon_XpressTrig_idperf.TrigDecisionTool = monTrigDecTool
- ToolSvc += JpsiMon_XpressTrig_idperf
+ #ToolSvc += JpsiMon_XpressTrig_idperf
if (InDetFlags.doPrintConfigurables()):
print JpsiMon_XpressTrig_idperf
InDetDiMuMonManager.AthenaMonTools += [ JpsiMon_XpressTrig_idperf ]
@@ -280,7 +280,7 @@ if rec.doHeavyIon():
doSaveFits = doSaveFits)
JpsiMon_XpressTrig_2mu.TriggerChain = "HLT_mu4_mu4noL1"
JpsiMon_XpressTrig_2mu.TrigDecisionTool = monTrigDecTool
- ToolSvc += JpsiMon_XpressTrig_2mu
+ #ToolSvc += JpsiMon_XpressTrig_2mu
if (InDetFlags.doPrintConfigurables()):
print JpsiMon_XpressTrig_2mu
InDetDiMuMonManager.AthenaMonTools += [ JpsiMon_XpressTrig_2mu ]
@@ -301,7 +301,7 @@ if rec.doHeavyIon():
doSaveFits = doSaveFits)
ZmumuMon_XpressTrig_idperf.TriggerChain = "HLT_mu13_mu13_idperf_Zmumu"
ZmumuMon_XpressTrig_idperf.TrigDecisionTool = monTrigDecTool
- ToolSvc += ZmumuMon_XpressTrig_idperf
+ #ToolSvc += ZmumuMon_XpressTrig_idperf
if (InDetFlags.doPrintConfigurables()):
print ZmumuMon_XpressTrig_idperf
InDetDiMuMonManager.AthenaMonTools += [ ZmumuMon_XpressTrig_idperf ]
@@ -321,7 +321,7 @@ if rec.doHeavyIon():
doSaveFits = doSaveFits)
ZmumuMon_XpressTrig_2mu.TriggerChain = "HLT_mu4_mu4noL1"
ZmumuMon_XpressTrig_2mu.TrigDecisionTool = monTrigDecTool
- ToolSvc += ZmumuMon_XpressTrig_2mu
+ #ToolSvc += ZmumuMon_XpressTrig_2mu
if (InDetFlags.doPrintConfigurables()):
print ZmumuMon_XpressTrig_2mu
InDetDiMuMonManager.AthenaMonTools += [ ZmumuMon_XpressTrig_2mu ]
diff --git a/InnerDetector/InDetMonitoring/InDetPerformanceMonitoring/share/IDPerfMon_jobOptions.py b/InnerDetector/InDetMonitoring/InDetPerformanceMonitoring/share/IDPerfMon_jobOptions.py
index 2902259c7e75..fcc207decaf1 100644
--- a/InnerDetector/InDetMonitoring/InDetPerformanceMonitoring/share/IDPerfMon_jobOptions.py
+++ b/InnerDetector/InDetMonitoring/InDetPerformanceMonitoring/share/IDPerfMon_jobOptions.py
@@ -4,14 +4,14 @@ IDPerfMonDoOutput = False
from InDetPerformanceMonitoring.InDetPerformanceMonitoringConf import IDPerfMonZee
IDPerfMonZee_noTrig = IDPerfMonZee (name = "IDPerfMonZee_noTrig",
tracksName=InDetKeys.xAODTrackParticleContainer())# tracksName = "InDetTrackParticles")#InDetKeys.TrackParticles())
-ToolSvc += IDPerfMonZee_noTrig
+#ToolSvc += IDPerfMonZee_noTrig
if (InDetFlags.doPrintConfigurables()):
print IDPerfMonZee_noTrig
from InDetPerformanceMonitoring.InDetPerformanceMonitoringConf import IDPerfMonWenu
IDPerfMonWenu_noTrig = IDPerfMonWenu (name = "IDPerfMonWenu_noTrig",
tracksName=InDetKeys.xAODTrackParticleContainer()) # tracksName = "InDetTrackParticles")#InDetKeys.TrackParticles())
-ToolSvc += IDPerfMonWenu_noTrig
+#ToolSvc += IDPerfMonWenu_noTrig
if (InDetFlags.doPrintConfigurables()):
print IDPerfMonWenu_noTrig
@@ -59,17 +59,17 @@ else:
IDPerfMonWenu_e24_tight_L1EM20VH.TriggerChain = "HLT_e24_tight_L1EM20VH"
- ToolSvc += IDPerfMonZee_e24_medium_L1EM18VH
+ #ToolSvc += IDPerfMonZee_e24_medium_L1EM18VH
if (InDetFlags.doPrintConfigurables()):
print IDPerfMonZee_e24_medium_L1EM18VH
- ToolSvc += IDPerfMonZee_e24_tight_L1EM20VH
+ #ToolSvc += IDPerfMonZee_e24_tight_L1EM20VH
if (InDetFlags.doPrintConfigurables()):
print IDPerfMonZee_e24_tight_L1EM20VH
- ToolSvc += IDPerfMonWenu_e24_medium_L1EM18VH
+ #ToolSvc += IDPerfMonWenu_e24_medium_L1EM18VH
if (InDetFlags.doPrintConfigurables()):
print IDPerfMonWenu_e24_medium_L1EM18VH
- ToolSvc += IDPerfMonWenu_e24_tight_L1EM20VH
+ #ToolSvc += IDPerfMonWenu_e24_tight_L1EM20VH
if (InDetFlags.doPrintConfigurables()):
print IDPerfMonWenu_e24_tight_L1EM20VH
@@ -107,14 +107,14 @@ else:
IDPerfMonWenu_e15_loose_ion.TriggerChain = "HLT_e15_loose_ion"
- ToolSvc += IDPerfMonZee_e15_loose_ion
+ #ToolSvc += IDPerfMonZee_e15_loose_ion
if (InDetFlags.doPrintConfigurables()):
print IDPerfMonZee_e15_loose_ion
- ToolSvc += IDPerfMonZee_2e10_loose_ion
+ #ToolSvc += IDPerfMonZee_2e10_loose_ion
if (InDetFlags.doPrintConfigurables()):
print IDPerfMonZee_2e10_loose_ion
- ToolSvc += IDPerfMonWenu_e15_loose_ion
+ #ToolSvc += IDPerfMonWenu_e15_loose_ion
if (InDetFlags.doPrintConfigurables()):
print IDPerfMonWenu_e15_loose_ion
diff --git a/InnerDetector/InDetMonitoring/InDetPerformanceMonitoring/share/TRT_Monitoring_RecExCommonAddOn_jobOptions.py b/InnerDetector/InDetMonitoring/InDetPerformanceMonitoring/share/TRT_Monitoring_RecExCommonAddOn_jobOptions.py
index 5128256d212d..4e35201e49d0 100644
--- a/InnerDetector/InDetMonitoring/InDetPerformanceMonitoring/share/TRT_Monitoring_RecExCommonAddOn_jobOptions.py
+++ b/InnerDetector/InDetMonitoring/InDetPerformanceMonitoring/share/TRT_Monitoring_RecExCommonAddOn_jobOptions.py
@@ -42,7 +42,7 @@ TRT_Electron_Monitoring_Tool = TRT_Electron_Monitoring_Tool (
isOnline = True,
doExpert = True)
-ToolSvc += TRT_Electron_Monitoring_Tool
+#ToolSvc += TRT_Electron_Monitoring_Tool
TRTElectronMonManager.AthenaMonTools += [ TRT_Electron_Monitoring_Tool]
diff --git a/InnerDetector/InDetMonitoring/InDetPerformanceMonitoring/share/TrackMonitoring.py b/InnerDetector/InDetMonitoring/InDetPerformanceMonitoring/share/TrackMonitoring.py
index 6d4805c7162b..77939a914759 100644
--- a/InnerDetector/InDetMonitoring/InDetPerformanceMonitoring/share/TrackMonitoring.py
+++ b/InnerDetector/InDetMonitoring/InDetPerformanceMonitoring/share/TrackMonitoring.py
@@ -105,7 +105,7 @@ for trackCollection in trackCollections:
)
print InDetAlignMonResiduals
- ToolSvc += InDetAlignMonResiduals
+ #ToolSvc += InDetAlignMonResiduals
InDetAlignMonManager.AthenaMonTools += [ InDetAlignMonResiduals ]
InDetAlignMonGenericTracks = IDAlignMonGenericTracks(
@@ -116,7 +116,7 @@ for trackCollection in trackCollections:
triggerChainName = "all",
VxPrimContainerName = InDetKeys.PrimaryVertices()
)
- ToolSvc += InDetAlignMonGenericTracks
+ #ToolSvc += InDetAlignMonGenericTracks
InDetAlignMonManager.AthenaMonTools += [ InDetAlignMonGenericTracks ]
InDetAlignMonSelectedTracksEfficiencies = IDAlignMonEfficiencies (
@@ -129,7 +129,7 @@ for trackCollection in trackCollections:
SCT_Manager = InDetKeys.SCT_Manager(),
TRT_Manager = InDetKeys.TRT_Manager()
)
- ToolSvc += InDetAlignMonSelectedTracksEfficiencies
+ #ToolSvc += InDetAlignMonSelectedTracksEfficiencies
InDetAlignMonManager.AthenaMonTools += [ InDetAlignMonSelectedTracksEfficiencies ]
@@ -143,7 +143,7 @@ InDetAlignMonBeamSpot_noTrig = InDetAlignMonBeamSpot (name = "InDetAlignMonBeam
vxContainerWithBeamConstraint = InDetFlags.useBeamConstraint(),
# vxContainerWithBeamConstraint = False,
OutputLevel= 1)
-ToolSvc += InDetAlignMonBeamSpot_noTrig
+#ToolSvc += InDetAlignMonBeamSpot_noTrig
InDetAlignMonManager.AthenaMonTools += [ InDetAlignMonBeamSpot_noTrig ]
# write out BS info
diff --git a/InnerDetector/InDetMonitoring/InDetPerformanceMonitoring/share/runJPsiMonitoring.py b/InnerDetector/InDetMonitoring/InDetPerformanceMonitoring/share/runJPsiMonitoring.py
index f90a1878d15c..fea618084360 100644
--- a/InnerDetector/InDetMonitoring/InDetPerformanceMonitoring/share/runJPsiMonitoring.py
+++ b/InnerDetector/InDetMonitoring/InDetPerformanceMonitoring/share/runJPsiMonitoring.py
@@ -165,7 +165,7 @@ JpsiMon = DiMuMon(name = "JpsiMon_NoTrig",
doSaveFits = False,
OutputLevel = VERBOSE)
-ToolSvc += JpsiMon
+#ToolSvc += JpsiMon
from AthenaMonitoring.DQMonFlags import DQMonFlags
from AthenaMonitoring.AthenaMonitoringConf import AthenaMonManager
diff --git a/InnerDetector/InDetMonitoring/InDetPerformanceMonitoring/share/runJPsiMonitoring_data.py b/InnerDetector/InDetMonitoring/InDetPerformanceMonitoring/share/runJPsiMonitoring_data.py
index e631cfc846dc..55dbdb9a9568 100644
--- a/InnerDetector/InDetMonitoring/InDetPerformanceMonitoring/share/runJPsiMonitoring_data.py
+++ b/InnerDetector/InDetMonitoring/InDetPerformanceMonitoring/share/runJPsiMonitoring_data.py
@@ -209,7 +209,7 @@ JpsiMon = DiMuMon(name = "JpsiMon_NoTrig",
doSaveFits = False,
OutputLevel = VERBOSE)
-ToolSvc += JpsiMon
+#ToolSvc += JpsiMon
from AthenaMonitoring.DQMonFlags import DQMonFlags
from AthenaMonitoring.AthenaMonitoringConf import AthenaMonManager
diff --git a/InnerDetector/InDetMonitoring/InDetPerformanceMonitoring/share/runJPsiMonitoring_data_grid.py b/InnerDetector/InDetMonitoring/InDetPerformanceMonitoring/share/runJPsiMonitoring_data_grid.py
index e8a2b27baa05..6ccaaa845876 100644
--- a/InnerDetector/InDetMonitoring/InDetPerformanceMonitoring/share/runJPsiMonitoring_data_grid.py
+++ b/InnerDetector/InDetMonitoring/InDetPerformanceMonitoring/share/runJPsiMonitoring_data_grid.py
@@ -209,7 +209,7 @@ JpsiMon = DiMuMon(name = "JpsiMon_NoTrig",
doSaveFits = False,
OutputLevel = VERBOSE)
-ToolSvc += JpsiMon
+#ToolSvc += JpsiMon
from AthenaMonitoring.DQMonFlags import DQMonFlags
from AthenaMonitoring.AthenaMonitoringConf import AthenaMonManager
diff --git a/InnerDetector/InDetMonitoring/InDetPerformanceMonitoring/share/runKShortValidation.py b/InnerDetector/InDetMonitoring/InDetPerformanceMonitoring/share/runKShortValidation.py
index 826ec5c782b1..e2cc543b8498 100644
--- a/InnerDetector/InDetMonitoring/InDetPerformanceMonitoring/share/runKShortValidation.py
+++ b/InnerDetector/InDetMonitoring/InDetPerformanceMonitoring/share/runKShortValidation.py
@@ -156,7 +156,7 @@ iDPerfMonKshort = IDPerfMonKshort(name = 'IDPerfMonKshort',
VxPrimContainerName = "PrimaryVertices",
OutputLevel = DEBUG)
-ToolSvc += iDPerfMonKshort
+#ToolSvc += iDPerfMonKshort
from AthenaMonitoring.DQMonFlags import DQMonFlags
from AthenaMonitoring.AthenaMonitoringConf import AthenaMonManager
diff --git a/InnerDetector/InDetMonitoring/InDetPerformanceMonitoring/share/runKShortValidation_grid.py b/InnerDetector/InDetMonitoring/InDetPerformanceMonitoring/share/runKShortValidation_grid.py
index 56f6c4a7d3c9..bbd5535cde07 100644
--- a/InnerDetector/InDetMonitoring/InDetPerformanceMonitoring/share/runKShortValidation_grid.py
+++ b/InnerDetector/InDetMonitoring/InDetPerformanceMonitoring/share/runKShortValidation_grid.py
@@ -156,7 +156,7 @@ iDPerfMonKshort = IDPerfMonKshort(name = 'IDPerfMonKshort',
VxPrimContainerName = "PrimaryVertices",
OutputLevel = DEBUG)
-ToolSvc += iDPerfMonKshort
+#ToolSvc += iDPerfMonKshort
from AthenaMonitoring.DQMonFlags import DQMonFlags
from AthenaMonitoring.AthenaMonitoringConf import AthenaMonManager
diff --git a/InnerDetector/InDetMonitoring/InDetPerformanceMonitoring/share/runMonitoringZmumuValidation.py b/InnerDetector/InDetMonitoring/InDetPerformanceMonitoring/share/runMonitoringZmumuValidation.py
index 2a11112a3304..c396b8617334 100644
--- a/InnerDetector/InDetMonitoring/InDetPerformanceMonitoring/share/runMonitoringZmumuValidation.py
+++ b/InnerDetector/InDetMonitoring/InDetPerformanceMonitoring/share/runMonitoringZmumuValidation.py
@@ -166,7 +166,7 @@ ZmumuMon = DiMuMon (name = "ZmumuMon_NoTrig",
doSaveFits = False,
OutputLevel = VERBOSE)
-ToolSvc += ZmumuMon
+#ToolSvc += ZmumuMon
from AthenaMonitoring.DQMonFlags import DQMonFlags
from AthenaMonitoring.AthenaMonitoringConf import AthenaMonManager
diff --git a/InnerDetector/InDetMonitoring/InDetPerformanceMonitoring/share/runMonitoringZmumuValidation_data.py b/InnerDetector/InDetMonitoring/InDetPerformanceMonitoring/share/runMonitoringZmumuValidation_data.py
index 51ca83cbdebf..82b11748409f 100644
--- a/InnerDetector/InDetMonitoring/InDetPerformanceMonitoring/share/runMonitoringZmumuValidation_data.py
+++ b/InnerDetector/InDetMonitoring/InDetPerformanceMonitoring/share/runMonitoringZmumuValidation_data.py
@@ -154,7 +154,7 @@ ZmumuMon = DiMuMon (name = "ZmumuMon_NoTrig",
doSaveFits = False,
OutputLevel = DEBUG)
-ToolSvc += ZmumuMon
+#ToolSvc += ZmumuMon
from AthenaMonitoring.DQMonFlags import DQMonFlags
from AthenaMonitoring.AthenaMonitoringConf import AthenaMonManager
diff --git a/InnerDetector/InDetMonitoring/InDetPerformanceMonitoring/share/runzmumu_runallmonitoring.py b/InnerDetector/InDetMonitoring/InDetPerformanceMonitoring/share/runzmumu_runallmonitoring.py
index 3b6462ed756c..770e6b404725 100644
--- a/InnerDetector/InDetMonitoring/InDetPerformanceMonitoring/share/runzmumu_runallmonitoring.py
+++ b/InnerDetector/InDetMonitoring/InDetPerformanceMonitoring/share/runzmumu_runallmonitoring.py
@@ -182,7 +182,7 @@ if dimuonmon == True:
doSaveFits = False,
# setDebug = True,
OutputLevel = INFO)
- ToolSvc += ZmumuMon
+ #ToolSvc += ZmumuMon
from AthenaMonitoring.DQMonFlags import DQMonFlags
from AthenaMonitoring.AthenaMonitoringConf import AthenaMonManager
diff --git a/InnerDetector/InDetMonitoring/SCT_Monitoring/share/SCTMonitor_topOptions.py b/InnerDetector/InDetMonitoring/SCT_Monitoring/share/SCTMonitor_topOptions.py
index 9689976b5580..97d95b20c35a 100644
--- a/InnerDetector/InDetMonitoring/SCT_Monitoring/share/SCTMonitor_topOptions.py
+++ b/InnerDetector/InDetMonitoring/SCT_Monitoring/share/SCTMonitor_topOptions.py
@@ -71,7 +71,7 @@ from SCT_Monitoring.SCT_MonitoringConf import SCTInitialiseTool
SCTInitTool = SCTInitialiseTool (
name = "SCTInitialiseTool"
)
-ToolSvc += SCTInitTool
+#ToolSvc += SCTInitTool
SCTMonMan.AthenaMonTools += [SCTInitTool]
#from AthenaCommon.AppMgr import ToolSvc as toolSvc
@@ -89,7 +89,7 @@ SCTHitsTool.tracksName=InDetKeys.SCTTracks()
#SCTHitsTool.tracksName="ExtendedTracks"
-ToolSvc += SCTHitsTool
+#ToolSvc += SCTHitsTool
SCTMonMan.AthenaMonTools += [SCTHitsTool]
from SCT_Monitoring.SCT_MonitoringConf import SCTTracksMonTool
@@ -105,7 +105,7 @@ SCTTracksMonTool.CheckRate= 1000;
SCTTracksMonTool.doPositiveEndcap= True;
SCTTracksMonTool.doNegativeEndcap= True;
SCTTracksMonTool.doUnbiasedCalc= True;
-ToolSvc += SCTTracksMonTool;
+#ToolSvc += SCTTracksMonTool;
SCTMonMan.AthenaMonTools += [SCTTracksMonTool]
from SCT_Monitoring.SCT_MonitoringConf import SCTErrMonTool
@@ -117,7 +117,7 @@ SCTErrMonTool.histoPathBase="/stat";
SCTErrMonTool.CheckRate= 1000;
SCTErrMonTool.doPositiveEndcap= True;
SCTErrMonTool.doNegativeEndcap= True;
-ToolSvc += SCTErrMonTool;
+#ToolSvc += SCTErrMonTool;
SCTMonMan.AthenaMonTools +=[SCTErrMonTool]
@@ -154,7 +154,7 @@ if (InDetFlags.doPrintConfigurables()):
SCTHitEffMonTool.HoleSearch=SCT_MonHoleSearch
if globalflags.DataSource != "data":
SCTHitEffMonTool.IsSim = True
-ToolSvc+=SCTHitEffMonTool
+#ToolSvc+=SCTHitEffMonTool
SCTMonMan.AthenaMonTools += [SCTHitEffMonTool]
from SCT_Monitoring.SCT_MonitoringConf import SCTTimeDependentMonTool
diff --git a/InnerDetector/InDetValidation/InDetPhysValMonitoring/run/PhysValITk_jobOptions.py b/InnerDetector/InDetValidation/InDetPhysValMonitoring/run/PhysValITk_jobOptions.py
index 3c7f1523cd18..1d0a386e0fea 100644
--- a/InnerDetector/InDetValidation/InDetPhysValMonitoring/run/PhysValITk_jobOptions.py
+++ b/InnerDetector/InDetValidation/InDetPhysValMonitoring/run/PhysValITk_jobOptions.py
@@ -214,7 +214,7 @@ InDetPhysValMonitoringTool.TruthParticleContainerName = "TruthParticles"
# this will run over hardscatter tracks only:
#InDetPhysValMonitoringTool.PileupSwitch = "HardScatter"
InDetPhysValMonitoringTool.OutputLevel = INFO
-ToolSvc += InDetPhysValMonitoringTool
+#ToolSvc += InDetPhysValMonitoringTool
monMan.AthenaMonTools += [InDetPhysValMonitoringTool]
diff --git a/InnerDetector/InDetValidation/PixelRTT/share/PixelRTT_DigitizationValidation.py b/InnerDetector/InDetValidation/PixelRTT/share/PixelRTT_DigitizationValidation.py
index 3e0e806bda15..768262bf277a 100644
--- a/InnerDetector/InDetValidation/PixelRTT/share/PixelRTT_DigitizationValidation.py
+++ b/InnerDetector/InDetValidation/PixelRTT/share/PixelRTT_DigitizationValidation.py
@@ -127,7 +127,7 @@ monMan = AthenaMonManager( "PixelMonManager" )
from PixelMonitoring.PixelMonitoringConf import *
PixelMainsMon=PixelMainMon()
-ToolSvc += PixelMainsMon
+#ToolSvc += PixelMainsMon
monMan.AthenaMonTools += [ PixelMainsMon ]
print PixelMainsMon
diff --git a/InnerDetector/InDetValidation/PixelRTT/share/PixelRTT_SimulationValidation.py b/InnerDetector/InDetValidation/PixelRTT/share/PixelRTT_SimulationValidation.py
index 391db092dbe3..d66994542818 100644
--- a/InnerDetector/InDetValidation/PixelRTT/share/PixelRTT_SimulationValidation.py
+++ b/InnerDetector/InDetValidation/PixelRTT/share/PixelRTT_SimulationValidation.py
@@ -207,7 +207,7 @@ monMan = AthenaMonManager( "PixelMonManager" )
from PixelMonitoring.PixelMonitoringConf import *
PixelMainsMon=PixelMainMon()
-ToolSvc += PixelMainsMon
+#ToolSvc += PixelMainsMon
monMan.AthenaMonTools += [ PixelMainsMon ]
print PixelMainsMon
diff --git a/LArCalorimeter/LArCafJobs/share/skeleton.LArNoise_fromraw.py b/LArCalorimeter/LArCafJobs/share/skeleton.LArNoise_fromraw.py
index ad0f4dc6367a..3db84b6326d3 100644
--- a/LArCalorimeter/LArCafJobs/share/skeleton.LArNoise_fromraw.py
+++ b/LArCalorimeter/LArCafJobs/share/skeleton.LArNoise_fromraw.py
@@ -313,7 +313,7 @@ if hasattr(runArgs,"outputHIST_LARNOISEFile"):
theLArNoisyROMon.doHisto = True
#theLArNoisyROMon.OutputLevel = DEBUG
- ToolSvc += theLArNoisyROMon
+ #ToolSvc += theLArNoisyROMon
from AthenaMonitoring.AthenaMonitoringConf import AthenaMonManager
larRawMon=False
larESDMon=True
diff --git a/LArCalorimeter/LArMonTools/share/LArAffectedRegions_jobOptions.py b/LArCalorimeter/LArMonTools/share/LArAffectedRegions_jobOptions.py
index 0ec5810a22d7..be4e8df6b4cf 100644
--- a/LArCalorimeter/LArMonTools/share/LArAffectedRegions_jobOptions.py
+++ b/LArCalorimeter/LArMonTools/share/LArAffectedRegions_jobOptions.py
@@ -11,5 +11,5 @@ theLArAffectedRegions = LArAffectedRegions(name="LArAffectedRegions",
ProcessNEvents = EventBlockSize,
IsOnline = athenaCommonFlags.isOnline()
)
-ToolSvc += theLArAffectedRegions
+#ToolSvc += theLArAffectedRegions
LArMon.AthenaMonTools+=[ theLArAffectedRegions ]
diff --git a/LArCalorimeter/LArMonTools/share/LArCollisionTimeMonTool_jobOptions.py b/LArCalorimeter/LArMonTools/share/LArCollisionTimeMonTool_jobOptions.py
index d30e83ce2281..1f4183b57fda 100755
--- a/LArCalorimeter/LArMonTools/share/LArCollisionTimeMonTool_jobOptions.py
+++ b/LArCalorimeter/LArMonTools/share/LArCollisionTimeMonTool_jobOptions.py
@@ -47,6 +47,6 @@ LArCluCollTimeMonTool=LArCollisionTimeMonTool(Key="ClusterCollTime",
# --- register with toolservice ---
-ToolSvc += [LArCollisionTimeMon,LArCluCollTimeMonTool]
+#ToolSvc += [LArCollisionTimeMon,LArCluCollTimeMonTool]
LArMon.AthenaMonTools+=[ LArCollisionTimeMon,LArCluCollTimeMonTool ]
diff --git a/LArCalorimeter/LArMonTools/share/LArCosmicsMonTool_jobOptions.py b/LArCalorimeter/LArMonTools/share/LArCosmicsMonTool_jobOptions.py
index 7202e20a15ac..ab537b3c1e33 100755
--- a/LArCalorimeter/LArMonTools/share/LArCosmicsMonTool_jobOptions.py
+++ b/LArCalorimeter/LArMonTools/share/LArCosmicsMonTool_jobOptions.py
@@ -17,7 +17,7 @@ theLArCosmicsMonTool = LArCosmicsMonTool(name="LArCosmicsMonTool",
theLArCosmicsMonTool.LArPedestalKey='LArPedestal'
-ToolSvc += theLArCosmicsMonTool
+#ToolSvc += theLArCosmicsMonTool
LArMon.AthenaMonTools+=[ theLArCosmicsMonTool ]
diff --git a/LArCalorimeter/LArMonTools/share/LArCoverage_jobOptions.py b/LArCalorimeter/LArMonTools/share/LArCoverage_jobOptions.py
index 107cee42bada..559231056239 100755
--- a/LArCalorimeter/LArMonTools/share/LArCoverage_jobOptions.py
+++ b/LArCalorimeter/LArMonTools/share/LArCoverage_jobOptions.py
@@ -10,7 +10,7 @@ theLArCoverage = LArCoverage(name="LArCoverage",
LArBadChannelMask = theLArBadChannelsMasker,
Nevents = 40
)
-ToolSvc += theLArCoverage
+#ToolSvc += theLArCoverage
LArMon.AthenaMonTools+=[ theLArCoverage ]
# BadChannelTool configuration
@@ -18,11 +18,11 @@ from LArBadChannelTool.LArBadChannelToolConf import LArBadChanTool
theLArBadChannelTool=LArBadChanTool()
theLArBadChannelTool.ReadFromASCII=False
ToolSvc+=theLArBadChannelTool
-ToolSvc.LArCoverage.LArBadChannelTool=theLArBadChannelTool
+LArCoverage.LArBadChannelTool=theLArBadChannelTool
# CaloNoiseTool configuration
from CaloTools.CaloNoiseToolDefault import CaloNoiseToolDefault
theLArCoverageCaloNoiseTool=CaloNoiseToolDefault()
ToolSvc+=theLArCoverageCaloNoiseTool
-ToolSvc.LArCoverage.LArCaloNoiseTool=theLArCoverageCaloNoiseTool
+LArCoverage.LArCaloNoiseTool=theLArCoverageCaloNoiseTool
diff --git a/LArCalorimeter/LArMonTools/share/LArDigitMon_jobOptions.py b/LArCalorimeter/LArMonTools/share/LArDigitMon_jobOptions.py
index b53662da5c69..53e50475097b 100644
--- a/LArCalorimeter/LArMonTools/share/LArDigitMon_jobOptions.py
+++ b/LArCalorimeter/LArMonTools/share/LArDigitMon_jobOptions.py
@@ -51,7 +51,7 @@ theLArDigitMon = LArDigitMon(name="LArDigitMon",
theLArDigitMon.LArPedestalKey='LArPedestal'
-ToolSvc += theLArDigitMon
+#ToolSvc += theLArDigitMon
LArMon.AthenaMonTools+=[ theLArDigitMon ]
diff --git a/LArCalorimeter/LArMonTools/share/LArFEBMon_calibEMB_jobOptions.py b/LArCalorimeter/LArMonTools/share/LArFEBMon_calibEMB_jobOptions.py
index 4c05a18713e4..38d2afc96924 100644
--- a/LArCalorimeter/LArMonTools/share/LArFEBMon_calibEMB_jobOptions.py
+++ b/LArCalorimeter/LArMonTools/share/LArFEBMon_calibEMB_jobOptions.py
@@ -12,7 +12,7 @@ theLArFEBMon = LArFEBMon(name="LArFEBMon",
IgnoreMissingHeaderPS = False,
IgnoreMissingHeaderEMB = False
)
-ToolSvc += theLArFEBMon
+#ToolSvc += theLArFEBMon
LArMon.AthenaMonTools+=[ theLArFEBMon ]
# BadChannelTool configuration
@@ -20,7 +20,7 @@ from LArBadChannelTool.LArBadChannelToolConf import LArBadChanTool
theLArBadChannelTool=LArBadChanTool()
theLArBadChannelTool.ReadFromASCII=False
ToolSvc+=theLArBadChannelTool
-ToolSvc.LArFEBMon.LArBadChannelTool=theLArBadChannelTool
+LArFEBMon.LArBadChannelTool=theLArBadChannelTool
#to change an option later, do e.g
#ToolSvc.LArFEBMon.maxOfTimingHisto =100
diff --git a/LArCalorimeter/LArMonTools/share/LArFEBMon_calibPS_jobOptions.py b/LArCalorimeter/LArMonTools/share/LArFEBMon_calibPS_jobOptions.py
index 05612b1b3a63..55e3efa8b84c 100644
--- a/LArCalorimeter/LArMonTools/share/LArFEBMon_calibPS_jobOptions.py
+++ b/LArCalorimeter/LArMonTools/share/LArFEBMon_calibPS_jobOptions.py
@@ -12,7 +12,7 @@ theLArFEBMon = LArFEBMon(name="LArFEBMon",
IgnoreMissingHeaderPS = False,
IgnoreMissingHeaderEMB = True
)
-ToolSvc += theLArFEBMon
+#ToolSvc += theLArFEBMon
LArMon.AthenaMonTools+=[ theLArFEBMon ]
# BadChannelTool configuration
@@ -20,7 +20,7 @@ from LArBadChannelTool.LArBadChannelToolConf import LArBadChanTool
theLArBadChannelTool=LArBadChanTool()
theLArBadChannelTool.ReadFromASCII=False
ToolSvc+=theLArBadChannelTool
-ToolSvc.LArFEBMon.LArBadChannelTool=theLArBadChannelTool
+LArFEBMon.LArBadChannelTool=theLArBadChannelTool
#to change an option later, do e.g
#ToolSvc.LArFEBMon.maxOfTimingHisto =100
diff --git a/LArCalorimeter/LArMonTools/share/LArFEBMon_jobOptions.py b/LArCalorimeter/LArMonTools/share/LArFEBMon_jobOptions.py
index 963fc86abdc5..7fd60162092b 100755
--- a/LArCalorimeter/LArMonTools/share/LArFEBMon_jobOptions.py
+++ b/LArCalorimeter/LArMonTools/share/LArFEBMon_jobOptions.py
@@ -23,7 +23,7 @@ theLArFEBMon = LArFEBMon(name="LArFEBMon",
keyDSPThresholds = keyDSPThr,
IsOnline = OnlineMode
)
-ToolSvc += theLArFEBMon
+#ToolSvc += theLArFEBMon
LArMon.AthenaMonTools+=[ theLArFEBMon ]
# BadChannelTool configuration
@@ -31,7 +31,7 @@ from LArBadChannelTool.LArBadChannelToolConf import LArBadChanTool
theLArBadChannelTool=LArBadChanTool()
theLArBadChannelTool.ReadFromASCII=False
ToolSvc+=theLArBadChannelTool
-ToolSvc.LArFEBMon.LArBadChannelTool=theLArBadChannelTool
+LArFEBMon.LArBadChannelTool=theLArBadChannelTool
#to change an option later, do e.g
#ToolSvc.LArFEBMon.maxOfTimingHisto =100
diff --git a/LArCalorimeter/LArMonTools/share/LArHVCorrectionMonTool_jobOptions.py b/LArCalorimeter/LArMonTools/share/LArHVCorrectionMonTool_jobOptions.py
index afb699fed6ef..fd59b161c941 100644
--- a/LArCalorimeter/LArMonTools/share/LArHVCorrectionMonTool_jobOptions.py
+++ b/LArCalorimeter/LArMonTools/share/LArHVCorrectionMonTool_jobOptions.py
@@ -13,6 +13,6 @@ theLArHVCorrTool=LArHVCorrToolDefault()
ToolSvc+=theLArHVCorrTool
theLArHVCorrectionMonTool.HVCorrTool = theLArHVCorrTool
-ToolSvc += theLArHVCorrectionMonTool
+#ToolSvc += theLArHVCorrectionMonTool
LArMon.AthenaMonTools+=[ theLArHVCorrectionMonTool ]
diff --git a/LArCalorimeter/LArMonTools/share/LArNoiseMonTools_jobOptions.py b/LArCalorimeter/LArMonTools/share/LArNoiseMonTools_jobOptions.py
index 099afd11ad0e..da016a6b05fb 100755
--- a/LArCalorimeter/LArMonTools/share/LArNoiseMonTools_jobOptions.py
+++ b/LArCalorimeter/LArMonTools/share/LArNoiseMonTools_jobOptions.py
@@ -16,7 +16,7 @@ theLArFebNoiseMonTool = LArFebNoiseMonTool(name="LArFebNoiseMonTool",
## SingleTriggerSlot = 1
)
-ToolSvc += theLArFebNoiseMonTool
+#ToolSvc += theLArFebNoiseMonTool
LArMon.AthenaMonTools+=[ theLArFebNoiseMonTool ]
# ToolSvc.LArFebNoiseMonTool.OutputLevel=DEBUG
@@ -34,7 +34,7 @@ theLArFebNoiseMonToolAlt = LArFebNoiseMonTool(name="LArFebNoiseMonToolAlt",
## SingleTriggerSlot = 1
)
-ToolSvc += theLArFebNoiseMonToolAlt
+#ToolSvc += theLArFebNoiseMonToolAlt
LArMon.AthenaMonTools+=[ theLArFebNoiseMonToolAlt ]
# ToolSvc.LArFebNoiseMonToolAlt.OutputLevel=DEBUG
diff --git a/LArCalorimeter/LArMonTools/share/LArNoisyROMon_jobOptions.py b/LArCalorimeter/LArMonTools/share/LArNoisyROMon_jobOptions.py
index b4df2a108e71..fc77b15b8c35 100644
--- a/LArCalorimeter/LArMonTools/share/LArNoisyROMon_jobOptions.py
+++ b/LArCalorimeter/LArMonTools/share/LArNoisyROMon_jobOptions.py
@@ -63,5 +63,5 @@ if rec.doTrigger or LArNoisyROMonForceTrigger:
else:
theLArNoisyROMon.doTrigger = False
-ToolSvc += theLArNoisyROMon
+#ToolSvc += theLArNoisyROMon
LArMon.AthenaMonTools += [theLArNoisyROMon]
diff --git a/LArCalorimeter/LArMonTools/share/LArNoisyROMon_standalone.py b/LArCalorimeter/LArMonTools/share/LArNoisyROMon_standalone.py
index 04ca306ebd80..9b87160e8c9e 100644
--- a/LArCalorimeter/LArMonTools/share/LArNoisyROMon_standalone.py
+++ b/LArCalorimeter/LArMonTools/share/LArNoisyROMon_standalone.py
@@ -164,7 +164,7 @@ theLArNoisyROMon.BadFEBCut = larNoisyROFlags.BadFEBCut() #LArNoisyROFEBCutHelper
theLArNoisyROMon.doTrigger = False
theLArNoisyROMon.doHisto = False
-ToolSvc += theLArNoisyROMon
+#ToolSvc += theLArNoisyROMon
LArMon.AthenaMonTools += [theLArNoisyROMon]
#########
diff --git a/LArCalorimeter/LArMonTools/share/LArOddCellsMonTool_jobOptions.py b/LArCalorimeter/LArMonTools/share/LArOddCellsMonTool_jobOptions.py
index 7362ac50b71a..234b2ae7bd33 100755
--- a/LArCalorimeter/LArMonTools/share/LArOddCellsMonTool_jobOptions.py
+++ b/LArCalorimeter/LArMonTools/share/LArOddCellsMonTool_jobOptions.py
@@ -68,7 +68,7 @@ if DQMonFlags.useTrigger() and not athenaCommonFlags.isOnline():
if StreamFromFile=='express':
theLArOddCellsMonTool.monitoredStreams=["RNDM"]
-ToolSvc += theLArOddCellsMonTool
+#ToolSvc += theLArOddCellsMonTool
LArMon.AthenaMonTools+=[ theLArOddCellsMonTool ]
@@ -93,7 +93,7 @@ if (MaskBadChannel) :
"highNoiseHG","highNoiseMG","highNoiseLG"
]
ToolSvc+=theLArOddCellsMasker
- ToolSvc.LArOddCellsMonTool.LArBadChannelMask=theLArOddCellsMasker
+ LArOddCellsMonTool.LArBadChannelMask=theLArOddCellsMasker
#ToolSvc.LArOddCellsMonTool.OutputLevel = DEBUG
diff --git a/LArCalorimeter/LArMonTools/share/LArRODMonTool_jobOptions.py b/LArCalorimeter/LArMonTools/share/LArRODMonTool_jobOptions.py
index fe66877dcb9b..4a05a843f723 100755
--- a/LArCalorimeter/LArMonTools/share/LArRODMonTool_jobOptions.py
+++ b/LArCalorimeter/LArMonTools/share/LArRODMonTool_jobOptions.py
@@ -125,7 +125,7 @@ theLArRODMonTool.LArPedestalKey='LArPedestal'
from LArRecUtils.LArADC2MeVToolDefault import LArADC2MeVToolDefault
theLArRODMonTool.ADC2MeVTool=LArADC2MeVToolDefault()
-ToolSvc += theLArRODMonTool
+#ToolSvc += theLArRODMonTool
LArMon.AthenaMonTools+=[ theLArRODMonTool ]
#theLArRODMonTool.OutputLevel = DEBUG
diff --git a/LArCalorimeter/LArMonTools/share/LArRawChannelMonTool_jobOptions.py b/LArCalorimeter/LArMonTools/share/LArRawChannelMonTool_jobOptions.py
index a57bf84d92b6..e35295c70d4f 100755
--- a/LArCalorimeter/LArMonTools/share/LArRawChannelMonTool_jobOptions.py
+++ b/LArCalorimeter/LArMonTools/share/LArRawChannelMonTool_jobOptions.py
@@ -166,5 +166,5 @@ if DQMonFlags.useTrigger() and not athenaCommonFlags.isOnline():
LArRawChannelMon.TriggerChain= LArRawChannelMonTool_TriggerChain
# --- register with toolservice ---
-ToolSvc += LArRawChannelMon
+#ToolSvc += LArRawChannelMon
LArMon.AthenaMonTools+=[ LArRawChannelMon ]
diff --git a/MuonSpectrometer/MuonCalib/CscCalib/CscCalibAlgs/share/CscCalcPedMon.py b/MuonSpectrometer/MuonCalib/CscCalib/CscCalibAlgs/share/CscCalcPedMon.py
index d51b03feaeeb..1a0485feb46e 100644
--- a/MuonSpectrometer/MuonCalib/CscCalib/CscCalibAlgs/share/CscCalcPedMon.py
+++ b/MuonSpectrometer/MuonCalib/CscCalib/CscCalibAlgs/share/CscCalcPedMon.py
@@ -200,7 +200,7 @@ monMan.LumiBlock = 1
from MuonCalibMonitoring.MuonCalibMonitoringConf import CscCalibMonToolPed
CscCalibMonTool = CscCalibMonToolPed ("CscCalibMonToolPed" )
-ToolSvc += CscCalibMonTool
+#ToolSvc += CscCalibMonTool
monMan.AthenaMonTools += [CscCalibMonTool]
CscCalibMonTool.GetDebugForAllChannels = False
CscCalibMonTool.StatusReportFileName = outputPre + "CalibReport.txt"
diff --git a/MuonSpectrometer/MuonCalib/CscCalib/CscCalibAlgs/share/CscCalcSlopeMon.py b/MuonSpectrometer/MuonCalib/CscCalib/CscCalibAlgs/share/CscCalcSlopeMon.py
index 4fcc24014f74..a01d39913eb8 100644
--- a/MuonSpectrometer/MuonCalib/CscCalib/CscCalibAlgs/share/CscCalcSlopeMon.py
+++ b/MuonSpectrometer/MuonCalib/CscCalib/CscCalibAlgs/share/CscCalcSlopeMon.py
@@ -161,7 +161,7 @@ from MuonCalibMonitoring.MuonCalibMonitoringConf import CscCalibMonToolSlope
CscCalibMonTool = CscCalibMonToolSlope (
name = "CscCalibMonToolSlope"
)
-ToolSvc += CscCalibMonTool
+#ToolSvc += CscCalibMonTool
##CscCalibMonTool.OutputLevel = DEBUG
monMan.AthenaMonTools += [CscCalibMonTool]
#Conditions DB service
@@ -170,7 +170,7 @@ monMan.AthenaMonTools += [CscCalibMonTool]
from MuonCondSvc.CscCondDB import cscCondDB
cscCondDB.addPedFolders() #Set to read pedestal and noise folders from the database
cscCondDB.addPSlopeFolder() #Set to read slope folder from database
-#if(ToolSvc.CscRdoContByteStreamTool.IsCosmicData) :
+#if(#ToolSvc.CscRdoContByteStreamTool.IsCosmicData) :
# cscCondDB.overrideBaseTag('Csc-cosmic-DEFAULTCOND')
diff --git a/MuonSpectrometer/MuonValidation/MuonDQA/MuonDQAMonitoring/scripts/muondqamonitoring.sh b/MuonSpectrometer/MuonValidation/MuonDQA/MuonDQAMonitoring/scripts/muondqamonitoring.sh
index 38360e65e892..b3c9fd378754 100755
--- a/MuonSpectrometer/MuonValidation/MuonDQA/MuonDQAMonitoring/scripts/muondqamonitoring.sh
+++ b/MuonSpectrometer/MuonValidation/MuonDQA/MuonDQAMonitoring/scripts/muondqamonitoring.sh
@@ -488,21 +488,21 @@ ServiceMgr += CfgMgr.MessageSvc( Format = "% F%50W%S%7W%R%T %0W%M",
# NEED A REAL FIX
#---------------------------------------------------------------------------
if MuonDQAFlags.doMuonHitMon:
- ToolSvc += CfgMgr.MDTRawDataValAlg(OutputLevel = INFO)
- ToolSvc += CfgMgr.RPCRawDataValAlg(OutputLevel = INFO)
- ToolSvc += CfgMgr.MDTvsRPCRawDataValAlg(OutputLevel = INFO)
- ToolSvc += CfgMgr.RPCLV1RawDataValAlg(OutputLevel = INFO)
- ToolSvc += CfgMgr.TGCRawDataValAlg(OutputLevel = INFO)
+ #ToolSvc += CfgMgr.MDTRawDataValAlg(OutputLevel = INFO)
+ #ToolSvc += CfgMgr.RPCRawDataValAlg(OutputLevel = INFO)
+ #ToolSvc += CfgMgr.MDTvsRPCRawDataValAlg(OutputLevel = INFO)
+ #ToolSvc += CfgMgr.RPCLV1RawDataValAlg(OutputLevel = INFO)
+ #ToolSvc += CfgMgr.TGCRawDataValAlg(OutputLevel = INFO)
if MuonDQAFlags.doCSCMon:
- ToolSvc += CfgMgr.CSCPRDMonTool(OutputLevel = INFO)
- ToolSvc += CfgMgr.CSCRDOMonTool(OutputLevel = INFO)
+ #ToolSvc += CfgMgr.CSCPRDMonTool(OutputLevel = INFO)
+ #ToolSvc += CfgMgr.CSCRDOMonTool(OutputLevel = INFO)
if MuonDQAFlags.doMuonSegmMon:
- ToolSvc += CfgMgr.MuonSegmValidation(OutputLevel = INFO)
+ #ToolSvc += CfgMgr.MuonSegmValidation(OutputLevel = INFO)
if MuonDQAFlags.doMuonTrackMon:
- ToolSvc += CfgMgr.MuonTrackValidation(OutputLevel = INFO)
- ToolSvc += CfgMgr.MuonAlignMonGenericTracks(OutputLevel = INFO)
+ #ToolSvc += CfgMgr.MuonTrackValidation(OutputLevel = INFO)
+ #ToolSvc += CfgMgr.MuonAlignMonGenericTracks(OutputLevel = INFO)
Service( "THistSvc" ).OutputLevel = WARNING
#---------------------------------------------------------------------------
diff --git a/MuonSpectrometer/MuonValidation/MuonDQA/MuonDQAMonitoring/share/MuonDQAMonitoring_CommRunsTier0.py b/MuonSpectrometer/MuonValidation/MuonDQA/MuonDQAMonitoring/share/MuonDQAMonitoring_CommRunsTier0.py
index cb444c2bd071..a91288b8a4ba 100644
--- a/MuonSpectrometer/MuonValidation/MuonDQA/MuonDQAMonitoring/share/MuonDQAMonitoring_CommRunsTier0.py
+++ b/MuonSpectrometer/MuonValidation/MuonDQA/MuonDQAMonitoring/share/MuonDQAMonitoring_CommRunsTier0.py
@@ -464,47 +464,47 @@ if MuonDQAFlags.doCallgrind:
# -------------------------------------------------------------
# --------------For RawData Monitoring----------------------------
if MuonDQAFlags.doMuonHitMon:
- ToolSvc += CfgMgr.MDTRawDataBSValAlg(OutputLevel = INFO)
- ToolSvc += CfgMgr.MDTRawDataESDValAlg(OutputLevel = INFO)
- ToolSvc += CfgMgr.RPCRawDataValAlg(OutputLevel = INFO)
- ToolSvc += CfgMgr.MDTvsRPCRawDataValAlg(OutputLevel = INFO)
- ToolSvc += CfgMgr.RPCLV1RawDataValAlg(OutputLevel = INFO)
- ToolSvc += CfgMgr.TGCRawDataESDValAlg(OutputLevel = INFO)
- ToolSvc += CfgMgr.TGCLV1RawDataESDValAlg(OutputLevel = INFO)
- ToolSvc += CfgMgr.MDTvsTGCRawDataESDValAlg(OutputLevel = INFO)
+ #ToolSvc += CfgMgr.MDTRawDataBSValAlg(OutputLevel = INFO)
+ #ToolSvc += CfgMgr.MDTRawDataESDValAlg(OutputLevel = INFO)
+ #ToolSvc += CfgMgr.RPCRawDataValAlg(OutputLevel = INFO)
+ #ToolSvc += CfgMgr.MDTvsRPCRawDataValAlg(OutputLevel = INFO)
+ #ToolSvc += CfgMgr.RPCLV1RawDataValAlg(OutputLevel = INFO)
+ #ToolSvc += CfgMgr.TGCRawDataESDValAlg(OutputLevel = INFO)
+ #ToolSvc += CfgMgr.TGCLV1RawDataESDValAlg(OutputLevel = INFO)
+ #ToolSvc += CfgMgr.MDTvsTGCRawDataESDValAlg(OutputLevel = INFO)
if MuonDQAFlags.doCSCMon:
- ToolSvc += CfgMgr.CSCPrdValAlg(OutputLevel = INFO)
- ToolSvc += CfgMgr.CSCRdoValAlg(OutputLevel = INFO)
- ToolSvc += CfgMgr.CSCClusterTree(OutputLevel = INFO)
- ToolSvc += CfgMgr.CSCClusterValAlg(OutputLevel = INFO)
+ #ToolSvc += CfgMgr.CSCPrdValAlg(OutputLevel = INFO)
+ #ToolSvc += CfgMgr.CSCRdoValAlg(OutputLevel = INFO)
+ #ToolSvc += CfgMgr.CSCClusterTree(OutputLevel = INFO)
+ #ToolSvc += CfgMgr.CSCClusterValAlg(OutputLevel = INFO)
# --------------For MuonSegment Monitoring------------------------
if MuonDQAFlags.doMuonSegmMon:
- ToolSvc += CfgMgr.MuonSegmValidation(OutputLevel = INFO)
+ #ToolSvc += CfgMgr.MuonSegmValidation(OutputLevel = INFO)
# --------------For MuonTrk Alignment Monitoring------------------------
if MuonDQAFlags.doMuonTrkAlignMon:
- ToolSvc += CfgMgr.MuonAlignValidation(OutputLevel = INFO)
+ #ToolSvc += CfgMgr.MuonAlignValidation(OutputLevel = INFO)
# --------------For MuonTrk Monitoring----------------------------
# --------------For No Trigger MuonTrk Monitoring-----------------
if MuonDQAFlags.doMuonTrackMon and not MuonDQAFlags.MuonTrkMonDoTrigger:
- ToolSvc += CfgMgr.MuonSelectedTracksMon(OutputLevel = INFO)
- ToolSvc += CfgMgr.MuonGenericTracksMon(OutputLevel = INFO)
+ #ToolSvc += CfgMgr.MuonSelectedTracksMon(OutputLevel = INFO)
+ #ToolSvc += CfgMgr.MuonGenericTracksMon(OutputLevel = INFO)
# --------------For TriggerAware MuonTrk Monitoring---------------
if MuonDQAFlags.doMuonTrackMon and MuonDQAFlags.MuonTrkMonDoTrigger:
### UseTriggerVector =True
- ToolSvc += CfgMgr.MuonSelectedTracksMon_Trig(OutputLevel = INFO)
- ToolSvc += CfgMgr.MuonGenericTracksMon_Trig(OutputLevel = INFO)
+ #ToolSvc += CfgMgr.MuonSelectedTracksMon_Trig(OutputLevel = INFO)
+ #ToolSvc += CfgMgr.MuonGenericTracksMon_Trig(OutputLevel = INFO)
### UseTriggerVector = False
- ToolSvc += CfgMgr.MuonSelectedTracksMon_trigmu10(OutputLevel = INFO)
- ToolSvc += CfgMgr.MuonSelectedTracksMon_trigmu20(OutputLevel = INFO)
- ToolSvc += CfgMgr.MuonSelectedTracksMon_trigmu40(OutputLevel = INFO)
- ToolSvc += CfgMgr.MuonSelectedTracksMon_trig2mu10(OutputLevel = INFO)
- ToolSvc += CfgMgr.MuonGenericTracksMon_trigmu10(OutputLevel = INFO)
- ToolSvc += CfgMgr.MuonGenericTracksMon_trigmu20(OutputLevel = INFO)
- ToolSvc += CfgMgr.MuonGenericTracksMon_trigmu40(OutputLevel = INFO)
- ToolSvc += CfgMgr.MuonGenericTracksMon_trig2mu10(OutputLevel = INFO)
+ #ToolSvc += CfgMgr.MuonSelectedTracksMon_trigmu10(OutputLevel = INFO)
+ #ToolSvc += CfgMgr.MuonSelectedTracksMon_trigmu20(OutputLevel = INFO)
+ #ToolSvc += CfgMgr.MuonSelectedTracksMon_trigmu40(OutputLevel = INFO)
+ #ToolSvc += CfgMgr.MuonSelectedTracksMon_trig2mu10(OutputLevel = INFO)
+ #ToolSvc += CfgMgr.MuonGenericTracksMon_trigmu10(OutputLevel = INFO)
+ #ToolSvc += CfgMgr.MuonGenericTracksMon_trigmu20(OutputLevel = INFO)
+ #ToolSvc += CfgMgr.MuonGenericTracksMon_trigmu40(OutputLevel = INFO)
+ #ToolSvc += CfgMgr.MuonGenericTracksMon_trig2mu10(OutputLevel = INFO)
# --------------For MuonEventInfo Monitoring----------------------------
if MuonDQAFlags.doMuonEvtMon:
- ToolSvc += CfgMgr.MuonDQA__MuonEventInfoMonTool(OutputLevel = INFO)
+ #ToolSvc += CfgMgr.MuonDQA__MuonEventInfoMonTool(OutputLevel = INFO)
#---------------------------------------------------------------------------
Service( "THistSvc" ).OutputLevel = WARNING
#---------------------------------------------------------------------------
@@ -522,5 +522,5 @@ print theApp.TopAlg
#---------------------------------------------------------------------------
print topSequence
print ServiceMgr
-print ToolSvc
+print #ToolSvc
#======================================================================
diff --git a/MuonSpectrometer/MuonValidation/MuonDQA/MuonDQAMonitoring/share/MuonEventInfoMonitoring_options.py b/MuonSpectrometer/MuonValidation/MuonDQA/MuonDQAMonitoring/share/MuonEventInfoMonitoring_options.py
index 1087b4ed4673..5d8841ae40e7 100644
--- a/MuonSpectrometer/MuonValidation/MuonDQA/MuonDQAMonitoring/share/MuonEventInfoMonitoring_options.py
+++ b/MuonSpectrometer/MuonValidation/MuonDQA/MuonDQAMonitoring/share/MuonEventInfoMonitoring_options.py
@@ -8,5 +8,5 @@ if MuonDQAFlags.doMuonEvtMon:
)
MuonDQA__MuonEventInfoMonTool.LastEvent = MuonDQAFlags.EvtMax
MuonDQA__MuonEventInfoMonTool.TriggerTagAdd = True
- ToolSvc += MuonDQA__MuonEventInfoMonTool
+ #ToolSvc += MuonDQA__MuonEventInfoMonTool
monMan.AthenaMonTools += [ MuonDQA__MuonEventInfoMonTool ]
diff --git a/MuonSpectrometer/MuonValidation/MuonDQA/MuonRawDataMonitoring/CscRawDataMonitoring/share/CscRawBS_MonitoringOptions.py b/MuonSpectrometer/MuonValidation/MuonDQA/MuonRawDataMonitoring/CscRawDataMonitoring/share/CscRawBS_MonitoringOptions.py
index 3f9fc53cc966..9414c1113611 100755
--- a/MuonSpectrometer/MuonValidation/MuonDQA/MuonRawDataMonitoring/CscRawDataMonitoring/share/CscRawBS_MonitoringOptions.py
+++ b/MuonSpectrometer/MuonValidation/MuonDQA/MuonRawDataMonitoring/CscRawDataMonitoring/share/CscRawBS_MonitoringOptions.py
@@ -20,7 +20,7 @@ cscRdoBSValAlg = CscRdoValAlg (name = 'cscRdoBSValAlg',
CSCRawDataKey = 'CSCRDO',
NoiseCutADC = 100
)
-ToolSvc += cscRdoBSValAlg
+#ToolSvc += cscRdoBSValAlg
cscrdoBsRawMonMan.AthenaMonTools += [ cscRdoBSValAlg ]
cscRdoBSValAlg.OutputLevel = INFO
diff --git a/MuonSpectrometer/MuonValidation/MuonDQA/MuonRawDataMonitoring/CscRawDataMonitoring/share/CscRawESD_MonitoringOptions.py b/MuonSpectrometer/MuonValidation/MuonDQA/MuonRawDataMonitoring/CscRawDataMonitoring/share/CscRawESD_MonitoringOptions.py
index a40337114e82..921197dbb2ae 100755
--- a/MuonSpectrometer/MuonValidation/MuonDQA/MuonRawDataMonitoring/CscRawDataMonitoring/share/CscRawESD_MonitoringOptions.py
+++ b/MuonSpectrometer/MuonValidation/MuonDQA/MuonRawDataMonitoring/CscRawDataMonitoring/share/CscRawESD_MonitoringOptions.py
@@ -42,7 +42,7 @@ cscPrdESDValAlg = CscPrdValAlg ( name = 'cscPrdESDValAlg',
NoiseCutADC = 100,
CSCStripFitter = ToolSvc.CalibCscStripFitter
)
-ToolSvc += cscPrdESDValAlg
+#ToolSvc += cscPrdESDValAlg
cscprdRawMonMan.AthenaMonTools += [ cscPrdESDValAlg ]
topSequence += cscprdRawMonMan
@@ -75,7 +75,7 @@ cscClusterESDValAlg = CscClusterValAlg( name = 'cscClusterESDValAlg',
CSCEventSelTriggers = csc_evtSelectionTriggers
)
-ToolSvc += cscClusterESDValAlg
+#ToolSvc += cscClusterESDValAlg
cscesdRawMonMan.AthenaMonTools += [cscClusterESDValAlg]
topSequence += cscesdRawMonMan
@@ -113,7 +113,7 @@ CSCSegmESDValAlg = CSCSegmValAlg ( name = "CSCSegmValAlg",
ClusterStatus = clusStatWords
)
-ToolSvc += CSCSegmESDValAlg
+#ToolSvc += CSCSegmESDValAlg
cscesdSegmMonMan.AthenaMonTools += [ CSCSegmESDValAlg ]
topSequence += cscesdSegmMonMan
diff --git a/MuonSpectrometer/MuonValidation/MuonDQA/MuonRawDataMonitoring/MdtRawDataMonitoring/share/MdtRaw_MonitoringOptions.py b/MuonSpectrometer/MuonValidation/MuonDQA/MuonRawDataMonitoring/MdtRawDataMonitoring/share/MdtRaw_MonitoringOptions.py
index 285bab2505ea..f68866a0dee1 100755
--- a/MuonSpectrometer/MuonValidation/MuonDQA/MuonRawDataMonitoring/MdtRawDataMonitoring/share/MdtRaw_MonitoringOptions.py
+++ b/MuonSpectrometer/MuonValidation/MuonDQA/MuonRawDataMonitoring/MdtRawDataMonitoring/share/MdtRaw_MonitoringOptions.py
@@ -71,7 +71,7 @@ mdtRawDataValAlg_main = MdtRawDataValAlg(name='mdtRawDataValAlg_main',
nHits_NoiseThreshold = 10000
)
-ToolSvc += mdtRawDataValAlg_main
+#ToolSvc += mdtRawDataValAlg_main
mdtRawMonMan.AthenaMonTools += [ mdtRawDataValAlg_main ]
if( isTier0Flag ) :
@@ -124,7 +124,7 @@ if( isTier0Flag ) :
mdtRawDataValAlg_express.TriggerChain = "L1_MU0, L1_MU6, L1_MU10, L1_MU15, L1_MU20"
#end if useTrigger
- ToolSvc += mdtRawDataValAlg_express
+ #ToolSvc += mdtRawDataValAlg_express
mdtRawMonMan.AthenaMonTools += [ mdtRawDataValAlg_express ]
#end if( isTier0Flag )
diff --git a/MuonSpectrometer/MuonValidation/MuonDQA/MuonRawDataMonitoring/MdtVsRpcRawDataMonitoring/share/MdtVsRpcRaw_MonitoringOptions.py b/MuonSpectrometer/MuonValidation/MuonDQA/MuonRawDataMonitoring/MdtVsRpcRawDataMonitoring/share/MdtVsRpcRaw_MonitoringOptions.py
index cfe5074a155c..59139077d440 100755
--- a/MuonSpectrometer/MuonValidation/MuonDQA/MuonRawDataMonitoring/MdtVsRpcRawDataMonitoring/share/MdtVsRpcRaw_MonitoringOptions.py
+++ b/MuonSpectrometer/MuonValidation/MuonDQA/MuonRawDataMonitoring/MdtVsRpcRawDataMonitoring/share/MdtVsRpcRaw_MonitoringOptions.py
@@ -27,7 +27,7 @@ MdtVsRpcRawDataValAlg = MdtVsRpcRawDataValAlg(name='MdtVsRpcRawDataValAlg',
RpcPrepDataContainer="RPC_Measurements",
MdtPrepDataContainer="MDT_DriftCircles",
LastEvent = MuonDQAFlags.EvtMax)
-ToolSvc += MdtVsRpcRawDataValAlg
+#ToolSvc += MdtVsRpcRawDataValAlg
MdtRpcRawMonMan.AthenaMonTools += [ MdtVsRpcRawDataValAlg ]
topSequence += MdtRpcRawMonMan
print MdtRpcRawMonMan
diff --git a/MuonSpectrometer/MuonValidation/MuonDQA/MuonRawDataMonitoring/MdtVsTgcRawDataMonitoring/share/MdtVsTgcRaw_MonitoringOptions.py b/MuonSpectrometer/MuonValidation/MuonDQA/MuonRawDataMonitoring/MdtVsTgcRawDataMonitoring/share/MdtVsTgcRaw_MonitoringOptions.py
index cdcf7ddaf442..89eac2e54133 100755
--- a/MuonSpectrometer/MuonValidation/MuonDQA/MuonRawDataMonitoring/MdtVsTgcRawDataMonitoring/share/MdtVsTgcRaw_MonitoringOptions.py
+++ b/MuonSpectrometer/MuonValidation/MuonDQA/MuonRawDataMonitoring/MdtVsTgcRawDataMonitoring/share/MdtVsTgcRaw_MonitoringOptions.py
@@ -22,7 +22,7 @@ MdtVsTgcRawDataValAlg = MdtVsTgcRawDataValAlg (name = "MdtVsTgcRawDataValAlg",
OutputCoinCollection="TrigT1CoinDataCollection",
MdtPrepDataContainer="MDT_DriftCircles",
TgcLv1File = False)
-ToolSvc += MdtVsTgcRawDataValAlg
+#ToolSvc += MdtVsTgcRawDataValAlg
MdtTgcRawMonMan.AthenaMonTools += [ MdtVsTgcRawDataValAlg ]
topSequence += MdtTgcRawMonMan
print MdtTgcRawMonMan
diff --git a/MuonSpectrometer/MuonValidation/MuonDQA/MuonRawDataMonitoring/RpcRawDataMonitoring/share/RpcRawBS_MonitoringOptions.py b/MuonSpectrometer/MuonValidation/MuonDQA/MuonRawDataMonitoring/RpcRawDataMonitoring/share/RpcRawBS_MonitoringOptions.py
index 9529f43b5eae..8c33fa8d074f 100755
--- a/MuonSpectrometer/MuonValidation/MuonDQA/MuonRawDataMonitoring/RpcRawDataMonitoring/share/RpcRawBS_MonitoringOptions.py
+++ b/MuonSpectrometer/MuonValidation/MuonDQA/MuonRawDataMonitoring/RpcRawDataMonitoring/share/RpcRawBS_MonitoringOptions.py
@@ -24,7 +24,7 @@ rpcLV1RawDataValAlg = RpcLv1RawDataValAlg(name='rpcLV1RawDataValAlg'
OutputLevel = OutputMessageLevel ,
LastEvent = MuonDQAFlags.EvtMax,
doCoolDB = False )
-ToolSvc += rpcLV1RawDataValAlg
+#ToolSvc += rpcLV1RawDataValAlg
rpcLv1RawMonMan.AthenaMonTools += [ rpcLV1RawDataValAlg ]
topSequence += rpcLv1RawMonMan
print rpcLv1RawMonMan
@@ -39,7 +39,7 @@ from RpcRawDataMonitoring.RpcRawDataMonitoringConf import RpcLv1RawDataSectorLog
rpcLV1RawDataSectorLogic = RpcLv1RawDataSectorLogic(name='rpcLV1RawDataSectorLogic',OutputLevel = OutputMessageLevel)
if globalflags.DataSource() != 'data':
rpcLV1RawDataSectorLogic.isMC = True
-ToolSvc += rpcLV1RawDataSectorLogic
+#ToolSvc += rpcLV1RawDataSectorLogic
rpcLv1SLRawMonMan.AthenaMonTools += [ rpcLV1RawDataSectorLogic ]
topSequence += rpcLv1SLRawMonMan
print rpcLv1SLRawMonMan
diff --git a/MuonSpectrometer/MuonValidation/MuonDQA/MuonRawDataMonitoring/RpcRawDataMonitoring/share/RpcRawESD_MonitoringOptions.py b/MuonSpectrometer/MuonValidation/MuonDQA/MuonRawDataMonitoring/RpcRawDataMonitoring/share/RpcRawESD_MonitoringOptions.py
index e60664aab0a0..57966f6e629a 100755
--- a/MuonSpectrometer/MuonValidation/MuonDQA/MuonRawDataMonitoring/RpcRawDataMonitoring/share/RpcRawESD_MonitoringOptions.py
+++ b/MuonSpectrometer/MuonValidation/MuonDQA/MuonRawDataMonitoring/RpcRawDataMonitoring/share/RpcRawESD_MonitoringOptions.py
@@ -41,7 +41,7 @@ rpcRawDataValAlg = RpcRawDataValAlg(name='rpcRawDataValAlg',
ClusterContainer ="rpcClusters",
OutputLevel = OutputMessageLevel,
LastEvent = MuonDQAFlags.EvtMax)
-ToolSvc += rpcRawDataValAlg
+#ToolSvc += rpcRawDataValAlg
rpcRawMonMan.AthenaMonTools += [ rpcRawDataValAlg ]
topSequence += rpcRawMonMan
print rpcRawMonMan
@@ -74,7 +74,7 @@ RPCStandaloneTracksMon = RPCStandaloneTracksMon(name='RPCStandaloneTracksMon',
ClusterContainer = "rpcClusters")
if globalflags.DataSource() != 'data':
RPCStandaloneTracksMon.isMC = True
-ToolSvc += RPCStandaloneTracksMon
+#ToolSvc += RPCStandaloneTracksMon
rpcTrackMonMan.AthenaMonTools += [ RPCStandaloneTracksMon ]
topSequence += rpcTrackMonMan
print rpcTrackMonMan
@@ -95,7 +95,7 @@ if not hasattr(topSequence,"RpcClusterBuilderPRD"):
rpcLv1RawDataEfficiency = RpcLv1RawDataEfficiency(name='rpcLv1RawDataEfficiency')
if globalflags.DataSource() != 'data':
rpcLv1RawDataEfficiency.isMC = True
-ToolSvc += rpcLv1RawDataEfficiency
+#ToolSvc += rpcLv1RawDataEfficiency
rpcLv1RawEfficiencyMonMan.AthenaMonTools += [ rpcLv1RawDataEfficiency ]
topSequence += rpcLv1RawEfficiencyMonMan
print rpcLv1RawEfficiencyMonMan
diff --git a/MuonSpectrometer/MuonValidation/MuonDQA/MuonRawDataMonitoring/TgcRawDataMonitoring/share/TgcRaw_MonitoringOptions.py b/MuonSpectrometer/MuonValidation/MuonDQA/MuonRawDataMonitoring/TgcRawDataMonitoring/share/TgcRaw_MonitoringOptions.py
index 54b2cc59c1cd..adf4ef9d2380 100755
--- a/MuonSpectrometer/MuonValidation/MuonDQA/MuonRawDataMonitoring/TgcRawDataMonitoring/share/TgcRaw_MonitoringOptions.py
+++ b/MuonSpectrometer/MuonValidation/MuonDQA/MuonRawDataMonitoring/TgcRawDataMonitoring/share/TgcRaw_MonitoringOptions.py
@@ -19,7 +19,7 @@ tgcLv1RawMonMan = AthenaMonManager(name="TgcLv1RawMonManager",
from TgcRawDataMonitoring.TgcRawDataMonitoringConf import TgcRawDataValAlg
tgcRawDataValAlg = TgcRawDataValAlg(name='tgcRawDataValAlg',
TgcPrepDataContainer="TGC_Measurements")
-ToolSvc += tgcRawDataValAlg
+#ToolSvc += tgcRawDataValAlg
tgcRawMonMan.AthenaMonTools += [ tgcRawDataValAlg ]
topSequence += tgcRawMonMan
print tgcRawMonMan
@@ -28,7 +28,7 @@ from TgcRawDataMonitoring.TgcRawDataMonitoringConf import TgcLv1RawDataValAlg
tgcLv1RawDataValAlg = TgcLv1RawDataValAlg(name='tgcLv1RawDataValAlg')
if DQMonFlags.useTrigger():
- ToolSvc += tgcLv1RawDataValAlg
+ #ToolSvc += tgcLv1RawDataValAlg
tgcLv1RawMonMan.AthenaMonTools += [ tgcLv1RawDataValAlg ]
topSequence += tgcLv1RawMonMan
print tgcLv1RawMonMan
diff --git a/MuonSpectrometer/MuonValidation/MuonDQA/MuonTrackMonitoring/share/MuonTrackDQA_options.py b/MuonSpectrometer/MuonValidation/MuonDQA/MuonTrackMonitoring/share/MuonTrackDQA_options.py
index 6d7517ee3597..510db8551373 100755
--- a/MuonSpectrometer/MuonValidation/MuonDQA/MuonTrackMonitoring/share/MuonTrackDQA_options.py
+++ b/MuonSpectrometer/MuonValidation/MuonDQA/MuonTrackMonitoring/share/MuonTrackDQA_options.py
@@ -21,8 +21,8 @@ MuonGenericTracksMon_NoTrig = MuonGenericTracksMon(name = "MuonGenericTra
MuonTriggerChainName = "NoTrig/",
OutputLevel = WARNING,
)
-ToolSvc += MuonGenericTracksMon_NoTrig
-muTrackMonMan.AthenaMonTools.append(MuonGenericTracksMon_NoTrig)
+#ToolSvc += MuonGenericTracksMon_NoTrig
+muTrackMonMan.AthenaMonTools += [MuonGenericTracksMon_NoTrig]
# L1_Trig part is intended to only select events passing L1_MU triggers
MuonGenericTracksMon_L1Trig = MuonGenericTracksMon(name = "MuonGenericTracksMon_L1Trig",
@@ -36,8 +36,8 @@ else:
MuonGenericTracksMon_L1Trig.TriggerChain = "L1_MU4, L1_MU6, L1_MU10, L1_MU11, L1_MU15, L1_MU20, L1_2MU4, L1_2MU6, L1_2MU10"
MuonGenericTracksMon_L1Trig.MuonTriggerChainName = ""
MuonGenericTracksMon_L1Trig.TrigDecisionTool = monTrigDecTool
- ToolSvc += MuonGenericTracksMon_L1Trig
- muTrackMonMan.AthenaMonTools.append(MuonGenericTracksMon_L1Trig)
+ #ToolSvc += MuonGenericTracksMon_L1Trig
+ muTrackMonMan.AthenaMonTools += [MuonGenericTracksMon_L1Trig]
#for Muon Quality Selection
if not hasattr(ToolSvc,"MuonSelectorTool"):
diff --git a/MuonSpectrometer/MuonValidation/MuonDQA/MuonTrackMonitoring/share/MuonTrackMonitoring_options.py b/MuonSpectrometer/MuonValidation/MuonDQA/MuonTrackMonitoring/share/MuonTrackMonitoring_options.py
index 3d8a369e5044..87802adc996b 100755
--- a/MuonSpectrometer/MuonValidation/MuonDQA/MuonTrackMonitoring/share/MuonTrackMonitoring_options.py
+++ b/MuonSpectrometer/MuonValidation/MuonDQA/MuonTrackMonitoring/share/MuonTrackMonitoring_options.py
@@ -45,9 +45,9 @@ if MuonDQAFlags.doMuonTrackMon:
TGCStandaloneTracksMon_NoTrig = TGCStandaloneTracksMon(name = "TGCStandaloneTracksMon",
TriggerAware = False,
MuonTriggerChainName = "TriggersInChain")
- ToolSvc += MuonSelectedTracksMon
- ToolSvc += MuonGenericTracksMon
- ToolSvc += TGCStandaloneTracksMon
+ #ToolSvc += MuonSelectedTracksMon
+ #ToolSvc += MuonGenericTracksMon
+ #ToolSvc += TGCStandaloneTracksMon
monMan.AthenaMonTools += [ MuonSelectedTracksMon ]
monMan.AthenaMonTools += [ MuonGenericTracksMon ]
monMan.AthenaMonTools += [ TGCStandaloneTracksMon ]
@@ -87,9 +87,9 @@ else:
MuonTriggerDecisionTool = "TrigDec::TrigDecisionTool",
Muon_Trigger_Items = ["MU0", "MU4", "MU6", "MU10", "MU11", "MU15", "MU20", "MU40", "MU0_TGC", "MU6_TGC", "MU0_TGC_HALO" ],
MuonTriggerChainName = "TriggersInChain")
- ToolSvc += MuonSelectedTracksMon_Trig
- ToolSvc += MuonGenericTracksMon_Trig
- ToolSvc += TGCStandaloneTracksMon_Trig
+ #ToolSvc += MuonSelectedTracksMon_Trig
+ #ToolSvc += MuonGenericTracksMon_Trig
+ #ToolSvc += TGCStandaloneTracksMon_Trig
monMan.AthenaMonTools += [ MuonSelectedTracksMon_Trig ]
monMan.AthenaMonTools += [ MuonGenericTracksMon_Trig]
monMan.AthenaMonTools += [ TGCStandaloneTracksMon_Trig]
@@ -187,18 +187,18 @@ else:
MuonGenericTracksMon_trigmu40.MuonTriggerChainName = "EF_mu40"
MuonGenericTracksMon_trig2mu10.MuonTriggerChainName = "EF_2mu10"
###################################################
- ToolSvc += MuonSelectedTracksMon_trig2mu4
- ToolSvc += MuonSelectedTracksMon_trig2mu6
- ToolSvc += MuonSelectedTracksMon_trigmu10
- ToolSvc += MuonSelectedTracksMon_trigmu20
- ToolSvc += MuonSelectedTracksMon_trigmu40
- ToolSvc += MuonSelectedTracksMon_trig2mu10
- ToolSvc += MuonGenericTracksMon_trig2mu4
- ToolSvc += MuonGenericTracksMon_trig2mu6
- ToolSvc += MuonGenericTracksMon_trigmu10
- ToolSvc += MuonGenericTracksMon_trigmu20
- ToolSvc += MuonGenericTracksMon_trigmu40
- ToolSvc += MuonGenericTracksMon_trig2mu10
+ #ToolSvc += MuonSelectedTracksMon_trig2mu4
+ #ToolSvc += MuonSelectedTracksMon_trig2mu6
+ #ToolSvc += MuonSelectedTracksMon_trigmu10
+ #ToolSvc += MuonSelectedTracksMon_trigmu20
+ #ToolSvc += MuonSelectedTracksMon_trigmu40
+ #ToolSvc += MuonSelectedTracksMon_trig2mu10
+ #ToolSvc += MuonGenericTracksMon_trig2mu4
+ #ToolSvc += MuonGenericTracksMon_trig2mu6
+ #ToolSvc += MuonGenericTracksMon_trigmu10
+ #ToolSvc += MuonGenericTracksMon_trigmu20
+ #ToolSvc += MuonGenericTracksMon_trigmu40
+ #ToolSvc += MuonGenericTracksMon_trig2mu10
###################################################
monMan.AthenaMonTools += [ MuonSelectedTracksMon_trig2mu4 ]
monMan.AthenaMonTools += [ MuonSelectedTracksMon_trig2mu6 ]
diff --git a/PhysicsAnalysis/JetTagging/JetTagMonitoring/share/JetTagMonitoring_jobOptions.py b/PhysicsAnalysis/JetTagging/JetTagMonitoring/share/JetTagMonitoring_jobOptions.py
index d48827ad4c22..ccae0d8f34e7 100644
--- a/PhysicsAnalysis/JetTagging/JetTagMonitoring/share/JetTagMonitoring_jobOptions.py
+++ b/PhysicsAnalysis/JetTagging/JetTagMonitoring/share/JetTagMonitoring_jobOptions.py
@@ -18,7 +18,7 @@ from JetTagMonitoring.JetTagMonitoringConf import JetTagMonitoring
jetTagMonTool = JetTagMonitoring (
name = "jetTagMonTool",
)
-ToolSvc += jetTagMonTool
+#ToolSvc += jetTagMonTool
monManJetTag.AthenaMonTools += [ jetTagMonTool ]
# remove events with non-collision BCIDs from your monitoring tools
diff --git a/Reconstruction/HeavyIonRec/HIMonitoring/share/HIMonitoringSteering_jo.py b/Reconstruction/HeavyIonRec/HIMonitoring/share/HIMonitoringSteering_jo.py
index 5fc56e93e304..fe4767485944 100755
--- a/Reconstruction/HeavyIonRec/HIMonitoring/share/HIMonitoringSteering_jo.py
+++ b/Reconstruction/HeavyIonRec/HIMonitoring/share/HIMonitoringSteering_jo.py
@@ -55,7 +55,7 @@ name = "HIElectronsMonTool",
if DQMonFlags.monManEnvironment == 'tier0ESD' or DQMonFlags.monManEnvironment == 'tier0':
- ToolSvc += HIEventShapeMonTool
+ #ToolSvc += HIEventShapeMonTool
HIEventShapeMonMan = AthenaMonManager( "HIEventShapeManager",
FileKey = DQMonFlags.monManFileKey(), #"GLOBAL" #"stat"
ManualDataTypeSetup = DQMonFlags.monManManualDataTypeSetup(), #True
@@ -67,7 +67,7 @@ if DQMonFlags.monManEnvironment == 'tier0ESD' or DQMonFlags.monManEnvironment ==
AthenaMonTools = [ HIEventShapeMonTool ])
topSequence += HIEventShapeMonMan
- ToolSvc += HIPhotonsMonTool
+ #ToolSvc += HIPhotonsMonTool
HIPhotonsMonMan = AthenaMonManager( "HIPhotonsMonManager",
FileKey = DQMonFlags.monManFileKey(), #"GLOBAL" #"stat"
ManualDataTypeSetup = DQMonFlags.monManManualDataTypeSetup(), #True
@@ -79,7 +79,7 @@ if DQMonFlags.monManEnvironment == 'tier0ESD' or DQMonFlags.monManEnvironment ==
AthenaMonTools = [ HIPhotonsMonTool ])
topSequence += HIPhotonsMonMan
- ToolSvc += HIMuonsMonTool
+ #ToolSvc += HIMuonsMonTool
HIMuonsMonMan = AthenaMonManager( "HIMuonsMonManager",
FileKey = DQMonFlags.monManFileKey(), #"GLOBAL" #"stat"
ManualDataTypeSetup = DQMonFlags.monManManualDataTypeSetup(), #True
@@ -91,7 +91,7 @@ if DQMonFlags.monManEnvironment == 'tier0ESD' or DQMonFlags.monManEnvironment ==
AthenaMonTools = [ HIMuonsMonTool ])
topSequence += HIMuonsMonMan
- ToolSvc += HIElectronsMonTool
+ #ToolSvc += HIElectronsMonTool
HIElectronsMonMan = AthenaMonManager( "HIElectronsMonManager",
FileKey = DQMonFlags.monManFileKey(), #"GLOBAL" #"stat"
ManualDataTypeSetup = DQMonFlags.monManManualDataTypeSetup(), #True
@@ -104,7 +104,7 @@ if DQMonFlags.monManEnvironment == 'tier0ESD' or DQMonFlags.monManEnvironment ==
topSequence += HIElectronsMonMan
if DQMonFlags.monManEnvironment == 'tier0ESD' or DQMonFlags.monManEnvironment == 'tier0' or DQMonFlags.monManEnvironment == 'online':
- ToolSvc += HIZdcMonTool
+ #ToolSvc += HIZdcMonTool
HIZdcMonMan = AthenaMonManager( "HIZdcMonManager",
FileKey = DQMonFlags.monManFileKey(), #"GLOBAL" #"stat"
ManualDataTypeSetup = DQMonFlags.monManManualDataTypeSetup(), #True
diff --git a/Reconstruction/Jet/JetMonitoring/python/HIJetMonitoringHistos.py b/Reconstruction/Jet/JetMonitoring/python/HIJetMonitoringHistos.py
index 1d8b25b204ee..2f2ab08e1068 100644
--- a/Reconstruction/Jet/JetMonitoring/python/HIJetMonitoringHistos.py
+++ b/Reconstruction/Jet/JetMonitoring/python/HIJetMonitoringHistos.py
@@ -134,14 +134,14 @@ if monitorTracks :
#cbg
athenaMonTool.FilterTools += [ monbadlb ]
-ToolSvc += athenaMonTool
+#ToolSvc += athenaMonTool
athenaMonTool_LB = JetMonitoringTool("JetMonitoring_LB", HistoTools = [ "ptN", "Timing", "EMFrac", "HECFrac", "LArQuality", JetKinematicHistos("kinematics",PlotOccupancy=True, PlotAveragePt=True, PlotAverageE=True, PlotNJet=True) ] ,IntervalType = 2)
#cbg
athenaMonTool_LB.FilterTools += [ monbadlb ]
-ToolSvc += athenaMonTool_LB
+#ToolSvc += athenaMonTool_LB
from AthenaMonitoring.DQMonFlags import DQMonFlags
if DQMonFlags.useTrigger() :
@@ -151,7 +151,7 @@ if DQMonFlags.useTrigger() :
] , IntervalType = 6 )
#cbg
athenaMonTool_trig.FilterTools += [ monbadlb ]
- ToolSvc += athenaMonTool_trig
+ #ToolSvc += athenaMonTool_trig
athenaMonTool_trig.TrigDecisionTool = getattr(ToolSvc, DQMonFlags.nameTrigDecTool())
athenaMonTool_trig.TriggerChain = "CATEGORY_monitoring_jet"
#athenaMonTool_trig.TriggerChain = "HLT_j25,HLT_j60,HLT_j200_jes_PS"
diff --git a/Reconstruction/Jet/JetMonitoring/python/JetMonitoringHistos.py b/Reconstruction/Jet/JetMonitoring/python/JetMonitoringHistos.py
index 73323a8781f1..c03ca58032e4 100644
--- a/Reconstruction/Jet/JetMonitoring/python/JetMonitoringHistos.py
+++ b/Reconstruction/Jet/JetMonitoring/python/JetMonitoringHistos.py
@@ -147,14 +147,14 @@ if monitorTracks :
#cbg
athenaMonTool.FilterTools += [ monbadlb ]
-ToolSvc += athenaMonTool
+#ToolSvc += athenaMonTool
athenaMonTool_LB = JetMonitoringTool("JetMonitoring_LB", HistoTools = [commonMonitoringTool_LB("AntiKt4EMTopoJets") ], IntervalType = 2)
#cbg
athenaMonTool_LB.FilterTools += [ monbadlb ]
-ToolSvc += athenaMonTool_LB
+#ToolSvc += athenaMonTool_LB
from AthenaMonitoring.DQMonFlags import DQMonFlags
if DQMonFlags.useTrigger() :
@@ -166,7 +166,7 @@ if DQMonFlags.useTrigger() :
] , IntervalType = 6 )
#cbg
athenaMonTool_trig.FilterTools += [ monbadlb ]
- ToolSvc += athenaMonTool_trig
+ #ToolSvc += athenaMonTool_trig
athenaMonTool_trig.TrigDecisionTool = getattr(ToolSvc, DQMonFlags.nameTrigDecTool())
athenaMonTool_trig.TriggerChain = "CATEGORY_monitoring_jet"
#athenaMonTool_trig.TriggerChain = "HLT_j25,HLT_j60,HLT_j200_jes_PS"
diff --git a/Reconstruction/Jet/JetMonitoring/share/JetMonitoring_jobOptions_standalone.py b/Reconstruction/Jet/JetMonitoring/share/JetMonitoring_jobOptions_standalone.py
index 60ad559f5952..e6a9bcd6bdb2 100644
--- a/Reconstruction/Jet/JetMonitoring/share/JetMonitoring_jobOptions_standalone.py
+++ b/Reconstruction/Jet/JetMonitoring/share/JetMonitoring_jobOptions_standalone.py
@@ -87,7 +87,7 @@ akt4Filler.HistoTools += [
jetMonTool = JetMonitoringTool(HistoTools = [akt4Filler])
-ToolSvc += jetMonTool
+#ToolSvc += jetMonTool
monMan.AthenaMonTools += [ jetMonTool ]
diff --git a/Reconstruction/Jet/JetValidation/python/PhysicsValidationHistos.py b/Reconstruction/Jet/JetValidation/python/PhysicsValidationHistos.py
index 4ebd9944a6e1..039d22628a03 100644
--- a/Reconstruction/Jet/JetValidation/python/PhysicsValidationHistos.py
+++ b/Reconstruction/Jet/JetValidation/python/PhysicsValidationHistos.py
@@ -199,7 +199,7 @@ if (isMC==False):
commonPhysValTool( "AntiKt4EMPFlowJets" ),
], IntervalType=8) # 8 == HistoGroupBase::all
-ToolSvc += athenaMonTool
+#ToolSvc += athenaMonTool
def athenaPhysValTool():
return athenaMonTool
diff --git a/Reconstruction/MissingETMonitoring/share/MissingET_Monitoring.py b/Reconstruction/MissingETMonitoring/share/MissingET_Monitoring.py
index a162c61e6a2f..5c23f40643ae 100755
--- a/Reconstruction/MissingETMonitoring/share/MissingET_Monitoring.py
+++ b/Reconstruction/MissingETMonitoring/share/MissingET_Monitoring.py
@@ -49,8 +49,8 @@ for trigger in triggerList:
metMonTool.TriggerChain = trigger
#New AthenaMonitoring filter tool to be added to filter out events in non-filled BCIDs
-# metMonTool.FilterTools.append(monFilledBunchFilterTool)
- metMonTool.FilterTools.append(monbadlb)
+# metMonTool.FilterTools += [monFilledBunchFilterTool]
+ metMonTool.FilterTools += [monbadlb]
if trigger != "":
metMonTool.TrigDecisionTool = monTrigDecTool
@@ -61,7 +61,7 @@ for trigger in triggerList:
#metMonTool.doJetcleaning = False
- ToolSvc += metMonTool
+ #ToolSvc += metMonTool
monManETmiss.AthenaMonTools += [ metMonTool ]
# Standard Monitoring cut80
@@ -74,8 +74,8 @@ for trigger in triggerList:
# metMonTool.doMetCut80 = True
# metMonTool.metCut = 10
# #New AthenaMonitoring filter tool to be added to filter out events in non-filled BCIDs
- # metMonTool.FilterTools.append(monFilledBunchFilterTool)
-# metMonTool.FilterTools.append(monbadlb)
+ # metMonTool.FilterTools += [monFilledBunchFilterTool]
+# metMonTool.FilterTools += [monbadlb]
# if trigger != "":
# metMonTool.TrigDecisionTool = monTrigDecTool
@@ -100,8 +100,8 @@ for trigger in triggerList:
metMonTool.muoColKey = ""
metMonTool.jetColKey = "AntiKt4LCTopoJets"
metMonTool.TriggerChain = trigger
-# metMonTool.FilterTools.append(monFilledBunchFilterTool)
- metMonTool.FilterTools.append(monbadlb)
+# metMonTool.FilterTools += [monFilledBunchFilterTool]
+ metMonTool.FilterTools += [monbadlb]
metMonTool.JetSelectorTool = cleaningTool
metMonTool.badJets = True
if trigger != "":
@@ -110,7 +110,7 @@ for trigger in triggerList:
#metMonTool.eleColKey = "ElectronAODCollection"
#Uncomment to avoid the jet cleaning
#metMonTool.doJetcleaning = False
- ToolSvc += metMonTool
+ #ToolSvc += metMonTool
monManETmiss.AthenaMonTools += [ metMonTool ]
@@ -126,11 +126,11 @@ for trigger in triggerList:
metMonTool.eleColKey = ""
metMonTool.muoColKey = ""
metMonTool.TriggerChain = trigger
-# metMonTool.FilterTools.append(monFilledBunchFilterTool)
- metMonTool.FilterTools.append(monbadlb)
+# metMonTool.FilterTools += [monFilledBunchFilterTool]
+ metMonTool.FilterTools += [monbadlb]
if trigger != "":
metMonTool.TrigDecisionTool = monTrigDecTool
- ToolSvc += metMonTool
+ #ToolSvc += metMonTool
monManETmiss.AthenaMonTools += [ metMonTool ]
# Tool for refined MET monitoring
@@ -145,11 +145,11 @@ for trigger in triggerList:
metMonTool.eleColKey = ""
metMonTool.muoColKey = ""
metMonTool.TriggerChain = trigger
-# metMonTool.FilterTools.append(monFilledBunchFilterTool)
- metMonTool.FilterTools.append(monbadlb)
+# metMonTool.FilterTools += [monFilledBunchFilterTool]
+ metMonTool.FilterTools += [monbadlb]
if trigger != "":
metMonTool.TrigDecisionTool = monTrigDecTool
- ToolSvc += metMonTool
+ #ToolSvc += metMonTool
monManETmiss.AthenaMonTools += [ metMonTool ]
# Tool for PFlow MET monitoring
@@ -164,11 +164,11 @@ for trigger in triggerList:
metMonTool.eleColKey = ""
metMonTool.muoColKey = ""
metMonTool.TriggerChain = trigger
-# metMonTool.FilterTools.append(monFilledBunchFilterTool)
- metMonTool.FilterTools.append(monbadlb)
+# metMonTool.FilterTools += [monFilledBunchFilterTool]
+ metMonTool.FilterTools += [monbadlb]
if trigger != "":
metMonTool.TrigDecisionTool = monTrigDecTool
- ToolSvc += metMonTool
+ #ToolSvc += metMonTool
monManETmiss.AthenaMonTools += [ metMonTool ]
@@ -188,11 +188,11 @@ for trigger in triggerList:
metMonTool.doJetcleaning = True
metMonTool.JetSelectorTool = cleaningTool
metMonTool.TriggerChain = trigger
-# metMonTool.FilterTools.append(monFilledBunchFilterTool)
- metMonTool.FilterTools.append(monbadlb)
+# metMonTool.FilterTools += [monFilledBunchFilterTool]
+ metMonTool.FilterTools += [monbadlb]
if trigger != "":
metMonTool.TrigDecisionTool = monTrigDecTool
- ToolSvc += metMonTool
+ #ToolSvc += metMonTool
monManETmiss.AthenaMonTools += [ metMonTool ]
# Tool for calorimetric MET monitoring (TopoCluster)
@@ -209,11 +209,11 @@ for trigger in triggerList:
metMonTool.doJetcleaning = True
metMonTool.JetSelectorTool = cleaningTool
metMonTool.TriggerChain = trigger
-# metMonTool.FilterTools.append(monFilledBunchFilterTool)
- metMonTool.FilterTools.append(monbadlb)
+# metMonTool.FilterTools += [monFilledBunchFilterTool]
+ metMonTool.FilterTools += [monbadlb]
if trigger != "":
metMonTool.TrigDecisionTool = monTrigDecTool
- ToolSvc += metMonTool
+ #ToolSvc += metMonTool
monManETmiss.AthenaMonTools += [ metMonTool ]
@@ -231,11 +231,11 @@ for trigger in triggerList:
metMonTool.doJetcleaning = True
metMonTool.JetSelectorTool = cleaningTool
metMonTool.TriggerChain = trigger
-# metMonTool.FilterTools.append(monFilledBunchFilterTool)
- metMonTool.FilterTools.append(monbadlb)
+# metMonTool.FilterTools += [monFilledBunchFilterTool]
+ metMonTool.FilterTools += [monbadlb]
if trigger != "":
metMonTool.TrigDecisionTool = monTrigDecTool
- ToolSvc += metMonTool
+ #ToolSvc += metMonTool
monManETmiss.AthenaMonTools += [ metMonTool ]
@@ -254,11 +254,11 @@ metMonTool.muoColKey = ""
metMonTool.doMetCut80 = True
metMonTool.metCut = 80.0
# metMonTool.TriggerChain = trigger
-# metMonTool.FilterTools.append(monFilledBunchFilterTool)
-metMonTool.FilterTools.append(monbadlb)
+# metMonTool.FilterTools += [monFilledBunchFilterTool]
+metMonTool.FilterTools += [monbadlb]
if trigger != "":
metMonTool.TrigDecisionTool = monTrigDecTool
-ToolSvc += metMonTool
+#ToolSvc += metMonTool
monManETmiss.AthenaMonTools += [ metMonTool ]
@@ -274,11 +274,11 @@ metMonTool.muoColKey = ""
metMonTool.doMetCut80 = True
metMonTool.metCut = 80.0
#metMonTool.TriggerChain = trigger
-metMonTool.FilterTools.append(monFilledBunchFilterTool)
-metMonTool.FilterTools.append(monbadlb)
+metMonTool.FilterTools += [monFilledBunchFilterTool]
+metMonTool.FilterTools += [monbadlb]
if trigger != "":
metMonTool.TrigDecisionTool = monTrigDecTool
-ToolSvc += metMonTool
+#ToolSvc += metMonTool
monManETmiss.AthenaMonTools += [ metMonTool ]
@@ -308,7 +308,7 @@ metMonTool.FillNegativeSumEt = True
metMonTool.TriggerChain = trigger
if trigger != "":
metMonTool.TrigDecisionTool = monTrigDecTool
-ToolSvc += metMonTool
+#ToolSvc += metMonTool
monManETmiss.AthenaMonTools += [ metMonTool ]
@@ -332,7 +332,7 @@ metMonTool.FillNegativeSumEt = True
#metMonTool.TriggerChain = trigger
#if trigger != "":
# metMonTool.TrigDecisionTool = monTrigDecTool
-ToolSvc += metMonTool
+#ToolSvc += metMonTool
monManETmiss.AthenaMonTools += [ metMonTool ]
diff --git a/Reconstruction/egamma/egammaPerformance/share/egammaMonitoring_jobOptions.py b/Reconstruction/egamma/egammaPerformance/share/egammaMonitoring_jobOptions.py
index 91b745cad1bf..1ff2a9c6bcb7 100644
--- a/Reconstruction/egamma/egammaPerformance/share/egammaMonitoring_jobOptions.py
+++ b/Reconstruction/egamma/egammaPerformance/share/egammaMonitoring_jobOptions.py
@@ -115,9 +115,9 @@ if DQMonFlags.monManEnvironment() in ('tier0','tier0ESD','online', 'AOD'):
phMonTool.FilterTools += [ monbadlb ]
if jobproperties.Beam.beamType()=='collisions' and hasattr(ToolSvc, 'DQFilledBunchFilterTool'):
- phMonTool.FilterTools.append(monFilledBunchFilterTool)
- ToolSvc+=phMonTool
- monManEgamma.AthenaMonTools += [ "photonMonTool/phMonTool" ]
+ phMonTool.FilterTools += [monFilledBunchFilterTool]
+ #ToolSvc+=phMonTool
+ monManEgamma.AthenaMonTools += [ phMonTool ]
if DQMonFlags.useTrigger():
phMonToolWithTrigger = photonMonTool(name= "phMonToolWithTrigger",
@@ -132,9 +132,9 @@ if DQMonFlags.monManEnvironment() in ('tier0','tier0ESD','online', 'AOD'):
phMonToolWithTrigger.FilterTools += [ monbadlb ]
if jobproperties.Beam.beamType()=='collisions' and hasattr(ToolSvc, 'DQFilledBunchFilterTool'):
- phMonToolWithTrigger.FilterTools.append(monFilledBunchFilterTool)
- ToolSvc+=phMonToolWithTrigger
- monManEgamma.AthenaMonTools += [ "photonMonTool/phMonToolWithTrigger" ]
+ phMonToolWithTrigger.FilterTools += [monFilledBunchFilterTool]
+ #ToolSvc+=phMonToolWithTrigger
+ monManEgamma.AthenaMonTools += [ phMonToolWithTrigger ]
if(egammaMonitorElectrons):
@@ -149,9 +149,9 @@ if DQMonFlags.monManEnvironment() in ('tier0','tier0ESD','online', 'AOD'):
)
elMonTool.FilterTools += [ monbadlb ]
if jobproperties.Beam.beamType()=='collisions' and hasattr(ToolSvc, 'DQFilledBunchFilterTool'):
- elMonTool.FilterTools.append(monFilledBunchFilterTool)
- ToolSvc+=elMonTool
- monManEgamma.AthenaMonTools += [ "electronMonTool/elMonTool" ]
+ elMonTool.FilterTools += [monFilledBunchFilterTool]
+ #ToolSvc+=elMonTool
+ monManEgamma.AthenaMonTools += [ elMonTool ]
print elMonTool
if DQMonFlags.useTrigger():
@@ -165,9 +165,9 @@ if DQMonFlags.monManEnvironment() in ('tier0','tier0ESD','online', 'AOD'):
)
elMonToolWithTrigger.FilterTools += [ monbadlb ]
if jobproperties.Beam.beamType()=='collisions' and hasattr(ToolSvc, 'DQFilledBunchFilterTool'):
- elMonToolWithTrigger.FilterTools.append(monFilledBunchFilterTool)
- ToolSvc+=elMonToolWithTrigger
- monManEgamma.AthenaMonTools += [ "electronMonTool/elMonToolWithTrigger" ]
+ elMonToolWithTrigger.FilterTools += [monFilledBunchFilterTool]
+ #ToolSvc+=elMonToolWithTrigger
+ monManEgamma.AthenaMonTools += [ elMonToolWithTrigger ]
print elMonToolWithTrigger
@@ -184,9 +184,9 @@ if DQMonFlags.monManEnvironment() in ('tier0','tier0ESD','online', 'AOD'):
fwdMonTool.FilterTools += [ monbadlb ]
if jobproperties.Beam.beamType()=='collisions' and hasattr(ToolSvc, 'DQFilledBunchFilterTool'):
- fwdMonTool.FilterTools.append(monFilledBunchFilterTool)
- ToolSvc+=fwdMonTool
- monManEgamma.AthenaMonTools += [ "forwardElectronMonTool/fwdMonTool" ]
+ fwdMonTool.FilterTools += [monFilledBunchFilterTool]
+ #ToolSvc+=fwdMonTool
+ monManEgamma.AthenaMonTools += [ fwdMonTool ]
if(egammaMonitorZee):
from egammaPerformance.egammaPerformanceConf import ZeeTaPMonTool
@@ -205,9 +205,9 @@ if DQMonFlags.monManEnvironment() in ('tier0','tier0ESD','online', 'AOD'):
)
if jobproperties.Beam.beamType()=='collisions' and hasattr(ToolSvc, 'DQFilledBunchFilterTool'):
- ZeeMonTool.FilterTools.append(monFilledBunchFilterTool)
- ToolSvc+=ZeeMonTool
- monManEgamma.AthenaMonTools += [ "ZeeTaPMonTool/ZeeMonTool" ]
+ ZeeMonTool.FilterTools += [monFilledBunchFilterTool]
+ #ToolSvc+=ZeeMonTool
+ monManEgamma.AthenaMonTools += [ ZeeMonTool ]
if(egammaMonitorJPsi):
from egammaPerformance.egammaPerformanceConf import ZeeTaPMonTool
@@ -225,9 +225,9 @@ if DQMonFlags.monManEnvironment() in ('tier0','tier0ESD','online', 'AOD'):
OutputLevel = egammaMonOutputLevel,
)
if jobproperties.Beam.beamType()=='collisions' and hasattr(ToolSvc, 'DQFilledBunchFilterTool'):
- JPsiMonTool.FilterTools.append(monFilledBunchFilterTool)
- ToolSvc+=JPsiMonTool
- monManEgamma.AthenaMonTools += [ "ZeeTaPMonTool/JPsiMonTool" ]
+ JPsiMonTool.FilterTools += [monFilledBunchFilterTool]
+ #ToolSvc+=JPsiMonTool
+ monManEgamma.AthenaMonTools += [ JPsiMonTool ]
if(egammaMonitorUpsilon1S):
from egammaPerformance.egammaPerformanceConf import physicsMonTool
@@ -245,8 +245,8 @@ if DQMonFlags.monManEnvironment() in ('tier0','tier0ESD','online', 'AOD'):
TrigDecisionTool = MyTrigDecisionTool,
UseTrigger = MyDoTrigger)
- ToolSvc+=Upsilon1SMonTool
- monManEgamma.AthenaMonTools += [ "physicsMonTool/Upsilon1SMonTool" ]
+ #ToolSvc+=Upsilon1SMonTool
+ monManEgamma.AthenaMonTools += [ Upsilon1SMonTool ]
if(egammaMonitorUpsilon2S):
@@ -265,8 +265,8 @@ if DQMonFlags.monManEnvironment() in ('tier0','tier0ESD','online', 'AOD'):
TrigDecisionTool = MyTrigDecisionTool,
UseTrigger = MyDoTrigger)
- ToolSvc+=Upsilon2SMonTool
- monManEgamma.AthenaMonTools += [ "physicsMonTool/Upsilon2SMonTool" ]
+ #ToolSvc+=Upsilon2SMonTool
+ monManEgamma.AthenaMonTools += [ Upsilon2SMonTool ]
if(egammaMonitorWenu):
from egammaPerformance.egammaPerformanceConf import ephysicsMonTool
@@ -290,8 +290,8 @@ if DQMonFlags.monManEnvironment() in ('tier0','tier0ESD','online', 'AOD'):
TrigDecisionTool = MyTrigDecisionTool,
UseTrigger = MyDoTrigger)
- ToolSvc+=WenuMonTool
- monManEgamma.AthenaMonTools += [ "ephysicsMonTool/WenuMonTool" ]
+ #ToolSvc+=WenuMonTool
+ monManEgamma.AthenaMonTools += [ WenuMonTool ]
if(egammaMonitorTop):
from egammaPerformance.egammaPerformanceConf import TopphysicsMonTool
@@ -315,8 +315,8 @@ if DQMonFlags.monManEnvironment() in ('tier0','tier0ESD','online', 'AOD'):
TrigDecisionTool = MyTrigDecisionTool,
UseTrigger = MyDoTrigger)
- ToolSvc+=TopMonTool
- monManEgamma.AthenaMonTools += [ "TopphysicsMonTool/TopMonTool" ]
+ #ToolSvc+=TopMonTool
+ monManEgamma.AthenaMonTools += [ TopMonTool ]
diff --git a/Reconstruction/egamma/egammaPerformance/share/egammaMonitoring_jobOptions_aod.py b/Reconstruction/egamma/egammaPerformance/share/egammaMonitoring_jobOptions_aod.py
index aa95f7893bf8..d318840a25c1 100644
--- a/Reconstruction/egamma/egammaPerformance/share/egammaMonitoring_jobOptions_aod.py
+++ b/Reconstruction/egamma/egammaPerformance/share/egammaMonitoring_jobOptions_aod.py
@@ -97,10 +97,10 @@ if DQMonFlags.monManEnvironment() == 'tier0ESD':
phMonTool.FilterTools += [ monbadlb ]
- if jobproperties.Beam.beamType()=='collisions' and hasattr(ToolSvc, 'DQFilledBunchFilterTool'):
- phMonTool.FilterTools.append(monFilledBunchFilterTool)
- ToolSvc+=phMonTool
- monManEgamma.AthenaMonTools += [ "photonMonTool/phMonTool" ]
+ if jobproperties.Beam.beamType()=='collisions' and hasattr(#ToolSvc, 'DQFilledBunchFilterTool'):
+ phMonTool.FilterTools += [monFilledBunchFilterTool]
+ #ToolSvc+=phMonTool
+ monManEgamma.AthenaMonTools += [ phMonTool ]
if(egammaMonitorElectrons):
from egammaPerformance.egammaPerformanceConf import electronMonTool
@@ -118,10 +118,10 @@ if DQMonFlags.monManEnvironment() == 'tier0ESD':
elMonTool.FilterTools += [ monbadlb ]
- if jobproperties.Beam.beamType()=='collisions' and hasattr(ToolSvc, 'DQFilledBunchFilterTool'):
- elMonTool.FilterTools.append(monFilledBunchFilterTool)
- ToolSvc+=elMonTool
- monManEgamma.AthenaMonTools += [ "electronMonTool/elMonTool" ]
+ if jobproperties.Beam.beamType()=='collisions' and hasattr(#ToolSvc, 'DQFilledBunchFilterTool'):
+ elMonTool.FilterTools += [monFilledBunchFilterTool]
+ #ToolSvc+=elMonTool
+ monManEgamma.AthenaMonTools += [ elMonTool ]
if(egammaMonitorFwdEg):
@@ -135,10 +135,10 @@ if DQMonFlags.monManEnvironment() == 'tier0ESD':
fwdMonTool.FilterTools += [ monbadlb ]
- if jobproperties.Beam.beamType()=='collisions' and hasattr(ToolSvc, 'DQFilledBunchFilterTool'):
- fwdMonTool.FilterTools.append(monFilledBunchFilterTool)
- ToolSvc+=fwdMonTool
- monManEgamma.AthenaMonTools += [ "forwardEgammaMonTool/fwdMonTool" ]
+ if jobproperties.Beam.beamType()=='collisions' and hasattr(#ToolSvc, 'DQFilledBunchFilterTool'):
+ fwdMonTool.FilterTools += [monFilledBunchFilterTool]
+ #ToolSvc+=fwdMonTool
+ monManEgamma.AthenaMonTools += [ fwdMonTool ]
if(egammaMonitorSoftEg):
from egammaPerformance.egammaPerformanceConf import softEMonTool
@@ -155,10 +155,10 @@ if DQMonFlags.monManEnvironment() == 'tier0ESD':
sfMonTool.FilterTools += [ monbadlb ]
- if jobproperties.Beam.beamType()=='collisions' and hasattr(ToolSvc, 'DQFilledBunchFilterTool'):
- sfMonTool.FilterTools.append(monFilledBunchFilterTool)
- ToolSvc+=sfMonTool
- monManEgamma.AthenaMonTools += [ "softEMonTool/sfMonTool" ]
+ if jobproperties.Beam.beamType()=='collisions' and hasattr(#ToolSvc, 'DQFilledBunchFilterTool'):
+ sfMonTool.FilterTools += [monFilledBunchFilterTool]
+ #ToolSvc+=sfMonTool
+ monManEgamma.AthenaMonTools += [ sfMonTool ]
if(egammaMonitorZee):
@@ -177,8 +177,8 @@ if DQMonFlags.monManEnvironment() == 'tier0ESD':
TrigDecisionTool = MyTrigDecisionTool,
UseTrigger = DQMonFlags.useTrigger())
- ToolSvc+=ZeeMonTool
- monManEgamma.AthenaMonTools += [ "physicsMonTool/ZeeMonTool" ]
+ #ToolSvc+=ZeeMonTool
+ monManEgamma.AthenaMonTools += [ ZeeMonTool ]
if(egammaMonitorJPsi):
from egammaPerformance.egammaPerformanceConf import physicsMonTool
@@ -196,8 +196,8 @@ if DQMonFlags.monManEnvironment() == 'tier0ESD':
TrigDecisionTool = MyTrigDecisionTool,
UseTrigger = DQMonFlags.useTrigger())
- ToolSvc+=JPsiMonTool
- monManEgamma.AthenaMonTools += [ "physicsMonTool/JPsiMonTool" ]
+ #ToolSvc+=JPsiMonTool
+ monManEgamma.AthenaMonTools += [ JPsiMonTool ]
if(egammaMonitorUpsilon1S):
@@ -216,8 +216,8 @@ if DQMonFlags.monManEnvironment() == 'tier0ESD':
TrigDecisionTool = MyTrigDecisionTool,
UseTrigger = DQMonFlags.useTrigger())
- ToolSvc+=Upsilon1SMonTool
- monManEgamma.AthenaMonTools += [ "physicsMonTool/Upsilon1SMonTool" ]
+ #ToolSvc+=Upsilon1SMonTool
+ monManEgamma.AthenaMonTools += [ Upsilon1SMonTool ]
if(egammaMonitorUpsilon2S):
@@ -236,8 +236,8 @@ if DQMonFlags.monManEnvironment() == 'tier0ESD':
TrigDecisionTool = MyTrigDecisionTool,
UseTrigger = DQMonFlags.useTrigger())
- ToolSvc+=Upsilon2SMonTool
- monManEgamma.AthenaMonTools += [ "physicsMonTool/Upsilon2SMonTool" ]
+ #ToolSvc+=Upsilon2SMonTool
+ monManEgamma.AthenaMonTools += [ Upsilon2SMonTool ]
if(egammaMonitorWenu):
from egammaPerformance.egammaPerformanceConf import ephysicsMonTool
@@ -261,8 +261,8 @@ if DQMonFlags.monManEnvironment() == 'tier0ESD':
TrigDecisionTool = MyTrigDecisionTool,
UseTrigger = DQMonFlags.useTrigger())
- ToolSvc+=WenuMonTool
- monManEgamma.AthenaMonTools += [ "ephysicsMonTool/WenuMonTool" ]
+ #ToolSvc+=WenuMonTool
+ monManEgamma.AthenaMonTools += [ WenuMonTool ]
if(egammaMonitorTop):
@@ -287,8 +287,8 @@ if DQMonFlags.monManEnvironment() == 'tier0ESD':
TrigDecisionTool = MyTrigDecisionTool,
UseTrigger = DQMonFlags.useTrigger())
- ToolSvc+=TopMonTool
- monManEgamma.AthenaMonTools += [ "TopphysicsMonTool/TopMonTool" ]
+ #ToolSvc+=TopMonTool
+ monManEgamma.AthenaMonTools += [ TopMonTool ]
diff --git a/Reconstruction/egamma/egammaPerformance/share/egamma_MonitorTool.py b/Reconstruction/egamma/egammaPerformance/share/egamma_MonitorTool.py
index 6ea8c9dd6f80..8c4869e9a8d9 100755
--- a/Reconstruction/egamma/egammaPerformance/share/egamma_MonitorTool.py
+++ b/Reconstruction/egamma/egammaPerformance/share/egamma_MonitorTool.py
@@ -37,8 +37,8 @@ phMonTool = photonMonTool(name= "phMonTool",
Photon_Selection_Items = ["all","tight"])
-ToolSvc+=phMonTool
-monMan.AthenaMonTools += [ "photonMonTool/phMonTool" ]
+#ToolSvc+=phMonTool
+monMan.AthenaMonTools += [ phMonTool ]
from egammaPerformance.egammaPerformanceConf import electronMonTool
elMonTool = electronMonTool(name= "elMonTool",
@@ -49,16 +49,16 @@ elMonTool = electronMonTool(name= "elMonTool",
Electron_Trigger_Items = ["EF_e10_medium"],
Electron_Selection_Items = ["all","loose","medium","tight"])
-ToolSvc+=elMonTool
-monMan.AthenaMonTools += [ "electronMonTool/elMonTool" ]
+#ToolSvc+=elMonTool
+monMan.AthenaMonTools += [ elMonTool ]
from egammaPerformance.egammaPerformanceConf import forwardEgammaMonTool
fwdMonTool = forwardEgammaMonTool(name= "fwdMonTool",
ElectronContainer ="ElectronAODCollection",
Electron_Selection_Items = ["all","tight","loose"])
-ToolSvc+=fwdMonTool
-monMan.AthenaMonTools += [ "forwardEgammaMonTool/fwdMonTool" ]
+#ToolSvc+=fwdMonTool
+monMan.AthenaMonTools += [ fwdMonTool ]
from egammaPerformance.egammaPerformanceConf import physicsMonTool
@@ -73,8 +73,8 @@ ZeeMonTool = physicsMonTool(name= "ZeeMonTool",
massLowerCut = 70000,
massUpperCut = 110000)
-ToolSvc+=ZeeMonTool
-monMan.AthenaMonTools += [ "physicsMonTool/ZeeMonTool" ]
+#ToolSvc+=ZeeMonTool
+monMan.AthenaMonTools += [ ZeeMonTool ]
from egammaPerformance.egammaPerformanceConf import physicsMonTool
JPsiMonTool = physicsMonTool(name= "JPsiMonTool",
@@ -88,8 +88,8 @@ JPsiMonTool = physicsMonTool(name= "JPsiMonTool",
massLowerCut = 1000,
massUpperCut = 5000)
-ToolSvc+=JPsiMonTool
-monMan.AthenaMonTools += [ "physicsMonTool/JPsiMonTool" ]
+#ToolSvc+=JPsiMonTool
+monMan.AthenaMonTools += [ JPsiMonTool ]
from egammaPerformance.egammaPerformanceConf import physicsMonTool
Upsilon1SMonTool = physicsMonTool(name= "Upsilon1SMonTool",
@@ -103,8 +103,8 @@ Upsilon1SMonTool = physicsMonTool(name= "Upsilon1SMonTool",
massLowerCut = 5000,
massUpperCut = 15000)
-ToolSvc+=Upsilon1SMonTool
-monMan.AthenaMonTools += [ "physicsMonTool/Upsilon1SMonTool" ]
+#ToolSvc+=Upsilon1SMonTool
+monMan.AthenaMonTools += [ Upsilon1SMonTool ]
from egammaPerformance.egammaPerformanceConf import physicsMonTool
@@ -119,8 +119,8 @@ Upsilon2SMonTool = physicsMonTool(name= "Upsilon2SMonTool",
massLowerCut = 5000,
massUpperCut = 15000)
-ToolSvc+=Upsilon2SMonTool
-monMan.AthenaMonTools += [ "physicsMonTool/Upsilon2SMonTool" ]
+#ToolSvc+=Upsilon2SMonTool
+monMan.AthenaMonTools += [ Upsilon2SMonTool ]
@@ -143,8 +143,8 @@ WenuMonTool = ephysicsMonTool(name= "WenuMonTool",
JetEnergyCut = 30000,
DeltaRCut = 1)
-ToolSvc+=WenuMonTool
-monMan.AthenaMonTools += [ "ephysicsMonTool/WenuMonTool" ]
+#ToolSvc+=WenuMonTool
+monMan.AthenaMonTools += [ WenuMonTool ]
diff --git a/Reconstruction/tauMonitoring/share/tauMonitoring_jobOptions.py b/Reconstruction/tauMonitoring/share/tauMonitoring_jobOptions.py
index 70a10e25d168..1c9ad311afcc 100644
--- a/Reconstruction/tauMonitoring/share/tauMonitoring_jobOptions.py
+++ b/Reconstruction/tauMonitoring/share/tauMonitoring_jobOptions.py
@@ -41,7 +41,7 @@ if tauMonTool.doTrigger :
tauMonTool.TauEleJetMbtsTriggerItems = [ [ "L1_TAU1.*" , "L1_TAU2.*" , "L1_TAU60" , "L1_EM15VHI_2TAU.*" , "L1_EM15VHI_TAU40.*" , "L1_MU10_TAU.*" , "L1_J25_3J12_EM15-TAU.*" ] , [ "HLT_e2.*" , "L1_EM2.*" , "L1_2EM15" ] , [ "HLT_j55" , "HLT_j60" , "HLT_j85" , "HLT_j110" , "HLT_j175" , "HLT_4j85" , "HLT_4j10.*" ] , [ "HLT_mb_sp2000_trk70_hmt" ] ]
tauMonTool.FilterTools = [ monAtlasReadyFilterTool ]
-tauMonTool.FilterTools.append(monbadlb)
-ToolSvc += tauMonTool
+tauMonTool.FilterTools += [monbadlb]
+#ToolSvc += tauMonTool
monManTau.AthenaMonTools += [ tauMonTool ]
diff --git a/TileCalorimeter/TileExample/TileRecEx/share/jobOptions_TileCalibRec.py b/TileCalorimeter/TileExample/TileRecEx/share/jobOptions_TileCalibRec.py
index 3163ff78c3bb..2144c173c715 100644
--- a/TileCalorimeter/TileExample/TileRecEx/share/jobOptions_TileCalibRec.py
+++ b/TileCalorimeter/TileExample/TileRecEx/share/jobOptions_TileCalibRec.py
@@ -1222,7 +1222,7 @@ if doTileMon:
TileMon.Run = RunNumber
TileMon.LumiBlock = 1
- from AthenaCommon.AppMgr import ToolSvc
+ #from AthenaCommon.AppMgr import ToolSvc
from TileMonitoring.TileMonitoringConf import *
doTileMonDigi = ReadDigits
@@ -1242,7 +1242,7 @@ if doTileMon:
book2D = b2d,
runType = runType,
FillPedestalDifference = True)
- ToolSvc += theTileDigitsMon
+ #ToolSvc += theTileDigitsMon
TileMon.AthenaMonTools += [ theTileDigitsMon ]
print theTileDigitsMon
@@ -1253,7 +1253,7 @@ if doTileMon:
book2D = b2d,
PlotDSP = useRODReco,
runType = runType )
- ToolSvc += theTileRawChannelMon
+ #ToolSvc += theTileRawChannelMon
TileMon.AthenaMonTools += [ theTileRawChannelMon ]
theTileRawChannelMon.TileRawChannelContainer = "TileRawChannelCnt"; # default for simulation
@@ -1321,7 +1321,7 @@ if doTileMon:
if useRODReco:
theTileDQFragMon.TileRawChannelContainerDSP = "TileRawChannelCnt"
- ToolSvc += theTileDQFragMon;
+ #ToolSvc += theTileDQFragMon;
TileMon.AthenaMonTools += [ theTileDQFragMon ];
print theTileDQFragMon
@@ -1334,7 +1334,7 @@ if doTileMon:
negEnergyThreshold = -2000,
energyThreshold = 300,
histoPathBase = "/Tile/Cell");
- ToolSvc += theTileCellMonHG;
+ #ToolSvc += theTileCellMonHG;
TileMon.AthenaMonTools += [ theTileCellMonHG ];
print theTileCellMonHG;
@@ -1350,7 +1350,7 @@ if doTileMon:
#theTileCellMon.energyThreshold = 300.
#theTileCellMon.energyThresholdForTime = 150.
#theTileCellMon.FillTimeHistograms = True
- ToolSvc += theTileCellMon;
+ #ToolSvc += theTileCellMon;
TileMon.AthenaMonTools += [ theTileCellMon ];
print theTileCellMon;
@@ -1361,7 +1361,7 @@ if doTileMon:
histoPathBase = "/Tile/DigiNoise" );
if not TileBiGainRun: TileDigiNoiseMon.TriggerTypes = [ 0x82 ]
- ToolSvc += TileDigiNoiseMon;
+ #ToolSvc += TileDigiNoiseMon;
TileMon.AthenaMonTools += [ TileDigiNoiseMon ];
print TileDigiNoiseMon;
@@ -1373,7 +1373,7 @@ if doTileMon:
histoPathBase = "/Tile/CellNoise/LG");
TileCellNoiseMonLG.Xmin = -2000.;
TileCellNoiseMonLG.Xmax = 2000.;
- ToolSvc += TileCellNoiseMonLG;
+ #ToolSvc += TileCellNoiseMonLG;
TileMon.AthenaMonTools += [ TileCellNoiseMonLG ];
print TileCellNoiseMonLG;
@@ -1385,7 +1385,7 @@ if doTileMon:
histoPathBase = "/Tile/CellNoise/HG");
TileCellNoiseMonHG.Xmin = -300.;
TileCellNoiseMonHG.Xmax = 300.;
- ToolSvc += TileCellNoiseMonHG;
+ #ToolSvc += TileCellNoiseMonHG;
TileMon.AthenaMonTools += [ TileCellNoiseMonHG ];
print TileCellNoiseMonHG;
@@ -1397,7 +1397,7 @@ if doTileMon:
histoPathBase = "/Tile/CellNoise");
TileCellNoiseMon.Xmin = -2000.;
TileCellNoiseMon.Xmax = 2000.;
- ToolSvc += TileCellNoiseMon;
+ #ToolSvc += TileCellNoiseMon;
TileMon.AthenaMonTools += [ TileCellNoiseMon ];
print TileCellNoiseMon;
@@ -1411,7 +1411,7 @@ if doTileMon:
doOnline = athenaCommonFlags.isOnline(),
TileRawChannelContainer = "TileRawChannelFit")
- ToolSvc += TileRawChannelTimeMon
+ #ToolSvc += TileRawChannelTimeMon
TileMon.AthenaMonTools += [ TileRawChannelTimeMon ];
print TileRawChannelTimeMon
@@ -1431,7 +1431,7 @@ if doTileMon:
# doFit = True,
SummaryUpdateFrequency = 0 );
- ToolSvc += TileRawChannelNoiseMonLG;
+ #ToolSvc += TileRawChannelNoiseMonLG;
TileMon.AthenaMonTools += [ TileRawChannelNoiseMonLG ];
print TileRawChannelNoiseMonLG;
@@ -1448,7 +1448,7 @@ if doTileMon:
SummaryUpdateFrequency = 0 );
- ToolSvc += TileRawChannelNoiseMonHG;
+ #ToolSvc += TileRawChannelNoiseMonHG;
TileMon.AthenaMonTools += [ TileRawChannelNoiseMonHG ];
print TileRawChannelNoiseMonHG;
@@ -1468,7 +1468,7 @@ if doTileMon:
# if not defined here, then by default all triggers will be considered
TileRawChannelNoiseMon.TriggerTypes = [ 0x82 ];
- ToolSvc += TileRawChannelNoiseMon;
+ #ToolSvc += TileRawChannelNoiseMon;
TileMon.AthenaMonTools += [ TileRawChannelNoiseMon ];
print TileRawChannelNoiseMon;
@@ -1476,27 +1476,27 @@ if doTileMon:
########### end doTileCellNoiseMon ##########
if doTileTMDBDigitsMon:
- ToolSvc += CfgMgr.TileTMDBDigitsMonTool(name = 'TileTMDBDigitsMon'
+ TileTMDBDigitsMon = CfgMgr.TileTMDBDigitsMonTool(name = 'TileTMDBDigitsMon'
, OutputLevel = INFO
, TileDigitsContainer = "MuRcvDigitsCnt"
, histoPathBase = "/Tile/TMDBDigits")
- TileMon.AthenaMonTools += [ ToolSvc.TileTMDBDigitsMon ]
- print ToolSvc.TileTMDBDigitsMon
+ TileMon.AthenaMonTools += [ TileTMDBDigitsMon ]
+ print TileTMDBDigitsMon
if doTileTMDBRawChannelMon:
- ToolSvc += CfgMgr.TileTMDBRawChannelMonTool(name = 'TileTMDBRawChannelDspMon'
+ TileTMDBRawChannelDspMon = CfgMgr.TileTMDBRawChannelMonTool(name = 'TileTMDBRawChannelDspMon'
, OutputLevel = INFO
, NotDSP = False
, TileRawChannelContainer = "MuRcvRawChCnt"
, histoPathBase = "/Tile/TMDBRawChannel/Dsp")
- TileMon.AthenaMonTools += [ToolSvc.TileTMDBRawChannelDspMon ]
- print ToolSvc.TileTMDBRawChannelDspMon
+ TileMon.AthenaMonTools += [TileTMDBRawChannelDspMon ]
+ print TileTMDBRawChannelDspMon
- ToolSvc += CfgMgr.TileTMDBRawChannelMonTool(name = 'TileTMDBRawChannelMon'
+ TileTMDBRawChannelMon = CfgMgr.TileTMDBRawChannelMonTool(name = 'TileTMDBRawChannelMon'
, OutputLevel = INFO
, TileRawChannelContainer = "TileMuRcvRawChannelOpt2"
, NotDSP = True
@@ -1504,8 +1504,8 @@ if doTileMon:
, histoPathBase = "/Tile/TMDBRawChannel")
- TileMon.AthenaMonTools += [ToolSvc.TileTMDBRawChannelMon ]
- print ToolSvc.TileTMDBRawChannelMon
+ TileMon.AthenaMonTools += [TileTMDBRawChannelMon ]
+ print TileTMDBRawChannelMon
if doTileMonDigi or doTileMonRch or doTileMonCell or doTileMonDQ \
@@ -1567,7 +1567,7 @@ if doTileCalib:
TileCisTool.StuckBitsProbsTool = ToolSvc.TileDigitsMon
TileCisTool.removePed = True
- from AthenaCommon.AppMgr import ToolSvc
+ #from AthenaCommon.AppMgr import ToolSvc
ToolSvc += TileCisTool
TileCalibAlg.TileCalibTools += [ TileCisTool ]
@@ -1587,7 +1587,7 @@ if doTileCalib:
# declare Trigger tool(s) and set jobOptions if necessary
TileTriggerTool = TileTriggerDefaultCalibTool()
- from AthenaCommon.AppMgr import ToolSvc
+ #from AthenaCommon.AppMgr import ToolSvc
ToolSvc += TileTriggerTool
TileCalibAlg.TileCalibTools += [ TileTriggerTool ]
@@ -1608,7 +1608,7 @@ if doTileCalib:
if hasattr(ToolSvc, 'TileDigitsMon'):
TileLaserTool.StuckBitsProbsTool = ToolSvc.TileDigitsMon
- from AthenaCommon.AppMgr import ToolSvc
+ #from AthenaCommon.AppMgr import ToolSvc
ToolSvc += TileLaserTool
TileCalibAlg.Tools = [ TileLaserTool ]
@@ -1648,7 +1648,7 @@ if doEventDisplay:
if doAtlantis:
include("JiveXML/JiveXML_jobOptionBase.py")
- from AthenaCommon.AppMgr import ToolSvc
+ #from AthenaCommon.AppMgr import ToolSvc
if 'doAtlantisStreamToServer' in dir() and doAtlantisStreamToServer:
from JiveXML.JiveXMLConf import JiveXML__ONCRPCServerSvc
diff --git a/TileCalorimeter/TileMonitoring/share/TileMon_jobOptions.py b/TileCalorimeter/TileMonitoring/share/TileMon_jobOptions.py
index 0b9cc9e39df3..db71745dbd64 100644
--- a/TileCalorimeter/TileMonitoring/share/TileMon_jobOptions.py
+++ b/TileCalorimeter/TileMonitoring/share/TileMon_jobOptions.py
@@ -55,60 +55,60 @@ if tileESDMon:
TileCellMon.FillTimeHistograms = True
TileCellMon.energyThresholdForTime = 150.0
- ToolSvc += TileCellMon;
+ #ToolSvc += TileCellMon;
ManagedAthenaTileMon.AthenaMonTools += [ TileCellMon ];
include ("TileMonitoring/TileMonTower_jobOptions.py")
- ToolSvc += CfgMgr.TileTowerMonTool(name = 'TileTowerMon'
+ TileTowerMon = CfgMgr.TileTowerMonTool(name = 'TileTowerMon'
, OutputLevel = INFO
, towersContainerName = "TileTower"
, FillHistogramsForL1Triggers = []
, histoPathBase = "/Tile/Tower");
- ManagedAthenaTileMon.AthenaMonTools += [ ToolSvc.TileTowerMon ];
+ ManagedAthenaTileMon.AthenaMonTools += [ TileTowerMon ];
include ("TileMonitoring/TileMonTopoCluster_jobOptions.py")
- ToolSvc += CfgMgr.TileClusterMonTool(name = 'TileClusterMon'
+ TileClusterMon = CfgMgr.TileClusterMonTool(name = 'TileClusterMon'
, OutputLevel = INFO
, clustersContainerName = "TileTopoCluster"
, FillHistogramsForL1Triggers = []
, histoPathBase = "/Tile/Cluster");
- ManagedAthenaTileMon.AthenaMonTools += [ ToolSvc.TileClusterMon ];
+ ManagedAthenaTileMon.AthenaMonTools += [ TileClusterMon ];
if (jobproperties.Beam.beamType() == 'cosmics' or jobproperties.Beam.beamType() == 'singlebeam'):
- ToolSvc += CfgMgr.TileMuonFitMonTool(name = 'TileMuonFitMon'
+ TileMuonFitMon = CfgMgr.TileMuonFitMonTool(name = 'TileMuonFitMon'
, OutputLevel = INFO
, UseLVL1 = DQMonFlags.useTrigger()
, FillHistogramsForL1Triggers = []
, histoPathBase = "/Tile/MuonFit")
- ManagedAthenaTileMon.AthenaMonTools += [ ToolSvc.TileMuonFitMon ]
+ ManagedAthenaTileMon.AthenaMonTools += [ TileMuonFitMon ]
- ToolSvc += CfgMgr.TileMuIdMonTool(name = 'TileMuIdMon'
+ TileMuIdMon = CfgMgr.TileMuIdMonTool(name = 'TileMuIdMon'
, OutputLevel = INFO
, FillHistogramsForL1Triggers = []
, histoPathBase = "/Tile/Muid")
- ManagedAthenaTileMon.AthenaMonTools += [ ToolSvc.TileMuIdMon ];
+ ManagedAthenaTileMon.AthenaMonTools += [ TileMuIdMon ];
- ToolSvc += CfgMgr.TileL2MonTool(name = 'TileL2MuMon'
+ TileL2MuMon = CfgMgr.TileL2MonTool(name = 'TileL2MuMon'
, OutputLevel = INFO
, FillHistogramsForL1Triggers = []
, histoPathBase = "/Tile/L2Muon")
- ManagedAthenaTileMon.AthenaMonTools += [ ToolSvc.TileL2MuMon ];
+ ManagedAthenaTileMon.AthenaMonTools += [ TileL2MuMon ];
if (jobproperties.Beam.beamType() == 'collisions'):
- ToolSvc += CfgMgr.TileJetMonTool(name = 'TileJetMonTool'
+ TileJetMonTool = CfgMgr.TileJetMonTool(name = 'TileJetMonTool'
, OutputLevel = INFO
, jetPtMin = 20000.0
, jetEtaMax = 1.6
@@ -135,31 +135,31 @@ if tileESDMon:
cleaning.CutLevel = "LooseBad"
cleaning.DoUgly = False
ToolSvc += cleaning
- ToolSvc.TileJetMonTool.do_jet_cleaning = True
- ToolSvc.TileJetMonTool.useJVTTool = jvt
- ToolSvc.TileJetMonTool.useJetCleaning = cleaning
+ TileJetMonTool.do_jet_cleaning = True
+ TileJetMonTool.useJVTTool = jvt
+ TileJetMonTool.useJetCleaning = cleaning
if DQMonFlags.monManDataType == 'heavyioncollisions':
if not rec.doHIP():
- ToolSvc.TileJetMonTool.jetCollectionName = 'AntiKt4HIJets'
- ToolSvc.TileJetMonTool.do_event_cleaning = False
- ToolSvc.TileJetMonTool.do_jet_cleaning = False
+ TileJetMonTool.jetCollectionName = 'AntiKt4HIJets'
+ TileJetMonTool.do_event_cleaning = False
+ TileJetMonTool.do_jet_cleaning = False
- ManagedAthenaTileMon.AthenaMonTools += [ ToolSvc.TileJetMonTool ]
+ ManagedAthenaTileMon.AthenaMonTools += [ TileJetMonTool ]
if (not 'doTileTMDBRawChannelMon' in dir() or doTileTMDBRawChannelMon) and (DQMonFlags.useTrigger() and rec.doTrigger()):
from TileConditions.TileCondToolConf import getTileCondToolTMDB
tileCondToolTMDB = getTileCondToolTMDB('COOL')
if tileCondToolTMDB:
ToolSvc += tileCondToolTMDB
- ToolSvc += CfgMgr.TileTMDBRawChannelMonTool(name = 'TileTMDBRawChannelDspMon'
+ TileTMDBRawChannelDspMon = CfgMgr.TileTMDBRawChannelMonTool(name = 'TileTMDBRawChannelDspMon'
, OutputLevel = INFO
, NotDSP = False
, Efficiency = True
, TileRawChannelContainer = "MuRcvRawChCnt"
, TileCondToolTMDB = tileCondToolTMDB
, histoPathBase = "/Tile/TMDBRawChannel/Dsp")
- ManagedAthenaTileMon.AthenaMonTools += [ ToolSvc.TileTMDBRawChannelDspMon ];
+ ManagedAthenaTileMon.AthenaMonTools += [ TileTMDBRawChannelDspMon ];
@@ -180,21 +180,21 @@ if tileRawMon:
if globalflags.InputFormat() == 'pool':
TileMBTSMon.TileDigitsContainerName = 'TileDigitsFlt'
- ToolSvc += TileMBTSMon;
+ #ToolSvc += TileMBTSMon;
ManagedAthenaTileMon.AthenaMonTools += [ TileMBTSMon ]
from TileRecUtils.TileRecFlags import jobproperties
if jobproperties.TileRecFlags.readDigits():
if 'doTileRODMon' in dir() and doTileRODMon:
- ToolSvc += CfgMgr.TileRODMonTool( name = 'TileRODMon'
+ TileRODMon = CfgMgr.TileRODMonTool( name = 'TileRODMon'
, OutputLevel = INFO
, histoPathBase = "/Tile/ROD"
, FillHistogramsForL1Triggers = []
, doOnline = athenaCommonFlags.isOnline())
- ManagedAthenaTileMon.AthenaMonTools += [ ToolSvc.TileRODMon ]
+ ManagedAthenaTileMon.AthenaMonTools += [ TileRODMon ]
- ToolSvc += CfgMgr.TileDigiNoiseMonTool(name = 'TileDigiNoiseMon'
+ TileDigiNoiseMon = CfgMgr.TileDigiNoiseMonTool(name = 'TileDigiNoiseMon'
, OutputLevel = INFO
, TileDigitsContainer = "TileDigitsCnt"
, histoPathBase = "/Tile/DigiNoise"
@@ -203,12 +203,12 @@ if tileRawMon:
, TriggerTypes = [ 0x82 ]);
if globalflags.InputFormat() == 'pool':
- ToolSvc.TileDigiNoiseMon.TileDigitsContainer = 'TileDigitsFlt'
+ TileDigiNoiseMon.TileDigitsContainer = 'TileDigitsFlt'
- ManagedAthenaTileMon.AthenaMonTools += [ ToolSvc.TileDigiNoiseMon ]
+ ManagedAthenaTileMon.AthenaMonTools += [ TileDigiNoiseMon ]
- ToolSvc += CfgMgr.TileDQFragLWMonTool(name = 'TileDQFragMon'
+ TileDQFragMon = CfgMgr.TileDQFragLWMonTool(name = 'TileDQFragMon'
, OutputLevel = INFO
, TileRawChannelContainer = jobproperties.TileRecFlags.TileRawChannelContainer()
, TileDigitsContainer = "TileDigitsCnt"
@@ -222,9 +222,9 @@ if tileRawMon:
if globalflags.InputFormat() == 'pool':
- ToolSvc.TileDQFragMon.TileDigitsContainer = 'TileDigitsFlt'
+ TileDQFragMon.TileDigitsContainer = 'TileDigitsFlt'
- ManagedAthenaTileMon.AthenaMonTools += [ ToolSvc.TileDQFragMon ]
+ ManagedAthenaTileMon.AthenaMonTools += [ TileDQFragMon ]
topSequence += ManagedAthenaTileMon;
print ManagedAthenaTileMon;
diff --git a/TileCalorimeter/TileMonitoring/share/Tile_JetMonTool_time.py b/TileCalorimeter/TileMonitoring/share/Tile_JetMonTool_time.py
index 4e491371f615..af7dfe8f4c32 100644
--- a/TileCalorimeter/TileMonitoring/share/Tile_JetMonTool_time.py
+++ b/TileCalorimeter/TileMonitoring/share/Tile_JetMonTool_time.py
@@ -254,7 +254,7 @@ TileJetMonTool = TileJetMonTool(name = 'TileJetMonTool',
useJetCleaning = cleaning,
jet_JVT_threshold = 0.64,
OutputLevel = INFO);
-ToolSvc += TileJetMonTool;
+#ToolSvc += TileJetMonTool;
ManagedAthenaTileMon.AthenaMonTools += [ TileJetMonTool ];
diff --git a/Trigger/TrigAnalysis/TrigEgammaAnalysisTools/python/TrigEgammaMonToolConfig.py b/Trigger/TrigAnalysis/TrigEgammaAnalysisTools/python/TrigEgammaMonToolConfig.py
index 64a8c5d8ceb2..96f9961fb6f5 100644
--- a/Trigger/TrigAnalysis/TrigEgammaAnalysisTools/python/TrigEgammaMonToolConfig.py
+++ b/Trigger/TrigAnalysis/TrigEgammaAnalysisTools/python/TrigEgammaMonToolConfig.py
@@ -1,7 +1,7 @@
# Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
def TrigEgammaMonTool():
- from AthenaCommon.AppMgr import ToolSvc
+ #from AthenaCommon.AppMgr import ToolSvc
from TrigEgammaAnalysisTools.TrigEgammaAnalysisToolsConfig import TrigEgammaNavAnalysisTool,TrigEgammaNavTPAnalysisTool,TrigEgammaNavTPJpsieeAnalysisTool
from TrigEgammaAnalysisTools.TrigEgammaAnalysisToolsConfig import TrigEgammaPlotTool
from TrigEgammaAnalysisTools.TrigEgammaProbelist import monitoring_mam, monitoring_electron, monitoring_photon
@@ -92,4 +92,4 @@ def TrigEgammaMonTool():
"TrigEgammaNavAnalysisTool/NavElectronAnalysis",
"TrigEgammaNavTPAnalysisTool/NavTPAnalysis",
"TrigEgammaNavTPAnalysisTool/NavTPJpsieeAnalysis"])
- ToolSvc += TrigEgammaMonTool
+ #ToolSvc += TrigEgammaMonTool
diff --git a/Trigger/TrigAnalysis/TrigEgammaAnalysisTools/python/TrigEgammaMonToolConfig50ns.py b/Trigger/TrigAnalysis/TrigEgammaAnalysisTools/python/TrigEgammaMonToolConfig50ns.py
index 00225795587a..7af1f7b52df4 100644
--- a/Trigger/TrigAnalysis/TrigEgammaAnalysisTools/python/TrigEgammaMonToolConfig50ns.py
+++ b/Trigger/TrigAnalysis/TrigEgammaAnalysisTools/python/TrigEgammaMonToolConfig50ns.py
@@ -1,7 +1,7 @@
# Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
def TrigEgammaMonTool():
- from AthenaCommon.AppMgr import ToolSvc
+ #from AthenaCommon.AppMgr import ToolSvc
from AthenaCommon import CfgMgr
from ElectronPhotonSelectorTools.ElectronPhotonSelectorToolsConf import AsgElectronIsEMSelector
from ElectronPhotonSelectorTools.ElectronIsEMSelectorMapping import ElectronIsEMMap,electronPIDmenu
@@ -109,4 +109,4 @@ def TrigEgammaMonTool():
Tools=["TrigEgammaNavAnalysisTool/NavAnalysis",
"TrigEgammaNavTPAnalysisTool/NavTPAnalysis",
"TrigEgammaNavTPAnalysisTool/NavTPJpsieeAnalysis"])
- ToolSvc += TrigEgammaMonTool
+ #ToolSvc += TrigEgammaMonTool
diff --git a/Trigger/TrigAnalysis/TrigEgammaAnalysisTools/python/TrigEgammaPhysValMonToolConfig.py b/Trigger/TrigAnalysis/TrigEgammaAnalysisTools/python/TrigEgammaPhysValMonToolConfig.py
index 8e54d18baac1..9ef1c9d44531 100644
--- a/Trigger/TrigAnalysis/TrigEgammaAnalysisTools/python/TrigEgammaPhysValMonToolConfig.py
+++ b/Trigger/TrigAnalysis/TrigEgammaAnalysisTools/python/TrigEgammaPhysValMonToolConfig.py
@@ -1,7 +1,7 @@
# Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
def TrigEgammaPhysValMonTool():
- from AthenaCommon.AppMgr import ToolSvc
+ #from AthenaCommon.AppMgr import ToolSvc
from TrigEgammaAnalysisTools.TrigEgammaAnalysisToolsConfig import TrigEgammaEmulationTool
from TrigEgammaAnalysisTools.TrigEgammaAnalysisToolsConfig import TrigEgammaNavAnalysisTool,TrigEgammaNavTPAnalysisTool, TrigEgammaNavNtuple, TrigEgammaNavTPNtuple
from TrigEgammaAnalysisTools.TrigEgammaProbelist import default, probeListLowMidPtPhysicsTriggers # to import probelist
@@ -88,7 +88,7 @@ def TrigEgammaPhysValMonTool():
"TrigEgammaNavTPNtuple/NavTPNtuple"
])
- ToolSvc += TrigEgammaPhysValMonTool
+ #ToolSvc += TrigEgammaPhysValMonTool
diff --git a/Trigger/TrigAnalysis/TrigEgammaAnalysisTools/share/testTrigEgammaAnalysisTools.py b/Trigger/TrigAnalysis/TrigEgammaAnalysisTools/share/testTrigEgammaAnalysisTools.py
index 696145e7d69d..c9204906db76 100755
--- a/Trigger/TrigAnalysis/TrigEgammaAnalysisTools/share/testTrigEgammaAnalysisTools.py
+++ b/Trigger/TrigAnalysis/TrigEgammaAnalysisTools/share/testTrigEgammaAnalysisTools.py
@@ -105,12 +105,12 @@ from TrigHLTMonitoring.TrigHLTMonitoringConf import HLTMonTool
HLTMon = HLTMonTool(name = 'HLTMon',
histoPathBase = "HLT");
-ToolSvc += HLTMon;
-HLTMonManager.AthenaMonTools += [ "HLTMonTool/HLTMon" ];
+#ToolSvc += HLTMon;
+HLTMonManager.AthenaMonTools += [ HLTMon ];
from TrigEgammaAnalysisTools import TrigEgammaMonToolConfig
-TrigEgammaMonToolConfig.TrigEgammaMonTool()
-HLTMonManager.AthenaMonTools += [ "TrigEgammaMonTool/HLTEgammaMon" ]
+HLTEgammaMon = TrigEgammaMonToolConfig.TrigEgammaMonTool()
+HLTMonManager.AthenaMonTools += [ HLTEgammaMon ]
HLTMonManager.FileKey = "GLOBAL"
diff --git a/Trigger/TrigAnalysis/TrigEgammaAnalysisTools/share/testTrigEgammaAnalysisToolsGRL.py b/Trigger/TrigAnalysis/TrigEgammaAnalysisTools/share/testTrigEgammaAnalysisToolsGRL.py
index 57af39802146..bc68fb6dccbe 100755
--- a/Trigger/TrigAnalysis/TrigEgammaAnalysisTools/share/testTrigEgammaAnalysisToolsGRL.py
+++ b/Trigger/TrigAnalysis/TrigEgammaAnalysisTools/share/testTrigEgammaAnalysisToolsGRL.py
@@ -143,12 +143,12 @@ if 'DOTIER0' in dir():
histoPathBase = "HLT");
- ToolSvc += HLTMon;
- HLTMonManager.AthenaMonTools += [ "HLTMonTool/HLTMon" ];
+ #ToolSvc += HLTMon;
+ HLTMonManager.AthenaMonTools += [ HLTMon ];
from TrigEgammaAnalysisTools import TrigEgammaMonToolConfig
- TrigEgammaMonToolConfig.TrigEgammaMonTool()
- HLTMonManager.AthenaMonTools += [ "TrigEgammaMonTool" ]
+ TrigEgammaMonTool = TrigEgammaMonToolConfig.TrigEgammaMonTool()
+ HLTMonManager.AthenaMonTools += [ TrigEgammaMonTool ]
HLTMonManager.FileKey = "GLOBAL"
elif 'DO50ns' in dir():
@@ -172,12 +172,12 @@ elif 'DO50ns' in dir():
histoPathBase = "HLT");
- ToolSvc += HLTMon;
- HLTMonManager.AthenaMonTools += [ "HLTMonTool/HLTMon" ];
+ #ToolSvc += HLTMon;
+ HLTMonManager.AthenaMonTools += [ HLTMon ];
from TrigEgammaAnalysisTools import TrigEgammaMonToolConfig50ns
- TrigEgammaMonToolConfig50ns.TrigEgammaMonTool()
- HLTMonManager.AthenaMonTools += [ "TrigEgammaMonTool" ]
+ TrigEgammaMonTool = TrigEgammaMonToolConfig50ns.TrigEgammaMonTool()
+ HLTMonManager.AthenaMonTools += [ TrigEgammaMonTool ]
HLTMonManager.FileKey = "GLOBAL"
elif 'DOPHYSVAL' in dir():
from AthenaCommon.AlgSequence import AlgSequence
diff --git a/Trigger/TrigAnalysis/TrigEgammaEmulationTool/python/TrigEgammaEmulationToolConfig.py b/Trigger/TrigAnalysis/TrigEgammaEmulationTool/python/TrigEgammaEmulationToolConfig.py
index 60f6d071af9b..160c6c2c4453 100644
--- a/Trigger/TrigAnalysis/TrigEgammaEmulationTool/python/TrigEgammaEmulationToolConfig.py
+++ b/Trigger/TrigAnalysis/TrigEgammaEmulationTool/python/TrigEgammaEmulationToolConfig.py
@@ -28,8 +28,8 @@ from ElectronPhotonSelectorTools.ElectronIsEMSelectorMapping import Electro
#ToolSvc += EgammaMatchTool
#*****************************************************************************
-from egammaMVACalib.egammaMVACalibConf import egammaMVATool
-mvatool = egammaMVATool("mvatool",folder="egammaMVACalib/v1")
+from egammaMVACalib.egammaMVACalibConf import egammaMVACalibTool
+mvatool = egammaMVACalibTool("mvatool",folder="egammaMVACalib/v1")
ToolSvc += mvatool
#*****************************************************************************
diff --git a/Trigger/TrigAnalysis/TrigEgammaEmulationTool/share/test_TrigEgammaAnalysisToolsWithEmulation.py b/Trigger/TrigAnalysis/TrigEgammaEmulationTool/share/test_TrigEgammaAnalysisToolsWithEmulation.py
index 48cf8a9ea30f..ad8c1a954ef9 100755
--- a/Trigger/TrigAnalysis/TrigEgammaEmulationTool/share/test_TrigEgammaAnalysisToolsWithEmulation.py
+++ b/Trigger/TrigAnalysis/TrigEgammaEmulationTool/share/test_TrigEgammaAnalysisToolsWithEmulation.py
@@ -140,7 +140,7 @@ HLTMonManager = topSequence.HLTMonManager
from TrigHLTMonitoring.TrigHLTMonitoringConf import HLTMonTool
HLTMon = HLTMonTool(name = 'HLTMon', histoPathBase = "HLT");
ToolSvc += HLTMon;
-HLTMonManager.AthenaMonTools += [ "HLTMonTool/HLTMon" ];
+HLTMonManager.AthenaMonTools += [ HLTMon ];
####################################################################################################
#Define the base path for all histograms
@@ -221,8 +221,8 @@ AnalysisTool = TrigEgammaNavTPAnalysisTool( name = "TrigEgammaNavTPAnalysisTool"
Tools=['TrigEgammaNavTPAnalysisTool/TrigEgammaNavTPAnalysisTool']
from TrigEgammaAnalysisTools.TrigEgammaAnalysisToolsConf import TrigEgammaMonTool
TrigEgammaMonTool = TrigEgammaMonTool( name = "HLTEgammaMon", histoPathBase=basePath, Tools=Tools)
-ToolSvc += TrigEgammaMonTool
-HLTMonManager.AthenaMonTools += [ "TrigEgammaMonTool/HLTEgammaMon" ]
+#ToolSvc += TrigEgammaMonTool
+HLTMonManager.AthenaMonTools += [ TrigEgammaMonTool ]
HLTMonManager.FileKey = "GLOBAL"
-ToolSvc.TrigDecisionTool.Navigation.OutputLevel = WARNING
+#ToolSvc.TrigDecisionTool.Navigation.OutputLevel = WARNING
####################################################################################################
diff --git a/Trigger/TrigAnalysis/TrigInDetAnalysisExample/run/tida_athanarun2.py b/Trigger/TrigAnalysis/TrigInDetAnalysisExample/run/tida_athanarun2.py
index 17f9bda89d61..30985f846e52 100644
--- a/Trigger/TrigAnalysis/TrigInDetAnalysisExample/run/tida_athanarun2.py
+++ b/Trigger/TrigAnalysis/TrigInDetAnalysisExample/run/tida_athanarun2.py
@@ -157,8 +157,8 @@ if ( False ) :
d = release_metadata()
TestMonTool.releaseMetaData = d['nightly name'] + " " + d['nightly release'] + " " + d['date'] + " " + d['platform'] + " " + d['release']
TestMonTool.outputFileName="TrkNtuple.root"
- ToolSvc += TestMonTool
- HLTMonManager.AthenaMonTools += [ "TrigTestMonToolAC/TestMonToolAC" ]
+ #ToolSvc += TestMonTool
+ HLTMonManager.AthenaMonTools += [ TestMonTool ]
print TestMonTool
diff --git a/Trigger/TrigAnalysis/TrigInDetAnalysisExample/run/tida_autoconf.py b/Trigger/TrigAnalysis/TrigInDetAnalysisExample/run/tida_autoconf.py
index 68c461a3fcc0..ecc48515e4af 100644
--- a/Trigger/TrigAnalysis/TrigInDetAnalysisExample/run/tida_autoconf.py
+++ b/Trigger/TrigAnalysis/TrigInDetAnalysisExample/run/tida_autoconf.py
@@ -126,8 +126,8 @@ TestMonTool.ntupleChainNames += [
"HLT_.*id.*cosmic.*:InDetTrigTrackingxAODCnv_CosmicsN_EFID"
]
TestMonTool.outputFileName="TrkNtuple.root"
-ToolSvc += TestMonTool
-HLTMonManager.AthenaMonTools += [ "TrigTestMonToolAC/TestMonToolAC" ]
+#ToolSvc += TestMonTool
+HLTMonManager.AthenaMonTools += [ TestMonTool ]
print TestMonTool
diff --git a/Trigger/TrigAnalysis/TrigInDetAnalysisExample/run/tida_dc14.py b/Trigger/TrigAnalysis/TrigInDetAnalysisExample/run/tida_dc14.py
index a2c8d4983a32..6fe096186792 100644
--- a/Trigger/TrigAnalysis/TrigInDetAnalysisExample/run/tida_dc14.py
+++ b/Trigger/TrigAnalysis/TrigInDetAnalysisExample/run/tida_dc14.py
@@ -159,8 +159,8 @@ TestMonTool.ntupleChainNames += [
]
TestMonTool.outputFileName="TrkNtuple.root"
-ToolSvc += TestMonTool
-HLTMonManager.AthenaMonTools += [ "TrigTestMonToolAC/TestMonToolAC" ]
+#ToolSvc += TestMonTool
+HLTMonManager.AthenaMonTools += [ TestMonTool ]
print TestMonTool
diff --git a/Trigger/TrigAnalysis/TrigInDetAnalysisExample/run/tida_run2.py b/Trigger/TrigAnalysis/TrigInDetAnalysisExample/run/tida_run2.py
index 6d471146dcff..1239669d21b4 100644
--- a/Trigger/TrigAnalysis/TrigInDetAnalysisExample/run/tida_run2.py
+++ b/Trigger/TrigAnalysis/TrigInDetAnalysisExample/run/tida_run2.py
@@ -261,8 +261,8 @@ TestMonTool.ntupleChainNames += [
]
TestMonTool.outputFileName="TrkNtuple.root"
-ToolSvc += TestMonTool
-HLTMonManager.AthenaMonTools += [ "TrigTestMonToolAC/TestMonToolAC" ]
+#ToolSvc += TestMonTool
+HLTMonManager.AthenaMonTools += [ TestMonTool ]
print TestMonTool
diff --git a/Trigger/TrigMonitoring/TrigBjetMonitoring/python/TrigBjetMonitoringConfig.py b/Trigger/TrigMonitoring/TrigBjetMonitoring/python/TrigBjetMonitoringConfig.py
index f9117d0892e9..4d7817e832b8 100644
--- a/Trigger/TrigMonitoring/TrigBjetMonitoring/python/TrigBjetMonitoringConfig.py
+++ b/Trigger/TrigMonitoring/TrigBjetMonitoring/python/TrigBjetMonitoringConfig.py
@@ -14,9 +14,9 @@ def TrigBjetMonitoringConfig():
HLTBjetMon.monitoring_bjet = hltmonList.monitoring_bjet
- from AthenaCommon.AppMgr import ToolSvc
- ToolSvc += HLTBjetMon;
- list = [ "HLTBjetMonTool/HLTBjetMon" ];
+ #from AthenaCommon.AppMgr import ToolSvc
+ #ToolSvc += HLTBjetMon;
+ list = [ HLTBjetMon ];
return list
diff --git a/Trigger/TrigMonitoring/TrigBjetMonitoring/src/HLTBjetMonTool.cxx b/Trigger/TrigMonitoring/TrigBjetMonitoring/src/HLTBjetMonTool.cxx
index 2ad1b4b57f10..e1be1ca2ce3e 100755
--- a/Trigger/TrigMonitoring/TrigBjetMonitoring/src/HLTBjetMonTool.cxx
+++ b/Trigger/TrigMonitoring/TrigBjetMonitoring/src/HLTBjetMonTool.cxx
@@ -236,6 +236,7 @@ StatusCode HLTBjetMonTool::book(){
ATH_MSG_INFO(" Chain Name sizes - Bjet: " << size_TriggerChainBjet << " MuJet: " << size_TriggerChainMujet );
if ( (size_TriggerChainBjet+size_TriggerChainMujet) <= 0) {
ATH_MSG_INFO( " No trigger chain is configured for this run ==> Stop monitoring " );
+ // Not really a failure
return StatusCode::FAILURE;
}
for (int i =0; i<size_TriggerChainBjet; i++){
diff --git a/Trigger/TrigMonitoring/TrigBphysMonitoring/python/TrigBphysMonitoringConfig.py b/Trigger/TrigMonitoring/TrigBphysMonitoring/python/TrigBphysMonitoringConfig.py
index 71f0f16c529c..ee84ec4087ee 100644
--- a/Trigger/TrigMonitoring/TrigBphysMonitoring/python/TrigBphysMonitoringConfig.py
+++ b/Trigger/TrigMonitoring/TrigBphysMonitoring/python/TrigBphysMonitoringConfig.py
@@ -157,7 +157,7 @@ def TrigBphysMonitoringTool():
)
from AthenaCommon.AppMgr import ToolSvc
- ToolSvc += HLTBphysMon
- items = [ "HLTXAODBphysMonTool/HLTBphysMon" ]
+ #ToolSvc += HLTBphysMon
+ items = [ HLTBphysMon ]
return items
diff --git a/Trigger/TrigMonitoring/TrigBphysMonitoring/share/testBphysMonitoring.py b/Trigger/TrigMonitoring/TrigBphysMonitoring/share/testBphysMonitoring.py
index c468865bdb0a..e647ac26e069 100644
--- a/Trigger/TrigMonitoring/TrigBphysMonitoring/share/testBphysMonitoring.py
+++ b/Trigger/TrigMonitoring/TrigBphysMonitoring/share/testBphysMonitoring.py
@@ -64,9 +64,9 @@ HLTMon = HLTMonTool(name = 'HLTMon',
#HLTMon.TrigDecisionTool = monTrigDecTool
-ToolSvc += HLTMon;
+#ToolSvc += HLTMon;
-HLTMonManager.AthenaMonTools += [ "HLTMonTool/HLTMon" ];
+HLTMonManager.AthenaMonTools += [ HLTMon ];
from TrigBphysMonitoring.TrigBphysMonitoringConfig import TrigBphysMonitoringTool
HLTMonManager.AthenaMonTools += TrigBphysMonitoringTool()
diff --git a/Trigger/TrigMonitoring/TrigCaloMonitoring/python/TrigCaloMonitoringConfig.py b/Trigger/TrigMonitoring/TrigCaloMonitoring/python/TrigCaloMonitoringConfig.py
index 306cdf2f8d07..eeb80428536a 100644
--- a/Trigger/TrigMonitoring/TrigCaloMonitoring/python/TrigCaloMonitoringConfig.py
+++ b/Trigger/TrigMonitoring/TrigCaloMonitoring/python/TrigCaloMonitoringConfig.py
@@ -64,10 +64,10 @@ def HLTCaloMonitoringTool():
#HLTFullCalo = HLTCaloTool(name = 'HLTFullCalo',
# histoPathBase = "/Trigger/HLT")
#HLTFullCalo.TCRTools = [fullcalocellcontmaker]
- ToolSvc += HLTCalo;
- list = [ "HLTCaloTool/HLTCalo" ];
- ToolSvc += HLTCaloFEB;
- list += [ "HLTCaloFEBTool/HLTCaloFEB" ];
+ #ToolSvc += HLTCalo;
+ list = [ HLTCalo ];
+ #ToolSvc += HLTCaloFEB;
+ list += [ HLTCaloFEB ];
#ToolSvc += HLTFullCalo;
#list += [ "HLTCaloTool/HLTFullCalo" ];
return list
@@ -92,15 +92,15 @@ def HLTCaloMonitoringTool():
histoPathBase = "/Trigger/HLT")
from AthenaCommon.AppMgr import ToolSvc
#ToolSvc += HLTCaloL2;
- ToolSvc += xAODTrigEMClusters
+ #ToolSvc += xAODTrigEMClusters
#list = [ "HLTCaloToolL2/HLTCaloL2" ];
- list = [ "HLTCaloESD_xAODTrigEMClusters/xAODTrigEMClusters" ]
+ list = [ xAODTrigEMClusters ]
#ToolSvc += HLTCaloCluster;
- ToolSvc += xAODCaloClusters
+ #ToolSvc += xAODCaloClusters
#list += [ "HLTCaloClusterTool/HLTCaloCluster" ];
- list += [ "HLTCaloESD_xAODCaloClusters/xAODCaloClusters" ]
- ToolSvc += CaloCells
- list += [ "HLTCaloESD_CaloCells/CaloCells" ]
+ list += [ xAODCaloClusters ]
+ #ToolSvc += CaloCells
+ list += [ CaloCells ]
return list
else:
diff --git a/Trigger/TrigMonitoring/TrigEgammaMonitoring/python/TrigEgammaMonitoringConfig.py b/Trigger/TrigMonitoring/TrigEgammaMonitoring/python/TrigEgammaMonitoringConfig.py
index 677f2f1dd5e4..fe387089139e 100644
--- a/Trigger/TrigMonitoring/TrigEgammaMonitoring/python/TrigEgammaMonitoringConfig.py
+++ b/Trigger/TrigMonitoring/TrigEgammaMonitoring/python/TrigEgammaMonitoringConfig.py
@@ -266,31 +266,33 @@ class TrigEgammaMonToolBuilder:
return tool
def configureMonTool(self):
- from AthenaCommon.AppMgr import ToolSvc
- toolList=['TrigEgammaMonTool/HLTEgammaMon'];
+ #from AthenaCommon.AppMgr import ToolSvc
+ #toolList=['TrigEgammaMonTool/HLTEgammaMon'];
if self.mc_mode == True or self.pp_mode == True:
if(self.derivation == True):
tool = TrigEgammaMonTool( name = "HLTEgammaMon",
histoPathBase=self.basePath,
IgnoreTruncationCheck=True,
Tools=["TrigEgammaNavTPAnalysisTool/HLTEgammaTPAnalysis"])
- ToolSvc += tool
+ #ToolSvc += tool
else:
- ToolSvc += self.configureDefaultMonTool()
+ tool = self.configureDefaultMonTool()
+ #ToolSvc += self.configureDefaultMonTool()
elif self.HI_mode == True or self.pPb_mode == True:
tool = TrigEgammaMonTool( name = "HLTEgammaMon",
histoPathBase=self.basePath,
IgnoreTruncationCheck=True,
Tools=["TrigEgammaNavAnalysisTool/HLTEgammaPhotonAnalysis",
"TrigEgammaNavAnalysisTool/HLTEgammaElectronAnalysis"])
- ToolSvc += tool
+ #ToolSvc += tool
elif self.cosmic_mode == True:
tool = TrigEgammaMonTool( name = "HLTEgammaMon",
histoPathBase=self.basePath,
IgnoreTruncationCheck=True,
Tools=["TrigEgammaNavAnalysisTool/HLTEgammaPhotonAnalysis",
"TrigEgammaNavAnalysisTool/HLTEgammaElectronAnalysis"])
- ToolSvc += tool
+ #ToolSvc += tool
else:
- ToolSvc += self.configureDefaultMonTool()
- return toolList
+ tool = self.configureDefaultMonTool()
+ #ToolSvc += self.configureDefaultMonTool()
+ return [ tool ]
diff --git a/Trigger/TrigMonitoring/TrigHLTMonitoring/python/TrigHLTMonitoringConfig.py b/Trigger/TrigMonitoring/TrigHLTMonitoring/python/TrigHLTMonitoringConfig.py
index 73e344b2b085..b06aea39f031 100644
--- a/Trigger/TrigMonitoring/TrigHLTMonitoring/python/TrigHLTMonitoringConfig.py
+++ b/Trigger/TrigMonitoring/TrigHLTMonitoring/python/TrigHLTMonitoringConfig.py
@@ -1,7 +1,7 @@
# Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
def HLTGeneralTool():
- from AthenaCommon.AppMgr import ToolSvc
+ #from AthenaCommon.AppMgr import ToolSvc
from TrigHLTMonitoring.TrigHLTMonitoringConf import HLTMonTool
HLTMon = HLTMonTool( name = 'HLTMon',
histoPathBase = "/Trigger/HLT/ResultMon",
@@ -30,6 +30,6 @@ def HLTGeneralTool():
},
LumiKey = 'LumiBlocks'
)
- ToolSvc += HLTMon
- list = [ "HLTMonTool/HLTMon" ]
+ #ToolSvc += HLTMon
+ list = [ HLTMon ]
return list
diff --git a/Trigger/TrigMonitoring/TrigHLTMonitoring/share/HLTIDtrkMon_DumpTDT.py b/Trigger/TrigMonitoring/TrigHLTMonitoring/share/HLTIDtrkMon_DumpTDT.py
index 74d5d40c4c89..eb090dc0ae18 100755
--- a/Trigger/TrigMonitoring/TrigHLTMonitoring/share/HLTIDtrkMon_DumpTDT.py
+++ b/Trigger/TrigMonitoring/TrigHLTMonitoring/share/HLTIDtrkMon_DumpTDT.py
@@ -134,8 +134,8 @@ if (IDtrkMon):
HLTIDtrkMon.PtMin = 0.
HLTIDtrkMon.EtaMax = 5.0
HLTIDtrkMon.SiHitMin = 3
- ToolSvc += HLTIDtrkMon;
- HLTMonManager.AthenaMonTools += [ "HLTIDtrkMonTool/HLTIDtrkMon" ];
+ #ToolSvc += HLTIDtrkMon;
+ HLTMonManager.AthenaMonTools += [ HLTIDtrkMon ];
##### HLTIDtrkMon Part ####################
@@ -217,8 +217,8 @@ if (IDtrkDump):
- ToolSvc += HLTIDtrkDump;
- HLTMonManager.AthenaMonTools += [ "HLTIDtrkDumpTool/HLTIDtrkDump" ];
+ #ToolSvc += HLTIDtrkDump;
+ HLTMonManager.AthenaMonTools += [ HLTIDtrkDump ];
##### Histogram File Part #################
diff --git a/Trigger/TrigMonitoring/TrigIDJpsiMonitoring/python/TrigIDJpsiMonitoringConfig.py b/Trigger/TrigMonitoring/TrigIDJpsiMonitoring/python/TrigIDJpsiMonitoringConfig.py
index af1e2e909d14..18c2bd5d3adf 100644
--- a/Trigger/TrigMonitoring/TrigIDJpsiMonitoring/python/TrigIDJpsiMonitoringConfig.py
+++ b/Trigger/TrigMonitoring/TrigIDJpsiMonitoring/python/TrigIDJpsiMonitoringConfig.py
@@ -11,6 +11,6 @@ def TrigIDJpsiMonitoringTool():
TrigJpsiMon = TrigJpsiMonTool(name = 'TrigJpsiMon',
histoPathBase = "/Trigger/HLT/IDJpsiMon")
- ToolSvc += TrigJpsiMon
- list = [ "TrigJpsiMonTool/TrigJpsiMon" ]
+ #ToolSvc += TrigJpsiMon
+ list = [ TrigJpsiMon ]
return list
diff --git a/Trigger/TrigMonitoring/TrigIDJpsiMonitoring/run/RunJpsimumu.py b/Trigger/TrigMonitoring/TrigIDJpsiMonitoring/run/RunJpsimumu.py
index 49e71291b4da..8c802d8f0a8f 100644
--- a/Trigger/TrigMonitoring/TrigIDJpsiMonitoring/run/RunJpsimumu.py
+++ b/Trigger/TrigMonitoring/TrigIDJpsiMonitoring/run/RunJpsimumu.py
@@ -7,8 +7,8 @@ HLTMonManager = topSequence.HLTMonManager
from TrigIDJpsiMonitoring.TrigIDJpsiMonitoringConf import TrigJpsiMonTool
TestMonTool = TrigJpsiMonTool( name="TestMonTool")
-ToolSvc += TestMonTool
-HLTMonManager.AthenaMonTools += [ "TrigJpsiMonTool/TestMonTool" ]
+#ToolSvc += TestMonTool
+HLTMonManager.AthenaMonTools += [ TestMonTool ]
##### Trigger Decision Part #####################
diff --git a/Trigger/TrigMonitoring/TrigIDJpsiMonitoring/run/TrigIDJpsiMonitoring_topOptions.py b/Trigger/TrigMonitoring/TrigIDJpsiMonitoring/run/TrigIDJpsiMonitoring_topOptions.py
index 5a1819f61333..bc7ac504d776 100644
--- a/Trigger/TrigMonitoring/TrigIDJpsiMonitoring/run/TrigIDJpsiMonitoring_topOptions.py
+++ b/Trigger/TrigMonitoring/TrigIDJpsiMonitoring/run/TrigIDJpsiMonitoring_topOptions.py
@@ -123,8 +123,8 @@ HLTMonManager = topSequence.HLTMonManager
from TrigIDJpsiMonitoring.TrigIDJpsiMonitoringConf import TrigJpsiMonTool
TestMonTool = TrigJpsiMonTool( name="TestMonTool")
-ToolSvc += TestMonTool
-HLTMonManager.AthenaMonTools += [ "TrigJpsiMonTool/TestMonTool" ]
+#ToolSvc += TestMonTool
+HLTMonManager.AthenaMonTools += [ TestMonTool ]
##### Trigger Decision Part #####################
diff --git a/Trigger/TrigMonitoring/TrigIDJpsiMonitoring/run/TrigInDetValidation_RTT_topOptions_Bphysics.py b/Trigger/TrigMonitoring/TrigIDJpsiMonitoring/run/TrigInDetValidation_RTT_topOptions_Bphysics.py
index ed992017e9a2..2dc99e872653 100644
--- a/Trigger/TrigMonitoring/TrigIDJpsiMonitoring/run/TrigInDetValidation_RTT_topOptions_Bphysics.py
+++ b/Trigger/TrigMonitoring/TrigIDJpsiMonitoring/run/TrigInDetValidation_RTT_topOptions_Bphysics.py
@@ -73,8 +73,8 @@ HLTMonManager = topSequence.HLTMonManager
from TrigIDJpsiMonitoring.TrigIDJpsiMonitoringConf import TrigJpsiMonTool
TPMonTool = TrigJpsiMonTool( name="TPMonTool")
-ToolSvc += TPMonTool
-HLTMonManager.AthenaMonTools += [ "TrigJpsiMonTool/TPMonTool" ]
+#ToolSvc += TPMonTool
+HLTMonManager.AthenaMonTools += [ TPMonTool ]
TPMonTool.matchR = 0.1
diff --git a/Trigger/TrigMonitoring/TrigIDJpsiMonitoring/run/grid_TrigIDJpsiMonitoring_topOptions.py b/Trigger/TrigMonitoring/TrigIDJpsiMonitoring/run/grid_TrigIDJpsiMonitoring_topOptions.py
index 8bffb7b67445..fd26065e841a 100644
--- a/Trigger/TrigMonitoring/TrigIDJpsiMonitoring/run/grid_TrigIDJpsiMonitoring_topOptions.py
+++ b/Trigger/TrigMonitoring/TrigIDJpsiMonitoring/run/grid_TrigIDJpsiMonitoring_topOptions.py
@@ -113,8 +113,8 @@ HLTMonManager = topSequence.HLTMonManager
from TrigIDJpsiMonitoring.TrigIDJpsiMonitoringConf import TrigJpsiMonTool
TestMonTool = TrigJpsiMonTool( name="TestMonTool")
-ToolSvc += TestMonTool
-HLTMonManager.AthenaMonTools += [ "TrigJpsiMonTool/TestMonTool" ]
+#ToolSvc += TestMonTool
+HLTMonManager.AthenaMonTools += [ TestMonTool ]
##### Trigger Decision Part #####################
diff --git a/Trigger/TrigMonitoring/TrigIDtrkMonitoring/python/TrigIDPhysValMonitoringConfig.py b/Trigger/TrigMonitoring/TrigIDtrkMonitoring/python/TrigIDPhysValMonitoringConfig.py
index 1f1c5f99fd82..f504a62c29ef 100644
--- a/Trigger/TrigMonitoring/TrigIDtrkMonitoring/python/TrigIDPhysValMonitoringConfig.py
+++ b/Trigger/TrigMonitoring/TrigIDtrkMonitoring/python/TrigIDPhysValMonitoringConfig.py
@@ -56,10 +56,10 @@ def TrigIDPhysValMonitoringTool():
TestIDPhysValMon.ntupleChainNames += chainnames
TestIDPhysValMon.releaseMetaData = d['nightly name'] + " " + d['nightly release'] + " " + d['date'] + " " + d['platform'] + " " + d['release']
- from AthenaCommon.AppMgr import ToolSvc
- ToolSvc += TestIDPhysValMon
- Monname = "TrigTestPhysValMon/" + Monname
- return Monname
+ #from AthenaCommon.AppMgr import ToolSvc
+ #ToolSvc += TestIDPhysValMon
+ #Monname = "TrigTestPhysValMon/" + Monname
+ return TestIDPhysValMon
############### Electrons ###############
name = "Electron"
diff --git a/Trigger/TrigMonitoring/TrigIDtrkMonitoring/python/TrigIDtrkMonitoringConfig.py b/Trigger/TrigMonitoring/TrigIDtrkMonitoring/python/TrigIDtrkMonitoringConfig.py
index 8a3c4964dc54..8c70e88edd12 100644
--- a/Trigger/TrigMonitoring/TrigIDtrkMonitoring/python/TrigIDtrkMonitoringConfig.py
+++ b/Trigger/TrigMonitoring/TrigIDtrkMonitoring/python/TrigIDtrkMonitoringConfig.py
@@ -32,8 +32,8 @@ def TrigIDtrkMonitoringTool():
"HLT_id_cosmic.*:InDetTrigTrackingxAODCnv_CosmicsN_EFID",
"HLT_id_cosmic.*:InDetTrigTrackingxAODCnvIOTRT_CosmicsN_EFID"
]
- ToolSvc += tidacos;
- list += [ "TrigTestBase/IDCosmicTool" ]
+ #ToolSvc += tidacos;
+ list += [ tidacos ]
# Cosmic Shifter instance
@@ -51,8 +51,8 @@ def TrigIDtrkMonitoringTool():
"HLT_id_cosmic.*:InDetTrigTrackingxAODCnv_CosmicsN_EFID",
"HLT_id_cosmic.*:InDetTrigTrackingxAODCnvIOTRT_CosmicsN_EFID"
]
- ToolSvc += tidacosshift;
- list += [ "TrigTestBase/IDCosmicShifterTool" ]
+ #ToolSvc += tidacosshift;
+ list += [ tidacosshift ]
@@ -72,8 +72,8 @@ def TrigIDtrkMonitoringTool():
"HLT_e.*idperf.*:InDetTrigTrackingxAODCnv_Electron_IDTrig",
"HLT_e.*idperf.*:InDetTrigTrackingxAODCnv_Electron_FTF"
]
- ToolSvc += tidaegamma;
- list += [ "TrigTestBase/IDEgammaTool" ]
+ #ToolSvc += tidaegamma;
+ list += [ tidaegamma ]
@@ -97,8 +97,8 @@ def TrigIDtrkMonitoringTool():
"HLT_e.*_idperf:InDetTrigTrackingxAODCnv_Electron_FTF",
"HLT_e.*_idperf:InDetTrigTrackingxAODCnv_Electron_IDTrig"
]
- ToolSvc += tidaegammashift;
- list += [ "TrigTestBase/IDEgammaShifterTool" ]
+ #ToolSvc += tidaegammashift;
+ list += [ tidaegammashift ]
# Shifter purity instances
@@ -120,8 +120,8 @@ def TrigIDtrkMonitoringTool():
"HLT_e.*_idperf:InDetTrigTrackingxAODCnv_Electron_FTF",
"HLT_e.*_idperf:InDetTrigTrackingxAODCnv_Electron_IDTrig"
]
- ToolSvc += tidaegammapurity;
- list += [ "TrigTestBase/IDEgammaPurityTool" ]
+ #ToolSvc += tidaegammapurity;
+ list += [ tidaegammapurity ]
@@ -144,8 +144,8 @@ def TrigIDtrkMonitoringTool():
"HLT_mu.*idperf.*:InDetTrigTrackingxAODCnv_Muon_FTF",
"HLT_mu.*idperf.*:InDetTrigTrackingxAODCnv_Muon_IDTrig"
]
- ToolSvc += tidamuon;
- list += [ "TrigTestBase/IDMuonTool" ]
+ #ToolSvc += tidamuon;
+ list += [ tidamuon ]
# Shifter instances
@@ -166,8 +166,8 @@ def TrigIDtrkMonitoringTool():
"HLT_mu.*_idperf:InDetTrigTrackingxAODCnv_Muon_FTF",
"HLT_mu.*_idperf:InDetTrigTrackingxAODCnv_Muon_IDTrig"
]
- ToolSvc += tidamuonshift;
- list += [ "TrigTestBase/IDMuonShifterTool" ]
+ #ToolSvc += tidamuonshift;
+ list += [ tidamuonshift ]
# Shifter purity instances
@@ -190,8 +190,8 @@ def TrigIDtrkMonitoringTool():
"HLT_mu.*_idperf:InDetTrigTrackingxAODCnv_Muon_FTF",
"HLT_mu.*_idperf:InDetTrigTrackingxAODCnv_Muon_IDTrig"
]
- ToolSvc += tidamuonpurity;
- list += [ "TrigTestBase/IDMuonPurityTool" ]
+ #ToolSvc += tidamuonpurity;
+ list += [ tidamuonpurity ]
@@ -215,8 +215,8 @@ def TrigIDtrkMonitoringTool():
"HLT_tau.*idperf.*tracktwo.*:key=InDetTrigTrackingxAODCnv_TauIso_FTF:roi=forID3",
"HLT_tau.*idperf.*tracktwo.*:key=InDetTrigTrackingxAODCnv_Tau_IDTrig:roi=forID3"
]
- ToolSvc += tidatau;
- list += [ "TrigTestBase/IDTauTool" ]
+ #ToolSvc += tidatau;
+ list += [ tidatau ]
# Shifter instances
@@ -233,8 +233,8 @@ def TrigIDtrkMonitoringTool():
"HLT_tau.*_idperf_tracktwo:key=InDetTrigTrackingxAODCnv_Tau_IDTrig:roi=forID3",
"HLT_tau.*_idperf_tracktwo:key=InDetTrigTrackingxAODCnv_TauIso_FTF:roi=forID3"
]
- ToolSvc += tidataushift;
- list += [ "TrigTestBase/IDTauShifterTool" ]
+ #ToolSvc += tidataushift;
+ list += [ tidataushift ]
@@ -254,8 +254,8 @@ def TrigIDtrkMonitoringTool():
"HLT_tau.*_idperf_tracktwo:key=InDetTrigTrackingxAODCnv_Tau_IDTrig:roi=forID3",
"HLT_tau.*_idperf_tracktwo:key=InDetTrigTrackingxAODCnv_TauIso_FTF:roi=forID3"
]
- ToolSvc += tidataupurity;
- list += [ "TrigTestBase/IDTauPurityTool" ]
+ #ToolSvc += tidataupurity;
+ list += [ tidataupurity ]
@@ -282,8 +282,8 @@ def TrigIDtrkMonitoringTool():
"HLT_j.*boffperf_split:key=InDetTrigTrackingxAODCnv_Bjet_IDTrig",
"HLT_j.*boffperf_split:key=InDetTrigTrackingxAODCnv_Bjet_FTF"
]
- ToolSvc += tidabjet;
- list += [ "TrigTestBase/IDBjetTool" ]
+ #ToolSvc += tidabjet;
+ list += [ tidabjet ]
# Shifter instances
@@ -300,8 +300,8 @@ def TrigIDtrkMonitoringTool():
"HLT_j.*_boffperf_split:InDetTrigTrackingxAODCnv_Bjet_FTF",
"HLT_j.*_boffperf_split:InDetTrigTrackingxAODCnv_Bjet_IDTrig"
]
- ToolSvc += tidabjetshift;
- list += [ "TrigTestBase/IDBjetShifterTool" ]
+ #ToolSvc += tidabjetshift;
+ list += [ tidabjetshift ]
# Shifter Purity instances
tidabjetpurity = TrigTestBase(name = "IDBjetPurityerTool",
@@ -314,8 +314,8 @@ def TrigIDtrkMonitoringTool():
"HLT_j85_boffperf_split:InDetTrigTrackingxAODCnv_Bjet_FTF",
"HLT_j85_boffperf_split:InDetTrigTrackingxAODCnv_Bjet_IDTrig"
]
- ToolSvc += tidabjetpurity;
- list += [ "TrigTestBase/IDBjetPurityTool" ]
+ #ToolSvc += tidabjetpurity;
+ list += [ tidabjetpurity ]
# Shifter instances
@@ -333,8 +333,8 @@ def TrigIDtrkMonitoringTool():
"HLT_j.*_boffperf_split:InDetTrigTrackingxAODCnv_BjetPrmVtx_FTF_SuperRoi:roi=SuperRoi:vtx=xPrimVx",
"HLT_j.*_boffperf_split:InDetTrigTrackingxAODCnv_BjetPrmVtx_FTF_SuperRoi:roi=SuperRoi:vtx=EFHistoPrmVtx"
]
- ToolSvc += tidabjetvtxshift;
- list += [ "TrigTestBase/IDBjetVtxShifterTool" ]
+ #ToolSvc += tidabjetvtxshift;
+ list += [ tidabjetvtxshift ]
@@ -358,8 +358,8 @@ def TrigIDtrkMonitoringTool():
# "HLT_.*Bmumux.*:InDetTrigTrackingxAODCnv_Bphysics_IDTrig",
# "HLT_.*Bmumux.*:InDetTrigTrackingxAODCnv_Bphysics_FTF"
]
- ToolSvc += tidabphys;
- list += [ "TrigTestBase/IDBphysTool" ]
+ #ToolSvc += tidabphys;
+ list += [ tidabphys ]
# Shifter instances
@@ -374,8 +374,8 @@ def TrigIDtrkMonitoringTool():
"HLT_mu.*_mu.*idperf.*noid:InDetTrigTrackingxAODCnv_Bphysics_FTF",
"HLT_mu.*_mu.*idperf.*noid:InDetTrigTrackingxAODCnv_Bphysics_IDTrig"
]
- ToolSvc += tidabphysshift;
- list += [ "TrigTestBase/IDBphysShifterTool" ]
+ #ToolSvc += tidabphysshift;
+ list += [ tidabphysshift ]
@@ -394,8 +394,8 @@ def TrigIDtrkMonitoringTool():
"Offline",
"HLT_mb_.*idperf.*:InDetTrigTrackingxAODCnv_minBias_EFID"
]
- ToolSvc += tidaminbias;
- list += [ "TrigTestBase/IDminBiasTool" ]
+ #ToolSvc += tidaminbias;
+ list += [ tidaminbias ]
# Shifter instances
@@ -407,8 +407,8 @@ def TrigIDtrkMonitoringTool():
"Offline",
"HLT_mb_.*idperf.*:InDetTrigTrackingxAODCnv_minBias_EFID"
]
- ToolSvc += tidaminbiasshift;
- list += [ "TrigTestBase/IDminBiasShifterTool" ]
+ #ToolSvc += tidaminbiasshift;
+ list += [ tidaminbiasshift ]
################################################
@@ -442,8 +442,8 @@ def TrigIDtrkMonitoringTool():
"HLT_mu.*idperf_FTKRefit:key=InDetTrigTrackingxAODCnv_Muon_FTKRefit",
"HLT_mu.*idperf_FTKRefit:key=InDetTrigTrackingxAODCnv_Muon_FTKRefit_IDTrig"
]
- ToolSvc += tidaftk;
- list += [ "TrigTestBase/IDFTKTool" ]
+ #ToolSvc += tidaftk;
+ list += [ tidaftk ]
return list
diff --git a/Trigger/TrigMonitoring/TrigJetMonitoring/python/TrigJetMonitoringConfig.py b/Trigger/TrigMonitoring/TrigJetMonitoring/python/TrigJetMonitoringConfig.py
index eb4615e19c93..f8fa667a2298 100644
--- a/Trigger/TrigMonitoring/TrigJetMonitoring/python/TrigJetMonitoringConfig.py
+++ b/Trigger/TrigMonitoring/TrigJetMonitoring/python/TrigJetMonitoringConfig.py
@@ -824,7 +824,7 @@ def TrigJetMonitoringTool():
# HLTMonFlags.doEgamma.set_Value_and_Lock(False)
- ToolSvc += HLTJetMon;
+ #ToolSvc += HLTJetMon;
# Set up the trigger configuration tool:
#ToolSvc += CfgMgr.TrigConf__xAODConfigTool( "xAODConfigTool",
@@ -836,7 +836,7 @@ def TrigJetMonitoringTool():
#ConfigTool = ToolSvc.xAODConfigTool,
#TrigDecisionKey = "xTrigDecision" )
- list = [ "HLTJetMonTool/HLTJetMon" ];
+ list = [ HLTJetMon ];
return list
diff --git a/Trigger/TrigMonitoring/TrigJetMonitoring/python/TrigJetMonitoringConfig_cosmics.py b/Trigger/TrigMonitoring/TrigJetMonitoring/python/TrigJetMonitoringConfig_cosmics.py
index 448896bda218..427013420a4c 100644
--- a/Trigger/TrigMonitoring/TrigJetMonitoring/python/TrigJetMonitoringConfig_cosmics.py
+++ b/Trigger/TrigMonitoring/TrigJetMonitoring/python/TrigJetMonitoringConfig_cosmics.py
@@ -245,7 +245,7 @@ def TrigJetMonitoringTool():
#DoOFMaxJetTimeCut = True,
#OFMaxTimens = 50.
);
- from AthenaCommon.AppMgr import ToolSvc
- ToolSvc += HLTJetMon;
- list = [ "HLTJetMonTool/HLTJetMon" ];
+ #from AthenaCommon.AppMgr import ToolSvc
+ #ToolSvc += HLTJetMon;
+ list = [ HLTJetMon ];
return list
diff --git a/Trigger/TrigMonitoring/TrigJetMonitoring/python/TrigJetMonitoringConfig_physics.py b/Trigger/TrigMonitoring/TrigJetMonitoring/python/TrigJetMonitoringConfig_physics.py
index 4f72fad20374..879cf76f2fb5 100644
--- a/Trigger/TrigMonitoring/TrigJetMonitoring/python/TrigJetMonitoringConfig_physics.py
+++ b/Trigger/TrigMonitoring/TrigJetMonitoring/python/TrigJetMonitoringConfig_physics.py
@@ -240,7 +240,7 @@ def TrigJetMonitoringTool():
#DoOFMaxJetTimeCut = True,
#OFMaxTimens = 50.
);
- from AthenaCommon.AppMgr import ToolSvc
- ToolSvc += HLTJetMon;
- list = [ "HLTJetMonTool/HLTJetMon" ];
+ #from AthenaCommon.AppMgr import ToolSvc
+ #ToolSvc += HLTJetMon;
+ list = [ HLTJetMon ];
return list
diff --git a/Trigger/TrigMonitoring/TrigMETMonitoring/python/TrigMETMonitoringConfig.py b/Trigger/TrigMonitoring/TrigMETMonitoring/python/TrigMETMonitoringConfig.py
index 3c018f277fa5..19fe1eccf75a 100644
--- a/Trigger/TrigMonitoring/TrigMETMonitoring/python/TrigMETMonitoringConfig.py
+++ b/Trigger/TrigMonitoring/TrigMETMonitoring/python/TrigMETMonitoringConfig.py
@@ -89,6 +89,6 @@ def HLTMETMonitoringTool():
prescaled_met = [],
);
from AthenaCommon.AppMgr import ToolSvc
- ToolSvc += HLTMETMon;
- list = [ "HLTMETMonTool/HLTMETMon" ];
+ #ToolSvc += HLTMETMon;
+ list = [ HLTMETMon ];
return list
diff --git a/Trigger/TrigMonitoring/TrigMinBiasMonitoring/python/TrigMinBiasMonitoringConfig.py b/Trigger/TrigMonitoring/TrigMinBiasMonitoring/python/TrigMinBiasMonitoringConfig.py
index ee65e58c6a42..6c30fd39cd93 100644
--- a/Trigger/TrigMonitoring/TrigMinBiasMonitoring/python/TrigMinBiasMonitoringConfig.py
+++ b/Trigger/TrigMonitoring/TrigMinBiasMonitoring/python/TrigMinBiasMonitoringConfig.py
@@ -78,8 +78,8 @@ def TrigMinBiasMonitoringTool():
# ---------------------- !Collective Histograms Management
- ToolSvc += HLTMinBiasMon;
- list = [ "HLTMinBiasMonTool/HLTMinBiasMon" ];
+ #ToolSvc += HLTMinBiasMon;
+ list = [ HLTMinBiasMon ];
return list
diff --git a/Trigger/TrigMonitoring/TrigMuonMonitoring/python/TrigMuonMonitoringConfig.py b/Trigger/TrigMonitoring/TrigMuonMonitoring/python/TrigMuonMonitoringConfig.py
index 19fdfd1324c7..70bb0374615e 100644
--- a/Trigger/TrigMonitoring/TrigMuonMonitoring/python/TrigMuonMonitoringConfig.py
+++ b/Trigger/TrigMonitoring/TrigMuonMonitoring/python/TrigMuonMonitoringConfig.py
@@ -22,8 +22,8 @@ def TrigMuonMonitoringTool():
from TrigBunchCrossingTool.BunchCrossingTool import BunchCrossingTool
HLTMuonMon.BCTool = BunchCrossingTool()
from AthenaCommon.AppMgr import ToolSvc
- ToolSvc += HLTMuonMon;
- list = [ "HLTMuonMonTool/HLTMuonMon" ];
+ #ToolSvc += HLTMuonMon;
+ list = [ HLTMuonMon ];
return list
diff --git a/Trigger/TrigMonitoring/TrigTauMonitoring/python/TrigTauMonitoringConfig.py b/Trigger/TrigMonitoring/TrigTauMonitoring/python/TrigTauMonitoringConfig.py
index 8c0eb15630ce..ff407649685c 100644
--- a/Trigger/TrigMonitoring/TrigTauMonitoring/python/TrigTauMonitoringConfig.py
+++ b/Trigger/TrigMonitoring/TrigTauMonitoring/python/TrigTauMonitoringConfig.py
@@ -132,8 +132,8 @@ def TrigTauMonitoringTool():
isData = (globalflags.DataSource == 'data'));
#from AthenaCommon.AppMgr import ToolSvc
- ToolSvc += HLTTauMon;
+ #ToolSvc += HLTTauMon;
print ToolSvc
- list = [ "HLTTauMonTool/HLTTauMon" ];
+ list = [ HLTTauMon ];
return list
from TriggerJobOpts.TriggerConfigGetter import TriggerConfigGetter
diff --git a/Trigger/TrigT1/TrigT1CTMonitoring/share/TrigT1CTMonitoringJobOptions.py b/Trigger/TrigT1/TrigT1CTMonitoring/share/TrigT1CTMonitoringJobOptions.py
index 53304bdee138..d155ccdc728d 100644
--- a/Trigger/TrigT1/TrigT1CTMonitoring/share/TrigT1CTMonitoringJobOptions.py
+++ b/Trigger/TrigT1/TrigT1CTMonitoring/share/TrigT1CTMonitoringJobOptions.py
@@ -242,7 +242,7 @@ if not hasattr(topSequence,"PrimaryManager"):
CTmonMan = topSequence.PrimaryManager
from TrigT1CTMonitoring.TrigT1CTMonitoringConf import TrigT1CTMonitoring__BSMonitoring as BSMon
-svcMgr.ToolSvc += BSMon()
+#svcMgr.ToolSvc += BSMon()
BSMonJob=BSMon(ProcessMuctpiData=True,
ProcessMuctpiDataRIO=True,
ProcessCTPData=True,
diff --git a/Trigger/TrigT1/TrigT1CTMonitoring/share/TrigT1CTMonitoringJobOptions_forRecExCommission.py b/Trigger/TrigT1/TrigT1CTMonitoring/share/TrigT1CTMonitoringJobOptions_forRecExCommission.py
index e4fda62dd855..264274099b95 100644
--- a/Trigger/TrigT1/TrigT1CTMonitoring/share/TrigT1CTMonitoringJobOptions_forRecExCommission.py
+++ b/Trigger/TrigT1/TrigT1CTMonitoring/share/TrigT1CTMonitoringJobOptions_forRecExCommission.py
@@ -274,5 +274,5 @@ if not isOnline:
conddb.addFolder('TRIGGER', '/TRIGGER/LVL1/CTPCoreInputMapping')
# monMan.AthenaMonTools += [ "TrigT1CTMonitoring__BSMonitoring/BSMon" ]
- ToolSvc += CTBSMonTool
+ #ToolSvc += CTBSMonTool
monMan.AthenaMonTools += [ CTBSMonTool ]
diff --git a/Trigger/TrigT1/TrigT1CaloMonitoring/share/TrigT1CaloMonitoring_forRecExCommission_Run1.py b/Trigger/TrigT1/TrigT1CaloMonitoring/share/TrigT1CaloMonitoring_forRecExCommission_Run1.py
index d9056189ad1b..749265418431 100644
--- a/Trigger/TrigT1/TrigT1CaloMonitoring/share/TrigT1CaloMonitoring_forRecExCommission_Run1.py
+++ b/Trigger/TrigT1/TrigT1CaloMonitoring/share/TrigT1CaloMonitoring_forRecExCommission_Run1.py
@@ -35,7 +35,7 @@ if l1caloRawMon:
L1CaloMan = AthenaMonManager( "L1CaloMonManager" )
## get a handle on the ToolSvc
- from AthenaCommon.AppMgr import ToolSvc
+ #from AthenaCommon.AppMgr import ToolSvc
if globalflags.InputFormat() == "bytestream":
include ("TrigT1CaloByteStream/ReadLVL1CaloBS_jobOptions.py")
@@ -83,7 +83,7 @@ if l1caloRawMon:
PathInRootFile = "L1Calo/PPrStabilityMon",
#OutputLevel = DEBUG
)
- ToolSvc += L1PPrStabilityMonTool
+ #ToolSvc += L1PPrStabilityMonTool
L1CaloMan.AthenaMonTools += [ L1PPrStabilityMonTool ]
else:
@@ -104,7 +104,7 @@ if l1caloRawMon:
PathInRootFile = "L1Calo/PPM/Stability",
#OutputLevel = DEBUG
)
- ToolSvc += L1PPrStabilityMonTool
+ #ToolSvc += L1PPrStabilityMonTool
L1CaloMan.AthenaMonTools += [ L1PPrStabilityMonTool ]
#=================================================================================
@@ -127,14 +127,14 @@ if l1caloRawMon:
#OnlineTest = True,
#OutputLevel = DEBUG
)
- ToolSvc += L1PPrMonTool
+ #ToolSvc += L1PPrMonTool
L1CaloMan.AthenaMonTools += [ L1PPrMonTool ]
if isData:
from TrigT1CaloMonitoring.TrigT1CaloMonitoringConf import LVL1__PPMSimBSMon
PPMSimBSMonTool = LVL1__PPMSimBSMon("PPMSimBSMonTool")
- ToolSvc += PPMSimBSMonTool
+ #ToolSvc += PPMSimBSMonTool
L1CaloMan.AthenaMonTools += [ PPMSimBSMonTool ]
#ToolSvc.PPMSimBSMonTool.OutputLevel = DEBUG
from TrigT1CaloTools.TrigT1CaloToolsConf import LVL1__L1TriggerTowerTool
@@ -152,7 +152,7 @@ if l1caloRawMon:
ErrorPathInRootFile = "L1Calo/PPM/SpareChannels/Errors",
#OutputLevel = DEBUG
)
- ToolSvc += L1PPrSpareMonTool
+ #ToolSvc += L1PPrSpareMonTool
L1CaloMan.AthenaMonTools += [ L1PPrSpareMonTool ]
#=================================================================================
@@ -172,7 +172,7 @@ if l1caloRawMon:
ErrorPathInRootFile = "L1Calo/JEM/Errors/Hardware",
#OutputLevel = DEBUG
)
- ToolSvc += L1JEMMonTool
+ #ToolSvc += L1JEMMonTool
L1CaloMan.AthenaMonTools += [ L1JEMMonTool ]
#----------------------------------- CMM ------------------------------------------
@@ -186,7 +186,7 @@ if l1caloRawMon:
ErrorPathInRootFile = "L1Calo/JEM_CMM/Errors/Hardware",
#OutputLevel = DEBUG
)
- ToolSvc += L1CMMMonTool
+ #ToolSvc += L1CMMMonTool
L1CaloMan.AthenaMonTools += [ L1CMMMonTool ]
@@ -201,7 +201,7 @@ if l1caloRawMon:
# JetTool = "LVL1::L1JetTools/L1JetTools_Mon",
# JEPEtSumsTool = "LVL1::L1JEPEtSumsTools/L1JEPEtSumsTools_Mon",
# )
- # ToolSvc += JEPSimBSMonTool
+ # #ToolSvc += JEPSimBSMonTool
# L1CaloMan.AthenaMonTools += [ JEPSimBSMonTool ]
# #ToolSvc.JEPSimBSMonTool.OutputLevel = DEBUG
@@ -238,7 +238,7 @@ if l1caloRawMon:
MaxEnergyRange = 256,
#OutputLevel = DEBUG,
)
- ToolSvc += L1BSCPMMonTool
+ #ToolSvc += L1BSCPMMonTool
L1CaloMan.AthenaMonTools += [ L1BSCPMMonTool ]
if isData:
@@ -247,9 +247,9 @@ if l1caloRawMon:
CPMSimBSMonTool = LVL1__CPMSimBSMon("CPMSimBSMonTool",
EmTauTool = "LVL1::L1EmTauTools/L1EmTauTools_Mon",
)
- ToolSvc += CPMSimBSMonTool
+ #ToolSvc += CPMSimBSMonTool
L1CaloMan.AthenaMonTools += [ CPMSimBSMonTool ]
- #ToolSvc.CPMSimBSMonTool.OutputLevel = DEBUG
+ ##ToolSvc.CPMSimBSMonTool.OutputLevel = DEBUG
from TrigT1CaloTools.TrigT1CaloToolsConf import LVL1__L1EmTauTools
L1EmTauTools = LVL1__L1EmTauTools("L1EmTauTools_Mon")
@@ -265,7 +265,7 @@ if l1caloRawMon:
#OnlineTest = True,
#OutputLevel = DEBUG,
)
- ToolSvc += L1BSRODMonTool
+ #ToolSvc += L1BSRODMonTool
L1CaloMan.AthenaMonTools += [ L1BSRODMonTool ]
#=================================================================================
@@ -281,7 +281,7 @@ if l1caloRawMon:
#OnlineTest = True,
#OutputLevel = DEBUG
)
- ToolSvc += L1GlobalMonTool
+ #ToolSvc += L1GlobalMonTool
L1CaloMan.AthenaMonTools += [ L1GlobalMonTool ]
# if isData and isCalo and Offline and (rec.triggerStream() == "JetTauEtmiss"
@@ -296,7 +296,7 @@ if l1caloRawMon:
# L1EmEfficienciesMonTool = LVL1__EmEfficienciesMonTool ( name = "EmEfficienciesMonTool",
# TriggerStrings = trigstring
# )
- # ToolSvc += L1EmEfficienciesMonTool
+ # #ToolSvc += L1EmEfficienciesMonTool
# L1CaloMan.AthenaMonTools += [ L1EmEfficienciesMonTool ]
# if not hasattr( ToolSvc, "TrigDecisionTool" ):
# from TrigDecisionTool.TrigDecisionToolConf import Trig__TrigDecisionTool
@@ -319,17 +319,17 @@ if l1caloRawMon:
# L1JetEfficienciesMonTool = LVL1__JetEfficienciesMonTool ( name = "JetEfficienciesMonTool",
# TriggerStrings = trigstring
# )
- # from AthenaCommon.AppMgr import ToolSvc
+ # #from AthenaCommon.AppMgr import ToolSvc
# ToolSvc += JetCleaningTool('JetCleaningLooseTool')
- # # ToolSvc += JetCleaningTool('JetCleaningMediumTool')
+ # #ToolSvc += JetCleaningTool('JetCleaningMediumTool')
# ToolSvc += JetCleaningTool('JetCleaningTightTool')
# L1JetEfficienciesMonTool.JetCleaningLooseTool = ConfiguredJetCleaningTool_Loose("JetCleaningLooseTool")
# # L1JetEfficienciesMonTool.JetCleaningMediumTool = ConfiguredJetCleaningTool_Medium("JetCleaningMediumTool")
# L1JetEfficienciesMonTool.JetCleaningTightTool = ConfiguredJetCleaningTool_Tight("JetCleaningTightTool")
- # ToolSvc += L1JetEfficienciesMonTool
+ # #ToolSvc += L1JetEfficienciesMonTool
# L1CaloMan.AthenaMonTools += [ L1JetEfficienciesMonTool ]
- # if not hasattr( ToolSvc, "TrigDecisionTool" ):
+ # if not hasattr( #ToolSvc, "TrigDecisionTool" ):
# from TrigDecisionTool.TrigDecisionToolConf import Trig__TrigDecisionTool
# tdt = Trig__TrigDecisionTool('TrigDecisionTool')
# ToolSvc += tdt
diff --git a/Trigger/TrigT1/TrigT1CaloMonitoring/share/TrigT1CaloMonitoring_forRecExCommission_Run2.py b/Trigger/TrigT1/TrigT1CaloMonitoring/share/TrigT1CaloMonitoring_forRecExCommission_Run2.py
index ac0decd129cc..e15e73e900be 100644
--- a/Trigger/TrigT1/TrigT1CaloMonitoring/share/TrigT1CaloMonitoring_forRecExCommission_Run2.py
+++ b/Trigger/TrigT1/TrigT1CaloMonitoring/share/TrigT1CaloMonitoring_forRecExCommission_Run2.py
@@ -99,7 +99,7 @@ if l1caloRawMon:
PathInRootFile="L1Calo/PPrStabilityMon",
# OutputLevel = DEBUG
)
- ToolSvc += L1PPrStabilityMonTool
+ #ToolSvc += L1PPrStabilityMonTool
L1CaloMan.AthenaMonTools += [L1PPrStabilityMonTool]
# --- BunchCrossing Tool configuration ---
@@ -127,7 +127,7 @@ if l1caloRawMon:
PathInRootFile="L1Calo/PPM/Stability",
#OutputLevel = DEBUG
)
- ToolSvc += L1PPrStabilityMonTool
+ #ToolSvc += L1PPrStabilityMonTool
L1CaloMan.AthenaMonTools += [L1PPrStabilityMonTool]
#======================================================================
@@ -150,14 +150,14 @@ if l1caloRawMon:
#OnlineTest = True,
#OutputLevel = DEBUG
)
- ToolSvc += L1PPrMonTool
+ #ToolSvc += L1PPrMonTool
L1CaloMan.AthenaMonTools += [L1PPrMonTool]
if isData:
from TrigT1CaloMonitoring.TrigT1CaloMonitoringConf import LVL1__PPMSimBSMon
PPMSimBSMonTool = LVL1__PPMSimBSMon("PPMSimBSMonTool")
- ToolSvc += PPMSimBSMonTool
+ #ToolSvc += PPMSimBSMonTool
L1CaloMan.AthenaMonTools += [PPMSimBSMonTool]
#ToolSvc.PPMSimBSMonTool.OutputLevel = DEBUG
from TrigT1CaloTools.TrigT1CaloToolsConf import LVL1__L1TriggerTowerTool
@@ -174,7 +174,7 @@ if l1caloRawMon:
ErrorPathInRootFile="L1Calo/PPM/SpareChannels/Errors",
#OutputLevel = DEBUG
)
- ToolSvc += L1PPrSpareMonTool
+ #ToolSvc += L1PPrSpareMonTool
L1CaloMan.AthenaMonTools += [L1PPrSpareMonTool]
#======================================================================
@@ -184,20 +184,20 @@ if l1caloRawMon:
#------------------------------------ JEM -----------------------------
from TrigT1CaloMonitoring.TrigT1CaloMonitoringConf import LVL1__JEPJEMMon
L1JEPJEMMonTool = LVL1__JEPJEMMon("L1JEPJEMMonTool")
- ToolSvc += L1JEPJEMMonTool
+ #ToolSvc += L1JEPJEMMonTool
L1CaloMan.AthenaMonTools += [L1JEPJEMMonTool]
#----------------------------------- CMX ------------------------------
from TrigT1CaloMonitoring.TrigT1CaloMonitoringConf import LVL1__JEPCMXMon
L1JEPCMXMonTool = LVL1__JEPCMXMon("L1JEPCMXMonTool")
- ToolSvc += L1JEPCMXMonTool
+ #ToolSvc += L1JEPCMXMonTool
L1CaloMan.AthenaMonTools += [L1JEPCMXMonTool]
if isData:
#--------------------- Transmission and Performance ---------------
from TrigT1CaloMonitoring.TrigT1CaloMonitoringConf import LVL1__JEPSimMon
JEPSimMonTool = LVL1__JEPSimMon("JEPSimMonTool")
- ToolSvc += JEPSimMonTool
+ #ToolSvc += JEPSimMonTool
L1CaloMan.AthenaMonTools += [JEPSimMonTool]
# ToolSvc.JEPSimBSMonTool.OutputLevel = DEBUG
@@ -228,14 +228,14 @@ if l1caloRawMon:
# CPMTowers, CMXCPTobs and CMXCPHits
from TrigT1CaloMonitoring.TrigT1CaloMonitoringConf import LVL1__CPMon
L1CPMMonTool = LVL1__CPMon("L1CPMMonTool")
- ToolSvc += L1CPMMonTool
+ #ToolSvc += L1CPMMonTool
L1CaloMan.AthenaMonTools += [L1CPMMonTool]
if isData:
from TrigT1CaloMonitoring.TrigT1CaloMonitoringConf import LVL1__CPSimMon
CPSimMonTool = LVL1__CPSimMon("CPSimMonTool")
- ToolSvc += CPSimMonTool
+ #ToolSvc += CPSimMonTool
L1CaloMan.AthenaMonTools += [CPSimMonTool]
# ToolSvc.CPMSimBSMonTool.OutputLevel = DEBUG
@@ -253,7 +253,7 @@ if l1caloRawMon:
#OnlineTest = True,
#OutputLevel = DEBUG,
)
- ToolSvc += L1BSRODMonTool
+ #ToolSvc += L1BSRODMonTool
L1CaloMan.AthenaMonTools += [L1BSRODMonTool]
#==================================================================
@@ -261,7 +261,7 @@ if l1caloRawMon:
#==================================================================
from TrigT1CaloMonitoring.TrigT1CaloMonitoringConf import LVL1__OverviewMon
L1OverviewMonTool = LVL1__OverviewMon("L1OverviewMonTool")
- ToolSvc += L1OverviewMonTool
+ #ToolSvc += L1OverviewMonTool
L1CaloMan.AthenaMonTools += [L1OverviewMonTool]
from TrigT1CaloMonitoringTools.TrigT1CaloMonitoringToolsConf import LVL1__TrigT1CaloMonErrorTool
@@ -269,7 +269,7 @@ if l1caloRawMon:
name="TrigT1CaloMonErrorTool",
FlagCorruptEvents="None"
)
- ToolSvc += L1MonErrorTool
+ #ToolSvc += L1MonErrorTool
# pass
# if isData and isCalo and Offline and (rec.triggerStream() == "JetTauEtmiss"
@@ -282,7 +282,7 @@ if l1caloRawMon:
from TrigT1CaloMonitoring.TrigT1CaloMonitoringConf import LVL1__TagProbeEfficiencyMon
TagProbeEfficiencyMonTool = LVL1__TagProbeEfficiencyMon("TagProbeEfficiencyMonTool")
- ToolSvc += TagProbeEfficiencyMonTool
+ #ToolSvc += TagProbeEfficiencyMonTool
L1CaloMan.AthenaMonTools += [TagProbeEfficiencyMonTool]
diff --git a/Trigger/TrigT1/TrigT1CaloMonitoring/share/TrigT1CaloMonitoring_forRecExCommission_cpu.py b/Trigger/TrigT1/TrigT1CaloMonitoring/share/TrigT1CaloMonitoring_forRecExCommission_cpu.py
index 0988d00b0b82..61c7dc8413d4 100644
--- a/Trigger/TrigT1/TrigT1CaloMonitoring/share/TrigT1CaloMonitoring_forRecExCommission_cpu.py
+++ b/Trigger/TrigT1/TrigT1CaloMonitoring/share/TrigT1CaloMonitoring_forRecExCommission_cpu.py
@@ -55,7 +55,7 @@ if l1caloRawMon:
L1CaloManD = AthenaMonManager( "L1CaloMonManagerD" )
## get a handle on the ToolSvc
- from AthenaCommon.AppMgr import ToolSvc
+ #from AthenaCommon.AppMgr import ToolSvc
if globalflags.InputFormat() == "bytestream":
include ("TrigT1CaloByteStream/ReadLVL1CaloBS_jobOptions.py")
@@ -68,28 +68,28 @@ if l1caloRawMon:
name = "L1TrigT1CaloBSMonToolA1",
LoadL1CaloPPM = True
)
- ToolSvc += L1TrigT1CaloBSMonToolA1
+ #ToolSvc += L1TrigT1CaloBSMonToolA1
L1CaloMan0A1.AthenaMonTools += [ L1TrigT1CaloBSMonToolA1 ]
# CPM
L1TrigT1CaloBSMonToolA2 = TrigT1CaloBSMon(
name = "L1TrigT1CaloBSMonToolA2",
LoadL1CaloCPM = True
)
- ToolSvc += L1TrigT1CaloBSMonToolA2
+ #ToolSvc += L1TrigT1CaloBSMonToolA2
L1CaloMan0A2.AthenaMonTools += [ L1TrigT1CaloBSMonToolA2 ]
# JEM
L1TrigT1CaloBSMonToolA3 = TrigT1CaloBSMon(
name = "L1TrigT1CaloBSMonToolA3",
LoadL1CaloJEM = True
)
- ToolSvc += L1TrigT1CaloBSMonToolA3
+ #ToolSvc += L1TrigT1CaloBSMonToolA3
L1CaloMan0A3.AthenaMonTools += [ L1TrigT1CaloBSMonToolA3 ]
# ROD headers
L1TrigT1CaloBSMonToolA4 = TrigT1CaloBSMon(
name = "L1TrigT1CaloBSMonToolA4",
LoadL1CaloROD = True
)
- ToolSvc += L1TrigT1CaloBSMonToolA4
+ #ToolSvc += L1TrigT1CaloBSMonToolA4
L1CaloMan0A4.AthenaMonTools += [ L1TrigT1CaloBSMonToolA4 ]
include("CaloConditions/CaloConditions_jobOptions.py")
@@ -106,7 +106,7 @@ if l1caloRawMon:
name = "L1TrigT1CaloBSMonToolB",
LoadCaloCells = True
)
- ToolSvc += L1TrigT1CaloBSMonToolB
+ #ToolSvc += L1TrigT1CaloBSMonToolB
L1CaloMan0B.AthenaMonTools += [ L1TrigT1CaloBSMonToolB ]
from TrigT1CaloMonitoringTools.LVL1CaloMonFlags import LVL1CaloMonFlags
@@ -144,7 +144,7 @@ if l1caloRawMon:
PathInRootFile = "L1Calo/PPrStabilityMon",
#OutputLevel = DEBUG
)
- ToolSvc += L1PPrStabilityMonTool
+ #ToolSvc += L1PPrStabilityMonTool
L1CaloMan1A.AthenaMonTools += [ L1PPrStabilityMonTool ]
else:
@@ -167,7 +167,7 @@ if l1caloRawMon:
PathInRootFile = "L1Calo/PPM/Stability",
#OutputLevel = DEBUG
)
- ToolSvc += L1PPrStabilityMonToolA
+ #ToolSvc += L1PPrStabilityMonToolA
L1CaloMan1A.AthenaMonTools += [ L1PPrStabilityMonToolA ]
L1PPrStabilityMonToolB = PPrStabilityMon(
@@ -182,7 +182,7 @@ if l1caloRawMon:
PathInRootFile = "L1Calo/PPM/Stability",
#OutputLevel = DEBUG
)
- ToolSvc += L1PPrStabilityMonToolB
+ #ToolSvc += L1PPrStabilityMonToolB
L1CaloMan1B.AthenaMonTools += [ L1PPrStabilityMonToolB ]
L1PPrStabilityMonToolC = PPrStabilityMon(
@@ -197,7 +197,7 @@ if l1caloRawMon:
PathInRootFile = "L1Calo/PPM/Stability",
#OutputLevel = DEBUG
)
- ToolSvc += L1PPrStabilityMonToolC
+ #ToolSvc += L1PPrStabilityMonToolC
L1CaloMan1C.AthenaMonTools += [ L1PPrStabilityMonToolC ]
#=================================================================================
@@ -218,14 +218,14 @@ if l1caloRawMon:
ErrorPathInRootFile = "L1Calo/PPM/Errors",
#OutputLevel = DEBUG
)
- ToolSvc += L1PPrMonTool
+ #ToolSvc += L1PPrMonTool
L1CaloMan2.AthenaMonTools += [ L1PPrMonTool ]
if isData:
from TrigT1CaloMonitoring.TrigT1CaloMonitoringConf import PPMSimBSMon
PPMSimBSMonTool = PPMSimBSMon("PPMSimBSMonTool")
- ToolSvc += PPMSimBSMonTool
+ #ToolSvc += PPMSimBSMonTool
L1CaloMan3.AthenaMonTools += [ PPMSimBSMonTool ]
#ToolSvc.PPMSimBSMonTool.OutputLevel = DEBUG
from TrigT1CaloTools.TrigT1CaloToolsConf import LVL1__L1TriggerTowerTool
@@ -243,7 +243,7 @@ if l1caloRawMon:
ErrorPathInRootFile = "L1Calo/PPM/SpareChannels/Errors",
#OutputLevel = DEBUG
)
- ToolSvc += L1PPrSpareMonTool
+ #ToolSvc += L1PPrSpareMonTool
L1CaloMan4.AthenaMonTools += [ L1PPrSpareMonTool ]
#=================================================================================
@@ -263,7 +263,7 @@ if l1caloRawMon:
ErrorPathInRootFile = "L1Calo/JEM/Errors/Hardware",
#OutputLevel = DEBUG
)
- ToolSvc += L1JEMMonTool
+ #ToolSvc += L1JEMMonTool
L1CaloMan5.AthenaMonTools += [ L1JEMMonTool ]
#----------------------------------- CMM ------------------------------------------
@@ -277,7 +277,7 @@ if l1caloRawMon:
ErrorPathInRootFile = "L1Calo/JEM_CMM/Errors/Hardware",
#OutputLevel = DEBUG
)
- ToolSvc += L1CMMMonTool
+ #ToolSvc += L1CMMMonTool
L1CaloMan6.AthenaMonTools += [ L1CMMMonTool ]
if isData:
@@ -289,7 +289,7 @@ if l1caloRawMon:
JetTool = "LVL1::L1JetTools/L1JetTools_Mon",
JEPEtSumsTool = "LVL1::L1JEPEtSumsTools/L1JEPEtSumsTools_Mon",
)
- ToolSvc += JEPSimBSMonTool
+ #ToolSvc += JEPSimBSMonTool
L1CaloMan7.AthenaMonTools += [ JEPSimBSMonTool ]
#ToolSvc.JEPSimBSMonTool.OutputLevel = DEBUG
@@ -326,7 +326,7 @@ if l1caloRawMon:
MaxEnergyRange = 256,
#OutputLevel = DEBUG,
)
- ToolSvc += L1BSCPMMonTool
+ #ToolSvc += L1BSCPMMonTool
L1CaloMan8.AthenaMonTools += [ L1BSCPMMonTool ]
if isData:
@@ -335,7 +335,7 @@ if l1caloRawMon:
CPMSimBSMonTool = CPMSimBSMon("CPMSimBSMonTool",
EmTauTool = "LVL1::L1EmTauTools/L1EmTauTools_Mon",
)
- ToolSvc += CPMSimBSMonTool
+ #ToolSvc += CPMSimBSMonTool
L1CaloMan9.AthenaMonTools += [ CPMSimBSMonTool ]
#ToolSvc.CPMSimBSMonTool.OutputLevel = DEBUG
@@ -353,7 +353,7 @@ if l1caloRawMon:
#OnlineTest = True,
#OutputLevel = DEBUG,
)
- ToolSvc += L1BSRODMonTool
+ #ToolSvc += L1BSRODMonTool
L1CaloManA.AthenaMonTools += [ L1BSRODMonTool ]
#=================================================================================
@@ -369,7 +369,7 @@ if l1caloRawMon:
#OnlineTest = True,
#OutputLevel = DEBUG
)
- ToolSvc += L1GlobalMonTool
+ #ToolSvc += L1GlobalMonTool
L1CaloManB.AthenaMonTools += [ L1GlobalMonTool ]
if isData and isCalo and Offline and (rec.triggerStream() == "JetTauEtmiss"
@@ -384,7 +384,7 @@ if l1caloRawMon:
L1EmEfficienciesMonTool = EmEfficienciesMonTool ( name = "EmEfficienciesMonTool",
TriggerStrings = trigstring
)
- ToolSvc += L1EmEfficienciesMonTool
+ #ToolSvc += L1EmEfficienciesMonTool
L1CaloManC.AthenaMonTools += [ L1EmEfficienciesMonTool ]
if not hasattr( ToolSvc, "TrigDecisionTool" ):
from TrigDecisionTool.TrigDecisionToolConf import Trig__TrigDecisionTool
@@ -405,7 +405,7 @@ if l1caloRawMon:
)
ToolSvc += L1JetEfficienciesMonTool
L1CaloManD.AthenaMonTools += [ L1JetEfficienciesMonTool ]
- if not hasattr( ToolSvc, "TrigDecisionTool" ):
+ if not hasattr( #ToolSvc, "TrigDecisionTool" ):
from TrigDecisionTool.TrigDecisionToolConf import Trig__TrigDecisionTool
tdt = Trig__TrigDecisionTool('TrigDecisionTool')
ToolSvc += tdt
diff --git a/Trigger/TrigT1/TrigT1CaloMonitoring/share/TrigT1CaloMonitoring_runStandalone.py b/Trigger/TrigT1/TrigT1CaloMonitoring/share/TrigT1CaloMonitoring_runStandalone.py
index 3dd3a5ad198c..fbe2c5141ec8 100644
--- a/Trigger/TrigT1/TrigT1CaloMonitoring/share/TrigT1CaloMonitoring_runStandalone.py
+++ b/Trigger/TrigT1/TrigT1CaloMonitoring/share/TrigT1CaloMonitoring_runStandalone.py
@@ -64,32 +64,32 @@ L1CaloMan.ManualRunLBSetup = False
if doJEPJEMMon:
from TrigT1CaloMonitoring.TrigT1CaloMonitoringConf import LVL1__JEPJEMMon
L1JEPJEMMonTool = LVL1__JEPJEMMon("L1JEPJEMMonTool")
- ToolSvc += L1JEPJEMMonTool
+ #ToolSvc += L1JEPJEMMonTool
L1CaloMan.AthenaMonTools += [L1JEPJEMMonTool]
if doJEPCMXMon:
from TrigT1CaloMonitoring.TrigT1CaloMonitoringConf import LVL1__JEPCMXMon
L1JEPCMXMonTool = LVL1__JEPCMXMon("L1JEPCMXMonTool")
- ToolSvc += L1JEPCMXMonTool
+ #ToolSvc += L1JEPCMXMonTool
L1CaloMan.AthenaMonTools += [L1JEPCMXMonTool]
if doCPMon:
from TrigT1CaloMonitoring.TrigT1CaloMonitoringConf import LVL1__CPMon
L1CPMMonTool = LVL1__CPMon("L1CPMMonTool")
- ToolSvc += L1CPMMonTool
+ #ToolSvc += L1CPMMonTool
L1CaloMan.AthenaMonTools += [L1CPMMonTool]
if doCPSimMon:
from TrigT1CaloMonitoring.TrigT1CaloMonitoringConf import LVL1__CPSimMon
CPSimMonTool = LVL1__CPSimMon("CPSimMonTool")
- ToolSvc += CPSimMonTool
+ #ToolSvc += CPSimMonTool
L1CaloMan.AthenaMonTools += [CPSimMonTool]
if doJEPSimMon:
from TrigT1CaloMonitoring.TrigT1CaloMonitoringConf import LVL1__JEPSimMon
JEPSimMonTool = LVL1__JEPSimMon("JEPSimMonTool")
- ToolSvc += JEPSimMonTool
+ #ToolSvc += JEPSimMonTool
L1CaloMan.AthenaMonTools += [JEPSimMonTool]
if doRODMon:
@@ -97,14 +97,14 @@ if doRODMon:
L1BSRODMonTool = LVL1__RODMon(
name="L1BSRODMonTool",
)
- ToolSvc += L1BSRODMonTool
+ #ToolSvc += L1BSRODMonTool
L1CaloMan.AthenaMonTools += [L1BSRODMonTool]
if doOverviewMon:
from TrigT1CaloMonitoring.TrigT1CaloMonitoringConf import LVL1__OverviewMon
L1OverviewMonTool = LVL1__OverviewMon("L1OverviewMonTool")
- ToolSvc += L1OverviewMonTool
+ #ToolSvc += L1OverviewMonTool
L1CaloMan.AthenaMonTools += [L1OverviewMonTool]
from TrigT1CaloMonitoringTools.TrigT1CaloMonitoringToolsConf import LVL1__TrigT1CaloMonErrorTool
diff --git a/Trigger/TrigT1/TrigT1Monitoring/share/TrigT1Monitoring_forRecExCommission_Run2.py b/Trigger/TrigT1/TrigT1Monitoring/share/TrigT1Monitoring_forRecExCommission_Run2.py
index 9a4003ea341a..c8bd2f89a04f 100644
--- a/Trigger/TrigT1/TrigT1Monitoring/share/TrigT1Monitoring_forRecExCommission_Run2.py
+++ b/Trigger/TrigT1/TrigT1Monitoring/share/TrigT1Monitoring_forRecExCommission_Run2.py
@@ -71,7 +71,7 @@ if l1caloRawMon:
MaxEnergyRange = 256,
#OutputLevel = VERBOSE,
)
- ToolSvc += CalorimeterL1CaloMonTool
+ #ToolSvc += CalorimeterL1CaloMonTool
L1Man.AthenaMonTools += [ CalorimeterL1CaloMonTool ]
# HV corrections
from LArRecUtils.LArHVCorrToolDefault import LArHVCorrToolDefault
@@ -95,7 +95,7 @@ if l1caloRawMon:
DoHVDifference = doHV,
PathInRootFile = "LVL1_Interfaces/Calorimeter",
)
- ToolSvc += L1CaloHVScalesMonTool
+ #ToolSvc += L1CaloHVScalesMonTool
L1Man.AthenaMonTools += [ L1CaloHVScalesMonTool ]
# PMT scores
from TrigT1Monitoring.TrigT1MonitoringConf import LVL1__L1CaloPMTScoresMon
@@ -103,7 +103,7 @@ if l1caloRawMon:
name = "L1CaloPMTScoresMonTool",
PathInRootFile = "LVL1_Interfaces/Calorimeter",
)
- ToolSvc += L1CaloPMTScoresMonTool
+ #ToolSvc += L1CaloPMTScoresMonTool
L1Man.AthenaMonTools += [ L1CaloPMTScoresMonTool ]
if isData: #and DQMonFlags.doCTPMon(): # KW this is not set in online environment! Investigate! # GP doCTPMon() commented out for now
@@ -117,7 +117,7 @@ if l1caloRawMon:
name = "L1CaloCTPMonTool",
#OutputLevel = DEBUG,
)
- ToolSvc += L1CaloCTPMonTool
+ #ToolSvc += L1CaloCTPMonTool
L1Man.AthenaMonTools += [ L1CaloCTPMonTool ]
####################### L1Calo->Level-2 ################################
@@ -136,7 +136,7 @@ if l1caloRawMon:
#OutputLevel = DEBUG,
#OutputLevel = VERBOSE,
)
- ToolSvc += L1CaloL1TopoMonTool
+ #ToolSvc += L1CaloL1TopoMonTool
L1Man.AthenaMonTools += [ L1CaloL1TopoMonTool ]
##########################################################################
diff --git a/Trigger/TrigT1/TrigT1Monitoring/share/TrigT1Monitoring_forRecExCommission_cpu.py b/Trigger/TrigT1/TrigT1Monitoring/share/TrigT1Monitoring_forRecExCommission_cpu.py
index ec39e07a8799..2188933a6241 100644
--- a/Trigger/TrigT1/TrigT1Monitoring/share/TrigT1Monitoring_forRecExCommission_cpu.py
+++ b/Trigger/TrigT1/TrigT1Monitoring/share/TrigT1Monitoring_forRecExCommission_cpu.py
@@ -50,7 +50,7 @@ if l1caloRawMon:
L1Man2 = topSequence.L1MonManager2
## get a handle on the ToolSvc
- from AthenaCommon.AppMgr import ToolSvc
+ #from AthenaCommon.AppMgr import ToolSvc
if globalflags.InputFormat() == "bytestream":
include ("TrigT1CaloByteStream/ReadLVL1CaloBS_jobOptions.py")
@@ -78,7 +78,7 @@ if l1caloRawMon:
MaxEnergyRange = 256,
#OutputLevel = VERBOSE,
)
- ToolSvc += CalorimeterL1CaloMonTool
+ #ToolSvc += CalorimeterL1CaloMonTool
L1Man0A.AthenaMonTools += [ CalorimeterL1CaloMonTool ]
# HV corrections
from LArRecUtils.LArHVCorrToolDefault import LArHVCorrToolDefault
@@ -102,7 +102,7 @@ if l1caloRawMon:
DoHVDifference = doHV,
PathInRootFile = "LVL1_Interfaces/Calorimeter",
)
- ToolSvc += L1CaloHVScalesMonTool
+ #ToolSvc += L1CaloHVScalesMonTool
L1Man0B.AthenaMonTools += [ L1CaloHVScalesMonTool ]
# PMT scores
from TrigT1Monitoring.TrigT1MonitoringConf import LVL1__L1CaloPMTScoresMon
@@ -110,7 +110,7 @@ if l1caloRawMon:
name = "L1CaloPMTScoresMonTool",
PathInRootFile = "LVL1_Interfaces/Calorimeter",
)
- ToolSvc += L1CaloPMTScoresMonTool
+ #ToolSvc += L1CaloPMTScoresMonTool
L1Man0C.AthenaMonTools += [ L1CaloPMTScoresMonTool ]
if isData and DQMonFlags.doCTPMon():
@@ -125,7 +125,7 @@ if l1caloRawMon:
#OutputLevel = DEBUG,
#OutputLevel = VERBOSE,
)
- ToolSvc += L1CaloCTPMonTool
+ #ToolSvc += L1CaloCTPMonTool
L1Man1.AthenaMonTools += [ L1CaloCTPMonTool ]
####################### L1Calo->Level-2 ################################
@@ -134,7 +134,7 @@ if l1caloRawMon:
name = "L1CaloLevel2MonTool",
#OutputLevel = DEBUG,
)
- ToolSvc += L1CaloLevel2MonTool
+ #ToolSvc += L1CaloLevel2MonTool
L1Man2.AthenaMonTools += [ L1CaloLevel2MonTool ]
##########################################################################
diff --git a/Trigger/TrigValidation/TrigAnalysisTest/share/testAthenaTrigAOD_xTrigDecision_HLTMonitoring.py b/Trigger/TrigValidation/TrigAnalysisTest/share/testAthenaTrigAOD_xTrigDecision_HLTMonitoring.py
index 7a1ea9601e2f..f63ff87902c6 100644
--- a/Trigger/TrigValidation/TrigAnalysisTest/share/testAthenaTrigAOD_xTrigDecision_HLTMonitoring.py
+++ b/Trigger/TrigValidation/TrigAnalysisTest/share/testAthenaTrigAOD_xTrigDecision_HLTMonitoring.py
@@ -42,9 +42,9 @@ HLTMon = HLTMonTool(name = 'HLTMon',
histoPathBase = "/Trigger/HLT",
TrigConfigTool=cfgtool);
-ToolSvc += HLTMon;
+#ToolSvc += HLTMon;
-HLTMonManager.AthenaMonTools += [ "HLTMonTool/HLTMon" ];
+HLTMonManager.AthenaMonTools += [ HLTMon ];
HLTMonManager.FileKey = "GLOBAL"
diff --git a/Trigger/TrigValidation/TrigAnalysisTest/share/testAthenaTrigESD_HLTMonitoring.py b/Trigger/TrigValidation/TrigAnalysisTest/share/testAthenaTrigESD_HLTMonitoring.py
index bd7c23ba881b..f8c5ab05ba60 100644
--- a/Trigger/TrigValidation/TrigAnalysisTest/share/testAthenaTrigESD_HLTMonitoring.py
+++ b/Trigger/TrigValidation/TrigAnalysisTest/share/testAthenaTrigESD_HLTMonitoring.py
@@ -61,9 +61,9 @@ HLTMon = HLTMonTool(name = 'HLTMon',
#HLTMon.TrigDecisionTool = monTrigDecTool
-ToolSvc += HLTMon;
+#ToolSvc += HLTMon;
-HLTMonManager.AthenaMonTools += [ "HLTMonTool/HLTMon" ];
+HLTMonManager.AthenaMonTools += [ HLTMon ];
from TrigEgammaMonitoring.TrigEgammaMonitoringConfig import TrigEgammaMonitoringTool
diff --git a/Trigger/TrigValidation/TrigEgammaValidation/share/TrigEgammaAnalysisTools_RTT.py b/Trigger/TrigValidation/TrigEgammaValidation/share/TrigEgammaAnalysisTools_RTT.py
index 5b95aac25d04..eab843fdd310 100755
--- a/Trigger/TrigValidation/TrigEgammaValidation/share/TrigEgammaAnalysisTools_RTT.py
+++ b/Trigger/TrigValidation/TrigEgammaValidation/share/TrigEgammaAnalysisTools_RTT.py
@@ -114,6 +114,6 @@ TrigEgammaPhysValMonTool = TrigEgammaPhysValMonTool( name = "TrigEgammaPhysValMo
"TrigEgammaNavTPAnalysisTool/NavTPAnalysis",
])
-ToolSvc += TrigEgammaPhysValMonTool
-monMan.AthenaMonTools += [ "TrigEgammaPhysValMonTool" ]
+#ToolSvc += TrigEgammaPhysValMonTool
+monMan.AthenaMonTools += [ TrigEgammaPhysValMonTool ]
diff --git a/Trigger/TrigValidation/TrigInDetValidation/share/TrigInDetValidation_RTT_Common.py b/Trigger/TrigValidation/TrigInDetValidation/share/TrigInDetValidation_RTT_Common.py
index 495a2c1f28a1..ef6fa03c28f9 100644
--- a/Trigger/TrigValidation/TrigInDetValidation/share/TrigInDetValidation_RTT_Common.py
+++ b/Trigger/TrigValidation/TrigInDetValidation/share/TrigInDetValidation_RTT_Common.py
@@ -302,10 +302,10 @@ d = release_metadata()
TestMonTool.releaseMetaData = d['nightly name'] + " " + d['nightly release'] + " " + d['date'] + " " + d['platform'] + " " + d['release']
TestMonTool.outputFileName="TrkNtuple.root"
-ToolSvc += TestMonTool
+#ToolSvc += TestMonTool
#TestMonTool.OutputLevel=DEBUG
-HLTMonManager.AthenaMonTools += [ "TrigTestMonToolAC/TestMonToolAC" ]
+HLTMonManager.AthenaMonTools += [ TestMonTool ]
# post set up trigger monitoring
if 'enableCostMonitoring' in dir() and bool(enableCostMonitoring) == True:
diff --git a/Trigger/TrigValidation/TrigInDetValidation/share/TrigInDetValidation_RTT_topOptions_Bphysics.py b/Trigger/TrigValidation/TrigInDetValidation/share/TrigInDetValidation_RTT_topOptions_Bphysics.py
index c418447a93c3..05ebf64334eb 100644
--- a/Trigger/TrigValidation/TrigInDetValidation/share/TrigInDetValidation_RTT_topOptions_Bphysics.py
+++ b/Trigger/TrigValidation/TrigInDetValidation/share/TrigInDetValidation_RTT_topOptions_Bphysics.py
@@ -57,8 +57,8 @@ HLTMonManager = topSequence.HLTMonManager
from TrigIDJpsiMonitoring.TrigIDJpsiMonitoringConf import TrigJpsiMonTool
TPMonTool = TrigJpsiMonTool( name="TPMonTool")
-ToolSvc += TPMonTool
-HLTMonManager.AthenaMonTools += [ "TrigJpsiMonTool/TPMonTool" ]
+#ToolSvc += TPMonTool
+HLTMonManager.AthenaMonTools += [ TPMonTool ]
TPMonTool.matchR = 0.1
--
GitLab