Merge branch 'IncludeOnlineMonInTrigFactories' into 'master'

Include online monitoring in trigElectron factories

See merge request !32500

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

Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Electron/TrigElectronFactories.py

 # 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()