diff --git a/Trigger/TriggerCommon/TrigEDMConfig/python/TriggerEDMRun3.py b/Trigger/TriggerCommon/TrigEDMConfig/python/TriggerEDMRun3.py index 05e3c1dff92443d2156be1b6721ca9771d2c1606..13c69564630982b8275fefb418960332fea1102e 100644 --- a/Trigger/TriggerCommon/TrigEDMConfig/python/TriggerEDMRun3.py +++ b/Trigger/TriggerCommon/TrigEDMConfig/python/TriggerEDMRun3.py @@ -74,10 +74,9 @@ TriggerHLTListRun3 = [ ('TrigRoiDescriptorCollection#MURoIs', 'BS ESD AODFULL AODSLIM', 'Steer'), ('TrigRoiDescriptorCollection#METRoI', 'BS ESD AODFULL AODSLIM', 'Steer'), ('TrigRoiDescriptorCollection#JETRoI', 'BS ESD AODFULL AODSLIM', 'Steer'), - ('TrigRoiDescriptorCollection#HLT_RoiForTau', 'BS ESD AODFULL AODSLIM', 'Steer'), - ('TrigRoiDescriptorCollection#HLT_RoiForID2', 'BS ESD AODFULL AODSLIM', 'Steer'), - ('TrigRoiDescriptorCollection#HLT_RoiForID1', 'BS ESD AODFULL AODSLIM', 'Steer'), - ('TrigRoiDescriptorCollection#HLT_RoiForID', 'BS ESD AODFULL AODSLIM', 'Steer'), + ('TrigRoiDescriptorCollection#HLT_RoiForTau', 'BS ESD AODFULL AODSLIM', 'Steer', 'inViews = TAUCaloViews'), + ('TrigRoiDescriptorCollection#HLT_RoiForID2', 'BS ESD AODFULL AODSLIM', 'Steer', 'inViews = TAUIDViews'), + ('TrigRoiDescriptorCollection#HLT_RoiForID1', 'BS ESD AODFULL AODSLIM', 'Steer', 'inViews = TAUID2Views'), ('xAOD::TrigCompositeContainer#L1EM', 'BS ESD AODFULL AODSLIM', 'Steer'), ('xAOD::TrigCompositeAuxContainer#L1EMAux.', 'BS ESD AODFULL AODSLIM', 'Steer'), diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Tau/TauRecoSequences.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Tau/TauRecoSequences.py index 5f4fc0c560a6db7d51106724c01268aeed6c6709..95d25f08be633260b198ee801de0e9bdca2574fa 100644 --- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Tau/TauRecoSequences.py +++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Tau/TauRecoSequences.py @@ -115,7 +115,7 @@ def tauCoreTrackSequence( RoIs, name ): tauCoreTrackSequence = parOR(name) from TriggerMenuMT.HLTMenuConfig.CommonSequences.InDetSetup import makeInDetAlgs - (viewAlgs, eventAlgs) = makeInDetAlgs(whichSignature='TauCore',separateTrackParticleCreator="_TauCore") + (viewAlgs, eventAlgs) = makeInDetAlgs(whichSignature='TauCore',separateTrackParticleCreator="_TauCore",rois = RoIs) for viewAlg in viewAlgs: if "InDetTrigTrackParticleCreatorAlg" in viewAlg.name(): @@ -129,9 +129,6 @@ def tauCoreTrackSequence( RoIs, name ): viewAlgs.append(tauTrackRoiUpdaterAlg) - global TrackParticlesName - global theFTF_name - for viewAlg in viewAlgs: tauCoreTrackSequence += viewAlg #print viewAlg.name() @@ -154,14 +151,12 @@ def tauIsoTrackSequence( RoIs , name): tauIsoTrackSequence = parOR(name) from TriggerMenuMT.HLTMenuConfig.CommonSequences.InDetSetup import makeInDetAlgs - (viewAlgs, eventAlgs) = makeInDetAlgs(whichSignature='TauIso',separateTrackParticleCreator="_TauIso") + (viewAlgs, eventAlgs) = makeInDetAlgs(whichSignature='TauIso',separateTrackParticleCreator="_TauIso",rois = RoIs) ViewVerify = CfgMgr.AthViews__ViewDataVerifier("tauViewDataVerifierIsoFTF") ViewVerify.DataObjects = [('xAOD::TauJetContainer','StoreGateSvc+HLT_TrigTauRecMerged')] viewAlgs.append(ViewVerify) - global theFTFIso_name - for viewAlg in viewAlgs: tauIsoTrackSequence += viewAlg #print viewAlg.name()