From 05339025cd6ff88102ffbe646cb8bc62c7bdad90 Mon Sep 17 00:00:00 2001
From: Nils Ruthmann <nils.ruthmann@cern.ch>
Date: Mon, 29 Aug 2016 10:53:08 +0200
Subject: [PATCH] set timeburner delay to 200ms by default
 (TriggerMenu-00-19-30)

	* Set timeburner delay to 200 ms by default
	* TriggerMenu-00-19-30
2016-08-24  Martin Rybar
	* Adding new vn and jet triggers (ATR-14212)
	* Affects HI_v4 menu only
	* requires TrigHIHypo-00-00-79
	* ht1000_L1J100 to JetCleanMonitoring (ATR-14906)
	* TriggerMenu-00-19-29

2016-08-24 Daniele Zanzi
        * SUSY Higgsino triggers in Physics v6 (ATR-14717)
	* TriggerMenu-00-19-28

2016-08-24 Daniele Zanzi
	* new L1topo tau chain for L1topo monitoring in Physics v6 (ATR-14349)
	* new Hbb VBF chains in Physics v6 (ATR-13526)
	* TriggerMenu-00-19-27

2016-08-18  Javier Montejo Berlingen
	* Add cell+mht xe triggers
...
(Long ChangeLog diff - truncated)


Former-commit-id: 7f751ab0df923e1a5aa666650a1c91c7f4a5557f
---
 .../bphysics/generateBPhysicsChainDefs.py     |  24 +
 .../python/calibcosmicmon/MonitorDef.py       |   2 +-
 .../python/egamma/EgammaCleanMonitoring.py    |  85 ++-
 .../python/heavyion/HeavyIonDef.py            |  16 +-
 .../python/jet/JetCleanMonitoring.py          |   1 +
 .../TriggerMenu/python/jet/JetDef.py          |   2 +-
 .../TriggerMenu/python/l1menu/ItemDef.py      |   6 +-
 .../python/l1menu/Menu_MC_pp_v6.py            |  67 ++-
 .../python/l1menu/Menu_Physics_HI_v4.py       |  47 +-
 .../TriggerMenu/python/l1menu/MonitorDef.py   |  17 +-
 .../TriggerMenu/python/menu/MC_HI_v4.py       |   6 +-
 .../TriggerMenu/python/menu/MC_pp_v6.py       | 106 ++--
 .../TriggerMenu/python/menu/MenuUtils.py      |  78 ++-
 .../TriggerMenu/python/menu/Physics_HI_v4.py  | 536 ++++++------------
 .../TriggerMenu/python/menu/Physics_pp_v6.py  | 238 +++++---
 .../TriggerMenu/python/menu/SignatureDicts.py |   9 +-
 .../TriggerMenu/python/muon/MuonDef.py        | 113 ++--
 .../python/tau/generateTauChainDefs.py        |  30 +-
 .../TriggerMenu/scripts/generateL1TopoMenu.py |   2 +-
 19 files changed, 732 insertions(+), 653 deletions(-)

diff --git a/Trigger/TriggerCommon/TriggerMenu/python/bphysics/generateBPhysicsChainDefs.py b/Trigger/TriggerCommon/TriggerMenu/python/bphysics/generateBPhysicsChainDefs.py
index b2670321719..ed398c1a8f3 100644
--- a/Trigger/TriggerCommon/TriggerMenu/python/bphysics/generateBPhysicsChainDefs.py
+++ b/Trigger/TriggerCommon/TriggerMenu/python/bphysics/generateBPhysicsChainDefs.py
@@ -625,6 +625,14 @@ def bBmumuxTopos(theChainDef,chainDict, inputTEsL2, inputTEsEF, topoStartFrom):
         L2TEname = L2TEname.replace("bBmumux_BpmumuKp","bBmumuxv2")
         if topo2StartFrom:
             topo2StartFrom = L2TEname
+    if 'BsmumuPhi' in topoAlgs:
+        L2TEname = L2TEname.replace("bBmumux_BsmumuPhi","bBmumuxv2")
+        if topo2StartFrom:
+            topo2StartFrom = L2TEname
+    if 'BsJpsiPhi' in topoAlgs:
+        L2TEname = L2TEname.replace("bBmumux_BsJpsiPhi","bBmumuxv2")
+        if topo2StartFrom:
+            topo2StartFrom = L2TEname
         
     if 'Ftk' in topoAlgs:
         from TrigInDetConf.TrigInDetFTKSequence import TrigInDetFTKSequence
@@ -655,6 +663,22 @@ def bBmumuxTopos(theChainDef,chainDict, inputTEsL2, inputTEsEF, topoStartFrom):
         #L2Fex = L2BMuMuXFex_BplusMuMuKplus()
         EFFex = EFBMuMuXFex_BplusMuMuKplus()
         EFHypo = EFBMuMuXHypo_BplusMuMuKplus()
+        
+    elif 'BsmumuPhi' in topoAlgs:
+        #from TrigBphysHypo.TrigL2BMuMuXFexConfig import L2BMuMuXFex_BplusMuMuKplus
+        from TrigBphysHypo.TrigEFBMuMuXFexConfig import EFBMuMuXFex_BsMuMuPhi
+        from TrigBphysHypo.TrigEFBMuMuXHypoConfig import EFBMuMuXHypo_BsMuMuPhi
+        #L2Fex = L2BMuMuXFex_BplusMuMuKplus()
+        EFFex = EFBMuMuXFex_BsMuMuPhi()
+        EFHypo = EFBMuMuXHypo_BsMuMuPhi()
+        
+    elif 'BsJpsiPhi' in topoAlgs:
+        #from TrigBphysHypo.TrigL2BMuMuXFexConfig import L2BMuMuXFex_BplusMuMuKplus
+        from TrigBphysHypo.TrigEFBMuMuXFexConfig import EFBMuMuXFex_BsJpsiPhi
+        from TrigBphysHypo.TrigEFBMuMuXHypoConfig import EFBMuMuXHypo_BsJpsiPhi
+        #L2Fex = L2BMuMuXFex_BplusMuMuKplus()
+        EFFex = EFBMuMuXFex_BsJpsiPhi()
+        EFHypo = EFBMuMuXHypo_BsJpsiPhi()
 
     elif 'Taumumux' in topoAlgs:
         #from TrigBphysHypo.TrigL2BMuMuXFexConfig import L2BMuMuXFex_TauMuMuX
diff --git a/Trigger/TriggerCommon/TriggerMenu/python/calibcosmicmon/MonitorDef.py b/Trigger/TriggerCommon/TriggerMenu/python/calibcosmicmon/MonitorDef.py
index 3a60d9f1604..7d7ebab44e4 100644
--- a/Trigger/TriggerCommon/TriggerMenu/python/calibcosmicmon/MonitorDef.py
+++ b/Trigger/TriggerCommon/TriggerMenu/python/calibcosmicmon/MonitorDef.py
@@ -195,7 +195,7 @@ class L2EFChain_Monitoring(L2EFChainDef):
     def setupTimeBurnerChain(self):
         from TrigGenericAlgs.TrigGenericAlgsConf import TimeBurner
         TimeBurner= TimeBurner("DummyTimeBurner")
-        TimeBurner.TimeDelay = 15
+        TimeBurner.TimeDelay = 200
         self.L2sequenceList += [[ self.L2InputTE,     
                                   [TimeBurner], 
                                   'L2_DummyTimeBurner']]
