diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Muon/MuonDef.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Muon/MuonDef.py index 8b80aeabf3a7ab93dff16e687f22055141b5d973..824a4e6adac8e9293e0be0dd38c5c14983ec51c6 100755 --- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Muon/MuonDef.py +++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Muon/MuonDef.py @@ -11,7 +11,7 @@ log = logging.getLogger("TriggerMenuMT.HLTMenuConfig.Muon.MuonDef") from TriggerMenuMT.HLTMenuConfig.Menu.ChainConfigurationBase import ChainConfigurationBase -from TriggerMenuMT.HLTMenuConfig.Muon.MuonSequenceSetup import muFastSequence, muFastOvlpRmSequence, muCombSequence, muCombOvlpRmSequence, muEFMSSequence, muEFSASequence, muIsoSequence, muEFCBSequence, muEFSAFSSequence, muEFCBFSSequence, muEFIsoSequence, efLateMuRoISequence, efLateMuSequence +from TriggerMenuMT.HLTMenuConfig.Muon.MuonSequenceSetup import muFastSequence, muFastOvlpRmSequence, muCombSequence, muCombOvlpRmSequence, muEFSASequence, muIsoSequence, muEFCBSequence, muEFSAFSSequence, muEFCBFSSequence, muEFIsoSequence, efLateMuRoISequence, efLateMuSequence from TrigMuonHypoMT.TrigMuonHypoMTConfig import TrigMuonEFInvMassHypoToolFromDict # this must be moved to the HypoTool file: @@ -38,9 +38,6 @@ def muCombSequenceCfg(flags): def muCombOvlpRmSequenceCfg(flags): return muCombOvlpRmSequence() -def muEFMSSequenceCfg(flags): - return muEFMSSequence() - def muEFSASequenceCfg(flags): return muEFSASequence() @@ -113,7 +110,7 @@ class MuonChainConfiguration(ChainConfigurationBase): "noL2Comb" : [['getmuFast'], ['getmuEFSA', 'getmuEFCB']], "ivar":[['getmuFast', 'getmuComb', 'getmuIso']], "noL1":[[],['getFSmuEFSA', 'getFSmuEFCB']], - "msonly":[['getmuFast', 'getmuMSEmpty'], ['getmuEFMS']], + "msonly":[['getmuFast', 'getmuMSEmpty'], ['getmuEFSA']], "ivarmedium":[['getmuFast', 'getmuComb'], ['getmuEFSA', 'getmuEFCB', 'getmuEFIso']], "lateMu":[[],['getLateMuRoI','getLateMu']], "Dr": [['getmuFastDr', 'getmuCombDr']], @@ -161,9 +158,6 @@ class MuonChainConfiguration(ChainConfigurationBase): def getmuEFSA(self): return self.getStep(3,'muEFSA',[ muEFSASequenceCfg]) - # -------------------- - def getmuEFMS(self): - return self.getStep(3,'muEFMS', [muEFMSSequenceCfg]) # -------------------- def getmuIso(self): diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Muon/MuonSequenceSetup.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Muon/MuonSequenceSetup.py index 6e74f9bf4a14ab6d6a19bfc51ccd7ef9714a979f..48997c2a26c8f293dfefeb32d47e88215af9c804 100644 --- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Muon/MuonSequenceSetup.py +++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Muon/MuonSequenceSetup.py @@ -236,23 +236,6 @@ def muEFSASequence(): -def muEFMSSequence(): - - (muonEFSAonlySequence, efsaViewsMaker, sequenceOut) = RecoFragmentsPool.retrieve(muEFSAAlgSequence, ConfigFlags) - - # setup EFSA hypo - from TrigMuonHypoMT.TrigMuonHypoMTConfig import TrigMuonEFHypoAlg - trigMuonEFSAHypo = TrigMuonEFHypoAlg( "TrigMuonEFMSonlyHypoAlg" ) - trigMuonEFSAHypo.MuonDecisions = sequenceOut - - from TrigMuonHypoMT.TrigMuonHypoMTConfig import TrigMuonEFMSonlyHypoToolFromDict - - return MenuSequence( Sequence = muonEFSAonlySequence, - Maker = efsaViewsMaker, - Hypo = trigMuonEFSAHypo, - HypoToolGen = TrigMuonEFMSonlyHypoToolFromDict ) - - ###################### ### EFCB seq ### ######################