diff --git a/Trigger/TrigValidation/TrigUpgradeTest/python/CaloMenuDefs.py b/Trigger/TrigValidation/TrigUpgradeTest/python/CaloMenuDefs.py
index fb77e6c1a255c8a8f56a49ea8a44c65de91266d9..d4c628d9a8e2961adb11e379cdc7635b31899212 100644
--- a/Trigger/TrigValidation/TrigUpgradeTest/python/CaloMenuDefs.py
+++ b/Trigger/TrigValidation/TrigUpgradeTest/python/CaloMenuDefs.py
@@ -1,6 +1,7 @@
from AthenaCommon.Constants import ERROR, DEBUG
-from TriggerMenuMT.HLTMenuConfig.Menu.MenuComponents import MenuSequence
+from TriggerMenuMT.HLTMenuConfig.Menu.MenuComponents import RecoFragmentsPool, MenuSequence
from AthenaCommon.CFElements import seqAND
+from AthenaConfiguration.AllConfigFlags import ConfigFlags
class CaloMenuDefs():
@@ -9,9 +10,8 @@ class CaloMenuDefs():
-
-def fastCaloMenuSequence():
- """ Creates L2 Fast Calo menu sequence"""
+def fastCaloSequence(ConfigFlags):
+ """ Creates L2 Fast Calo sequence"""
# EV creator
from TrigT2CaloCommon.CaloDef import fastCaloEVCreator
(fastCaloViewsMaker, InViewRoIs) = fastCaloEVCreator()
@@ -22,7 +22,13 @@ def fastCaloMenuSequence():
# connect EVC and reco
fastCaloSequence = seqAND("fastCaloSequence", [fastCaloViewsMaker, fastCaloInViewSequence ])
-
+ return (fastCaloSequence, fastCaloViewsMaker, sequenceOut)
+
+
+def fastCaloMenuSequence():
+ """ Creates L2 Fast Calo MENU sequence"""
+ (sequence, fastCaloViewsMaker, sequenceOut) = RecoFragmentsPool.retrieve(fastCaloSequence, ConfigFlags)
+
# hypo
from TrigEgammaHypo.TrigEgammaHypoConf import TrigL2CaloHypoAlgMT
theFastCaloHypo = TrigL2CaloHypoAlgMT("L2CaloHypo", OutputLevel = DEBUG)
@@ -31,7 +37,7 @@ def fastCaloMenuSequence():
from TrigEgammaHypo.TrigL2CaloHypoTool import TrigL2CaloHypoToolFromName
- return MenuSequence( Sequence = fastCaloSequence,
+ return MenuSequence( Sequence = sequence,
Maker = fastCaloViewsMaker,
Hypo = theFastCaloHypo,
HypoToolGen = TrigL2CaloHypoToolFromName )
diff --git a/Trigger/TrigValidation/TrigUpgradeTest/python/HLTSignatureConfig.py b/Trigger/TrigValidation/TrigUpgradeTest/python/HLTSignatureConfig.py
index e3306f1bb7805a1f64cfa538d716793983cc82ba..fcadcca4ad9d3186675e887d74839bc86945d8c6 100644
--- a/Trigger/TrigValidation/TrigUpgradeTest/python/HLTSignatureConfig.py
+++ b/Trigger/TrigValidation/TrigUpgradeTest/python/HLTSignatureConfig.py
@@ -1,12 +1,9 @@
-from TrigUpgradeTest.TrigUpgradeTestConf import HLTTest__TestRecoAlg
-from TrigUpgradeTest.TrigUpgradeTestConf import HLTTest__TestHypoAlg
-from TrigUpgradeTest.TrigUpgradeTestConf import HLTTest__TestHypoTool
-from TrigUpgradeTest.TrigUpgradeTestConf import HLTTest__TestComboHypoAlg
+from TrigUpgradeTest.TrigUpgradeTestConf import HLTTest__TestRecoAlg, HLTTest__TestHypoAlg, HLTTest__TestHypoTool, HLTTest__TestComboHypoAlg
from AthenaCommon.Constants import VERBOSE,DEBUG
from TrigUpgradeTest.HLTSignatureHypoTools import *
from TriggerMenuMT.HLTMenuConfig.Menu.MenuComponents import RecoFragmentsPool, MenuSequence
from AthenaCommon.CFElements import parOR, seqAND, stepSeq
-
+from AthenaConfiguration.AllConfigFlags import ConfigFlags
UseThisLinkName="initialRoI"
#UseThisLinkName="feature"
@@ -24,57 +21,53 @@ def InputMakerForFeatureAlg(name):
# - declare all the RecoAlg and the HypoAlg -> create the Sequence
# - creates the InputMaker, without the inputs
-flags = ""
+
#### muon signatures
#####################
-
-
def muMSRecAlg(name, FileName="noreco.dat"):
return HLTTest__TestRecoAlg(name=name, FileName=FileName, OutputLevel = DEBUG)
def MuHypo(name):
return HLTTest__TestHypoAlg(name=name, LinkName=UseThisLinkName, OutputLevel = DEBUG)
-
-#class EmuStepTestNaming():
-def muStep1Sequence(flags):
- muIM= InputMakerForInitialRoIAlg(name="Step1MuInputMaker")
- muIM.Output='muIM_out'
+def muStep1Sequence(ConfigFlags, name):
+ muIM= InputMakerForInitialRoIAlg(name=name+"Step1MuInputMaker")
+ muIM.Output=name+'muIM_out'
- #print muIM
- muAlg = muMSRecAlg(name="muMSRecAlg", FileName="msmu.dat")
- muAlg.Output='muAlg_out'
+ muAlg = muMSRecAlg(name=name+"muMSRecAlg", FileName="msmu.dat")
+ muAlg.Output=name+'muAlg_out'
muAlg.Input = muIM.Output
- mustep1_sequence = seqAND("muSeqStep1", [muIM, muAlg])
+
+ mustep1_sequence = seqAND(name+"muSeqStep1", [muIM, muAlg])
return (mustep1_sequence, muIM, muAlg.Output)
-def muStep1MenuSequence():
- (mustep1_sequence, muIM, seqOut) = RecoFragmentsPool.retrieve(muStep1Sequence, flags)
- muHypo = MuHypo(name="Step1MuHypo")
+def muStep1MenuSequence(name):
+ (mustep1_sequence, muIM, seqOut) = RecoFragmentsPool.retrieve(muStep1Sequence, ConfigFlags, name=name)
+ muHypo = MuHypo(name=name+"Step1MuHypo")
muHypo.Input = seqOut
return MenuSequence(Sequence=mustep1_sequence, Maker=muIM, Hypo=muHypo, HypoToolGen=MuTestHypoTool)
-# mu step2
-def muStep2Sequence(flags):
- muIM2= InputMakerForFeatureAlg(name="Step2MuInputMaker")
- muIM2.Output='muIM2_out'
- muAlg2 = muMSRecAlg(name="muMSRecAlg2", FileName="msmu.dat")
- muAlg2.Output='muAlg2_out'
+def muStep2Sequence(ConfigFlags, name):
+ muIM2= InputMakerForFeatureAlg(name=name+"Step2MuInputMaker")
+ muIM2.Output=name+'muIM2_out'
+
+ muAlg2 = muMSRecAlg(name=name+"muMSRecAlg2", FileName="msmu.dat")
+ muAlg2.Output=name+'muAlg2_out'
muAlg2.Input = muIM2.Output
- mustep2_sequence = seqAND("muSeqStep2", [muIM2, muAlg2])
+ mustep2_sequence = seqAND(name+"muSeqStep2", [muIM2, muAlg2])
return (mustep2_sequence, muIM2, muAlg2.Output)
-def muStep2MenuSequence():
- (mustep2_sequence, muIM2, seqOut) = RecoFragmentsPool.retrieve(muStep2Sequence, flags)
- muHypo2 = MuHypo(name="Step2MuHypo")
+def muStep2MenuSequence(name):
+ (mustep2_sequence, muIM2, seqOut) = RecoFragmentsPool.retrieve(muStep2Sequence, ConfigFlags, name=name)
+ muHypo2 = MuHypo(name=name+"Step2MuHypo")
muHypo2.Input =seqOut
return MenuSequence( Sequence=mustep2_sequence, Maker=muIM2, Hypo=muHypo2, HypoToolGen=MuTest2HypoTool)
@@ -83,9 +76,6 @@ def muStep2MenuSequence():
## ##### electron signatures
## ##########################
-
-
-
def CaloClustering(name, FileName="noreco.dat"):
return HLTTest__TestRecoAlg(name=name, FileName=FileName, OutputLevel = DEBUG)
@@ -94,46 +84,46 @@ def ElGamHypo(name):
-def elStep1Sequence(flags):
- elIM= InputMakerForInitialRoIAlg(name="Step1ElInputMaker")
- elIM.Output='elIM_out'
+def elStep1Sequence(ConfigFlags, name):
+ elIM= InputMakerForInitialRoIAlg(name=name+"Step1ElInputMaker")
+ elIM.Output=name+'elIM_out'
- elAlg = CaloClustering(name="CaloClustering", FileName="emclusters.dat")
- elAlg.Output='elAlg_out'
+ elAlg = CaloClustering(name=name+"CaloClustering", FileName="emclusters.dat")
+ elAlg.Output=name+'elAlg_out'
elAlg.Input = elIM.Output
- elstep1_sequence = seqAND("elSeqStep1", [elIM, elAlg])
+ elstep1_sequence = seqAND(name+"elSeqStep1", [elIM, elAlg])
return (elstep1_sequence, elIM, elAlg.Output)
-def elStep1MenuSequence():
-# l2CaloReco = RecoFragmentsPool.retrieve(l2CaloRecoCfg, flags)
- (elstep1_sequence, elIM, seqOut) = RecoFragmentsPool.retrieve(elStep1Sequence, flags)
- elHypo = ElGamHypo(name="Step1ElHypo")
+def elStep1MenuSequence(name):
+ (elstep1_sequence, elIM, seqOut) = RecoFragmentsPool.retrieve(elStep1Sequence, ConfigFlags, name=name)
+ elHypo = ElGamHypo(name=name+"Step1ElHypo")
elHypo.Input = seqOut
return MenuSequence( Maker=elIM, Sequence=elstep1_sequence, Hypo=elHypo, HypoToolGen=ElTestHypoTool)
-def gammStep1MenuSequence():
- (elstep1_sequence, elIM, seqOut) = RecoFragmentsPool.retrieve(elStep1Sequence, flags)
- #(recoSeq, seqOut) = elStep1Sequence()
- gammHypo = ElGamHypo(name="Step1GamHypo")
+def gammStep1MenuSequence(name):
+ (elstep1_sequence, elIM, seqOut) = RecoFragmentsPool.retrieve(elStep1Sequence, ConfigFlags, name=name)
+ gammHypo = ElGamHypo(name=name+"Step1GamHypo")
gammHypo.Input = seqOut
return MenuSequence( Maker=elIM, Sequence=elstep1_sequence, Hypo=gammHypo, HypoToolGen=GammTestHypoTool)
#step2
-def elStep2Sequence(flags):
- elIM2= InputMakerForFeatureAlg(name="Step2ElInputMaker")
- elIM2.Output='elIM2_out'
+def elStep2Sequence(ConfigFlags, name):
+# print "FPDEBUG Running elStep2Sequence with flags %s and name %s"%(ConfigFlags, name)
+ elIM2= InputMakerForFeatureAlg(name=name+"Step2ElInputMaker")
+ elIM2.Output=name+'elIM2_out'
- elAlg2 = CaloClustering(name="CaloClustering2", FileName="emclusters.dat")
- elAlg2.Output='elAlg2_out'
+ elAlg2 = CaloClustering(name=name+"CaloClustering2", FileName="emclusters.dat")
+ elAlg2.Output=name+'elAlg2_out'
elAlg2.Input = elIM2.Output
- elstep2_sequence = seqAND("elSeqStep2", [elIM2, elAlg2])
+ elstep2_sequence = seqAND(name+"elSeqStep2", [elIM2, elAlg2])
return (elstep2_sequence, elIM2,elAlg2.Output)
-def elStep2MenuSequence():
- (elstep2_sequence, elIM2, seqOut) = RecoFragmentsPool.retrieve(elStep2Sequence,flags)
- elHypo2 = ElGamHypo(name="Step2ElHypo")
+def elStep2MenuSequence(name):
+ (elstep2_sequence, elIM2, seqOut) = RecoFragmentsPool.retrieve(elStep2Sequence,ConfigFlags,name=name)
+ elHypo2 = ElGamHypo(name+"Step2ElHypo")
elHypo2.Input = seqOut
return MenuSequence( Maker=elIM2, Sequence=elstep2_sequence, Hypo=elHypo2, HypoToolGen=ElTestHypoTool)
+
diff --git a/Trigger/TrigValidation/TrigUpgradeTest/python/electronMenuDefs.py b/Trigger/TrigValidation/TrigUpgradeTest/python/electronMenuDefs.py
index c890aab0e9bb46665b0811bf1e5aaae8294e5f6b..97186c5115b40528343fba4754b41f49094e45ff 100644
--- a/Trigger/TrigValidation/TrigUpgradeTest/python/electronMenuDefs.py
+++ b/Trigger/TrigValidation/TrigUpgradeTest/python/electronMenuDefs.py
@@ -6,9 +6,10 @@ from AthenaCommon.Include import include
from AthenaCommon.Constants import VERBOSE,DEBUG
from AthenaCommon.AppMgr import ServiceMgr as svcMgr
import AthenaCommon.CfgMgr as CfgMgr
+from AthenaConfiguration.AllConfigFlags import ConfigFlags
# menu components
-from TriggerMenuMT.HLTMenuConfig.Menu.MenuComponents import MenuSequence
+from TriggerMenuMT.HLTMenuConfig.Menu.MenuComponents import MenuSequence, RecoFragmentsPool
from AthenaCommon.CFElements import parOR, seqOR, seqAND, stepSeq
from ViewAlgs.ViewAlgsConf import EventViewCreatorAlgorithm
@@ -31,7 +32,7 @@ def inDetSetup():
from InDetRecExample.InDetKeys import InDetKeys
-def electronSequence():
+def electronSequence(ConfigFlags):
""" second step: tracking....."""
# is this needed?
@@ -85,18 +86,24 @@ def electronSequence():
electronInViewAlgs = parOR("electronInViewAlgs", viewAlgs + [ theElectronFex ])
l2ElectronViewsMaker.ViewNodeName = "electronInViewAlgs"
+ electronAthSequence = seqAND("electronAthSequence", eventAlgs + [l2ElectronViewsMaker, electronInViewAlgs ] )
+ return (electronAthSequence, l2ElectronViewsMaker, theElectronFex.ElectronsName)
+
+
+def electronMenuSequence():
+ """ Creates 2nd step Electron MENU sequence"""
+ # retrievee the reco seuqence+IM
+ (electronAthSequence, l2ElectronViewsMaker, sequenceOut) = RecoFragmentsPool.retrieve(electronSequence, ConfigFlags)
+
# make the Hypo
from TrigEgammaHypo.TrigEgammaHypoConf import TrigL2ElectronHypoAlgMT
theElectronHypo = TrigL2ElectronHypoAlgMT()
- theElectronHypo.Electrons = theElectronFex.ElectronsName
+ theElectronHypo.Electrons = sequenceOut
theElectronHypo.RunInView=True
theElectronHypo.OutputLevel = VERBOSE
- electronAthSequence = seqAND("electronAthSequence", eventAlgs + [l2ElectronViewsMaker, electronInViewAlgs ] )
-
from TrigEgammaHypo.TrigL2ElectronHypoTool import TrigL2ElectronHypoToolFromName
-
return MenuSequence( Maker = l2ElectronViewsMaker,
Sequence = electronAthSequence,
Hypo = theElectronHypo,
diff --git a/Trigger/TrigValidation/TrigUpgradeTest/share/EmuStepProcessingTest.py b/Trigger/TrigValidation/TrigUpgradeTest/share/EmuStepProcessingTest.py
index d5fc886a21f09167f7db1537259ace61a1005bcb..c990c0acb764475cb22db3695a7b48bf66eb666f 100644
--- a/Trigger/TrigValidation/TrigUpgradeTest/share/EmuStepProcessingTest.py
+++ b/Trigger/TrigValidation/TrigUpgradeTest/share/EmuStepProcessingTest.py
@@ -94,8 +94,8 @@ EnabledElComboChains = []
# muon chains
if doMuon:
from TrigUpgradeTest.HLTSignatureConfig import muStep1MenuSequence, muStep2MenuSequence
- muStep1 = muStep1MenuSequence()
- muStep2 = muStep2MenuSequence()
+ muStep1 = muStep1MenuSequence("v1")
+ muStep2 = muStep2MenuSequence("v1")
MuChains = [
@@ -113,14 +113,16 @@ if doMuon:
## #electron chains
if doElectron:
from TrigUpgradeTest.HLTSignatureConfig import elStep1MenuSequence, elStep2MenuSequence, gammStep1MenuSequence
- elStep1 = elStep1MenuSequence()
- elStep2 = elStep2MenuSequence()
-
- gammStep1 = gammStep1MenuSequence()
+ # electron
+ elStep1 = elStep1MenuSequence("v1")
+ elStep2 = elStep2MenuSequence("v1")
+ elStep2v2 = elStep2MenuSequence("v2")
+ # gamma
+ gammStep1 = gammStep1MenuSequence("v1")
ElChains = [
Chain(name='HLT_e5' , Seed="L1_EM7", ChainSteps=[ ChainStep("Step1_em", [elStep1]), ChainStep("Step2_em", [elStep2]) ] ),
- Chain(name='HLT_e20' , Seed="L1_EM7", ChainSteps=[ ChainStep("Step1_em", [elStep1]), ChainStep("Step2_em", [elStep2]) ] ),
+ Chain(name='HLT_e20' , Seed="L1_EM7", ChainSteps=[ ChainStep("Step1_em", [elStep1]), ChainStep("Step2v2_em", [elStep2v2]) ] ),
Chain(name='HLT_e8' , Seed="L1_EM7", ChainSteps=[ ChainStep("Step1_em", [elStep1]), ChainStep("Step2_em", [elStep2]) ] ),
Chain(name='HLT_g5' , Seed="L1_EM7", ChainSteps=[ ChainStep("Step1_gam", [gammStep1]) ] )
]
@@ -132,10 +134,10 @@ if doElectron:
# combined chain
if doCombo:
from TrigUpgradeTest.HLTSignatureConfig import elStep1MenuSequence, muStep1MenuSequence, elStep2MenuSequence, muStep2MenuSequence
- elStep1 = elStep1MenuSequence()
- muStep1 = muStep1MenuSequence()
- elStep2 = elStep2MenuSequence()
- muStep2 = muStep2MenuSequence()
+ elStep1 = elStep1MenuSequence("v1")
+ muStep1 = muStep1MenuSequence("v1")
+ elStep2 = elStep2MenuSequence("v1")
+ muStep2 = muStep2MenuSequence("v1")
CombChains =[
diff --git a/Trigger/TrigValidation/TrigUpgradeTest/share/electron.menu.py b/Trigger/TrigValidation/TrigUpgradeTest/share/electron.menu.py
index 44238a8bd5b8fd4a618e9ea89be02b32b100a762..16b036025671064828378d92078ebda222294816 100644
--- a/Trigger/TrigValidation/TrigUpgradeTest/share/electron.menu.py
+++ b/Trigger/TrigValidation/TrigUpgradeTest/share/electron.menu.py
@@ -9,13 +9,14 @@ include("TrigUpgradeTest/testHLT_MT.py")
# menu
##########################################
from TriggerMenuMT.HLTMenuConfig.Menu.MenuComponents import Chain, ChainStep
-from TrigUpgradeTest.electronMenuDefs import electronSequence
+
from TrigUpgradeTest.CaloMenuDefs import fastCaloMenuSequence
+from TrigUpgradeTest.electronMenuDefs import electronMenuSequence
fastCaloStep= fastCaloMenuSequence()
-electronStep= electronSequence()
+electronStep= electronMenuSequence()
step1=ChainStep("Step1_etcut", [fastCaloStep])
step2=ChainStep("Step2_etcut", [electronStep])
diff --git a/Trigger/TrigValidation/TrigUpgradeTest/share/fullMenu.py b/Trigger/TrigValidation/TrigUpgradeTest/share/fullMenu.py
index 0a6b477cacc153d6ae4088346b25455f13388515..b0154c927615c35a87500d2b65b438d62532b3db 100644
--- a/Trigger/TrigValidation/TrigUpgradeTest/share/fullMenu.py
+++ b/Trigger/TrigValidation/TrigUpgradeTest/share/fullMenu.py
@@ -16,10 +16,10 @@ include("TrigUpgradeTest/testHLT_MT.py")
##########################################
doElectron = True
-doPhoton = True
-doMuon = False
+doPhoton = False
+doMuon = True
doJet = False
-doCombo = False
+doCombo = True
from TriggerMenuMT.HLTMenuConfig.Menu.MenuComponents import Chain, ChainStep
@@ -30,17 +30,16 @@ EnabledElComboChains = []
testChains = []
-#common parts:
-fastCaloStep=None
+
##################################################################
# egamma chains
##################################################################
if (doElectron):
from TrigUpgradeTest.CaloMenuDefs import fastCaloMenuSequence
- from TrigUpgradeTest.electronMenuDefs import electronSequence
+ from TrigUpgradeTest.electronMenuDefs import electronMenuSequence
fastCaloStep=fastCaloMenuSequence()
- electronStep=electronSequence()
+ electronStep=electronMenuSequence()
step1=ChainStep("Step1_etcut", [fastCaloStep])
step2=ChainStep("Step2_etcut", [electronStep])
@@ -60,9 +59,8 @@ if (doPhoton):
from TrigUpgradeTest.CaloMenuDefs import fastCaloMenuSequence
from TrigUpgradeTest.photonMenuDefs import photonMenuSequence
+ fastCaloStep=fastCaloMenuSequence()
photonstep= photonMenuSequence()
- if fastCaloStep is None:
- fastCaloStep=fastCaloMenuSequence()
photonChains = [
Chain(name='HLT_g5_etcut', Seed="L1_EM3", ChainSteps=[ ChainStep("Step1_g5_etcut", [fastCaloStep]), ChainStep("Step2_g5_etcut", [photonstep])] )
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Egamma/ElectronDef.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Egamma/ElectronDef.py
index abaa584fd3f61cf9dace5a40a4013edd02ffcbef..4c6b5285e4733751fb7a232c72ed1cd29b0b1404 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Egamma/ElectronDef.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Egamma/ElectronDef.py
@@ -12,12 +12,13 @@ from TriggerMenuMT.HLTMenuConfig.Menu.TriggerConfigHLT import TriggerConfigHLT
# fragments generating configuration will be functions in New JO, so let's make them functions already now
def fastCaloSequenceCfg( flags ):
- from TrigUpgradeTest.electronMenuDefs import fastCaloSequence
- return fastCaloSequence()
+ from TrigUpgradeTest.CaloMenuDefs import fastCaloMenuSequence
+ return fastCaloMenuSequence()
+
def electronSequenceCfg( flags ):
- from TrigUpgradeTest.electronMenuDefs import electronSequence
- return electronSequence()
+ from TrigUpgradeTest.electronMenuDefs import electronMenuSequence
+ return electronMenuSequence()
def generateChain(flags, chainDict ): # in New JO we will add flags here
chainDict = type("chainDict", (object,), chainDict)
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/HLTCFConfig.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/HLTCFConfig.py
index 4fc953c823abf3be3c3dab9c67a081586a34d13f..c93b3db116deb2c27eaa012a0e020cb67b676b98 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/HLTCFConfig.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/HLTCFConfig.py
@@ -243,14 +243,11 @@ def decisionTree_From_Chains(HLTNode, chains):
prev = chain.steps[nstep-1].sequences
# previous filter name
pre_filter_name = CFNaming.filterName(chain.steps[nstep-1].name)
- print "Searching %s in %d sequences: "%(pre_filter_name, len(prev))
+# print "Searching %s in %d sequences: "%(pre_filter_name, len(prev))
for seq in prev:
- print seq.name
for out in seq.outputs:
- print out
if pre_filter_name in out:
- newinput = out
- filter_input.append(newinput)
+ filter_input.append(out)
#filter_input.extend(newinput)
log.debug("Connect to previous sequence through these filter inputs: %s" %str( filter_input) )
if len(filter_input) == 0:
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/MenuComponents.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/MenuComponents.py
index 80dcc5221eeb757a8860667ba16765f71aeedd1a..ab6fbb444d4735c39bef65aa495eaf67c9f2fbed 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/MenuComponents.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/MenuComponents.py
@@ -137,7 +137,6 @@ class HypoAlgNode(AlgNode):
def __init__(self, Alg):
assert isHypoBase(Alg), "Error in creating HypoAlgNode from Alg " + Alg.name()
AlgNode.__init__(self, Alg, 'HypoInputDecisions', 'HypoOutputDecisions')
- # self.addDefaultOutput()
self.tools = []
self.previous=[]
@@ -304,7 +303,6 @@ class MenuSequence():
self.hypo= HypoAlgNode( Alg=HypoAlg )
def connectToFilter(self, outfilter):
- #def connectToFilter(self, sfilter, outfilter):
""" Sets the input and output of the hypo, and links to the input maker """
#### Connect filter to the InputMaker