diff --git a/Trigger/TriggerCommon/TriggerMenu/python/egamma/EgammaCleanMonitoring.py b/Trigger/TriggerCommon/TriggerMenu/python/egamma/EgammaCleanMonitoring.py
index 9c244589643..a217a54bd2c 100644
--- a/Trigger/TriggerCommon/TriggerMenu/python/egamma/EgammaCleanMonitoring.py
+++ b/Trigger/TriggerCommon/TriggerMenu/python/egamma/EgammaCleanMonitoring.py
@@ -2,53 +2,48 @@
 
 
 EgammaChainsToKeepMonitoring={
-"g40_loose",
-"e12_loose",
-"2e12_loose_L12EM10VH",
-"e12_loose_L1EM10VH",
-"2e12_loose_mu10",
-"e12_loose_2mu10"
-"e24_lhmedium_L1EM18VH",
-"e24_lhmedium",
-"e24_medium_L1EM18VH",
-"e12_lhloose",
-"2e12_lhloose_L12EM10VH",
-"2e12_loose_L12EM10VH",
-"e24_lhmedium_idperf_L1EM20VH",
-"e24_medium_L1EM20VH",
-"e24_medium_idperf_L1EM20VH",
-"e24_medium_idperf",
-"e24_lhtight_L1EM20VH_e15_etcut_Zee",
-"e24_lhtight_L1EM20VH",
-"e15_etcut",
-"e5_lhtight_e4_etcut_Jpsiee",
-"e5_lhtight",
-"e4_etcut",
-"g120_loose",
+# ES triggers
+"e26_lhtight_nod0_ivarloose",
+"2e17_lhvloose_nod0",
+"e26_lhtight_nod0_e15_etcut_L1EM7_Zee",
+"e5_lhtight_nod0_e4_etcut_Jpsiee",
+"e26_lhtight_idperf",
+"g60_loose_L1EM15VH",
+"g140_loose",
+"g35_medium_g25_medium",
+# Combined items
 "g35_loose_g25_loose",
-"g35_loose",
+"2g22_tight",
+"3g20_loose",
+"e17_lhloose_nod0_2e10_lhloose_nod0_L1EM15VH_3EM8VH",
+"e17_lhloose_nod0_mu14",
+"e7_lhmedium_nod0_mu24",
+"e12_lhloose_nod0_2mu10",
+"2e12_lhloose_nod0_mu10",
+"e20_lhmedium_nod0_g35_loose",
+"e24_lhmedium_nod0_L1EM15VH_g25_medium",
+"e20_lhmedium_nod0_2g10_loose_L1EM15VH_3EM8VH",
+# Single items
+"e17_lhvloose_nod0",
+"e12_lhloose_nod0",
+"e60_lhmedium_nod0",
+"e140_lhloose_nod0",
+"g22_tight",
 "g25_loose",
-"e24_lhmedium_L1EM20VHI",
-"e24_medium_L1EM20VHI_mu8noL1",
-"e24_medium_L1EM15VH_g25_medium",
-"e24_medium_L1EM20VHI",
-"e24_medium_L1EM15VH",
-"e24_medium_iloose_L1EM18VH",
-"e24_medium_iloose_L1EM20VH",
-"e24_lhmedium_iloose_L1EM20VH",
-"e24_tight_iloose",
-"e24_lhtight_iloose",
-"e120_lhloose"
-"e10_etcut",
-"e12_etcut",
-"e15_etcut",
-"g12_etcut",
-"g18_etcut",
-"g20_etcut",
-"e15_loose",
-"e15_medium",
-"e15_lhloose",
-"e15_lhmedium",
+"g25_medium",
+"g35_loose",
+"g35_medium",
+"g140_loose",
+# Support triggers
+"e10_etcut_L1EM7",
+"e15_etcut_L1EM7",
+"e30_etcut_L1EM15",
+"e40_etcut_L1EM15",
+"e50_etcut_L1EM15",
+"e60_etcut",
+"e70_etcut",
+"e26_lhmedium_nod0_L1EM20VH",
+# HI
 "e10_etcut_ion",
 "e12_etcut_ion",
 "e15_etcut_ion",
diff --git a/Trigger/TriggerCommon/TriggerMenu/python/heavyion/HeavyIonDef.py b/Trigger/TriggerCommon/TriggerMenu/python/heavyion/HeavyIonDef.py
index c43f0ee74e6..f4d1e833341 100644
--- a/Trigger/TriggerCommon/TriggerMenu/python/heavyion/HeavyIonDef.py
+++ b/Trigger/TriggerCommon/TriggerMenu/python/heavyion/HeavyIonDef.py
@@ -125,7 +125,21 @@ class L2EFChain_HI(L2EFChainDef):
             th=int(ESth)
             ESDiHypo = [V2_th[th], V3_th[th]]
 
-        print "WTF", ESHypo, VetoHypo, ESDiHypo, " when making chain ", self.chainPart
+        elif 'v2A' == self.chainPart['eventShape']:
+            from TrigHIHypo.VnHypos import V2Assym
+            chainSuffix = 'v2A_th'+ESth
+            th=int(ESth)
+            ESHypo=V2Assym(th, 'A')
+
+        elif 'v2C' == self.chainPart['eventShape']:
+            from TrigHIHypo.VnHypos import V2Assym
+            chainSuffix = 'v2C_th'+ESth
+            th=int(ESth)
+            ESHypo=V2Assym(th, 'C')
+
+
+
+        #print "ERROR", ESHypo, VetoHypo, ESDiHypo, " when making chain ", self.chainPart
 
         from TrigHIHypo.UE import theUEMaker, theFSCellMaker
 
diff --git a/Trigger/TriggerCommon/TriggerMenu/python/jet/JetCleanMonitoring.py b/Trigger/TriggerCommon/TriggerMenu/python/jet/JetCleanMonitoring.py
index c4c4664fdaf..010b9661aa5 100644
--- a/Trigger/TriggerCommon/TriggerMenu/python/jet/JetCleanMonitoring.py
+++ b/Trigger/TriggerCommon/TriggerMenu/python/jet/JetCleanMonitoring.py
@@ -14,6 +14,7 @@ JetChainsToKeepMonitoring={
 "ht850",
 "ht850_L1J75",
 "ht850_L1J100",
+"ht1000_L1J100",
 #nice to keep for crosschecks, as used in DQ (offline monitoring):
 "5j60",
 "6j45",
diff --git a/Trigger/TriggerCommon/TriggerMenu/python/jet/JetDef.py b/Trigger/TriggerCommon/TriggerMenu/python/jet/JetDef.py
index 5d350f51931..428309a8d78 100644
--- a/Trigger/TriggerCommon/TriggerMenu/python/jet/JetDef.py
+++ b/Trigger/TriggerCommon/TriggerMenu/python/jet/JetDef.py
@@ -95,7 +95,7 @@ def _check_chainpart_consistency(chain_parts):
         the different chainParts"""
 
         to_remove = ['multiplicity', 'etaRange', 'threshold', 'chainPartName',
-                     'addInfo', 'bTag', 'bTracking', 'bConfig', 'topo', 'bMatching']
+                     'addInfo', 'bTag', 'bTracking', 'bConfig', 'topo', 'bMatching','extra']
         for tr in to_remove: 
             try:
                 del d[tr]
diff --git a/Trigger/TriggerCommon/TriggerMenu/python/l1menu/ItemDef.py b/Trigger/TriggerCommon/TriggerMenu/python/l1menu/ItemDef.py
index 3a9d887a728..c76ee3dc0bb 100755
--- a/Trigger/TriggerCommon/TriggerMenu/python/l1menu/ItemDef.py
+++ b/Trigger/TriggerCommon/TriggerMenu/python/l1menu/ItemDef.py
@@ -344,6 +344,7 @@ class ItemDef:
         LVL1MenuItem('L1_MU10_TAU12IM'     ).setLogic( MU10  & HA12IM        & physcond).setTriggerType( TT.calo )
         LVL1MenuItem('L1_MU10_TAU20'       ).setLogic( MU10  & HA20          & physcond).setTriggerType( TT.calo )
         LVL1MenuItem('L1_MU10_TAU20IM'     ).setLogic( MU10  & HA20IM        & physcond).setTriggerType( TT.calo )
+        LVL1MenuItem('L1_MU10_TAU20IM_J25_2J20'     ).setLogic( MU10  & HA20IM   & J25 & J20.x(2) & physcond).setTriggerType( TT.calo )
         LVL1MenuItem('L1_MU10_TAU20I'       ).setLogic( MU10  & HA20I        & physcond).setTriggerType( TT.calo )
         LVL1MenuItem('L1_TAU12I_MU10_J25'  ).setLogic( HA12I & MU10 & J25    & physcond).setTriggerType( TT.calo )
         LVL1MenuItem('L1_TAU12I_MU10_J25_2J12'  ).setLogic( HA12I & MU10 & J25 & J12.x(2)  & physcond).setTriggerType( TT.calo )
@@ -368,6 +369,7 @@ class ItemDef:
         LVL1MenuItem('L1_TAU20IL_2TAU12IL_XE35'        ).setLogic( HA20IL  & HA12IL.x(2)  & XE35 & physcond).setTriggerType( TT.calo )
         LVL1MenuItem('L1_TAU20IT_2TAU12IT_XE35'        ).setLogic( HA20IT  & HA12IT.x(2)  & XE35 & physcond).setTriggerType( TT.calo )
         LVL1MenuItem('L1_TAU20IM_2TAU12IM_XE40'        ).setLogic( HA20IM  & HA12IM.x(2)  & XE40 & physcond).setTriggerType( TT.calo )
+        LVL1MenuItem('L1_EM15HI_TAU20IM_2TAU15_J25_2J20_3J15'          ).setLogic( EM15HI  &  HA20IM  &  HA15.x(2) &  J25  & J20.x(2) & J15.x(3) & physcond).setTriggerType( TT.calo )
         LVL1MenuItem('L1_EM15HI_2TAU12I_XE35'          ).setLogic( EM15HI  & HA12I.x(2) & XE35 & physcond).setTriggerType( TT.calo )
         LVL1MenuItem('L1_EM15HI_2TAU12IM_XE35'         ).setLogic( EM15HI  & HA12IM.x(2) & XE35 & physcond).setTriggerType( TT.calo )
         LVL1MenuItem('L1_EM15HI_2TAU12IL_XE35'         ).setLogic( EM15HI  & HA12IL.x(2) & XE35 & physcond).setTriggerType( TT.calo )
@@ -511,6 +513,8 @@ class ItemDef:
         LVL1MenuItem('L1_MU10_3J20'  ).setLogic( MU10 & J20.x(3)  & physcond).setTriggerType(TT.calo)
         LVL1MenuItem('L1_MU10_2J20'  ).setLogic( MU10 & J20.x(2)  & physcond).setTriggerType(TT.calo)
         LVL1MenuItem('L1_MU10_2J15_J20'  ).setLogic( MU10 & J15.x(2) & J20  & physcond).setTriggerType(TT.calo)
+        LVL1MenuItem('L1_MU4_J50_XE40'   ).setLogic( MU4 & J50 & XE40  & physcond).setTriggerType(TT.calo)
+        LVL1MenuItem('L1_2MU4_J40_XE20'  ).setLogic( MU4.x(2) & J40 & XE20  & physcond).setTriggerType(TT.calo)
         # HI
         LVL1MenuItem('L1_J15_NZ' ).setLogic( J15      & Not(ZDC_AND) & physcond).setTriggerType(TT.calo)
         LVL1MenuItem('L1_2J15_NZ').setLogic( J15.x(2) & Not(ZDC_AND) & physcond).setTriggerType(TT.calo)   
@@ -804,7 +808,6 @@ class ItemDef:
         LVL1MenuItem('L1_AFP_C_AND').setLogic( (AFP_FSC & AFP_NSC) & physcond )
 
 
-
         # RANDOM
         LVL1MenuItem('L1_RD0_FILLED'         ).setLogic( RNDM0 & physcond           ).setTriggerType(TT.rand)
         LVL1MenuItem('L1_RD0_EMPTY'          ).setLogic( RNDM0 & cosmiccond         ).setTriggerType(TT.rand)
@@ -921,6 +924,7 @@ class ItemDef:
         LVL1MenuItem('L1_AFP_C_ZDC_C').setLogic( AFP_C & ZDC_C & physcond )
         LVL1MenuItem('L1_AFP_C_J12').setLogic( AFP_C & J12 & physcond )
         LVL1MenuItem('L1_AFP_C_EM3').setLogic( AFP_C & EM3 & physcond )
+        LVL1MenuItem('L1_AFP_C_MU4').setLogic( AFP_C & MU4 & physcond )
         LVL1MenuItem('L1_AFP_C_TE5').setLogic( AFP_C & TE5 & physcond )
         LVL1MenuItem('L1_AFP_C_ALFA_C').setLogic( AFP_C &  ALFA_C & physcond )
         LVL1MenuItem('L1_AFP_C_ALFA_A').setLogic( AFP_C &  ALFA_A & physcond )
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 eb47047e817..4cdd8d7ae75 100644
--- a/Trigger/TriggerCommon/TriggerMenu/python/l1menu/Menu_MC_pp_v6.py
+++ b/Trigger/TriggerCommon/TriggerMenu/python/l1menu/Menu_MC_pp_v6.py
@@ -90,7 +90,7 @@ def defineMenu():
         # 8 x TE
         #'TE3', 'TE5', 'TE10', 'TE15', 'TE20', 'TE25', 'TE30', 'TE40',
         #'TE5', 'TE30', 'TE40', 'TE45', 'TE50', 'TE55', 'TE60', 'TE65',
-        'TE5', 'TE10', 'TE20', 'TE30', 'TE40', 'TE50', 'TE60', 'TE70',
+        'TE5', 'TE10', 'TE15', 'TE20', 'TE25', 'TE30', 'TE40', 'TE70',
 
         # 8 x XE (for standard XE)
         #'XE35', 'XE40', 'XE45', 'XE50', 'XE55', 'XE60', 'XE70', 'XE80',
@@ -115,7 +115,7 @@ def defineMenu():
         # 8 x restricted eta range
         #'TE3.0ETA24', 'TE5.0ETA24','TE10.0ETA24', 'TE15.0ETA24', 'TE20.0ETA24', 'TE25.0ETA24', 'TE30.0ETA24', 'TE40.0ETA24',
         #'TE5.0ETA24', 'TE30.0ETA24','TE40.0ETA24', 'TE45.0ETA24', 'TE50.0ETA24', 'TE55.0ETA24', 'TE60.0ETA24', 'TE65.0ETA24',
-        'TE5.0ETA24', 'TE10.0ETA24','TE20.0ETA24', 'TE30.0ETA24', 'TE40.0ETA24', 'TE50.0ETA24', 'TE60.0ETA24', 'TE70.0ETA24',
+        'TE5.0ETA24', 'TE10.0ETA24', 'TE15.0ETA24', 'TE20.0ETA24', 'TE25.0ETA24', 'TE30.0ETA24', 'TE40.0ETA24', 'TE70.0ETA24',
 
         #------------------------
         # SLOT 9 / CON 0 (MUCTPi)
@@ -391,7 +391,7 @@ def defineMenu():
 
 
         # single tau
-        "L1_TAU12", "L1_TAU12IL",  "L1_TAU12IM",  "L1_TAU12IT", "L1_TAU20", "L1_TAU20IL", "L1_TAU20IM", "L1_TAU20IT", 
+        "L1_TAU12", "L1_TAU12IM",  "L1_TAU20", "L1_TAU20IM",
         "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_NONISO",
 
@@ -407,11 +407,11 @@ def defineMenu():
 #        "L1_MU10_TAU12_J25_2J12", 
 #        "L1_MU10_TAU20",
         "L1_MU10_TAU20IM",
+        "L1_MU10_TAU20IM_J25_2J20",	
 
         # combined tau - jet
 #        "L1_TAU25IT_2TAU12IT_2J25_3J12", 
 
-        "L1_TAU20IL_2TAU12IL_J25_2J20_3J12", 
         "L1_TAU20IM_2TAU12IM_J25_2J20_3J12", 
         'L1_J25_2J20_3J12_BOX-TAU20ITAU12I',  
         'L1_DR-MU10TAU12I_TAU12I-J25', 
@@ -425,7 +425,8 @@ def defineMenu():
         'L1_XE45_TAU20-J20',    
 
         #"L1_EM15HI_2TAU12I_XE35", 
-        "L1_EM15HI_2TAU12IM_XE35",  
+        "L1_EM15HI_2TAU12IM_XE35", 
+        "L1_EM15HI_TAU20IM_2TAU15_J25_2J20_3J15",	 
         'L1_XE35_EM15-TAU12I', 
         'L1_XE40_EM15-TAU12I', 
 
@@ -445,13 +446,14 @@ def defineMenu():
         'L1_EM13VH_3J20',
 
         # combined mu - jet
-        'L1_MU4_J12', 'L1_MU6_J20', 'L1_MU6_J30.0ETA49_2J20.0ETA49', 'L1_MU6_J40', 'L1_MU6_J75',
+        'L1_MU4_J12',  'L1_MU4_J50_XE40', 'L1_MU6_J20', 'L1_MU6_J30.0ETA49_2J20.0ETA49', 'L1_MU6_J40', 'L1_MU6_J75',
 #ATR-13743        'L1_MU4_J30',
         #'L1_MU4_J50',
         'L1_MU10_2J20','L1_MU10_3J20', 'L1_MU10_2J15_J20',
+        'L1_2MU4_J40_XE20',
 
         # single jet
-        "L1_J12","L1_J15","L1_J20","L1_J25", "L1_J30", "L1_J40", "L1_J50","L1_J75","L1_J85", "L1_J100", "L1_J120", "L1_J400",
+        "L1_J12","L1_J15","L1_J20","L1_J25", "L1_J30", "L1_J40", "L1_J50" ,"L1_J75","L1_J85", "L1_J100", "L1_J120", "L1_J400",
         "L1_J20.31ETA49", "L1_J30.31ETA49", "L1_J50.31ETA49", "L1_J75.31ETA49", "L1_J100.31ETA49",
         #'L1_J15.23ETA49',
          'L1_J15.31ETA49',
@@ -486,7 +488,7 @@ def defineMenu():
         "L1_5J15.0ETA25", 
         
         # combined jet
-        "L1_2J15_XE55", "L1_J40_XE50", "L1_J75_XE40", "L1_J75_XE50",
+        "L1_2J15_XE55", "L1_J40_XE50", "L1_J75_XE50",
 
         #'L1_2J40_XE45',
         "L1_2J50_XE40", "L1_J40_XE60","L1_J40.0ETA25_XE50",
@@ -494,20 +496,20 @@ def defineMenu():
         # XE
         "L1_XE35", "L1_XE40", "L1_XE45", "L1_XE50", 
         "L1_XE55", "L1_XE60", "L1_XE70", "L1_XE80",
-        'L1_XE10', 'L1_XE20', 'L1_XE25', 'L1_XE30', 'L1_XE65', 'L1_XE75', 'L1_XE150', 'L1_XE300',
+        'L1_XE10', 'L1_XE30', 'L1_XE65', 'L1_XE75', 'L1_XE150', 'L1_XE300',
         
         #XS
-        'L1_XS20', 'L1_XS30', 'L1_XS40', 'L1_XS50', 'L1_XS60',
+        'L1_XS20', 'L1_XS30',
         'L1_EM12_XS20', 'L1_EM15_XS30',
         
         # TE
         #"L1_TE3",        "L1_TE5",        "L1_TE10",        "L1_TE15",        "L1_TE20",        "L1_TE25",        "L1_TE30",        "L1_TE40",
         #"L1_TE5",        "L1_TE30",        "L1_TE40",        "L1_TE45",        "L1_TE50",        "L1_TE55",        "L1_TE60",        "L1_TE65",
-        "L1_TE5",        "L1_TE10",        "L1_TE20",        "L1_TE30",        "L1_TE40",        "L1_TE50",        "L1_TE60",        "L1_TE70",
+        "L1_TE5",        "L1_TE10",        "L1_TE15",   "L1_TE20",  "L1_TE25",  "L1_TE30",        "L1_TE40",      "L1_TE70",      
 
         #"L1_TE3.0ETA24", "L1_TE5.0ETA24", "L1_TE10.0ETA24", "L1_TE15.0ETA24", "L1_TE20.0ETA24", "L1_TE25.0ETA24", "L1_TE30.0ETA24", "L1_TE40.0ETA24", 
         #"L1_TE5.0ETA24", "L1_TE30.0ETA24", "L1_TE40.0ETA24", "L1_TE45.0ETA24", "L1_TE50.0ETA24", "L1_TE55.0ETA24", "L1_TE60.0ETA24", "L1_TE65.0ETA24", 
-        "L1_TE5.0ETA24", "L1_TE10.0ETA24", "L1_TE20.0ETA24", "L1_TE30.0ETA24", "L1_TE40.0ETA24", "L1_TE50.0ETA24", "L1_TE60.0ETA24", "L1_TE70.0ETA24", 
+        "L1_TE5.0ETA24", "L1_TE10.0ETA24", "L1_TE15.0ETA24", "L1_TE20.0ETA24", "L1_TE25.0ETA24", "L1_TE30.0ETA24", "L1_TE40.0ETA24","L1_TE70.0ETA24",
 
         # MBTS
         "L1_MBTS_1", "L1_MBTS_2", "L1_MBTS_1_1",
@@ -830,10 +832,14 @@ def defineMenu():
         'L1_AFP_C_TE5',
         'L1_AFP_C_ALFA_C',
         'L1_AFP_C_ALFA_A',
-        'L1_AFP_C_ANY_MBTS_A'
+        'L1_AFP_C_ANY_MBTS_A',
+        'L1_AFP_C_MU4'
         ]
     
     # the CTP ID mapping still has to be defined, currently it is taken from the order of the items
+    #Free slot [ATR-14858], 16-08-16
+    #[82,143,377,378,379,406,409,416,480]
+
     
     Lvl1Flags.CtpIdMap = {
         'L1_EM3' : 0,
@@ -884,13 +890,9 @@ def defineMenu():
         'L1_2EM8VH_MU10' : 43,
         'L1_EM15VH_MU10' : 44,
         'L1_TAU12' : 45,
-        'L1_TAU12IL' : 46,
         'L1_TAU12IM' : 47,
-        'L1_TAU12IT' : 48,
         'L1_TAU20' : 49,
-        'L1_TAU20IL' : 50,
         'L1_TAU20IM' : 51,
-        'L1_TAU20IT' : 52,
         'L1_TAU30' : 53,
         'L1_TAU40' : 54,
         'L1_TAU60' : 55,
@@ -908,7 +910,8 @@ def defineMenu():
         #        'L1_MU10_TAU12_J25_2J12' : 65,
 #        'L1_MU10_TAU20' : 66,
         'L1_MU10_TAU20IM' : 67,
-        'L1_TAU20IL_2TAU12IL_J25_2J20_3J12' : 69,
+        'L1_MU10_TAU20IM_J25_2J20' : 377,
+
         'L1_TAU20IM_2TAU12IM_J25_2J20_3J12' : 70,
         'L1_J25_2J20_3J12_BOX-TAU20ITAU12I' : 71,
         'L1_DR-MU10TAU12I_TAU12I-J25' : 72,
@@ -917,6 +920,7 @@ def defineMenu():
         'L1_TAU30_UNPAIRED_ISO' :343,
         'L1_XE45_TAU20-J20' : 77,
         'L1_EM15HI_2TAU12IM_XE35' : 78,
+        'L1_EM15HI_TAU20IM_2TAU15_J25_2J20_3J15' : 378,	
         'L1_XE35_EM15-TAU12I' : 79,
         'L1_XE40_EM15-TAU12I' : 80,
         'L1_MU10_TAU12IM_XE35' : 81,
@@ -926,9 +930,11 @@ def defineMenu():
 #        'L1_TAU20IM_2TAU12IM_XE40' : 85,
         'L1_EM15VH_JJ15.23ETA49' : 86,
         'L1_MU4_J12' : 87,
+        'L1_MU4_J50_XE40' : 330,
         'L1_MU6_J20' : 88,
         'L1_MU6_J40' : 89,
         'L1_MU6_J75' : 90,
+        'L1_2MU4_J40_XE20' : 331,
         'L1_J12' : 91,
         'L1_J15' : 92,
         'L1_J20' : 93,
@@ -982,16 +988,17 @@ def defineMenu():
 
        
         'L1_TE10' : 138,
+        'L1_TE15' : 82,
+        'L1_TE25' : 143,
 
         'L1_5J15.0ETA25' : 140,
         'L1_2J15_XE55' : 141,
         'L1_J40_XE50' : 142,
-        'L1_J75_XE40' : 143,
+        #'L1_J75_XE40' : 143,
         'L1_J75_XE50' : 133,
 
         'L1_XE10': 68,
-        'L1_XE20': 76,
-        'L1_XE25': 82,
+        #'L1_XE25': 82,
         'L1_XE30': 85,
         'L1_XE65': 108,
         'L1_XE75': 134,
@@ -1077,7 +1084,7 @@ def defineMenu():
         'L1_AFP_C_ALFA_C':193,
         'L1_AFP_C_ALFA_A':170,
         'L1_AFP_C_ANY_MBTS_A':174,
-        
+        'L1_AFP_C_MU4':379,   
         
 #        'L1_EM8I' : 183,
 #        'L1_EM15I': 184,
@@ -1302,10 +1309,12 @@ def defineMenu():
         'L1_3J25.0ETA23' : 373,
         'L1_TE20' : 374,
         'L1_TE10.0ETA24' : 375,
+        'L1_TE15.ETA24' : 406,
         'L1_TE20.0ETA24' : 376,
-        'L1_XS40' : 377,
-        'L1_XS50' : 378,
-        'L1_XS60' : 379,
+        'L1_TE25.0ETA24' : 409,
+        #'L1_XS40' : 377,
+        #'L1_XS50' : 378,
+        #'L1_XS60' : 379,
         'L1_J12_BGRP12' : 380,
         'L1_J30.31ETA49_BGRP12' : 381,
         'L1_MU6_J30.0ETA49_2J20.0ETA49' : 382,
@@ -1333,17 +1342,17 @@ def defineMenu():
         "L1_MU6_3MU4"  :403,
         "L1_2MU6_3MU4" :404,
         "L1_BGRP9"     :405,
-        'L1_TE50'       :406,
+        #'L1_TE50'       :406,
         'L1_TE5'       :407,
-        'L1_TE60'      :408,
-        'L1_TE50.0ETA24':409,
+        #'L1_TE60'      :408,
+        #'L1_TE50.0ETA24':409,
         'L1_TE5.0ETA24':410, 
         'L1_EM20VH_FIRSTEMPTY':411, 
         'L1_EM22VHI_FIRSTEMPTY':412, 
         'L1_MU20_FIRSTEMPTY':413, 
         'L1_J100_FIRSTEMPTY':414, 
         'L1_J100.31ETA49_FIRSTEMPTY':415, 
-        'L1_TE60.0ETA24':416, 
+        #'L1_TE60.0ETA24':416, 
         'L1_TE70.0ETA24':417, 
         'L1_TE40.0ETA24':418, 
 
diff --git a/Trigger/TriggerCommon/TriggerMenu/python/l1menu/Menu_Physics_HI_v4.py b/Trigger/TriggerCommon/TriggerMenu/python/l1menu/Menu_Physics_HI_v4.py
index 4aa0fc3dcad..b63e7275f59 100644
--- a/Trigger/TriggerCommon/TriggerMenu/python/l1menu/Menu_Physics_HI_v4.py
+++ b/Trigger/TriggerCommon/TriggerMenu/python/l1menu/Menu_Physics_HI_v4.py
@@ -31,7 +31,8 @@ def defineMenu():
         #-------------------------
         
         # 16 x EM
-        'EM7', 'EM8', 'EM8I', 'EM10', 'EM10VH', 'EM12', 'EM13VH', 'EM14', 'EM15', 'EM15HI', 'EM16', 'EM18', 'EM20', 'EM20VH', 'EM20VHI', 'EM22',
+        #'EM7', 'EM8', 'EM8I', 'EM10', 'EM10VH', 'EM12', 'EM13VH', 'EM14', 'EM15', 'EM15HI', 'EM16', 'EM18', 'EM20', 'EM20VH', 'EM20VHI', 'EM22',
+        'EM3','EM4','EM5','EM7', 'EM8', 'EM8I', 'EM10', 'EM10VH', 'EM12', 'EM13VH', 'EM14', 'EM15', 'EM15HI', 'EM16', 'EM20VH', 'EM20VHI',
         
         # 1 x ZB
         'ZB_J75', # Will double check if 'ZB_EM15' should be used for Run-2.
@@ -74,7 +75,7 @@ def defineMenu():
         # 24 x 1-bit thresholds
         
         # 8 x TE
-        'TE5', 'TE20', 'TE50', 'TE100', 'TE200', 'TE10000', 'TE12000', 'TE14000',
+        'TE5', 'TE10', 'TE20', 'TE50', 'TE60', 'TE70', 'TE100', 'TE200', 
         
         # 8 x XE
         'XE35', 'XE40', 'XE45', 'XE50', 'XE55', 'XE60', 'XE70', 'XE80',
@@ -168,17 +169,21 @@ def defineMenu():
         ]
 
     Lvl1Flags.items = [
+                       'L1_EM3',
+                       'L1_EM4',
+                       'L1_EM5',
                        'L1_EM7',
 		       'L1_EM8',
                        'L1_EM10',
                        'L1_EM12',
                        'L1_EM14',
                        'L1_EM16',
-                       'L1_EM18',
-		       'L1_EM20',
-	               'L1_EM22',
-                       'L1_2EM10',
-                       #'L1_2EM5',
+                       #'L1_EM18',
+		       #'L1_EM20',
+	               #'L1_EM22',
+                       #'L1_2EM10',
+                       'L1_2EM3',
+                       'L1_2EM5',
 		       'L1_2EM7',
                        # tau beam items
                        #'L1_TAU8',
@@ -252,13 +257,13 @@ def defineMenu():
                        #MET
                        #total energy
                        'L1_TE5',
+                       'L1_TE10',
                        'L1_TE20',
                        'L1_TE50',
+                       'L1_TE60',
+                       'L1_TE70',
                        'L1_TE100',
                        'L1_TE200', 
-                       'L1_TE10000',
-                       'L1_TE12000',
-		       'L1_TE14000',
                        'L1_TE5_NZ',
 		       'L1_TE5_VTE200',
 		       # restricted TE
@@ -493,8 +498,8 @@ def defineMenu():
                        ]
 
     Lvl1Flags.CtpIdMap = {
-	'L1_EM18' : 0,
-        'L1_EM22' : 1,
+	'L1_EM3' : 0,
+        'L1_EM5' : 1,
         'L1_EM7' : 2,
         'L1_EM10' : 3,
         'L1_EM12' : 4,
@@ -503,8 +508,8 @@ def defineMenu():
         'L1_RD0_UNPAIRED_NONISO' : 7,
         'L1_BCM_AC_CA_UNPAIRED_NONISO': 8,
         'L1_FJ10_UNPAIRED_NONISO' :  9,
-        'L1_2EM10' : 10,
-        #'L1_2EM5' : 11,
+        'L1_2EM3' : 10,
+        'L1_2EM5' : 11,
         'L1_MU0_VTE20' : 12,
         'L1_NIM_S8C2B21'            : 13,#DIRNIM
         'L1_NIM_S8C2B22'            : 14,#DIRNIM
@@ -566,7 +571,7 @@ def defineMenu():
         'L1_BCM_AC_CA_BGRP0' : 81,
         'L1_MBTSC1' : 82,
         'L1_J10_UNPAIRED' : 83,
-        'L1_EM20' : 84,
+        'L1_EM4' : 84,
         'L1_EM16' : 85,
         'L1_MBTSC0' : 86,
         'L1_J30_UNPAIRED' : 87,
@@ -613,17 +618,17 @@ def defineMenu():
         'L1_J30_FIRSTEMPTY' : 130,
         'L1_MBTSA2' : 131,
         'L1_TE5' : 132,
-        'L1_TE14000' : 133,
+        'L1_TE10' : 133,
         'L1_TE20' : 134,
-        'L1_TE50' : 138,
-        'L1_TE100' : 136,
-        'L1_TE200' : 135,
+        'L1_TE70' : 138,
+        'L1_TE60' : 136,
+        'L1_TE50' : 135,
         'L1_MBTSA3' : 137,
         
         'L1_2J5' : 139,
         'L1_2J10' : 140,
-        'L1_TE12000' : 141,
-	'L1_TE10000' : 142,
+        'L1_TE100' : 141,
+	'L1_TE200' : 142,
         'L1_2MU6_EMPTY' : 143,
         'L1_2MU6_FIRSTEMPTY' : 144,
         'L1_ZDC_MBTS_1' : 145,
diff --git a/Trigger/TriggerCommon/TriggerMenu/python/l1menu/MonitorDef.py b/Trigger/TriggerCommon/TriggerMenu/python/l1menu/MonitorDef.py
index a439b85f065..d1c27aabf51 100644
--- a/Trigger/TriggerCommon/TriggerMenu/python/l1menu/MonitorDef.py
+++ b/Trigger/TriggerCommon/TriggerMenu/python/l1menu/MonitorDef.py
@@ -140,19 +140,28 @@ class MonitorDef:
 
 
         monItems[TBP|TAP|TAV] = [
-            "L1_EM3","L1_EM12","L1_EM20VH","L1_EM20VHI","L1_EM22VHI",
+            "L1_EM3","L1_EM20VH","L1_EM22VHI",
             "L1_MU4","L1_MU10","L1_MU20",
             "L1_TAU12", "L1_TAU12IT", "L1_TAU20", "L1_TAU60",
             "L1_J12", "L1_J20", "L1_J100", "L1_J400", "L1_J20.31ETA49", "L1_J30.31ETA49",
-            "L1_XE35", "L1_XE80", "L1_XS20", "L1_XS60", "L1_TE20", "L1_TE20.0ETA24", "L1_TE50",
+            "L1_XE35", "L1_XE80", "L1_XS20", 
             "L1_MBTS_4_A", "L1_MBTS_4_C", "L1_MBTS_1", "L1_MBTS_2", "L1_MBTS_1_1",
             "L1_LUCID", "L1_LUCID_A_C_EMPTY", "L1_ALFA_ANY",
             "L1_ZDC_A", "L1_ZDC_C", "L1_ZDC_AND",
-            "L1_BTAG-MU4J30", "L1_3J15_BTAG-MU4J30", "L1_BPH-DR-2MU4-BO_BPH-4M8-2MU4-BO","L1_HT190-J15.ETA21","L1_JPSI-1M5-EM7","L1_J40_DPHI-J20XE50","L1_MJJ-100",
             "L1_BPTX0_BGRP0","L1_BPTX1_BGRP0",
-            "L1_LHCF",
             "L1_CALREQ2",
             "L1_AFP_NSC","L1_AFP_FSC",
+            "L1_BPH-2M8-2MU4","L1_BPH-2M8-MU6MU4_BPH-0DR15-MU6MU4","L1_BPH-2M9-2MU6_BPH-2DR15-2MU6",
+            "L1_MU6MU4-BO","L1_2MU4-B",
+            "L1_LFV-EM8I",
+            "L1_DY-BOX-2MU6",
+            "L1_LLP-NOMATCH",
+            "L1_DR-TAU20ITAU12I",
+            "L1_HT190-J15s5.ETA21",
+            "L1_3J15_BTAG-MU4J15",
+            "L1_MJJ-900",
+            "L1_J40_DPHI-J20s2XE50",
+            "L1_KF-XE55",
             ]
 
         monItemsHF[TBP|TAP|TAV] = [
diff --git a/Trigger/TriggerCommon/TriggerMenu/python/menu/MC_HI_v4.py b/Trigger/TriggerCommon/TriggerMenu/python/menu/MC_HI_v4.py
index f8d229dc072..ea931c2557f 100755
--- a/Trigger/TriggerCommon/TriggerMenu/python/menu/MC_HI_v4.py
+++ b/Trigger/TriggerCommon/TriggerMenu/python/menu/MC_HI_v4.py
@@ -98,11 +98,11 @@ Prescales.HLTPrescales_tight_mc_prescale = deepcopy(Prescales.HLTPrescales)
 Prescales.HLTPrescales_tight_mc_prescale.update({
         'mb_idperf_ion_L1MBTS_1'          : [    -1,    0,   -1],     
         'mb_idperf_ion_L1MBTS_1_1'        : [    -1,    0,   -1],
-        '2e10_loose_ion'                  : [    -1,    0,   -1],
+        ##'2e10_loose_ion'                  : [    -1,    0,   -1],
         'e10_etcut_ion'                   : [    -1,    0,   -1],
         'e10_etcut'                       : [    -1,    0,   -1],
-        'e12_etcut'                       : [    -1,    0,   -1],
-        'e12_etcut_ion'                   : [    -1,    0,   -1],
+        ##'e12_etcut'                       : [    -1,    0,   -1],
+        ##'e12_etcut_ion'                   : [    -1,    0,   -1],
         'e12_etcut_ion_L1EM10'            : [    -1,    0,   -1],
         })
 
diff --git a/Trigger/TriggerCommon/TriggerMenu/python/menu/MC_pp_v6.py b/Trigger/TriggerCommon/TriggerMenu/python/menu/MC_pp_v6.py
index 860205e26d2..ae8fca174a3 100755
--- a/Trigger/TriggerCommon/TriggerMenu/python/menu/MC_pp_v6.py
+++ b/Trigger/TriggerCommon/TriggerMenu/python/menu/MC_pp_v6.py
@@ -210,6 +210,9 @@ def setupMenu():
         ['j380_a10_lcw_sub_L1J100', 'L1_J100', [], [PhysicsStream], ['RATE:SingleJet', 'BW:Jet'], -1],
         ['j440_a10_lcw_sub_L1J100', 'L1_J100', [], [PhysicsStream], ['RATE:SingleJet', 'BW:Jet'], -1],
 
+        # trimming chains
+        #['j460_a10t_lcw_L1J100',  'L1_J100',    [], [PhysicsStream], ['Rate:SingleJet',  'BW:Jet'], -1],
+
         # data scouting
         ['j0_perf_ds1_L1All',      'L1_All',  [], ['DataScouting_05_Jets'], ['RATE:Cosmic_Jets_DS', 'BW:Jet'], -1],
         ['j0_lcw_jes_L1J12',       'L1_J12', [], [PhysicsStream], ['RATE:SingleJet', 'BW:Jet'], -1], 
@@ -696,9 +699,6 @@ def setupMenu():
         ['2j35_bmv2c2070_split_2j35_L14J20', 'L1_4J20', [], [PhysicsStream], ['RATE:MultiBJet', 'BW:BJet'], -1],
         ['2j45_bmv2c2070_split_2j45_L13J25.0ETA23', 'L1_3J25.0ETA23', [], [PhysicsStream], ['RATE:MultiBJet', 'BW:BJet'], -1],
         ['2j55_bmv2c2077_split_2j55_L13J25.0ETA23', 'L1_3J25.0ETA23', [], [PhysicsStream], ['RATE:MultiBJet', 'BW:BJet'], -1],
-
-        #ATR-13526, ATR-14198
-        #['j80_0eta240_j60_j45_320eta490_invm700_j45_bmv2c2070_split_j45_bmv2c2085_split','L1_J40.0ETA25_2J25_J20.31ETA49', ['','','','',''], [PhysicsStream], ['RATE:MultiBJet', 'BW:BJet' ], -1, ['serial',-1,['j80_0eta240','j60','j45_320eta490_invm700','j45_bmv2c2070','j45_bmv2c2085'] ]],
         
         
 			 ]
@@ -779,7 +779,6 @@ def setupMenu():
         ['te60_L1TE40.0ETA24',           'L1_TE40.0ETA24',[], [PhysicsStream], ['RATE:MET', 'BW:MET'], -1],
 	
         ['xe90_L1XE60',                'L1_XE60',[], [PhysicsStream], ['RATE:MET', 'BW:MET'], -1],  
-        ['xe110_L1XE60',               'L1_XE60',[], [PhysicsStream], ['RATE:MET', 'BW:MET'], -1],
 
 
  	['xe85_tc_lcw_L1XE50',               'L1_XE50',[], [PhysicsStream], ['RATE:MET', 'BW:MET'], -1],
@@ -1011,8 +1010,6 @@ def setupMenu():
         ['tau35_loose1_ptonly',                    'L1_TAU20IM', [], [PhysicsStream], ['RATE:SingleTau', 'BW:Tau'], -1],
         ['tau35_medium1_track',                    'L1_TAU20IM', [], [PhysicsStream], ['RATE:SingleTau', 'BW:Tau'], -1],
         ['tau35_medium1_tracktwo_L1TAU20',         'L1_TAU20', [], [PhysicsStream], ['RATE:SingleTau', 'BW:Tau'], -1],
-        ['tau35_medium1_tracktwo_L1TAU20IL',       'L1_TAU20IL', [], [PhysicsStream], ['RATE:SingleTau', 'BW:Tau'], -1],
-        ['tau35_medium1_tracktwo_L1TAU20IT',       'L1_TAU20IT', [], [PhysicsStream], ['RATE:SingleTau', 'BW:Tau'], -1],
         ['tau35_medium1_ptonly',                   'L1_TAU20IM', [], [PhysicsStream], ['RATE:SingleTau', 'BW:Tau'], -1],
         ['tau35_medium1_ptonly_L1TAU20',           'L1_TAU20', [], [PhysicsStream], ['RATE:SingleTau', 'BW:Tau'], -1],
         ['tau35_tight1_tracktwo',                  'L1_TAU20IM', [], [PhysicsStream], ['RATE:SingleTau', 'BW:Tau'], -1],
@@ -1444,7 +1441,11 @@ def setupMenu():
         # Asymmetric 3mu chains
         ['mu6_2mu4_bDimu', 'L1_MU6_3MU4', ['L1_MU6','L1_3MU4'], [PhysicsStream], ['RATE:Bphysics', 'BW:Bphys'], -1],
         ['2mu6_mu4_bDimu', 'L1_2MU6_3MU4', ['L1_2MU6','L1_MU4'], [PhysicsStream], ['RATE:Bphysics', 'BW:Bphys'], -1],
-
+        
+        # chains for Bs->mumuPhi and Bs->J/psiPhi 
+        ['mu6_mu4_bBmumux_BsJpsiPhi_delayed',                    'L1_MU6_2MU4', ['L1_MU6','L1_MU4'], [PhysicsStream], ['RATE:Bphysics','BW:Bphys'], -1],
+        ['2mu6_bBmumux_BsJpsiPhi_delayed',                    'L1_2MU6', [], [PhysicsStream], ['RATE:Bphysics','BW:Bphys'], -1],
+        ['mu10_mu6_bBmumux_BsJpsiPhi_delayed',            'L1_MU10_2MU6', ['L1_MU10','L1_MU6'],[PhysicsStream], ['RATE:Bphysics','BW:Bphys'], -1],
 
 
         # Narrow-scan chains seeded L1_MU11_2MU6
@@ -1862,9 +1863,22 @@ def setupMenu():
 
 
     TriggerFlags.CombinedSlice.signatures = TriggerFlags.CombinedSlice.signatures() + [
+        ['j20_xe100_mht_L1XE50', 'L1_XE50', ['',''], [PhysicsStream], ['RATE:JetMET', 'BW:Jet'], -1, ['serial',-1,['j20','xe100_mht_L1XE50']]],
+        ['j30_xe100_mht_L1XE50', 'L1_XE50', ['',''], [PhysicsStream], ['RATE:JetMET', 'BW:Jet'], -1, ['serial',-1,['j30','xe100_mht_L1XE50']]],
+        ['j40_xe100_mht_L1XE50', 'L1_XE50', ['',''], [PhysicsStream], ['RATE:JetMET', 'BW:Jet'], -1, ['serial',-1,['j40','xe100_mht_L1XE50']]],
+        
+        ['j20_lcw_xe100_mht_L1XE50', 'L1_XE50', ['',''], [PhysicsStream], ['RATE:JetMET', 'BW:Jet'], -1, ['serial',-1,['j20_lcw','xe100_mht_L1XE50']]],
+        ['j30_lcw_xe100_mht_L1XE50', 'L1_XE50', ['',''], [PhysicsStream], ['RATE:JetMET', 'BW:Jet'], -1, ['serial',-1,['j30_lcw','xe100_mht_L1XE50']]],
+        ['j40_lcw_xe100_mht_L1XE50', 'L1_XE50', ['',''], [PhysicsStream], ['RATE:JetMET', 'BW:Jet'], -1, ['serial',-1,['j40_lcw','xe100_mht_L1XE50']]],
+        
+        ['j20_cleanT_xe100_mht_L1XE50', 'L1_XE50', ['',''], [PhysicsStream], ['RATE:JetMET', 'BW:Jet'], -1, ['serial',-1,['j20_cleanT','xe100_mht_L1XE50']]],
+        ['j30_cleanT_xe100_mht_L1XE50', 'L1_XE50', ['',''], [PhysicsStream], ['RATE:JetMET', 'BW:Jet'], -1, ['serial',-1,['j30_cleanT','xe100_mht_L1XE50']]],
+        ['j40_cleanT_xe100_mht_L1XE50', 'L1_XE50', ['',''], [PhysicsStream], ['RATE:JetMET', 'BW:Jet'], -1, ['serial',-1,['j40_cleanT','xe100_mht_L1XE50']]],        
 
+        ['j80_0eta240_j60_j45_320eta490_invm700_AND_j45_bmv2c2070_split_j45_bmv2c2085_split','L1_J40.0ETA25_2J25_J20.31ETA49', ['','','','',''], [PhysicsStream], ['RATE:MultiBJet', 'BW:BJet' ], -1, ['serial',-1,['j80_0eta240','j60','j45_320eta490_invm700_AND','j45_bmv2c2070_split','j45_bmv2c2085_split'] ]],
+        
         #['j80_0eta240_j60_j45_320eta490', 'L1_J40.0ETA25_2J25_J20.31ETA49', ['L1_J40.0ETA25_2J25_J20.31ETA49','',''], [PhysicsStream], ['RATE:MultiBJet', 'BW:BJet' ], -1,],
-
+        
 
 
         # all e/g + X triggers are taken from DC14 and L1 thresholds adjusted
@@ -2117,9 +2131,6 @@ def setupMenu():
         ['g35_medium_tau25_dikaontight_tracktwo_L1TAU12',     'L1_EM22VHI', ['L1_EM22VHI','L1_TAU12'], [PhysicsStream], ['RATE:TauGamma', 'BW:Tau', 'BW:Egamma'], -1,['serial',-1,["g35_medium","tau25_dikaontight_tracktwo_L1TAU12"]]],
         ['g35_medium_tau35_dikaontight_tracktwo_L1TAU12',     'L1_EM22VHI', ['L1_EM22VHI','L1_TAU12'], [PhysicsStream], ['RATE:TauGamma', 'BW:Tau', 'BW:Egamma'],-1,['serial',-1,["g35_medium","tau35_dikaontight_tracktwo_L1TAU12"]]],
 
-	# ATR-14643
-        ['g25_medium_tau25_dikaonmasstight_tracktwo_60mVis10000',     'L1_EM22VHI', ['L1_EM22VHI','L1_TAU12'], [PhysicsStream], ['RATE:TauGamma', 'BW:Tau', 'BW:Egamma'], -1,['parallel',-1,[]]],
-	['g25_medium_L1EM24VHI_tau25_dikaonmasstight_tracktwo_60mVis10000',     'L1_EM24VHI', ['L1_EM24VHI','L1_TAU12'], [PhysicsStream], ['RATE:TauGamma', 'BW:Tau', 'BW:Egamma'], -1,['parallel',-1,[]]],
 
         # 4-jet items (VBF H->bb, hh->bbbb)
 
@@ -2277,6 +2288,7 @@ def setupMenu():
         ['mu6_j320_dr05', 'L1_MU6_J75', ['L1_MU6', ''], [PhysicsStream], ['RATE:MuonBJet', 'BW:BJet'], -1,['serial',-1,['mu6', 'j320'] ]],
         ['mu6_j400_dr05', 'L1_MU6_J75', ['L1_MU6', ''], [PhysicsStream], ['RATE:MuonBJet', 'BW:BJet'], -1,['serial',-1,['mu6', 'j400'] ]],
 
+
         # Extra calibration items seeded from L1Topo
         ## ATR-14355: moved to phys ['mu4_j35_bperf_split_dr05_dz02_L1BTAG-MU4J15', 'L1_BTAG-MU4J15', ['L1_MU4', ''], [PhysicsStream], ['RATE:MuonBJet', 'BW:BJet'], -1,['serial',-1,['mu4', 'j35_bperf_split'] ], False],
         ['mu4_j55_bperf_split_dr05_dz02_L1BTAG-MU4J15', 'L1_BTAG-MU4J15', ['L1_MU4', ''], [PhysicsStream], ['RATE:MuonBJet', 'BW:BJet'], -1,['serial',-1,['mu4', 'j55_bperf_split'] ], False],
@@ -2460,16 +2472,16 @@ def setupMenu():
         #HMT
         ['mb_sp2000_trk70_hmt', 'L1_TE40', [], ['MinBias'], ["BW:MinBias", "RATE:MinBias"], -1],        
         ['mb_sp2000_pusup600_trk70_hmt', 'L1_TE40', [], ['MinBias'], ["BW:MinBias", "RATE:MinBias"], -1], 
-        ['mb_sp2000_pusup600_trk70_hmt_L1TE60',  'L1_TE60', [], ['MinBias'], ["BW:MinBias", "RATE:MinBias"], -1], 
+        ##B['mb_sp2000_pusup600_trk70_hmt_L1TE60',  'L1_TE60', [], ['MinBias'], ["BW:MinBias", "RATE:MinBias"], -1], 
         ['mb_sp2000_pusup600_trk70_hmt_L1TE70',  'L1_TE70', [], ['MinBias'], ["BW:MinBias", "RATE:MinBias"], -1], 
-        ['mb_sp2000_pusup700_trk70_hmt_L1TE60',  'L1_TE60', [], ['MinBias'], ["BW:MinBias", "RATE:MinBias"], -1], 
+        ##B['mb_sp2000_pusup700_trk70_hmt_L1TE60',  'L1_TE60', [], ['MinBias'], ["BW:MinBias", "RATE:MinBias"], -1], 
         ['mb_sp2000_pusup700_trk70_hmt_L1TE70',  'L1_TE70', [], ['MinBias'], ["BW:MinBias", "RATE:MinBias"], -1], 
         ['mb_sptrk_vetombts2in_L1RD0_FILLED', 'L1_RD0_FILLED', [], ['MinBias'], ["BW:MinBias", "RATE:MinBias"], -1],
 	#ATR-9419
-        ['mb_sp2000_pusup700_trk60_hmt_L1TE60', 'L1_TE60', [], ['MinBias'], ["BW:MinBias", "RATE:MinBias"], -1],
+        ##B['mb_sp2000_pusup700_trk60_hmt_L1TE60', 'L1_TE60', [], ['MinBias'], ["BW:MinBias", "RATE:MinBias"], -1],
         ['mb_sp2500_pusup750_trk90_hmt_L1TE70', 'L1_TE70', [], ['MinBias'], ["BW:MinBias", "RATE:MinBias"], -1],
         #['mb_sp3000_pusup800_trk120_hmt_L1TE40', 'L1_TE40', [], ['MinBias'], ["BW:MinBias", "RATE:MinBias"], -1],
-        ['mb_sp2000_pusup700_trk50_sumet70_hmt_L1TE60',   'L1_TE60', [], ['MinBias'], ["BW:MinBias", "RATE:MinBias"], -1],
+        ##B['mb_sp2000_pusup700_trk50_sumet70_hmt_L1TE60',   'L1_TE60', [], ['MinBias'], ["BW:MinBias", "RATE:MinBias"], -1],
 	['mb_sp2000_pusup700_trk50_sumet110_hmt_L1TE70',  'L1_TE70', [], ['MinBias'], ["BW:MinBias", "RATE:MinBias"], -1],
         #['mb_sp2000_pusup700_trk50_sumet150_hmt_L1TE40',  'L1_TE40', [], ['MinBias'], ["BW:MinBias", "RATE:MinBias"], -1],
 
@@ -2650,6 +2662,7 @@ ps_calibmon_list=[
     'idcalib_trk9_central',
     'idcalib_trk9_fwd',
     'j40_L1ZB',
+    'j0_perf_ds1_L1All',
     'l1calocalib',
     'l1calocalib_L1BGRP9',
     'larcalib_L1EM3_EMPTY',
@@ -2666,7 +2679,6 @@ ps_calibmon_list=[
     'larnoiseburst_L1J40_XE50',
     'larnoiseburst_L1J50',
     'larnoiseburst_L1J75',
-    'larnoiseburst_L1J75_XE40',
     'larnoiseburst_L1XE35',
     'larnoiseburst_L1XE50',
     'larnoiseburst_L1XE80',
@@ -2822,10 +2834,10 @@ ps_minb_list=[
     'mb_sp2100_hmtperf_L1TE20',
     'mb_sp2100_hmtperf_L1TE30',
     'mb_sp2100_hmtperf_L1TE40',
-    'mb_sp2100_hmtperf_L1TE50',
-    'mb_sp2100_hmtperf_L1TE60',
-    'mb_sp1500_hmtperf_L1TE50',
-    'mb_sp1500_hmtperf_L1TE60',
+    ##B'mb_sp2100_hmtperf_L1TE50',
+    ##B'mb_sp2100_hmtperf_L1TE60',
+    ##B'mb_sp1500_hmtperf_L1TE50',
+    ##B'mb_sp1500_hmtperf_L1TE60',
     'mb_sp1400_trk100_hmt_L1TE40',
     'mb_sp800_pusup400_trk50_hmt_L1TE5',
     'mb_sp900_pusup500_trk60_hmt_L1TE5',
@@ -2845,14 +2857,14 @@ ps_minb_list=[
     'mb_sp2000_pusup1200_trk100_hmt_L1TE40',
     'mb_sp2200_pusup1300_trk110_hmt_L1TE40',
     'mb_sp2400_pusup1400_trk120_hmt_L1TE40',
-    'mb_sp1600_pusup1100_trk90_hmt_L1TE50',
-    'mb_sp2000_pusup1200_trk100_hmt_L1TE50',
-    'mb_sp2200_pusup1300_trk110_hmt_L1TE50',
-    'mb_sp2400_pusup1400_trk120_hmt_L1TE50',
-    'mb_sp1600_pusup1100_trk90_hmt_L1TE60',
-    'mb_sp2000_pusup1200_trk100_hmt_L1TE60',
-    'mb_sp2200_pusup1300_trk110_hmt_L1TE60',
-    'mb_sp2400_pusup1400_trk120_hmt_L1TE60',
+    ##B'mb_sp1600_pusup1100_trk90_hmt_L1TE50',
+    ##B'mb_sp2000_pusup1200_trk100_hmt_L1TE50',
+    ##B'mb_sp2200_pusup1300_trk110_hmt_L1TE50',
+    ##B'mb_sp2400_pusup1400_trk120_hmt_L1TE50',
+    ##B'mb_sp1600_pusup1100_trk90_hmt_L1TE60',
+    ##B'mb_sp2000_pusup1200_trk100_hmt_L1TE60',
+    ##B'mb_sp2200_pusup1300_trk110_hmt_L1TE60',
+    ##B'mb_sp2400_pusup1400_trk120_hmt_L1TE60',
     'mb_sptrk_vetombts2in_L1ZDC_AND',
     'mb_sptrk_vetombts2in_L1ZDC_A_C',
     'mb_sp1400_trk100_hmt_L1TE40.0ETA24',
@@ -2874,7 +2886,7 @@ ps_minb_list=[
     'mb_sp1400_pusup550_trk90_hmt_L1TE40.0ETA24',
     'mb_sp1400_pusup550_trk90_hmt_L1TE10',
     'mb_sp1400_pusup550_trk90_hmt_L1TE10.0ETA24',
-    'mb_sp1400_pusup550_trk90_hmt_L1TE50',
+    ##B'mb_sp1400_pusup550_trk90_hmt_L1TE50',
     'mb_sp1500_trk100_hmt_L1TE40',
     'mb_sp1500_trk100_hmt_L1TE40.0ETA24',
     'mb_sp1400_trk80_hmt_L1MBTS_1_1',
@@ -2900,7 +2912,7 @@ ps_minb_list=[
     'mb_sp1500_pusup700_trk100_hmt_L1TE40.0ETA24',
     'mb_sp1500_pusup700_trk100_hmt_L1TE10',
     'mb_sp1500_pusup700_trk100_hmt_L1TE10.0ETA24',
-    'mb_sp1500_pusup700_trk100_hmt_L1TE50',
+    ##B'mb_sp1500_pusup700_trk100_hmt_L1TE50',
     'mb_sp1500_trk100_hmt_L1TE20',
     'mb_sp1500_trk100_hmt_L1TE20.0ETA24',
     'mb_sp1500_trk100_hmt_L1TE30',
@@ -2925,7 +2937,7 @@ ps_minb_list=[
     'mb_sp1800_pusup800_trk110_hmt_L1TE40.0ETA24',
     'mb_sp1800_pusup800_trk110_hmt_L1TE10',
     'mb_sp1800_pusup800_trk110_hmt_L1TE10.0ETA24',
-    'mb_sp1800_pusup800_trk110_hmt_L1TE50',
+    ##B'mb_sp1800_pusup800_trk110_hmt_L1TE50',
     'mb_sp1800_trk110_hmt_L1TE20',
     'mb_sp1800_trk110_hmt_L1TE20.0ETA24',
     'mb_sp1800_trk110_hmt_L1TE30',
@@ -2936,35 +2948,37 @@ ps_minb_list=[
     'mb_sp2100_pusup1000_trk120_hmt_L1TE20',
     'mb_sp2100_pusup1000_trk120_hmt_L1TE30',
     'mb_sp2100_pusup1000_trk120_hmt_L1TE40',
-    'mb_sp2100_pusup1000_trk120_hmt_L1TE50',
+    ##B'mb_sp2100_pusup1000_trk120_hmt_L1TE50',
     'mb_sp2400_pusup1100_trk130_hmt_L1TE20',
     'mb_sp2400_pusup1100_trk130_hmt_L1TE30',
     'mb_sp2400_pusup1100_trk130_hmt_L1TE40',
-    'mb_sp2400_pusup1100_trk130_hmt_L1TE50',
+    ##B'mb_sp2400_pusup1100_trk130_hmt_L1TE50',
     'mb_sp2700_pusup1300_trk140_hmt_L1TE20',
     'mb_sp2700_pusup1300_trk140_hmt_L1TE30',
     'mb_sp2700_pusup1300_trk140_hmt_L1TE40',
-    'mb_sp2700_pusup1300_trk140_hmt_L1TE50',
+    ##B'mb_sp2700_pusup1300_trk140_hmt_L1TE50',
     'mb_sp3000_pusup1400_trk150_hmt_L1TE20',
     'mb_sp3000_pusup1400_trk150_hmt_L1TE30',
     'mb_sp3000_pusup1400_trk150_hmt_L1TE40',
-    'mb_sp3000_pusup1400_trk150_hmt_L1TE50',
-    'mb_sp3000_pusup1400_trk150_hmt_L1TE60',
+    ##B'mb_sp3000_pusup1400_trk150_hmt_L1TE50',
+    ##B'mb_sp3000_pusup1400_trk150_hmt_L1TE60',
     'mb_sp3000_pusup1500_trk160_hmt_L1TE20',
     'mb_sp3000_pusup1500_trk160_hmt_L1TE30',
     'mb_sp3000_pusup1500_trk160_hmt_L1TE40',
-    'mb_sp3000_pusup1500_trk160_hmt_L1TE50',
-    'mb_sp3000_pusup1500_trk160_hmt_L1TE60',
+    ##B'mb_sp3000_pusup1500_trk160_hmt_L1TE50',
+    ##B'mb_sp3000_pusup1500_trk160_hmt_L1TE60',
     'mb_sp2000_pusup600_trk70_hmt',
-    'mb_sp2000_pusup600_trk70_hmt_L1TE60',
+    ##B'mb_sp2000_pusup600_trk70_hmt_L1TE60',
     'mb_sp2000_pusup600_trk70_hmt_L1TE70',
     'mb_sp2000_pusup700_trk50_sumet110_hmt_L1TE70',
-    'mb_sp2000_pusup700_trk50_sumet70_hmt_L1TE60',
-    'mb_sp2000_pusup700_trk60_hmt_L1TE60',
-    'mb_sp2000_pusup700_trk70_hmt_L1TE60',
+    ##B'mb_sp2000_pusup700_trk50_sumet70_hmt_L1TE60',
+    ##B'mb_sp2000_pusup700_trk60_hmt_L1TE60',
+    ##B'mb_sp2000_pusup700_trk70_hmt_L1TE60',
     'mb_sp2000_pusup700_trk70_hmt_L1TE70',
     'mb_sp900_pusup400_trk60_hmt_L1TE5',
+    'mb_sp900_pusup400_trk60_hmt_L1TE5.0ETA24',
     'mb_sp1000_pusup450_trk70_hmt_L1TE5',
+    'mb_sp1000_pusup450_trk70_hmt_L1TE5.0ETA24',
     'mb_sp1200_pusup500_trk80_hmt_L1TE5',
     'mb_sp1600_pusup600_trk100_hmt_L1TE10',
     'mb_sp1600_pusup600_trk100_hmt_L1TE10.0ETA24',
@@ -3090,12 +3104,12 @@ ps_minb_list=[
     'noalg_mb_L1TE30.0ETA24',
     'noalg_mb_L1TE40',
     'noalg_mb_L1TE40.0ETA24',
-    'noalg_mb_L1TE60',
-    'noalg_mb_L1TE60.0ETA24',
+    ##B'noalg_mb_L1TE60',
+    ##B'noalg_mb_L1TE60.0ETA24',
     'noalg_mb_L1TE70',
     'noalg_mb_L1TE70.0ETA24',
-    'noalg_mb_L1TE50',
-    'noalg_mb_L1TE50.0ETA24',
+    ##B'noalg_mb_L1TE50',
+    ##B'noalg_mb_L1TE50.0ETA24',
     'noalg_mb_L1ZDC_A',
     'noalg_mb_L1ZDC_C',
     'noalg_mb_L1ZDC_AND',
diff --git a/Trigger/TriggerCommon/TriggerMenu/python/menu/MenuUtils.py b/Trigger/TriggerCommon/TriggerMenu/python/menu/MenuUtils.py
index e04339ecd0f..856468a1a1a 100644
--- a/Trigger/TriggerCommon/TriggerMenu/python/menu/MenuUtils.py
+++ b/Trigger/TriggerCommon/TriggerMenu/python/menu/MenuUtils.py
@@ -10,9 +10,9 @@ def splitInterSignatureChainDict(chainDict):
     listOfSplitChainDicts = []
     for chainPart in chainDict['chainParts']:
         thisSignature = chainPart['signature']
-        chainPartAdded = False
+        chainPartAdded = False        
         for splitChainDict in listOfSplitChainDicts:
-            if thisSignature == splitChainDict['chainParts'][0]['signature']:
+            if thisSignature == splitChainDict['chainParts'][0]['signature']:            
                 splitChainDict['chainParts'] += [chainPart]
                 chainPartAdded = True
                 break
@@ -23,6 +23,50 @@ def splitInterSignatureChainDict(chainDict):
             listOfSplitChainDicts += [newSplitChainDict]
             #print "Hi : adding to listofsplitchaindicts " + str(newSplitChainDict)
 
+            
+    #special code to handle chains with "AND" in the name
+    #jet,ht and bjet jet chains belong to the same signature
+    #so an extra key is needed to make sure the part are treated separately
+    for splitChainDict in listOfSplitChainDicts:
+        if 'AND' in [part['extra'] for part in  splitChainDict['chainParts']]:
+            log.info("Implement extra splitting, triggered by AND key (%s.)", chainDict['chainName'])
+                
+            listOfSplitChainDicts=[]        
+            addNewSplit= False      
+            for chainPart in chainDict['chainParts']:
+                thisSignature = chainPart['signature']
+                chainPartAdded = False        
+                
+                #chainPart coming after the AND, change temporaly the Signature name, 
+                #so it does not get added to existing dictionary
+                if addNewSplit:                    
+                    thisSignature = 'extraSplit'            
+                    addNewSplit = False        
+
+                #chainPart containing at AND,
+                # make sure next chainPart is added as a new elemented to the listOfSplitChainDicts
+                if 'AND' in chainPart['extra']:
+                    addNewSplit = True
+                    #log.info("AND key found, next chainPart will be added as a new element of listOfSplitChainDicts")
+                    
+                for splitChainDict in listOfSplitChainDicts:
+                    #if AND present in an elemenent of listOfSplitChainDicts, don't add anything to it
+                    if 'AND' in [part['extra'] for part in splitChainDict['chainParts']]:
+                        continue
+                    if thisSignature == splitChainDict['chainParts'][0]['signature']:            
+                        #log.info("Adding %s to existing element %s.", chainPart['chainPartName'], splitChainDict)
+                        splitChainDict['chainParts'] += [chainPart]
+                        chainPartAdded = True
+                        break
+                if not chainPartAdded:
+                    newSplitChainDict = deepcopy(chainDict)
+                    newSplitChainDict['chainParts'] = [chainPart]
+                    newSplitChainDict['signature'] = chainPart['signature']
+                    listOfSplitChainDicts += [newSplitChainDict]
+                    #log.info("Adding %s as a new element of listOfSplitChainDicts", chainPart['chainPartName'])
+                    
+    #log.info("ListOfSplitChainDicts", chainPart['chainPartName'])
+    
     #oder the splitted dicts
     orderedListOfSplitChainDicts = []
     if not chainDict.has_key("mergingOrder"):
@@ -31,15 +75,13 @@ def splitInterSignatureChainDict(chainDict):
         log.info("No merging order given for chain %s.", chainDict['chainName'])
     else:
         for chainPartName in chainDict["mergingOrder"]:
-            for splitChainDict in listOfSplitChainDicts:
+            for splitChainDict in listOfSplitChainDicts:                
                 if splitChainDict['chainParts'][0]['chainPartName'] == chainPartName:
                     orderedListOfSplitChainDicts += [splitChainDict]
                     #print "Hi : adding to orderedListOfSplitChainDicts " + str(splitChainDict)
         if not len(orderedListOfSplitChainDicts) == len(listOfSplitChainDicts):
-            #for chainPartName in chainDict["mergingOrder"]:
-            #    for splitChainDict in listOfSplitChainDicts:
-            #      print "BETTA", splitChainDict['chainParts'][0]['chainPartName'], chainPartName
-            log.error("Ordering of split chain dicts failed. Please check that orderedListOfSplitChainDicts and listOfSplitChainDicts contain the same elements!!")
+            for chainPartName in chainDict["mergingOrder"]:
+                log.error("Ordering of split chain dicts failed. Please check that orderedListOfSplitChainDicts and listOfSplitChainDicts contain the same elements!!")
             print chainDict
             
         return orderedListOfSplitChainDicts
@@ -134,24 +176,37 @@ def _mergeChainDefsSerial(ChainDicts,listOfChainDefs,offset,preserveL2EFOrder=Tr
     serial merging of chain def objects for combined chains
     """
 
+    
     noTEreplication=False
     #Add few exception to the replication of the TE
     jet_count=0
     met_count=0
+    ht_count=0
     try:
         for chainDict in ChainDicts:
             if (chainDict["signature"] == "Jet"):
-                jet_count=+1
+                jet_count+=1
+                #print "BETTA: adding one jet count: ",chainDict
+            if (chainDict["signature"] == "HT"):
+                ht_count+=1
+                #print "BETTA: adding one ht count: ",chainDict            
             if (chainDict["signature"] == "MET"):
                 for chainpart in chainDict["chainParts"]:
                     if 'xe' in chainpart['trigType'] and 'cell' not in chainpart['EFrecoAlg']:
-                        met_count=+1
+                        met_count+=1
     except:
         pass
 
+    #print "BETTA Total count: jet-", jet_count, " HT-", ht_count, " xe-", met_count, 
     if jet_count > 0 and met_count > 0:
         noTEreplication=True        
-        
+    if jet_count > 1:
+        noTEreplication=True        
+    if met_count > 1:
+        noTEreplication=True        
+    #if jet_count > 0 and ht_count > 0:
+    #    noTEreplication=True        
+
 
     listOfChainDefs = deepcopy(listOfChainDefs) 
 
@@ -160,7 +215,6 @@ def _mergeChainDefsSerial(ChainDicts,listOfChainDefs,offset,preserveL2EFOrder=Tr
         lastTE = chainDef.signatureList[-1]
 
     
-
     # copy the chaindef into which we want to merge the other chaindefs
     mergedChainDef = deepcopy(listOfChainDefs[0])
     firstChainDefLastTEs = mergedChainDef.signatureList[-1]['listOfTriggerElements']
@@ -181,9 +235,11 @@ def _mergeChainDefsSerial(ChainDicts,listOfChainDefs,offset,preserveL2EFOrder=Tr
         for signatureIdx,signature in enumerate(chainDef.signatureList):
             # if a topo is appended after the chain merging, or in same special cases, the replication of the last TEs is not necessary
             if noTEreplication:
+                #print "Removing replication of the TE for chain: ",chainDef.chain_name
                 log.info("Removing replication of the TE for chain: %s" %(chainDef.chain_name))
                 signatureToAdd = signature['listOfTriggerElements'] 
             else:
+                #print "no change for chain: ",chainDef.chain_name
                 signatureToAdd = signature['listOfTriggerElements'] if doTopo else signature['listOfTriggerElements'] + currentLastTEs 
             #signatureToAdd = signature['listOfTriggerElements'] 
             if preserveL2EFOrder:
diff --git a/Trigger/TriggerCommon/TriggerMenu/python/menu/Physics_HI_v4.py b/Trigger/TriggerCommon/TriggerMenu/python/menu/Physics_HI_v4.py
index a6c8ab0ccd5..636facbf188 100644
--- a/Trigger/TriggerCommon/TriggerMenu/python/menu/Physics_HI_v4.py
+++ b/Trigger/TriggerCommon/TriggerMenu/python/menu/Physics_HI_v4.py
@@ -90,151 +90,67 @@ def setupMenu():
 	['j0_perf_L1RD0_FILLED',     'L1_RD0_FILLED',[], [HardProbesStream], ['RATE:SingleJet', 'BW:Jet'], -1],
 
 	#physics
-	#R=0.4 jets
-	['j20_ion_L1TE20',         'L1_TE20',[], [HardProbesStream, 'express'], ['RATE:SingleJet', 'BW:Jet'], -1],
-        ['j25_ion_L1TE20',         'L1_TE20',[], [HardProbesStream], ['RATE:SingleJet', 'BW:Jet'], -1],
-	['j30_ion_L1TE20',         'L1_TE20',[], [HardProbesStream, 'express'], ['RATE:SingleJet', 'BW:Jet'], -1],   
-	['j40_ion_L1TE20',         'L1_TE20',[], [HardProbesStream], ['RATE:SingleJet', 'BW:Jet'], -1],
-	['j50_ion_L1TE20',         'L1_TE20',[], [HardProbesStream], ['RATE:SingleJet', 'BW:Jet'], -1],
-	['j30_ion_L1TE50',         'L1_TE50',[], [HardProbesStream, 'express'], ['RATE:SingleJet', 'BW:Jet'], -1],   
-	['j40_ion_L1TE50',         'L1_TE50',[], [HardProbesStream], ['RATE:SingleJet', 'BW:Jet'], -1],
-	['j50_ion_L1TE50',         'L1_TE50',[], [HardProbesStream, 'express'], ['RATE:SingleJet', 'BW:Jet'], -1],
-	['j60_ion_L1TE50',         'L1_TE50',[], [HardProbesStream], ['RATE:SingleJet', 'BW:Jet'], -1],
-	['j75_ion_L1TE50',         'L1_TE50',[], [HardProbesStream], ['RATE:SingleJet', 'BW:Jet'], -1],
-	['j100_ion_L1TE50',         'L1_TE50',[], [HardProbesStream, 'express'], ['RATE:SingleJet', 'BW:Jet'], -1],
-	['j150_ion_L1TE50',         'L1_TE50',[], [HardProbesStream, 'express'], ['RATE:SingleJet', 'BW:Jet'], -1],
-	['j50_ion_L1J10',         'L1_J10',[], [HardProbesStream, 'express'], ['RATE:SingleJet', 'BW:Jet'], -1],
-	['j60_ion_L1J10',         'L1_J10',[], [HardProbesStream], ['RATE:SingleJet', 'BW:Jet'], -1],
-	['j75_ion_L1J10',         'L1_J10',[], [HardProbesStream], ['RATE:SingleJet', 'BW:Jet'], -1],
-	['j100_ion_L1J10',         'L1_J10',[], [HardProbesStream], ['RATE:SingleJet', 'BW:Jet'], -1],
-	['j150_ion_L1J10',         'L1_J10',[], [HardProbesStream], ['RATE:SingleJet', 'BW:Jet'], -1],	
-	['j30_ion_L1ZDC_A_C',         'L1_ZDC_A_C',[], [HardProbesStream], ['RATE:SingleJet', 'BW:Jet'], -1],
-	['j40_ion_L1ZDC_A_C',         'L1_ZDC_A_C',[], [HardProbesStream], ['RATE:SingleJet', 'BW:Jet'], -1],
-	['j50_ion_L1ZDC_A_C',         'L1_ZDC_A_C',[], [HardProbesStream], ['RATE:SingleJet', 'BW:Jet'], -1],
-	['j60_ion_L1ZDC_A_C',         'L1_ZDC_A_C',[], [HardProbesStream], ['RATE:SingleJet', 'BW:Jet'], -1],
-	['j75_ion_L1ZDC_A_C',         'L1_ZDC_A_C',[], [HardProbesStream], ['RATE:SingleJet', 'BW:Jet'], -1],
+	#R=0.4 jets ion jets
+	#['j20_ion',         'L1_RD0_FILLED',[], [HardProbesStream], ['RATE:SingleJet', 'BW:Jet'], -1],
+	#['j20_ion_0eta490',         'L1_RD0_FILLED',[], [HardProbesStream], ['RATE:SingleJet', 'BW:Jet'], -1],
+	['j20_ion_L1MBTS_1_1',         'L1_MBTS_1_1',[], [HardProbesStream], ['RATE:SingleJet', 'BW:Jet'], -1],
+	['j20_ion_0eta490_L1MBTS_1_1',         'L1_MBTS_1_1',[], [HardProbesStream], ['RATE:SingleJet', 'BW:Jet'], -1],
+	#['j20_ion_L1TE5',         'L1_TE5',[], [HardProbesStream], ['RATE:SingleJet', 'BW:Jet'], -1],
+	#['j20_ion_0eta490_L1TE5',         'L1_TE5',[], [HardProbesStream], ['RATE:SingleJet', 'BW:Jet'], -1],
+	['j20_ion_L1TE10',         'L1_TE10',[], [HardProbesStream], ['RATE:SingleJet', 'BW:Jet'], -1],
+	['j20_ion_0eta490_L1TE10',         'L1_TE10',[], [HardProbesStream], ['RATE:SingleJet', 'BW:Jet'], -1],
+	['j30_ion_L1TE10',         'L1_TE10',[], [HardProbesStream], ['RATE:SingleJet', 'BW:Jet'], -1],
+	['j30_ion_0eta490_L1TE10',         'L1_TE10',[], [HardProbesStream], ['RATE:SingleJet', 'BW:Jet'], -1],   
+	['j40_ion_L1TE10',         'L1_TE10',[], [HardProbesStream], ['RATE:SingleJet', 'BW:Jet'], -1],
+	['j40_ion_0eta490_L1TE10',         'L1_TE10',[], [HardProbesStream], ['RATE:SingleJet', 'BW:Jet'], -1],
+	['j40_ion_L1J10',         'L1_J10',[], [HardProbesStream], ['RATE:SingleJet', 'BW:Jet'], -1],
+	['j50_ion_L1J10',         'L1_J10',[], [HardProbesStream], ['RATE:SingleJet', 'BW:Jet'], -1],
+	['j50_ion_L1J15',         'L1_J15',[], [HardProbesStream], ['RATE:SingleJet', 'BW:Jet'], -1],
+	['j60_ion_L1J15',         'L1_J15',[], [HardProbesStream], ['RATE:SingleJet', 'BW:Jet'], -1],
+	['j60_ion_L1J20',         'L1_J20',[], [HardProbesStream], ['RATE:SingleJet', 'BW:Jet'], -1],
+	['j75_ion_L1J20',         'L1_J20',[], [HardProbesStream], ['RATE:SingleJet', 'BW:Jet'], -1],
+	['j85_ion_L1J20',         'L1_J20',[], [HardProbesStream], ['RATE:SingleJet', 'BW:Jet'], -1],
+	['j100_ion_L1J20',         'L1_J20',[], [HardProbesStream, 'express'], ['RATE:SingleJet', 'BW:Jet'], -1],
+	['j110_ion_L1J3',         'L1_J30',[], [HardProbesStream, 'express'], ['RATE:SingleJet', 'BW:Jet'], -1],
+	['j150_ion_L1J30',         'L1_J30',[], [HardProbesStream, 'express'], ['RATE:SingleJet', 'BW:Jet'], -1],
+	['j175_ion_L1J30',         'L1_J50',[], [HardProbesStream, 'express'], ['RATE:SingleJet', 'BW:Jet'], -1],
+	
+	#R=0.4 jets pp jets
+	#['j20',         'L1_RD0_FILLED',[], [HardProbesStream], ['RATE:SingleJet', 'BW:Jet'], -1],
+	#['j20_0eta490',         'L1_RD0_FILLED',[], [HardProbesStream], ['RATE:SingleJet', 'BW:Jet'], -1],
+	['j20_L1MBTS_1_1',         'L1_MBTS_1_1',[], [HardProbesStream], ['RATE:SingleJet', 'BW:Jet'], -1],
+	['j20_0eta490_L1MBTS_1_1',         'L1_MBTS_1_1',[], [HardProbesStream], ['RATE:SingleJet', 'BW:Jet'], -1],
+	#['j20_ion_L1TE5',         'L1_TE5',[], [HardProbesStream], ['RATE:SingleJet', 'BW:Jet'], -1],
+	#['j20_0eta490_ion_L1TE5',         'L1_TE5',[], [HardProbesStream], ['RATE:SingleJet', 'BW:Jet'], -1],
+	['j20_L1TE10',         'L1_TE10',[], [HardProbesStream], ['RATE:SingleJet', 'BW:Jet'], -1],
+	['j20_0eta490_L1TE10',         'L1_TE10',[], [HardProbesStream], ['RATE:SingleJet', 'BW:Jet'], -1],
+	['j30_L1TE10',         'L1_TE10',[], [HardProbesStream], ['RATE:SingleJet', 'BW:Jet'], -1],
+	['j30_0eta490_L1TE10',         'L1_TE10',[], [HardProbesStream], ['RATE:SingleJet', 'BW:Jet'], -1],   
+	['j40_L1TE10',         'L1_TE10',[], [HardProbesStream], ['RATE:SingleJet', 'BW:Jet'], -1],
+	['j40_0eta490_L1TE10',         'L1_TE10',[], [HardProbesStream], ['RATE:SingleJet', 'BW:Jet'], -1],
+	['j40_L1J10',         'L1_J10',[], [HardProbesStream], ['RATE:SingleJet', 'BW:Jet'], -1],
+	['j50_L1J10',         'L1_J10',[], [HardProbesStream], ['RATE:SingleJet', 'BW:Jet'], -1],
+	['j50_L1J15',         'L1_J15',[], [HardProbesStream], ['RATE:SingleJet', 'BW:Jet'], -1],
+	['j60_L1J15',         'L1_J15',[], [HardProbesStream], ['RATE:SingleJet', 'BW:Jet'], -1],
+	['j60',         'L1_J20',[], [HardProbesStream], ['RATE:SingleJet', 'BW:Jet'], -1],
+	['j75_L1J20',         'L1_J20',[], [HardProbesStream], ['RATE:SingleJet', 'BW:Jet'], -1],
+	['j85',         'L1_J20',[], [HardProbesStream], ['RATE:SingleJet', 'BW:Jet'], -1],
+	['j100_L1J20',         'L1_J20',[], [HardProbesStream, 'express'], ['RATE:SingleJet', 'BW:Jet'], -1],
+	['j110',         'L1_J30',[], [HardProbesStream, 'express'], ['RATE:SingleJet', 'BW:Jet'], -1],
+	['j150_L1J30',         'L1_J30',[], [HardProbesStream, 'express'], ['RATE:SingleJet', 'BW:Jet'], -1],
+	['j175',         'L1_J50',[], [HardProbesStream, 'express'], ['RATE:SingleJet', 'BW:Jet'], -1],
+	
 	
-	#R=0.3 jets
-	['j20_a3_ion_L1TE20',         'L1_TE20',[], [HardProbesStream], ['RATE:SingleJet', 'BW:Jet'], -1],
-	['j25_a3_ion_L1TE20',         'L1_TE20',[], [HardProbesStream], ['RATE:SingleJet', 'BW:Jet'], -1],
-	['j30_a3_ion_L1TE20',         'L1_TE20',[], [HardProbesStream], ['RATE:SingleJet', 'BW:Jet'], -1],   
-	['j40_a3_ion_L1TE20',         'L1_TE20',[], [HardProbesStream], ['RATE:SingleJet', 'BW:Jet'], -1],
-	['j50_a3_ion_L1TE20',         'L1_TE20',[], [HardProbesStream], ['RATE:SingleJet', 'BW:Jet'], -1],
-	['j30_a3_ion_L1TE50',         'L1_TE50',[], [HardProbesStream, 'express'], ['RATE:SingleJet', 'BW:Jet'], -1],   
-	['j40_a3_ion_L1TE50',         'L1_TE50',[], [HardProbesStream], ['RATE:SingleJet', 'BW:Jet'], -1],
-	['j50_a3_ion_L1TE50',         'L1_TE50',[], [HardProbesStream], ['RATE:SingleJet', 'BW:Jet'], -1],
-	['j60_a3_ion_L1TE50',         'L1_TE50',[], [HardProbesStream], ['RATE:SingleJet', 'BW:Jet'], -1],
-	['j75_a3_ion_L1TE50',         'L1_TE50',[], [HardProbesStream], ['RATE:SingleJet', 'BW:Jet'], -1],
-	['j100_a3_ion_L1TE50',         'L1_TE50',[], [HardProbesStream], ['RATE:SingleJet', 'BW:Jet'], -1],
-	['j150_a3_ion_L1TE50',         'L1_TE50',[], [HardProbesStream], ['RATE:SingleJet', 'BW:Jet'], -1],
-	['j50_a3_ion_L1J10',         'L1_J10',[], [HardProbesStream], ['RATE:SingleJet', 'BW:Jet'], -1],
-	['j60_a3_ion_L1J10',         'L1_J10',[], [HardProbesStream], ['RATE:SingleJet', 'BW:Jet'], -1],
-	['j75_a3_ion_L1J10',         'L1_J10',[], [HardProbesStream], ['RATE:SingleJet', 'BW:Jet'], -1],
-	['j100_a3_ion_L1J10',         'L1_J10',[], [HardProbesStream], ['RATE:SingleJet', 'BW:Jet'], -1],
-	['j150_a3_ion_L1J10',         'L1_J10',[], [HardProbesStream], ['RATE:SingleJet', 'BW:Jet'], -1],
-	['j30_a3_ion_L1ZDC_A_C',         'L1_ZDC_A_C',[], [HardProbesStream], ['RATE:SingleJet', 'BW:Jet'], -1],
-	['j40_a3_ion_L1ZDC_A_C',         'L1_ZDC_A_C',[], [HardProbesStream], ['RATE:SingleJet', 'BW:Jet'], -1],
-	['j50_a3_ion_L1ZDC_A_C',         'L1_ZDC_A_C',[], [HardProbesStream], ['RATE:SingleJet', 'BW:Jet'], -1],
-	['j60_a3_ion_L1ZDC_A_C',         'L1_ZDC_A_C',[], [HardProbesStream], ['RATE:SingleJet', 'BW:Jet'], -1],
-	['j75_a3_ion_L1ZDC_A_C',         'L1_ZDC_A_C',[], [HardProbesStream], ['RATE:SingleJet', 'BW:Jet'], -1],
-
 	#forward jets ATR-12623
-	['j25_320eta490_ion_L1TE20',         'L1_TE20',[], [HardProbesStream], ['RATE:SingleJet', 'BW:Jet'], -1],
-	['j25_320eta490_ion_L1TE50',         'L1_TE50',[], [HardProbesStream], ['RATE:SingleJet', 'BW:Jet'], -1],
-	['j30_320eta490_ion_L1TE20',         'L1_TE20',[], [HardProbesStream], ['RATE:SingleJet', 'BW:Jet'], -1],
-        ['j30_320eta490_ion_L1TE50',         'L1_TE50',[], [HardProbesStream], ['RATE:SingleJet', 'BW:Jet'], -1],
-	['j40_320eta490_ion_L1TE20',         'L1_TE20',[], [HardProbesStream], ['RATE:SingleJet', 'BW:Jet'], -1],
-        ['j40_320eta490_ion_L1TE50',         'L1_TE50',[], [HardProbesStream], ['RATE:SingleJet', 'BW:Jet'], -1],
-	['j50_320eta490_ion_L1TE20',         'L1_TE20',[], [HardProbesStream], ['RATE:SingleJet', 'BW:Jet'], -1],
-        ['j50_320eta490_ion_L1TE50',         'L1_TE50',[], [HardProbesStream], ['RATE:SingleJet', 'BW:Jet'], -1],
-
-	['j25_a3_320eta490_ion_L1TE20',         'L1_TE20',[], [HardProbesStream], ['RATE:SingleJet', 'BW:Jet'], -1],
-        ['j25_a3_320eta490_ion_L1TE50',         'L1_TE50',[], [HardProbesStream], ['RATE:SingleJet', 'BW:Jet'], -1],
-        ['j30_a3_320eta490_ion_L1TE20',         'L1_TE20',[], [HardProbesStream], ['RATE:SingleJet', 'BW:Jet'], -1],
-        ['j30_a3_320eta490_ion_L1TE50',         'L1_TE50',[], [HardProbesStream], ['RATE:SingleJet', 'BW:Jet'], -1],
-        ['j40_a3_320eta490_ion_L1TE20',         'L1_TE20',[], [HardProbesStream], ['RATE:SingleJet', 'BW:Jet'], -1],
-        ['j40_a3_320eta490_ion_L1TE50',         'L1_TE50',[], [HardProbesStream], ['RATE:SingleJet', 'BW:Jet'], -1],
-        ['j50_a3_320eta490_ion_L1TE20',         'L1_TE20',[], [HardProbesStream], ['RATE:SingleJet', 'BW:Jet'], -1],
-        ['j50_a3_320eta490_ion_L1TE50',         'L1_TE50',[], [HardProbesStream], ['RATE:SingleJet', 'BW:Jet'], -1],
-
-	#multijets ATR-12737
-	['j60_ion_2j30_ion_L1TE50',    'L1_TE50', [], [HardProbesStream], ['RATE:MultiJet',  'BW:Jet'], -1],
-	['j75_ion_2j30_ion_L1TE50',    'L1_TE50', [], [HardProbesStream], ['RATE:MultiJet',  'BW:Jet'], -1],
-	['j75_ion_2j40_ion_L1TE50',    'L1_TE50', [], [HardProbesStream], ['RATE:MultiJet',  'BW:Jet'], -1],
-	['j100_ion_2j30_ion_L1TE50',   'L1_TE50', [], [HardProbesStream], ['RATE:MultiJet',  'BW:Jet'], -1],
-	['j100_ion_2j40_ion_L1TE50',   'L1_TE50', [], [HardProbesStream], ['RATE:MultiJet',  'BW:Jet'], -1],
-	['j100_ion_2j50_ion_L1TE50',   'L1_TE50', [], [HardProbesStream], ['RATE:MultiJet',  'BW:Jet'], -1],
-
-	['j60_ion_2j30_ion_L1J10',     'L1_J10', [], [HardProbesStream], ['RATE:MultiJet',  'BW:Jet'], -1],
-	['j75_ion_2j30_ion_L1J10',     'L1_J10', [], [HardProbesStream], ['RATE:MultiJet',  'BW:Jet'], -1],
-	['j75_ion_2j40_ion_L1J10',     'L1_J10', [], [HardProbesStream], ['RATE:MultiJet',  'BW:Jet'], -1],
-	['j100_ion_2j30_ion_L1J10',    'L1_J10', [], [HardProbesStream], ['RATE:MultiJet',  'BW:Jet'], -1],
-	['j100_ion_2j40_ion_L1J10',    'L1_J10', [], [HardProbesStream], ['RATE:MultiJet',  'BW:Jet'], -1],
-	['j100_ion_2j50_ion_L1J10',    'L1_J10', [], [HardProbesStream], ['RATE:MultiJet',  'BW:Jet'], -1],
-
-        #photoproduction ATR-12923
-        ['j5_ion_L1TE5_VTE200',                 'L1_TE5_VTE200',[], [UPCStream], ['RATE:UPC', 'BW:UPC'], -1],
-        ['j10_ion_L1TE5_VTE200',                 'L1_TE5_VTE200',[], [UPCStream], ['RATE:UPC', 'BW:UPC'], -1],
-	['j15_ion_L1TE5_VTE200',                 'L1_TE5_VTE200',[], [UPCStream], ['RATE:UPC', 'BW:UPC'], -1],
-	['j20_ion_L1TE5_VTE200',                 'L1_TE5_VTE200',[], [UPCStream], ['RATE:UPC', 'BW:UPC'], -1],
-
-        ['j5_ion_L1ZDC_XOR_TE5_VTE200',                 'L1_ZDC_XOR_TE5_VTE200',[], [UPCStream], ['RATE:UPC', 'BW:UPC'], -1],
-        ['j10_ion_L1ZDC_XOR_TE5_VTE200',                 'L1_ZDC_XOR_TE5_VTE200',[], [UPCStream], ['RATE:UPC', 'BW:UPC'], -1],
-	['j15_ion_L1ZDC_XOR_TE5_VTE200',                 'L1_ZDC_XOR_TE5_VTE200',[], [UPCStream], ['RATE:UPC', 'BW:UPC'], -1],
-	['j20_ion_L1ZDC_XOR_TE5_VTE200',                 'L1_ZDC_XOR_TE5_VTE200',[], [UPCStream], ['RATE:UPC', 'BW:UPC'], -1],
-
-        ['j5_ion_L1ZDC_A_C_TE5_VTE200',                  'L1_ZDC_A_C_TE5_VTE200',[], [UPCStream], ['RATE:UPC', 'BW:UPC'], -1],
-        ['j10_ion_L1ZDC_A_C_TE5_VTE200',                 'L1_ZDC_A_C_TE5_VTE200',[], [UPCStream], ['RATE:UPC', 'BW:UPC'], -1],
-	['j15_ion_L1ZDC_A_C_TE5_VTE200',                 'L1_ZDC_A_C_TE5_VTE200',[], [UPCStream], ['RATE:UPC', 'BW:UPC'], -1],
-	['j20_ion_L1ZDC_A_C_TE5_VTE200',                 'L1_ZDC_A_C_TE5_VTE200',[], [UPCStream], ['RATE:UPC', 'BW:UPC'], -1],
-        
-        #forward
-        ['j10_320eta490_ion_L1TE5_VTE200',                 'L1_TE5_VTE200',[], [UPCStream], ['RATE:UPC', 'BW:UPC'], -1],
-        ['j10_320eta490_ion_L1ZDC_XOR_TE5_VTE200',         'L1_ZDC_XOR_TE5_VTE200',[], [UPCStream], ['RATE:UPC', 'BW:UPC'], -1],
-        ['j10_320eta490_ion_L1ZDC_A_C_TE5_VTE200',         'L1_ZDC_A_C_TE5_VTE200',[], [UPCStream], ['RATE:UPC', 'BW:UPC'], -1],
-        ['j15_320eta490_ion_L1TE5_VTE200',                 'L1_TE5_VTE200',[], [UPCStream], ['RATE:UPC', 'BW:UPC'], -1],
-        ['j15_320eta490_ion_L1ZDC_XOR_TE5_VTE200',         'L1_ZDC_XOR_TE5_VTE200',[], [UPCStream], ['RATE:UPC', 'BW:UPC'], -1],
-        ['j15_320eta490_ion_L1ZDC_A_C_TE5_VTE200',         'L1_ZDC_A_C_TE5_VTE200',[], [UPCStream], ['RATE:UPC', 'BW:UPC'], -1],
-        ['j20_320eta490_ion_L1TE5_VTE200',                 'L1_TE5_VTE200',[], [UPCStream], ['RATE:UPC', 'BW:UPC'], -1],
-        ['j20_320eta490_ion_L1ZDC_XOR_TE5_VTE200',         'L1_ZDC_XOR_TE5_VTE200',[], [UPCStream], ['RATE:UPC', 'BW:UPC'], -1],
-        ['j20_320eta490_ion_L1ZDC_A_C_TE5_VTE200',         'L1_ZDC_A_C_TE5_VTE200',[], [UPCStream], ['RATE:UPC', 'BW:UPC'], -1],
-
-	#photoproduction ATR-12470
-	['2j10_ion_L1TE5_VTE200',                 'L1_TE5_VTE200',[], [UPCStream], ['RATE:UPC', 'BW:UPC'], -1],
-	['2j15_ion_L1TE5_VTE200',                 'L1_TE5_VTE200',[], [UPCStream], ['RATE:UPC', 'BW:UPC'], -1],
-	['2j20_ion_L1TE5_VTE200',                 'L1_TE5_VTE200',[], [UPCStream], ['RATE:UPC', 'BW:UPC'], -1],
-
-	['2j10_ion_L1ZDC_XOR_TE5_VTE200',         'L1_ZDC_XOR_TE5_VTE200',[], [UPCStream], ['RATE:UPC', 'BW:UPC'], -1],
-	['2j15_ion_L1ZDC_XOR_TE5_VTE200',         'L1_ZDC_XOR_TE5_VTE200',[], [UPCStream], ['RATE:UPC', 'BW:UPC'], -1],
-	['2j20_ion_L1ZDC_XOR_TE5_VTE200',         'L1_ZDC_XOR_TE5_VTE200',[], [UPCStream], ['RATE:UPC', 'BW:UPC'], -1],
-
-	['2j10_ion_L1ZDC_A_C_TE5_VTE200',         'L1_ZDC_A_C_TE5_VTE200',[], [UPCStream], ['RATE:UPC', 'BW:UPC'], -1],
-	['2j15_ion_L1ZDC_A_C_TE5_VTE200',         'L1_ZDC_A_C_TE5_VTE200',[], [UPCStream], ['RATE:UPC', 'BW:UPC'], -1],
-	['2j20_ion_L1ZDC_A_C_TE5_VTE200',         'L1_ZDC_A_C_TE5_VTE200',[], [UPCStream], ['RATE:UPC', 'BW:UPC'], -1],
-
-	['j10_ion_mb_mbts_vetombts1side2in_L1ZDC_A_C_VTE50',  'L1_ZDC_A_C_VTE50'  ,['',''], [UPCStream], ['RATE:UPC', 'BW:UPC'], -1,['serial',-1,[ 'mb_mbts_vetombts1side2in','j10_ion']]],
-        ['j15_ion_mb_mbts_vetombts1side2in_L1ZDC_A_C_VTE50',  'L1_ZDC_A_C_VTE50'  ,['',''], [UPCStream], ['RATE:UPC', 'BW:UPC'], -1,['serial',-1,[ 'mb_mbts_vetombts1side2in','j15_ion']]],
-        ['j20_ion_mb_mbts_vetombts1side2in_L1ZDC_A_C_VTE50',  'L1_ZDC_A_C_VTE50'  ,['',''], [UPCStream], ['RATE:UPC', 'BW:UPC'], -1,['serial',-1,[ 'mb_mbts_vetombts1side2in','j20_ion']]],
-        
-        ['j10_ion_mb_mbts_vetombts1side2in_L1ZDC_A_C_TE5_VTE200',  'L1_ZDC_A_C_TE5_VTE200'  ,['',''], [UPCStream], ['RATE:UPC', 'BW:UPC'], -1,['serial',-1,[ 'mb_mbts_vetombts1side2in','j10_ion']]],
-        ['j15_ion_mb_mbts_vetombts1side2in_L1ZDC_A_C_TE5_VTE200',  'L1_ZDC_A_C_TE5_VTE200'  ,['',''], [UPCStream], ['RATE:UPC', 'BW:UPC'], -1,['serial',-1,[ 'mb_mbts_vetombts1side2in','j15_ion']]],
-        ['j20_ion_mb_mbts_vetombts1side2in_L1ZDC_A_C_TE5_VTE200',  'L1_ZDC_A_C_TE5_VTE200'  ,['',''], [UPCStream], ['RATE:UPC', 'BW:UPC'], -1,['serial',-1,[ 'mb_mbts_vetombts1side2in','j20_ion']]],
-        
-        ['j10_ion_mb_mbts_vetombts1side2in_L1ZDC_XOR_TE5_VTE200',  'L1_ZDC_XOR_TE5_VTE200'  ,['',''], [UPCStream], ['RATE:UPC', 'BW:UPC'], -1,['serial',-1,[ 'mb_mbts_vetombts1side2in','j10_ion']]],
-        ['j15_ion_mb_mbts_vetombts1side2in_L1ZDC_XOR_TE5_VTE200',  'L1_ZDC_XOR_TE5_VTE200'  ,['',''], [UPCStream], ['RATE:UPC', 'BW:UPC'], -1,['serial',-1,[ 'mb_mbts_vetombts1side2in','j15_ion']]],
-        ['j20_ion_mb_mbts_vetombts1side2in_L1ZDC_XOR_TE5_VTE200',  'L1_ZDC_XOR_TE5_VTE200'  ,['',''], [UPCStream], ['RATE:UPC', 'BW:UPC'], -1,['serial',-1,[ 'mb_mbts_vetombts1side2in','j20_ion']]],
-
-	['2j10_ion_mb_mbts_vetombts1side2in_L1ZDC_A_C_VTE50',  'L1_ZDC_A_C_VTE50'  ,['',''], [UPCStream], ['RATE:UPC', 'BW:UPC'], -1,['serial',-1,[ 'mb_mbts_vetombts1side2in','2j10_ion']]],
-	['2j15_ion_mb_mbts_vetombts1side2in_L1ZDC_A_C_VTE50',  'L1_ZDC_A_C_VTE50'  ,['',''], [UPCStream], ['RATE:UPC', 'BW:UPC'], -1,['serial',-1,[ 'mb_mbts_vetombts1side2in','2j15_ion']]],
-        ['2j20_ion_mb_mbts_vetombts1side2in_L1ZDC_A_C_VTE50',  'L1_ZDC_A_C_VTE50'  ,['',''], [UPCStream], ['RATE:UPC', 'BW:UPC'], -1,['serial',-1,[ 'mb_mbts_vetombts1side2in','2j20_ion']]],
-
-	['2j10_ion_mb_mbts_vetombts1side2in_L1ZDC_A_C_TE5_VTE200',  'L1_ZDC_A_C_TE5_VTE200'  ,['',''], [UPCStream], ['RATE:UPC', 'BW:UPC'], -1,['serial',-1,[ 'mb_mbts_vetombts1side2in','2j10_ion']]],
-        ['2j15_ion_mb_mbts_vetombts1side2in_L1ZDC_A_C_TE5_VTE200',  'L1_ZDC_A_C_TE5_VTE200'  ,['',''], [UPCStream], ['RATE:UPC', 'BW:UPC'], -1,['serial',-1,[ 'mb_mbts_vetombts1side2in','2j15_ion']]],
-        ['2j20_ion_mb_mbts_vetombts1side2in_L1ZDC_A_C_TE5_VTE200',  'L1_ZDC_A_C_TE5_VTE200'  ,['',''], [UPCStream], ['RATE:UPC', 'BW:UPC'], -1,['serial',-1,[ 'mb_mbts_vetombts1side2in','2j20_ion']]],
+	['j10_320eta490_ion_L1MBTS_1_1',         'L1_MBTS_1_1',[], [HardProbesStream], ['RATE:SingleJet', 'BW:Jet'], -1],
+	['j15_320eta490_ion_L1MBTS_1_1',         'L1_MBTS_1_1',[], [HardProbesStream], ['RATE:SingleJet', 'BW:Jet'], -1],
+	#['j15_320eta490_ion_L1TE5',         'L1_TE5',[], [HardProbesStream], ['RATE:SingleJet', 'BW:Jet'], -1],
+	#['j25_320eta490_ion_L1TE5',         'L1_TE5',[], [HardProbesStream], ['RATE:SingleJet', 'BW:Jet'], -1],
+	['j25_320eta490_ion_L1TE10',         'L1_TE10',[], [HardProbesStream], ['RATE:SingleJet', 'BW:Jet'], -1],
+	['j35_320eta490_ion_L1TE10',         'L1_TE10',[], [HardProbesStream], ['RATE:SingleJet', 'BW:Jet'], -1],
+	#['j45_320eta490_ion',         'L1_J15.31ETA49',[], [HardProbesStream], ['RATE:SingleJet', 'BW:Jet'], -1],
+	#['j55_320eta490_ion',         'L1_J15.31ETA49',[], [HardProbesStream], ['RATE:SingleJet', 'BW:Jet'], -1],
 
-	['2j10_ion_mb_mbts_vetombts1side2in_L1ZDC_XOR_TE5_VTE200',  'L1_ZDC_XOR_TE5_VTE200'  ,['',''], [UPCStream], ['RATE:UPC', 'BW:UPC'], -1,['serial',-1,[ 'mb_mbts_vetombts1side2in','2j10_ion']]],
-        ['2j15_ion_mb_mbts_vetombts1side2in_L1ZDC_XOR_TE5_VTE200',  'L1_ZDC_XOR_TE5_VTE200'  ,['',''], [UPCStream], ['RATE:UPC', 'BW:UPC'], -1,['serial',-1,[ 'mb_mbts_vetombts1side2in','2j15_ion']]],
-        ['2j20_ion_mb_mbts_vetombts1side2in_L1ZDC_XOR_TE5_VTE200',  'L1_ZDC_XOR_TE5_VTE200'  ,['',''], [UPCStream], ['RATE:UPC', 'BW:UPC'], -1,['serial',-1,[ 'mb_mbts_vetombts1side2in','2j20_ion']]],
         ]
 
     TriggerFlags.BjetSlice.signatures = [
@@ -249,7 +165,7 @@ def setupMenu():
     TriggerFlags.EgammaSlice.signatures = [
 
 	['e10_etcut',                  'L1_EM7',  [], [HardProbesStream], ['RATE:SingleElectron', 'BW:Egamma'], -1],
-	['e12_etcut',                  'L1_EM8',  [], [HardProbesStream], ['RATE:SingleElectron', 'BW:Egamma'], -1],
+	##['e12_etcut',                  'L1_EM8',  [], [HardProbesStream], ['RATE:SingleElectron', 'BW:Egamma'], -1],
 	['e15_etcut',                  'L1_EM10', [], [HardProbesStream], ['RATE:SingleElectron', 'BW:Egamma'], -1],
         ['e15_etcut_L1EM12',           'L1_EM12', [], [HardProbesStream], ['RATE:SingleElectron', 'BW:Egamma'], -1],
 	['g12_etcut',                  'L1_EM10', [], [HardProbesStream], ['RATE:SinglPhoton', 'BW:Egamma'], -1],
@@ -270,7 +186,7 @@ def setupMenu():
 	
 	#heavy ion instances	
 	['e10_etcut_ion',              'L1_EM7', [], [HardProbesStream, 'express'], ['RATE:SingleElectron', 'BW:Egamma'], -1],
-	['e12_etcut_ion',              'L1_EM8', [], [HardProbesStream, 'express'], ['RATE:SingleElectron', 'BW:Egamma'], -1],
+	##['e12_etcut_ion',              'L1_EM8', [], [HardProbesStream, 'express'], ['RATE:SingleElectron', 'BW:Egamma'], -1],
         ['e12_etcut_ion_L1EM10',       'L1_EM10', [], [HardProbesStream, 'express'], ['RATE:SingleElectron', 'BW:Egamma'], -1],
         ['e15_etcut_ion',              'L1_EM10', [], [HardProbesStream, 'express'], ['RATE:SingleElectron', 'BW:Egamma'], -1],
         ['e15_etcut_ion_L1EM12',       'L1_EM12', [], [HardProbesStream, 'express'], ['RATE:SingleElectron', 'BW:Egamma'], -1],
@@ -309,7 +225,7 @@ def setupMenu():
 	['e15_medium_ion_idperf_L1EM12', 'L1_EM12', [], [HardProbesStream, 'express'], ['RATE:IDMonitoring', 'BW:Egamma', 'BW:ID'],-1],
 
 	#di-electrons , timeouts ATR-10226
-	['2e10_loose_ion',               'L1_2EM7', [], [HardProbesStream, 'express'], ['RATE:MultiElectron', 'BW:Egamma'], -1],
+	##['2e10_loose_ion',               'L1_2EM7', [], [HardProbesStream, 'express'], ['RATE:MultiElectron', 'BW:Egamma'], -1],
 	#['2e10_lhloose_ion',            'L1_2EM5', [], [HardProbesStream], ['RATE:SingleElectron', 'BW:Egamma'], -1],
 
 	['g15_loose',                  'L1_EM10', [], [HardProbesStream, 'express'], ['RATE:SinglePhoton', 'BW:Egamma'], -1],
@@ -323,8 +239,8 @@ def setupMenu():
         ['g20_medium_ion',             'L1_EM12', [], [HardProbesStream], ['RATE:SinglePhoton', 'BW:Egamma'], -1],
 
 	#di-photon triggers
-	['2g15_loose',                  'L1_2EM10', [], [HardProbesStream], ['RATE:MultiPhoton', 'BW:Egamma'], -1],
-	['2g15_loose_ion',              'L1_2EM10', [], [HardProbesStream], ['RATE:MultiPhoton', 'BW:Egamma'], -1],
+	##['2g15_loose',                  'L1_2EM10', [], [HardProbesStream], ['RATE:MultiPhoton', 'BW:Egamma'], -1],
+	##['2g15_loose_ion',              'L1_2EM10', [], [HardProbesStream], ['RATE:MultiPhoton', 'BW:Egamma'], -1],
 
 	# Monopole triggers ATR-12467
         ['g0_hiptrt_L1EM14',                    'L1_EM14', [], [HardProbesStream], ['RATE:SinglePhoton', 'BW:Egamma'], -1],
@@ -340,130 +256,58 @@ def setupMenu():
         ]
 
     TriggerFlags.CombinedSlice.signatures = [
-	['mu4_j20_a3_ion_dr05', 'L1_MU4',     ['L1_MU4', ''], [HardProbesStream], ['RATE:MuonBjet', 'BW:BJet'], -1,['serial',-1,['mu4', 'j20_a3_ion'] ]],
 	['mu4_j20_ion_dr05', 'L1_MU4',     ['L1_MU4', ''], [HardProbesStream, 'express'], ['RATE:MuonBjet', 'BW:BJet'], -1,['serial',-1,['mu4', 'j20_ion'] ]],
-
-	['mu4_j25_a3_ion_dr05', 'L1_MU4',     ['L1_MU4', ''], [HardProbesStream], ['RATE:MuonBjet', 'BW:BJet'], -1,['serial',-1,['mu4', 'j25_a3_ion'] ]],
 	['mu4_j25_ion_dr05', 'L1_MU4',     ['L1_MU4', ''], [HardProbesStream], ['RATE:MuonBjet', 'BW:BJet'], -1,['serial',-1,['mu4', 'j25_ion'] ]],
-
-	['mu4_j30_a3_ion_dr05', 'L1_MU4',     ['L1_MU4', ''], [HardProbesStream], ['RATE:MuonBjet', 'BW:BJet'], -1,['serial',-1,['mu4', 'j30_a3_ion'] ]],
 	['mu4_j30_ion_dr05', 'L1_MU4',     ['L1_MU4', ''], [HardProbesStream], ['RATE:MuonBjet', 'BW:BJet'], -1,['serial',-1,['mu4', 'j30_ion'] ]],
-
-	['mu4_j40_a3_ion_dr05', 'L1_MU4',     ['L1_MU4', ''], [HardProbesStream], ['RATE:MuonBjet', 'BW:BJet'], -1,['serial',-1,['mu4', 'j40_a3_ion'] ]],
 	['mu4_j40_ion_dr05', 'L1_MU4',     ['L1_MU4', ''], [HardProbesStream], ['RATE:MuonBjet', 'BW:BJet'], -1,['serial',-1,['mu4', 'j40_ion'] ]],
-	
-	['mu4_j50_a3_ion_dr05', 'L1_MU4',     ['L1_MU4', ''], [HardProbesStream], ['RATE:MuonBjet', 'BW:BJet'], -1,['serial',-1,['mu4', 'j50_a3_ion'] ]],
 	['mu4_j50_ion_dr05', 'L1_MU4',     ['L1_MU4', ''], [HardProbesStream], ['RATE:MuonBjet', 'BW:BJet'], -1,['serial',-1,['mu4', 'j50_ion'] ]],
-
-	['mu4_j60_a3_ion_dr05', 'L1_MU4',     ['L1_MU4', ''], [HardProbesStream], ['RATE:MuonBjet', 'BW:BJet'], -1,['serial',-1,['mu4', 'j60_a3_ion'] ]],
 	['mu4_j60_ion_dr05', 'L1_MU4',     ['L1_MU4', ''], [HardProbesStream, 'express'], ['RATE:MuonBjet', 'BW:BJet'], -1,['serial',-1,['mu4', 'j60_ion'] ]],
 
-
-	['mu6_j20_a3_ion_dr05', 'L1_MU6',     ['L1_MU6', ''], [HardProbesStream], ['RATE:MuonBjet', 'BW:BJet'], -1,['serial',-1,['mu6', 'j20_a3_ion'] ]],
 	['mu6_j20_ion_dr05', 'L1_MU6',     ['L1_MU6', ''], [HardProbesStream], ['RATE:MuonBjet', 'BW:BJet'], -1,['serial',-1,['mu6', 'j20_ion'] ]],
-
-	['mu6_j25_a3_ion_dr05', 'L1_MU6',     ['L1_MU6', ''], [HardProbesStream], ['RATE:MuonBjet', 'BW:BJet'], -1,['serial',-1,['mu6', 'j25_a3_ion'] ]],
 	['mu6_j25_ion_dr05', 'L1_MU6',     ['L1_MU6', ''], [HardProbesStream], ['RATE:MuonBjet', 'BW:BJet'], -1,['serial',-1,['mu6', 'j25_ion'] ]],
-
-	['mu6_j30_a3_ion_dr05', 'L1_MU6',     ['L1_MU6', ''], [HardProbesStream], ['RATE:MuonBjet', 'BW:BJet'], -1,['serial',-1,['mu6', 'j30_a3_ion'] ]],
 	['mu6_j30_ion_dr05', 'L1_MU6',     ['L1_MU6', ''], [HardProbesStream, 'express'], ['RATE:MuonBjet', 'BW:BJet'], -1,['serial',-1,['mu6', 'j30_ion'] ]],
 
 	#supporting triggers
-	['mu4_j20_a3_ion', 'L1_MU4',     ['L1_MU4', ''], [HardProbesStream], ['RATE:MuonBjet', 'BW:BJet'], -1,['serial',-1,['mu4', 'j20_a3_ion'] ]],
 	['mu4_j20_ion', 'L1_MU4',     ['L1_MU4', ''], [HardProbesStream], ['RATE:MuonBjet', 'BW:BJet'], -1,['serial',-1,['mu4', 'j20_ion'] ]],
-
-	['mu4_j25_a3_ion', 'L1_MU4',     ['L1_MU4', ''], [HardProbesStream], ['RATE:MuonBjet', 'BW:BJet'], -1,['serial',-1,['mu4', 'j25_a3_ion'] ]],
 	['mu4_j25_ion', 'L1_MU4',     ['L1_MU4', ''], [HardProbesStream], ['RATE:MuonBjet', 'BW:BJet'], -1,['serial',-1,['mu4', 'j25_ion'] ]],
-    
-	['mu4_j30_a3_ion', 'L1_MU4',     ['L1_MU4', ''], [HardProbesStream], ['RATE:MuonBjet', 'BW:BJet'], -1,['serial',-1,['mu4', 'j30_a3_ion'] ]],
 	['mu4_j30_ion', 'L1_MU4',     ['L1_MU4', ''], [HardProbesStream], ['RATE:MuonBjet', 'BW:BJet'], -1,['serial',-1,['mu4', 'j30_ion'] ]],
-
-	['mu4_j40_a3_ion', 'L1_MU4',     ['L1_MU4', ''], [HardProbesStream], ['RATE:MuonBjet', 'BW:BJet'], -1,['serial',-1,['mu4', 'j40_a3_ion'] ]],
 	['mu4_j40_ion', 'L1_MU4',     ['L1_MU4', ''], [HardProbesStream], ['RATE:MuonBjet', 'BW:BJet'], -1,['serial',-1,['mu4', 'j40_ion'] ]],
-
-	['mu4_j50_a3_ion', 'L1_MU4',     ['L1_MU4', ''], [HardProbesStream], ['RATE:MuonBjet', 'BW:BJet'], -1,['serial',-1,['mu4', 'j50_a3_ion'] ]],
 	['mu4_j50_ion', 'L1_MU4',     ['L1_MU4', ''], [HardProbesStream], ['RATE:MuonBjet', 'BW:BJet'], -1,['serial',-1,['mu4', 'j50_ion'] ]],
-
-	['mu4_j60_a3_ion', 'L1_MU4',     ['L1_MU4', ''], [HardProbesStream], ['RATE:MuonBjet', 'BW:BJet'], -1,['serial',-1,['mu4', 'j60_a3_ion'] ]],
 	['mu4_j60_ion', 'L1_MU4',     ['L1_MU4', ''], [HardProbesStream], ['RATE:MuonBjet', 'BW:BJet'], -1,['serial',-1,['mu4', 'j60_ion'] ]],
 
-        
-
-	['mu6_j20_a3_ion', 'L1_MU6',     ['L1_MU6', ''], [HardProbesStream], ['RATE:MuonBjet', 'BW:BJet'], -1,['serial',-1,['mu6', 'j20_a3_ion'] ]],
 	['mu6_j20_ion', 'L1_MU6',     ['L1_MU6', ''], [HardProbesStream], ['RATE:MuonBjet', 'BW:BJet'], -1,['serial',-1,['mu6', 'j20_ion'] ]],
-
-	['mu6_j25_a3_ion', 'L1_MU6',     ['L1_MU6', ''], [HardProbesStream], ['RATE:MuonBjet', 'BW:BJet'], -1,['serial',-1,['mu6', 'j25_a3_ion'] ]],
 	['mu6_j25_ion', 'L1_MU6',     ['L1_MU6', ''], [HardProbesStream], ['RATE:MuonBjet', 'BW:BJet'], -1,['serial',-1,['mu6', 'j25_ion'] ]],
-
-	['mu6_j30_a3_ion', 'L1_MU6',     ['L1_MU6', ''], [HardProbesStream], ['RATE:MuonBjet', 'BW:BJet'], -1,['serial',-1,['mu6', 'j30_a3_ion'] ]],
 	['mu6_j30_ion', 'L1_MU6',     ['L1_MU6', ''], [HardProbesStream], ['RATE:MuonBjet', 'BW:BJet'], -1,['serial',-1,['mu6', 'j30_ion'] ]],
         ]
    
     TriggerFlags.HeavyIonSlice.signatures = [
 	#event shape triggers
-        ['hi_v2_th5_L1TE50',    'L1_TE50',   [], [MinBiasStream],["BW:EventShape", "RATE:EventShape"], 1],
-        ['hi_v3_th5_L1TE50',    'L1_TE50',   [], [MinBiasStream],["BW:EventShape", "RATE:EventShape"], 1],
-        ['hi_v2_th10_L1TE50',    'L1_TE50',   [], [MinBiasStream],["BW:EventShape", "RATE:EventShape"], 1],
-        ['hi_v3_th10_L1TE50',    'L1_TE50',   [], [MinBiasStream],["BW:EventShape", "RATE:EventShape"], 1],
-        ['hi_v2_th13_L1TE50',    'L1_TE50',   [], [MinBiasStream],["BW:EventShape", "RATE:EventShape"], 1],
-        ['hi_v3_th13_L1TE50',    'L1_TE50',   [], [MinBiasStream],["BW:EventShape", "RATE:EventShape"], 1],
-        ['hi_v2_th14_L1TE50',    'L1_TE50',   [], [MinBiasStream],["BW:EventShape", "RATE:EventShape"], 1],
-        ['hi_v3_th14_L1TE50',    'L1_TE50',   [], [MinBiasStream],["BW:EventShape", "RATE:EventShape"], 1],
-        ['hi_v2_th15_L1TE50',    'L1_TE50',   [], [MinBiasStream],["BW:EventShape", "RATE:EventShape"], 1],
-        ['hi_v3_th15_L1TE50',    'L1_TE50',   [], [MinBiasStream],["BW:EventShape", "RATE:EventShape"], 1],
-        ['hi_v2_th16_L1TE50',    'L1_TE50',   [], [MinBiasStream],["BW:EventShape", "RATE:EventShape"], 1],
-        ['hi_v3_th16_L1TE50',    'L1_TE50',   [], [MinBiasStream],["BW:EventShape", "RATE:EventShape"], 1],
-        ['hi_v3_th13_veto2_L1TE50',    'L1_TE50',   [], [MinBiasStream],["BW:EventShape", "RATE:EventShape"], 1],
-        ['hi_v2_th13_veto3_L1TE50',    'L1_TE50',   [], [MinBiasStream],["BW:EventShape", "RATE:EventShape"], 1],
-        ['hi_v23_th14_L1TE50',    'L1_TE50',   [], [MinBiasStream],["BW:EventShape", "RATE:EventShape"], 1],
-        ['hi_v23_th15_L1TE50',    'L1_TE50',   [], [MinBiasStream],["BW:EventShape", "RATE:EventShape"], 1],
-
-	#ultra-central triggers
-	#physics
-        ['hi_th1_ucc_L1TE10000',    'L1_TE10000',   [], [MinBiasStream, 'express'],["BW:UltraCentral", "RATE:UltraCentral"], 1],
-	['hi_th2_ucc_L1TE10000',    'L1_TE10000',   [], [MinBiasStream],["BW:UltraCentral", "RATE:UltraCentral"], 1],
-	['hi_th3_ucc_L1TE10000',    'L1_TE10000',   [], [MinBiasStream],["BW:UltraCentral", "RATE:UltraCentral"], 1],
-
-	['hi_th1_ucc_L1TE12000',    'L1_TE12000',   [], [MinBiasStream],["BW:UltraCentral", "RATE:UltraCentral"], 1],
-        ['hi_th2_ucc_L1TE12000',    'L1_TE12000',   [], [MinBiasStream],["BW:UltraCentral", "RATE:UltraCentral"], 1],
-        ['hi_th3_ucc_L1TE12000',    'L1_TE12000',   [], [MinBiasStream],["BW:UltraCentral", "RATE:UltraCentral"], 1],
-
-	['hi_th1_ucc_L1TE14000',    'L1_TE14000',   [], [MinBiasStream],["BW:UltraCentral", "RATE:UltraCentral"], 1],
-        ['hi_th2_ucc_L1TE14000',    'L1_TE14000',   [], [MinBiasStream],["BW:UltraCentral", "RATE:UltraCentral"], 1],
-        ['hi_th3_ucc_L1TE14000',    'L1_TE14000',   [], [MinBiasStream],["BW:UltraCentral", "RATE:UltraCentral"], 1],
-
-	#backup (ATR-12547)
-	['hi_th1_zdcpu_ucc_L1TE10000',    'L1_TE10000',   [], [MinBiasStream, 'express'],["BW:UltraCentral", "RATE:UltraCentral"], 1],
-        ['hi_th2_zdcpu_ucc_L1TE10000',    'L1_TE10000',   [], [MinBiasStream],["BW:UltraCentral", "RATE:UltraCentral"], 1],
-        ['hi_th3_zdcpu_ucc_L1TE10000',    'L1_TE10000',   [], [MinBiasStream],["BW:UltraCentral", "RATE:UltraCentral"], 1],
-
-        ['hi_th1_zdcpu_ucc_L1TE12000',    'L1_TE12000',   [], [MinBiasStream],["BW:UltraCentral", "RATE:UltraCentral"], 1],
-        ['hi_th2_zdcpu_ucc_L1TE12000',    'L1_TE12000',   [], [MinBiasStream],["BW:UltraCentral", "RATE:UltraCentral"], 1],
-        ['hi_th3_zdcpu_ucc_L1TE12000',    'L1_TE12000',   [], [MinBiasStream],["BW:UltraCentral", "RATE:UltraCentral"], 1],
+        ['hi_v2A_th1_L1TE50',    'L1_TE50',   [], [MinBiasStream],["BW:EventShape", "RATE:EventShape"], 1],
+        ['hi_v2C_th1_L1TE50',    'L1_TE50',   [], [MinBiasStream],["BW:EventShape", "RATE:EventShape"], 1],
+        ['hi_v2A_th2_L1TE50',    'L1_TE50',   [], [MinBiasStream],["BW:EventShape", "RATE:EventShape"], 1],
+        ['hi_v2C_th2_L1TE50',    'L1_TE50',   [], [MinBiasStream],["BW:EventShape", "RATE:EventShape"], 1],
+        ['hi_v2A_th3_L1TE50',    'L1_TE50',   [], [MinBiasStream],["BW:EventShape", "RATE:EventShape"], 1],
+        ['hi_v2C_th3_L1TE50',    'L1_TE50',   [], [MinBiasStream],["BW:EventShape", "RATE:EventShape"], 1],
+
+        #['hi_v2_th5_L1TE50',    'L1_TE50',   [], [MinBiasStream],["BW:EventShape", "RATE:EventShape"], 1],
+        #['hi_v3_th5_L1TE50',    'L1_TE50',   [], [MinBiasStream],["BW:EventShape", "RATE:EventShape"], 1],
+        #['hi_v2_th10_L1TE50',    'L1_TE50',   [], [MinBiasStream],["BW:EventShape", "RATE:EventShape"], 1],
+        #['hi_v3_th10_L1TE50',    'L1_TE50',   [], [MinBiasStream],["BW:EventShape", "RATE:EventShape"], 1],
+        #['hi_v2_th13_L1TE50',    'L1_TE50',   [], [MinBiasStream],["BW:EventShape", "RATE:EventShape"], 1],
+        #['hi_v3_th13_L1TE50',    'L1_TE50',   [], [MinBiasStream],["BW:EventShape", "RATE:EventShape"], 1],
+        #['hi_v2_th14_L1TE50',    'L1_TE50',   [], [MinBiasStream],["BW:EventShape", "RATE:EventShape"], 1],
+        #['hi_v3_th14_L1TE50',    'L1_TE50',   [], [MinBiasStream],["BW:EventShape", "RATE:EventShape"], 1],
+        #['hi_v2_th15_L1TE50',    'L1_TE50',   [], [MinBiasStream],["BW:EventShape", "RATE:EventShape"], 1],
+        #['hi_v3_th15_L1TE50',    'L1_TE50',   [], [MinBiasStream],["BW:EventShape", "RATE:EventShape"], 1],
+        #['hi_v2_th16_L1TE50',    'L1_TE50',   [], [MinBiasStream],["BW:EventShape", "RATE:EventShape"], 1],
+        #['hi_v3_th16_L1TE50',    'L1_TE50',   [], [MinBiasStream],["BW:EventShape", "RATE:EventShape"], 1],
+        #['hi_v3_th13_veto2_L1TE50',    'L1_TE50',   [], [MinBiasStream],["BW:EventShape", "RATE:EventShape"], 1],
+        #['hi_v2_th13_veto3_L1TE50',    'L1_TE50',   [], [MinBiasStream],["BW:EventShape", "RATE:EventShape"], 1],
+        #['hi_v23_th14_L1TE50',    'L1_TE50',   [], [MinBiasStream],["BW:EventShape", "RATE:EventShape"], 1],
+        #['hi_v23_th15_L1TE50',    'L1_TE50',   [], [MinBiasStream],["BW:EventShape", "RATE:EventShape"], 1],
     
-        ['hi_th1_zdcpu_ucc_L1TE14000',    'L1_TE14000',   [], [MinBiasStream],["BW:UltraCentral", "RATE:UltraCentral"], 1],
-        ['hi_th2_zdcpu_ucc_L1TE14000',    'L1_TE14000',   [], [MinBiasStream],["BW:UltraCentral", "RATE:UltraCentral"], 1],
-        ['hi_th3_zdcpu_ucc_L1TE14000',    'L1_TE14000',   [], [MinBiasStream],["BW:UltraCentral", "RATE:UltraCentral"], 1],
-
-	#performance/calibration
-	['hi_perf_ucc_L1TE10000',    'L1_TE10000',   [], [MinBiasStream],["BW:UltraCentral", "RATE:UltraCentral"], 1],
-	['hi_perf_ucc_L1ZDC_A_C',    'L1_ZDC_A_C',   [], [MinBiasStream],["BW:UltraCentral", "RATE:UltraCentral"], 1],
-        ['hi_perf_ucc_L1All',    '',   [], [MinBiasStream],["BW:UltraCentral", "RATE:UltraCentral"], 1],
-        ['hi_perfzdc_ucc_L1ZDC_A_C',    'L1_ZDC_A_C',   [], [MinBiasStream],["BW:UltraCentral", "RATE:UltraCentral"], 1],
-        ['hi_perfzdc_ucc_L1All',    '',   [], [MinBiasStream],["BW:UltraCentral", "RATE:UltraCentral"], 1],
-        
 	#ultra-peripheral
-        ['hi_loose_upc_L1ZDC_A_C_VTE50',     'L1_ZDC_A_C_VTE50',   [], [UPCStream],["BW:UPC", "RATE:UPC"], 1],
-	['hi_medium_upc_L1ZDC_A_C_VTE50',    'L1_ZDC_A_C_VTE50',   [], [UPCStream],["BW:UPC", "RATE:UPC"], 1],
-	['hi_tight_upc_L1ZDC_A_C_VTE50',     'L1_ZDC_A_C_VTE50',   [], [UPCStream],["BW:UPC", "RATE:UPC"], 1],
-
-	# ATR-12727
-	['hi_gg_upc_L1ZDC_A_C_VTE50',     'L1_ZDC_A_C_VTE50',   [], [UPCStream],["BW:UPC", "RATE:UPC"], 1],
-	['hi_gg_upc_L1TE5_VTE200',        'L1_TE5_VTE200',   [], [UPCStream],["BW:UPC", "RATE:UPC"], 1],
-	['hi_gg_upc_L1All',               '',   [], [UPCStream],["BW:UPC", "RATE:UPC"], 1],
 
-	# validation trigger
-	['hi_loose_upc_L1All',     '',   [], [UPCStream],["BW:UPC", "RATE:UPC"], 1],
         ]
     
     TriggerFlags.MinBiasSlice.signatures = [
@@ -475,7 +319,7 @@ def setupMenu():
 
 	#sptrk
         ['mb_sp',  'L1_RD0_FILLED', [], [MinBiasStream, 'express'],["BW:MinBias", "RATE:MinBias"], 1],
-        ['mb_sptrk_ion_L1ZDC_A_C_VTE50',  'L1_ZDC_A_C_VTE50', [], [MinBiasStream, 'express'],["BW:MinBias", "RATE:MinBias"], 1],
+        ##['mb_sptrk_ion_L1ZDC_A_C_VTE50',  'L1_ZDC_A_C_VTE50', [], [MinBiasStream, 'express'],["BW:MinBias", "RATE:MinBias"], 1],
         ['mb_sptrk_ion_L1MBTS_1_1_VTE50', 'L1_MBTS_1_1_VTE50', [], [MinBiasStream, 'express'],["BW:MinBias", "RATE:MinBias"], 1],
         ['mb_idperf_ion_L1MBTS_1', 'L1_MBTS_1', [], [MinBiasStream],["BW:MinBias", "RATE:MinBias"], 1],
         ['mb_idperf_ion_L1MBTS_1_1', 'L1_MBTS_1_1', [], [MinBiasStream, 'express'],["BW:MinBias", "RATE:MinBias"], 1],
@@ -483,13 +327,8 @@ def setupMenu():
         ['mb_perf_L1RD1_FILLED',    'L1_RD1_FILLED',   [], [MinBiasStream],["BW:MinBias", "RATE:MinBias"], 1],
         ['mb_perf_L1RD1_EMPTY',    'L1_RD1_EMPTY',   [], [MinBiasStream],["BW:MinBias", "RATE:MinBias"], 1],
 
-	#supporting ATR-12470, ATR-12923
-	['mb_sptrk_ion_L1ZDC_A_C_TE5_VTE200',  'L1_ZDC_A_C_TE5_VTE200', [], [UPCStream],["BW:UPC", "RATE:UPC"], 1],
-	['mb_sptrk_ion_L1ZDC_XOR_TE5_VTE200',  'L1_ZDC_XOR_TE5_VTE200', [], [UPCStream],["BW:UPC", "RATE:UPC"], 1],
-	['mb_sptrk_ion_L1ZDC_VTE200',  'L1_ZDC_VTE200', [], [UPCStream],["BW:UPC", "RATE:UPC"], 1],
-
 	#overlay
-	['mb_sptrk_ion_L1ZDC_A_C_VTE50_OVERLAY',  'L1_ZDC_A_C_VTE50_OVERLAY', [], ['MinBiasOverlay'],["BW:MinBiasOverlay", "RATE:MinBiasOverlay"], 1],
+	##['mb_sptrk_ion_L1ZDC_A_C_VTE50_OVERLAY',  'L1_ZDC_A_C_VTE50_OVERLAY', [], ['MinBiasOverlay'],["BW:MinBiasOverlay", "RATE:MinBiasOverlay"], 1],
 
         #Zdc
 	['mb_lg_zdcperf_L1All',  '', [], [MinBiasStream],["BW:MinBias", "RATE:MinBias"], 1],
@@ -497,90 +336,82 @@ def setupMenu():
         ['mb_hg_zdcperf_L1All',  '', [], [MinBiasStream],["BW:MinBias", "RATE:MinBias"], 1],
         ['mb_hg_zdcperf_L1ZDC_A_C',  'L1_ZDC_A_C', [], [MinBiasStream],["BW:MinBias", "RATE:MinBias"], 1],
 
-	#UPC ATR-10574
-	['mb_sptrk_vetombts2in_L1MU0_VTE50',                 'L1_MU0_VTE50',   [], [UPCStream, 'express'], ["BW:UPC", "RATE:UPC"], -1],
-	['mb_sptrk_vetombts2in_L1ZDC_A_C_VTE50',             'L1_ZDC_A_C_VTE50',   [], [UPCStream], ["BW:UPC", "RATE:UPC"], -1],
-
-	#photo-production ATR-12470
-	['mb_sptrk_vetombts1side2in_L1ZDC_XOR_TE5_VTE200',        'L1_ZDC_XOR_TE5_VTE200',   [], [UPCStream], ["BW:UPC", "RATE:UPC"], -1],
-	['mb_sptrk_vetombts1side2in_L1ZDC_XOR_TRT_VTE200',        'L1_ZDC_XOR_TRT_VTE200',   [], [UPCStream], ["BW:UPC", "RATE:UPC"], -1],
-
         ]
 
     TriggerFlags.CalibSlice.signatures   = [
 
-	['idcalib_trk9_central_L1J10_VTE100',    'L1_J10_VTE100', [], ['IDTracks'], [ 'RATE:IDTracks','BW:Detector'], -1],
-        ['idcalib_trk9_fwd_L1J10_VTE100',        'L1_J10_VTE100', [], ['IDTracks'], [ 'RATE:IDTracks','BW:Detector'], -1],
-	['idcalib_trk9_central_L1J10_VTE200',    'L1_J10_VTE200', [], ['IDTracks'], [ 'RATE:IDTracks','BW:Detector'], -1],
-        ['idcalib_trk9_fwd_L1J10_VTE200',        'L1_J10_VTE200', [], ['IDTracks'], [ 'RATE:IDTracks','BW:Detector'], -1],
+	##['idcalib_trk9_central_L1J10_VTE100',    'L1_J10_VTE100', [], ['IDTracks'], [ 'RATE:IDTracks','BW:Detector'], -1],
+        ##['idcalib_trk9_fwd_L1J10_VTE100',        'L1_J10_VTE100', [], ['IDTracks'], [ 'RATE:IDTracks','BW:Detector'], -1],
+	##['idcalib_trk9_central_L1J10_VTE200',    'L1_J10_VTE200', [], ['IDTracks'], [ 'RATE:IDTracks','BW:Detector'], -1],
+        ##['idcalib_trk9_fwd_L1J10_VTE200',        'L1_J10_VTE200', [], ['IDTracks'], [ 'RATE:IDTracks','BW:Detector'], -1],
 
-        ['idcalib_trk9_central',    'L1_TE5_VTE200', [], ['IDTracks'], [ 'RATE:IDTracks','BW:Detector'], -1],
-        ['idcalib_trk9_fwd',        'L1_TE5_VTE200', [], ['IDTracks'], [ 'RATE:IDTracks','BW:Detector'], -1],
-        ['idcalib_trk16_central',   'L1_TE5_VTE200', [], ['IDTracks'], [ 'RATE:IDTracks','BW:Detector'], -1],
-        ['idcalib_trk16_fwd',       'L1_TE5_VTE200', [], ['IDTracks'], [ 'RATE:IDTracks','BW:Detector'], -1],
-        ['idcalib_trk29_central',   'L1_TE5_VTE200', [], ['IDTracks'], [ 'RATE:IDTracks','BW:Detector'], -1],
-        ['idcalib_trk29_fwd',       'L1_TE5_VTE200', [], ['IDTracks'], [ 'RATE:IDTracks','BW:Detector'], -1],
+        ##['idcalib_trk9_central',    'L1_TE5_VTE200', [], ['IDTracks'], [ 'RATE:IDTracks','BW:Detector'], -1],
+        ##['idcalib_trk9_fwd',        'L1_TE5_VTE200', [], ['IDTracks'], [ 'RATE:IDTracks','BW:Detector'], -1],
+        ##['idcalib_trk16_central',   'L1_TE5_VTE200', [], ['IDTracks'], [ 'RATE:IDTracks','BW:Detector'], -1],
+        ##['idcalib_trk16_fwd',       'L1_TE5_VTE200', [], ['IDTracks'], [ 'RATE:IDTracks','BW:Detector'], -1],
+        ##['idcalib_trk29_central',   'L1_TE5_VTE200', [], ['IDTracks'], [ 'RATE:IDTracks','BW:Detector'], -1],
+        ##['idcalib_trk29_fwd',       'L1_TE5_VTE200', [], ['IDTracks'], [ 'RATE:IDTracks','BW:Detector'], -1],
 
         ['lumipeb_L1RD0_EMPTY',        'L1_RD0_EMPTY', [], ['PixelNoise'], ["RATE:Calibration", "RATE:PixelCalibration", "BW:Detector"], -1],
         ['lumipeb_L1RD0_FILLED',         'L1_RD0_FILLED', [], ['PixelBeam'], ["RATE:Calibration", "RATE:PixelBeamCalibration", "BW:Detector"], -1],
         ['lumipeb_L1RD0_UNPAIRED_ISO',    'L1_RD0_UNPAIRED_ISO',    [], ['PixelBeam'], ["RATE:Calibration", "BW:Detector"], -1],
-        ['lumipeb_L1RD0_ABORTGAPNOTCALIB',    'L1_RD0_ABORTGAPNOTCALIB',    [], ['PixelBeam'], ["RATE:Calibration", "BW:Detector"], -1],
+        #['lumipeb_L1RD0_ABORTGAPNOTCALIB',    'L1_RD0_ABORTGAPNOTCALIB',    [], ['PixelBeam'], ["RATE:Calibration", "BW:Detector"], -1],
         ['lumipeb_L1MBTS_1_1',    'L1_MBTS_1_1',    [], ['PixelBeam'], ["RATE:Calibration", "BW:Detector"], -1],
         ['lumipeb_L1MBTS_1_1_UNPAIRED_ISO',    'L1_MBTS_1_1_UNPAIRED_ISO',    [], ['PixelBeam'], ["RATE:Calibration", "BW:Detector"], -1],
 
 
         # triggers for VdM scan
-        ['lumipeb_vdm_L1MBTS_2_BGRP9',          'L1_MBTS_2_BGRP9',          [], ['VdM'], ["RATE:Calibration", "BW:Detector"], -1],
-        ['lumipeb_vdm_L1MBTS_2_BGRP11',         'L1_MBTS_2_BGRP11',         [], ['VdM'], ["RATE:Calibration", "BW:Detector"], -1],
+        ##['lumipeb_vdm_L1MBTS_2_BGRP9',          'L1_MBTS_2_BGRP9',          [], ['VdM'], ["RATE:Calibration", "BW:Detector"], -1],
+        ##['lumipeb_vdm_L1MBTS_2_BGRP11',         'L1_MBTS_2_BGRP11',         [], ['VdM'], ["RATE:Calibration", "BW:Detector"], -1],
         ['lumipeb_vdm_L1MBTS_2_UNPAIRED_ISO',   'L1_MBTS_2_UNPAIRED_ISO',   [], ['VdM'], ["RATE:Calibration", "BW:Detector"], -1],
-        ['lumipeb_vdm_L1MBTS_1_1_BGRP9',        'L1_MBTS_1_1_BGRP9',        [], ['VdM'], ["RATE:Calibration", "BW:Detector"], -1],
-        ['lumipeb_vdm_L1MBTS_1_1_BGRP11',       'L1_MBTS_1_1_BGRP11',       [], ['VdM'], ["RATE:Calibration", "BW:Detector"], -1],
+        ##['lumipeb_vdm_L1MBTS_1_1_BGRP9',        'L1_MBTS_1_1_BGRP9',        [], ['VdM'], ["RATE:Calibration", "BW:Detector"], -1],
+        ##['lumipeb_vdm_L1MBTS_1_1_BGRP11',       'L1_MBTS_1_1_BGRP11',       [], ['VdM'], ["RATE:Calibration", "BW:Detector"], -1],
         ['lumipeb_vdm_L1MBTS_1_1_UNPAIRED_ISO', 'L1_MBTS_1_1_UNPAIRED_ISO', [], ['VdM'], ["RATE:Calibration", "BW:Detector"], -1],
-        ['lumipeb_vdm_L1ZDC_A_C_BGRP9',         'L1_ZDC_A_C_BGRP9',         [], ['VdM'], ["RATE:Calibration", "BW:Detector"], -1],
-        ['lumipeb_vdm_L1ZDC_A_C_BGRP11',        'L1_ZDC_A_C_BGRP11',        [], ['VdM'], ["RATE:Calibration", "BW:Detector"], -1],
+        ##['lumipeb_vdm_L1ZDC_A_C_BGRP9',         'L1_ZDC_A_C_BGRP9',         [], ['VdM'], ["RATE:Calibration", "BW:Detector"], -1],
+        ##['lumipeb_vdm_L1ZDC_A_C_BGRP11',        'L1_ZDC_A_C_BGRP11',        [], ['VdM'], ["RATE:Calibration", "BW:Detector"], -1],
         ['lumipeb_vdm_L1ZDC_A_C_UNPAIRED_ISO',  'L1_ZDC_A_C_UNPAIRED_ISO',  [], ['VdM'], ["RATE:Calibration", "BW:Detector"], -1],
-        ['lumipeb_vdm_L1RD0_BGRP9',             'L1_RD0_BGRP9',             [], ['VdM'], ["RATE:Calibration", "BW:Detector"], -1],
+        ##['lumipeb_vdm_L1RD0_BGRP9',             'L1_RD0_BGRP9',             [], ['VdM'], ["RATE:Calibration", "BW:Detector"], -1],
         ['lumipeb_vdm_L1MBTS_2',                'L1_MBTS_2',                [], ['VdM'], ["RATE:Calibration", "BW:Detector"], -1],
         ['lumipeb_vdm_L1MBTS_1_1',              'L1_MBTS_1_1',              [], ['VdM'], ["RATE:Calibration", "BW:Detector"], -1],
         ['lumipeb_vdm_L1ZDC_A_C',               'L1_ZDC_A_C',               [], ['VdM'], ["RATE:Calibration", "BW:Detector"], -1],
 
         
         # Monitoritems for saturated towers
-        ['satu20em_l1satmon_L1J100_FIRSTEMPTY',  'L1_J100_FIRSTEMPTY',     [], ['L1Calo'], ['RATE:Calibration', 'BW:Detector'],-1],
-        ['satu20em_l1satmon_L1J100.31ETA49_FIRSTEMPTY',  'L1_J100.31ETA49_FIRSTEMPTY',     [], ['L1Calo'], ['RATE:Calibration', 'BW:Detector'],-1],
-        ['satu20em_l1satmon_L1EM20VH_FIRSTEMPTY',  'L1_EM20VH_FIRSTEMPTY',     [], ['L1Calo'], ['RATE:Calibration', 'BW:Detector'],-1],
+        ##['satu20em_l1satmon_L1J100_FIRSTEMPTY',  'L1_J100_FIRSTEMPTY',     [], ['L1Calo'], ['RATE:Calibration', 'BW:Detector'],-1],
+        ##['satu20em_l1satmon_L1J100.31ETA49_FIRSTEMPTY',  'L1_J100.31ETA49_FIRSTEMPTY',     [], ['L1Calo'], ['RATE:Calibration', 'BW:Detector'],-1],
+        ##['satu20em_l1satmon_L1EM20VH_FIRSTEMPTY',  'L1_EM20VH_FIRSTEMPTY',     [], ['L1Calo'], ['RATE:Calibration', 'BW:Detector'],-1],
         #['satu20em_l1satmon_L1EM20VHI_FIRSTEMPTY',  'L1_EM20VHI_FIRSTEMPTY',     [], ['L1Calo'], ['RATE:Calibration', 'BW:Detector'],-1], 
         # the one above was replaced with a em22vhi_firstempty seeded one:
         #['satu20em_l1satmon_L1EM22VHI_FIRSTEMPTY',  'L1_EM22VHI_FIRSTEMPTY',     [], ['L1Calo'], ['RATE:Calibration', 'BW:Detector'],-1], # for HI, L1EM20VH one is OK?
-        ['satu20em_l1satmon_L1J100',  'L1_J100',     [], ['L1Calo'], ['RATE:Calibration', 'BW:Detector'],-1],
-        ['satu20em_l1satmon_L1J100.31ETA49',  'L1_J100.31ETA49',     [], ['L1Calo'], ['RATE:Calibration', 'BW:Detector'],-1],                 
+        ##['satu20em_l1satmon_L1J100',  'L1_J100',     [], ['L1Calo'], ['RATE:Calibration', 'BW:Detector'],-1],
+        ##['satu20em_l1satmon_L1J100.31ETA49',  'L1_J100.31ETA49',     [], ['L1Calo'], ['RATE:Calibration', 'BW:Detector'],-1],                 
         # larnoiseburst
-        ['larnoiseburst_L1XE35',            'L1_XE35',       [], ['LArNoiseBurst'], ["RATE:Calibration", "BW:Detector"], -1],
-        ['larnoiseburst_L1XE50',            'L1_XE50',       [], ['LArNoiseBurst'], ["RATE:Calibration", "BW:Detector"], -1],
+        ##['larnoiseburst_L1XE35',            'L1_XE35',       [], ['LArNoiseBurst'], ["RATE:Calibration", "BW:Detector"], -1],
+        ##['larnoiseburst_L1XE50',            'L1_XE50',       [], ['LArNoiseBurst'], ["RATE:Calibration", "BW:Detector"], -1],
         #['larnoiseburst_L1XE80', 'L1_XE80', [], ['LArNoiseBurst'], ["RATE:Calibration", "BW:Detector"], -1], # for HI, XE50 is OK?
         ['larnoiseburst_L1J50',             'L1_J50',       [], ['LArNoiseBurst'], ["RATE:Calibration", "BW:Detector"], -1],
-        ['larnoiseburst_L1J75',             'L1_J75',       [], ['LArNoiseBurst'], ["RATE:Calibration", "BW:Detector"], -1],
-        ['larnoiseburst_L1J100', 'L1_J100', [], ['LArNoiseBurst'], ["RATE:Calibration", "BW:Detector"], -1],
-        ['larnoiseburst_L1J40_XE50',            'L1_J40_XE50',       [], ['LArNoiseBurst'], ["RATE:Calibration", "BW:Detector"], -1], 
-        ['larnoiseburst_L1J75_XE40',            'L1_J75_XE40',       [], ['LArNoiseBurst'], ["RATE:Calibration", "BW:Detector"], -1], 
+        ##['larnoiseburst_L1J75',             'L1_J75',       [], ['LArNoiseBurst'], ["RATE:Calibration", "BW:Detector"], -1],
+        ##['larnoiseburst_L1J100', 'L1_J100', [], ['LArNoiseBurst'], ["RATE:Calibration", "BW:Detector"], -1],
+        ##['larnoiseburst_L1J40_XE50',            'L1_J40_XE50',       [], ['LArNoiseBurst'], ["RATE:Calibration", "BW:Detector"], -1], 
+        ##['larnoiseburst_L1J75_XE40',            'L1_J75_XE40',       [], ['LArNoiseBurst'], ["RATE:Calibration", "BW:Detector"], -1], 
 
         # larpeb
         ['g8_loose_larpeb',                      'L1_EM7',     [], ['LArCells'], ['RATE:SinglePhoton', 'BW:Egamma'],-1],
         ['g12_loose_larpeb',                     'L1_EM10',     [], ['LArCells'], ['RATE:SinglePhoton', 'BW:Egamma'],-1],
-        ['g20_loose_larpeb_L1EM15',              'L1_EM15', [], ['LArCells'], ['RATE:SinglePhoton', 'BW:Egamma'],-1],
-        ['g40_loose_larpeb',                     'L1_EM20', [], ['LArCells'], ['RATE:SinglePhoton', 'BW:Egamma'],-1],
-        ['g60_loose_larpeb',                     'L1_EM20', [], ['LArCells'], ['RATE:SinglePhoton', 'BW:Egamma'],-1],
-        ['g80_loose_larpeb',                     'L1_EM20', [], ['LArCells'], ['RATE:SinglePhoton', 'BW:Egamma'],-1],
-        ['conej40_larpebj',  'L1_J12',     [], ['LArCells'], ['RATE:Calibration', 'BW:Detector'],-1],
-        ['conej165_larpebj', 'L1_J75',     [], ['LArCells'], ['RATE:Calibration', 'BW:Detector'],-1],
-        ['conej75_320eta490_larpebj',  'L1_J30.31ETA49',     [], ['LArCells'], ['RATE:Calibration', 'BW:Detector'],-1],
-        ['conej140_320eta490_larpebj', 'L1_J75.31ETA49',     [], ['LArCells'], ['RATE:Calibration', 'BW:Detector'],-1],
+        ##['g20_loose_larpeb_L1EM15',              'L1_EM15', [], ['LArCells'], ['RATE:SinglePhoton', 'BW:Egamma'],-1],
+        ##['g40_loose_larpeb',                     'L1_EM20', [], ['LArCells'], ['RATE:SinglePhoton', 'BW:Egamma'],-1],
+        ##['g60_loose_larpeb',                     'L1_EM20', [], ['LArCells'], ['RATE:SinglePhoton', 'BW:Egamma'],-1],
+        ##['g80_loose_larpeb',                     'L1_EM20', [], ['LArCells'], ['RATE:SinglePhoton', 'BW:Egamma'],-1],
+        ##['conej40_larpebj',  'L1_J12',     [], ['LArCells'], ['RATE:Calibration', 'BW:Detector'],-1],
+        ##['conej165_larpebj', 'L1_J75',     [], ['LArCells'], ['RATE:Calibration', 'BW:Detector'],-1],
+        ##['conej75_320eta490_larpebj',  'L1_J30.31ETA49',     [], ['LArCells'], ['RATE:Calibration', 'BW:Detector'],-1],
+        ##['conej140_320eta490_larpebj', 'L1_J75.31ETA49',     [], ['LArCells'], ['RATE:Calibration', 'BW:Detector'],-1],
         
         # larcalib
-        ['larcalib_L1EM7_EMPTY',    'L1_EM7_EMPTY',      [], ['LArCellsEmpty'], ["RATE:Calibration", "BW:Detector"], -1],
-        ['larcalib_L1TAU12_EMPTY',   'L1_TAU12_EMPTY',     [], ['LArCellsEmpty'], ["RATE:Calibration", "BW:Detector"], -1],
-        ['larcalib_L1J12_EMPTY',    'L1_J12_EMPTY',      [], ['LArCellsEmpty'], ["RATE:Calibration", "BW:Detector"], -1],
-        ['larcalib_L1J3031ETA49_EMPTY',  'L1_J30.31ETA49_EMPTY',     [], ['LArCellsEmpty'], ["RATE:Calibration", "BW:Detector"], -1],
+        ##['larcalib_L1EM7_EMPTY',    'L1_EM7_EMPTY',      [], ['LArCellsEmpty'], ["RATE:Calibration", "BW:Detector"], -1],
+        ##['larcalib_L1TAU12_EMPTY',   'L1_TAU12_EMPTY',     [], ['LArCellsEmpty'], ["RATE:Calibration", "BW:Detector"], -1], ##no ctpid
+        ##['larcalib_L1J12_EMPTY',    'L1_J12_EMPTY',      [], ['LArCellsEmpty'], ["RATE:Calibration", "BW:Detector"], -1],
+        ##['larcalib_L1J3031ETA49_EMPTY',  'L1_J30.31ETA49_EMPTY',     [], ['LArCellsEmpty'], ["RATE:Calibration", "BW:Detector"], -1],
         
         #Special re-run chains
         ['larnoiseburst_rerun',                  '',             [], ['LArNoiseBurst'], ["RATE:Calibration", "BW:Detector"], -1],
@@ -589,51 +420,16 @@ def setupMenu():
         ]
     
     TriggerFlags.CosmicSlice.signatures  = [        
-        ['tilecalib_laser',   'L1_CALREQ2', [], ['Tile'], ["RATE:Calibration", "RATE:Cosmic_TileCalibration", "BW:Detector"], -1], 
-        ['sct_noise',          'L1_RD0_EMPTY', [], ['SCTNoise'], ["RATE:Calibration", "RATE:SCTCalibration", "BW:Detector"], -1],
-        # CosmicID
-        ['id_cosmicid_L1MU4_EMPTY',         'L1_MU4_EMPTY', [],  ['HLT_IDCosmic', 'express'], ['RATE:CosmicSlice', 'RATE:Cosmic_Tracking', 'BW:Detector'], -1],
-        ['id_cosmicid_L1MU11_EMPTY',        'L1_MU11_EMPTY', [], ['HLT_IDCosmic', 'express'], ['RATE:CosmicSlice', 'RATE:Cosmic_Tracking', 'BW:Detector'], -1],
-
-        # CosmicCalo
-        ['larps_L1EM7_EMPTY',  'L1_EM7_EMPTY', [], ['CosmicCalo'], ['RATE:CosmicSlice', 'RATE:Cosmic_LArCalibration', 'BW:Detector'], -1],
-        ['larps_L1J12_EMPTY',  'L1_J12_EMPTY', [], ['CosmicCalo'], ['RATE:CosmicSlice', 'RATE:Cosmic_LArCalibration', 'BW:Detector'], -1],
-        ['larps_L1J30_EMPTY',  'L1_J30_EMPTY', [], ['CosmicCalo'], ['RATE:CosmicSlice', 'RATE:Cosmic_LArCalibration', 'BW:Detector'], -1],
-        ['larps_L1TAU12_EMPTY', 'L1_TAU12_EMPTY', [], ['CosmicCalo'], ['RATE:CosmicSlice', 'RATE:Cosmic_LArCalibration', 'BW:Detector'], -1],        
-        ['larps_L1J3031ETA49_EMPTY', 'L1_J30.31ETA49_EMPTY', [], ['CosmicCalo'], ['RATE:CosmicSlice', 'RATE:Cosmic_LArCalibration', 'BW:Detector'], -1],
-        ['larps_L1J12_FIRSTEMPTY', 'L1_J12_FIRSTEMPTY', [], ['LArCellsEmpty'], ['RATE:CosmicSlice', 'RATE:Cosmic_LArCalibration', 'BW:Detector'], -1],
-        ['larps_L1J30_FIRSTEMPTY', 'L1_J30_FIRSTEMPTY', [], ['LArCellsEmpty'], ['RATE:CosmicSlice', 'RATE:Cosmic_LArCalibration', 'BW:Detector'], -1], 
-        ['larps_L1EM7_FIRSTEMPTY',  'L1_EM7_FIRSTEMPTY', [], ['LArCellsEmpty'], ['RATE:CosmicSlice', 'RATE:Cosmic_LArCalibration', 'BW:Detector'], -1], 
-        
-        ['larhec_L1J12_FIRSTEMPTY', 'L1_J12_FIRSTEMPTY', [], ['LArCellsEmpty'], ['RATE:CosmicSlice', 'RATE:Cosmic_LArCalibration', 'BW:Detector'], -1],
-        ['larhec_L1J30_FIRSTEMPTY', 'L1_J30_FIRSTEMPTY', [], ['LArCellsEmpty'], ['RATE:CosmicSlice', 'RATE:Cosmic_LArCalibration', 'BW:Detector'], -1],
-        ['larhec_L1EM7_FIRSTEMPTY', 'L1_EM7_FIRSTEMPTY', [], ['LArCellsEmpty'], ['RATE:CosmicSlice', 'RATE:Cosmic_LArCalibration', 'BW:Detector'], -1],
-        ['larhec_L1TAU12_FIRSTEMPTY', 'L1_TAU12_FIRSTEMPTY', [], ['LArCellsEmpty'], ['RATE:CosmicSlice', 'RATE:Cosmic_LArCalibration', 'BW:Detector'], -1],
-
-
-        
         
         ]
     TriggerFlags.StreamingSlice.signatures = [
 	#TE full calo
-	['noalg_mb_L1TE5',      'L1_TE5', [], [MinBiasStream, 'express'], ["BW:MinBias", "RATE:MinBias"], 1],
 	['noalg_mb_L1TE20',      'L1_TE20', [], [MinBiasStream], ["BW:MinBias", "RATE:MinBias"], 1],
         ['noalg_mb_L1TE50',      'L1_TE50', [], [MinBiasStream, 'express'], ["BW:MinBias", "RATE:MinBias"], 1],
-	['noalg_mb_L1TE100',      'L1_TE100', [], [MinBiasStream], ["BW:MinBias", "RATE:MinBias"], 1],
-	['noalg_mb_L1TE200',      'L1_TE200', [], [MinBiasStream], ["BW:MinBias", "RATE:MinBias"], 1],
-	['noalg_mb_L1TE10000',      'L1_TE10000', [], [MinBiasStream], ["BW:MinBias", "RATE:MinBias"], 1],
-	['noalg_mb_L1TE12000',      'L1_TE12000', [], [MinBiasStream], ["BW:MinBias", "RATE:MinBias"], 1],
-	['noalg_mb_L1TE14000',      'L1_TE14000', [], [MinBiasStream], ["BW:MinBias", "RATE:MinBias"], 1],
+
 
 	#TE restricted calo
-        ['noalg_mb_L1TE500.0ETA49',      'L1_TE500.0ETA49', [], [MinBiasStream], ["BW:MinBias", "RATE:MinBias"], 1],
-	['noalg_mb_L1TE1500.0ETA49',      'L1_TE1500.0ETA49', [], [MinBiasStream], ["BW:MinBias", "RATE:MinBias"], 1],
-	['noalg_mb_L1TE3000.0ETA49',      'L1_TE3000.0ETA49', [], [MinBiasStream], ["BW:MinBias", "RATE:MinBias"], 1],
-	['noalg_mb_L1TE3500.0ETA49',      'L1_TE3500.0ETA49', [], [MinBiasStream], ["BW:MinBias", "RATE:MinBias"], 1],
-	['noalg_mb_L1TE5000.0ETA49',      'L1_TE5000.0ETA49', [], [MinBiasStream], ["BW:MinBias", "RATE:MinBias"], 1],
-	['noalg_mb_L1TE6500.0ETA49',      'L1_TE6500.0ETA49', [], [MinBiasStream], ["BW:MinBias", "RATE:MinBias"], 1],
-	['noalg_mb_L1TE8000.0ETA49',      'L1_TE8000.0ETA49', [], [MinBiasStream], ["BW:MinBias", "RATE:MinBias"], 1],
-	['noalg_mb_L1TE9000.0ETA49',      'L1_TE9000.0ETA49', [], [MinBiasStream], ["BW:MinBias", "RATE:MinBias"], 1],
+
 
 	#min bias
         ['noalg_mb_L1MBTS_2',    'L1_MBTS_2', [], [MinBiasStream], ["BW:MinBias", "RATE:MinBias"], 1],
@@ -655,16 +451,10 @@ def setupMenu():
 	['noalg_mb_L1LUCID_UNPAIRED_ISO', 'L1_LUCID_UNPAIRED_ISO', [], [MinBiasStream], ["BW:MinBias", "RATE:MinBias"], 1],
 
 	#UPC+photoproduction
-	['noalg_L1ZDC_A_C_VTE50',   'L1_ZDC_A_C_VTE50', [], [UPCStream], ["BW:UPC", "RATE:UPC"], 1],
-	['noalg_L1ZDC_XOR',         'L1_ZDC_XOR', [], [UPCStream], ["BW:UPC", "RATE:UPC"], 1],
-	['noalg_L1TE5_VTE200',      'L1_TE5_VTE200', [], [UPCStream], ["BW:UPC", "RATE:UPC"], 1],
-	['noalg_L1ZDC_A_C_TE5_VTE200',   'L1_ZDC_A_C_TE5_VTE200', [], [UPCStream], ["BW:UPC", "RATE:UPC"], 1],
-	['noalg_L1ZDC_XOR_TE5_VTE200',   'L1_ZDC_XOR_TE5_VTE200', [], [UPCStream], ["BW:UPC", "RATE:UPC"], 1],
-	['noalg_L1ZDC_XOR_TRT_VTE200',   'L1_ZDC_XOR_TRT_VTE200', [], [UPCStream], ["BW:UPC", "RATE:UPC"], 1],
 
 	#beam spot
-	['noalg_L1J10_VTE100',   'L1_J10_VTE100', [], [HardProbesStream], ["BW:Jet", "RATE:Jets"], 1],
-	['noalg_L1J10_VTE200',   'L1_J10_VTE200', [], [HardProbesStream], ["BW:Jet", "RATE:Jets"], 1],
+	##['noalg_L1J10_VTE100',   'L1_J10_VTE100', [], [HardProbesStream], ["BW:Jet", "RATE:Jets"], 1],
+	##['noalg_L1J10_VTE200',   'L1_J10_VTE200', [], [HardProbesStream], ["BW:Jet", "RATE:Jets"], 1],
 	['noalg_L1MU0_VTE50',   'L1_MU0_VTE50', [], [UPCStream], ["BW:UPC", "RATE:UPC"], 1],
 
 	#muon
@@ -680,39 +470,31 @@ def setupMenu():
 	['noalg_L1J15',   'L1_J15', [], [HardProbesStream], ["BW:Jet", "RATE:Jets"], 1],
         ['noalg_L1J20',   'L1_J20', [], [HardProbesStream], ["BW:Jet", "RATE:Jets"], 1],
         ['noalg_L1J30',   'L1_J30', [], [HardProbesStream], ["BW:Jet", "RATE:Jets"], 1],
-	['noalg_L1J35',   'L1_J35', [], [HardProbesStream], ["BW:Jet", "RATE:Jets"], 1],
+	##['noalg_L1J35',   'L1_J35', [], [HardProbesStream], ["BW:Jet", "RATE:Jets"], 1],
 	['noalg_L1J50',   'L1_J50', [], [HardProbesStream], ["BW:Jet", "RATE:Jets"], 1],
-	['noalg_L1J75',   'L1_J75', [], [HardProbesStream], ["BW:Jet", "RATE:Jets"], 1],
-	['noalg_L1J175',   'L1_J175', [], [HardProbesStream], ["BW:Jet", "RATE:Jets"], 1],
+	##['noalg_L1J75',   'L1_J75', [], [HardProbesStream], ["BW:Jet", "RATE:Jets"], 1],
+	##['noalg_L1J175',   'L1_J175', [], [HardProbesStream], ["BW:Jet", "RATE:Jets"], 1],
 
 	#egamma
 	['noalg_L1EM7',    'L1_EM7',  [], [HardProbesStream], ["BW:SingleElectron", "RATE:Egamma"], 1],
-        ['noalg_L1EM8',    'L1_EM8',  [], [HardProbesStream], ["BW:SingleElectron", "RATE:Egamma"], 1],
+        ##['noalg_L1EM8',    'L1_EM8',  [], [HardProbesStream], ["BW:SingleElectron", "RATE:Egamma"], 1],
 	['noalg_L1EM10',   'L1_EM10', [], [HardProbesStream, 'express'], ["BW:SingleElectron", "RATE:Egamma"], 1],
 	['noalg_L1EM12',   'L1_EM12', [], [HardProbesStream, 'express'], ["BW:SingleElectron", "RATE:Egamma"], 1],
         ['noalg_L1EM14',   'L1_EM14', [], [HardProbesStream, 'express'], ["BW:SingleElectron", "RATE:Egamma"], 1],
 	['noalg_L1EM16',   'L1_EM16', [], [HardProbesStream], ["BW:SingleElectron", "RATE:Egamma"], 1],
-	['noalg_L1EM18',   'L1_EM18', [], [HardProbesStream], ["BW:SingleElectron", "RATE:Egamma"], 1],
-	['noalg_L1EM20',   'L1_EM20', [], [HardProbesStream], ["BW:SingleElectron", "RATE:Egamma"], 1],
+	##['noalg_L1EM18',   'L1_EM18', [], [HardProbesStream], ["BW:SingleElectron", "RATE:Egamma"], 1],
+	##['noalg_L1EM20',   'L1_EM20', [], [HardProbesStream], ["BW:SingleElectron", "RATE:Egamma"], 1],
 
 	#data min-bias overlay
 	['noalg_L1ZDC_A_C_OVERLAY',   'L1_ZDC_A_C_OVERLAY', [], ['MinBiasOverlay'], ["BW:MinBiasOverlay", "RATE:MinBiasOverlay"], 1],
-	['noalg_L1TE50_OVERLAY',   'L1_TE50_OVERLAY', [], ['MinBiasOverlay'], ["BW:MinBiasOverlay", "RATE:MinBiasOverlay"], 1],
+	##['noalg_L1TE50_OVERLAY',   'L1_TE50_OVERLAY', [], ['MinBiasOverlay'], ["BW:MinBiasOverlay", "RATE:MinBiasOverlay"], 1],
 	
-	#TE restricted calo in |eta|<4.9   
-        ['noalg_mb_L1TE500.0ETA49_OVERLAY',       'L1_TE500.0ETA49_OVERLAY', [], ['MinBiasOverlay'], ["BW:MinBiasOverlay", "RATE:MinBiasOverlay"], 1],
-        ['noalg_mb_L1TE1500.0ETA49_OVERLAY',      'L1_TE1500.0ETA49_OVERLAY', [], ['MinBiasOverlay'], ["BW:MinBiasOverlay", "RATE:MinBiasOverlay"], 1],
-        ['noalg_mb_L1TE3000.0ETA49_OVERLAY',      'L1_TE3000.0ETA49_OVERLAY', [], ['MinBiasOverlay'], ["BW:MinBiasOverlay", "RATE:MinBiasOverlay"], 1],
-        ['noalg_mb_L1TE3500.0ETA49_OVERLAY',      'L1_TE3500.0ETA49_OVERLAY', [], ['MinBiasOverlay'], ["BW:MinBiasOverlay", "RATE:MinBiasOverlay"], 1],
-        ['noalg_mb_L1TE5000.0ETA49_OVERLAY',      'L1_TE5000.0ETA49_OVERLAY', [], ['MinBiasOverlay'], ["BW:MinBiasOverlay", "RATE:MinBiasOverlay"], 1],
-        ['noalg_mb_L1TE6500.0ETA49_OVERLAY',      'L1_TE6500.0ETA49_OVERLAY', [], ['MinBiasOverlay'], ["BW:MinBiasOverlay", "RATE:MinBiasOverlay"], 1],
-        ['noalg_mb_L1TE8000.0ETA49_OVERLAY',      'L1_TE8000.0ETA49_OVERLAY', [], ['MinBiasOverlay'], ["BW:MinBiasOverlay", "RATE:MinBiasOverlay"], 1],
-        ['noalg_mb_L1TE9000.0ETA49_OVERLAY',      'L1_TE9000.0ETA49_OVERLAY', [], ['MinBiasOverlay'], ["BW:MinBiasOverlay", "RATE:MinBiasOverlay"], 1],
+	#TE restricted calo in |eta|<4.9 for overlay   
 
 	#data zero bias overlay
 	['noalg_zb_L1ZB',   'L1_ZB', [], ['ZeroBias'], ["BW:ZeroBias", "RATE:ZeroBias"], 1],
 
-        ['noalg_L1TGC_BURST',   'L1_TGC_BURST', [], ['TgcNoiseBurst'], ["RATE:Calibration", "BW:Detector"], -1],
+        ##['noalg_L1TGC_BURST',   'L1_TGC_BURST', [], ['TgcNoiseBurst'], ["RATE:Calibration", "BW:Detector"], -1],
 
         #idmon streamer
         ['noalg_idmon_L1RD0_EMPTY',          'L1_RD0_EMPTY',        [], ['IDMonitoring','express'], ["RATE:Monitoring", "BW:Detector"], -1],
@@ -720,16 +502,16 @@ def setupMenu():
         ['noalg_idmon_L1RD0_UNPAIRED_ISO',   'L1_RD0_UNPAIRED_ISO', [], ['IDMonitoring'], ["RATE:Monitoring", "BW:Detector"], -1],
 
         # Cosmic calo streamer
-        ['noalg_cosmiccalo_L1EM7_EMPTY',         'L1_EM7_EMPTY',        [], ['CosmicCalo'], ["BW:MinBias", "RATE:Cosmic_Calo"], -1],
+        ##['noalg_cosmiccalo_L1EM7_EMPTY',         'L1_EM7_EMPTY',        [], ['CosmicCalo'], ["BW:MinBias", "RATE:Cosmic_Calo"], -1],
         ['noalg_cosmiccalo_L1RD1_EMPTY',         'L1_RD1_EMPTY',        [], ['CosmicCalo', 'express'], ["RATE:Calibration", "BW:Detector"], -1],
-        ['noalg_cosmiccalo_L1J3031ETA49_EMPTY',  'L1_J30.31ETA49_EMPTY',[], ['CosmicCalo'], ["BW:Jet", "RATE:Cosmic_Calo"], -1],
-        ['noalg_cosmiccalo_L1J12_EMPTY',         'L1_J12_EMPTY',        [], ['CosmicCalo', 'express'], ["BW:Jet", "RATE:Cosmic_Calo"], -1],
+        ##['noalg_cosmiccalo_L1J3031ETA49_EMPTY',  'L1_J30.31ETA49_EMPTY',[], ['CosmicCalo'], ["BW:Jet", "RATE:Cosmic_Calo"], -1],
+        ##['noalg_cosmiccalo_L1J12_EMPTY',         'L1_J12_EMPTY',        [], ['CosmicCalo', 'express'], ["BW:Jet", "RATE:Cosmic_Calo"], -1],
         ['noalg_cosmiccalo_L1J30_EMPTY',         'L1_J30_EMPTY',        [], ['CosmicCalo', 'express'], ["BW:Jet", "RATE:Cosmic_Calo"], -1],
 
         #background streamers
         ['noalg_bkg_L1Bkg',               'L1_Bkg',               [], ['Background'], ["RATE:SeededStreamers", "BW:Other"], -1],  
-        ['noalg_bkg_L1J12_BGRP12', 'L1_J12_BGRP12', [], ['Background'], ["RATE:SeededStreamers", "BW:Other"], -1],
-        ['noalg_bkg_L1J30.31ETA49_BGRP12', 'L1_J30.31ETA49_BGRP12', [], ['Background'], ["RATE:SeededStreamers", "BW:Other"], -1],
+        ##['noalg_bkg_L1J12_BGRP12', 'L1_J12_BGRP12', [], ['Background'], ["RATE:SeededStreamers", "BW:Other"], -1],
+        ##['noalg_bkg_L1J30.31ETA49_BGRP12', 'L1_J30.31ETA49_BGRP12', [], ['Background'], ["RATE:SeededStreamers", "BW:Other"], -1],
         ['noalg_L1Calo', 'L1_Calo', [], ['L1Calo'], ["RATE:SeededStreamers", "BW:Other"], -1], 
 
         #DCM level monitoring test chain
@@ -745,30 +527,28 @@ def setupMenu():
 #        ['noalg_larcells_L1LAR-J',                 'L1_LAR-J',            [], ['LArCells'],     ["RATE:SeededStreamers", "BW:Other"], -1],
 
         # HI EB
-        ['noalg_eb_L1ZDC_A_C_VTE50', 'L1_ZDC_A_C_VTE50', [], ['EnhancedBias'], ["RATE:EnhancedBias", "BW:Detector"], -1],
-        ['noalg_eb_L1TE5_VTE200', 'L1_TE5_VTE200', [], ['EnhancedBias'], ["RATE:EnhancedBias", "BW:Detector"], -1],
+        ##['noalg_eb_L1ZDC_A_C_VTE50', 'L1_ZDC_A_C_VTE50', [], ['EnhancedBias'], ["RATE:EnhancedBias", "BW:Detector"], -1],
+        ##['noalg_eb_L1TE5_VTE200', 'L1_TE5_VTE200', [], ['EnhancedBias'], ["RATE:EnhancedBias", "BW:Detector"], -1],
         ['noalg_eb_L1MBTS_1_1', 'L1_MBTS_1_1', [], ['EnhancedBias'], ["RATE:EnhancedBias", "BW:Detector"], -1],
-        ['noalg_eb_L1ZDC_XOR_TE5_VTE200', 'L1_ZDC_XOR_TE5_VTE200', [], ['EnhancedBias'], ["RATE:EnhancedBias", "BW:Detector"], -1],
         ['noalg_eb_L1MU0_VTE50', 'L1_MU0_VTE50', [], ['EnhancedBias'], ["RATE:EnhancedBias", "BW:Detector"], -1],
         ['noalg_eb_L1EM12', 'L1_EM12', [], ['EnhancedBias'], ["RATE:EnhancedBias", "BW:Detector"], -1],
         ['noalg_eb_L1MU4', 'L1_MU4', [], ['EnhancedBias'], ["RATE:EnhancedBias", "BW:Detector"], -1],
         ['noalg_eb_L1TE50', 'L1_TE50', [], ['EnhancedBias'], ["RATE:EnhancedBias", "BW:Detector"], -1],
-        ['noalg_eb_L1TE12000', 'L1_TE12000', [], ['EnhancedBias'], ["RATE:EnhancedBias", "BW:Detector"], -1],
 
         ]
 
     TriggerFlags.BeamspotSlice.signatures = [
-        ['beamspot_activeTE_trkfast_peb',           'L1_J10_VTE100', [], ["BeamSpot"], ['RATE:BeamSpot',  'BW:BeamSpot'], -1],
-        ['beamspot_allTE_trkfast_pebTRT',           'L1_J10_VTE100', [], ["BeamSpot"], ['RATE:BeamSpot',  'BW:BeamSpot'], -1],
-        ['beamspot_trkFS_trkfast',                  'L1_J10_VTE100', [], ["BeamSpot"], ['RATE:BeamSpot',  'BW:BeamSpot'], -1],
+        ##['beamspot_activeTE_trkfast_peb',           'L1_J10_VTE100', [], ["BeamSpot"], ['RATE:BeamSpot',  'BW:BeamSpot'], -1],
+        ##['beamspot_allTE_trkfast_pebTRT',           'L1_J10_VTE100', [], ["BeamSpot"], ['RATE:BeamSpot',  'BW:BeamSpot'], -1],
+        ##['beamspot_trkFS_trkfast',                  'L1_J10_VTE100', [], ["BeamSpot"], ['RATE:BeamSpot',  'BW:BeamSpot'], -1],
 
-	['beamspot_activeTE_trkfast_peb_L1J10_VTE200',           'L1_J10_VTE200', [], ["BeamSpot"], ['RATE:BeamSpot',  'BW:BeamSpot'], -1],
-        ['beamspot_allTE_trkfast_pebTRT_L1J10_VTE200',           'L1_J10_VTE200', [], ["BeamSpot"], ['RATE:BeamSpot',  'BW:BeamSpot'], -1],
-        ['beamspot_trkFS_trkfast_L1J10_VTE200',                  'L1_J10_VTE200', [], ["BeamSpot"], ['RATE:BeamSpot',  'BW:BeamSpot'], -1],
+	##['beamspot_activeTE_trkfast_peb_L1J10_VTE200',           'L1_J10_VTE200', [], ["BeamSpot"], ['RATE:BeamSpot',  'BW:BeamSpot'], -1],
+        ##['beamspot_allTE_trkfast_pebTRT_L1J10_VTE200',           'L1_J10_VTE200', [], ["BeamSpot"], ['RATE:BeamSpot',  'BW:BeamSpot'], -1],
+        ##['beamspot_trkFS_trkfast_L1J10_VTE200',                  'L1_J10_VTE200', [], ["BeamSpot"], ['RATE:BeamSpot',  'BW:BeamSpot'], -1],
 
-	['beamspot_activeTE_trkfast_peb_L1TE5_VTE200',           'L1_TE5_VTE200', [], ["BeamSpot"], ['RATE:BeamSpot',  'BW:BeamSpot'], -1],
-        ['beamspot_allTE_trkfast_pebTRT_L1TE5_VTE200',           'L1_TE5_VTE200', [], ["BeamSpot"], ['RATE:BeamSpot',  'BW:BeamSpot'], -1],
-        ['beamspot_trkFS_trkfast_L1TE5_VTE200',                  'L1_TE5_VTE200', [], ["BeamSpot"], ['RATE:BeamSpot',  'BW:BeamSpot'], -1],
+	##['beamspot_activeTE_trkfast_peb_L1TE5_VTE200',           'L1_TE5_VTE200', [], ["BeamSpot"], ['RATE:BeamSpot',  'BW:BeamSpot'], -1],
+        ##['beamspot_allTE_trkfast_pebTRT_L1TE5_VTE200',           'L1_TE5_VTE200', [], ["BeamSpot"], ['RATE:BeamSpot',  'BW:BeamSpot'], -1],
+        ##['beamspot_trkFS_trkfast_L1TE5_VTE200',                  'L1_TE5_VTE200', [], ["BeamSpot"], ['RATE:BeamSpot',  'BW:BeamSpot'], -1],
 
 	]
 
diff --git a/Trigger/TriggerCommon/TriggerMenu/python/menu/Physics_pp_v6.py b/Trigger/TriggerCommon/TriggerMenu/python/menu/Physics_pp_v6.py
index da2601b011e..d557722a90d 100644
--- a/Trigger/TriggerCommon/TriggerMenu/python/menu/Physics_pp_v6.py
+++ b/Trigger/TriggerCommon/TriggerMenu/python/menu/Physics_pp_v6.py
@@ -48,6 +48,7 @@ def setupMenu():
         ['mu26_imedium',          'L1_MU20',           [], [PhysicsStream, 'express'], ['RATE:SingleMuon', 'BW:Muon'], -1],
         ['mu28_imedium',          'L1_MU20',           [], [PhysicsStream], ['RATE:SingleMuon', 'BW:Muon'], -1],
         ['mu50',                  'L1_MU20',           [], [PhysicsStream], ['RATE:SingleMuon', 'BW:Muon'], -1],
+        ['mu60',                  'L1_MU20',           [], [PhysicsStream], ['RATE:SingleMuon', 'BW:Muon'], -1],
         ['mu60_0eta105_msonly',   'L1_MU20',           [], [PhysicsStream], ['RATE:SingleMuon', 'BW:Muon'], -1],
         ['mu40',                   'L1_MU20',           [], [PhysicsStream], ['RATE:SingleMuon', 'BW:Muon'], -1],
         ['mu24_imedium',           'L1_MU20',           [], [PhysicsStream, 'express'], ['RATE:SingleMuon', 'BW:Muon'], -1],
@@ -160,9 +161,13 @@ def setupMenu():
 
 
         ['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_noComb']]],
+        ['mu20_msonly_mu10noL1_msonly_nscan03_noComb',   'L1_MU20',   ['L1_MU20','L2_mu20_msonly'], [PhysicsStream], ['RATE:MultiMuon','BW:Muon'], -1,['serial',-1,['mu20_msonly','mu10noL1_msonly_nscan03_noComb']]],
         ['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_nscan03_noComb_L1MU6_EMPTY',       'L1_MU6_EMPTY',        ['L1_MU20','L2_mu20_msonly'], ["Late"], ['RATE:MultiMuon','BW:Muon'], -1,['serial',-1,['mu20_msonly','mu6noL1_msonly_nscan03_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_nscan03_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_nscan03_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']]],
+        #['mu20_msonly_mu10noL1_msonly_nscan03_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_nscan03_noComb']]],
 
 
          ### ATR-14377: Emergency additional class of chains instead of mu20_msonly_mu10noL1_msonly_nscan05_noComb*
@@ -199,8 +204,6 @@ def setupMenu():
         ['mu6_nomucomb_2mu4_nomucomb_delayed_L1MU6_3MU4',          'L1_MU6_3MU4',  ['L1_MU6','L1_2MU4'],          ['BphysDelayed'], ['RATE:BphysDelayed','BW:Bphys'], -1],
 
         #AFP muons
-        ['mu4_L1AFP_C_AND',                  'L1_AFP_C_AND',                  [], ['MinBias'], ["BW:MinBias", "RATE:MinBias"], -1],
-        ['mu6_L1AFP_C_AND',                  'L1_AFP_C_AND',                  [], ['MinBias'], ["BW:MinBias", "RATE:MinBias"], -1],
 
 
 			 ]
@@ -890,6 +893,43 @@ def setupMenu():
         ['xe160_pueta_wEFMu_L1XE50','L1_XE50',[], [PhysicsStream], ['RATE:MET', 'BW:MET'], -1],
         ['xe160_pueta_wEFMu_L1XE55','L1_XE55',[], [PhysicsStream], ['RATE:MET', 'BW:MET'], -1],
         ['xe120_wEFMu_L1XE55','L1_XE55',[], [PhysicsStream], ['RATE:MET', 'BW:MET'], -1],
+
+        ['xe140_mht_L1XE50','L1_XE50',[], [PhysicsStream], ['RATE:MET', 'BW:MET'], -1],
+        ['xe140_mht_L1XE55','L1_XE55',[], [PhysicsStream], ['RATE:MET', 'BW:MET'], -1],
+        ['xe140_mht_L1XE60','L1_XE60',[], [PhysicsStream], ['RATE:MET', 'BW:MET'], -1],
+        ['xe140_mht_L1XE70','L1_XE70',[], [PhysicsStream], ['RATE:MET', 'BW:MET'], -1],
+        ['xe150_mht_L1XE50','L1_XE50',[], [PhysicsStream], ['RATE:MET', 'BW:MET'], -1],
+        ['xe150_mht_L1XE55','L1_XE55',[], [PhysicsStream], ['RATE:MET', 'BW:MET'], -1],
+        ['xe150_mht_L1XE60','L1_XE60',[], [PhysicsStream], ['RATE:MET', 'BW:MET'], -1],
+        ['xe150_mht_L1XE70','L1_XE70',[], [PhysicsStream], ['RATE:MET', 'BW:MET'], -1],
+        ['xe160_mht_L1XE50','L1_XE50',[], [PhysicsStream], ['RATE:MET', 'BW:MET'], -1],
+        ['xe160_mht_L1XE55','L1_XE55',[], [PhysicsStream], ['RATE:MET', 'BW:MET'], -1],
+        ['xe160_mht_L1XE60','L1_XE60',[], [PhysicsStream], ['RATE:MET', 'BW:MET'], -1],
+        ['xe160_mht_L1XE70','L1_XE70',[], [PhysicsStream], ['RATE:MET', 'BW:MET'], -1],
+
+        ['xe130_L1XE55','L1_XE55',[], [PhysicsStream], ['RATE:MET', 'BW:MET'], -1],
+        ['xe140_L1XE55','L1_XE55',[], [PhysicsStream], ['RATE:MET', 'BW:MET'], -1],
+        ['xe150_L1XE55','L1_XE55',[], [PhysicsStream], ['RATE:MET', 'BW:MET'], -1],
+        ['xe160_L1XE55','L1_XE55',[], [PhysicsStream], ['RATE:MET', 'BW:MET'], -1],
+        ['xe110_L1XE60','L1_XE60',[], [PhysicsStream], ['RATE:MET', 'BW:MET'], -1],
+        ['xe120_L1XE60','L1_XE60',[], [PhysicsStream], ['RATE:MET', 'BW:MET'], -1],
+        ['xe130_L1XE60','L1_XE60',[], [PhysicsStream], ['RATE:MET', 'BW:MET'], -1],
+        ['xe140_L1XE60','L1_XE60',[], [PhysicsStream], ['RATE:MET', 'BW:MET'], -1],
+        ['xe150_L1XE60','L1_XE60',[], [PhysicsStream], ['RATE:MET', 'BW:MET'], -1],
+        ['xe100_L1XE70','L1_XE70',[], [PhysicsStream], ['RATE:MET', 'BW:MET'], -1],
+        ['xe110_L1XE70','L1_XE70',[], [PhysicsStream], ['RATE:MET', 'BW:MET'], -1],
+        ['xe120_L1XE70','L1_XE70',[], [PhysicsStream], ['RATE:MET', 'BW:MET'], -1],
+        ['xe130_L1XE70','L1_XE70',[], [PhysicsStream], ['RATE:MET', 'BW:MET'], -1],
+
+				###cell+mht XE
+        ['xe110_mht_L1XE50_AND_xe65_L1XE50','L1_XE50', ['L1_XE50','L1_XE50'], [PhysicsStream], ['RATE:MET', 'BW:MET' ], -1, ['serial',-1,['xe110_mht_L1XE50_AND','xe65_L1XE50'] ]],
+        ['xe110_mht_L1XE50_AND_xe70_L1XE50','L1_XE50', ['L1_XE50','L1_XE50'], [PhysicsStream], ['RATE:MET', 'BW:MET' ], -1, ['serial',-1,['xe110_mht_L1XE50_AND','xe70_L1XE50'] ]],
+        ['xe110_mht_L1XE50_AND_xe75_L1XE50','L1_XE50', ['L1_XE50','L1_XE50'], [PhysicsStream], ['RATE:MET', 'BW:MET' ], -1, ['serial',-1,['xe110_mht_L1XE50_AND','xe75_L1XE50'] ]],
+        ['xe110_mht_L1XE50_AND_xe80_L1XE50','L1_XE50', ['L1_XE50','L1_XE50'], [PhysicsStream], ['RATE:MET', 'BW:MET' ], -1, ['serial',-1,['xe110_mht_L1XE50_AND','xe80_L1XE50'] ]],
+        ['xe110_mht_L1XE55_AND_xe65_L1XE55','L1_XE55', ['L1_XE55','L1_XE55'], [PhysicsStream], ['RATE:MET', 'BW:MET' ], -1, ['serial',-1,['xe110_mht_L1XE55_AND','xe65_L1XE55'] ]],
+        ['xe110_mht_L1XE55_AND_xe70_L1XE55','L1_XE55', ['L1_XE55','L1_XE55'], [PhysicsStream], ['RATE:MET', 'BW:MET' ], -1, ['serial',-1,['xe110_mht_L1XE55_AND','xe70_L1XE55'] ]],
+        ['xe110_mht_L1XE55_AND_xe75_L1XE55','L1_XE55', ['L1_XE55','L1_XE55'], [PhysicsStream], ['RATE:MET', 'BW:MET' ], -1, ['serial',-1,['xe110_mht_L1XE55_AND','xe75_L1XE55'] ]],
+        ['xe110_mht_L1XE55_AND_xe80_L1XE55','L1_XE55', ['L1_XE55','L1_XE55'], [PhysicsStream], ['RATE:MET', 'BW:MET' ], -1, ['serial',-1,['xe110_mht_L1XE55_AND','xe80_L1XE55'] ]],
     
         ### ATR-14354: L1Topo met chains
         #['xe110_mht_L1KF-XE50',    'L1_KF-XE50',[], [PhysicsStream], ['RATE:MET', 'BW:MET'], -1],
@@ -921,8 +961,6 @@ def setupMenu():
         ['tau25_medium1_tracktwo',                 'L1_TAU12IM', [], [PhysicsStream, 'express'], ['RATE:SingleTau', 'BW:Tau'], -1],
         ['tau25_tight1_tracktwo',                  'L1_TAU12IM', [], [PhysicsStream], ['RATE:SingleTau', 'BW:Tau'], -1],
         ['tau25_medium1_tracktwo_L1TAU12',         'L1_TAU12', [], [PhysicsStream], ['RATE:SingleTau', 'BW:Tau'], -1],
-        ['tau25_medium1_tracktwo_L1TAU12IL',       'L1_TAU12IL', [], [PhysicsStream], ['RATE:SingleTau', 'BW:Tau'], -1],
-        ['tau25_medium1_tracktwo_L1TAU12IT',       'L1_TAU12IT', [], [PhysicsStream], ['RATE:SingleTau', 'BW:Tau'], -1],
         # Run-II - With BDT: main calo-based items
         # Run-II - With BDT: pt only
         ['tau25_loose1_ptonly',                    'L1_TAU12IM', [], [PhysicsStream], ['RATE:SingleTau', 'BW:Tau'], -1],
@@ -953,7 +991,7 @@ def setupMenu():
         ['tau35_tight1_tracktwo_tau25_tight1_tracktwo',   'L1_TAU20IM_2TAU12IM_J25_2J20_3J12',['L1_TAU20IM','L1_TAU12IM'], [PhysicsStream], ['RATE:MultiTau', 'BW:Tau'], -1,['serial',-1,["tau35_tight1_tracktwo","tau25_tight1_tracktwo"]]],
 
 
-        ['tau35_medium1_tracktwo_tau25_medium1_tracktwo_L1TAU20IM_2TAU12IM',   'L1_TAU20IM_2TAU12IM',['L1_TAU20IM','L1_TAU12IM'], [PhysicsStream], ['RATE:MultiTau', 'BW:Tau'], -1,['serial',-1,["tau35_medium1_tracktwo","tau25_medium1_tracktwo"]]],
+        ['tau35_medium1_tracktwo_tau25_medium1_tracktwo_L1TAU20IM_2TAU12IM',   'L1_TAU20IM_2TAU12IM',['L1_TAU20IM','L1_TAU12IM'], [PhysicsStream, 'express'], ['RATE:MultiTau', 'BW:Tau'], -1,['serial',-1,["tau35_medium1_tracktwo","tau25_medium1_tracktwo"]]],
 
 	# l1topo ditau chains
 	['tau35_medium1_tracktwo_tau25_medium1_tracktwo_L1TAU20ITAU12I-J25',   'L1_TAU20ITAU12I-J25',['L1_TAU20IM','L1_TAU12IM'], [PhysicsStream], ['RATE:MultiTau', 'BW:Tau'], -1,['serial',-1,["tau35_medium1_tracktwo","tau25_medium1_tracktwo"]]]	,
@@ -965,6 +1003,11 @@ def setupMenu():
         ['tau35_medium1_tracktwo_tau25_medium1_tracktwo_tautsf_L1DR-TAU20ITAU12I',   'L1_DR-TAU20ITAU12I',['L1_TAU20IM','L1_TAU12IM'], [PhysicsStream], ['RATE:MultiTau', 'BW:Tau'], -1,['serial',-1,["tau35_medium1_tracktwo","tau25_medium1_tracktwo"]],True],
         ['tau35_medium1_tracktwo_tau25_medium1_tracktwo_notautsf_L1DR-TAU20ITAU12I',   'L1_DR-TAU20ITAU12I',['L1_TAU20IM','L1_TAU12IM'], [PhysicsStream], ['RATE:MultiTau', 'BW:Tau'], -1,['serial',-1,["tau35_medium1_tracktwo","tau25_medium1_tracktwo"]],False],
         ['tau35_medium1_tracktwo_tau25_medium1_tracktwo_tautsf_L1DR-TAU20ITAU12I-J25',   'L1_DR-TAU20ITAU12I-J25',['L1_TAU20IM','L1_TAU12IM'], [PhysicsStream], ['RATE:MultiTau', 'BW:Tau'], -1,['serial',-1,["tau35_medium1_tracktwo","tau25_medium1_tracktwo"]],True],
+        ['tau35_medium1_tracktwo_tau25_medium1_tracktwo_notautsf_L1DR-TAU20ITAU12I-J25',   'L1_DR-TAU20ITAU12I-J25',['L1_TAU20IM','L1_TAU12IM'], [PhysicsStream], ['RATE:MultiTau', 'BW:Tau'], -1,['serial',-1,["tau35_medium1_tracktwo","tau25_medium1_tracktwo"]],False],
+
+	['tau35_medium1_tracktwo_tau25_medium1_tracktwo_03dR30',   'L1_TAU20IM_2TAU12IM_J25_2J20_3J12',['L1_TAU20IM','L1_TAU12IM'], [PhysicsStream, 'express'], ['RATE:MultiTau', 'BW:Tau'], -1,['serial',-1,["tau35_medium1_tracktwo","tau25_medium1_tracktwo"]]],
+        ['tau35_medium1_tracktwo_tau25_medium1_tracktwo_03dR30_L1DR-TAU20ITAU12I',   'L1_DR-TAU20ITAU12I',['L1_TAU20IM','L1_TAU12IM'], [PhysicsStream], ['RATE:MultiTau', 'BW:Tau'], -1,['serial',-1,["tau35_medium1_tracktwo","tau25_medium1_tracktwo"]]],
+        ['tau35_medium1_tracktwo_tau25_medium1_tracktwo_03dR30_L1DR-TAU20ITAU12I-J25',   'L1_DR-TAU20ITAU12I-J25',['L1_TAU20IM','L1_TAU12IM'], [PhysicsStream], ['RATE:MultiTau', 'BW:Tau'], -1,['serial',-1,["tau35_medium1_tracktwo","tau25_medium1_tracktwo"]]],
 
         # High-pT DiTau seeding off of single-tau
         ['tau80_medium1_tracktwo_L1TAU60_tau50_medium1_tracktwo_L1TAU12', 'L1_TAU60',['L1_TAU60','L1_TAU12'], [PhysicsStream], ['RATE:MultiTau', 'BW:Tau'], -1,['serial',-1,["tau80_medium1_tracktwo_L1TAU60","tau50_medium1_tracktwo_L1TAU12"]]],
@@ -1456,6 +1499,10 @@ def setupMenu():
 
     TriggerFlags.BphysicsSlice.signatures = [
 
+        ['mu6_mu4_bBmumux_BsmumuPhi_delayed',                    'L1_MU6_2MU4', ['L1_MU6','L1_MU4'], [PhysicsStream], ['RATE:Bphysics','BW:Bphys'], -1],
+        ['2mu6_bBmumux_BsmumuPhi_delayed',                    'L1_2MU6', [], [PhysicsStream], ['RATE:Bphysics','BW:Bphys'], -1],
+        ['mu10_mu6_bBmumux_BsmumuPhi_delayed',            'L1_MU10_2MU6', ['L1_MU10','L1_MU6'],[PhysicsStream], ['RATE:Bphysics','BW:Bphys'], -1],
+
         ['3mu4_nomucomb_bTau',            'L1_3MU4', [], [PhysicsStream], ['RATE:Bphysics', 'BW:Bphys'], -1],
         ['2mu4_bDimu',                    'L1_2MU4', [], [PhysicsStream], ['RATE:Bphysics','BW:Bphys'], -1], 
         ['2mu4_bDimu_noinvm_novtx_ss',    'L1_2MU4', [], [PhysicsStream], ['RATE:Bphysics','BW:Bphys'], -1],
@@ -1704,7 +1751,33 @@ def setupMenu():
         ['mu10_mu6_bBmumuxv2_L1LFV-MU',  'L1_LFV-MU',     ['L1_MU10','L1_MU6'], [PhysicsStream], ['RATE:Bphysics','BW:Bphys'], -1, False],
         ['mu10_mu6_bBmumux_BcmumuDsloose_L1LFV-MU',  'L1_LFV-MU',     ['L1_MU10','L1_MU6'], [PhysicsStream], ['RATE:Bphysics','BW:Bphys'], -1, False],
 
-
+# ATR-14350
+        ['2mu4_bBmumu_Lxy0_L1BPH-2M8-2MU4',      'L1_BPH-2M8-2MU4',     ['L1_2MU4'], [PhysicsStream], ['RATE:Bphysics','BW:Bphys'], -1, False],
+        ['mu6_mu4_bBmumu_Lxy0_L1BPH-2M8-MU6MU4_BPH-0DR15-MU6MU4', 'L1_BPH-2M8-MU6MU4_BPH-0DR15-MU6MU4',     ['L1_MU6','L1_MU4'], [PhysicsStream], ['RATE:Bphysics','BW:Bphys'], -1, False],
+        ['mu6_mu4_bBmumux_BsmumuPhi_L1BPH-2M8-MU6MU4_BPH-0DR15-MU6MU4', 'L1_BPH-2M8-MU6MU4_BPH-0DR15-MU6MU4',     ['L1_MU6','L1_MU4'], [PhysicsStream], ['RATE:Bphysics','BW:Bphys'], -1, False],
+        ['mu6_mu4_bJpsimumu_Lxy0_L1BPH-2M8-MU6MU4_BPH-0DR15-MU6MU4', 'L1_BPH-2M8-MU6MU4_BPH-0DR15-MU6MU4',     ['L1_MU6','L1_MU4'], [PhysicsStream], ['RATE:Bphysics','BW:Bphys'], -1, False],
+        ['2mu6_bBmumu_Lxy0_L1BPH-2M9-2MU6_BPH-2DR15-2MU6', 'L1_BPH-2M9-2MU6_BPH-2DR15-2MU6',     ['L1_2MU6'], [PhysicsStream], ['RATE:Bphysics','BW:Bphys'], -1, False],
+        ['2mu6_bBmumux_BsmumuPhi_L1BPH-2M9-2MU6_BPH-2DR15-2MU6', 'L1_BPH-2M9-2MU6_BPH-2DR15-2MU6',     ['L1_2MU6'], [PhysicsStream], ['RATE:Bphysics','BW:Bphys'], -1, False],
+        ['2mu6_bJpsimumu_Lxy0_L1BPH-2M9-2MU6_BPH-2DR15-2MU6', 'L1_BPH-2M9-2MU6_BPH-2DR15-2MU6',     ['L1_2MU6'], [PhysicsStream], ['RATE:Bphysics','BW:Bphys'], -1, False],
+        ['mu10_mu6_bBmumux_BsmumuPhi',            'L1_MU10_2MU6', ['L1_MU10','L1_MU6'],[PhysicsStream], ['RATE:Bphysics','BW:Bphys'], -1],
+
+# Delayed stream ATR-14350
+        ['mu6_mu4_bBmumuxv2_delayed_L1BPH-2M8-MU6MU4_BPH-0DR15-MU6MU4',  'L1_BPH-2M8-MU6MU4_BPH-0DR15-MU6MU4',     ['L1_MU6','L1_MU4'], ['BphysDelayed'], ['RATE:BphysDelayed','BW:Bphys'], -1, False],	
+        ['mu6_mu4_bBmumux_BsmumuPhi_delayed_L1BPH-2M8-MU6MU4_BPH-0DR15-MU6MU4', 'L1_BPH-2M8-MU6MU4_BPH-0DR15-MU6MU4',     ['L1_MU6','L1_MU4'], ['BphysDelayed'], ['RATE:BphysDelayed','BW:Bphys'], -1, False],
+        ['mu6_mu4_bBmumux_BcmumuDsloose_delayed_L1BPH-2M8-MU6MU4_BPH-0DR15-MU6MU4',  'L1_BPH-2M8-MU6MU4_BPH-0DR15-MU6MU4',     ['L1_MU6','L1_MU4'], ['BphysDelayed'], ['RATE:BphysDelayed','BW:Bphys'], -1, False],
+        ['mu6_mu4_bJpsimumu_delayed_L1BPH-2M8-MU6MU4_BPH-0DR15-MU6MU4',  'L1_BPH-2M8-MU6MU4_BPH-0DR15-MU6MU4',     ['L1_MU6','L1_MU4'], ['BphysDelayed'], ['RATE:BphysDelayed','BW:Bphys'], -1, False],
+        ['mu6_mu4_bJpsimumu_Lxy0_delayed_L1BPH-2M8-MU6MU4_BPH-0DR15-MU6MU4', 'L1_BPH-2M8-MU6MU4_BPH-0DR15-MU6MU4',     ['L1_MU6','L1_MU4'], ['BphysDelayed'], ['RATE:BphysDelayed','BW:Bphys'], -1, False],
+        ['mu6_mu4_bJpsimumu_delayed_L1MU6MU4-BO',  'L1_MU6MU4-BO',     ['L1_MU6','L1_MU4'], ['BphysDelayed'], ['RATE:BphysDelayed','BW:Bphys'], -1, False],
+        ['mu6_mu4_bBmumuxv2_delayed_L1MU6MU4-BO',  'L1_MU6MU4-BO',     ['L1_MU6','L1_MU4'], ['BphysDelayed'], ['RATE:BphysDelayed','BW:Bphys'], -1, False],
+        ['mu6_mu4_bUpsimumu_delayed_L1BPH-8M15-MU6MU4', 'L1_BPH-8M15-MU6MU4',     ['L1_MU6','L1_MU4'], ['BphysDelayed'], ['RATE:BphysDelayed','BW:Bphys'], -1, False],
+        ['2mu6_bBmumuxv2_delayed_L1BPH-2M9-2MU6_BPH-2DR15-2MU6',  'L1_BPH-2M9-2MU6_BPH-2DR15-2MU6',     ['L1_2MU6'], ['BphysDelayed'], ['RATE:BphysDelayed','BW:Bphys'], -1, False],
+        ['2mu6_bBmumux_BsmumuPhi_delayed_L1BPH-2M9-2MU6_BPH-2DR15-2MU6', 'L1_BPH-2M9-2MU6_BPH-2DR15-2MU6',     ['L1_2MU6'], ['BphysDelayed'], ['RATE:BphysDelayed','BW:Bphys'], -1, False],
+        ['2mu6_bBmumux_BcmumuDsloose_delayed_L1BPH-2M9-2MU6_BPH-2DR15-2MU6',  'L1_BPH-2M9-2MU6_BPH-2DR15-2MU6',     ['L1_2MU6'], ['BphysDelayed'], ['RATE:BphysDelayed','BW:Bphys'], -1, False],
+        ['2mu6_bJpsimumu_delayed_L1BPH-2M9-2MU6_BPH-2DR15-2MU6',  'L1_BPH-2M9-2MU6_BPH-2DR15-2MU6',     ['L1_2MU6'], ['BphysDelayed'], ['RATE:BphysDelayed','BW:Bphys'], -1, False],
+        ['2mu6_bJpsimumu_Lxy0_delayed_L1BPH-2M9-2MU6_BPH-2DR15-2MU6', 'L1_BPH-2M9-2MU6_BPH-2DR15-2MU6',     ['L1_2MU6'], ['BphysDelayed'], ['RATE:BphysDelayed','BW:Bphys'], -1, False],
+        ['2mu6_bUpsimumu_delayed_L1BPH-8M15-2MU6', 'L1_BPH-8M15-2MU6',     ['L1_2MU6'], ['BphysDelayed'], ['RATE:BphysDelayed','BW:Bphys'], -1, False],
+        ['mu10_mu6_bBmumuxv2_delayed_L1LFV-MU',  'L1_LFV-MU',     ['L1_MU10','L1_MU6'], ['BphysDelayed'], ['RATE:BphysDelayed','BW:Bphys'], -1, False],
+        ['mu10_mu6_bBmumux_BcmumuDsloose_delayed_L1LFV-MU',  'L1_LFV-MU',     ['L1_MU10','L1_MU6'], ['BphysDelayed'], ['RATE:BphysDelayed','BW:Bphys'], -1, False],
 
 
 				#Delayed stream ATR-14091
@@ -1844,6 +1917,13 @@ def setupMenu():
 
         ### ATR-14351
         ['j100_xe110_mht_1dphi10_L1J40_DPHI-J20s2XE50', 'L1_J40_DPHI-J20s2XE50', [], [PhysicsStream], ['RATE:JetMET', 'BW:Jet'], -1,['serial',-1,["j100","xe110_mht"]]],
+        
+        ['mu4_j100_xe80_mht',  'L1_MU4_J50_XE40', ['L1_MU4','L1_J50', 'L1_XE40'], [PhysicsStream], ['RATE:MuonJetMET', 'BW:Muon', 'BW:Jet'], -1, ['serial',-1,["mu4","j100","xe80_mht"] ]],
+        ['2mu4_j80_xe40_mht',  'L1_2MU4_J40_XE20', ['L1_2MU4','L1_J40', 'L1_XE20'], [PhysicsStream], ['RATE:MuonJetMET', 'BW:Muon', 'BW:Jet'], -1, ['serial',-1,["2mu4","j80","xe40_mht"] ]],
+
+	# ATR-14717
+        ['mu4_j125_xe90_mht',  'L1_MU4_J50_XE40', ['L1_MU4','L1_J50', 'L1_XE40'], [PhysicsStream], ['RATE:MuonJetMET', 'BW:Muon', 'BW:Jet'], -1, ['serial',-1,["mu4","j125","xe90_mht"] ]],
+        ['2mu4_j85_xe50_mht',  'L1_2MU4_J40_XE20', ['L1_2MU4','L1_J40', 'L1_XE20'], [PhysicsStream], ['RATE:MuonJetMET', 'BW:Muon', 'BW:Jet'], -1, ['serial',-1,["2mu4","j85","xe50_mht"] ]],
 
         ['mu4_j15_bperf_split_dr05_dz02', 'L1_MU4',     ['L1_MU4', ''], [PhysicsStream], ['RATE:MuonBJet', 'BW:BJet'], -1,['serial',-1,['mu4', 'j15_bperf_split'] ]],
         ['mu4_j25_bperf_split_dr05_dz02', 'L1_MU4',     ['L1_MU4', ''], [PhysicsStream], ['RATE:MuonBJet', 'BW:BJet'], -1,['serial',-1,['mu4', 'j25_bperf_split'] ]],
@@ -1927,6 +2007,7 @@ def setupMenu():
         ['mu26_ivarmedium_2j35_boffperf_split',    'L1_MU20',    ['L1_MU20', ''],    [PhysicsStream], ['RATE:MuonBJet',  'BW:BJet'],-1,['serial',-1,['mu26_ivarmedium', '2j35_boffperf_split']]],
         ['e26_tight_iloose_2j35_boffperf_split',   'L1_EM22VHI', ['L1_EM22VHI', ''], [PhysicsStream], ['RATE:EgammaJet', 'BW:BJet'],-1,['serial',-1,['e26_tight_iloose', '2j35_boffperf_split']]],
         ['e26_lhtight_nod0_ivarloose_2j35_boffperf_split', 'L1_EM22VHI', ['L1_EM22VHI', ''], [PhysicsStream], ['RATE:EgammaJet', 'BW:BJet'],-1,['serial',-1,['e26_lhtight_nod0_ivarloose', '2j35_boffperf_split']]],
+        ['e28_lhtight_nod0_ivarloose_2j35_boffperf_split', 'L1_EM24VHI', ['L1_EM24VHI', ''], [PhysicsStream], ['RATE:EgammaJet', 'BW:BJet'],-1,['serial',-1,['e28_lhtight_nod0_ivarloose', '2j35_boffperf_split']]],
 
 
 
@@ -2037,7 +2118,10 @@ def setupMenu():
 	# COMBINED TAU CHAINS
 
 	# e+tau
-        #new ones                                                                                                                                                                                    
+        #new ones   
+	                                                                                                                     
+	['e17_lhmedium_nod0_ivarloose_tau35_medium1_tracktwo_L1EM15HI_TAU20IM_2TAU15_J25_2J20_3J15',   'L1_EM15HI_TAU20IM_2TAU15_J25_2J20_3J15',['L1_EM15HI','L1_TAU20IM'], [PhysicsStream],['RATE:ElectronTau', 'BW:Tau', 'BW:Egamma'], -1,['serial',-1,["e17_lhmedium_nod0_ivarloose","tau35_medium1_tracktwo"]]],
+	                                               
         ['e17_lhmedium_nod0_tau80_medium1_tracktwo',   'L1_EM15HI_TAU40_2TAU15',['L1_EM15HI','L1_TAU40'], [PhysicsStream], ['RATE:ElectronTau', 'BW:Tau', 'BW:Egamma'], -1,['serial',-1,["e17_lhmedium_nod0","tau80_medium1_tracktwo"]]],
         ['e17_lhmedium_nod0_ivarloose_tau25_medium1_tracktwo',  'L1_EM15HI_2TAU12IM_J25_3J12',['L1_EM15HI','L1_TAU12IM'], [PhysicsStream],['RATE:ElectronTau', 'BW:Tau', 'BW:Egamma'], -1,['serial',-1,["e17_lhmedium_nod0_ivarloose","tau25_medium1_tracktwo"]]],
 
@@ -2056,6 +2140,7 @@ def setupMenu():
 
         ['e17_lhmedium_nod0_tau80_medium1_tracktwo_L1EM15-TAU40',   'L1_EM15-TAU40',['L1_EM15HI','L1_TAU40'], [PhysicsStream], ['RATE:ElectronTau', 'BW:Tau'], -1,['serial',-1,["e17_lhmedium_nod0","tau80_medium1_tracktwo"]]],
         ['mu14_ivarloose_tau35_medium1_tracktwo',  'L1_MU10_TAU20IM',['L1_MU10','L1_TAU20IM'], [PhysicsStream], ['RATE:MuonTau', 'BW:Tau', 'BW:Muon'], -1,['serial',-1,["mu14_ivarloose","tau35_medium1_tracktwo"]]],
+        ['mu14_ivarloose_tau35_medium1_tracktwo_L1MU10_TAU20IM_J25_2J20',      'L1_MU10_TAU20IM_J25_2J20',['L1_MU10','L1_TAU20IM'], [PhysicsStream], ['RATE:MuonTau', 'BW:Tau', 'BW:Muon'], -1,['serial',-1,["mu14_ivarloose","tau35_medium1_tracktwo"]]],   
 
         ['mu14_iloose_tau25_perf_tracktwo', 'L1_MU10_TAU12IM',['L1_MU10','L1_TAU12IM'], [PhysicsStream, 'express'], ['RATE:MuonTau', 'BW:Tau', 'BW:Muon'], -1,['serial',-1,["mu14_iloose","tau25_perf_tracktwo"]]],
         ### ATR-14543
@@ -2185,6 +2270,9 @@ def setupMenu():
         ['mu6_2j40_0eta490_invm600_L1MU6_J30.0ETA49_2J20.0ETA49', 'L1_MU6_J30.0ETA49_2J20.0ETA49', ['L1_MU6',''], [PhysicsStream], ['RATE:MuonJet', 'BW:Muon', 'BW:Jet'], -1, ['serial',-1,["mu6","2j40_0eta490_invm600"]]],
         ['mu6_2j40_0eta490_invm800_L1MU6_J30.0ETA49_2J20.0ETA49', 'L1_MU6_J30.0ETA49_2J20.0ETA49', ['L1_MU6',''], [PhysicsStream], ['RATE:MuonJet', 'BW:Muon', 'BW:Jet'], -1, ['serial',-1,["mu6","2j40_0eta490_invm800"]]],
 
+	# Hbb VBF trigger (ATR-13526)
+        ['j80_0eta240_j60_j45_320eta490_invm700_AND_j45_bmv2c2070_split_j45_bmv2c2077_split','L1_J40.0ETA25_2J25_J20.31ETA49', ['','','','',''], [PhysicsStream], ['RATE:MultiBJet', 'BW:BJet' ], -1, ['serial',-1,['j80_0eta240','j60','j45_320eta490_invm700_AND','j45_bmv2c2070_split','j45_bmv2c2077_split'] ]],
+        ['j80_0eta240_j60_j45_320eta490_AND_2j45_bmv2c2070_split','L1_J40.0ETA25_2J25_J20.31ETA49', ['','','','',''], [PhysicsStream], ['RATE:MultiBJet', 'BW:BJet' ], -1, ['serial',-1,['j80_0eta240','j60','j45_320eta490_AND','2j45_bmv2c2070_split'] ]],
 
         #['2j40_0eta490_invm250_xe80_L1XE70',    'L1_XE70', ['',''], [PhysicsStream], ['RATE:JetMET', 'BW:Jet'], -1, ['serial',-1,["2j40_0eta490_invm250","xe80_L1XE70"]]],
         #['j40_0eta490_j30_0eta490_deta25_xe80_L1XE70',    'L1_XE70', ['','',''], [PhysicsStream], ['RATE:JetMET', 'BW:Jet'], -1, ['serial',-1,["j40_0eta490","j30_0eta490_deta25","xe80_L1XE70"]]],
@@ -2220,6 +2308,10 @@ def setupMenu():
         ['g35_medium_L1EM24VHI_tau25_kaonpi2_tracktwo_L1TAU12',     'L1_EM24VHI', ['L1_EM24VHI','L1_TAU12'], [PhysicsStream], ['RATE:TauGamma', 'BW:Tau', 'BW:Egamma'], -1,['serial',-1,["g35_medium_L1EM24VHI","tau25_kaonpi2_tracktwo_L1TAU12"]]],
         ['g35_medium_L1EM24VHI_tau35_kaonpi2_tracktwo_L1TAU12',     'L1_EM24VHI', ['L1_EM24VHI','L1_TAU12'], [PhysicsStream], ['RATE:TauGamma', 'BW:Tau', 'BW:Egamma'], -1,['serial',-1,["g35_medium_L1EM24VHI","tau35_kaonpi2_tracktwo_L1TAU12"]]],
 
+	# ATR-14643
+        ['g25_medium_tau25_dikaonmasstight_tracktwo_60mVis10000',     'L1_EM22VHI', ['L1_EM22VHI','L1_TAU12'], [PhysicsStream], ['RATE:TauGamma', 'BW:Tau', 'BW:Egamma'], -1,['parallel',-1,[]]],
+				['g25_medium_L1EM24VHI_tau25_dikaonmasstight_tracktwo_60mVis10000',     'L1_EM24VHI', ['L1_EM24VHI','L1_TAU12'], [PhysicsStream], ['RATE:TauGamma', 'BW:Tau', 'BW:Egamma'], -1,['parallel',-1,[]]],
+
         # photon+pion (ATR-13525)
         ['g35_medium_tau25_singlepion_tracktwo_L1TAU12',     'L1_EM22VHI', ['L1_EM22VHI','L1_TAU12'], [PhysicsStream], ['RATE:TauGamma', 'BW:Tau', 'BW:Egamma'], -1,['serial',-1,["g35_medium","tau25_singlepion_tracktwo_L1TAU12"]]],
         ['g35_medium_tau25_singlepiontight_tracktwo_L1TAU12',     'L1_EM22VHI', ['L1_EM22VHI','L1_TAU12'], [PhysicsStream], ['RATE:TauGamma', 'BW:Tau', 'BW:Egamma'], -1,['serial',-1,["g35_medium","tau25_singlepiontight_tracktwo_L1TAU12"]]],
@@ -2476,10 +2568,10 @@ def setupMenu():
         ['mb_sp2100_hmtperf_L1TE30', 'L1_TE30', [], ['MinBias'], ["BW:MinBias", "RATE:MinBias"], -1],
 	['mb_sp1500_hmtperf_L1TE40', 'L1_TE40', [], ['MinBias'], ["BW:MinBias", "RATE:MinBias"], -1],
         ['mb_sp2100_hmtperf_L1TE40', 'L1_TE40', [], ['MinBias'], ["BW:MinBias", "RATE:MinBias"], -1],
-	['mb_sp1500_hmtperf_L1TE50', 'L1_TE50', [], ['MinBias'], ["BW:MinBias", "RATE:MinBias"], -1],
-        ['mb_sp2100_hmtperf_L1TE50', 'L1_TE50', [], ['MinBias'], ["BW:MinBias", "RATE:MinBias"], -1],
-	['mb_sp1500_hmtperf_L1TE60', 'L1_TE60', [], ['MinBias'], ["BW:MinBias", "RATE:MinBias"], -1],
-        ['mb_sp2100_hmtperf_L1TE60', 'L1_TE60', [], ['MinBias'], ["BW:MinBias", "RATE:MinBias"], -1],
+	##B['mb_sp1500_hmtperf_L1TE50', 'L1_TE50', [], ['MinBias'], ["BW:MinBias", "RATE:MinBias"], -1],
+        ##B['mb_sp2100_hmtperf_L1TE50', 'L1_TE50', [], ['MinBias'], ["BW:MinBias", "RATE:MinBias"], -1],
+	##B['mb_sp1500_hmtperf_L1TE60', 'L1_TE60', [], ['MinBias'], ["BW:MinBias", "RATE:MinBias"], -1],
+        ##B['mb_sp2100_hmtperf_L1TE60', 'L1_TE60', [], ['MinBias'], ["BW:MinBias", "RATE:MinBias"], -1],
 
 	['mb_sp800_pusup400_trk50_hmt_L1TE5', 'L1_TE5', [], ['MinBias'], ["BW:MinBias", "RATE:MinBias"], -1],
 	['mb_sp900_pusup500_trk60_hmt_L1TE5', 'L1_TE5', [], ['MinBias'], ["BW:MinBias", "RATE:MinBias"], -1],
@@ -2503,15 +2595,15 @@ def setupMenu():
         ['mb_sp2200_pusup1300_trk110_hmt_L1TE40', 'L1_TE40', [], ['MinBias'], ["BW:MinBias", "RATE:MinBias"], -1],
         ['mb_sp2400_pusup1400_trk120_hmt_L1TE40', 'L1_TE40', [], ['MinBias'], ["BW:MinBias", "RATE:MinBias"], -1],
 
-	['mb_sp1600_pusup1100_trk90_hmt_L1TE50', 'L1_TE50', [], ['MinBias'], ["BW:MinBias", "RATE:MinBias"], -1],
-        ['mb_sp2000_pusup1200_trk100_hmt_L1TE50', 'L1_TE50', [], ['MinBias'], ["BW:MinBias", "RATE:MinBias"], -1],
-        ['mb_sp2200_pusup1300_trk110_hmt_L1TE50', 'L1_TE50', [], ['MinBias'], ["BW:MinBias", "RATE:MinBias"], -1],
-        ['mb_sp2400_pusup1400_trk120_hmt_L1TE50', 'L1_TE50', [], ['MinBias'], ["BW:MinBias", "RATE:MinBias"], -1],
-
-	['mb_sp1600_pusup1100_trk90_hmt_L1TE60', 'L1_TE60', [], ['MinBias'], ["BW:MinBias", "RATE:MinBias"], -1],
-        ['mb_sp2000_pusup1200_trk100_hmt_L1TE60', 'L1_TE60', [], ['MinBias'], ["BW:MinBias", "RATE:MinBias"], -1],
-        ['mb_sp2200_pusup1300_trk110_hmt_L1TE60', 'L1_TE60', [], ['MinBias'], ["BW:MinBias", "RATE:MinBias"], -1],
-        ['mb_sp2400_pusup1400_trk120_hmt_L1TE60', 'L1_TE60', [], ['MinBias'], ["BW:MinBias", "RATE:MinBias"], -1],
+	##B['mb_sp1600_pusup1100_trk90_hmt_L1TE50', 'L1_TE50', [], ['MinBias'], ["BW:MinBias", "RATE:MinBias"], -1],
+        ##B['mb_sp2000_pusup1200_trk100_hmt_L1TE50', 'L1_TE50', [], ['MinBias'], ["BW:MinBias", "RATE:MinBias"], -1],
+        ##B['mb_sp2200_pusup1300_trk110_hmt_L1TE50', 'L1_TE50', [], ['MinBias'], ["BW:MinBias", "RATE:MinBias"], -1],
+        ##B['mb_sp2400_pusup1400_trk120_hmt_L1TE50', 'L1_TE50', [], ['MinBias'], ["BW:MinBias", "RATE:MinBias"], -1],
+        ##B
+	##B['mb_sp1600_pusup1100_trk90_hmt_L1TE60', 'L1_TE60', [], ['MinBias'], ["BW:MinBias", "RATE:MinBias"], -1],
+        ##B['mb_sp2000_pusup1200_trk100_hmt_L1TE60', 'L1_TE60', [], ['MinBias'], ["BW:MinBias", "RATE:MinBias"], -1],
+        ##B['mb_sp2200_pusup1300_trk110_hmt_L1TE60', 'L1_TE60', [], ['MinBias'], ["BW:MinBias", "RATE:MinBias"], -1],
+        ##B['mb_sp2400_pusup1400_trk120_hmt_L1TE60', 'L1_TE60', [], ['MinBias'], ["BW:MinBias", "RATE:MinBias"], -1],
 
 	#ATR-9999
 	['mb_sp2_hmtperf_L1TE5', 'L1_TE5', [], ['MinBias'], ["BW:MinBias", "RATE:MinBias"], -1],
@@ -2562,7 +2654,7 @@ def setupMenu():
         ['mb_sp1400_pusup550_trk90_hmt_L1TE30', 'L1_TE30', [], ['MinBias'], ["BW:MinBias", "RATE:MinBias"], -1],
         ['mb_sp1400_pusup550_trk90_hmt_L1TE40', 'L1_TE40', [], ['MinBias'], ["BW:MinBias", "RATE:MinBias"], -1],
         ['mb_sp1400_pusup550_trk90_hmt_L1TE40.0ETA24', 'L1_TE40.0ETA24', [], ['MinBias'], ["BW:MinBias", "RATE:MinBias"], -1],
-	['mb_sp1400_pusup550_trk90_hmt_L1TE50', 'L1_TE50', [], ['MinBias'], ["BW:MinBias", "RATE:MinBias"], -1],
+	##B['mb_sp1400_pusup550_trk90_hmt_L1TE50', 'L1_TE50', [], ['MinBias'], ["BW:MinBias", "RATE:MinBias"], -1],
 
         ['mb_sp1500_trk100_hmt_L1TE10', 'L1_TE10', [], ['MinBias'], ["BW:MinBias", "RATE:MinBias"], -1],
         ['mb_sp1500_trk100_hmt_L1TE10.0ETA24', 'L1_TE10.0ETA24', [], ['MinBias'], ["BW:MinBias", "RATE:MinBias"], -1],
@@ -2579,7 +2671,7 @@ def setupMenu():
         ['mb_sp1500_pusup700_trk100_hmt_L1TE30', 'L1_TE30', [], ['MinBias'], ["BW:MinBias", "RATE:MinBias"], -1],
         ['mb_sp1500_pusup700_trk100_hmt_L1TE40', 'L1_TE40', [], ['MinBias'], ["BW:MinBias", "RATE:MinBias"], -1],
         ['mb_sp1500_pusup700_trk100_hmt_L1TE40.0ETA24', 'L1_TE40.0ETA24', [], ['MinBias'], ["BW:MinBias", "RATE:MinBias"], -1],
-	['mb_sp1500_pusup700_trk100_hmt_L1TE50', 'L1_TE50', [], ['MinBias'], ["BW:MinBias", "RATE:MinBias"], -1],
+	##B['mb_sp1500_pusup700_trk100_hmt_L1TE50', 'L1_TE50', [], ['MinBias'], ["BW:MinBias", "RATE:MinBias"], -1],
 
         ['mb_sp1800_trk110_hmt_L1TE10', 'L1_TE10', [], ['MinBias'], ["BW:MinBias", "RATE:MinBias"], -1],
         ['mb_sp1800_trk110_hmt_L1TE10.0ETA24', 'L1_TE10.0ETA24', [], ['MinBias'], ["BW:MinBias", "RATE:MinBias"], -1],
@@ -2596,38 +2688,40 @@ def setupMenu():
         ['mb_sp1800_pusup800_trk110_hmt_L1TE30', 'L1_TE30', [], ['MinBias'], ["BW:MinBias", "RATE:MinBias"], -1],
         ['mb_sp1800_pusup800_trk110_hmt_L1TE40', 'L1_TE40', [], ['MinBias'], ["BW:MinBias", "RATE:MinBias"], -1],
         ['mb_sp1800_pusup800_trk110_hmt_L1TE40.0ETA24', 'L1_TE40.0ETA24', [], ['MinBias'], ["BW:MinBias", "RATE:MinBias"], -1],
-	['mb_sp1800_pusup800_trk110_hmt_L1TE50', 'L1_TE50', [], ['MinBias'], ["BW:MinBias", "RATE:MinBias"], -1],
+	##b['mb_sp1800_pusup800_trk110_hmt_L1TE50', 'L1_TE50', [], ['MinBias'], ["BW:MinBias", "RATE:MinBias"], -1],
 
 	['mb_sp2100_pusup1000_trk120_hmt_L1TE20', 'L1_TE20', [], ['MinBias'], ["BW:MinBias", "RATE:MinBias"], -1],
 	['mb_sp2100_pusup1000_trk120_hmt_L1TE30', 'L1_TE30', [], ['MinBias'], ["BW:MinBias", "RATE:MinBias"], -1],
 	['mb_sp2100_pusup1000_trk120_hmt_L1TE40', 'L1_TE40', [], ['MinBias'], ["BW:MinBias", "RATE:MinBias"], -1],
-	['mb_sp2100_pusup1000_trk120_hmt_L1TE50', 'L1_TE50', [], ['MinBias'], ["BW:MinBias", "RATE:MinBias"], -1],
+	##B['mb_sp2100_pusup1000_trk120_hmt_L1TE50', 'L1_TE50', [], ['MinBias'], ["BW:MinBias", "RATE:MinBias"], -1],
 
 	['mb_sp2400_pusup1100_trk130_hmt_L1TE20', 'L1_TE20', [], ['MinBias'], ["BW:MinBias", "RATE:MinBias"], -1],
         ['mb_sp2400_pusup1100_trk130_hmt_L1TE30', 'L1_TE30', [], ['MinBias'], ["BW:MinBias", "RATE:MinBias"], -1],
         ['mb_sp2400_pusup1100_trk130_hmt_L1TE40', 'L1_TE40', [], ['MinBias'], ["BW:MinBias", "RATE:MinBias"], -1],
-        ['mb_sp2400_pusup1100_trk130_hmt_L1TE50', 'L1_TE50', [], ['MinBias'], ["BW:MinBias", "RATE:MinBias"], -1],
+        ##B['mb_sp2400_pusup1100_trk130_hmt_L1TE50', 'L1_TE50', [], ['MinBias'], ["BW:MinBias", "RATE:MinBias"], -1],
 
 	['mb_sp2700_pusup1300_trk140_hmt_L1TE20', 'L1_TE20', [], ['MinBias'], ["BW:MinBias", "RATE:MinBias"], -1],
         ['mb_sp2700_pusup1300_trk140_hmt_L1TE30', 'L1_TE30', [], ['MinBias'], ["BW:MinBias", "RATE:MinBias"], -1],
         ['mb_sp2700_pusup1300_trk140_hmt_L1TE40', 'L1_TE40', [], ['MinBias'], ["BW:MinBias", "RATE:MinBias"], -1],
-        ['mb_sp2700_pusup1300_trk140_hmt_L1TE50', 'L1_TE50', [], ['MinBias'], ["BW:MinBias", "RATE:MinBias"], -1],
+        ##B['mb_sp2700_pusup1300_trk140_hmt_L1TE50', 'L1_TE50', [], ['MinBias'], ["BW:MinBias", "RATE:MinBias"], -1],
 
 	['mb_sp3000_pusup1400_trk150_hmt_L1TE20', 'L1_TE20', [], ['MinBias'], ["BW:MinBias", "RATE:MinBias"], -1],
         ['mb_sp3000_pusup1400_trk150_hmt_L1TE30', 'L1_TE30', [], ['MinBias'], ["BW:MinBias", "RATE:MinBias"], -1],
         ['mb_sp3000_pusup1400_trk150_hmt_L1TE40', 'L1_TE40', [], ['MinBias'], ["BW:MinBias", "RATE:MinBias"], -1],
-        ['mb_sp3000_pusup1400_trk150_hmt_L1TE50', 'L1_TE50', [], ['MinBias'], ["BW:MinBias", "RATE:MinBias"], -1],
-	['mb_sp3000_pusup1400_trk150_hmt_L1TE60', 'L1_TE60', [], ['MinBias'], ["BW:MinBias", "RATE:MinBias"], -1],
+        ##B['mb_sp3000_pusup1400_trk150_hmt_L1TE50', 'L1_TE50', [], ['MinBias'], ["BW:MinBias", "RATE:MinBias"], -1],
+	##B['mb_sp3000_pusup1400_trk150_hmt_L1TE60', 'L1_TE60', [], ['MinBias'], ["BW:MinBias", "RATE:MinBias"], -1],
 
 	['mb_sp3000_pusup1500_trk160_hmt_L1TE20', 'L1_TE20', [], ['MinBias'], ["BW:MinBias", "RATE:MinBias"], -1],
         ['mb_sp3000_pusup1500_trk160_hmt_L1TE30', 'L1_TE30', [], ['MinBias'], ["BW:MinBias", "RATE:MinBias"], -1],
         ['mb_sp3000_pusup1500_trk160_hmt_L1TE40', 'L1_TE40', [], ['MinBias'], ["BW:MinBias", "RATE:MinBias"], -1],
-        ['mb_sp3000_pusup1500_trk160_hmt_L1TE50', 'L1_TE50', [], ['MinBias'], ["BW:MinBias", "RATE:MinBias"], -1],
-        ['mb_sp3000_pusup1500_trk160_hmt_L1TE60', 'L1_TE60', [], ['MinBias'], ["BW:MinBias", "RATE:MinBias"], -1],
+        ##B['mb_sp3000_pusup1500_trk160_hmt_L1TE50', 'L1_TE50', [], ['MinBias'], ["BW:MinBias", "RATE:MinBias"], -1],
+        ##B['mb_sp3000_pusup1500_trk160_hmt_L1TE60', 'L1_TE60', [], ['MinBias'], ["BW:MinBias", "RATE:MinBias"], -1],
 
         #ATR-13773
         ['mb_sp900_pusup400_trk60_hmt_L1TE5', 'L1_TE5', [], ['MinBias'], ["BW:MinBias", "RATE:MinBias"], -1],
+        ['mb_sp900_pusup400_trk60_hmt_L1TE5.0ETA24', 'L1_TE5.0ETA24', [], ['MinBias'], ["BW:MinBias", "RATE:MinBias"], -1],
         ['mb_sp1000_pusup450_trk70_hmt_L1TE5', 'L1_TE5', [], ['MinBias'], ["BW:MinBias", "RATE:MinBias"], -1],
+        ['mb_sp1000_pusup450_trk70_hmt_L1TE5.0ETA24', 'L1_TE5.0ETA24', [], ['MinBias'], ["BW:MinBias", "RATE:MinBias"], -1],
         ['mb_sp1200_pusup500_trk80_hmt_L1TE5', 'L1_TE5', [], ['MinBias'], ["BW:MinBias", "RATE:MinBias"], -1],
         ['mb_sp1600_pusup600_trk100_hmt_L1TE10', 'L1_TE10', [], ['MinBias'], ["BW:MinBias", "RATE:MinBias"], -1],
         ['mb_sp1600_pusup600_trk100_hmt_L1TE10.0ETA24', 'L1_TE10.0ETA24', [], ['MinBias'], ["BW:MinBias", "RATE:MinBias"], -1],
@@ -2739,11 +2833,12 @@ def setupMenu():
         ['larnoiseburst_L1All',             'L1_All',       [], ['LArNoiseBurst'], ["RATE:Calibration", "BW:Detector"], -1],
         ['larnoiseburst_L1XE35',            'L1_XE35',       [], ['LArNoiseBurst'], ["RATE:Calibration", "BW:Detector"], -1],
         ['larnoiseburst_L1XE50',            'L1_XE50',       [], ['LArNoiseBurst'], ["RATE:Calibration", "BW:Detector"], -1],
+        ['larnoiseburst_L1XE55',            'L1_XE55',       [], ['LArNoiseBurst'], ["RATE:Calibration", "BW:Detector"], -1],
         ['larnoiseburst_L1J50',             'L1_J50',       [], ['LArNoiseBurst'], ["RATE:Calibration", "BW:Detector"], -1],
         ['larnoiseburst_L1J75',             'L1_J75',       [], ['LArNoiseBurst'], ["RATE:Calibration", "BW:Detector"], -1],
         ['larnoiseburst_L1J40_XE50',            'L1_J40_XE50',       [], ['LArNoiseBurst'], ["RATE:Calibration", "BW:Detector"], -1],
-        ['larnoiseburst_L1J75_XE40',            'L1_J75_XE40',       [], ['LArNoiseBurst'], ["RATE:Calibration", "BW:Detector"], -1],
-
+        ['larnoiseburst_L1J40_XE60',            'L1_J40_XE60',       [], ['LArNoiseBurst'], ["RATE:Calibration", "BW:Detector"], -1],
+        
 
         ['larnoiseburst_L1XE80', 'L1_XE80', [], ['LArNoiseBurst'], ["RATE:Calibration", "BW:Detector"], -1],
         ['larnoiseburst_L1J100', 'L1_J100', [], ['LArNoiseBurst'], ["RATE:Calibration", "BW:Detector"], -1],
@@ -2916,8 +3011,8 @@ def setupMenu():
         ['noalg_mb_L1TE20',  'L1_TE20', [], ['MinBias'], ["BW:MinBias", "RATE:MinBias"], -1],
         ['noalg_mb_L1TE30',  'L1_TE30', [], ['MinBias'], ["BW:MinBias", "RATE:MinBias"], -1], 
         ['noalg_mb_L1TE40',  'L1_TE40', [], ['MinBias'], ["BW:MinBias", "RATE:MinBias"], -1],
-        ['noalg_mb_L1TE50',  'L1_TE50', [], ['MinBias'], ["BW:MinBias", "RATE:MinBias"], -1],
-        ['noalg_mb_L1TE60',  'L1_TE60', [], ['MinBias'], ["BW:MinBias", "RATE:MinBias"], -1],
+        ##B['noalg_mb_L1TE50',  'L1_TE50', [], ['MinBias'], ["BW:MinBias", "RATE:MinBias"], -1],
+        ##B['noalg_mb_L1TE60',  'L1_TE60', [], ['MinBias'], ["BW:MinBias", "RATE:MinBias"], -1],
         ['noalg_mb_L1TE70',  'L1_TE70', [], ['MinBias'], ["BW:MinBias", "RATE:MinBias"], -1],
 
         ['noalg_mb_L1TE5.0ETA24',  'L1_TE5.0ETA24', [], ['MinBias'], ["BW:MinBias", "RATE:MinBias"], -1],
@@ -2925,8 +3020,8 @@ def setupMenu():
         ['noalg_mb_L1TE20.0ETA24',  'L1_TE20.0ETA24', [], ['MinBias'], ["BW:MinBias", "RATE:MinBias"], -1], 
         ['noalg_mb_L1TE30.0ETA24',  'L1_TE30.0ETA24', [], ['MinBias'], ["BW:MinBias", "RATE:MinBias"], -1], 
         ['noalg_mb_L1TE40.0ETA24',  'L1_TE40.0ETA24', [], ['MinBias'], ["BW:MinBias", "RATE:MinBias"], -1], 
-        ['noalg_mb_L1TE50.0ETA24',  'L1_TE50.0ETA24', [], ['MinBias'], ["BW:MinBias", "RATE:MinBias"], -1], 
-        ['noalg_mb_L1TE60.0ETA24',  'L1_TE60.0ETA24', [], ['MinBias'], ["BW:MinBias", "RATE:MinBias"], -1],
+        ##B['noalg_mb_L1TE50.0ETA24',  'L1_TE50.0ETA24', [], ['MinBias'], ["BW:MinBias", "RATE:MinBias"], -1], 
+        ##B['noalg_mb_L1TE60.0ETA24',  'L1_TE60.0ETA24', [], ['MinBias'], ["BW:MinBias", "RATE:MinBias"], -1],
         ['noalg_mb_L1TE70.0ETA24',  'L1_TE70.0ETA24', [], ['MinBias'], ["BW:MinBias", "RATE:MinBias"], -1],
 
         # ZDC streamers
@@ -2946,16 +3041,11 @@ def setupMenu():
         ['noalg_L1TAU20IM_2TAU12IM', 'L1_TAU20IM_2TAU12IM', [], [PhysicsStream], ['RATE:SeededStreamers', 'BW:Tau'], -1],
         ['noalg_L1TAU12',            'L1_TAU12',            [], [PhysicsStream], ['RATE:SeededStreamers', 'BW:Tau'], -1],
         ['noalg_L1TAU12IM',            'L1_TAU12IM',            [], [PhysicsStream], ['RATE:SeededStreamers', 'BW:Tau'], -1],
-        ['noalg_L1TAU12IL',            'L1_TAU12IL',            [], [PhysicsStream], ['RATE:SeededStreamers', 'BW:Tau'], -1],
-        ['noalg_L1TAU12IT',            'L1_TAU12IT',            [], [PhysicsStream], ['RATE:SeededStreamers', 'BW:Tau'], -1],
         ['noalg_L1TAU20IM',            'L1_TAU20IM',            [], [PhysicsStream], ['RATE:SeededStreamers', 'BW:Tau'], -1],
-        ['noalg_L1TAU20IL',            'L1_TAU20IL',            [], [PhysicsStream], ['RATE:SeededStreamers', 'BW:Tau'], -1],
-        ['noalg_L1TAU20IT',            'L1_TAU20IT',            [], [PhysicsStream], ['RATE:SeededStreamers', 'BW:Tau'], -1],
 
         # MET streamers
         ['noalg_L1XE35',             'L1_XE35',             [], [PhysicsStream, 'express'], ['RATE:SeededStreamers', 'BW:MET'], -1],
         ['noalg_L1XE10',             'L1_XE10',             [], [PhysicsStream], ['RATE:SeededStreamers', 'BW:MET'], -1],
-        ['noalg_L1XE20',             'L1_XE20',             [], [PhysicsStream], ['RATE:SeededStreamers', 'BW:MET'], -1],
         ['noalg_L1XE30',             'L1_XE30',             [], [PhysicsStream], ['RATE:SeededStreamers', 'BW:MET'], -1],
         ['noalg_L1XE150',            'L1_XE150',             [], [PhysicsStream], ['RATE:SeededStreamers', 'BW:MET'], -1],
         ['noalg_L1XE300',            'L1_XE300',             [], [PhysicsStream], ['RATE:SeededStreamers', 'BW:MET'], -1],
@@ -3385,8 +3475,8 @@ def setupMenu():
         ['noalg_L1XE40',  'L1_XE40',   [], [PhysicsStream], ["RATE:SeededStreamers", "BW:MET"], -1 ],
 	
         ['noalg_L1TE70',  'L1_TE70',   [], [PhysicsStream], ["RATE:SeededStreamers", "BW:MET"], -1 ],
-        ['noalg_L1TE60',  'L1_TE60',   [], [PhysicsStream], ["RATE:SeededStreamers", "BW:MET"], -1 ],
-        ['noalg_L1TE50',  'L1_TE50',   [], [PhysicsStream], ["RATE:SeededStreamers", "BW:MET"], -1 ], 
+        ##B['noalg_L1TE60',  'L1_TE60',   [], [PhysicsStream], ["RATE:SeededStreamers", "BW:MET"], -1 ],
+        ##B['noalg_L1TE50',  'L1_TE50',   [], [PhysicsStream], ["RATE:SeededStreamers", "BW:MET"], -1 ], 
         ['noalg_L1TE40',  'L1_TE40',   [], [PhysicsStream], ["RATE:SeededStreamers", "BW:MET"], -1 ], 
         ['noalg_L1TE30',  'L1_TE30',   [], [PhysicsStream], ["RATE:SeededStreamers", "BW:MET"], -1 ], 
         ['noalg_L1TE20',  'L1_TE20',   [], [PhysicsStream], ["RATE:SeededStreamers", "BW:MET"], -1 ], 
@@ -3397,12 +3487,9 @@ def setupMenu():
         ['noalg_L1TE20.0ETA24',  'L1_TE20.0ETA24',   [], [PhysicsStream], ["RATE:SeededStreamers", "BW:MET"], -1 ], 
         ['noalg_L1TE30.0ETA24',  'L1_TE30.0ETA24',   [], [PhysicsStream], ["RATE:SeededStreamers", "BW:MET"], -1 ], 
         ['noalg_L1TE40.0ETA24',  'L1_TE40.0ETA24',   [], [PhysicsStream], ["RATE:SeededStreamers", "BW:MET"], -1 ], 
-        ['noalg_L1TE50.0ETA24',  'L1_TE50.0ETA24',   [], [PhysicsStream], ["RATE:SeededStreamers", "BW:MET"], -1 ], 
-	['noalg_L1TE60.0ETA24',  'L1_TE60.0ETA24',   [], [PhysicsStream], ["RATE:SeededStreamers", "BW:MET"], -1 ], 
+        ##B['noalg_L1TE50.0ETA24',  'L1_TE50.0ETA24',   [], [PhysicsStream], ["RATE:SeededStreamers", "BW:MET"], -1 ], 
+	##B['noalg_L1TE60.0ETA24',  'L1_TE60.0ETA24',   [], [PhysicsStream], ["RATE:SeededStreamers", "BW:MET"], -1 ], 
         
-        ['noalg_L1XS60',  'L1_XS60',   [], [PhysicsStream], ["RATE:SeededStreamers", "BW:MET"], -1 ],
-        ['noalg_L1XS50',  'L1_XS50',   [], [PhysicsStream], ["RATE:SeededStreamers", "BW:MET"], -1 ],
-        ['noalg_L1XS40',  'L1_XS40',   [], [PhysicsStream], ["RATE:SeededStreamers", "BW:MET"], -1 ],
         ['noalg_L1XS30',  'L1_XS30',   [], [PhysicsStream], ["RATE:SeededStreamers", "BW:MET"], -1 ],
         ['noalg_L1XS20',  'L1_XS20',   [], [PhysicsStream], ["RATE:SeededStreamers", "BW:MET"], -1 ],
 	
@@ -3598,7 +3685,7 @@ chain_list=[
     'mb_sp1500_pusup700_trk100_hmt_L1TE20.0ETA24',
     'mb_sp1500_pusup700_trk100_hmt_L1TE30',
     'mb_sp1500_pusup700_trk100_hmt_L1TE40',
-    'mb_sp1500_pusup700_trk100_hmt_L1TE50',
+    ##B'mb_sp1500_pusup700_trk100_hmt_L1TE50',
     'mb_sp1500_pusup700_trk100_hmt_L1TE40.0ETA24',
     'mb_sp1500_pusup700_trk100_hmt_L1TE10',
     'mb_sp1500_pusup700_trk100_hmt_L1TE10.0ETA24',
@@ -3625,7 +3712,7 @@ chain_list=[
     'mb_sp1800_pusup800_trk110_hmt_L1TE40.0ETA24',
     'mb_sp1800_pusup800_trk110_hmt_L1TE10',
     'mb_sp1800_pusup800_trk110_hmt_L1TE10.0ETA24',
-    'mb_sp1800_pusup800_trk110_hmt_L1TE50',
+    ##B'mb_sp1800_pusup800_trk110_hmt_L1TE50',
     'mb_sp1800_trk110_hmt_L1TE20',
     'mb_sp1800_trk110_hmt_L1TE20.0ETA24',
     'mb_sp1800_trk110_hmt_L1TE30',
@@ -3636,27 +3723,29 @@ chain_list=[
     'mb_sp2100_pusup1000_trk120_hmt_L1TE20',
     'mb_sp2100_pusup1000_trk120_hmt_L1TE30',
     'mb_sp2100_pusup1000_trk120_hmt_L1TE40',
-    'mb_sp2100_pusup1000_trk120_hmt_L1TE50',
+    ##B'mb_sp2100_pusup1000_trk120_hmt_L1TE50',
     'mb_sp2400_pusup1100_trk130_hmt_L1TE20',
     'mb_sp2400_pusup1100_trk130_hmt_L1TE30',
     'mb_sp2400_pusup1100_trk130_hmt_L1TE40',
-    'mb_sp2400_pusup1100_trk130_hmt_L1TE50',
+    ##B'mb_sp2400_pusup1100_trk130_hmt_L1TE50',
     'mb_sp2700_pusup1300_trk140_hmt_L1TE20',
     'mb_sp2700_pusup1300_trk140_hmt_L1TE30',
     'mb_sp2700_pusup1300_trk140_hmt_L1TE40',
-    'mb_sp2700_pusup1300_trk140_hmt_L1TE50',
+    ##B'mb_sp2700_pusup1300_trk140_hmt_L1TE50',
     'mb_sp3000_pusup1400_trk150_hmt_L1TE20',
     'mb_sp3000_pusup1400_trk150_hmt_L1TE30',
     'mb_sp3000_pusup1400_trk150_hmt_L1TE40',
-    'mb_sp3000_pusup1400_trk150_hmt_L1TE50',
-    'mb_sp3000_pusup1400_trk150_hmt_L1TE60',
+    ##B'mb_sp3000_pusup1400_trk150_hmt_L1TE50',
+    ##B'mb_sp3000_pusup1400_trk150_hmt_L1TE60',
     'mb_sp3000_pusup1500_trk160_hmt_L1TE20',
     'mb_sp3000_pusup1500_trk160_hmt_L1TE30',
     'mb_sp3000_pusup1500_trk160_hmt_L1TE40',
-    'mb_sp3000_pusup1500_trk160_hmt_L1TE50',
-    'mb_sp3000_pusup1500_trk160_hmt_L1TE60',
+    ##B'mb_sp3000_pusup1500_trk160_hmt_L1TE50',
+    ##B'mb_sp3000_pusup1500_trk160_hmt_L1TE60',
     'mb_sp900_pusup400_trk60_hmt_L1TE5',
+    'mb_sp900_pusup400_trk60_hmt_L1TE5.0ETA24',
     'mb_sp1000_pusup450_trk70_hmt_L1TE5',
+    'mb_sp1000_pusup450_trk70_hmt_L1TE5.0ETA24',
     'mb_sp1200_pusup500_trk80_hmt_L1TE5',
     'mb_sp1600_pusup600_trk100_hmt_L1TE10',
     'mb_sp1600_pusup600_trk100_hmt_L1TE10.0ETA24',
@@ -3722,42 +3811,43 @@ chain_list=[
     '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',
+    ##B'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',
+    ##B'mb_sp1500_hmtperf_L1TE50',
+    ##B'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',
+    ##B'mb_sp1600_pusup1100_trk90_hmt_L1TE50',
+    ##B'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',
+    ##B'mb_sp2000_pusup1200_trk100_hmt_L1TE50',
+    ##B'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',
+    ##B'mb_sp2200_pusup1300_trk110_hmt_L1TE50',
+    ##B'mb_sp2200_pusup1300_trk110_hmt_L1TE60',
     'mb_sp2100_hmtperf_L1TE30',
     'mb_sp2100_hmtperf_L1TE40',
-    'mb_sp2100_hmtperf_L1TE50',
-    'mb_sp2100_hmtperf_L1TE60',
+    ##B'mb_sp2100_hmtperf_L1TE50',
+    ##B'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',
+    ##B'mb_sp2400_pusup1400_trk120_hmt_L1TE50',
+    ##B'mb_sp2400_pusup1400_trk120_hmt_L1TE60',
     'mb_sp700_hmtperf_L1TE5',
     'mb_sp800_pusup400_trk50_hmt_L1TE5',
+    'mb_sp900_pusup500_trk60_hmt_L1TE5',
     'mb_sptrk',
     'mb_sptrk_L1RD0_EMPTY',
     'mb_sptrk_L1RD0_UNPAIRED_ISO',
@@ -3827,10 +3917,10 @@ chain_list=[
     'noalg_mb_L1TE30.0ETA24',
     'noalg_mb_L1TE40',
     'noalg_mb_L1TE40.0ETA24',
-    'noalg_mb_L1TE50',
-    'noalg_mb_L1TE50.0ETA24',
-    'noalg_mb_L1TE60',
-    'noalg_mb_L1TE60.0ETA24',
+    ##B'noalg_mb_L1TE50',
+    ##B'noalg_mb_L1TE50.0ETA24',
+    ##B'noalg_mb_L1TE60',
+    ##B'noalg_mb_L1TE60.0ETA24',
     'noalg_mb_L1TE70',
     'noalg_mb_L1TE70.0ETA24',
     'noalg_mb_L1ZDC_A',
diff --git a/Trigger/TriggerCommon/TriggerMenu/python/menu/SignatureDicts.py b/Trigger/TriggerCommon/TriggerMenu/python/menu/SignatureDicts.py
index a20f084f954..4a74a4bdf26 100644
--- a/Trigger/TriggerCommon/TriggerMenu/python/menu/SignatureDicts.py
+++ b/Trigger/TriggerCommon/TriggerMenu/python/menu/SignatureDicts.py
@@ -65,7 +65,8 @@ AllowedTopos_bphys = ['bJpsi', 'bTau', 'bDimu',
                       'Trkloose', 'Zmumu', 'noL2', 'noEFbph',
                       'noinvm', 'ss', 'BpmumuKp', 'Taumumux',
                       '11invm24', '24invm60',
-                      'tightChi2', 'Lxy0', 'Ftk','legacyVtx']
+                      'tightChi2', 'Lxy0', 'Ftk','legacyVtx',
+                      'BsmumuPhi', 'BsJpsiPhi']
 AllowedTopos_jet = ['muvtx',
                     'revllp',
                     'llp',
@@ -82,7 +83,7 @@ AllowedTopos_jet = ['muvtx',
                     'invm700',
                     'invm800',
                     'invm1000']
-AllowedTopos_Tau = ['ditauL', 'ditauM', 'ditauT','tautsf','notautsf','60mVis10000']
+AllowedTopos_Tau = ['ditauL', 'ditauM', 'ditauT','tautsf','notautsf','60mVis10000','03dR30']
 AllowedTopos_comb = ['taumass', 'dr05', 'dz02']
 
 #AllowedTopos = AllowedTopos_e+AllowedTopos_mu+AllowedTopos_bphys+AllowedTopos_jet+AllowedTopos_xe+AllowedTopos_comb
@@ -104,7 +105,7 @@ JetChainParts = {
     'etaRange'     : ['0eta490','0eta320','0eta240', '240eta490','280eta320', '320eta490'],
     'gscThreshold' : ['gsc400','gsc380','gsc360','gsc110'],
     'trigType'     : ['j'],
-    'extra'        : ['noL1','test1','test2','test3','delayed'],
+    'extra'        : ['noL1','test1','test2','test3','delayed','AND'],
     'cleaning'     : ['cleanL','cleanT','cleanLLP',
                       'cleanLA','cleanTA','cleanLLPA', 'noCleaning'
                       ],
@@ -526,7 +527,7 @@ HeavyIonChainParts = {
     'extra'          : ['th1', 'th2', 'th3', 'th4', 'th5', 'th6', 'th7', 'th8', 'th9', 'th10', 'th11', 'th12', 'th13', 'th14', 'th15', 'th16', 'perf', 'perfzdc'],
     'IDinfo'         : [],
     'trkInfo'        : [],
-    'eventShape'     : ['v2', 'v3', 'v23'],
+    'eventShape'     : ['v2', 'v3', 'v23', 'v2A', 'v2C'],    
     'eventShapeVeto' : ['veto2', 'veto3'],
     'hypoL2Info'     : ['loose', 'medium', 'tight', 'gg',],
     'pileupInfo'     : ['zdcpu'],
diff --git a/Trigger/TriggerCommon/TriggerMenu/python/muon/MuonDef.py b/Trigger/TriggerCommon/TriggerMenu/python/muon/MuonDef.py
index d13ca4613e9..b39c4052e51 100755
--- a/Trigger/TriggerCommon/TriggerMenu/python/muon/MuonDef.py
+++ b/Trigger/TriggerCommon/TriggerMenu/python/muon/MuonDef.py
@@ -71,8 +71,6 @@ class L2EFChain_mu(L2EFChainDef):
       self.L2InputTE = self.L2InputTE.replace("L1_","")
       self.L2InputTE = self.L2InputTE.split("_")[0]
       self.L2InputTE = self.L2InputTE[1:] if self.L2InputTE[0].isdigit() else self.L2InputTE
-      if 'AFP' in self.L2InputTE:
-        self.L2InputTE = ""
     
     # --- used to configure hypos for FS muon chains
     self.allMuThrs=AllMuons
@@ -1374,24 +1372,51 @@ class L2EFChain_mu(L2EFChainDef):
     inputTEfromL2 = "placeHolderTE"
     if "nscan03" in self.chainPart['FSinfo']:
       cone = "_cone03"
-      #      self.EFsequenceList += [[self.chainPart['L1item'].replace("L1_",""),
-      self.EFsequenceList += [[inputTEfromL2,
-                               [CfgGetter.getAlgorithm("TrigMuSuperEF_WideCone"),
-                                theTrigMuonEFSA_NS_Hypo],
-                               'EF_SA_NS']]
-      self.EFsequenceList += [['EF_SA_NS',
-                              [CfgGetter.getAlgorithm("TrigMuonEFFSRoiMaker")],
-                               'EF_SAR_NS']]
-      self.EFsequenceList += [['EF_SAR_NS',
-                               trkfast+trkprec,                             
-	   		       'EF_NStracksMuon']]
-      self.EFsequenceList += [['EF_NStracksMuon',
-                              [CfgGetter.getAlgorithm("TrigMuSuperEF_TMEFCombinerOnly")],
-                               'EF_CB_NS_single']]
-      self.EFsequenceList += [['EF_CB_NS_single',
-                              [TrigMuonEFRoiAggregatorConfig('TrigMuonEFFSRoiAggregator'),
-                               theTrigMuonEFCombinerMultiHypoConfig],
-                               'EF_CB_NS']]
+      if "msonly" in self.chainPart['reccalibInfo']:
+              #      self.EFsequenceList += [[self.chainPart['L1item'].replace("L1_",""),
+      	      self.EFsequenceList += [[inputTEfromL2,
+      	        		      [CfgGetter.getAlgorithm("TrigMuSuperEF_WideCone"),
+      	        		       theTrigMuonEFSA_NS_Hypo],
+      	        		       'EF_SA_NS']]
+      	      self.EFsequenceList += [['EF_SA_NS',
+      	        		      [TrigMuonEFRoiAggregatorConfig('TrigMuonEFFSRoiAggregator'),
+              #     	               theTrigMuonEFCombinerMultiHypoConfig],
+      	        		       theTrigMuonEFExtrapolatorMultiHypoConfig],
+      	        		       'EF_NS']]
+      	      if "noComb" in self.chainPart['addInfo']:
+      	        self.EFsequenceList += [['EF_NS',
+      	        			 [CfgGetter.getAlgorithm("TrigMuonEFFSRoiMaker")],
+      	        			 'EF_SAR_NS']]
+      	        self.EFsequenceList += [['EF_SAR_NS',
+      	        			 trkfast+trkprec,		  #theTrigEFIDInsideOut_Muon,	  #a fallback - it should be replaced by the previous line if it works
+      	        			 'EF_NStracksMuon']]
+      	        self.EFsequenceList += [['EF_NStracksMuon',
+      	        			 [CfgGetter.getAlgorithm("TrigMuSuperEF_TMEFCombinerOnly")],
+      	        			 'EF_CB_NS_single']]
+      	        self.EFsequenceList += [['EF_CB_NS_single',
+      	        			 [TrigMuonEFRoiAggregatorConfig('TrigMuonEFFSRoiAggregator'),
+      	        			  theTrigMuonEFCombinerMultiHypoConfig],
+      	        			 'EF_CB_NS']]
+      
+      else:
+              #      self.EFsequenceList += [[self.chainPart['L1item'].replace("L1_",""),
+      	      self.EFsequenceList += [[inputTEfromL2,
+      	        		       [CfgGetter.getAlgorithm("TrigMuSuperEF_WideCone"),
+      	        			theTrigMuonEFSA_NS_Hypo],
+      	        		       'EF_SA_NS']]
+      	      self.EFsequenceList += [['EF_SA_NS',
+      	        		      [CfgGetter.getAlgorithm("TrigMuonEFFSRoiMaker")],
+      	        		       'EF_SAR_NS']]
+      	      self.EFsequenceList += [['EF_SAR_NS',
+      	        		       trkfast+trkprec, 			    
+      	        		       'EF_NStracksMuon']]
+      	      self.EFsequenceList += [['EF_NStracksMuon',
+      	        		      [CfgGetter.getAlgorithm("TrigMuSuperEF_TMEFCombinerOnly")],
+      	        		       'EF_CB_NS_single']]
+      	      self.EFsequenceList += [['EF_CB_NS_single',
+      	        		      [TrigMuonEFRoiAggregatorConfig('TrigMuonEFFSRoiAggregator'),
+      	        		       theTrigMuonEFCombinerMultiHypoConfig],
+      	        		       'EF_CB_NS']]
     elif "nscan05" in self.chainPart['FSinfo']:
       cone = "_cone05"
       #      self.EFsequenceList += [[self.chainPart['L1item'].replace("L1_",""),
@@ -1401,7 +1426,7 @@ class L2EFChain_mu(L2EFChainDef):
                                'EF_SA_NS']]
       self.EFsequenceList += [['EF_SA_NS',
                               [TrigMuonEFRoiAggregatorConfig('TrigMuonEFFSRoiAggregator'),
-#                               theTrigMuonEFCombinerMultiHypoConfig],
+      #                        theTrigMuonEFCombinerMultiHypoConfig],
                                theTrigMuonEFExtrapolatorMultiHypoConfig],
                                'EF_NS']]
       if "noComb" in self.chainPart['addInfo']:
@@ -1427,10 +1452,18 @@ class L2EFChain_mu(L2EFChainDef):
       
     self.EFsignatureList += [ [['EF_SA_NS']] ]
     if "nscan03" in self.chainPart['FSinfo']:
-      self.EFsignatureList += [ [['EF_SAR_NS']] ]
-      self.EFsignatureList += [ [['EF_NStracksMuon']] ]
-      self.EFsignatureList += [ [['EF_CB_NS_single']] ]
-      self.EFsignatureList += [ [['EF_CB_NS']] ]
+      if "msonly" in self.chainPart['reccalibInfo']:
+        self.EFsignatureList += [ [['EF_NS']] ]
+        if "noComb" in self.chainPart['addInfo']:
+          self.EFsignatureList += [ [['EF_SAR_NS']] ]
+          self.EFsignatureList += [ [['EF_NStracksMuon']] ]
+          self.EFsignatureList += [ [['EF_CB_NS_single']] ]
+          self.EFsignatureList += [ [['EF_CB_NS']] ]
+      else:
+        self.EFsignatureList += [ [['EF_SAR_NS']] ]
+        self.EFsignatureList += [ [['EF_NStracksMuon']] ]
+        self.EFsignatureList += [ [['EF_CB_NS_single']] ]
+        self.EFsignatureList += [ [['EF_CB_NS']] ]
     if "nscan05" in self.chainPart['FSinfo']:
       self.EFsignatureList += [ [['EF_NS']] ]
       if "noComb" in self.chainPart['addInfo']:
@@ -1443,13 +1476,29 @@ class L2EFChain_mu(L2EFChainDef):
     l1seed = self.chainL1Item
 
     if "nscan03" in self.chainPart['FSinfo']:
-      self.TErenamingDict = {
-        'EF_SA_NS': mergeRemovingOverlap('EF_SA_NS_','SANShyp'+hypocut+cone+'_'+nscanseed+'_'+l1seed),
-        'EF_SAR_NS': mergeRemovingOverlap('EF_SAR_NS_','SANShyp'+hypocut+cone+'_'+nscanseed+'_'+l1seed),
-        'EF_NStracksMuon': mergeRemovingOverlap('EF_NStrkMu_', 'SANShyp'+hypocut+cone+'_'+nscanseed+'_'+l1seed),
-        'EF_CB_NS_single': mergeRemovingOverlap('EF_CB_NS_sngl_','SANShyp'+hypocut+cone+'_'+nscanseed+'_'+l1seed), 
-        'EF_CB_NS': mergeRemovingOverlap('EF_CB_NS_', 'SANShyp'+hypocut+'_'+hypocutEF+cone+'_'+nscanseed+'_'+l1seed),
-      }
+      if "msonly" in self.chainPart['reccalibInfo']:
+        if "noComb" in self.chainPart['addInfo']:
+          self.TErenamingDict = {
+            'EF_SA_NS': mergeRemovingOverlap('EF_SA_NS_','SANShyp'+hypocut+cone+'_noComb_'+nscanseed+'_'+l1seed),
+            'EF_NS': mergeRemovingOverlap('EF_NS_', 'SANShyp'+hypocut+cone+'_noComb_'+nscanseed+'_'+l1seed), 
+            'EF_SAR_NS': mergeRemovingOverlap('EF_SAR_NS_','SANSHypo'+hypocut+cone+'_noComb_'+nscanseed+'_'+l1seed), 
+            'EF_NStracksMuon': mergeRemovingOverlap('EF_NStracksMuon_', 'SANSHypo'+hypocut+cone+'_noComb_'+nscanseed+'_'+l1seed), 
+            'EF_CB_NS_single': mergeRemovingOverlap('EF_CB_NS_single_','SANSHypo'+hypocut+cone+'_noComb_'+nscanseed+'_'+l1seed), 
+            'EF_CB_NS': mergeRemovingOverlap('EF_CB_NS_', 'SANSHypo'+hypocut+'_'+hypocutEF+cone+'_noComb_'+nscanseed+'_'+l1seed),
+            }
+        else:
+          self.TErenamingDict = {
+            'EF_SA_NS': mergeRemovingOverlap('EF_SA_NS_','SANShyp'+hypocut+cone+'_'+nscanseed+'_'+l1seed),
+            'EF_NS': mergeRemovingOverlap('EF_NS_','SANShyp'+hypocut+'_'+hypocutEF+cone+'_'+nscanseed+'_'+l1seed),
+            }
+      else:
+        self.TErenamingDict = {
+          'EF_SA_NS': mergeRemovingOverlap('EF_SA_NS_','SANShyp'+hypocut+cone+'_'+nscanseed+'_'+l1seed),
+          'EF_SAR_NS': mergeRemovingOverlap('EF_SAR_NS_','SANShyp'+hypocut+cone+'_'+nscanseed+'_'+l1seed),
+          'EF_NStracksMuon': mergeRemovingOverlap('EF_NStrkMu_', 'SANShyp'+hypocut+cone+'_'+nscanseed+'_'+l1seed),
+          'EF_CB_NS_single': mergeRemovingOverlap('EF_CB_NS_sngl_','SANShyp'+hypocut+cone+'_'+nscanseed+'_'+l1seed), 
+          'EF_CB_NS': mergeRemovingOverlap('EF_CB_NS_', 'SANShyp'+hypocut+'_'+hypocutEF+cone+'_'+nscanseed+'_'+l1seed),
+        }
     if "nscan05" in self.chainPart['FSinfo']:
       if "noComb" in self.chainPart['addInfo']:
         print "hi nils "+ self.chainPartL1Item +' ' + self.chainPartName
diff --git a/Trigger/TriggerCommon/TriggerMenu/python/tau/generateTauChainDefs.py b/Trigger/TriggerCommon/TriggerMenu/python/tau/generateTauChainDefs.py
index 404fccd34d0..c3b143df3ae 100755
--- a/Trigger/TriggerCommon/TriggerMenu/python/tau/generateTauChainDefs.py
+++ b/Trigger/TriggerCommon/TriggerMenu/python/tau/generateTauChainDefs.py
@@ -114,7 +114,35 @@ def _addTopoInfo(theChainDef,chainDict,doAtL2AndEF=False):
         preselectionAlgorithms = [theHLTVertexCombo, theHLTVertexPreSelHypo] 
         theChainDef.addSequence(preselectionAlgorithms, inputTEsL2, preselectionTEName, None)
         theChainDef.addSignatureL2([preselectionTEName])
-        
+
+
+    if any("dR" in alg for alg in topoAlgs):
+       inputTEsEF = theChainDef.signatureList[-1]['listOfTriggerElements']
+
+       maxdR=-1
+       mindR=-1
+       for topo_item in chainDict['topo']:
+           if 'dR' in topo_item:
+              mindR=float(topo_item.split('dR')[0])
+              maxdR=float(topo_item.split('dR')[1])
+       log.debug("dR cuts at: %d and %d", mindR, maxdR)
+       if mindR==-1 or maxdR==-1:
+          log.error("No dR chain part found in tau-tau dR Topo cut")
+
+       from TrigTauHypo.TrigTauHypoConfig2012 import EFTauTopoHypo
+       from TrigTauHypo.TrigTauHypoConf       import EFTauTopoFex
+
+       EFFex  =  EFTauTopoFex()
+       theVars    = ['DRMin','DRMax']
+       theThresh  = [mindR*0.1,maxdR*0.1]
+       TauTaudR_Hypo = EFTauTopoHypo("EFTauTopo_"+str(mindR).replace(".","")+"dR"+str(maxdR).replace(".",""),
+                                           theVars, theThresh)
+       log.debug("Input TEs to dR algorithm: %s", inputTEsEF)
+
+       EFChainName = "EF_" + chainDict['chainName']
+
+       theChainDef.addSequence([EFFex, TauTaudR_Hypo],inputTEsEF,EFChainName)
+       theChainDef.addSignature(theChainDef.signatureList[-1]['signature_counter']+1, [EFChainName])         
         
     return theChainDef
 
diff --git a/Trigger/TriggerCommon/TriggerMenu/scripts/generateL1TopoMenu.py b/Trigger/TriggerCommon/TriggerMenu/scripts/generateL1TopoMenu.py
index b987e98e82b..c6af9030cfc 100755
--- a/Trigger/TriggerCommon/TriggerMenu/scripts/generateL1TopoMenu.py
+++ b/Trigger/TriggerCommon/TriggerMenu/scripts/generateL1TopoMenu.py
@@ -38,7 +38,7 @@ def main():
         generateL1TopoMenu(menu="DC14")
         return 0
 
-    if sys.argv[1] in ["Physics_HI_v3", "MC_HI_v3", "LS1_v1", "DC14","Physics_pp_v6", "MC_pp_v6"]: # explicit names for TMXML nightly
+    if sys.argv[1] in ["Physics_HI_v4", "MC_HI_v4", "Physics_HI_v3", "MC_HI_v3", "LS1_v1", "DC14","Physics_pp_v6", "MC_pp_v6"]: # explicit names for TMXML nightly
         generateL1TopoMenu(menu=sys.argv[1])
         return 0
 
-- 
GitLab