diff --git a/Reconstruction/egamma/egammaPerformance/python/SetupEgammaMonitoring.py b/Reconstruction/egamma/egammaPerformance/python/SetupEgammaMonitoring.py index a3c7e65039d33166fe9e17eaab9c17a7fda278d2..d0a142fd85438a7b4fb37e13b8e51b6c36d51023 100755 --- a/Reconstruction/egamma/egammaPerformance/python/SetupEgammaMonitoring.py +++ b/Reconstruction/egamma/egammaPerformance/python/SetupEgammaMonitoring.py @@ -2,12 +2,14 @@ # Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration # -'''@file SetupEgammaMonitoring.py +''' +@file SetupEgammaMonitoring.py @author B. Laforge 4 May 2020 @brief Example python configuration for the Run III AthenaMonitoring package ''' from AthenaConfiguration.ComponentFactory import CompFactory +import TrigEgammaMonitoring.TrigEgammaMonitCategory as egammaConf def BookHistogramsPerRegions(thegroupe,theparttype,thename,title,path,xbins,xmin,xmax,thetype="TH1F",thecut="is_pt_gt_4gev"): ''' @@ -601,8 +603,6 @@ def MonitorElectronConfig(inputFlags): ### STEP 3 ### # Edit properties of algorithms - import TrigEgammaMonitoring.TrigEgammaMonitCategory as egammaConf - elLHTightMonAlg.ParticleContainerName = "Electrons" elLHTightMonAlg.RecoName = "LHTight" elLHTightMonAlg.ParticlePrefix = "electron" @@ -705,8 +705,6 @@ def MonitorPhotonConfig(inputFlags): ### STEP 3 ### # Edit properties of algorithms - import TrigEgammaMonitoring.TrigEgammaMonitCategory as egammaConf - phCBTightMonAlg.ParticleContainerName = "Photons" phCBTightMonAlg.RecoName = "Tight" phCBTightMonAlg.ParticlePrefix = "photon" @@ -770,8 +768,6 @@ def MonitorTnPConfig(inputFlags): ### STEP 3 ### # Edit properties of algorithms - import TrigEgammaMonitoring.TrigEgammaMonitCategory as egammaConf - ZeeMonAlg.ParticleContainerName = "Electrons" ZeeMonAlg.RecoName = "LHLoose" ZeeMonAlg.ParticlePrefix = "electron" @@ -780,17 +776,33 @@ def MonitorTnPConfig(inputFlags): ZeeMonAlg.MassLowerCut = 70000. ZeeMonAlg.MassUpperCut = 110000. ZeeMonAlg.TnPType = "Z" - ZeeMonAlg.TriggerChain = egammaConf.monitoring_Zee[0] + + # get trigger chain from egammaConf.monitoring_Zee + chain="" + for el in egammaConf.monitoring_Zee: + if chain != "": + chain = chain + ", " + el + else : + chain = el + #ZeeMonAlg.TriggerChain = chain JPsiMonAlg.ParticleContainerName = "Electrons" JPsiMonAlg.RecoName = "LHLoose" JPsiMonAlg.ParticlePrefix = "electron" JPsiMonAlg.MassPeak = 3097. JPsiMonAlg.ElectronEtCut = 3000. - JPsiMonAlg.MassLowerCut = 2500. - JPsiMonAlg.MassUpperCut = 3500. + JPsiMonAlg.MassLowerCut = 2000. + JPsiMonAlg.MassUpperCut = 5000. JPsiMonAlg.TnPType = "JPsi" - JPsiMonAlg.TriggerChain =egammaConf.monitoring_Jpsiee[0] + + # get trigger chain from egammaConf.monitoring_Jpsiee + chain ="" + for el in egammaConf.monitoring_Jpsiee: + if chain != "": + chain = chain + ", " + el + else : + chain = el + JPsiMonAlg.TriggerChain = chain ### STEP 4 ### @@ -836,8 +848,6 @@ def MonitorForwardElectronConfig(inputFlags): ### STEP 3 ### # Edit properties of algorithms - import TrigEgammaMonitoring.TrigEgammaMonitCategory as egammaConf - # fwdelLHTightMonAlg.ParticleContainerName = "ForwardElectrons" # fwdelLHTightMonAlg.RecoName = "LHTight" # fwdelLHTightMonAlg.ParticlePrefix = "FwdElectron" @@ -931,7 +941,7 @@ if __name__=='__main__': from AthenaCommon.Logging import log from AthenaCommon.Constants import INFO log.setLevel(INFO) - + # Set the Athena configuration flags from AthenaConfiguration.AllConfigFlags import ConfigFlags nightly = '/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/CommonInputs/' @@ -970,6 +980,7 @@ if __name__=='__main__': #MonitorElectronAcc.getEventAlgo('elLHLooseMonAlg').OutputLevel = 2 # 2 = DEBUG #MonitorPhotonAcc.getEventAlgo('phCBLooseMonAlg').OutputLevel = 2 # 2 = DEBUG #MonitorTnPAcc.getEventAlgo('TnPZeeMonAlg').OutputLevel = 2 # 2 = DEBUG + #MonitorTnPAcc.getEventAlgo('TnPJpsiMonAlg').OutputLevel = 2 # 2 = DEBUG #MonitorFwdElectronAcc.getEventAlgo('fwdelCBTightMonAlg').OutputLevel = 2 # 2 = DEBUG MonitorFwdElectronAcc = MonitorForwardElectronConfig(ConfigFlags)