diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Egamma/FastPhotonMenuSequences.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Egamma/FastPhotonMenuSequences.py index f343aa5b43a02a8e3f77ce3546f1bfed648844f7..3926ad842ff862abe3db5d128c3b1402e7d17824 100644 --- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Egamma/FastPhotonMenuSequences.py +++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Egamma/FastPhotonMenuSequences.py @@ -1,7 +1,9 @@ # Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration + + # menu components -from TriggerMenuMT.HLTMenuConfig.Menu.MenuComponents import MenuSequence +from TriggerMenuMT.HLTMenuConfig.Menu.MenuComponents import MenuSequence, RecoFragmentsPool from AthenaCommon.CFElements import parOR, seqAND from ViewAlgs.ViewAlgsConf import EventViewCreatorAlgorithm from DecisionHandling.DecisionHandlingConf import ViewCreatorCentredOnClusterROITool @@ -13,7 +15,7 @@ from AthenaCommon.Logging import logging log = logging.getLogger(__name__) -def fastPhotonMenuSequence(): +def fastPhotonSequence(flags): """Creates secpond step photon sequence""" from TriggerMenuMT.HLTMenuConfig.CommonSequences.CaloSequences import CaloMenuDefs @@ -56,19 +58,33 @@ def fastPhotonMenuSequence(): l2PhotonViewsMaker.ViewNodeName = "photonInViewAlgs" - from TrigEgammaHypo.TrigEgammaHypoConf import TrigEgammaFastPhotonHypoAlg - thePhotonHypo = TrigEgammaFastPhotonHypoAlg() - thePhotonHypo.Photons = thePhotonFex.PhotonsName - thePhotonHypo.RunInView=True - + # this needs to be added: #electronDecisionsDumper = DumpDecisions("electronDecisionsDumper", Decisions = [theElectronHypo.Output] ) photonAthSequence = seqAND("photonAthSequence", [l2PhotonViewsMaker, photonInViewAlgs] ) + + return (photonAthSequence, l2PhotonViewsMaker) + + + +def fastPhotonMenuSequence(flags=None): + """Creates secpond step photon sequence""" + + # retrieve the reco sequence+IM + (photonAthSequence, l2PhotonViewsMaker) = RecoFragmentsPool.retrieve(fastPhotonSequence, flags=None) + + # make the hypo + from TrigEgammaHypo.TrigEgammaHypoConf import TrigEgammaFastPhotonHypoAlg + thePhotonHypo = TrigEgammaFastPhotonHypoAlg() + thePhotonHypo.Photons = "HLT_FastPhotons" + thePhotonHypo.RunInView=True + from TrigEgammaHypo.TrigEgammaFastPhotonHypoTool import TrigEgammaFastPhotonHypoToolFromDict return MenuSequence( Maker=l2PhotonViewsMaker, Sequence=photonAthSequence, Hypo=thePhotonHypo, - HypoToolGen=TrigEgammaFastPhotonHypoToolFromDict) + HypoToolGen=TrigEgammaFastPhotonHypoToolFromDict + ) diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Egamma/PhotonChainConfiguration.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Egamma/PhotonChainConfiguration.py index 7a57158ae8d85c5dbe79080624f36761e2f3fa1d..813c6539be123992df3ab2e773031fe41839a245 100644 --- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Egamma/PhotonChainConfiguration.py +++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Egamma/PhotonChainConfiguration.py @@ -28,7 +28,7 @@ def fastPhotonCaloSequenceCfg( flags ): return fastCaloMenuSequence('Photon', doRinger=False) def fastPhotonSequenceCfg( flags ): - return fastPhotonMenuSequence() + return fastPhotonMenuSequence( flags ) def TLAPhotonSequenceCfg(flags, HLT_threshold ): photonsIn = "HLT_egamma_Photons" diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Egamma/TLAPhotonMenuSequences.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Egamma/TLAPhotonMenuSequences.py index f1a8d2456af970a84ce0313380cc7ed8ce0651f5..4f8fcb85cd111bfbe09e2004d41e7737e6bfe446 100644 --- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Egamma/TLAPhotonMenuSequences.py +++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Egamma/TLAPhotonMenuSequences.py @@ -55,7 +55,7 @@ def TLAPhotonAthSequence(flags, photonsIn, HLT_threshold): tlaPhotonViewsMakerAlg.ViewFallThrough = True tlaPhotonViewsMakerAlg.RequireParentView = True tlaPhotonViewsMakerAlg.Views = "TLAPhotonsViews" - tlaPhotonViewsMakerAlg.mergeUsingFeature = True + tlaPhotonViewsMakerAlg.mergeUsingFeature = False tlaPhotonViewsMakerAlg.ViewNodeName = "tlaPhotonInViewAlgs"