diff --git a/Trigger/TrigValidation/TrigUpgradeTest/python/InDetConfig.py b/Trigger/TrigValidation/TrigUpgradeTest/python/InDetConfig.py index 692959fdf3e55c3d27b9691cc1c9768b3ed21a2f..3311aff346edc5ea826d0866cbd566d0ec12bdb1 100644 --- a/Trigger/TrigValidation/TrigUpgradeTest/python/InDetConfig.py +++ b/Trigger/TrigValidation/TrigUpgradeTest/python/InDetConfig.py @@ -441,17 +441,11 @@ def indetInViewRecoCfg( flags, viewMakerName ): from TriggerMenuMT.HLTMenuConfig.Menu.MenuComponents import InViewReco reco = InViewReco( viewMakerName ) algAcc = TrigInDetConfig( flags, roisKey=reco.inputMaker().InViewRoIs ) - # TODO fixeme using getEventAlgs CA method - # this awkward line will be removed one CA gets appopriate method to get all algorithms - reco.addRecoAlg( algAcc._sequence.getChildren() ) from AthenaCommon.Constants import DEBUG for a in algAcc._sequence.getChildren(): a.OutputLevel=DEBUG - - from AthenaCommon.AlgSequence import AthSequencer - algAcc._sequence = AthSequencer('AthAlgSeq') # empty the sequence, we need a better API for that - reco.merge( algAcc ) - + + reco.mergeReco( algAcc ) return reco diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/MenuComponents.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/MenuComponents.py index 39d58c7199c76ac048608b6cb571e6a56fae698a..5c6f65fcc605dcd00317141516ce783d05ff4719 100644 --- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/MenuComponents.py +++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/MenuComponents.py @@ -528,8 +528,13 @@ class InViewReco( ComponentAccumulator ): self.viewMakerAlg.InputMakerInputDecisions += [ inKey ] self.viewMakerAlg.InputMakerOutputDecisions += [ outKey ] + def mergeReco( self, ca ): + """ Merged CA movnig reconstruction algorithms into the right sequence """ + return self.merge( ca, sequenceName=self.viewsSeq.getName() ) + def addRecoAlg( self, alg ): """Reconstruction alg to be run per view""" + log.warning( "InViewReco.addRecoAlgo: consider using mergeReco that takes care of the CA accumulation and moving algorithms" ) self.addEventAlgo( alg, self.viewsSeq.name() ) def sequence( self ):