diff --git a/Trigger/TrigMonitoring/TrigEgammaMonitoring/python/egammaMonitorPrecisionConfig.py b/Trigger/TrigMonitoring/TrigEgammaMonitoring/python/egammaMonitorPrecisionConfig.py
index 08ebbab1745f7c6a774f2deafac2bf5b0e02d379..9b4de8cac94d0b805d046b5c78fd75975569969f 100644
--- a/Trigger/TrigMonitoring/TrigEgammaMonitoring/python/egammaMonitorPrecisionConfig.py
+++ b/Trigger/TrigMonitoring/TrigEgammaMonitoring/python/egammaMonitorPrecisionConfig.py
@@ -6,12 +6,12 @@ from AthenaCommon.Logging import logging
logging.getLogger().info("Importing %s",__name__)
log = logging.getLogger("TrigEgammaMonitoring.egammaMonitorPrecisionConfig")
-def egammaMonitorPrecisionCfg(name):
+def egammaMonitorPrecisionCfg(flags, name):
if ('Electron' in name):
from AthenaMonitoringKernel.GenericMonitoringTool import GenericMonitoringTool
- monTool = GenericMonitoringTool("MonTool_"+name)
+ monTool = GenericMonitoringTool(flags, "MonTool_"+name)
#track variables monitoring
monTool.defineHistogram('deltaEta0',title='Precision#Delta#eta0', path='EXPERT',xbins=40, xmin=-0.01,xmax=0.01)
monTool.defineHistogram('deltaEta1',title='Precision#Delta#eta1', path='EXPERT',xbins=40, xmin=-0.01,xmax=0.01)
@@ -55,7 +55,7 @@ def egammaMonitorPrecisionCfg(name):
return monTool
else:
from AthenaMonitoringKernel.GenericMonitoringTool import GenericMonitoringTool
- monTool = GenericMonitoringTool("MonTool_"+name)
+ monTool = GenericMonitoringTool(flags, "MonTool_"+name)
#Shower Shapes variables monitoring
monTool.defineHistogram('Reta', type='TH1F', path='EXPERT',title="Reta",xbins=15, xmin=0.4, xmax=1.2)
@@ -84,12 +84,12 @@ def egammaMonitorPrecisionCfg(name):
return monTool
-def egammaMonitorSuperClusterCfg(name):
+def egammaMonitorSuperClusterCfg(flags, name):
from math import pi
from AthenaMonitoringKernel.GenericMonitoringTool import GenericMonitoringTool
- monTool = GenericMonitoringTool("MonTool_"+name)
+ monTool = GenericMonitoringTool(flags, "MonTool_"+name)
#calo cluster variables monitoring
monTool.defineHistogram('et', type='TH1D', path='EXPERT', title="E_{T}; E_{T} [GeV]; Entries", xbins= 150, xmin= 0.0, xmax= 200.0)
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/Electron/PrecisionElectronRecoSequences.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/Electron/PrecisionElectronRecoSequences.py
index 0ba3f2132f41a39182a30d2c900a38f581d060d8..8cd23c9e8c2213528186c217cb4ab48b34a5681b 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/Electron/PrecisionElectronRecoSequences.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/Electron/PrecisionElectronRecoSequences.py
@@ -137,7 +137,7 @@ def precisionElectronRecoSequence(flags, RoIs, ion=False, doGSF=True, doLRT=Fals
#online monitoring for topoEgammaBuilder_GSF
from TriggerMenuMT.HLT.Electron.TrigElectronFactories import PrecisionElectronTopoMonitorCfg
- PrecisionElectronRecoMonAlgo_GSF = PrecisionElectronTopoMonitorCfg("PrecisionElectronTopoMonitoring"+tag)
+ PrecisionElectronRecoMonAlgo_GSF = PrecisionElectronTopoMonitorCfg(flags, "PrecisionElectronTopoMonitoring"+tag)
PrecisionElectronRecoMonAlgo_GSF.ElectronKey = TrigTopoEgammaAlgo_GSF.ElectronOutputName
PrecisionElectronRecoMonAlgo_GSF.IsoVarKeys = [ '%s.ptcone20' % TrigTopoEgammaAlgo_GSF.ElectronOutputName,
'%s.ptvarcone20' % TrigTopoEgammaAlgo_GSF.ElectronOutputName,
@@ -147,7 +147,7 @@ def precisionElectronRecoSequence(flags, RoIs, ion=False, doGSF=True, doLRT=Fals
#online monitoring for TrigElectronSuperClusterBuilder_GSF
from TriggerMenuMT.HLT.Electron.TrigElectronFactories import PrecisionElectronSuperClusterMonitorCfg
- PrecisionElectronSuperClusterMonAlgo_GSF = PrecisionElectronSuperClusterMonitorCfg("PrecisionElectronSuperClusterBuilder"+tag)
+ PrecisionElectronSuperClusterMonAlgo_GSF = PrecisionElectronSuperClusterMonitorCfg(flags, "PrecisionElectronSuperClusterBuilder"+tag)
PrecisionElectronSuperClusterMonAlgo_GSF.InputEgammaRecContainerName = TrigSuperElectronAlgo_GSF.SuperElectronRecCollectionName
thesequence_GSF += PrecisionElectronSuperClusterMonAlgo_GSF
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/Electron/TrigElectronFactories.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/Electron/TrigElectronFactories.py
index 2dd5993fbf7242051ff541834e98b48eef339c1d..75de69ead6fa4656127db1ac1416086ceb6d2f4c 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/Electron/TrigElectronFactories.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/Electron/TrigElectronFactories.py
@@ -71,11 +71,11 @@ def TrigTopoEgammaElectronCfg(name='topoEgammaBuilder_TrigElectrons'):
)
return TrigTopoEgammaElectron()
-def PrecisionElectronTopoMonitorCfg(name = 'PrecisionElectronTopoMonitoring'):
+def PrecisionElectronTopoMonitorCfg(flags, name = 'PrecisionElectronTopoMonitoring'):
from TrigEgammaMonitoring import TrigEgammaMonitoringConf
from TrigEgammaMonitoring.egammaMonitorPrecisionConfig import egammaMonitorPrecisionCfg
- monTool = egammaMonitorPrecisionCfg(name)
+ monTool = egammaMonitorPrecisionCfg(flags, name)
PrecisionElectronTopoMonitor = AlgFactory( TrigEgammaMonitoringConf.egammaMonitorElectronAlgorithm,
name = name,
@@ -86,11 +86,11 @@ def PrecisionElectronTopoMonitorCfg(name = 'PrecisionElectronTopoMonitoring'):
return PrecisionElectronTopoMonitor()
-def PrecisionElectronSuperClusterMonitorCfg(name = 'PrecisionElectronSuperClusterMonitoring'):
+def PrecisionElectronSuperClusterMonitorCfg(flags, name = 'PrecisionElectronSuperClusterMonitoring'):
from TrigEgammaMonitoring import TrigEgammaMonitoringConf
from TrigEgammaMonitoring.egammaMonitorPrecisionConfig import egammaMonitorSuperClusterCfg
- monTool = egammaMonitorSuperClusterCfg(name)
+ monTool = egammaMonitorSuperClusterCfg(flags, name)
PrecisionElectronSuperClusterMonitor = AlgFactory( TrigEgammaMonitoringConf.egammaMonitorSuperClusterAlgorithm,
name = name,
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/Photon/PrecisionPhotonCaloIsoRecoSequences.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/Photon/PrecisionPhotonCaloIsoRecoSequences.py
index 52dc856bab69d8fb66a8e7f3e43b050f95d22c98..20d157112d83bff1a6d6902395c5c0e3e6d4ce35 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/Photon/PrecisionPhotonCaloIsoRecoSequences.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/Photon/PrecisionPhotonCaloIsoRecoSequences.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2002-2022 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2023 CERN for the benefit of the ATLAS collaboration
from AthenaCommon.CFElements import parOR
from TriggerMenuMT.HLT.Egamma.TrigEgammaKeys import getTrigEgammaKeys
@@ -9,7 +9,7 @@ log = logging.getLogger(__name__)
-def precisionPhotonCaloIsoRecoSequence(RoIs, ion=False):
+def precisionPhotonCaloIsoRecoSequence(flags, RoIs, ion=False):
""" With this function we will setup the sequence of Calo isolation to be executed after PrecisionPhoton in TrigEgamma
"""
@@ -59,7 +59,7 @@ def precisionPhotonCaloIsoRecoSequence(RoIs, ion=False):
#online monitoring for topoEgammaBuilder
from TriggerMenuMT.HLT.Photon.TrigPhotonFactories import PrecisionPhotonCaloIsoMonitorCfg
- PrecisionPhotonCaloIsoRecoMonAlgo = PrecisionPhotonCaloIsoMonitorCfg('PrecisionPhotonCaloIsoEgammaBuilderMon' + tag)
+ PrecisionPhotonCaloIsoRecoMonAlgo = PrecisionPhotonCaloIsoMonitorCfg(flags, 'PrecisionPhotonCaloIsoEgammaBuilderMon' + tag)
PrecisionPhotonCaloIsoRecoMonAlgo.PhotonKey = TrigEgammaKeys.precisionPhotonContainer
PrecisionPhotonCaloIsoRecoMonAlgo.IsoVarKeys = [ '%s.topoetcone20' % collectionIn, '%s.topoetcone40' % collectionIn]
thesequence += PrecisionPhotonCaloIsoRecoMonAlgo
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/Photon/PrecisionPhotonMenuSequences.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/Photon/PrecisionPhotonMenuSequences.py
index 2468e3417e9c3df2464a9fe3d0b0cb54a8fbbe63..ba38f8bd576df091db79812acbd260908e82a90e 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/Photon/PrecisionPhotonMenuSequences.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/Photon/PrecisionPhotonMenuSequences.py
@@ -27,7 +27,7 @@ def precisionPhotonSequence(flags, ion=False):
# Configure the reconstruction algorithm sequence
from TriggerMenuMT.HLT.Photon.PrecisionPhotonRecoSequences import precisionPhotonRecoSequence
- (precisionPhotonInViewSequence, sequenceOut) = precisionPhotonRecoSequence(InViewRoIs, ion)
+ (precisionPhotonInViewSequence, sequenceOut) = precisionPhotonRecoSequence(flags, InViewRoIs, ion)
precisionPhotonViewsMaker.ViewNodeName = precisionPhotonInViewSequence.name()
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/Photon/PrecisionPhotonRecoSequences.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/Photon/PrecisionPhotonRecoSequences.py
index 204401f69a8065b707bd59b17ce73bb8e2b9fe44..cf7af96c8fefde75d680ffebee24526392115fc4 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/Photon/PrecisionPhotonRecoSequences.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/Photon/PrecisionPhotonRecoSequences.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2023 CERN for the benefit of the ATLAS collaboration
from AthenaCommon.CFElements import parOR
from TriggerMenuMT.HLT.Egamma.TrigEgammaKeys import getTrigEgammaKeys
@@ -9,7 +9,7 @@ log = logging.getLogger(__name__)
-def precisionPhotonRecoSequence(RoIs, ion=False):
+def precisionPhotonRecoSequence(flags, RoIs, ion=False):
""" With this function we will setup the sequence of offline EgammaAlgorithms so to make a photon for TrigEgamma
Sequence of algorithms is the following:
@@ -68,14 +68,14 @@ def precisionPhotonRecoSequence(RoIs, ion=False):
#online monitoring for topoEgammaBuilder
from TriggerMenuMT.HLT.Photon.TrigPhotonFactories import PrecisionPhotonTopoMonitorCfg
- PrecisionPhotonRecoMonAlgo = PrecisionPhotonTopoMonitorCfg('PrecisionPhotonTopoEgammaBuilder' + tag)
+ PrecisionPhotonRecoMonAlgo = PrecisionPhotonTopoMonitorCfg(flags, 'PrecisionPhotonTopoEgammaBuilder' + tag)
PrecisionPhotonRecoMonAlgo.PhotonKey = trigTopoEgammaAlgo.PhotonOutputName
#PrecisionPhotonRecoMonAlgo.IsoVarKeys = [ '%s.topoetcone20' % trigTopoEgammaAlgo.PhotonOutputName, '%s.topoetcone40' % trigTopoEgammaAlgo.PhotonOutputName]
thesequence += PrecisionPhotonRecoMonAlgo
#online monitoring for TrigPhotonSuperClusterBuilder
from TriggerMenuMT.HLT.Photon.TrigPhotonFactories import PrecisionPhotonSuperClusterMonitorCfg
- PrecisionPhotonSuperClusterMonAlgo = PrecisionPhotonSuperClusterMonitorCfg('PrecisionPhotonSuperClusterBuilder' + tag)
+ PrecisionPhotonSuperClusterMonAlgo = PrecisionPhotonSuperClusterMonitorCfg(flags, 'PrecisionPhotonSuperClusterBuilder' + tag)
PrecisionPhotonSuperClusterMonAlgo.InputEgammaRecContainerName = TrigEgammaKeys.precisionPhotonSuperClusterCollection
thesequence += PrecisionPhotonSuperClusterMonAlgo
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/Photon/TrigPhotonFactories.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/Photon/TrigPhotonFactories.py
index 96ac546fea4cc15d0f81b2f102bd5090f4c5a5b2..cc22a7422d6dc4cf5f882d5fa8306d810b4135bd 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/Photon/TrigPhotonFactories.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/Photon/TrigPhotonFactories.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2023 CERN for the benefit of the ATLAS collaboration
__doc__ = "ToolFactories to configure egammaAlgs to be used at the HLT"
__author__ = "Fernando Monticelli"
@@ -85,11 +85,11 @@ TrigTopoEgammaPhotons = AlgFactory( egammaAlgsConf.xAODEgammaBuilder,
doElectrons = False,
)
-def PrecisionPhotonCaloIsoMonitorCfg(name = 'PrecisionPhotonCaloIsoMonitoring'):
+def PrecisionPhotonCaloIsoMonitorCfg(flags, name = 'PrecisionPhotonCaloIsoMonitoring'):
from TrigEgammaMonitoring import TrigEgammaMonitoringConf
from TrigEgammaMonitoring.egammaMonitorPrecisionConfig import egammaMonitorPrecisionCfg
- monTool = egammaMonitorPrecisionCfg(name)
+ monTool = egammaMonitorPrecisionCfg(flags, name)
PrecisionPhotonCaloIsoMonitor = AlgFactory( TrigEgammaMonitoringConf.egammaMonitorPhotonAlgorithm,
name = name,
@@ -100,11 +100,11 @@ def PrecisionPhotonCaloIsoMonitorCfg(name = 'PrecisionPhotonCaloIsoMonitoring'):
return PrecisionPhotonCaloIsoMonitor()
-def PrecisionPhotonTopoMonitorCfg(name = 'PrecisionPhotonTopoMonitoring'):
+def PrecisionPhotonTopoMonitorCfg(flags, name = 'PrecisionPhotonTopoMonitoring'):
from TrigEgammaMonitoring import TrigEgammaMonitoringConf
from TrigEgammaMonitoring.egammaMonitorPrecisionConfig import egammaMonitorPrecisionCfg
- monTool = egammaMonitorPrecisionCfg(name)
+ monTool = egammaMonitorPrecisionCfg(flags, name)
PrecisionPhotonTopoMonitor = AlgFactory( TrigEgammaMonitoringConf.egammaMonitorPhotonAlgorithm,
name = name,
@@ -115,11 +115,11 @@ def PrecisionPhotonTopoMonitorCfg(name = 'PrecisionPhotonTopoMonitoring'):
return PrecisionPhotonTopoMonitor()
-def PrecisionPhotonSuperClusterMonitorCfg(name = 'PrecisionPhotonSuperClusterMonitoring'):
+def PrecisionPhotonSuperClusterMonitorCfg(flags, name = 'PrecisionPhotonSuperClusterMonitoring'):
from TrigEgammaMonitoring import TrigEgammaMonitoringConf
from TrigEgammaMonitoring.egammaMonitorPrecisionConfig import egammaMonitorSuperClusterCfg
- monTool = egammaMonitorSuperClusterCfg(name)
+ monTool = egammaMonitorSuperClusterCfg(flags, name)
PrecisionPhotonSuperClusterMonitor = AlgFactory( TrigEgammaMonitoringConf.egammaMonitorSuperClusterAlgorithm,
name = name,