diff --git a/Trigger/TrigHypothesis/TrigMuonHypo/src/TrigMuonTLAHypoAlg.cxx b/Trigger/TrigHypothesis/TrigMuonHypo/src/TrigMuonTLAHypoAlg.cxx index 21edba55afd04c6c39063c67876c79c84e63d773..0238a8a9e49266504d44ed7537828cecb00484f2 100644 --- a/Trigger/TrigHypothesis/TrigMuonHypo/src/TrigMuonTLAHypoAlg.cxx +++ b/Trigger/TrigHypothesis/TrigMuonHypo/src/TrigMuonTLAHypoAlg.cxx @@ -75,8 +75,7 @@ StatusCode TrigMuonTLAHypoAlg::execute(const EventContext &ctx) const // now go on with the normal Hypo, linking new decision with previous one auto newDecision = newDecisionIn( outputDecisions, hypoAlgNodeName() ); TrigCompositeUtils::linkToPrevious( newDecision, previousDecision, ctx ); - // do we need to re-link the feature? - //newDecision->setObjectLink(featureString(), prevMuons); + newDecision->setObjectLink(featureString(), ElementLink<xAOD::MuonContainer>(*h_TLAMuons, h_TLAMuons->size()-1, ctx)); HypoInputs.push_back( std::make_pair(newDecision, previousDecision) ); nDecision++; diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Muon/MuonChainConfiguration.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Muon/MuonChainConfiguration.py index 04cd94e5560a911edb34d2199f02a388523a2282..3353f2fa817f42086075cd0c27f42052c23d2cd6 100755 --- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Muon/MuonChainConfiguration.py +++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Muon/MuonChainConfiguration.py @@ -70,9 +70,9 @@ def muEFLateRoISequenceCfg(flags,is_probe_leg=False): def muEFLateSequenceCfg(flags,is_probe_leg=False): return efLateMuSequence() -def TLAMuonMenuSequenceCfg(flags, is_probe_leg=False): +def TLAMuonMenuSequenceCfg(flags): muonsIn = "HLT_Muons_RoI" - return TLAMuonMenuSequence(flags, muonsIn, is_probe_leg=is_probe_leg) + return TLAMuonMenuSequence(flags, muonsIn) ############################################# ### Class/function to configure muon chains @@ -105,7 +105,7 @@ class MuonChainConfiguration(ChainConfigurationBase): if self.dict["eventBuildType"] == "PhysicsTLA" : log.debug('Adding muon trigger step getTLAMu') step='getTLAMu' - TLAStep = getattr(self, step)(is_probe_leg=is_probe_leg) + TLAStep = getattr(self, step)() chainSteps+= [TLAStep] myChain = self.buildChain(chainSteps) @@ -253,7 +253,7 @@ class MuonChainConfiguration(ChainConfigurationBase): #-------------------- - def getTLAMu(self,is_probe_leg=False): # No T&P support, add if needed - return self.getStep(5,'muonTLA',[TLAMuonMenuSequenceCfg], is_probe_leg=is_probe_leg) + def getTLAMu(self): # No T&P support, add if needed + return self.getStep(5,'muonTLA',[TLAMuonMenuSequenceCfg]) diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Muon/TLAMuonSequence.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Muon/TLAMuonSequence.py index 49e9c1c604cc6586479d7f02a9ed3fe511567e46..c1a5b9f448a09ac434eaf745fd40cdd165e7dbf3 100644 --- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Muon/TLAMuonSequence.py +++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Muon/TLAMuonSequence.py @@ -10,24 +10,24 @@ def TLAMuonSequence (flags, muons): ## add the InputMaker (event context) tlaMuonInputMakerAlg = CompFactory.InputMakerForRoI("IMTLAMuons", RoIsLink="initialRoI") tlaMuonInputMakerAlg.mergeUsingFeature = True + tlaMuonInputMakerAlg.RoITool = CompFactory.ViewCreatorPreviousROITool() tlaMuonAthSequence = seqAND( "TLAMuonAthSequence", [tlaMuonInputMakerAlg] ) sequenceOut = muons+"_TLA" return (tlaMuonAthSequence, tlaMuonInputMakerAlg, sequenceOut) -def TLAMuonMenuSequence( flags, muonsIn, is_probe_leg): +def TLAMuonMenuSequence( flags, muonsIn): # retrieve the sequence via RecoFragmentsPool (tlaMuonAthSequence, tlaMuonInputMakerAlg, sequenceOut) = RecoFragmentsPool.retrieve(TLAMuonSequence, flags, muons=muonsIn) # add the hypo from TrigMuonHypo.TrigMuonHypoConf import TrigMuonTLAHypoAlg from TrigMuonHypo.TrigMuonHypoConfig import TrigMuonEFMSonlyHypoToolFromDict hypo = TrigMuonTLAHypoAlg("TrigMuonTLAHypoAlg") #+muonsIn) - + hypo.TLAMuons=sequenceOut return MenuSequence( Sequence = tlaMuonAthSequence, Maker = tlaMuonInputMakerAlg, Hypo = hypo, - HypoToolGen = TrigMuonEFMSonlyHypoToolFromDict, - IsProbe = is_probe_leg + HypoToolGen = TrigMuonEFMSonlyHypoToolFromDict )