diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/MenuComponents.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/MenuComponents.py index 0fd148f7f34f69ae87c508dcb847d25e1f7fdb30..74c80a054fb0e8b149158bb495c4df2d98338f10 100644 --- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/MenuComponents.py +++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/MenuComponents.py @@ -233,7 +233,7 @@ class InputMakerNode(AlgNode): def __init__(self, Alg): assert isInputMakerBase(Alg), "Error in creating InputMakerNode from Alg " + compName(Alg) AlgNode.__init__(self, Alg, 'InputMakerInputDecisions', 'InputMakerOutputDecisions') - input_maker_output = CFNaming.inputMakerOutName(compName(self.Alg),"out") + input_maker_output = CFNaming.inputMakerOutName(compName(self.Alg)) self.addOutput(input_maker_output) diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/MenuComponentsNaming.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/MenuComponentsNaming.py index f23bc5e928c16017164258eaea64c7048a174623..fc97a087ad76cede98310e610d976a8ffb07c4fa 100644 --- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/MenuComponentsNaming.py +++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/MenuComponentsNaming.py @@ -31,8 +31,8 @@ class CFNaming(object): return CFNaming.simplifyOutName("HLTNav_" + filter_name + "__" + filterIn) @staticmethod - def inputMakerOutName(IMname, filterOut=None): - return CFNaming.simplifyOutName("HLTNav_" + IMname + ("__" + filterOut if filterOut else "")) + def inputMakerOutName(IMname): + return CFNaming.simplifyOutName("HLTNav_" + IMname) @staticmethod def hypoAlgOutNameOld(HypoName, HypoInput): diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Muon/MuonSequenceSetup.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Muon/MuonSequenceSetup.py index 592a1ad0996a46c52617f86b806b3e2d078b37ba..1d49eeb29e5e2fee4d960bb17a0244c9a3435b29 100644 --- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Muon/MuonSequenceSetup.py +++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Muon/MuonSequenceSetup.py @@ -130,7 +130,7 @@ def muCombAlgSequence(ConfigFlags): muonChainFilter = MuonChainFilterAlg("FilterBphysChains") bphysChains =getBphysChainNames() muonChainFilter.ChainsToFilter=bphysChains - muonChainFilter.InputDecisions = [ CFNaming.inputMakerOutName(l2muCombViewsMaker.name(),"out") ] + muonChainFilter.InputDecisions = [ CFNaming.inputMakerOutName(l2muCombViewsMaker.name()) ] muonChainFilter.L2MuCombContainer = sequenceOut muCombFilterSequence = seqAND("l2muCombFilterSequence", [muonChainFilter, muCombRecoSequence])