diff --git a/Trigger/TrigValidation/TrigAnalysisTest/share/ref_RDOtoRDOTrig_v1Dev_build.ref b/Trigger/TrigValidation/TrigAnalysisTest/share/ref_RDOtoRDOTrig_v1Dev_build.ref index 7f6e353af4fc61601840c1265c0b84e3ac938383..9f696a76f78622be154a4e86273e7ddb0551a289 100644 --- a/Trigger/TrigValidation/TrigAnalysisTest/share/ref_RDOtoRDOTrig_v1Dev_build.ref +++ b/Trigger/TrigValidation/TrigAnalysisTest/share/ref_RDOtoRDOTrig_v1Dev_build.ref @@ -100,9 +100,6 @@ TrigSignatureMoniMT INFO -- #4008168535 Features TrigSignatureMoniMT INFO HLT_2mu4_muonqual_L12MU4 #1584776935 TrigSignatureMoniMT INFO -- #1584776935 Events 4 4 0 0 0 0 3 3 2 2 - - - - - 2 TrigSignatureMoniMT INFO -- #1584776935 Features 0 0 0 0 12 12 8 8 - - - - - -TrigSignatureMoniMT INFO HLT_2mu6Comb_L12MU6 #2046267508 -TrigSignatureMoniMT INFO -- #2046267508 Events 4 4 0 0 0 0 3 2 - - - - - - - 2 -TrigSignatureMoniMT INFO -- #2046267508 Features 0 0 0 0 12 8 - - - - - - - TrigSignatureMoniMT INFO HLT_2mu6_10invm70_L1MU6 #1316992871 TrigSignatureMoniMT INFO -- #1316992871 Events 10 10 0 0 0 0 3 2 2 2 - - - - - 2 TrigSignatureMoniMT INFO -- #1316992871 Features 0 0 0 0 12 8 8 8 - - - - - @@ -604,9 +601,6 @@ TrigSignatureMoniMT INFO -- #1696906927 Features TrigSignatureMoniMT INFO HLT_mu20_2mu4noL1_L1MU20 #1029128679 TrigSignatureMoniMT INFO -- #1029128679 Events 8 8 0 0 0 0 8 5 5 5 0 0 0 1 1 1 TrigSignatureMoniMT INFO -- #1029128679 Features 0 0 0 0 10 6 6 6 0 0 0 2 2 -TrigSignatureMoniMT INFO HLT_mu20_ivar_L1MU6 #2083734526 -TrigSignatureMoniMT INFO -- #2083734526 Events 10 10 0 0 0 0 10 6 5 - - - - - - 5 -TrigSignatureMoniMT INFO -- #2083734526 Features 0 0 0 0 13 7 5 - - - - - - TrigSignatureMoniMT INFO HLT_mu20_ivarmedium_mu8noL1_L1MU20 #3249386942 TrigSignatureMoniMT INFO -- #3249386942 Events 8 8 0 0 0 0 8 5 5 5 3 0 0 1 1 1 TrigSignatureMoniMT INFO -- #3249386942 Features 0 0 0 0 10 6 6 6 3 0 0 1 1 @@ -667,9 +661,6 @@ TrigSignatureMoniMT INFO -- #1642591450 Features TrigSignatureMoniMT INFO HLT_mu60_L1MU20 #2871837722 TrigSignatureMoniMT INFO -- #2871837722 Events 8 8 0 0 0 0 8 5 1 1 - - - - - 1 TrigSignatureMoniMT INFO -- #2871837722 Features 0 0 0 0 10 6 1 1 - - - - - -TrigSignatureMoniMT INFO HLT_mu6Comb_L1MU6 #996392590 -TrigSignatureMoniMT INFO -- #996392590 Events 10 10 0 0 0 0 10 10 - - - - - - - 10 -TrigSignatureMoniMT INFO -- #996392590 Features 0 0 0 0 13 12 - - - - - - - TrigSignatureMoniMT INFO HLT_mu6_L1MU6 #2560542253 TrigSignatureMoniMT INFO -- #2560542253 Events 10 10 0 0 0 0 10 10 10 10 - - - - - 10 TrigSignatureMoniMT INFO -- #2560542253 Features 0 0 0 0 13 12 13 13 - - - - - @@ -679,6 +670,9 @@ TrigSignatureMoniMT INFO -- #934918532 Features TrigSignatureMoniMT INFO HLT_mu6_ivarmedium_L1MU6 #1012713062 TrigSignatureMoniMT INFO -- #1012713062 Events 10 10 0 0 0 0 10 10 10 10 6 - - - - 6 TrigSignatureMoniMT INFO -- #1012713062 Features 0 0 0 0 13 12 13 13 6 - - - - +TrigSignatureMoniMT INFO HLT_mu6_j45_nojcalib_L1J20 #2114129685 +TrigSignatureMoniMT INFO -- #2114129685 Events 19 19 0 0 0 0 0 0 0 0 0 0 - - - 0 +TrigSignatureMoniMT INFO -- #2114129685 Features 0 0 0 0 0 0 0 0 0 0 - - - TrigSignatureMoniMT INFO HLT_mu6_msonly_L1MU6 #3895421032 TrigSignatureMoniMT INFO -- #3895421032 Events 10 10 0 0 0 0 10 0 10 - - - - - - 10 TrigSignatureMoniMT INFO -- #3895421032 Features 0 0 0 0 13 0 13 - - - - - - @@ -688,15 +682,9 @@ TrigSignatureMoniMT INFO -- #1713982776 Features TrigSignatureMoniMT INFO HLT_mu6_mu6noL1_L1MU6 #451489897 TrigSignatureMoniMT INFO -- #451489897 Events 10 10 0 0 0 0 10 10 10 10 0 0 0 5 4 4 TrigSignatureMoniMT INFO -- #451489897 Features 0 0 0 0 13 12 13 13 0 0 0 7 6 -TrigSignatureMoniMT INFO HLT_mu6fast_L1MU6 #3518031697 -TrigSignatureMoniMT INFO -- #3518031697 Events 10 10 0 0 0 0 10 - - - - - - - - 10 -TrigSignatureMoniMT INFO -- #3518031697 Features 0 0 0 0 13 - - - - - - - - -TrigSignatureMoniMT INFO HLT_mu6fast_j45_nojcalib_L1J20 #1776326110 -TrigSignatureMoniMT INFO -- #1776326110 Events 19 19 0 0 0 0 0 0 0 0 0 0 - - - 0 -TrigSignatureMoniMT INFO -- #1776326110 Features 0 0 0 0 0 0 0 0 0 0 - - - -TrigSignatureMoniMT INFO HLT_mu6fast_xe30_mht_L1XE10 #1876869651 -TrigSignatureMoniMT INFO -- #1876869651 Events 19 19 0 0 0 0 0 0 0 0 0 0 - - - 0 -TrigSignatureMoniMT INFO -- #1876869651 Features 0 0 0 0 0 0 0 0 0 0 - - - +TrigSignatureMoniMT INFO HLT_mu6_xe30_mht_L1XE10 #3192713675 +TrigSignatureMoniMT INFO -- #3192713675 Events 19 19 0 0 0 0 0 0 0 0 0 0 - - - 0 +TrigSignatureMoniMT INFO -- #3192713675 Features 0 0 0 0 0 0 0 0 0 0 - - - TrigSignatureMoniMT INFO HLT_mu80_L1MU20 #387900377 TrigSignatureMoniMT INFO -- #387900377 Events 8 8 0 0 0 0 8 5 1 0 - - - - - 0 TrigSignatureMoniMT INFO -- #387900377 Features 0 0 0 0 10 6 1 0 - - - - - diff --git a/Trigger/TrigValidation/TriggerTest/share/ref_data_v1Dev_build.ref b/Trigger/TrigValidation/TriggerTest/share/ref_data_v1Dev_build.ref index 350b5c69ca71dd75baa29c3cb785e24ee98e8a29..07a4688ebb490d9e3eebe80697a54d8e3fe6ae43 100644 --- a/Trigger/TrigValidation/TriggerTest/share/ref_data_v1Dev_build.ref +++ b/Trigger/TrigValidation/TriggerTest/share/ref_data_v1Dev_build.ref @@ -100,9 +100,6 @@ TrigSignatureMoniMT INFO -- #4008168535 Features TrigSignatureMoniMT INFO HLT_2mu4_muonqual_L12MU4 #1584776935 TrigSignatureMoniMT INFO -- #1584776935 Events 20 20 0 0 0 0 1 0 0 0 - - - - - 0 TrigSignatureMoniMT INFO -- #1584776935 Features 0 0 0 0 4 0 0 0 - - - - - -TrigSignatureMoniMT INFO HLT_2mu6Comb_L12MU6 #2046267508 -TrigSignatureMoniMT INFO -- #2046267508 Events 20 20 0 0 0 0 0 0 - - - - - - - 0 -TrigSignatureMoniMT INFO -- #2046267508 Features 0 0 0 0 0 0 - - - - - - - TrigSignatureMoniMT INFO HLT_2mu6_10invm70_L1MU6 #1316992871 TrigSignatureMoniMT INFO -- #1316992871 Events 20 20 0 0 0 0 0 0 0 0 - - - - - 0 TrigSignatureMoniMT INFO -- #1316992871 Features 0 0 0 0 0 0 0 0 - - - - - @@ -604,9 +601,6 @@ TrigSignatureMoniMT INFO -- #1696906927 Features TrigSignatureMoniMT INFO HLT_mu20_2mu4noL1_L1MU20 #1029128679 TrigSignatureMoniMT INFO -- #1029128679 Events 20 20 0 0 0 0 1 1 0 0 0 0 0 0 0 0 TrigSignatureMoniMT INFO -- #1029128679 Features 0 0 0 0 1 1 0 0 0 0 0 0 0 -TrigSignatureMoniMT INFO HLT_mu20_ivar_L1MU6 #2083734526 -TrigSignatureMoniMT INFO -- #2083734526 Events 20 20 0 0 0 0 1 1 1 - - - - - - 1 -TrigSignatureMoniMT INFO -- #2083734526 Features 0 0 0 0 1 1 1 - - - - - - TrigSignatureMoniMT INFO HLT_mu20_ivarmedium_mu8noL1_L1MU20 #3249386942 TrigSignatureMoniMT INFO -- #3249386942 Events 20 20 0 0 0 0 1 1 0 0 0 0 0 0 0 0 TrigSignatureMoniMT INFO -- #3249386942 Features 0 0 0 0 1 1 0 0 0 0 0 0 0 @@ -667,9 +661,6 @@ TrigSignatureMoniMT INFO -- #1642591450 Features TrigSignatureMoniMT INFO HLT_mu60_L1MU20 #2871837722 TrigSignatureMoniMT INFO -- #2871837722 Events 20 20 0 0 0 0 1 1 0 0 - - - - - 0 TrigSignatureMoniMT INFO -- #2871837722 Features 0 0 0 0 1 1 0 0 - - - - - -TrigSignatureMoniMT INFO HLT_mu6Comb_L1MU6 #996392590 -TrigSignatureMoniMT INFO -- #996392590 Events 20 20 0 0 0 0 1 1 - - - - - - - 1 -TrigSignatureMoniMT INFO -- #996392590 Features 0 0 0 0 1 1 - - - - - - - TrigSignatureMoniMT INFO HLT_mu6_L1MU6 #2560542253 TrigSignatureMoniMT INFO -- #2560542253 Events 20 20 0 0 0 0 1 1 0 0 - - - - - 0 TrigSignatureMoniMT INFO -- #2560542253 Features 0 0 0 0 1 1 0 0 - - - - - @@ -679,6 +670,9 @@ TrigSignatureMoniMT INFO -- #934918532 Features TrigSignatureMoniMT INFO HLT_mu6_ivarmedium_L1MU6 #1012713062 TrigSignatureMoniMT INFO -- #1012713062 Events 20 20 0 0 0 0 1 1 0 0 0 - - - - 0 TrigSignatureMoniMT INFO -- #1012713062 Features 0 0 0 0 1 1 0 0 0 - - - - +TrigSignatureMoniMT INFO HLT_mu6_j45_nojcalib_L1J20 #2114129685 +TrigSignatureMoniMT INFO -- #2114129685 Events 20 20 0 0 0 0 0 0 0 0 0 0 - - - 0 +TrigSignatureMoniMT INFO -- #2114129685 Features 0 0 0 0 0 0 0 0 0 0 - - - TrigSignatureMoniMT INFO HLT_mu6_msonly_L1MU6 #3895421032 TrigSignatureMoniMT INFO -- #3895421032 Events 20 20 0 0 0 0 1 0 0 - - - - - - 0 TrigSignatureMoniMT INFO -- #3895421032 Features 0 0 0 0 1 0 0 - - - - - - @@ -688,15 +682,9 @@ TrigSignatureMoniMT INFO -- #1713982776 Features TrigSignatureMoniMT INFO HLT_mu6_mu6noL1_L1MU6 #451489897 TrigSignatureMoniMT INFO -- #451489897 Events 20 20 0 0 0 0 1 1 0 0 0 0 0 0 0 0 TrigSignatureMoniMT INFO -- #451489897 Features 0 0 0 0 1 1 0 0 0 0 0 0 0 -TrigSignatureMoniMT INFO HLT_mu6fast_L1MU6 #3518031697 -TrigSignatureMoniMT INFO -- #3518031697 Events 20 20 0 0 0 0 1 - - - - - - - - 1 -TrigSignatureMoniMT INFO -- #3518031697 Features 0 0 0 0 1 - - - - - - - - -TrigSignatureMoniMT INFO HLT_mu6fast_j45_nojcalib_L1J20 #1776326110 -TrigSignatureMoniMT INFO -- #1776326110 Events 20 20 0 0 0 0 0 0 0 0 0 0 - - - 0 -TrigSignatureMoniMT INFO -- #1776326110 Features 0 0 0 0 0 0 0 0 0 0 - - - -TrigSignatureMoniMT INFO HLT_mu6fast_xe30_mht_L1XE10 #1876869651 -TrigSignatureMoniMT INFO -- #1876869651 Events 20 20 0 0 0 0 0 0 0 0 0 0 - - - 0 -TrigSignatureMoniMT INFO -- #1876869651 Features 0 0 0 0 0 0 0 0 0 0 - - - +TrigSignatureMoniMT INFO HLT_mu6_xe30_mht_L1XE10 #3192713675 +TrigSignatureMoniMT INFO -- #3192713675 Events 20 20 0 0 0 0 0 0 0 0 0 0 - - - 0 +TrigSignatureMoniMT INFO -- #3192713675 Features 0 0 0 0 0 0 0 0 0 0 - - - TrigSignatureMoniMT INFO HLT_mu80_L1MU20 #387900377 TrigSignatureMoniMT INFO -- #387900377 Events 20 20 0 0 0 0 1 1 0 0 - - - - - 0 TrigSignatureMoniMT INFO -- #387900377 Features 0 0 0 0 1 1 0 0 - - - - - diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/LS2_v1.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/LS2_v1.py index 32d066a3c9a65af7661a0bd5e532b8ac41c0ef75..2bfb8fe5b370ca8a8accb3c1a9885aad01227db4 100644 --- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/LS2_v1.py +++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/LS2_v1.py @@ -37,11 +37,8 @@ def setupMenu(): ChainProp(name='HLT_mu20_ivarmedium_mu8noL1_L1MU20', l1SeedThresholds=['MU20','FSNOSEED'], mergingStrategy='serial', groups=MultiMuonGroup), #test chains - ChainProp(name='HLT_mu6fast_L1MU6', groups=SingleMuonGroup), - ChainProp(name='HLT_mu6Comb_L1MU6', groups=SingleMuonGroup), ChainProp(name='HLT_mu6_L1MU6', groups=SingleMuonGroup), - ChainProp(name='HLT_mu20_ivar_L1MU6', groups=SingleMuonGroup), ChainProp(name='HLT_mu6_ivarmedium_L1MU6', groups=SingleMuonGroup), # commented because it is conflict with dimuon noL1 serial chain @@ -57,7 +54,6 @@ def setupMenu(): # ChainProp(name='HLT_mu6_Dr_mu4_Dr_L12MU4', l1SeedThresholds=['MU4']*2, groups=MultiMuonGroup), # ATR-20049 ChainProp(name='HLT_mu6_mu4_L12MU4', l1SeedThresholds=['MU4']*2, groups=MultiMuonGroup), - ChainProp(name='HLT_2mu6Comb_L12MU6', l1SeedThresholds=['MU6'], groups=MultiMuonGroup), # in planned primary as an option ChainProp(name='HLT_mu24_ivarmedium_L1MU20', groups=SingleMuonGroup), @@ -377,8 +373,8 @@ def setupMenu(): ChainProp(name='HLT_e24_lhmedium_2g12_loose_L1EM20VH_3EM10VH', l1SeedThresholds=['EM20VH','EM10VH'], mergingStrategy='parallel', stream=[PhysicsStream], groups=MultiElectronGroup), # unsure about l1SeedThresholds # Test chains for muon + jet/MET merging/aligning - ChainProp(name='HLT_mu6fast_xe30_mht_L1XE10', l1SeedThresholds=['MU6','XE10'], mergingStrategy='serial', stream=[PhysicsStream], groups=SingleMETGroup), - ChainProp(name='HLT_mu6fast_j45_nojcalib_L1J20', l1SeedThresholds=['MU6','J20'], mergingStrategy='serial', stream=[PhysicsStream], groups=SingleMETGroup), + ChainProp(name='HLT_mu6_xe30_mht_L1XE10', l1SeedThresholds=['MU6','XE10'], mergingStrategy='serial', stream=[PhysicsStream], groups=SingleMETGroup), + ChainProp(name='HLT_mu6_j45_nojcalib_L1J20', l1SeedThresholds=['MU6','J20'], mergingStrategy='serial', stream=[PhysicsStream], groups=SingleMETGroup), ] TriggerFlags.HeavyIonSlice.signatures = TriggerFlags.HeavyIonSlice.signatures() + [] diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/SignatureDicts.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/SignatureDicts.py index a02231864877113c44c29e1420e35b8d8442754c..2d7c65037ea00b9a14c1d9326c22e92b5eba8154 100644 --- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/SignatureDicts.py +++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/SignatureDicts.py @@ -186,9 +186,9 @@ MuonChainParts = { 'trigType' : ['mu'], 'etaRange' : ['0eta2550','0eta105'], 'threshold' : '', - 'extra' : ['noL1', 'Comb', 'fast', 'msonly','lateMu', "Dr", "muoncalib" ,'l2io'], + 'extra' : ['noL1', 'msonly','lateMu', "Dr", "muoncalib" ,'l2io'], 'IDinfo' : [], - 'isoInfo' : ['ivar','ivarmedium'], + 'isoInfo' : ['ivarmedium'], 'invMassInfo' : ['10invm70'], 'addInfo' : ['1step','idperf','3layersEC','cosmic',"muonqual"], 'topo' : AllowedTopos_mu, diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Muon/MuonDef.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Muon/MuonDef.py index 1d0bf15daab88ebf1009b0c9d924c09c6f47ff76..d274928a3c1e86eb78520297d0687ae89569e389 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, mul2IOOvlpRmSequence, muEFSASequence, muIsoSequence, muEFCBSequence, muEFSAFSSequence, muEFCBFSSequence, muEFIsoSequence, efLateMuRoISequence, efLateMuSequence +from TriggerMenuMT.HLTMenuConfig.Muon.MuonSequenceSetup import muFastSequence, muFastOvlpRmSequence, muCombSequence, muCombOvlpRmSequence, mul2IOOvlpRmSequence, muEFSASequence, muEFCBSequence, muEFSAFSSequence, muEFCBFSSequence, muEFIsoSequence, efLateMuRoISequence, efLateMuSequence from TrigMuonHypoMT.TrigMuonHypoMTConfig import TrigMuonEFInvMassHypoToolFromDict # this must be moved to the HypoTool file: @@ -44,9 +44,6 @@ def mul2IOOvlpRmSequenceCfg(flags): def muEFSASequenceCfg(flags): return muEFSASequence() -def muIsoSequenceCfg(flags): - return muIsoSequence() - def muEFCBSequenceCfg(flags): return muEFCBSequence() @@ -108,11 +105,8 @@ class MuonChainConfiguration(ChainConfigurationBase): stepDictionary = { "":[['getmuFast', 'getmuComb'], ['getmuEFSA', 'getmuEFCB']], - "fast":[['getmuFast']], - "Comb":[['getmuFast', 'getmuComb']], "l2io":[['getmuFast', 'getmuCombIO'], ['getmuEFSA', 'getmuEFCB']], "noL2Comb" : [['getmuFast'], ['getmuEFSA', 'getmuEFCB']], - "ivar":[['getmuFast', 'getmuComb', 'getmuIso']], "noL1":[[],['getFSmuEFSA', 'getFSmuEFCB']], "msonly":[['getmuFast', 'getmuMSEmpty'], ['getmuEFSA']], "ivarmedium":[['getmuFast', 'getmuComb'], ['getmuEFSA', 'getmuEFCB', 'getmuEFIso']], @@ -167,10 +161,6 @@ class MuonChainConfiguration(ChainConfigurationBase): return self.getStep(3,'muEFSA',[ muEFSASequenceCfg]) - # -------------------- - def getmuIso(self): - return self.getStep(3,'muIso', [muIsoSequenceCfg]) - # -------------------- def getmuEFCB(self): diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Muon/MuonSequenceSetup.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Muon/MuonSequenceSetup.py index 50de2d383311caf02387a7ea0355fa804b6f7490..1db463f1684e2daf14f10ccf80d1f2a96d8c1aff 100644 --- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Muon/MuonSequenceSetup.py +++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Muon/MuonSequenceSetup.py @@ -521,51 +521,6 @@ def efLateMuSequence(): -###################### -### l2Muiso step ### -###################### -def muIsoAlgSequence(ConfigFlags): - - l2muIsoViewsMaker = EventViewCreatorAlgorithm("IMl2muIso") - # - l2muIsoViewsMaker.RoIsLink = "roi" # Merge based on L2SA muon - l2muIsoViewsMaker.RoITool = ViewCreatorPreviousROITool() # Spawn EventViews on L2SA muon ROI - # - l2muIsoViewsMaker.Views = "MUIsoViewRoIs" - l2muIsoViewsMaker.InViewRoIs = "MUIsoRoIs" - # - l2muIsoViewsMaker.RequireParentView = True - l2muIsoViewsMaker.ViewFallThrough = True - - ### get EF reco sequence ### - from TriggerMenuMT.HLTMenuConfig.Muon.MuonSetup import l2muisoRecoSequence - l2muisoRecoSequence, sequenceOut = l2muisoRecoSequence( l2muIsoViewsMaker.InViewRoIs ) - - l2muIsoViewsMaker.ViewNodeName = l2muisoRecoSequence.name() - - ### Define a Sequence to run for muIso ### - l2muIsoSequence = seqAND("l2muIsoSequence", [ l2muIsoViewsMaker, l2muisoRecoSequence ] ) - - return (l2muIsoSequence, l2muIsoViewsMaker, sequenceOut) - -def muIsoSequence(): - - (l2muIsoSequence, l2muIsoViewsMaker, sequenceOut) = RecoFragmentsPool.retrieve(muIsoAlgSequence, ConfigFlags) - - # set up hypo - from TrigMuonHypoMT.TrigMuonHypoMTConfig import TrigMuisoHypoAlg - trigmuIsoHypo = TrigMuisoHypoAlg("L2MuisoHypoAlg") - trigmuIsoHypo.MuonL2ISInfoName = sequenceOut - - from TrigMuonHypoMT.TrigMuonHypoMTConfig import TrigMuisoHypoToolFromDict - - return MenuSequence( Sequence = l2muIsoSequence, - Maker = l2muIsoViewsMaker, - Hypo = trigmuIsoHypo, - HypoToolGen = TrigMuisoHypoToolFromDict ) - - - ###################### ### efMuiso step ### ###################### diff --git a/Trigger/TriggerCommon/TriggerMenuMT/share/full_menu_cf.py b/Trigger/TriggerCommon/TriggerMenuMT/share/full_menu_cf.py index c76ae391ba8f4d1c06038067943fc0180978b62a..155328bdfd8d59ccfe691da50dafc36f9ca5c07c 100644 --- a/Trigger/TriggerCommon/TriggerMenuMT/share/full_menu_cf.py +++ b/Trigger/TriggerCommon/TriggerMenuMT/share/full_menu_cf.py @@ -57,7 +57,7 @@ def generateChains(): # muon chains ################################################################## if opt.doMuonSlice == True: - from TriggerMenuMT.HLTMenuConfig.Muon.MuonSequenceSetup import muFastSequence, muCombSequence, muEFSASequence, muIsoSequence, muEFCBSequence, muEFSAFSSequence, muEFCBFSSequence + from TriggerMenuMT.HLTMenuConfig.Muon.MuonSequenceSetup import muFastSequence, muCombSequence, muEFSASequence, muEFCBSequence, muEFSAFSSequence, muEFCBFSSequence MuonChains = [] # step1 @@ -69,7 +69,6 @@ def generateChains(): # step3 muEFSAS = muEFSASequence() step3muEFSA=ChainStep("Step3_muEFSA", [ muEFSAS ]) - step3muIso =ChainStep("Step3_muIso", [ muIsoSequence() ]) # step4 muEFCBS = muEFCBSequence() step4muEFCB=ChainStep("Step4_muEFCB", [ muEFCBS ]) @@ -81,7 +80,6 @@ def generateChains(): MuonChains += [ makeChain(name='HLT_mu6Comb_L1MU6', L1Thresholds=["MU6"], ChainSteps=[ step1mufast, step2muComb ])] MuonChains += [ makeChain(name='HLT_mu6_L1MU6', L1Thresholds=["MU6"], ChainSteps=[ step1mufast, step2muComb, step3muEFSA, step4muEFCB ])] MuonChains += [ makeChain(name='HLT_mu6msonly_L1MU6', L1Thresholds=["MU6"], ChainSteps=[ step1mufast, emptyStep, step3muEFSA ])] # removed due to muEFSA isuue(?) - MuonChains += [ makeChain(name='HLT_mu20_ivar_L1MU6', L1Thresholds=["MU6"], ChainSteps=[ step1mufast, step2muComb, step3muIso ])] # multi muon trigger # 2muons symmetric