diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Electron/PrecisionElectronRecoSequences.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Electron/PrecisionElectronRecoSequences.py index aba42d585d80e96fd6923017649dd037e64466e3..c5fb21c3145c73a07709c150124132c1c6853b61 100644 --- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Electron/PrecisionElectronRecoSequences.py +++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Electron/PrecisionElectronRecoSequences.py @@ -64,7 +64,7 @@ def precisionElectronRecoSequence(RoIs): electronPrecisionTrack += ViewVerifyPrecisionCluster """ Retrieve the factories now """ - from TriggerMenuMT.HLTMenuConfig.Electron.TrigElectronFactories import TrigEgammaRecElectron, TrigElectronSuperClusterBuilder, TrigTopoEgammaElectron + from TriggerMenuMT.HLTMenuConfig.Electron.TrigElectronFactories import TrigEgammaRecElectron, TrigElectronSuperClusterBuilder, TrigTopoEgammaElectronCfg from TriggerMenuMT.HLTMenuConfig.Egamma.TrigEgammaFactories import TrigEMTrackMatchBuilder @@ -86,7 +86,7 @@ def precisionElectronRecoSequence(RoIs): trigElectronAlgo.InputEgammaRecContainerName = TrigEgammaAlgo.egammaRecContainer thesequence += trigElectronAlgo - trigTopoEgammaAlgo = TrigTopoEgammaElectron() + trigTopoEgammaAlgo = TrigTopoEgammaElectronCfg() trigTopoEgammaAlgo.SuperElectronRecCollectionName = trigElectronAlgo.SuperElectronRecCollectionName collectionOut = trigTopoEgammaAlgo.ElectronOutputName thesequence += trigTopoEgammaAlgo diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Electron/TrigElectronFactories.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Electron/TrigElectronFactories.py index f8ea466a3db5ea7e8284762807d2e511c7f9d1ed..4dbfeb3ae47b69f36925a88384d4aaf2d8110707 100644 --- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Electron/TrigElectronFactories.py +++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Electron/TrigElectronFactories.py @@ -1,4 +1,5 @@ # Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration +from AthenaCommon.Logging import logging __doc__ = "ToolFactories to configure egammaAlgs to be used at the HLT" @@ -45,18 +46,29 @@ TrigElectronSuperClusterBuilder = AlgFactory( egammaAlgsConf.electronSuperCluste ) -TrigTopoEgammaElectron = AlgFactory( egammaAlgsConf.topoEgammaBuilder, name = 'TrigTopoEgammaElectron', - SuperElectronRecCollectionName = TrigEgammaKeys.SuperElectronRecCollectionName, - SuperPhotonRecCollectionName = TrigEgammaKeys.SuperPhotonRecCollectionName, - ElectronOutputName = TrigEgammaKeys.outputElectronKey, - PhotonOutputName = TrigEgammaKeys.outputPhotonKey, - AmbiguityTool = EGammaAmbiguityTool, - EMClusterTool = TrigEMClusterTool, - EMShowerTool=TrigEMShowerBuilder, - egammaTools = FcnWrapper(TrigEgammaDecorationTools), - doAdd = False, - doPhotons = False, - doElectrons = True - ) +def TrigTopoEgammaElectronCfg(name='topoEgammaBuilder_TrigElectrons'): + from AthenaMonitoringKernel.GenericMonitoringTool import GenericMonitoringTool, defineHistogram + monTool = GenericMonitoringTool("MonTool_topoEgammaBuilder") + monTool.Histograms = [ defineHistogram('EldeltaEta',type='TH1F', title='#Delta#eta', path='EXPERT',xbins=80, xmin=-0.01,xmax=0.01), + defineHistogram('EldeltaPhi',type='TH1F', title='#Delta#phi', path='EXPERT',xbins=80, xmin=-0.01, xmax=0.01), + defineHistogram('EleT', type='TH1F', title='p#_{T} [GeV]', path='EXPERT',xbins=80, xmin=0., xmax=100)] + + mlog = logging.getLogger("TrigElectronFactories") + mlog.info('Starting configuration') + TrigTopoEgammaElectron = AlgFactory( egammaAlgsConf.topoEgammaBuilder, name = name, + SuperElectronRecCollectionName = TrigEgammaKeys.SuperElectronRecCollectionName, + SuperPhotonRecCollectionName = TrigEgammaKeys.SuperPhotonRecCollectionName, + ElectronOutputName = TrigEgammaKeys.outputElectronKey, + PhotonOutputName = TrigEgammaKeys.outputPhotonKey, + AmbiguityTool = EGammaAmbiguityTool, + EMClusterTool = TrigEMClusterTool, + EMShowerTool=TrigEMShowerBuilder, + egammaTools = FcnWrapper(TrigEgammaDecorationTools), + doAdd = False, + doPhotons = False, + doElectrons = True, + #MonTool = monTool + ) + return TrigTopoEgammaElectron()