diff --git a/Trigger/TriggerCommon/TriggerMenu/python/bphysics/generateBPhysicsChainDefs.py b/Trigger/TriggerCommon/TriggerMenu/python/bphysics/generateBPhysicsChainDefs.py
index ae98b0fc6335f65f84b5ba1c2a6bbc8e32a9a95b..565d9229a1b275e7e47c02ea3b385dc33de0d08d 100644
--- a/Trigger/TriggerCommon/TriggerMenu/python/bphysics/generateBPhysicsChainDefs.py
+++ b/Trigger/TriggerCommon/TriggerMenu/python/bphysics/generateBPhysicsChainDefs.py
@@ -497,6 +497,16 @@ def bMultipleOptionTopos(theChainDef, chainDict, inputTEsL2, inputTEsEF, topoSta
L2Hypo = L2BMuMuHypo_B()
EFFex = EFBMuMuFex_B()
EFHypo = EFBMuMuHypo_B_Lxy0()
+ # legacy vertexing
+ elif ('bDimu' in topoAlgs) & ('legacyVtx' in topoAlgs):
+ from TrigBphysHypo.TrigL2BMuMuFexConfig import L2BMuMuFex_DiMu
+ from TrigBphysHypo.TrigL2BMuMuHypoConfig import L2BMuMuHypo_DiMu
+ from TrigBphysHypo.TrigEFBMuMuFexConfig import EFBMuMuFex_DiMu_legacyVtx
+ from TrigBphysHypo.TrigEFBMuMuHypoConfig import EFBMuMuHypo_DiMu
+ L2Fex = L2BMuMuFex_DiMu()
+ L2Hypo = L2BMuMuHypo_DiMu()
+ EFFex = EFBMuMuFex_DiMu_legacyVtx()
+ EFHypo = EFBMuMuHypo_DiMu()
else:
log.error('Bphysics Chain %s can not be constructed, the given topo algs are not known: %s ' %(chainDict['chainName'], topoAlgs ))
@@ -661,6 +671,10 @@ def bBmumuxTopos(theChainDef,chainDict, inputTEsL2, inputTEsEF, topoStartFrom):
#L2Hypo = L2BMuMuHypo_1()
EFFex = EFBMuMuXFex_1()
EFHypo = EFBMuMuXHypo_1()
+ # legacy vertexing
+ if 'legacyVtx' in topoAlgs:
+ from TrigBphysHypo.TrigEFBMuMuXFexConfig import EFBMuMuXFex_1_legacyVtx
+ EFFex = EFBMuMuXFex_1_legacyVtx()
elif 'bBmumuxv3' in topoAlgs:
print 'MOOOO in bBmumuxv3'
diff --git a/Trigger/TriggerCommon/TriggerMenu/python/calibcosmicmon/EnhancedBiasDefs.py b/Trigger/TriggerCommon/TriggerMenu/python/calibcosmicmon/EnhancedBiasDefs.py
index f0578f84db4aeecbb4db5d441bdd63d0145425f0..db5a2fa9c3f5f5325302a98e3dc639149f9ee3d0 100644
--- a/Trigger/TriggerCommon/TriggerMenu/python/calibcosmicmon/EnhancedBiasDefs.py
+++ b/Trigger/TriggerCommon/TriggerMenu/python/calibcosmicmon/EnhancedBiasDefs.py
@@ -22,7 +22,8 @@ l1_seeds ={
'L1_J30.0ETA49_2J20.0ETA49', 'L1_TAU12',
'L1_MU4_J12', 'L1_2EM7',
'L1_2MU4', 'L1_XS30',
- 'L1_J15'],
+ 'L1_J15', 'L1_ZB',
+ 'L1_DETA-JJ'], # Topo
# High(er) threshold prescaled L1 items - slected at HLT based on TBP bit from L1 in random-seeded events
'high' : ['L1_3J15','L1_EM18VH',
@@ -31,7 +32,14 @@ l1_seeds ={
'L1_MU15','L1_TAU20_2TAU12',
'L1_XE35', 'L1_MU6_2MU4',
'L1_MU6_J20', 'L1_EM7_MU10',
- 'L1_EM15I_MU4', 'L1_EM15VH_3EM7']
+ 'L1_EM15VH_3EM7', 'L1_2EM15',
+ 'L1_EM15I_MU4', 'L1_J75',
+ 'L1_TAU20_2TAU12_XE35',
+ 'L1_DR-TAU20ITAU12I', 'L1_DY-BOX-2MU4', # Topo
+ 'L1_DY-DR-2MU4', 'L1_2CMU4', # Topo
+ 'L1_2MU4-B', 'L1_BTAG-MU4J15', # Topo
+ 'L1_MJJ-100', 'L1_J4-MATCH', # Topo
+ 'L1_HT190-J15.ETA21'] # Topo
}
#########################################################################
diff --git a/Trigger/TriggerCommon/TriggerMenu/python/l1menu/Menu_MC_pp_v6.py b/Trigger/TriggerCommon/TriggerMenu/python/l1menu/Menu_MC_pp_v6.py
index ec561c154129a3fbd69f4d417e49df3219b4c551..bd1226e56bb04e749b903c7c3ab109204371ae7a 100644
--- a/Trigger/TriggerCommon/TriggerMenu/python/l1menu/Menu_MC_pp_v6.py
+++ b/Trigger/TriggerCommon/TriggerMenu/python/l1menu/Menu_MC_pp_v6.py
@@ -363,7 +363,7 @@ def defineMenu():
'L1_EM10VH', 'L1_EM13VH', 'L1_EM15',
# 'L1_EM15I',
'L1_EM15HI','L1_EM15VH', 'L1_EM18VH', 'L1_EM20VH', 'L1_EM20VHI', 'L1_EM22VHI', 'L1_EM24VHI', # see Jira ATR-10334'L1_EM22VHLIL', #'L1_EM50V',
- 'L1_EM3_EMPTY', 'L1_EM7_EMPTY', 'L1_EM7_UNPAIRED_ISO', 'L1_EM7_FIRSTEMPTY',
+ 'L1_EM3_EMPTY', 'L1_EM7_EMPTY', 'L1_EM7_UNPAIRED_ISO', 'L1_EM7_FIRSTEMPTY','L1_EM7_UNPAIRED_NONISO',
'L1_EM20VH_FIRSTEMPTY',
'L1_EM22VHI_FIRSTEMPTY',
#'L1_EM15_BGRP7',
@@ -377,8 +377,8 @@ def defineMenu():
"L1_MU4", "L1_MU6", "L1_MU10", "L1_MU11", "L1_MU15", "L1_MU20",
"L1_MU4_EMPTY", "L1_MU6_EMPTY", "L1_MU4_FIRSTEMPTY", "L1_MU11_EMPTY",
- 'L1_MU4_UNPAIRED_ISO',
- 'L1_MU20_FIRSTEMPTY',
+ 'L1_MU4_UNPAIRED_ISO','L1_MU4_UNPAIRED_NONISO',
+ 'L1_MU20_FIRSTEMPTY',
@@ -393,7 +393,7 @@ def defineMenu():
# single tau
"L1_TAU12", "L1_TAU12IL", "L1_TAU12IM", "L1_TAU12IT", "L1_TAU20", "L1_TAU20IL", "L1_TAU20IM", "L1_TAU20IT",
"L1_TAU30","L1_TAU30_EMPTY","L1_TAU30_UNPAIRED_ISO", "L1_TAU40", "L1_TAU60", "L1_TAU8", "L1_TAU8_EMPTY",
- "L1_TAU8_UNPAIRED_ISO", "L1_TAU8_FIRSTEMPTY",
+ "L1_TAU8_UNPAIRED_ISO","L1_TAU8_FIRSTEMPTY","L1_TAU8_UNPAIRED_NONISO",
# multi tau
"L1_TAU20IM_2TAU12IM", "L1_TAU20_2TAU12", "L1_TAU40_2TAU20IM",
@@ -1317,6 +1317,9 @@ def defineMenu():
'L1_TAU8_UNPAIRED_ISO': 388,
'L1_EM7_UNPAIRED_ISO': 389,
+ 'L1_TAU8_UNPAIRED_NONISO': 467,
+ 'L1_EM7_UNPAIRED_NONISO': 468,
+ 'L1_MU4_UNPAIRED_NONISO' : 469,
'L1_RD2_BGRP12' : 390,
'L1_TAU8_FIRSTEMPTY': 391,
'L1_EM24VHI' : 392,
diff --git a/Trigger/TriggerCommon/TriggerMenu/python/menu/CPS.py b/Trigger/TriggerCommon/TriggerMenu/python/menu/CPS.py
index 2f1e0a4524ddf355665dd6f7b6bed534bd2de3c6..2d2b5d1b9b1c1c4d1315b8d0c3ab6d6368837db2 100644
--- a/Trigger/TriggerCommon/TriggerMenu/python/menu/CPS.py
+++ b/Trigger/TriggerCommon/TriggerMenu/python/menu/CPS.py
@@ -352,6 +352,13 @@ def defineCPSGroups():
'mu6_mu4_bDimu_novtx_noos',
],
+ 'RATE:CPS:HLT_2mu10_bDimu' : ['2mu10_bBmumux_BcmumuDsloose',
+ '2mu10_bJpsimumu',
+ '2mu10_bUpsimumu',
+ '2mu10_bBmumuxv2',
+ '2mu10_bDimu',
+ '2mu10_bDimu_novtx_noos',
+ ],
'RATE:CPS:HLT_3mu4_bDimu' : ['3mu4_bDimu',
'3mu4_bJpsi',
diff --git a/Trigger/TriggerCommon/TriggerMenu/python/menu/L1Seeds.py b/Trigger/TriggerCommon/TriggerMenu/python/menu/L1Seeds.py
index eb5e802956121910ab4fdf48bfe96371d4808b9d..313cdba3aaa37cc60a4f58df84143855e44cbb05 100644
--- a/Trigger/TriggerCommon/TriggerMenu/python/menu/L1Seeds.py
+++ b/Trigger/TriggerCommon/TriggerMenu/python/menu/L1Seeds.py
@@ -163,7 +163,7 @@ def getEBnoL1PSSeed(l1items, l1seedname):
# All of these L1 items must be PS=1 for an EB campaign
noL1PS_seeds = ''
if ('L1_PhysicsLow' in l1seedname):
- noL1PS_seeds = 'L1_2MU6,L1_3MU4,L1_2EM15,L1_EM15HI_2TAU12IM_J25_3J12,L1_EM15HI_2TAU12IM_XE35,L1_EM15HI_TAU40_2TAU15,L1_EM15VH_MU10,L1_EM15VH_3EM7,L1_EM22VHI,L1_2EM8VH_MU10,L1_MU10_TAU12IM_J25_2J12,L1_MU10_TAU12IM_XE35,L1_MU10_TAU20IM,L1_J75,L1_3J40,L1_4J15,L1_XE50,L1_2J15_XE55,L1_TAU60,L1_TAU20_2TAU12_XE35,L1_TAU20IM_2TAU12IM_J25_2J20_3J12,L1_TAU20IM_2TAU12IM_XE35,L1_TAU20IM_2J20_XE45,L1_MU20,L1_MU6_J30.0ETA49_2J20.0ETA49,L1_MU10_3J20,L1_MU6_J40,L1_J40.0ETA25_2J15.31ETA49,L1_3MU6,L1_EM15I_MU4'
+ noL1PS_seeds = 'L1_MU6_3MU4,L1_2MU6,L1_EM15HI_2TAU12IM_J25_3J12,L1_EM15HI_2TAU12IM_XE35,L1_EM15HI_TAU40_2TAU15,L1_EM15VH_MU10,L1_EM15VH_3EM7,L1_EM22VHI,L1_2EM8VH_MU10,L1_MU10_TAU12IM_J25_2J12,L1_MU10_TAU12IM_XE35,L1_MU10_TAU20IM,L1_3J40,L1_4J15,L1_XE50,L1_2J15_XE55,L1_TAU60,L1_TAU20IM_2TAU12IM_J25_2J20_3J12,L1_TAU20IM_2TAU12IM_XE35,L1_TAU20IM_2J20_XE45,L1_MU20,L1_MU6_J30.0ETA49_2J20.0ETA49,L1_MU10_3J20,L1_MU6_J40,L1_J40.0ETA25_2J15.31ETA49,L1_3MU6,L1_MU10_2J15_J20,L1_J40.0ETA25_2J25_J20.31ETA49'
elif ('L1_PhysicsHigh' in l1seedname):
noL1PS_seeds = 'L1_XE80,L1_J100.31ETA49,L1_J400,L1_XE300,L1_6J15'
elif ('L1_EMPTY' in l1seedname):
@@ -171,7 +171,7 @@ def getEBnoL1PSSeed(l1items, l1seedname):
elif ('L1_FIRSTEMPTY' in l1seedname):
noL1PS_seeds = 'L1_J12_FIRSTEMPTY,L1_MU20_FIRSTEMPTY,L1_TAU8_FIRSTEMPTY,L1_EM7_FIRSTEMPTY'
elif ('L1_UNPAIRED_ISO' in l1seedname):
- noL1PS_seeds = 'L1_J12_UNPAIRED_ISO,L1_J30.31ETA49_UNPAIRED_ISO,L1_BCM_Wide_UNPAIRED_ISO,L1_BCM_AC_UNPAIRED_ISO,L1_BCM_CA_UNPAIRED_ISO,L1_MU4_UNPAIRED_ISO,L1_EM7_UNPAIRED_ISO,L1_TAU8_UNPAIRED_ISO,L1_TAU30_UNPAIRED_ISO'
+ noL1PS_seeds = 'L1_J12_UNPAIRED_ISO,L1_J15.31ETA49_UNPAIRED_ISO,L1_BCM_Wide_UNPAIRED_ISO,L1_BCM_AC_UNPAIRED_ISO,L1_BCM_CA_UNPAIRED_ISO,L1_MU4_UNPAIRED_ISO,L1_EM7_UNPAIRED_ISO,L1_TAU8_UNPAIRED_ISO,L1_TAU30_UNPAIRED_ISO'
elif ('L1_UNPAIRED_NONISO' in l1seedname):
noL1PS_seeds = 'L1_J12_UNPAIRED_NONISO,L1_BCM_Wide_UNPAIRED_NONISO,L1_BCM_AC_UNPAIRED_NONISO,L1_BCM_CA_UNPAIRED_NONISO'
elif ('L1_ABORTGAPNOTCALIB' in l1seedname):
@@ -386,6 +386,7 @@ def getInputTEfromL1Item(l1item):
'L1_TAU8_EMPTY': ['HA8'],
'L1_TAU8_FIRSTEMPTY': ['HA8'],
'L1_TAU8_UNPAIRED_ISO': ['HA8'],
+ 'L1_TAU8_UNPAIRED_NONISO': ['HA8'],
'L1_TAU12_EMPTY': ['HA12'],
'L1_TAU12_FIRSTEMPTY': ['HA12'],
'L1_TAU12_UNPAIRED_ISO': ['HA12'],
diff --git a/Trigger/TriggerCommon/TriggerMenu/python/menu/MC_pp_v6.py b/Trigger/TriggerCommon/TriggerMenu/python/menu/MC_pp_v6.py
index a9400f87462df5a536002a3c86160b7d5fac4fa2..e7438c703b7160ae8fc1d453d28e46efb1bae6f0 100755
--- a/Trigger/TriggerCommon/TriggerMenu/python/menu/MC_pp_v6.py
+++ b/Trigger/TriggerCommon/TriggerMenu/python/menu/MC_pp_v6.py
@@ -78,6 +78,7 @@ def setupMenu():
['mu14_imedium_mu6noL1_msonly', 'L1_MU10', ['L1_MU10',''], [PhysicsStream], ['RATE:MultiMuon','BW:Muon'], -1,['serial',-1,['mu14_imedium','mu6noL1_msonly']]],
['2mu6_mu4', 'L1_2MU6_3MU4', ['L1_2MU6','L1_MU4'], [PhysicsStream], ['RATE:MultiMuon', 'BW:Muon'], -1],
['mu20_msonly_mu6noL1_msonly_nscan05_L1MU4_UNPAIRED_ISO','L1_MU4_UNPAIRED_ISO', ['L1_MU20','L2_mu20_msonly'], ["Late"], ['RATE:MultiMuon','BW:Muon'], -1,['serial',-1,['mu20_msonly','mu6noL1_msonly_nscan05']]],
+ ['mu20_msonly_mu12noL1_msonly_nscan05_noComb', 'L1_MU20', ['L1_MU20','L2_mu20_msonly'], [PhysicsStream], ['RATE:MultiMuon','BW:Muon'], -1,['serial',-1,['mu20_msonly','mu12noL1_msonly_nscan05']]],
# not working for now
['mu20_msonly_mu6noL1_msonly_nscan05_noComb', 'L1_MU20', ['L1_MU20','L2_mu20_msonly'], [PhysicsStream], ['RATE:MultiMuon','BW:Muon'], -1,['serial',-1,['mu20_msonly','mu6noL1_msonly_nscan05_noComb']]],
@@ -1352,6 +1353,16 @@ def setupMenu():
['2mu6_bJpsimumu_tightChi2', 'L1_2MU6', [], [PhysicsStream], ['RATE:Bphysics','BW:Bphys'], -1],
['2mu6_bBmumu_tightChi2', 'L1_2MU6', [], [PhysicsStream], ['RATE:Bphysics','BW:Bphys'], -1],
['2mu6_bUpsimumu_tightChi2', 'L1_2MU6', [], [PhysicsStream], ['RATE:Bphysics','BW:Bphys'], -1],
+ # chains with 'broken' vertexing at EF
+ ['2mu4_bDimu_legacyVtx', 'L1_2MU4', [], [PhysicsStream], ['RATE:Bphysics','BW:Bphys'], -1],
+ ['mu6_mu4_bDimu_legacyVtx', 'L1_MU6_2MU4', ['L1_MU6','L1_MU4'], [PhysicsStream], ['RATE:Bphysics','BW:Bphys'], -1],
+ ['2mu6_bDimu_legacyVtx', 'L1_2MU6', [], [PhysicsStream, 'express'], ['RATE:Bphysics','BW:Bphys'], -1],
+ ['2mu10_bDimu_legacyVtx', 'L1_2MU10', [], [PhysicsStream], ['RATE:Bphysics','BW:Bphys'], -1],
+ ['2mu4_bBmumuxv2_legacyVtx', 'L1_2MU4', [], [PhysicsStream], ['RATE:Bphysics','BW:Bphys'], -1],
+ ['mu6_mu4_bBmumuxv2_legacyVtx', 'L1_MU6_2MU4', ['L1_MU6','L1_MU4'], [PhysicsStream], ['RATE:Bphysics','BW:Bphys'], -1],
+ ['2mu6_bBmumuxv2_legacyVtx', 'L1_2MU6', [], [PhysicsStream, 'express'], ['RATE:Bphysics','BW:Bphys'], -1],
+ ['mu10_mu6_bBmumuxv2_legacyVtx', 'L1_MU10_2MU6', ['L1_MU10','L1_MU6'],[PhysicsStream], ['RATE:Bphysics','BW:Bphys'], -1],
+ ['2mu10_bBmumuxv2_legacyVtx', 'L1_2MU10', [], [PhysicsStream], ['RATE:Bphysics','BW:Bphys'], -1],
#new narrow-scan muon triggers for tau->3mu
#['3mu4_bTau', 'L1_3MU4', [], [PhysicsStream], ['RATE:Bphysics','BW:Bphys'], -1],
@@ -1444,14 +1455,14 @@ def setupMenu():
['2mu4_bBmumu', 'L1_2MU4', [], [PhysicsStream], ['RATE:Bphysics','BW:Bphys'], -1],
['mu6_mu4_bBmumu_noL2', 'L1_MU6_2MU4', ['L1_MU6','L1_MU4'], [PhysicsStream], ['RATE:Bphysics','BW:Bphys'], -1],
- ['2mu10_bBmumuxv2', 'L1_2MU10', [], [PhysicsStream], ['RATE:Bphysics','BW:Bphys'], -1],
- ['2mu10_bBmumux_BcmumuDsloose', 'L1_2MU10', [], [PhysicsStream], ['RATE:Bphysics','BW:Bphys'], -1],
+ ## moved to phys ['2mu10_bBmumuxv2', 'L1_2MU10', [], [PhysicsStream], ['RATE:Bphysics','BW:Bphys'], -1],
+ ## moved to phys ['2mu10_bBmumux_BcmumuDsloose', 'L1_2MU10', [], [PhysicsStream], ['RATE:Bphysics','BW:Bphys'], -1],
['2mu10_bBmumux_BpmumuKp', 'L1_2MU10', [], [PhysicsStream], ['RATE:Bphysics','BW:Bphys'], -1],
- ['2mu10_bDimu', 'L1_2MU10', [], [PhysicsStream], ['RATE:Bphysics','BW:Bphys'], -1],
+ ## moved to phys ['2mu10_bDimu', 'L1_2MU10', [], [PhysicsStream], ['RATE:Bphysics','BW:Bphys'], -1],
['2mu10_bDimu_noinvm_novtx_ss', 'L1_2MU10', [], [PhysicsStream], ['RATE:Bphysics','BW:Bphys'], -1],
- ['2mu10_bDimu_novtx_noos', 'L1_2MU10', [], [PhysicsStream], ['RATE:Bphysics','BW:Bphys'], -1],
- ['2mu10_bJpsimumu', 'L1_2MU10', [], [PhysicsStream], ['RATE:Bphysics','BW:Bphys'], -1],
- ['2mu10_bUpsimumu', 'L1_2MU10', [], [PhysicsStream], ['RATE:Bphysics','BW:Bphys'], -1],
+ ## moved to phys ['2mu10_bDimu_novtx_noos', 'L1_2MU10', [], [PhysicsStream], ['RATE:Bphysics','BW:Bphys'], -1],
+ ## moved to phys ['2mu10_bJpsimumu', 'L1_2MU10', [], [PhysicsStream], ['RATE:Bphysics','BW:Bphys'], -1],
+ ## moved to phys ['2mu10_bUpsimumu', 'L1_2MU10', [], [PhysicsStream], ['RATE:Bphysics','BW:Bphys'], -1],
['2mu10_bBmumu', 'L1_2MU10', [], [PhysicsStream], ['RATE:Bphysics','BW:Bphys'], -1],
# Bmumux chains with L2 B-physics selection skipped
diff --git a/Trigger/TriggerCommon/TriggerMenu/python/menu/Physics_pp_v6.py b/Trigger/TriggerCommon/TriggerMenu/python/menu/Physics_pp_v6.py
index 6944529703904a7c2a37ce2c3574e246b9b03c31..727554bbac47b60e58784cc5b19cbda160398a5e 100644
--- a/Trigger/TriggerCommon/TriggerMenu/python/menu/Physics_pp_v6.py
+++ b/Trigger/TriggerCommon/TriggerMenu/python/menu/Physics_pp_v6.py
@@ -152,12 +152,14 @@ def setupMenu():
['3mu6_msonly_L1MU4_EMPTY', 'L1_MU4_EMPTY', ['L1_3MU6'], ["Late"], ['RATE:MultiMuon', 'BW:Muon'], -1],
['3mu6_msonly_L1MU6_EMPTY', 'L1_MU6_EMPTY', ['L1_3MU6'], ["Late"], ['RATE:MultiMuon', 'BW:Muon'], -1],
['3mu6_msonly_L1MU4_UNPAIRED_ISO', 'L1_MU4_UNPAIRED_ISO', ['L1_3MU6'], ["Late"], ['RATE:MultiMuon', 'BW:Muon'], -1],
+ ['3mu6_msonly_L1MU4_UNPAIRED_NONISO', 'L1_MU4_UNPAIRED_NONISO', ['L1_3MU6'], ["Late"], ['RATE:MultiMuon', 'BW:Muon'], -1],
['mu20_msonly_mu10noL1_msonly_nscan05_noComb', 'L1_MU20', ['L1_MU20','L2_mu20_msonly'], [PhysicsStream], ['RATE:MultiMuon','BW:Muon'], -1,['serial',-1,['mu20_msonly','mu10noL1_msonly_nscan05']]],
['mu20_msonly_mu10noL1_msonly_nscan05_noComb_L1MU6_EMPTY', 'L1_MU6_EMPTY', ['L1_MU20','L2_mu20_msonly'], ["Late"], ['RATE:MultiMuon','BW:Muon'], -1,['serial',-1,['mu20_msonly','mu6noL1_msonly_nscan05_noComb']]],
['mu20_msonly_mu10noL1_msonly_nscan05_noComb_L1MU4_UNPAIRED_ISO','L1_MU4_UNPAIRED_ISO', ['L1_MU20','L2_mu20_msonly'], ["Late"], ['RATE:MultiMuon','BW:Muon'], -1,['serial',-1,['mu20_msonly','mu6noL1_msonly_nscan05_noComb']]],
+ ['mu20_msonly_mu10noL1_msonly_nscan05_noComb_L1MU4_UNPAIRED_NONISO','L1_MU4_UNPAIRED_NONISO', ['L1_MU20','L2_mu20_msonly'], ["Late"], ['RATE:MultiMuon','BW:Muon'], -1,['serial',-1,['mu20_msonly','mu6noL1_msonly_nscan05_noComb']]],
# exclusive di-lep
@@ -181,6 +183,9 @@ def setupMenu():
['mu20_iloose_L1MU15', 'L1_MU15', [], [PhysicsStream], ['RATE:SingleMuon', 'BW:Muon'], -1],
['mu20_imedium_L1MU15', 'L1_MU15', [], [PhysicsStream], ['RATE:SingleMuon', 'BW:Muon'], -1],
['mu20_ivarmedium_L1MU15', 'L1_MU15', [], [PhysicsStream], ['RATE:SingleMuon', 'BW:Muon'], -1],
+
+ #Delayed Bphys item, needs to be in muon slice: ATR-14367
+ ['3mu4_nomucomb_delayed', 'L1_3MU4', [], ['BphysDelayed'], ['RATE:BphysDelayed', 'BW:Bphys'], -1],
]
TriggerFlags.JetSlice.signatures = [
@@ -439,9 +444,9 @@ def setupMenu():
['2j40_0eta490_invm400', 'L1_MJJ-400', [], [PhysicsStream], ['RATE:MultiJet', 'BW:Jet'], -1],
# Delayed stream: ATR-14091
- ['j0_0i1c500m900TLA_delayed', 'L1_J100', [], ['ExoDelayed'], ['RATE:MultiJet', 'BW:Jet'], -1],
- ['j0_1i2c200m8000TLA_delayed', 'L1_J100', [], ['ExoDelayed'], ['RATE:MultiJet', 'BW:Jet'], -1],
- ['j0_0i1c500m2000TLA_delayed', 'L1_J100', [], ['ExoDelayed'], ['RATE:MultiJet', 'BW:Jet'], -1],
+ ['j0_0i1c500m900TLA_delayed', 'L1_J100', [], ['ExoDelayed'], ['RATE:ExoDelayed', 'BW:Jet'], -1],
+ ['j0_1i2c200m8000TLA_delayed', 'L1_J100', [], ['ExoDelayed'], ['RATE:ExoDelayed', 'BW:Jet'], -1],
+ ['j0_0i1c500m2000TLA_delayed', 'L1_J100', [], ['ExoDelayed'], ['RATE:ExoDelayed', 'BW:Jet'], -1],
]
TriggerFlags.BjetSlice.signatures = [
@@ -764,7 +769,49 @@ def setupMenu():
['xe45', 'L1_XE45',[], [PhysicsStream], ['RATE:MET', 'BW:MET'], -1],
['xe100_wEFMu_L1XE35', 'L1_XE35',[], [PhysicsStream], ['RATE:MET', 'BW:MET'], -1],
- ]
+
+
+
+ ['xe100_mht_wEFMu_L1XE55','L1_XE55',[], [PhysicsStream], ['RATE:MET', 'BW:MET'], -1],
+ ['xe110_mht_wEFMu_L1XE55','L1_XE55',[], [PhysicsStream], ['RATE:MET', 'BW:MET'], -1],
+ ['xe120_tc_lcw_wEFMu_L1XE55','L1_XE55',[], [PhysicsStream], ['RATE:MET', 'BW:MET'], -1],
+ ['xe130_tc_lcw_wEFMu_L1XE55','L1_XE55',[], [PhysicsStream], ['RATE:MET', 'BW:MET'], -1],
+ ['xe120_tc_em_wEFMu_L1XE55','L1_XE55',[], [PhysicsStream], ['RATE:MET', 'BW:MET'], -1],
+ ['xe130_tc_em_wEFMu_L1XE55','L1_XE55',[], [PhysicsStream], ['RATE:MET', 'BW:MET'], -1],
+ ['xe120_tc_em_L1XE55','L1_XE55',[], [PhysicsStream], ['RATE:MET', 'BW:MET'], -1],
+ ['xe130_tc_em_L1XE55','L1_XE55',[], [PhysicsStream], ['RATE:MET', 'BW:MET'], -1],
+ ['xe140_pufit_L1XE55','L1_XE55',[], [PhysicsStream], ['RATE:MET', 'BW:MET'], -1],
+ ['xe130_pufit_wEFMu_L1XE50','L1_XE50',[], [PhysicsStream], ['RATE:MET', 'BW:MET'], -1],
+ ['xe130_pufit_wEFMu_L1XE55','L1_XE55',[], [PhysicsStream], ['RATE:MET', 'BW:MET'], -1],
+ ['xe140_pufit_wEFMu_L1XE50','L1_XE50',[], [PhysicsStream], ['RATE:MET', 'BW:MET'], -1],
+ ['xe130_pueta_wEFMu_L1XE50','L1_XE50',[], [PhysicsStream], ['RATE:MET', 'BW:MET'], -1],
+ ['xe130_pueta_wEFMu_L1XE55','L1_XE55',[], [PhysicsStream], ['RATE:MET', 'BW:MET'], -1],
+ ['xe100_wEFMu_L1XE55','L1_XE55',[], [PhysicsStream], ['RATE:MET', 'BW:MET'], -1],
+ ['xe120_mht_L1XE55','L1_XE55',[], [PhysicsStream], ['RATE:MET', 'BW:MET'], -1],
+ ['xe120_mht_wEFMu_L1XE55','L1_XE55',[], [PhysicsStream], ['RATE:MET', 'BW:MET'], -1],
+ ['xe140_tc_lcw_L1XE55','L1_XE55',[], [PhysicsStream], ['RATE:MET', 'BW:MET'], -1],
+ ['xe140_tc_lcw_wEFMu_L1XE55','L1_XE55',[], [PhysicsStream], ['RATE:MET', 'BW:MET'], -1],
+ ['xe130_tc_em_L1XE50','L1_XE50',[], [PhysicsStream], ['RATE:MET', 'BW:MET'], -1],
+ ['xe140_tc_em_L1XE50','L1_XE50',[], [PhysicsStream], ['RATE:MET', 'BW:MET'], -1],
+ ['xe140_tc_em_L1XE55','L1_XE55',[], [PhysicsStream], ['RATE:MET', 'BW:MET'], -1],
+ ['xe130_tc_em_wEFMu_L1XE50','L1_XE50',[], [PhysicsStream], ['RATE:MET', 'BW:MET'], -1],
+ ['xe140_tc_em_wEFMu_L1XE50','L1_XE50',[], [PhysicsStream], ['RATE:MET', 'BW:MET'], -1],
+ ['xe140_tc_em_wEFMu_L1XE55','L1_XE55',[], [PhysicsStream], ['RATE:MET', 'BW:MET'], -1],
+ ['xe150_pufit_L1XE50','L1_XE50',[], [PhysicsStream], ['RATE:MET', 'BW:MET'], -1],
+ ['xe150_pufit_L1XE55','L1_XE55',[], [PhysicsStream], ['RATE:MET', 'BW:MET'], -1],
+ ['xe140_pufit_wEFMu_L1XE55','L1_XE55',[], [PhysicsStream], ['RATE:MET', 'BW:MET'], -1],
+ ['xe150_pufit_wEFMu_L1XE50','L1_XE50',[], [PhysicsStream], ['RATE:MET', 'BW:MET'], -1],
+ ['xe150_pufit_wEFMu_L1XE55','L1_XE55',[], [PhysicsStream], ['RATE:MET', 'BW:MET'], -1],
+ ['xe140_pueta_L1XE55','L1_XE55',[], [PhysicsStream], ['RATE:MET', 'BW:MET'], -1],
+ ['xe150_pueta_L1XE50','L1_XE50',[], [PhysicsStream], ['RATE:MET', 'BW:MET'], -1],
+ ['xe150_pueta_L1XE55','L1_XE55',[], [PhysicsStream], ['RATE:MET', 'BW:MET'], -1],
+ ['xe140_pueta_wEFMu_L1XE50','L1_XE50',[], [PhysicsStream], ['RATE:MET', 'BW:MET'], -1],
+ ['xe140_pueta_wEFMu_L1XE55','L1_XE55',[], [PhysicsStream], ['RATE:MET', 'BW:MET'], -1],
+ ['xe150_pueta_wEFMu_L1XE50','L1_XE50',[], [PhysicsStream], ['RATE:MET', 'BW:MET'], -1],
+ ['xe150_pueta_wEFMu_L1XE55','L1_XE55',[], [PhysicsStream], ['RATE:MET', 'BW:MET'], -1],
+ ['xe120_wEFMu_L1XE55','L1_XE55',[], [PhysicsStream], ['RATE:MET', 'BW:MET'], -1],
+
+ ]
TriggerFlags.TauSlice.signatures = [
# Energy calibration chain
@@ -1241,8 +1288,10 @@ def setupMenu():
['2g22_tight_L1EM7_EMPTY', 'L1_EM7_EMPTY', [], ["Late"], ['RATE:MultiPhoton', 'BW:Egamma'], -1],
['2g22_tight_L1EM7_UNPAIRED_ISO', 'L1_EM7_UNPAIRED_ISO', [], ["Late"], ['RATE:MultiPhoton', 'BW:Egamma'], -1],
+ ['2g22_tight_L1EM7_UNPAIRED_NONISO', 'L1_EM7_UNPAIRED_NONISO', [], ["Late"], ['RATE:MultiPhoton', 'BW:Egamma'], -1],
['2g50_tight_L1EM7_EMPTY', 'L1_EM7_EMPTY', [], ["Late"], ['RATE:MultiPhoton', 'BW:Egamma'], -1],
['2g50_tight_L1EM7_UNPAIRED_ISO', 'L1_EM7_UNPAIRED_ISO', [], ["Late"], ['RATE:MultiPhoton', 'BW:Egamma'], -1],
+ ['2g50_tight_L1EM7_UNPAIRED_NONISO', 'L1_EM7_UNPAIRED_NONISO', [], ["Late"], ['RATE:MultiPhoton', 'BW:Egamma'], -1],
# L1Topo W T&P
['e13_etcut_trkcut_L1EM12', 'L1_EM12', [], [PhysicsStream], ['RATE:SingleElectron', 'BW:Egamma'], -1],
@@ -1365,6 +1414,14 @@ def setupMenu():
['2mu10_bDimu_noL2', 'L1_2MU10', [], [PhysicsStream], ['RATE:Bphysics','BW:Bphys'], -1],
['2mu10_bJpsimumu_noL2', 'L1_2MU10', [], [PhysicsStream], ['RATE:Bphysics','BW:Bphys'], -1],
+ ['2mu10_bBmumuxv2', 'L1_2MU10', [], [PhysicsStream], ['RATE:Bphysics','BW:Bphys'], -1],
+ ['2mu10_bBmumux_BcmumuDsloose', 'L1_2MU10', [], [PhysicsStream], ['RATE:Bphysics','BW:Bphys'], -1],
+ ['2mu10_bDimu', 'L1_2MU10', [], [PhysicsStream], ['RATE:Bphysics','BW:Bphys'], -1],
+ ['2mu10_bDimu_novtx_noos', 'L1_2MU10', [], [PhysicsStream], ['RATE:Bphysics','BW:Bphys'], -1],
+ ['2mu10_bJpsimumu', 'L1_2MU10', [], [PhysicsStream], ['RATE:Bphysics','BW:Bphys'], -1],
+ ['2mu10_bUpsimumu', 'L1_2MU10', [], [PhysicsStream], ['RATE:Bphysics','BW:Bphys'], -1],
+
+
['mu11_nomucomb_2mu4noL1_nscan03_L1MU11_2MU6_bTau', 'L1_MU11_2MU6', ['L1_MU11','L2_mu11_nomucomb'], [PhysicsStream, 'express'], ['RATE:Bphysics','BW:Bphys'], -1,['serial',-1,['mu11_nomucomb','2mu4noL1_nscan03']]],
['mu11_nomucomb_mu6noL1_nscan03_L1MU11_2MU6_bTau', 'L1_MU11_2MU6', ['L1_MU11','L2_mu6_nomucomb'], [PhysicsStream], ['RATE:Bphysics','BW:Bphys'], -1,['serial',-1,['mu11_nomucomb','mu6noL1_nscan03']]],
['mu20_l2idonly_mu6noL1_nscan03_bTau', 'L1_MU20', ['L1_MU20','L2_mu20_l2idonly'], [PhysicsStream], ['RATE:Bphysics','BW:Bphys'], -1,['serial',-1,['mu20_l2idonly','mu6noL1_nscan03']]],
@@ -1382,31 +1439,31 @@ def setupMenu():
['mu4_iloose_mu4_7invm9_noos_novtx_L1MU6_2MU4', 'L1_MU6_2MU4', ['L1_MU4','L1_MU4'], [PhysicsStream], ['RATE:Bphysics','BW:Bphys'], -1],
#Delayed stream ATR-14091
- ['mu6_mu4_bBmumuxv2_delayed', 'L1_MU6_2MU4', ['L1_MU6','L1_MU4'], ['BphysDelayed'], ['RATE:Bphysics','BW:Bphys'], -1],
- ['mu6_mu4_bBmumux_BcmumuDsloose_delayed', 'L1_MU6_2MU4', ['L1_MU6','L1_MU4'], ['BphysDelayed'], ['RATE:Bphysics','BW:Bphys'], -1],
- ['mu6_mu4_bJpsimumu_delayed', 'L1_MU6_2MU4', ['L1_MU6','L1_MU4'], ['BphysDelayed'], ['RATE:Bphysics','BW:Bphys'], -1],
- ['mu6_mu4_bJpsimumu_Lxy0_delayed', 'L1_MU6_2MU4', ['L1_MU6','L1_MU4'], ['BphysDelayed'], ['RATE:Bphysics','BW:Bphys'], -1],
- ['mu6_mu4_bUpsimumu_delayed', 'L1_MU6_2MU4', ['L1_MU6','L1_MU4'], ['BphysDelayed'], ['RATE:Bphysics','BW:Bphys'], -1],
- ['2mu6_bBmumuxv2_delayed', 'L1_2MU6', [], ['BphysDelayed'], ['RATE:Bphysics','BW:Bphys'], -1],
- ['2mu6_bBmumux_BcmumuDsloose_delayed', 'L1_2MU6', [], ['BphysDelayed'], ['RATE:Bphysics','BW:Bphys'], -1],
- ['2mu6_bJpsimumu_delayed', 'L1_2MU6', [], ['BphysDelayed'], ['RATE:Bphysics','BW:Bphys'], -1],
- ['2mu6_bJpsimumu_Lxy0_delayed', 'L1_2MU6', [], ['BphysDelayed'], ['RATE:Bphysics','BW:Bphys'], -1],
- ['2mu6_bUpsimumu_delayed', 'L1_2MU6', [], ['BphysDelayed'], ['RATE:Bphysics','BW:Bphys'], -1],
- ['mu10_mu6_bBmumuxv2_delayed', 'L1_MU10_2MU6', ['L1_MU10','L1_MU6'], ['BphysDelayed'], ['RATE:Bphysics','BW:Bphys'], -1],
- ['mu10_mu6_bBmumux_BcmumuDsloose_delayed', 'L1_MU10_2MU6', ['L1_MU10','L1_MU6'], ['BphysDelayed'], ['RATE:Bphysics','BW:Bphys'], -1],
- ['mu10_mu6_bJpsimumu_delayed', 'L1_MU10_2MU6', ['L1_MU10','L1_MU6'], ['BphysDelayed'], ['RATE:Bphysics','BW:Bphys'], -1],
- ['mu10_mu6_bJpsimumu_Lxy0_delayed', 'L1_MU10_2MU6', ['L1_MU10','L1_MU6'], ['BphysDelayed'], ['RATE:Bphysics','BW:Bphys'], -1],
- ['mu10_mu6_bUpsimumu_delayed', 'L1_MU10_2MU6', ['L1_MU10','L1_MU6'], ['BphysDelayed'], ['RATE:Bphysics','BW:Bphys'], -1],
- ['3mu4_bJpsi_delayed', 'L1_3MU4', [], ['BphysDelayed'], ['RATE:Bphysics','BW:Bphys'], -1],
- ['3mu4_bUpsi_delayed', 'L1_3MU4', [], ['BphysDelayed'], ['RATE:Bphysics','BW:Bphys'], -1],
- ['mu6_2mu4_bJpsi_delayed', 'L1_MU6_3MU4', ['L1_MU6','L1_3MU4'], ['BphysDelayed'], ['RATE:Bphysics', 'BW:Bphys'], -1],
- ['mu6_2mu4_bUpsi_delayed', 'L1_MU6_3MU4', ['L1_MU6','L1_3MU4'], ['BphysDelayed'], ['RATE:Bphysics', 'BW:Bphys'], -1],
- ['mu11_nomucomb_mu6noL1_nscan03_L1MU11_2MU6_bTau_delayed', 'L1_MU11_2MU6', ['L1_MU11','L2_mu6_nomucomb'], ['BphysDelayed'], ['RATE:Bphysics','BW:Bphys'], -1,['serial',-1,['mu11_nomucomb','mu6noL1_nscan03']]],
- ['2mu10_bBmumux_BcmumuDsloose_delayed', 'L1_2MU10', [], ['BphysDelayed'], ['RATE:Bphysics','BW:Bphys'], -1],
- ['2mu10_bJpsimumu_delayed', 'L1_2MU10', [], ['BphysDelayed'], ['RATE:Bphysics','BW:Bphys'], -1],
- ['2mu10_bUpsimumu_delayed', 'L1_2MU10', [], ['BphysDelayed'], ['RATE:Bphysics','BW:Bphys'], -1],
- ['2mu10_bBmumuxv2_delayed', 'L1_2MU10', [], ['BphysDelayed'], ['RATE:Bphysics','BW:Bphys'], -1],
- ['3mu4_nomucomb_delayed', 'L1_3MU4', [], ['BphysDelayed'], ['RATE:Bphysics', 'BW:Bphys'], -1],
+ ['mu6_mu4_bBmumuxv2_delayed', 'L1_MU6_2MU4', ['L1_MU6','L1_MU4'], ['BphysDelayed'], ['RATE:BphysDelayed','BW:Bphys'], -1],
+ ['mu6_mu4_bBmumux_BcmumuDsloose_delayed', 'L1_MU6_2MU4', ['L1_MU6','L1_MU4'], ['BphysDelayed'], ['RATE:BphysDelayed','BW:Bphys'], -1],
+ ['mu6_mu4_bJpsimumu_delayed', 'L1_MU6_2MU4', ['L1_MU6','L1_MU4'], ['BphysDelayed'], ['RATE:BphysDelayed','BW:Bphys'], -1],
+ ['mu6_mu4_bJpsimumu_Lxy0_delayed', 'L1_MU6_2MU4', ['L1_MU6','L1_MU4'], ['BphysDelayed'], ['RATE:BphysDelayed','BW:Bphys'], -1],
+ ['mu6_mu4_bUpsimumu_delayed', 'L1_MU6_2MU4', ['L1_MU6','L1_MU4'], ['BphysDelayed'], ['RATE:BphysDelayed','BW:Bphys'], -1],
+ ['2mu6_bBmumuxv2_delayed', 'L1_2MU6', [], ['BphysDelayed'], ['RATE:BphysDelayed','BW:Bphys'], -1],
+ ['2mu6_bBmumux_BcmumuDsloose_delayed', 'L1_2MU6', [], ['BphysDelayed'], ['RATE:BphysDelayed','BW:Bphys'], -1],
+ ['2mu6_bJpsimumu_delayed', 'L1_2MU6', [], ['BphysDelayed'], ['RATE:BphysDelayed','BW:Bphys'], -1],
+ ['2mu6_bJpsimumu_Lxy0_delayed', 'L1_2MU6', [], ['BphysDelayed'], ['RATE:BphysDelayed','BW:Bphys'], -1],
+ ['2mu6_bUpsimumu_delayed', 'L1_2MU6', [], ['BphysDelayed'], ['RATE:BphysDelayed','BW:Bphys'], -1],
+ ['mu10_mu6_bBmumuxv2_delayed', 'L1_MU10_2MU6', ['L1_MU10','L1_MU6'], ['BphysDelayed'], ['RATE:BphysDelayed','BW:Bphys'], -1],
+ ['mu10_mu6_bBmumux_BcmumuDsloose_delayed', 'L1_MU10_2MU6', ['L1_MU10','L1_MU6'], ['BphysDelayed'], ['RATE:BphysDelayed','BW:Bphys'], -1],
+ ['mu10_mu6_bJpsimumu_delayed', 'L1_MU10_2MU6', ['L1_MU10','L1_MU6'], ['BphysDelayed'], ['RATE:BphysDelayed','BW:Bphys'], -1],
+ ['mu10_mu6_bJpsimumu_Lxy0_delayed', 'L1_MU10_2MU6', ['L1_MU10','L1_MU6'], ['BphysDelayed'], ['RATE:BphysDelayed','BW:Bphys'], -1],
+ ['mu10_mu6_bUpsimumu_delayed', 'L1_MU10_2MU6', ['L1_MU10','L1_MU6'], ['BphysDelayed'], ['RATE:BphysDelayed','BW:Bphys'], -1],
+ ['3mu4_bJpsi_delayed', 'L1_3MU4', [], ['BphysDelayed'], ['RATE:BphysDelayed','BW:Bphys'], -1],
+ ['3mu4_bUpsi_delayed', 'L1_3MU4', [], ['BphysDelayed'], ['RATE:BphysDelayed','BW:Bphys'], -1],
+ ['mu6_2mu4_bJpsi_delayed', 'L1_MU6_3MU4', ['L1_MU6','L1_3MU4'], ['BphysDelayed'], ['RATE:BphysDelayed', 'BW:Bphys'], -1],
+ ['mu6_2mu4_bUpsi_delayed', 'L1_MU6_3MU4', ['L1_MU6','L1_3MU4'], ['BphysDelayed'], ['RATE:BphysDelayed', 'BW:Bphys'], -1],
+ ['mu11_nomucomb_mu6noL1_nscan03_L1MU11_2MU6_bTau_delayed', 'L1_MU11_2MU6', ['L1_MU11','L2_mu6_nomucomb'], ['BphysDelayed'], ['RATE:BphysDelayed','BW:Bphys'], -1,['serial',-1,['mu11_nomucomb','mu6noL1_nscan03']]],
+ ## clashing with another chain (the same but with "bTau" and without "delayed" in it). commenting while trying to fix: ['mu6_nomucomb_2mu4_nomucomb_L1MU6_3MU4_delayed', 'L1_MU6_3MU4', ['L1_MU6','L1_2MU4'], ['BphysDelayed'], ['RATE:BphysDelayed','BW:Bphys'], -1],
+ ['2mu10_bBmumux_BcmumuDsloose_delayed', 'L1_2MU10', [], ['BphysDelayed'], ['RATE:BphysDelayed','BW:Bphys'], -1],
+ ['2mu10_bJpsimumu_delayed', 'L1_2MU10', [], ['BphysDelayed'], ['RATE:BphysDelayed','BW:Bphys'], -1],
+ ['2mu10_bUpsimumu_delayed', 'L1_2MU10', [], ['BphysDelayed'], ['RATE:BphysDelayed','BW:Bphys'], -1],
+ ['2mu10_bBmumuxv2_delayed', 'L1_2MU10', [], ['BphysDelayed'], ['RATE:BphysDelayed','BW:Bphys'], -1],
]
TriggerFlags.CombinedSlice.signatures = [
@@ -1567,6 +1624,7 @@ def setupMenu():
['j30_muvtx_noiso', 'L1_2MU10', [], [PhysicsStream], ['RATE:MuonJet','BW:Muon', 'BW:Jet'], -1],
['j30_muvtx_L1MU6_EMPTY', 'L1_MU6_EMPTY', [], ["Late"], ['RATE:MuonJet','BW:Muon', 'BW:Jet'], -1],
['j30_muvtx_L1MU4_UNPAIRED_ISO', 'L1_MU4_UNPAIRED_ISO', [], ["Late"], ['RATE:MuonJet','BW:Muon', 'BW:Jet'], -1],
+ ['j30_muvtx_L1MU4_UNPAIRED_NONISO', 'L1_MU4_UNPAIRED_NONISO', [], ["Late"], ['RATE:MuonJet','BW:Muon', 'BW:Jet'], -1],
# LLP trigger seeded by TAU items
['j30_jes_PS_llp_L1TAU60', 'L1_TAU60', [], [PhysicsStream], ['RATE:SingleJet', 'BW:Jet'], -1],
@@ -1574,6 +1632,8 @@ def setupMenu():
['j30_jes_cleanLLP_PS_llp_L1TAU60', 'L1_TAU60', [], [PhysicsStream], ['RATE:SingleJet', 'BW:Jet'], -1],
['j30_jes_cleanLLP_PS_llp_L1TAU8_EMPTY', 'L1_TAU8_EMPTY', [], ["Late"], ['RATE:SingleJet', 'BW:Jet'], -1],
['j30_jes_cleanLLP_PS_llp_L1TAU8_UNPAIRED_ISO', 'L1_TAU8_UNPAIRED_ISO', [], ["Late"], ['RATE:SingleJet', 'BW:Jet'], -1],
+ ['j30_jes_cleanLLP_PS_llp_L1TAU8_UNPAIRED_NONISO', 'L1_TAU8_UNPAIRED_NONISO', [], ["Late"], ['RATE:SingleJet', 'BW:Jet'], -1],
+
['j30_jes_cleanLLP_PS_llp_L1TAU30_EMPTY', 'L1_TAU30_EMPTY', [], ["Late"], ['RATE:SingleJet', 'BW:Jet'], -1],
['j30_jes_cleanLLP_PS_llp_L1TAU30_UNPAIRED_ISO', 'L1_TAU30_UNPAIRED_ISO', [], ["Late"], ['RATE:SingleJet', 'BW:Jet'], -1],
@@ -1581,17 +1641,20 @@ def setupMenu():
['j30_jes_cleanLLP_PS_llp_noiso_L1TAU60', 'L1_TAU60', [], [PhysicsStream], ['RATE:SingleJet', 'BW:Jet'], -1],
['j30_jes_cleanLLP_PS_llp_noiso_L1TAU8_EMPTY', 'L1_TAU8_EMPTY', [], ["Late"], ['RATE:SingleJet', 'BW:Jet'], -1],
- ['j30_jes_cleanLLP_PS_llp_noiso_L1TAU8_UNPAIRED_ISO', 'L1_TAU8_EMPTY', [], ["Late"], ['RATE:SingleJet', 'BW:Jet'], -1],
+ ['j30_jes_cleanLLP_PS_llp_noiso_L1TAU8_UNPAIRED_ISO', 'L1_TAU8_UNPAIRED_ISO', [], ["Late"], ['RATE:SingleJet', 'BW:Jet'], -1],
+ ['j30_jes_cleanLLP_PS_llp_noiso_L1TAU8_UNPAIRED_NONISO', 'L1_TAU8_UNPAIRED_NONISO', [], ["Late"], ['RATE:SingleJet', 'BW:Jet'], -1],
['j30_jes_cleanLLP_PS_llp_noiso_L1TAU30_EMPTY', 'L1_TAU30_EMPTY', [], ["Late"], ['RATE:SingleJet', 'BW:Jet'], -1],
- ['j30_jes_cleanLLP_PS_llp_noiso_L1TAU30_UNPAIRED_ISO', 'L1_TAU30_EMPTY', [], ["Late"], ['RATE:SingleJet', 'BW:Jet'], -1],
+ ['j30_jes_cleanLLP_PS_llp_noiso_L1TAU30_UNPAIRED_ISO', 'L1_TAU30_UNPAIRED_ISO', [], ["Late"], ['RATE:SingleJet', 'BW:Jet'], -1],
- ['j30_muvtx_noiso_L1MU6_EMPTY', 'L1_MU6_EMPTY', [], ["Late"], ['RATE:MuonJet','BW:Muon', 'BW:Jet'], -1],
+ ['j30_muvtx_noiso_L1MU6_EMPTY', 'L1_MU6_EMPTY', [], ["Late"], ['RATE:MuonJet','BW:Muon', 'BW:Jet'], -1],
['j30_muvtx_noiso_L1MU4_UNPAIRED_ISO', 'L1_MU4_UNPAIRED_ISO', [], ["Late"], ['RATE:MuonJet','BW:Muon', 'BW:Jet'], -1],
+ ['j30_muvtx_noiso_L1MU4_UNPAIRED_NONISO', 'L1_MU4_UNPAIRED_NONISO', [], ["Late"], ['RATE:MuonJet','BW:Muon', 'BW:Jet'], -1],
# LLP triggers
- ['g15_loose_2mu10_msonly_L1MU6_EMPTY', 'L1_MU6_EMPTY',['L1_EM8VH','L1_2MU10'], ["Late"], ['RATE:EgammaMuon', 'BW:Egamma','BW:Muon'],-1,['parallel',-1,[] ]],
+ ['g15_loose_2mu10_msonly_L1MU6_EMPTY', 'L1_MU6_EMPTY',['L1_EM8VH','L1_2MU10'], ["Late"], ['RATE:EgammaMuon', 'BW:Egamma','BW:Muon'],-1,['parallel',-1,[] ]],
['g15_loose_2mu10_msonly_L1MU4_UNPAIRED_ISO', 'L1_MU4_UNPAIRED_ISO',['L1_EM8VH','L1_2MU10'], ["Late"], ['RATE:EgammaMuon', 'BW:Egamma','BW:Muon'],-1,['parallel',-1,[] ]],
+ ['g15_loose_2mu10_msonly_L1MU4_UNPAIRED_NONISO', 'L1_MU4_UNPAIRED_NONISO',['L1_EM8VH','L1_2MU10'], ["Late"], ['RATE:EgammaMuon', 'BW:Egamma','BW:Muon'],-1,['parallel',-1,[] ]],
['j30_xe10_razor170', 'L1_2J15_XE55', ['',''], [PhysicsStream], ['RATE:JetMET', 'BW:Jet'], -1, ['serial',-1,['j30','xe10']]],
@@ -3154,6 +3217,43 @@ chain_list=[
'mb_sp900_trk60_hmt_L1TE10',
'mb_sp900_trk60_hmt_L1TE10.0ETA24',
'mb_sp900_trk65_hmt_L1MBTS_1_1',
+ 'mb_sp1200_pusup700_trk70_hmt_L1TE5',
+ 'mb_sp1400_pusup550_trk90_hmt_L1TE50',
+ 'mb_sp1400_pusup800_trk80_hmt_L1TE5',
+ 'mb_sp1400_trk100_hmt_L1TE40',
+ 'mb_sp1400_trk100_hmt_L1TE40.0ETA24',
+ 'mb_sp1500_hmtperf_L1TE50',
+ 'mb_sp1500_hmtperf_L1TE60',
+ 'mb_sp1600_pusup1100_trk90_hmt_L1TE10',
+ 'mb_sp1600_pusup1100_trk90_hmt_L1TE20',
+ 'mb_sp1600_pusup1100_trk90_hmt_L1TE30',
+ 'mb_sp1600_pusup1100_trk90_hmt_L1TE40',
+ 'mb_sp1600_pusup1100_trk90_hmt_L1TE50',
+ 'mb_sp1600_pusup1100_trk90_hmt_L1TE60',
+ 'mb_sp2000_pusup1200_trk100_hmt_L1TE10',
+ 'mb_sp2000_pusup1200_trk100_hmt_L1TE20',
+ 'mb_sp2000_pusup1200_trk100_hmt_L1TE30',
+ 'mb_sp2000_pusup1200_trk100_hmt_L1TE40',
+ 'mb_sp2000_pusup1200_trk100_hmt_L1TE50',
+ 'mb_sp2000_pusup1200_trk100_hmt_L1TE60',
+ 'mb_sp2100_hmtperf_L1TE10',
+ 'mb_sp2100_hmtperf_L1TE20',
+ 'mb_sp2200_pusup1300_trk110_hmt_L1TE20',
+ 'mb_sp2200_pusup1300_trk110_hmt_L1TE30',
+ 'mb_sp2200_pusup1300_trk110_hmt_L1TE40',
+ 'mb_sp2200_pusup1300_trk110_hmt_L1TE50',
+ 'mb_sp2200_pusup1300_trk110_hmt_L1TE60',
+ 'mb_sp2100_hmtperf_L1TE30',
+ 'mb_sp2100_hmtperf_L1TE40',
+ 'mb_sp2100_hmtperf_L1TE50',
+ 'mb_sp2100_hmtperf_L1TE60',
+ 'mb_sp2400_pusup1400_trk120_hmt_L1TE20',
+ 'mb_sp2400_pusup1400_trk120_hmt_L1TE30',
+ 'mb_sp2400_pusup1400_trk120_hmt_L1TE40',
+ 'mb_sp2400_pusup1400_trk120_hmt_L1TE50',
+ 'mb_sp2400_pusup1400_trk120_hmt_L1TE60',
+ 'mb_sp700_hmtperf_L1TE5',
+ 'mb_sp800_pusup400_trk50_hmt_L1TE5',
'mb_sptrk',
'mb_sptrk_L1RD0_EMPTY',
'mb_sptrk_L1RD0_UNPAIRED_ISO',
diff --git a/Trigger/TriggerCommon/TriggerMenu/python/menu/SignatureDicts.py b/Trigger/TriggerCommon/TriggerMenu/python/menu/SignatureDicts.py
index 831579a1d13c34432cd5f2a5b53ab0ec26f8f1b6..8a575a9fabb377eb7586ecd3ec63bab330cefbfb 100644
--- a/Trigger/TriggerCommon/TriggerMenu/python/menu/SignatureDicts.py
+++ b/Trigger/TriggerCommon/TriggerMenu/python/menu/SignatureDicts.py
@@ -65,7 +65,7 @@ AllowedTopos_bphys = ['bJpsi', 'bTau', 'bDimu',
'Trkloose', 'Zmumu', 'noL2', 'noEFbph',
'noinvm', 'ss', 'BpmumuKp',
'11invm24', '24invm60',
- 'tightChi2', 'Lxy0', 'Ftk']
+ 'tightChi2', 'Lxy0', 'Ftk','legacyVtx']
AllowedTopos_jet = ['muvtx',
'revllp',
'llp',
diff --git a/Trigger/TriggerCommon/TriggerMenu/python/minbias/MinBiasDef.py b/Trigger/TriggerCommon/TriggerMenu/python/minbias/MinBiasDef.py
index 25edb945d9b564ac0e59e527430c787b0626cb2d..969913fd717a81fbab96cdd7450a4dc2060f9da7 100644
--- a/Trigger/TriggerCommon/TriggerMenu/python/minbias/MinBiasDef.py
+++ b/Trigger/TriggerCommon/TriggerMenu/python/minbias/MinBiasDef.py
@@ -167,7 +167,7 @@ class L2EFChain_MB(L2EFChainDef):
theL2Fex = L2MbSpFex_SCTNoiseSup
elif doSpNcb:
# spacepoint halo trigger is SCT only
- theL2Fex = L2MbSpFex_noPix
+ theL2Fex = L2MbSpFex_ncb
chainSuffix = "sp_ncb"
elif doBLayer:
# pix occupancy trigger only counts the innermost pix layer