From aa0b667c0cbd55d6f3550fee46771d0a6e1f95eb Mon Sep 17 00:00:00 2001
From: Elisabetta Pianori <elisabetta.pianori@cern.ch>
Date: Fri, 30 Jan 2015 22:53:31 +0100
Subject: [PATCH] commnet out ALFA thr definition (TriggerMenu-00-06-67)

	* comment out threshold definition for ALFA (ATR-9924)
	* TriggerMenu-00-06-67

2015-01-30  Arantxa Ruiz Martinez  <aranzazu.ruiz.martinez@cern.ch>
	* VBF triggers implemented in MC_pp_v5 menu (ATR-9520)
	* TriggerMenu-00-06-66

2015-01-30 Elisabetta Pianori
	* update e/gamma menu (ATR-9981)
	* implement threshold definition for ALFA (ATR-9924)
	* add L1Mu6 warning for xe and te chains to ConsistentyChecker  exceptions
	* TriggerMenu-00-06-65

2015-01-30 Yu Nakahama
	* L1Topo M8 menu: changed INVM with EMall to EMs, fixed max value on Sebastian's request
	* TriggerMenu-00-06-64

2015-01-30  Arantxa Ruiz Martinez  <aranzazu.ruiz.martinez@cern.ch>
	* Jet triggers added in Physics_pp_v5 menu for M8 (ATR-9948)
	* TriggerMenu-00-06-63
...
(Long ChangeLog diff - truncated)
---
 .../data/menu_check_exceptions.xml            |   19 +-
 .../TriggerMenu/python/TriggerConfigL1Topo.py |   23 +-
 .../TriggerMenu/python/TriggerConfigLVL1.py   |   20 +-
 .../python/bjet/generateBjetChainDefs.py      |    2 +-
 .../bphysics/generateBPhysicsChainDefs.py     |   19 +-
 .../python/calibcosmicmon/BeamspotDef.py      |   37 +-
 .../python/calibcosmicmon/CalibDef.py         |   34 +-
 .../python/calibcosmicmon/CosmicDef.py        |   47 +-
 .../python/egamma/EgammaSliceFlags.py         |    2 -
 .../TriggerMenu/python/egamma/ElectronDef.py  |   28 +-
 .../python/egamma/ElectronDefIdTest.py        |    1 -
 .../egamma/generateElectronChainDefs.py       |   20 +-
 .../TriggerMenu/python/jet/AlgFactory.py      |   95 +-
 .../TriggerMenu/python/jet/AlgFactory_test.py |   41 +-
 .../python/jet/ChainConfigMaker.py            |   41 +-
 .../TriggerMenu/python/jet/ChangeLog          |   31 +
 .../python/jet/JetSequencesBuilder.py         |    2 +-
 .../TriggerMenu/python/jet/SequenceTree.py    |    7 +-
 .../python/jet/clusterparams_factory.py       |    3 +-
 .../TriggerMenu/python/jet/fex_factory.py     |  102 -
 .../python/jet/fex_factory_test.py            |   51 -
 .../python/jet/fexparams_factory.py           |    7 +-
 .../python/jet/fexparams_factory_test.py      |    3 +-
 .../python/jet/generateJetChainDefs.py        |    6 +-
 .../TriggerMenu/python/l1/Lvl1Menu.py         |   21 +-
 .../TriggerMenu/python/l1/Lvl1MenuItems.py    |   15 +-
 .../TriggerMenu/python/l1/Lvl1MonCounters.py  |    2 +-
 .../TriggerMenu/python/l1/Lvl1Thresholds.py   |    2 +
 .../TriggerMenu/python/l1menu/CaloDef.py      |    2 +-
 .../TriggerMenu/python/l1menu/ItemDef.py      |  115 +-
 .../python/l1menu/Menu_MC_pp_v5.py            |  485 +-
 .../TriggerMenu/python/l1menu/MonitorDef.py   |  122 +
 .../TriggerMenu/python/l1menu/ThresholdDef.py |   19 +-
 .../TriggerMenu/python/l1topo/L1TopoMenu.py   |   13 +-
 .../TriggerMenu/python/l1topo/TopoAlgos.py    |   11 +-
 .../python/l1topomenu/Menu_MC_pp_v5.py        |  168 +-
 .../python/l1topomenu/TopoAlgoDef.py          |  626 ++-
 .../TriggerMenu/python/menu/ChainDef.py       |    5 +-
 .../TriggerMenu/python/menu/DC14.py           |  774 +--
 .../python/menu/DictFromChainName.py          |   24 +-
 .../TriggerMenu/python/menu/GenerateMenu.py   |   92 +-
 .../TriggerMenu/python/menu/HLTObjects.py     |    6 +-
 .../TriggerMenu/python/menu/HltConfig.py      |   16 +-
 .../TriggerMenu/python/menu/LS1_v1.py         |  389 +-
 .../TriggerMenu/python/menu/Lumi.py           |    3 -
 .../TriggerMenu/python/menu/Lvl1.py           | 4854 -----------------
 .../TriggerMenu/python/menu/Lvl1Flags.py      |    5 -
 .../TriggerMenu/python/menu/MC_pp_v5.py       | 2380 ++++----
 .../TriggerMenu/python/menu/MenuUtil.py       |  477 +-
 .../TriggerMenu/python/menu/Physics_HI_v3.py  |   56 +-
 .../TriggerMenu/python/menu/Physics_pp_v5.py  |  369 +-
 .../TriggerMenu/python/menu/SignatureDicts.py |   32 +-
 .../TriggerMenu/python/menu/StreamInfo.py     |   99 +-
 .../python/menu/TriggerPythonConfig.py        |    1 +
 .../TriggerMenu/python/met/MissingETDef.py    |    4 +-
 .../TriggerMenu/python/minbias/MinBiasDef.py  |    1 -
 .../TriggerMenu/python/muon/MuonDef.py        |   75 +
 .../TriggerMenu/python/tau/TauDef.py          |   40 +-
 58 files changed, 3840 insertions(+), 8104 deletions(-)
 delete mode 100644 Trigger/TriggerCommon/TriggerMenu/python/jet/fex_factory.py
 delete mode 100644 Trigger/TriggerCommon/TriggerMenu/python/jet/fex_factory_test.py
 create mode 100644 Trigger/TriggerCommon/TriggerMenu/python/l1menu/MonitorDef.py
 delete mode 100755 Trigger/TriggerCommon/TriggerMenu/python/menu/Lvl1.py
 delete mode 100755 Trigger/TriggerCommon/TriggerMenu/python/menu/Lvl1Flags.py

diff --git a/Trigger/TriggerCommon/TriggerMenu/data/menu_check_exceptions.xml b/Trigger/TriggerCommon/TriggerMenu/data/menu_check_exceptions.xml
index 3cc2a025e69..5af57b510d9 100644
--- a/Trigger/TriggerCommon/TriggerMenu/data/menu_check_exceptions.xml
+++ b/Trigger/TriggerCommon/TriggerMenu/data/menu_check_exceptions.xml
@@ -11,16 +11,15 @@
 <exceptions>
   <test name="ThrSeqMismatch">
     <ex name="HLT_.*xe.*->MU6"/>
-    <ex name="HLT_e5_etcut_L110MINDPHI-AJj15s2-XE0->EM3"/>
-    <ex name="HLT_e5_etcut_L120MINDPHI-AJjs6-XE0->EM3"/>
-    <ex name="HLT_e5_etcut_L120MINDPHI-AJj15s2-XE0->EM3"/>
-    <ex name="HLT_e5_etcut_L105RATIO-XE0-HT0-AJj15all.ETA49->EM3"/>
-    <ex name="HLT_e5_etcut_L108RATIO-XE0-HT0-AJj0all.ETA49->EM3"/>
-    <ex name="HLT_e5_etcut_L140RATIO-XE0-HT0-AJj15all.ETA49->EM3"/>
-    <ex name="HLT_e5_etcut_L190RATIO-XE0-HT0-AJj0all.ETA49->EM3"/>
-    <ex name="HLT_e5_etcut_L1HT20-AJj0all.ETA49->EM3"/>
-    <ex name="HLT_e5_etcut_L1NOT-02MATCH-EM9s1-AJj15all.ETA49->EM3"/>
-    <ex name="HLT_e5_etcut_L1NOT-02MATCH-EM9s1-AJj15all.ETA49_05RATIO-XE0-SUM0-EM9s1-HT0-AJj15all.ETA49->EM3"/>
+    <ex name="HLT_.*te.*->MU6"/>
+    <ex name="HLT_.*xs.*->MU6"/>
+    <ex name="HLT_e5_etcut_L110.*->EM3"/>
+    <ex name="HLT_e5_etcut_L120.*->EM3"/>
+    <ex name="HLT_e5_etcut_L10.*->EM3"/>
+    <ex name="HLT_e5_etcut_L14.*->EM3"/>
+    <ex name="HLT_e5_etcut_L19.*->EM3"/>
+    <ex name="HLT_e5_etcut_L1HT20.*->EM3"/>
+    <ex name="HLT_e5_etcut_L1NOT.*->EM3"/>
     <ex name="HLT_e12_loose_2mu10->EM8VH"/>
     <ex name="HLT_e12_medium_2mu10->EM8VH"/>
     <ex name="HLT_e12_lhloose_2mu10->EM8VH"/>
diff --git a/Trigger/TriggerCommon/TriggerMenu/python/TriggerConfigL1Topo.py b/Trigger/TriggerCommon/TriggerMenu/python/TriggerConfigL1Topo.py
index 2800860ceaa..a20b3fb8488 100644
--- a/Trigger/TriggerCommon/TriggerMenu/python/TriggerConfigL1Topo.py
+++ b/Trigger/TriggerCommon/TriggerMenu/python/TriggerConfigL1Topo.py
@@ -44,6 +44,22 @@ class TriggerConfigL1Topo:
             self.registerMenu()
 
 
+
+    # remove prescale suffixes
+    @staticmethod
+    def getMenuBaseName(menuName):
+        import re 
+        pattern = re.compile('_v\d+|DC14')
+        patternPos = pattern.search(menuName)
+        if patternPos:
+            menuName=menuName[:patternPos.end()]
+        else:
+            log.info('Can\'t find pattern to shorten menu name, either non-existent in name or not implemented.')
+        return menuName         
+
+
+
+
     def registerAlgo(self, algo):
         """ Add a L1Topo algo to the set of algos which are registered for further use"""
 
@@ -104,13 +120,10 @@ class TriggerConfigL1Topo:
 
         Menu.defineMenu() defines the menu via L1TopoFlags
         """
-        #from TriggerConfigLVL1 import TriggerConfigLVL1
-        #tcl1 = TriggerConfigLVL1()
-        #menuName = tcl1.getMenuBaseName(menuName)
 
+        menuName = TriggerConfigL1Topo.getMenuBaseName(menuName)
         from TriggerJobOpts.TriggerFlags import TriggerFlags
-        menumodule = __import__('l1topomenu.Menu_%s' % menuName.replace('_tight_mc_prescale','').replace('_loose_mc_prescale','').replace('_special_mc_prescale','').replace('_no_prescale',''), globals(), locals(), ['defineMenu'], -1) 
-        #menumodule = __import__('l1topomenu.Menu_%s' % menuName, globals(), locals(), ['defineMenu'], -1)
+        menumodule = __import__('l1topomenu.Menu_%s' % menuName, globals(), locals(), ['defineMenu'], -1)
         menumodule.defineMenu()
         log.info("%s menu contains %i algos." % ( menuName, len(L1TopoFlags.algos()) )) 
         
diff --git a/Trigger/TriggerCommon/TriggerMenu/python/TriggerConfigLVL1.py b/Trigger/TriggerCommon/TriggerMenu/python/TriggerConfigLVL1.py
index 0751275d360..0d199d03213 100644
--- a/Trigger/TriggerCommon/TriggerMenu/python/TriggerConfigLVL1.py
+++ b/Trigger/TriggerCommon/TriggerMenu/python/TriggerConfigLVL1.py
@@ -57,19 +57,6 @@ class TriggerConfigLVL1:
             # registers all items ever defined
             self.registerMenu()
 
-    # remove prescale suffixes
-    def getMenuBaseName(self, menuName):
-        #import re 
-        #pattern = re.compile('_v\d+|DC14')
-        #patternPos = pattern.search(menuName)
-        #if m:
-        #    menuName=menuName[:patternPos.end()]
-        #else:
-        #    log.info('Can\'t find pattern to shorten menu name, either non-existent in name or not implemented.')
-        #return menuName 
-        
-        return menuName.replace("_tight_mc_prescale","").replace("_loose_mc_prescale","").replace("_special_mc_prescale","").replace("_no_prescale","")
-
 
     ## L1 Topo connection
     def getL1TopoTriggerLines(self, menu):
@@ -82,7 +69,7 @@ class TriggerConfigLVL1:
         else:
             triggerLines = None
             try:
-                tpcl1 = TriggerConfigL1Topo( menuName = self.getMenuBaseName(menu) )
+                tpcl1 = TriggerConfigL1Topo( menuName = TriggerConfigL1Topo.getMenuBaseName(menu) )
                 tpcl1.generateMenu()
                 triggerLines = tpcl1.menu.getTriggerLines()
                 #for tr in triggerLines:
@@ -198,9 +185,8 @@ class TriggerConfigLVL1:
         if not menuName:
             menuName = TriggerFlags.triggerMenuSetup()
 
-        #menuName=self.getMenuBaseName(menuName)
-        #menumodule = __import__('l1menu.Menu_%s' % menuName, globals(), locals(), ['defineMenu'], -1)
-        menumodule = __import__('l1menu.Menu_%s' % menuName.replace("_tight_mc_prescale","").replace("_loose_mc_prescale","").replace("_special_mc_prescale","").replace("_no_prescale",""), globals(), locals(), ['defineMenu'], -1) 
+        menuName=TriggerConfigL1Topo.getMenuBaseName(menuName)
+        menumodule = __import__('l1menu.Menu_%s' % menuName, globals(), locals(), ['defineMenu'], -1)
         menumodule.defineMenu()
         log = logging.getLogger('TriggerConfigLVL1.defineMenu')
         log.info("menu %s contains %i items and %i thresholds" % ( menuName, len(Lvl1Flags.items()), len(Lvl1Flags.thresholds()) ) )
diff --git a/Trigger/TriggerCommon/TriggerMenu/python/bjet/generateBjetChainDefs.py b/Trigger/TriggerCommon/TriggerMenu/python/bjet/generateBjetChainDefs.py
index 04a771cd292..170f24bafed 100644
--- a/Trigger/TriggerCommon/TriggerMenu/python/bjet/generateBjetChainDefs.py
+++ b/Trigger/TriggerCommon/TriggerMenu/python/bjet/generateBjetChainDefs.py
@@ -448,7 +448,7 @@ def _prepareJetChainDict(cdict):
 ###########################################################################
 
 def get_j35_ChainDef():
-    return theDictFromChainName.getChainDict( ['j35',          21,    'L1_J20', [], ["Main"], ['RATE:SingleJet',  'BW:Jets'], -1],)
+    return theDictFromChainName.getChainDict( ['j35', 'L1_J20', [], ["Main"], ['RATE:SingleJet',  'BW:Jets'], -1],)
 
 # def get_j35_ChainDef():
 #     # HACK TO GET j35 chains!!!
diff --git a/Trigger/TriggerCommon/TriggerMenu/python/bphysics/generateBPhysicsChainDefs.py b/Trigger/TriggerCommon/TriggerMenu/python/bphysics/generateBPhysicsChainDefs.py
index 82a3989d944..5f9a8fd3cf3 100644
--- a/Trigger/TriggerCommon/TriggerMenu/python/bphysics/generateBPhysicsChainDefs.py
+++ b/Trigger/TriggerCommon/TriggerMenu/python/bphysics/generateBPhysicsChainDefs.py
@@ -242,8 +242,17 @@ def bMultipleOptionTopos(theChainDef, chainDict, inputTEsL2, inputTEsEF):
         L2Hypo = L2BMuMuHypo_DiMu_noVtx()
         EFFex  = EFBMuMuFex_DiMu_noOS()
         EFHypo = EFBMuMuHypo_DiMu_noVtx()
+        
+    elif ('bDimu' in topoAlgs) & ('noinvm' in topoAlgs) & ('novtx' in topoAlgs) & ('ss' in topoAlgs):
+        from TrigBphysHypo.TrigL2BMuMuFexConfig  import L2BMuMuFex_DiMu_noinvm_SS
+        from TrigBphysHypo.TrigL2BMuMuHypoConfig import L2BMuMuHypo_DiMu_noinvm_noVtx
+        from TrigBphysHypo.TrigEFBMuMuFexConfig  import EFBMuMuFex_DiMu_noinvm_SS
+        from TrigBphysHypo.TrigEFBMuMuHypoConfig import EFBMuMuHypo_DiMu_noinvm_noVtx
+        L2Fex  = L2BMuMuFex_DiMu_noinvm_SS() 
+        L2Hypo = L2BMuMuHypo_DiMu_noinvm_noVtx()
+        EFFex  = EFBMuMuFex_DiMu_noinvm_SS()
+        EFHypo = EFBMuMuHypo_DiMu_noinvm_noVtx()
 	
-
     elif ('bJpsimumu' in topoAlgs) & ('noid' in topoAlgs):
         from TrigBphysHypo.TrigL2BMuMuFexConfig import L2BMuMuFex_noId
         from TrigBphysHypo.TrigL2BMuMuHypoConfig import L2BMuMuHypo_Jpsi_noId
@@ -305,6 +314,14 @@ def bBmumuxTopos(theChainDef,chainDict, inputTEsL2, inputTEsEF):
         EFFex = EFBMuMuXFex_BcMuMuDs()
         EFHypo = EFBMuMuXHypo_BcMuMuDs()
         
+    elif 'BpmumuKp' in topoAlgs:
+        from TrigBphysHypo.TrigL2BMuMuXFexConfig import L2BMuMuXFex_BplusMuMuKplus
+        from TrigBphysHypo.TrigEFBMuMuXFexConfig import EFBMuMuXFex_BplusMuMuKplus
+        from TrigBphysHypo.TrigEFBMuMuXHypoConfig import EFBMuMuXHypo_BplusMuMuKplus
+        L2Fex = L2BMuMuXFex_BplusMuMuKplus()
+        EFFex = EFBMuMuXFex_BplusMuMuKplus()
+        EFHypo = EFBMuMuXHypo_BplusMuMuKplus()
+        
     elif 'bBmumuxv2' in topoAlgs:
         from TrigBphysHypo.TrigL2BMuMuXFexConfig import L2BMuMuXFex_1
         from TrigBphysHypo.TrigEFBMuMuXFexConfig import EFBMuMuXFex_1
diff --git a/Trigger/TriggerCommon/TriggerMenu/python/calibcosmicmon/BeamspotDef.py b/Trigger/TriggerCommon/TriggerMenu/python/calibcosmicmon/BeamspotDef.py
index 2856bd19912..9178035a120 100644
--- a/Trigger/TriggerCommon/TriggerMenu/python/calibcosmicmon/BeamspotDef.py
+++ b/Trigger/TriggerCommon/TriggerMenu/python/calibcosmicmon/BeamspotDef.py
@@ -43,6 +43,7 @@ class L2EFChain_Beamspot(L2EFChainDef):
       self.eventBuildType = self.chainPart['eventBuildType']
 
       self.L2InputTE = self.chainPartL1Item or self.chainL1Item
+      self.L2InputTE = self.L2InputTE.replace("L1_","")
 
       if ('trkFS' in self.chainPart['addInfo']) \
             or ('activeTE' in self.chainPart['addInfo'] )\
@@ -102,29 +103,33 @@ class L2EFChain_Beamspot(L2EFChainDef):
 
 
      #commenting out because of ATR-8976 (removal of package)
-     #if  ('L2StarB' in self.l2IDAlg):
-     #  from TrigSiTrack.TrigSiTrack_Config import TrigSiTrack_BeamSpot
-     #  TrigL2SiTrackFinder_Config = __import__('TrigL2SiTrackFinder.TrigL2SiTrackFinder_Config', fromlist=[""])      
-     #  trk_alg = getattr(TrigL2SiTrackFinder_Config, "TrigL2SiTrackFinder_BeamSpotB") 
-     #  teaddition = 'L2StarB'
-     #else:
-     #  mlog.error('Cannot assemble chain %s - only configured for L2StarB' % (self.chainPartName))
-         
-
-     self.L2sequenceList +=[[ self.L2InputTE, [theFex], 'L2_fex']]
+     if  ('L2StarB' in self.l2IDAlg):
+       #from TrigSiTrack.TrigSiTrack_Config import TrigSiTrack_BeamSpot
+        TrigL2SiTrackFinder_Config = __import__('TrigL2SiTrackFinder.TrigL2SiTrackFinder_Config', fromlist=[""])      
+        trk_alg = getattr(TrigL2SiTrackFinder_Config, "TrigL2SiTrackFinder_BeamSpotB") 
+        teaddition = 'L2StarB'
+     else:
+        mlog.error('Cannot assemble chain %s - only configured for L2StarB' % (self.chainPartName))
+     
+    
+     from TrigGenericAlgs.TrigGenericAlgsConf import  PESA__DummyUnseededAllTEAlgo
+     self.L2sequenceList += [ [[""], [PESA__DummyUnseededAllTEAlgo("L2DummyAlgo"), trk_alg()], 'L2_BeamSpottracks']]
+
+#     self.L2sequenceList +=[[ self.L2InputTE, [theFex], 'L2_fex']]
+#     self.L2sequenceList +=[[['L2_fex'], [theAlg], 'L2_']]  
+#
+     self.L2sequenceList +=[[['L2_BeamSpottracks'], [theFex], 'L2_fex']]
      self.L2sequenceList +=[[['L2_fex'], [theAlg], 'L2_']]  
 
-     #from TrigGenericAlgs.TrigGenericAlgsConf import  PESA__DummyUnseededAllTEAlgo
-     #self.L2sequenceList += [ [[""], [PESA__DummyUnseededAllTEAlgo("L2DummyAlgo"), trk_alg()], 'L2_BeamSpottracks']]
-     
+     self.L2signatureList += [ [['L2_BeamSpottracks']] ]     
      self.L2signatureList += [ [['L2_fex']] ]
      self.L2signatureList += [ [['L2_']] ]
-     #self.L2signatureList += [ [['L2_BeamSpottracks']] ]
+
      
      self.TErenamingDict = {
        'L2_fex'           : mergeRemovingOverlap('L2_', self.chainName+'_fex'),        
-       'L2_'              : mergeRemovingOverlap('L2_', self.chainName),        
-       #'L2_BeamSpottracks': mergeRemovingOverlap('L2_', 'BeamSpottracks'+teaddition),        
+       'L2_'              : mergeRemovingOverlap('L2_', self.chainName+self.chainPart['addInfo'][0]),        
+       'L2_BeamSpottracks': mergeRemovingOverlap('L2_', self.chainName+'_BeamSpottracks'),        
        }    
 
      
diff --git a/Trigger/TriggerCommon/TriggerMenu/python/calibcosmicmon/CalibDef.py b/Trigger/TriggerCommon/TriggerMenu/python/calibcosmicmon/CalibDef.py
index a9f259be13b..3b373e53dc8 100644
--- a/Trigger/TriggerCommon/TriggerMenu/python/calibcosmicmon/CalibDef.py
+++ b/Trigger/TriggerCommon/TriggerMenu/python/calibcosmicmon/CalibDef.py
@@ -111,8 +111,8 @@ class L2EFChain_CalibTemplate(L2EFChainDef):
          self.setupL1CaloCalibrationChains()
       elif 'alfacalib' in self.chainPart['purpose']:
         self.setupL1ALFACalibrationChains()
-
-      #elif '
+      elif 'larnoiseburst' in self.chainPart['purpose']:
+        self.setupLarNoiseBurstChains()
       else:
          mlog.error('Chain %s could not be assembled' % (self.chainPartName))
          return False      
@@ -240,3 +240,33 @@ class L2EFChain_CalibTemplate(L2EFChainDef):
        'L2_':     'L2_l1ALFAcalib',
        }
      
+   ###########################################################################
+   # LarNoiseBurst chains
+   ###########################################################################
+
+   def setupLarNoiseBurstChains(self):
+
+     from TrigGenericAlgs.TrigGenericAlgsConf import PESA__DummyUnseededAllTEAlgo as DummyAlgo
+     theDummyRoiCreator = DummyAlgo('RoiCreator')
+     efht_thresh = '10'
+
+     from TrigCaloRec.TrigCaloRecConfig import TrigCaloCellMaker_jet_fullcalo
+     theTrigCaloCellMaker_jet_fullcalo = TrigCaloCellMaker_jet_fullcalo("CellMakerFullCalo_topo", doNoise=0, AbsE=True, doPers=True)
+
+     from TrigJetHypo.TrigJetHypoConfig import EFJetHypoNoiseConfig
+     theJetHypo = EFJetHypoNoiseConfig()
+
+
+     self.L2sequenceList += [['', [theDummyRoiCreator], 'EF_full']]
+     self.EFsequenceList += [[['EF_full'], [theTrigCaloCellMaker_jet_fullcalo ], 'EF_full_noise']]
+     self.EFsequenceList += [[['EF_full_noise'],[theJetHypo], 'jet_hypo']]
+
+     self.L2signatureList += [ [['EF_full']] ]
+     self.EFsignatureList += [ [['EF_full_noise']] ]
+     self.EFsignatureList += [ [['jet_hypo']] ]
+
+     antiktsize = 0
+     self.TErenamingDict = { 
+       'EF_full_noise' : mergeRemovingOverlap('HLT_full__cluster__', 'jr_antikt'+str(antiktsize)+'tc_had' ), 
+       'jet_hypo' : mergeRemovingOverlap('HLT_full__cluster__', 'jr_antikt'+str(antiktsize)+'tc_had_noiseHypo' ), 
+       }
diff --git a/Trigger/TriggerCommon/TriggerMenu/python/calibcosmicmon/CosmicDef.py b/Trigger/TriggerCommon/TriggerMenu/python/calibcosmicmon/CosmicDef.py
index 7fbecbeaa00..5548c94026d 100644
--- a/Trigger/TriggerCommon/TriggerMenu/python/calibcosmicmon/CosmicDef.py
+++ b/Trigger/TriggerCommon/TriggerMenu/python/calibcosmicmon/CosmicDef.py
@@ -18,10 +18,16 @@ from TriggerJobOpts.TriggerFlags  import TriggerFlags
 
 ###################################################################################
 def getInputTEfromL1Item(item):
-    L1Map = {'L1_CALREQ2':        ['NIM30'],
-             #'L1_RD0_EMPTY':      [''],
-             'L1_TAU8_EMPTY':      ['HA8'],
-             }
+
+
+    L1Map = {#'L1_RD0_EMPTY':      [''],
+        'L1_TAU8_EMPTY':      ['HA8'],
+        }
+
+    if TriggerFlags.triggerMenuSetup() == 'LS1_v1':                
+        L1Map['L1_CALREQ2']=['NIM30']
+    else:
+        L1Map['L1_CALREQ2']=['CAL2']
 
     if item in L1Map:
         return L1Map[item]
@@ -76,6 +82,9 @@ class L2EFChain_CosmicTemplate(L2EFChainDef):
         elif 'larps' in self.chainPart['purpose']:
             self.setupCosmicLArPreSNoise()
 
+        elif 'larhec' in self.chainPart['purpose']:
+            self.setupCosmicLArHECNoise()
+
         elif ('pixel' in self.chainPart['purpose']) \
                 | ('sct' in self.chainPart['purpose']):
             self.setupCosmicIDNoiseCalibration()
@@ -145,6 +154,7 @@ class L2EFChain_CosmicTemplate(L2EFChainDef):
             theTrigT2CaloEgammaFex = T2CaloEgamma_All()
             
         from TrigEgammaHypo.TrigL2CaloHypoConfig import TrigL2CaloLayersHypo_PreS_080
+
         self.L2sequenceList += [[ self.L2InputTE, 
                                   [theTrigT2CaloEgammaFex,
                                    TrigL2CaloLayersHypo_PreS_080('TrigL2CaloLayersHypo_'+self.chainName+'_080')],
@@ -155,10 +165,35 @@ class L2EFChain_CosmicTemplate(L2EFChainDef):
             'L2_step1': mergeRemovingOverlap('L2_','TrigL2CaloLayersHypo_'+self.chainName+'_080'),
             }
 
-
-
+    ##################################################################
+    def setupCosmicLArHECNoise(self):
+        
+        from TrigDetCalib.TrigDetCalibConfig import EtaHypo_HEC,LArL2ROBListWriter
+        
+        self.L2sequenceList += [[ '', 
+                                  [ EtaHypo_HEC('EtaHypo_HEC_' + self.chainPartName),],
+                                  'L2_step1']]
+        
+        self.L2sequenceList += [[ 'L2_step1',
+                                  [LArL2ROBListWriter('LArL2ROBListWriter_' + self.chainName, addCTPResult = True, addL2Result = True,etaWidth = 0.2, phiWidth = 0.2),],                                  
+                                  'L2_step2']]
+        
+        self.L2signatureList+=[ [['L2_step1']*self.mult] ]
+        self.L2signatureList+=[ [['L2_step2']*self.mult] ]
+        
+        self.TErenamingDict = {
+            'L2_step1': mergeRemovingOverlap('L2_','EtaHypo_HEC_'+self.chainName),
+            'L2_step2': mergeRemovingOverlap('L2_','LArL2ROBListWriter_'+self.chainName),
+            
+            }
+    
+        
+        
             
     ##################################################################
+
+
+
     def setupCosmicIDNoiseCalibration(self):
 
         from TrigDetCalib.TrigDetCalibConfig import TrigSubDetListWriter
diff --git a/Trigger/TriggerCommon/TriggerMenu/python/egamma/EgammaSliceFlags.py b/Trigger/TriggerCommon/TriggerMenu/python/egamma/EgammaSliceFlags.py
index 9dc74c3ddaa..10d3e6aa36f 100755
--- a/Trigger/TriggerCommon/TriggerMenu/python/egamma/EgammaSliceFlags.py
+++ b/Trigger/TriggerCommon/TriggerMenu/python/egamma/EgammaSliceFlags.py
@@ -51,8 +51,6 @@ class EgammaSlice(JobPropertyContainer, CommonSliceHelper):
 from TriggerJobOpts.TriggerFlags import TriggerFlags
 TriggerFlags.add_Container(EgammaSlice)
 
-from TriggerMenu.menu.Lvl1Flags import Lvl1Flags
-
 # add common slice flags
 TriggerFlags.EgammaSlice.import_JobProperties('TriggerMenu.menu.CommonSliceFlags')
 
diff --git a/Trigger/TriggerCommon/TriggerMenu/python/egamma/ElectronDef.py b/Trigger/TriggerCommon/TriggerMenu/python/egamma/ElectronDef.py
index 3ea3aea1ba5..157f4701f48 100644
--- a/Trigger/TriggerCommon/TriggerMenu/python/egamma/ElectronDef.py
+++ b/Trigger/TriggerCommon/TriggerMenu/python/egamma/ElectronDef.py
@@ -12,7 +12,6 @@ logElectronDef = logging.getLogger("TriggerMenu.egamma.ElectronDef")
 
 from TriggerJobOpts.TriggerFlags import TriggerFlags
 from TriggerMenu.menu.HltConfig import L2EFChainDef, mergeRemovingOverlap
-from TriggerMenu.menu.Lvl1Flags import Lvl1Flags
 
 #from TrigT2CaloEgamma.TrigT2CaloEgammaConfig import T2CaloEgamma_cells
 
@@ -346,6 +345,9 @@ class L2EFChain_e(L2EFChainDef):
         # EF Tracking
         from InDetTrigRecExample.EFInDetConfig import TrigEFIDInsideOut_Electron
         theEFElectronIDFex           = TrigEFIDInsideOut_Electron("Electron").getSequence()
+        # GSF refit
+        #from TrigEgammaHypo.TrigGSFTrackFexConfig import TrigGSFTrackFex_Electron
+        #theGSFtrackfex = TrigGSFTrackFex_Electron()
 
         # Ringer FEX for L2 Calo
         from TrigT2CaloEgamma.TrigT2CaloEgammaConfig        import T2CaloEgamma_Ringer
@@ -405,6 +407,11 @@ class L2EFChain_e(L2EFChainDef):
                                      [theTrigL2SiTrackFinder_eGammaB]+theL2StarxAOD+
                                      [theTrigL2SiTrackFinder_eGammaC]+theL2StarxAOD+theEFElectronIDFex,
                                      'EF_e_step3']]
+        elif 'gsf' in self.chainPart['addInfo']:
+            logElectronDef.error("GSF chains are not configured yet")
+        #    self.EFsequenceList += [[['EF_e_step2'], 
+        #                             trkseq + [theGSFTrackFex],
+        #                             'EF_e_step3']]
         else:
             self.EFsequenceList += [[['EF_e_step2'], 
                                      trkseq,
@@ -737,6 +744,10 @@ class L2EFChain_e(L2EFChainDef):
         
         # EF Tracking
         theEFElectronIDFex           = theTrigEFIDInsideOutMerged_Electron
+        
+        # GSF refit
+        #from TrigEgammaHypo.TrigGSFTrackFexConfig import TrigGSFTrackFex_Electron
+        #theGSFTrackFex = TrigGSFTrackFex_Electron()
         # EF Electron FEX
         #from TrigEgammaRec.TrigEgammaRecConfig       import TrigEgammaRec
         #theTrigEgammaRec_eGamma                  = TrigEgammaRec(name = "TrigEgammaRec_eGamma")
@@ -861,11 +872,16 @@ class L2EFChain_e(L2EFChainDef):
         self.EFsequenceList += [[['EF_e_step1'], 
                                  [theTrigEFCaloCalibFex,theTrigEFCaloHypo], 
                                  'EF_e_step2']]
-        
-        self.EFsequenceList += [[['EF_e_step2'], 
-                                 theEFElectronIDFex+[ theEFTrackHypo],
-                                 #trkcombfull+[ theEFTrackHypo],
-                                 'EF_e_step3']]
+        if 'gsf' in self.chainPart['addInfo']:
+            logElectronDef.error("GSF chains are not configured yet")
+        #    self.EFsequenceList += [[['EF_e_step2'], 
+        #                             theEFElectronIDFex+[ theGSFTrackFex],
+        #                             'EF_e_step3']]
+        else:
+            self.EFsequenceList += [[['EF_e_step2'], 
+                                     theEFElectronIDFex+[ theEFTrackHypo],
+                                     #trkcombfull+[ theEFTrackHypo],
+                                     'EF_e_step3']]
         
         self.EFsequenceList += [[['EF_e_step3'], 
                                  [theTrigEgammaFex, theEFElectronHypo], 
diff --git a/Trigger/TriggerCommon/TriggerMenu/python/egamma/ElectronDefIdTest.py b/Trigger/TriggerCommon/TriggerMenu/python/egamma/ElectronDefIdTest.py
index ecc0f68c215..059e8ff46bb 100644
--- a/Trigger/TriggerCommon/TriggerMenu/python/egamma/ElectronDefIdTest.py
+++ b/Trigger/TriggerCommon/TriggerMenu/python/egamma/ElectronDefIdTest.py
@@ -12,7 +12,6 @@ logElectronDef = logging.getLogger("TriggerMenu.egamma.ElectronDef")
 
 from TriggerJobOpts.TriggerFlags import TriggerFlags
 from TriggerMenu.menu.HltConfig import L2EFChainDef, mergeRemovingOverlap
-from TriggerMenu.menu.Lvl1Flags import Lvl1Flags
 
 ##########################################################################################
 #
diff --git a/Trigger/TriggerCommon/TriggerMenu/python/egamma/generateElectronChainDefs.py b/Trigger/TriggerCommon/TriggerMenu/python/egamma/generateElectronChainDefs.py
index a64249ae151..0ed5151c2a9 100755
--- a/Trigger/TriggerCommon/TriggerMenu/python/egamma/generateElectronChainDefs.py
+++ b/Trigger/TriggerCommon/TriggerMenu/python/egamma/generateElectronChainDefs.py
@@ -6,7 +6,8 @@ __doc__=""
 __version__="Implementation of Electron Slice single electron signatures"
 
 from AthenaCommon.Logging import logging
-logging.getLogger().info("Importing %s",__name__)
+log = logging.getLogger( 'TriggerMenu.egamma.generateElectronChainDefs' )
+log.info("Importing %s",__name__)
 
 
 from TriggerMenu.egamma.ElectronDef import L2EFChain_e as L2EFChain_e
@@ -95,6 +96,23 @@ def _addTopoInfo(theChainDef,chainDict,doAtL2AndEF=True):
 
         theChainDef.addSequence([EFFex, EFHypo],inputTEsEF,EFChainName)
         theChainDef.addSignature(theChainDef.signatureList[-1]['signature_counter']+1, [EFChainName])
+
+    elif "Zee" in chainDict["topo"]:
+
+        from TrigEgammaHypo.TrigL2DielectronMassHypoConfig import TrigL2DielectronMassFex_Zee, TrigL2DielectronMassHypo_ZeeTight
+        from TrigEgammaHypo.TrigEFDielectronMassHypoConfig import TrigEFDielectronMassFex_Zee, TrigEFDielectronMassHypo_ZeeTight
+
+        L2Fex = TrigL2DielectronMassFex_Zee()
+        L2Hypo = TrigL2DielectronMassHypo_ZeeTight()
+
+        EFFex = TrigEFDielectronMassFex_Zee()
+        EFHypo = TrigEFDielectronMassHypo_ZeeTight()
+
+        theChainDef.addSequence([L2Fex, L2Hypo],inputTEsL2,L2ChainName)
+        theChainDef.addSignatureL2([L2ChainName])
+
+        theChainDef.addSequence([EFFex, EFHypo],inputTEsEF,EFChainName)
+        theChainDef.addSignature(theChainDef.signatureList[-1]['signature_counter']+1, [EFChainName])
     
     return theChainDef
 
diff --git a/Trigger/TriggerCommon/TriggerMenu/python/jet/AlgFactory.py b/Trigger/TriggerCommon/TriggerMenu/python/jet/AlgFactory.py
index 7f4218945c1..fd0c2236000 100644
--- a/Trigger/TriggerCommon/TriggerMenu/python/jet/AlgFactory.py
+++ b/Trigger/TriggerCommon/TriggerMenu/python/jet/AlgFactory.py
@@ -88,7 +88,6 @@ class Alg(object):
         args.extend(self.kargs)
         args = [str(a) for a in args]
         args = ', '.join(args)
-        # import pdb; pdb.set_trace()
         s = '%s(%s)' % (self.factory, args)
         return s
 
@@ -102,6 +101,7 @@ class AlgFactory(object):
         self.cluster_params = self.menu_data.cluster_params
         self.fex_params = self.menu_data.fex_params
         self.recluster_params = self.menu_data.recluster_params
+        self.hypo_params = self.menu_data.hypo_params
 
     def tt_unpacker(self):
         return Alg('T2L1Unpacking_TT', (), {})
@@ -184,22 +184,34 @@ class AlgFactory(object):
         return Alg(factory, (), kwds)
 
     def jr_hypo_single(self):
-
-        hd = self.chain_config.menu_data.hypo_params
-        assert len(hd.jet_attributes) == 1
-        ja = hd.jet_attributes[0]
-
-        chain_name = hd.chain_name
-        chain_name = chain_name.replace("_boffperf","")
-        chain_name = chain_name.replace("_bperf","")
-        chain_name = chain_name.replace("_split","")
-        chain_name = chain_name.replace("_EFID","")
-
-        # make a new hypo instance by specifying a unique name
-        name = '"EFJetHypo_ef_%s"' % chain_name
-
-        # Gaudi does not allow '.' in instance names
-        name = name.replace('.', '_')
+        """
+        Skype discussion RC/P Sherwood
+        [21/01/15, 18:44:50] Ricardo Goncalo:
+        hypo parameters: ET, eta min, eta max
+
+        recoAlg:   'a4', 'a10', 'a10r'
+        dataType:  'TT', 'tc', 'cc'
+        calib:     'had', 'lcw', 'em'
+        jetCalob:  'jes', 'sub', 'subjes', 'nocalib'
+        scan:      'FS','PS'
+
+        j65_btight_split_3j65_L13J25.0ETA22 ->
+                        EFJetHypo_65000_0eta320_a4_tc_em_subjes_FS
+        """
+        
+        assert len(self.hypo_params.jet_attributes) == 1
+        ja = self.hypo_params.jet_attributes[0]
+
+        name_extension = '_'.join([str(e) for  e in
+                                   (int(ja.threshold * GeV),
+                                    ja.eta_range,
+                                    self.fex_params.fex_alg_name,
+                                    self.fex_params.data_type,
+                                    self.cluster_params.cluster_calib,
+                                    self.fex_params.jet_calib,
+                                    self.menu_data.scan_type)])
+        
+        name = '"EFJetHypo_j%s"' % name_extension
 
         etaMin = str(ja.eta_min)
         etaMax = str(ja.eta_max)
@@ -210,7 +222,38 @@ class AlgFactory(object):
         return Alg('EFJetHypo', args, kargs)
 
     def jr_hypo_multi(self):
+        """
+        Skype discussion RC/P Sherwood
+        [21/01/15, 18:44:50] Ricardo Goncalo:
+        hypo parameters: ET, eta min, eta max
+
+        recoAlg:   'a4', 'a10', 'a10r'
+        dataType:  'TT', 'tc', 'cc'
+        calib:     'had', 'lcw', 'em'
+        jetCalob:  'jes', 'sub', 'subjes', 'nocalib'
+        scan:      'FS','PS'
+
+        j65_btight_split_3j65_L13J25.0ETA22 ->
+                        EFJetHypo_65000_0eta320_a4_tc_em_subjes_FS
+        """
 
+        
+        mult = len(self.hypo_params.jet_attributes)
+        assert mult > 1
+        mult = str(mult)
+        
+        ja = self.hypo_params.jet_attributes[0]
+
+        name_extension = '_'.join([str(e) for  e in
+                                   (mult + 'j' + str(int(ja.threshold)),
+                                    ja.eta_range,
+                                    self.fex_params.fex_alg_name,
+                                    self.fex_params.data_type,
+                                    self.cluster_params.cluster_calib,
+                                    self.fex_params.jet_calib,
+                                    self.menu_data.scan_type)])
+        
+        name = '"EFCentFullScanMultiJetHypo_%s"' % name_extension
         hypo = self.menu_data.hypo_params
 
         etaMin = hypo.jet_attributes[0].eta_min
@@ -222,16 +265,6 @@ class AlgFactory(object):
                  'etaMax': etaMax,
              }
 
-        str_mult = hypo.jet_attributes_tostring()
-
-        # make a new hypo instance by specifying a unique name
-        name = '"EFCentFullScanMultiJetHypo_ef_%s"' % (
-            self.chain_config.chain_name)
-        
-
-        # Gaudi does not allow '.' in instance names
-        name = name.replace('.', '_')
-
         return Alg(
             'EFCentFullScanMultiJetHypo',
             (name,),
@@ -294,14 +327,14 @@ class AlgFactory(object):
         return Alg(factory, (), {})
 
     def jetRecDiagnostics(self):
-        chain_name = self.chain_config.chain_name
+        chain_name = self.chain_config.chain_name.replace('.', '_')
         factory = 'TrigHLTJetDiagnostics_named'
         kwds = {'name': "'TrigHLTJetDiagnostics_%s'" % chain_name,
                 'chain_name': "'%s'" % chain_name}
         return Alg(factory, (), kwds)
 
     def jetHypoDiagnostics(self):
-        chain_name = self.chain_config.chain_name
+        chain_name = self.chain_config.chain_name.replace('.', '_')
         factory = 'TrigHLTHypoDiagnostics_named'
         kwds = {'name': "'TrigHLTHypoDiagnostics_%s'" % chain_name,
                 'chain_name': "'%s'" % chain_name}
@@ -309,7 +342,7 @@ class AlgFactory(object):
 
 
     def clusterDiagnostics(self):
-        chain_name = self.chain_config.chain_name
+        chain_name = self.chain_config.chain_name.replace('.', '_')
         factory = 'TrigHLTClusterDiagnostics_named'
         kwds = {'name': "'TrigHLTClusterDiagnostics_%s'" % chain_name,
                 'chain_name': "'%s'" % chain_name}
@@ -317,7 +350,7 @@ class AlgFactory(object):
 
 
     def cellDiagnostics(self):
-        chain_name = self.chain_config.chain_name
+        chain_name = self.chain_config.chain_name.replace('.', '_')
         factory = 'TrigHLTCellDiagnostics_named'
         kwds = {'name': "'TrigHLTCellDiagnostics_%s'" % chain_name,
                 'chain_name': "'%s'" % chain_name}
diff --git a/Trigger/TriggerCommon/TriggerMenu/python/jet/AlgFactory_test.py b/Trigger/TriggerCommon/TriggerMenu/python/jet/AlgFactory_test.py
index 4e1b45ae391..e9de176bdf8 100644
--- a/Trigger/TriggerCommon/TriggerMenu/python/jet/AlgFactory_test.py
+++ b/Trigger/TriggerCommon/TriggerMenu/python/jet/AlgFactory_test.py
@@ -6,14 +6,19 @@ from AlgFactory import AlgFactory
 import inspect
 
 class TestAlgFactory(unittest.TestCase):
-    
+
     def setUp(self):
+        self.special_cases = ('jr_hypo_multi',)
+
+    def make_algfactory_singlejet(self):
 
         class AntiKt:
             fex_label = 'amtikt'
             def __init__(self):
                 self.merge_param = 0.4
                 self.jet_calib = 'subjes'
+                self.fex_alg_name = 'a4'
+                self.data_type = 'tc'
                 pass
 
         menu_data = MagicMock()
@@ -32,25 +37,59 @@ class TestAlgFactory(unittest.TestCase):
         
         self.alg_factory = AlgFactory(chain_config)
 
+
+    def make_algfactory_multijet(self):
+        self.make_algfactory_singlejet()
+
+        # make multiple jet attributes by copying
+        self.alg_factory.hypo_params.jet_attributes.append(
+            self.alg_factory.hypo_params.jet_attributes[0]
+        )
+
     def test_0(self):
         "call all the factory methods"
+
+        self.make_algfactory_singlejet()
+
         for name, m in inspect.getmembers(self.alg_factory,
                                           predicate=inspect.ismethod):
 
             if name.startswith ('__'):
                 continue
             print 'running Algfactory methods', name
+
+            if name in self.special_cases:
+                continue
+
             a = m()
             self.assertTrue(a.__class__.__name__ == 'Alg')
 
     def test_1(self):
+        "call special case factory methods"
+
+        self.make_algfactory_multijet()
+
+        a = self.alg_factory.jr_hypo_multi()
+        self.assertTrue(a.__class__.__name__ == 'Alg')
+
+        str(a)
+        a.asString()
+
+    def test_2(self):
         "call methods of "
+        self.make_algfactory_singlejet()
+
         for name, m in inspect.getmembers(self.alg_factory,
                                           predicate=inspect.ismethod):
 
             if name.startswith ('__'):
                 continue
+
             print 'running Algfactory methods', name
+
+            if name in self.special_cases:
+                continue
+
             a = m()
             str(a)
             a.asString()
diff --git a/Trigger/TriggerCommon/TriggerMenu/python/jet/ChainConfigMaker.py b/Trigger/TriggerCommon/TriggerMenu/python/jet/ChainConfigMaker.py
index 9da2f2f5bff..972fa65fc18 100644
--- a/Trigger/TriggerCommon/TriggerMenu/python/jet/ChainConfigMaker.py
+++ b/Trigger/TriggerCommon/TriggerMenu/python/jet/ChainConfigMaker.py
@@ -114,9 +114,12 @@ class ChainConfigMaker(object):
             'lcw': True,
             'had': False,
         }
-        
+
         cluster_do_lc = cluster_do_lcs.get(part['calib'])
         
+        self.check_and_set('cluster_calib', 'lcw' if
+                           cluster_do_lc else 'em')
+
         if cluster_do_lc is None:
             msg = '%s Unknown cluster calibration %s, possible values: %s' % (
                 err_hdr, p['calib'], str(cluster_do_lcs.keys())) 
@@ -124,12 +127,12 @@ class ChainConfigMaker(object):
             
         self.check_and_set('cluster_do_lc', cluster_do_lc)
 
-        cluster_calib = 'lc' if self.cluster_do_lc else 'em'
+        cluster_calib = 'lcw' if self.cluster_do_lc else 'em'
 
         # set up an identifier for the clutering algorithm
         cluster_label = reduce(lambda x, y: x + y,
                                (part['dataType'],
-                                cluster_calib,
+                                self.cluster_calib,
                                 part["scan"]))
         self.check_and_set('cluster_label', cluster_label)
 
@@ -190,19 +193,19 @@ class ChainConfigMaker(object):
         merge_param = int(reco_alg[1:])
         self.check_and_set('fex_name', 'antikt')
         self.check_and_set('merge_param', merge_param)
-
+        self.check_and_set('dataType', part['dataType'])
+        self.check_and_set('fex_alg_name', part["recoAlg"])
         # generate a string that will be used to label the fex
         # instance and associated entities.
         fex_label = reduce(lambda x, y: x + y,
-                           (part["recoAlg"],
-                            part["dataType"],
-                            cluster_calib,
+                           (self.fex_alg_name,
+                            self.data_type,
+                            self.cluster_calib,
                             part["jetCalib"],
                             part["scan"]))
 
-        self.check_and_set('fex_label',
-                           fex_label)
-                                          
+        self.check_and_set('fex_label', fex_label)
+        
         # check whether to run the hypo
         run_hypo =  'perf' not in part['addInfo']
         
@@ -275,13 +278,17 @@ class ChainConfigMaker(object):
         # parameters
 
         cluster_args = {'do_lc': self.cluster_do_lc,
+                        'cluster_calib': self.cluster_calib,
                         'label': self.cluster_label}
         
         cluster_params = clusterparams_factory(cluster_args)
 
         fex_args = {'merge_param': self.merge_param,
                     'jet_calib': self.jet_calib,
-                    'fex_label': self.fex_label}
+                    'fex_label': self.fex_label,
+                    'data_type': self.data_type,
+                    'fex_alg_name': self.fex_alg_name,  # for labelling
+                }
 
         fex_params = fexparams_factory(self.fex_name, fex_args)
 
@@ -296,13 +303,11 @@ class ChainConfigMaker(object):
 
         recluster_params = None
         if self.do_recluster:
-            recl_args = {
-                'ptMinCut': self.recl_ptMinCut,
-                'etaMaxCut': self.recl_etaMaxCut,
-                'merge_param': self.recl_merge_param,
-                'jet_calib': self.recl_jet_calib,
-                'fex_label': self.recl_fex_label,
-            }
+            recl_args = dict(fex_args)
+            recl_args.update({'ptMinCut': self.recl_ptMinCut,
+                              'etaMaxCut': self.recl_etaMaxCut,
+                              'fex_label': self.recl_fex_label})
+
             recluster_params = fexparams_factory(
                 'jetrec_recluster', recl_args)
             
diff --git a/Trigger/TriggerCommon/TriggerMenu/python/jet/ChangeLog b/Trigger/TriggerCommon/TriggerMenu/python/jet/ChangeLog
index 208b8ec4826..f062b987f71 100644
--- a/Trigger/TriggerCommon/TriggerMenu/python/jet/ChangeLog
+++ b/Trigger/TriggerCommon/TriggerMenu/python/jet/ChangeLog
@@ -1,3 +1,34 @@
+2015-01-28   Peter Sherwood  <peter@localhost>
+
+	* Reintate configuration of reclustered hjet chains - which
+	has stopped working.
+	M       JetSequencesBuilder.py
+
+2015-01-26   Peter Sherwood  <peter@localhost>
+
+	* Change Hypo names to reflect hypo and jet reco params rather
+	than the chainname (coarser granularity of hypo hists).
+	* Avoid usin gthe chain name in the final te name.
+
+	D       fex_factory.py
+	D       fex_factory_test.py
+
+	M       AlgFactory_test.py
+	M       fexparams_factory_test.py
+	M       ChainConfigMaker.py
+	M       SequenceTree.py
+	M       AlgFactory.py
+	M       clusterparams_factory.py
+	M       fexparams_factory.py
+
+
+2015-01-20   Peter Sherwood  <peter@localhost>
+
+	* AlgFactory.py (AlgFactory.clusterDiagnostics): 
+	The instance name constains the chain name for all the diagnostics
+	routines. Gaudi does not allow instance names with '.'
+	Replace '.' by '_' in the string used to name the instances.
+
 2015-01-14   Peter Sherwood  <peter@localhost>
 
 	* added config changes for JetDefFromJets (jet reclustering)
diff --git a/Trigger/TriggerCommon/TriggerMenu/python/jet/JetSequencesBuilder.py b/Trigger/TriggerCommon/TriggerMenu/python/jet/JetSequencesBuilder.py
index be2778f8f3e..bb33d874cca 100644
--- a/Trigger/TriggerCommon/TriggerMenu/python/jet/JetSequencesBuilder.py
+++ b/Trigger/TriggerCommon/TriggerMenu/python/jet/JetSequencesBuilder.py
@@ -129,7 +129,7 @@ class JetSequencesBuilder(object):
             raise RuntimeError(msg)
 
         # add jet reclustering sequence if requested
-        if 'jr' in seq_order and menu_data.recluster_params is not None:
+        if menu_data.recluster_params is not None:
             seq_order.append('rc')
 
         # fex diagnostics are run before the hypo,
diff --git a/Trigger/TriggerCommon/TriggerMenu/python/jet/SequenceTree.py b/Trigger/TriggerCommon/TriggerMenu/python/jet/SequenceTree.py
index 0c34bab718e..292db81fffa 100644
--- a/Trigger/TriggerCommon/TriggerMenu/python/jet/SequenceTree.py
+++ b/Trigger/TriggerCommon/TriggerMenu/python/jet/SequenceTree.py
@@ -33,7 +33,7 @@ class SequenceTree(object):
         # use te_in and the seuquence alias to form te_out.
         # the formeer defines the input, the latter defines
         # the sequence state (alg parameters).Both are needed to
-        # specify what the sequence calculates. 
+        # specify what the sequence calculates.
         if te_in:
             te_out = te_in + '__' + alglist.alias
         else:
@@ -87,7 +87,10 @@ class SequenceLinear(SequenceTree):
 
     def _make_sequences(self, alglist, te_in):
         SequenceTree._make_sequences(self, alglist, te_in)
-        self._rename_last_te()
+
+        # 22/01/2015 PS by request of the menu group
+        # do not rename the last te to the chain name
+        # self._rename_last_te()
 
     def _check(self):
         SequenceTree._check(self)
diff --git a/Trigger/TriggerCommon/TriggerMenu/python/jet/clusterparams_factory.py b/Trigger/TriggerCommon/TriggerMenu/python/jet/clusterparams_factory.py
index bd813b094ca..961ff734366 100644
--- a/Trigger/TriggerCommon/TriggerMenu/python/jet/clusterparams_factory.py
+++ b/Trigger/TriggerCommon/TriggerMenu/python/jet/clusterparams_factory.py
@@ -14,6 +14,7 @@ class _ClusterParams(object):
 
     cluster_type = 'topo_clusters'
 
-    def __init__(self, do_lc, label, **kargs):
+    def __init__(self, do_lc, label, cluster_calib, **kargs):
         self.do_lc = do_lc
+        self.cluster_calib = cluster_calib
         self.cluster_label = label
diff --git a/Trigger/TriggerCommon/TriggerMenu/python/jet/fex_factory.py b/Trigger/TriggerCommon/TriggerMenu/python/jet/fex_factory.py
deleted file mode 100644
index 91f9db6e9aa..00000000000
--- a/Trigger/TriggerCommon/TriggerMenu/python/jet/fex_factory.py
+++ /dev/null
@@ -1,102 +0,0 @@
-# Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
-
-
-
-def fex_factory(selector, kargs):
-
-    if selector == 'antikt':
-        return AntiKt(**kargs)
-
-    if selector == 'cone':
-        return Cone(**kargs)
-
-    if selector == 'jetrec':
-        return JetRec(**kargs)
-
-    else:
-        raise RuntimeError('fex_factory: unknow fex selector %s' % selector)
-
-
-class JetFex(object):
-    """Common code for Fexes: check sanity of input parameters.
-    Provide an alg factory parameter.
-
-    26/2/2014: with the current simple list (in constrast with 2012)
-    the fexes are so similar the class heirarchy is not yet useful.
-    It may become so if the variety of Fex algorithms increases."""
-
-    def __init__(self, merge_param, calib, fex_input, level):
-
-        # temporary kludge until algFactories names updataed
-        level = {
-            'TT': 'l15',
-            'tc': 'jr'}[level]
-
-        self._check_args(merge_param, fex_input)
-        self.merge_param = merge_param
-        self.fex_input = fex_input
-        self.do_jes = calib['do_jes']
-
-        # jes_label = 'jes' if self.do_jes else 'nojes'
-        # make key for the alg dispatcher table
-        # self.fex_key = '%s_%s%s_%s_%s' % (level,
-        #                                  self.fex_type,
-        #                                  str(merge_param),
-        #                                  fex_input,
-        #                                  jes_label)
-
-    def __str__(self):
-        s = ['%s: %s\n' % (k, str(v)) for k, v in self.__dict__.items()]
-        return '\n'.join(s)
-
-    def _check_args(self, merge_param, fex_input):
-        """check the constructor args"""
-
-        try:
-            merge_param = int(merge_param)
-        except ValueError:
-            m = '%s._check_args: non integer merge_param %s' % (
-                self.__class__.__name__,
-                str(merge_param))
-            raise RuntimeError(m)
-
-        if not merge_param in (2, 4, 10):
-            m = '%s._check_args: unsupported merge_param %d' % (
-                self.__class__.__name__,
-                merge_param)
-            raise RuntimeError(m)
-
-        if not fex_input in ('tc', 'cc', 'TT'):
-            m = '%s._check_args: unsupported fex input value %s' % (
-                self.__class__.__name__,
-                str(fex_input))
-            raise RuntimeError(m)
-
-
-class AntiKt(JetFex):
-    """ Argument checking class that holds the  parameters for a
-    AntiKt python alg"""
-
-    fex_type = 'antikt'
-
-    def __init__(self, merge_param, calib, fex_input, level, **kargs):
-        JetFex.__init__(self, merge_param, calib, fex_input, level)
-
-
-class Cone(JetFex):
-    """ Argument checking class that holds the  parameters for a
-    Cone python alg"""
-
-    fex_type = 'cone'
-
-    def __init__(self, merge_param, calib, fex_input, level, **kargs):
-        JetFex.__init__(self, merge_param, calib, fex_input, level)
-
-
-class JetRec(JetFex):
-    """ Argument checking class that holds the  parameters for JetRec"""
-
-    fex_type = 'jetrec'
-
-    def __init__(self, merge_param, calib, fex_input, level, **kargs):
-        JetFex.__init__(self, merge_param, calib, fex_input, level)
diff --git a/Trigger/TriggerCommon/TriggerMenu/python/jet/fex_factory_test.py b/Trigger/TriggerCommon/TriggerMenu/python/jet/fex_factory_test.py
deleted file mode 100644
index a9ed7d5aa72..00000000000
--- a/Trigger/TriggerCommon/TriggerMenu/python/jet/fex_factory_test.py
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
-
-"""
-INCOMPLETE
-"""
-
-import copy
-import unittest
-from mock import MagicMock
-from fex_factory import (fex_factory,
-                         JetFex,
-                         AntiKt,
-                         Cone,
-                         JetRec,)
-
-
-class Test_fex_factory(unittest.TestCase):
-
-    def setUp(self):
-
-        jet_attribute = MagicMock()
-        jet_attribute.threshold = 50
-        jet_attribute.region = 'j'
-        
-        self.fex_args = {
-            'merge_param': 4,
-            'calib': 'calib',
-            }
-
-    def test_0(self):
-        """test HypoAlg construction"""
-
-        fex = JetFex(self.fex_args)
-        self.assertTrue(fex.__class__.__name__ == 'HypoAlg')
-        str(fex)  # exercise string method
-
-    def test_20(self):
-        """test factory function"""
-
-        fex = fex_factory('antikt', self.fex_args)
-        self.assertTrue(hypo.__class__.__name__ == 'JetRecHypoAlg')
-
-        fex = fex_factory('cone', self.fex_args)
-        self.assertTrue(hypo.__class__.__name__ == 'JetRecHypoAlg')
-
-        fex = fex_factory('jetrec', self.fex_args)
-        self.assertTrue(hypo.__class__.__name__ == 'JetRecHypoAlg')
-
-
-if __name__ == '__main__':
-    unittest.main()
diff --git a/Trigger/TriggerCommon/TriggerMenu/python/jet/fexparams_factory.py b/Trigger/TriggerCommon/TriggerMenu/python/jet/fexparams_factory.py
index dacd4ba3dec..af055ddfbef 100644
--- a/Trigger/TriggerCommon/TriggerMenu/python/jet/fexparams_factory.py
+++ b/Trigger/TriggerCommon/TriggerMenu/python/jet/fexparams_factory.py
@@ -33,16 +33,19 @@ class _JetFexParams(object):
                  merge_param,
                  jet_calib,
                  fex_label,
+                 data_type,
+                 fex_alg_name,
                  **kargs):
 
         self._check_args(merge_param)
         self.merge_param = merge_param
-        
+        self.data_type = data_type  # input type: TT, tc etc
         # jet_calib:
         # string used by offline to determine which calibration to perform
         self.jet_calib = jet_calib 
         self.fex_label = fex_label
-
+        self.fex_alg_name = fex_alg_name  # from input dictionary
+        
     def __str__(self):
         s = ['%s: %s\n' % (k, str(v)) for k, v in self.__dict__.items()]
         return '\n'.join(s)
diff --git a/Trigger/TriggerCommon/TriggerMenu/python/jet/fexparams_factory_test.py b/Trigger/TriggerCommon/TriggerMenu/python/jet/fexparams_factory_test.py
index cc073ac577b..1862862fccf 100644
--- a/Trigger/TriggerCommon/TriggerMenu/python/jet/fexparams_factory_test.py
+++ b/Trigger/TriggerCommon/TriggerMenu/python/jet/fexparams_factory_test.py
@@ -23,7 +23,8 @@ class Test_fexparams_factory(unittest.TestCase):
             'jet_calib': 'subjes',
             'fex_label': 'fex_label',
             'level': 'tc',
-            'fex_input': 'tc',
+            'data_type': 'tc',
+            'fex_alg_name': 'a4',
             }
 
     def test_20(self):
diff --git a/Trigger/TriggerCommon/TriggerMenu/python/jet/generateJetChainDefs.py b/Trigger/TriggerCommon/TriggerMenu/python/jet/generateJetChainDefs.py
index c6995491e52..94336ab8ac3 100644
--- a/Trigger/TriggerCommon/TriggerMenu/python/jet/generateJetChainDefs.py
+++ b/Trigger/TriggerCommon/TriggerMenu/python/jet/generateJetChainDefs.py
@@ -146,8 +146,10 @@ def generateLLPchain(theChainDef, chainDict, inputTEsL2, inputTEsEF):
 
     from TrigL2SiTrackFinder.TrigL2SiTrackFinder_Config import TrigL2SiTrackFinder_muonIsoB
     fex_SiTrackFinder_muonIsoB = TrigL2SiTrackFinder_muonIsoB()
-    from TrigLongLivedParticlesHypo.TrigLongLivedParticlesHypoConfig import L2HVJetHypo
-    fex_llp_jet_hypo = L2HVJetHypo('L2HVJetHypo_j30', l2_thr=30*GeV, l2_lrat=1.2)
+    from TrigLongLivedParticlesHypo.TrigLongLivedParticlesHypoConfig import CaloRatioHypo
+    fex_llp_jet_hypo = CaloRatioHypo('TrigCaloRatioHypo_j30', threshold=30*GeV, logratio=1.2)
+    #from TrigLongLivedParticlesHypo.TrigLongLivedParticlesHypoConfig import L2HVJetHypo
+    #fex_llp_jet_hypo = L2HVJetHypo('L2HVJetHypo_j30', l2_thr=30*GeV, l2_lrat=1.2)
     from TrigEFLongLivedParticles.TrigEFLongLivedParticlesConfig import TrigLoFRemovalConfig
     fex_LoF = TrigLoFRemovalConfig()
     from TrigLongLivedParticlesHypo.TrigLongLivedParticlesHypoConfig import TrigLoFRemovalHypoConfig
diff --git a/Trigger/TriggerCommon/TriggerMenu/python/l1/Lvl1Menu.py b/Trigger/TriggerCommon/TriggerMenu/python/l1/Lvl1Menu.py
index 2108029e7b5..bb59f0c658d 100644
--- a/Trigger/TriggerCommon/TriggerMenu/python/l1/Lvl1Menu.py
+++ b/Trigger/TriggerCommon/TriggerMenu/python/l1/Lvl1Menu.py
@@ -2,7 +2,7 @@
 
 from Lvl1Thresholds import LVL1Thresholds, LVL1Threshold, ThresholdValue
 from Lvl1MenuItems import LVL1MenuItems, LVL1MenuItem
-from Lvl1MonCounters import Lvl1MonCounters, Lvl1CtpinCounter
+from Lvl1MonCounters import Lvl1MonCounters
 from CaloInfo import CaloInfo
 from MuctpiInfo import MuctpiInfo
 from CTPInfo import CTPInfo
@@ -62,13 +62,18 @@ class Lvl1Menu:
 
 
     def addCounters(self):
-        for thr in self.thresholds:
-            # this special check address the LUT size issue for the monitoring (see Cabling.py)
-            dontGenerateCounter = (thr.ttype=="JET" and (thr.mapping==8 or thr.mapping==9)) \
-                                  or thr.ttype=="TOPO"
-            if dontGenerateCounter: continue
-            for mult in range(1, 2**thr.cableinfo.bitnum):
-                self.counters.addCounter(Lvl1CtpinCounter(thr.name,mult))
+        from TriggerMenu.l1menu.MonitorDef import MonitorDef
+        # add the CTPIN counters
+        for counter in MonitorDef.ctpinCounters( self.thresholds ):
+            self.counters.addCounter( counter )
+
+        # add the CTPMon counters
+        for counter in MonitorDef.ctpmonCounters( self.thresholds ):
+            self.counters.addCounter( counter )
+
+        # mark the L1 Items that they should be monitored
+        MonitorDef.applyItemCounter( self.items )
+        
 
 
 
diff --git a/Trigger/TriggerCommon/TriggerMenu/python/l1/Lvl1MenuItems.py b/Trigger/TriggerCommon/TriggerMenu/python/l1/Lvl1MenuItems.py
index 01bed1a8b91..060d3e07acf 100644
--- a/Trigger/TriggerCommon/TriggerMenu/python/l1/Lvl1MenuItems.py
+++ b/Trigger/TriggerCommon/TriggerMenu/python/l1/Lvl1MenuItems.py
@@ -15,7 +15,7 @@ class LVL1MenuItem(object):
     # New items will be assigned to this partition
     currentPartition = 0
     
-    __slots__ = ['name', 'group', 'ctpid', 'psCut', 'complex_deadtime', 'trigger_type', 'partition', 'logic', 'verbose']
+    __slots__ = ['name', 'group', 'ctpid', 'psCut', 'complex_deadtime', 'trigger_type', 'partition', 'logic', 'monitors', 'verbose']
     def __init__(self, name, ctpid=-1, group='1', prescale=1, complex_deadtime=0, psCut=None, verbose=False):
         self.name             = name
         self.group            = group
@@ -25,6 +25,7 @@ class LVL1MenuItem(object):
         self.trigger_type     = 0
         self.partition        = LVL1MenuItem.currentPartition
         self.logic            = None
+        self.monitors         = []
         self.verbose          = verbose
 
         if self.verbose:
@@ -56,7 +57,10 @@ class LVL1MenuItem(object):
     def priority(self,priority):
         print "Setter: item priority not used anymore, replaced by complex_deadtime"
         
-        
+
+    def addMonitor(self, flag):
+        self.monitors += [flag]
+    
     def setLogic(self, logic):
         self.logic = logic
         if self.verbose:
@@ -90,8 +94,11 @@ class LVL1MenuItem(object):
 
 
     def xml(self, ind, step=2):
-        s = ind * step * ' ' + '<TriggerItem ctpid="%i" partition="%i" name="%s" complex_deadtime="%i" definition="(%s)" trigger_type="%s">\n' % \
-            (self.ctpid, self.partition, self.name, self.complex_deadtime, str(self.logic).replace('&','&amp;'), self.binary_trigger_type(8 if self.partition==1 else 4))
+        monitor = ""
+        if self.monitors:
+            monitor= ' monitor="' + "|".join(self.monitors) + '"'
+        s = ind * step * ' ' + '<TriggerItem ctpid="%i" partition="%i" name="%s" complex_deadtime="%i" definition="(%s)" trigger_type="%s"%s>\n' % \
+            (self.ctpid, self.partition, self.name, self.complex_deadtime, str(self.logic).replace('&','&amp;'), self.binary_trigger_type(8 if self.partition==1 else 4), monitor)
         if self.logic:
             self.logic.normalize()
             s += self.logic.xml(ind+1, step) + "\n"
diff --git a/Trigger/TriggerCommon/TriggerMenu/python/l1/Lvl1MonCounters.py b/Trigger/TriggerCommon/TriggerMenu/python/l1/Lvl1MonCounters.py
index 81bae1761ee..6ac35cb0c79 100644
--- a/Trigger/TriggerCommon/TriggerMenu/python/l1/Lvl1MonCounters.py
+++ b/Trigger/TriggerCommon/TriggerMenu/python/l1/Lvl1MonCounters.py
@@ -53,7 +53,7 @@ class Lvl1CtpmonCounter(Lvl1MonCounter):
 
     def __init__(self, name, multiplicity):
         super(Lvl1CtpmonCounter, self).__init__(name, multiplicity, 'CTPMON')
-        print 'Initialize ctpmon counter name="%i%s" triggerthreshold="%s" multi="%i"' % (self.multiplicity, self.name, self.name, self.multiplicity)
+        #print 'Initialize ctpmon counter name="%i%s" triggerthreshold="%s" multi="%i"' % (self.multiplicity, self.name, self.name, self.multiplicity)
 
     def xml(self, ind=1, step=2):
         s  = ind * step * ' ' + '<TriggerCounter name="%i%s" type="CTPMON">\n' % (self.multiplicity, self.name)
diff --git a/Trigger/TriggerCommon/TriggerMenu/python/l1/Lvl1Thresholds.py b/Trigger/TriggerCommon/TriggerMenu/python/l1/Lvl1Thresholds.py
index 9e8dc2d1220..17268f8c28f 100644
--- a/Trigger/TriggerCommon/TriggerMenu/python/l1/Lvl1Thresholds.py
+++ b/Trigger/TriggerCommon/TriggerMenu/python/l1/Lvl1Thresholds.py
@@ -122,6 +122,8 @@ class LVL1Threshold(object):
             return self.addJetThresholdValue(value, *args, **kwargs)
         if self.ttype in ['JE', 'TE', 'XE', 'XS', 'CALREQ', 'MBTSSI', 'TRT', 'ZDC', 'BCM', 'BCMCMB', 'LUCID', 'NIM']:
             return self.addEnergyThresholdValue(value, *args, **kwargs)
+        
+
         raise RuntimeError("addThrValue() not defined for threshold type %s" % self.ttype)
 
 
diff --git a/Trigger/TriggerCommon/TriggerMenu/python/l1menu/CaloDef.py b/Trigger/TriggerCommon/TriggerMenu/python/l1menu/CaloDef.py
index 5760b177a57..aefea49e01f 100644
--- a/Trigger/TriggerCommon/TriggerMenu/python/l1menu/CaloDef.py
+++ b/Trigger/TriggerCommon/TriggerMenu/python/l1menu/CaloDef.py
@@ -54,7 +54,7 @@ class CaloDef:
         caloInfo.minTOBPt += [ MinimumTOBPt(thrtype="EM", ptmin=3) ]
         caloInfo.minTOBPt += [ MinimumTOBPt(thrtype="TAU", ptmin=4) ]
         caloInfo.minTOBPt += [ MinimumTOBPt(thrtype="JETS", ptmin=8, window=4) ]
-        caloInfo.minTOBPt += [ MinimumTOBPt(thrtype="JETL", ptmin=12, window=8) ]
+        caloInfo.minTOBPt += [ MinimumTOBPt(thrtype="JETL", ptmin=5, window=8) ]
 
         # jet weights
         if len( tc.menu.thresholds.allThresholdsOf('JET') ) <= 8:
diff --git a/Trigger/TriggerCommon/TriggerMenu/python/l1menu/ItemDef.py b/Trigger/TriggerCommon/TriggerMenu/python/l1menu/ItemDef.py
index b7b3f32a106..ca24af0e7fc 100755
--- a/Trigger/TriggerCommon/TriggerMenu/python/l1menu/ItemDef.py
+++ b/Trigger/TriggerCommon/TriggerMenu/python/l1menu/ItemDef.py
@@ -68,6 +68,7 @@ class ItemDef:
         # E/gamma ctpid=[0:0x1f]
         emTT = TT.calo | TT.caloem
         LVL1MenuItem('L1_EM3'       ).setLogic( EM3        & physcond).setTriggerType( emTT )
+        LVL1MenuItem('L1_EM3HLIL'   ).setLogic( EM3HLIL    & physcond).setTriggerType( emTT )
         LVL1MenuItem('L1_EM4'       ).setLogic( EM4        & physcond).setTriggerType( emTT )
         LVL1MenuItem('L1_EM5'       ).setLogic( EM5        & physcond).setTriggerType( emTT )
         LVL1MenuItem('L1_EM7'       ).setLogic( EM7        & physcond).setTriggerType( emTT )
@@ -110,9 +111,9 @@ class ItemDef:
         LVL1MenuItem('L1_JJ15.23ETA49' ).setLogic( JJ1523ETA49 & physcond).setTriggerType(TT.calo)
         LVL1MenuItem('L1_J15.23ETA49' ).setLogic( J1523ETA49 & physcond).setTriggerType(TT.calo)
         LVL1MenuItem('L1_J15.24ETA49' ).setLogic( J1524ETA49 & physcond).setTriggerType(TT.calo)
-        LVL1MenuItem('L1_J15.28ETA32' ).setLogic( J1528ETA32 & physcond).setTriggerType(TT.calo)
+        LVL1MenuItem('L1_J15.29ETA32' ).setLogic( J1529ETA32 & physcond).setTriggerType(TT.calo)
         LVL1MenuItem('L1_J15.32ETA49' ).setLogic( J1532ETA49 & physcond).setTriggerType(TT.calo)
-        LVL1MenuItem('L1_J20.28ETA32' ).setLogic( J2028ETA32 & physcond).setTriggerType(TT.calo)
+        LVL1MenuItem('L1_J20.29ETA32' ).setLogic( J2029ETA32 & physcond).setTriggerType(TT.calo)
         LVL1MenuItem('L1_J20.32ETA49' ).setLogic( J2032ETA49 & physcond).setTriggerType(TT.calo)
         LVL1MenuItem('L1_J30.32ETA49' ).setLogic( J3032ETA49 & physcond).setTriggerType(TT.calo)
         LVL1MenuItem('L1_J50.32ETA49' ).setLogic( J5032ETA49 & physcond).setTriggerType(TT.calo)
@@ -121,8 +122,10 @@ class ItemDef:
 
         LVL1MenuItem('L1_J15.0ETA24'  ).setLogic( J150ETA24 & physcond).setTriggerType(TT.calo)
         LVL1MenuItem('L1_J20.0ETA28'  ).setLogic( J200ETA28 & physcond).setTriggerType(TT.calo)
-        LVL1MenuItem('L1_J25.0ETA22'  ).setLogic( J250ETA22 & physcond).setTriggerType(TT.calo)
+        LVL1MenuItem('L1_J25.0ETA23'  ).setLogic( J250ETA23 & physcond).setTriggerType(TT.calo)
 
+        LVL1MenuItem('L1_J20.0ETA49'  ).setLogic( J200ETA49 & physcond).setTriggerType(TT.calo)
+        LVL1MenuItem('L1_J30.0ETA49'  ).setLogic( J300ETA49 & physcond).setTriggerType(TT.calo)
         
 
 
@@ -133,8 +136,6 @@ class ItemDef:
 
 
 
-
-
         # HI
         LVL1MenuItem('L1_EM3_NZ'         ).setLogic( EM3      & Not(ZDC_AND) & physcond).setTriggerType( emTT )
         LVL1MenuItem('L1_2EM3_NZ'        ).setLogic( EM3.x(2) & Not(ZDC_AND) & physcond).setTriggerType( emTT )   
@@ -266,12 +267,14 @@ class ItemDef:
         # 3xTAU
         LVL1MenuItem('L1_TAU20_2TAU12'  ).setLogic( HA20 & HA12.x(2)  & physcond).setTriggerType( TT.calo )
         LVL1MenuItem('L1_TAU20_2TAU12I' ).setLogic( HA20 & HA12I.x(2) &  physcond).setTriggerType( TT.calo )
-
+        LVL1MenuItem('L1_TAU20IM_2TAU12IM' ).setLogic( HA20IM & HA12IM.x(2) &  physcond).setTriggerType( TT.calo )
 
         # mixed tau
         LVL1MenuItem('L1_EM15VH_2TAU12'                ).setLogic( EM15VH  & HA12.x(2)          & physcond).setTriggerType( TT.calo )
         LVL1MenuItem('L1_EM15VH_2TAU12IL'              ).setLogic( EM15VH  & HA12IL.x(2)        & physcond).setTriggerType( TT.calo )
+        LVL1MenuItem('L1_EM15HI_2TAU12'                ).setLogic( EM15HI  & HA12.x(2)        & physcond).setTriggerType( TT.calo )
         LVL1MenuItem('L1_EM15HI_2TAU12IL'              ).setLogic( EM15HI  & HA12IL.x(2)        & physcond).setTriggerType( TT.calo )
+        LVL1MenuItem('L1_EM15HI_2TAU12IM'              ).setLogic( EM15HI  & HA12IM.x(2)        & physcond).setTriggerType( TT.calo )
         LVL1MenuItem('L1_EM15_2TAU12'                  ).setLogic( EM15    & HA12.x(2)          & physcond).setTriggerType( TT.calo )
         LVL1MenuItem('L1_EM15_2TAU20'                  ).setLogic( EM15    & HA20.x(2)          & physcond).setTriggerType( TT.calo )
         LVL1MenuItem('L1_EM15VH_2TAU20'                ).setLogic( EM15VH  & HA20.x(2)          & physcond).setTriggerType( TT.calo )
@@ -279,29 +282,56 @@ class ItemDef:
         LVL1MenuItem('L1_EM15HI_TAU40_2TAU15'          ).setLogic( EM15HI  & HA40 & HA15.x(2)   & physcond).setTriggerType( TT.calo )
 
         LVL1MenuItem('L1_EM15_2TAU12_J25_2J15_3J12'    ).setLogic( EM15  & HA12.x(2)  & J25 & J15.x(2) & J12.x(3) & physcond).setTriggerType( TT.calo )
-        LVL1MenuItem('L1_EM15HI_2TAU12I_J25_2J15_3J12'  ).setLogic( EM15  & HA12I.x(2)  & J25 & J15.x(2) & J12.x(3) & physcond).setTriggerType( TT.calo )
+        LVL1MenuItem('L1_EM15HI_2TAU12I_J25_2J15_3J12'  ).setLogic( EM15HI  & HA12I.x(2)  & J25 & J15.x(2) & J12.x(3) & physcond).setTriggerType( TT.calo )
+        LVL1MenuItem('L1_EM15HI_2TAU12IM_J25_3J12'  ).setLogic( EM15HI  & HA12IM.x(2)  & J25 & J12.x(3) & physcond).setTriggerType( TT.calo )
+        LVL1MenuItem('L1_EM15HI_2TAU12IL_J25_3J12'  ).setLogic( EM15HI  & HA12IL.x(2)  & J25 & J12.x(3) & physcond).setTriggerType( TT.calo )
+        LVL1MenuItem('L1_EM15HI_2TAU12_J25_3J12'  ).setLogic( EM15HI  & HA12.x(2)  & J25 & J12.x(3) & physcond).setTriggerType( TT.calo )
 
         LVL1MenuItem('L1_MU10_TAU12'       ).setLogic( MU10  & HA12          & physcond).setTriggerType( TT.calo )
         LVL1MenuItem('L1_MU10_TAU12I'      ).setLogic( MU10  & HA12I         & physcond).setTriggerType( TT.calo )
+        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_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 )
         LVL1MenuItem('L1_MU10_TAU12_J25_2J12' ).setLogic( MU10 & HA12 & J25 & J12.x(2)     & physcond).setTriggerType( TT.calo )
+        LVL1MenuItem('L1_MU10_TAU12IM_J25_2J12' ).setLogic( MU10 & HA12IM & J25 & J12.x(2)    & physcond).setTriggerType( TT.calo )
+        LVL1MenuItem('L1_MU10_TAU12IL_J25_2J12' ).setLogic( MU10 & HA12IL & J25 & J12.x(2)    & physcond).setTriggerType( TT.calo )
         LVL1MenuItem('L1_TAU12I_MU10_J20.32ETA49' ).setLogic( HA12I & MU10 & J2032ETA49    & physcond).setTriggerType( TT.calo )
         LVL1MenuItem('L1_TAU20_2TAU12I_J25_2J15_3J12'   ).setLogic( HA20 & HA12I.x(2)     & J25 & J15.x(2) & J12.x(3) & physcond).setTriggerType( TT.calo )
         LVL1MenuItem('L1_TAU20_2TAU12_J25_2J20_3J12'   ).setLogic( HA20 & HA12.x(2)     & J25 & J20.x(2) & J12.x(3) & physcond).setTriggerType( TT.calo )
+        LVL1MenuItem('L1_TAU20IM_2TAU12IM_J25_2J20_3J12').setLogic( HA20IM & HA12IM.x(2)     & J25 & J20.x(2) & J12.x(3) & physcond).setTriggerType( TT.calo )
+        LVL1MenuItem('L1_TAU20IL_2TAU12IL_J25_2J20_3J12').setLogic( HA20IL & HA12IL.x(2)     & J25 & J20.x(2) & J12.x(3) & physcond).setTriggerType( TT.calo )
+
+        LVL1MenuItem('L1_TAU25IT_2TAU12IT_2J25_3J12').setLogic( HA25IT & HA12IT.x(2)     & J25.x(2)  & J12.x(3) & physcond).setTriggerType( TT.calo )
+
         LVL1MenuItem('L1_2TAU12I_TAU20_J25_2J15_3J12'  ).setLogic( HA12I.x(2)   & HA20  & J25 & J15.x(2) & J12.x(3) & physcond).setTriggerType( TT.calo )
         LVL1MenuItem('L1_TAU20_2J20_XE45'              ).setLogic( HA20    & J20.x(2)   & XE45 & physcond).setTriggerType( TT.calo )
+        LVL1MenuItem('L1_TAU20IM_2J20_XE50'            ).setLogic( HA20IM   & J20.x(2)   & XE50 & physcond).setTriggerType( TT.calo )
+        LVL1MenuItem('L1_TAU20IM_2J20_XE45'            ).setLogic( HA20IM    & J20.x(2)   & XE45 & physcond).setTriggerType( TT.calo )
+        LVL1MenuItem('L1_TAU25_2J20_XE45'              ).setLogic( HA25      & J20.x(2)   & XE45 & physcond).setTriggerType( TT.calo )
         LVL1MenuItem('L1_TAU20_2TAU12_XE35'            ).setLogic( HA20    & HA12.x(2)  & XE35 & physcond).setTriggerType( TT.calo )
+        LVL1MenuItem('L1_TAU20IM_2TAU12IM_XE35'        ).setLogic( HA20IM  & HA12IM.x(2)  & XE35 & physcond).setTriggerType( TT.calo )
+        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_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 )
+        LVL1MenuItem('L1_EM15HI_2TAU12_XE35'         ).setLogic( EM15HI  & HA12.x(2) & XE35 & physcond).setTriggerType( TT.calo )
         LVL1MenuItem('L1_MU10_TAU12I_XE35'             ).setLogic( MU10    & HA12I      & XE35 & physcond).setTriggerType( TT.calo )
+        LVL1MenuItem('L1_MU10_TAU12_XE35'              ).setLogic( MU10    & HA12       & XE35 & physcond).setTriggerType( TT.calo )
+        LVL1MenuItem('L1_MU10_TAU12IL_XE35'            ).setLogic( MU10    & HA12IL     & XE35 & physcond).setTriggerType( TT.calo )
+        LVL1MenuItem('L1_MU10_TAU12IM_XE35'            ).setLogic( MU10    & HA12IM     & XE35 & physcond).setTriggerType( TT.calo )
+        LVL1MenuItem('L1_MU10_TAU12IT_XE35'            ).setLogic( MU10    & HA12IT     & XE35 & physcond).setTriggerType( TT.calo )
+        LVL1MenuItem('L1_MU10_TAU12IM_XE40'            ).setLogic( MU10    & HA12IM     & XE40 & physcond).setTriggerType( TT.calo )
         LVL1MenuItem('L1_TAU20I_2TAU12I_XE35'          ).setLogic( HA20I   & HA12I.x(2) & XE35 & physcond).setTriggerType( TT.calo )
 
 
 
 
         # JET ctpid=[0x60:0x7f]
+        LVL1MenuItem('L1_J5 '   ).setLogic( J5  & physcond).setTriggerType(TT.calo)
         LVL1MenuItem('L1_J10'   ).setLogic( J10  & physcond).setTriggerType(TT.calo)
         LVL1MenuItem('L1_J12'   ).setLogic( J12  & physcond).setTriggerType(TT.calo)
         LVL1MenuItem('L1_J15'   ).setLogic( J15  & physcond).setTriggerType(TT.calo)
@@ -316,6 +346,7 @@ class ItemDef:
         LVL1MenuItem('L1_J85'   ).setLogic( J85  & physcond).setTriggerType(TT.calo)
         LVL1MenuItem('L1_J100'  ).setLogic( J100 & physcond).setTriggerType(TT.calo)
         LVL1MenuItem('L1_J120'  ).setLogic( J120 & physcond).setTriggerType(TT.calo)
+        LVL1MenuItem('L1_J150'  ).setLogic( J150 & physcond).setTriggerType(TT.calo)
         LVL1MenuItem('L1_J175'  ).setLogic( J175 & physcond).setTriggerType(TT.calo)
         LVL1MenuItem('L1_J250'  ).setLogic( J250 & physcond).setTriggerType(TT.calo)
         LVL1MenuItem('L1_J400'  ).setLogic( J400 & physcond).setTriggerType(TT.calo)
@@ -364,10 +395,11 @@ class ItemDef:
         LVL1MenuItem('L1_4J30'   ).setLogic( J30.x(4)    & physcond).setTriggerType(TT.calo)
         LVL1MenuItem('L1_6J15'   ).setLogic( J15.x(6)    & physcond).setTriggerType(TT.calo)
         LVL1MenuItem('L1_J75_3J20' ).setLogic( J75 & J20.x(3)    & physcond).setTriggerType(TT.calo)
-
+        LVL1MenuItem('L1_J30.0ETA49_2J20.0ETA49' ).setLogic( J300ETA49 & J200ETA49.x(2)    & physcond).setTriggerType(TT.calo)
+        
         LVL1MenuItem('L1_4J17.0ETA22' ).setLogic( J170ETA22.x(4) & physcond).setTriggerType(TT.calo)
         LVL1MenuItem('L1_4J15.0ETA24' ).setLogic( J150ETA24.x(4) & physcond).setTriggerType(TT.calo) 
-        LVL1MenuItem('L1_3J25.0ETA22' ).setLogic( J250ETA22.x(3) & physcond).setTriggerType(TT.calo)
+        LVL1MenuItem('L1_3J25.0ETA23' ).setLogic( J250ETA23.x(3) & physcond).setTriggerType(TT.calo)
         LVL1MenuItem('L1_3J15.0ETA24' ).setLogic( J150ETA24.x(3) & physcond).setTriggerType(TT.calo)
         LVL1MenuItem('L1_5J15.0ETA24' ).setLogic( J150ETA24.x(5) & physcond).setTriggerType(TT.calo)
 
@@ -404,6 +436,12 @@ class ItemDef:
         LVL1MenuItem('L1_XE70').setLogic( XE70 & physcond).setTriggerType(TT.calo)
         LVL1MenuItem('L1_XE80').setLogic( XE80 & physcond).setTriggerType(TT.calo)
 
+        LVL1MenuItem('L1_XS30').setLogic( XS30.x(1) & physcond).setTriggerType(TT.calo)
+        LVL1MenuItem('L1_XS45').setLogic( XS45.x(1) & physcond).setTriggerType(TT.calo)
+        LVL1MenuItem('L1_XS50').setLogic( XS50.x(1) & physcond).setTriggerType(TT.calo)
+        LVL1MenuItem('L1_XS55').setLogic( XS55.x(1) & physcond).setTriggerType(TT.calo)
+        LVL1MenuItem('L1_XS60').setLogic( XS60.x(1) & physcond).setTriggerType(TT.calo)
+        LVL1MenuItem('L1_XS65').setLogic( XS65.x(1) & physcond).setTriggerType(TT.calo)
 
         # TE
         LVL1MenuItem('L1_TE5' ).setLogic( TE5  & physcond).setTriggerType(TT.calo)
@@ -412,10 +450,11 @@ class ItemDef:
         LVL1MenuItem('L1_TE30').setLogic( TE30 & physcond).setTriggerType(TT.calo)
         LVL1MenuItem('L1_TE40').setLogic( TE40 & physcond).setTriggerType(TT.calo)
         LVL1MenuItem('L1_TE50').setLogic( TE50 & physcond).setTriggerType(TT.calo)
-        LVL1MenuItem('L1_TE60').setLogic( TE60 & physcond).setTriggerType(TT.calo)
         LVL1MenuItem('L1_TE2000').setLogic( TE2000 & physcond).setTriggerType(TT.calo)
         LVL1MenuItem('L1_TE4000').setLogic( TE4000 & physcond).setTriggerType(TT.calo)
 
+        LVL1MenuItem('L1_TE30.0ETA24').setLogic( TE300ETA24 & physcond).setTriggerType(TT.calo)
+
         LVL1MenuItem('L1_TE5_NZ').setLogic( TE5 & Not(ZDC_AND) & physcond).setTriggerType(TT.calo) 
         
         # MBTS
@@ -575,6 +614,21 @@ class ItemDef:
         # Topo items (keep them all together)
         try:
 
+            # M8 menu
+            LVL1MenuItem('L1_4INVM9999-AJ0s6-AJ0s6', ctpid=-1).setLogic( TOPO_4INVM9999_AJ0s6_AJ0s6 & physcond)
+            LVL1MenuItem('L1_3INVM9999-AJ0s6-AJ0s6', ctpid=-1).setLogic( TOPO_3INVM9999_AJ0s6_AJ0s6 & physcond)
+            LVL1MenuItem('L1_2INVM9999-AJ0s6-AJ0s6', ctpid=-1).setLogic( TOPO_2INVM9999_AJ0s6_AJ0s6 & physcond)
+            LVL1MenuItem('L1_1INVM9999-AJ0s6-AJ0s6', ctpid=-1).setLogic( TOPO_1INVM9999_AJ0s6_AJ0s6 & physcond)
+            
+            LVL1MenuItem('L1_HT200-AJ20s5.ETA49', ctpid=-1).setLogic( TOPO_HT200_AJ20s5ETA49 & physcond)
+            LVL1MenuItem('L1_HT190-AJ20s5.ETA49', ctpid=-1).setLogic( TOPO_HT190_AJ20s5ETA49 & physcond)
+            LVL1MenuItem('L1_HT1-AJ0all.ETA49',   ctpid=-1).setLogic( TOPO_HT1_AJ0allETA49 & physcond)
+
+            LVL1MenuItem('L1_1INVM5-EM6s2-EMall', ctpid=-1).setLogic( TOPO_1INVM5_EM6s2_EMall & physcond)
+            LVL1MenuItem('L1_1INVM5-EMs2-EMs', ctpid=-1).setLogic( TOPO_1INVM5_EMs2_EMs & physcond)
+            LVL1MenuItem('L1_1INVM5-EM6s2-EMs',ctpid=-1).setLogic( TOPO_1INVM5_EM6s2_EMs & physcond)
+            LVL1MenuItem('L1_1INVM5-EM12s2-EMs',ctpid=-1).setLogic( TOPO_1INVM5_EM12s2_EMs & physcond)
+            
             # B-jet
             LVL1MenuItem('L1_0DR04-MU4ab-CJ15ab', ctpid=-1).setLogic( TOPO_0DR04_MU4ab_CJ15ab & physcond)
             LVL1MenuItem('L1_0DR04-MU4ab-CJ30ab', ctpid=-1).setLogic( TOPO_0DR04_MU4ab_CJ30ab & physcond)
@@ -594,8 +648,6 @@ class ItemDef:
             LVL1MenuItem('L1_HT190-J15s5.ETA20',   ctpid=-1).setLogic( TOPO_HT190_J15s5ETA20 & physcond)
             LVL1MenuItem('L1_HT150-AJ20all.ETA30',   ctpid=-1).setLogic( TOPO_HT150_AJ20allETA30 & physcond)
             LVL1MenuItem('L1_HT150-J20s5.ETA30',   ctpid=-1).setLogic( TOPO_HT150_J20s5ETA30 & physcond)
-
-
             
             # Jpsi T&P
             LVL1MenuItem("L1_1INVM5-EMs2-EMall",  ctpid=-1).setLogic( TOPO_1INVM5_EMs2_EMall & physcond)
@@ -630,6 +682,34 @@ class ItemDef:
             LVL1MenuItem("L1_2DR15-2MU6ab_2INVM999-2MU6ab",  ctpid=-1).setLogic( TOPO_2DR15_2MU6ab & TOPO_2INVM999_2MU6ab & physcond)            
             LVL1MenuItem("L1_2DR15-2MU6ab_4INVM8-2MU6ab",  ctpid=-1).setLogic( TOPO_2DR15_2MU6ab & TOPO_4INVM8_2MU6ab & physcond)            
 
+            ##Combined L1Top 
+            LVL1MenuItem('L1_0DR28-MU10ab-TAU12abi_1DISAMB-TAU12abi-J25ab',   ctpid=-1).setLogic( TOPO_0DR28_MU10ab_TAU12abi &  TOPO_1DISAMB_TAU12abi_J25ab & physcond)
+            LVL1MenuItem('L1_XE35_DISAMB-EM15abhi-TAU12abi',                  ctpid=-1).setLogic( XE35 &  TOPO_DISAMB_EM15abhi_TAU12abi & physcond)  
+            LVL1MenuItem('L1_XE40_DISAMB-EM15abhi-TAU12abi',                  ctpid=-1).setLogic( XE40 &  TOPO_DISAMB_EM15abhi_TAU12abi & physcond)  
+            LVL1MenuItem('L1_XE45_1DISAMB-TAU20ab-J20ab',                     ctpid=-1).setLogic( XE45 & TOPO_1DISAMB_TAU20ab_J20ab & physcond)
+            LVL1MenuItem('L1_J25_2J20_3J12_0DR28-TAU20abi-TAU12abi',          ctpid=-1).setLogic( J25 & J20.x(2) & J12.x(3) &  TOPO_0DR28_TAU20abi_TAU12abi & physcond)
+            LVL1MenuItem('L1_J25_3J12_DISAMB-EM15abhi-TAU12abi',              ctpid=-1).setLogic( J25 & J12.x(3) &  TOPO_DISAMB_EM15abhi_TAU12abi & physcond)  
+            LVL1MenuItem('L1_J25_2J12_0DR28-MU10ab-TAU12abi',                 ctpid=-1).setLogic( J25 & J12.x(2) &  TOPO_0DR28_MU10ab_TAU12abi & physcond)
+            LVL1MenuItem('L1_J25_2J20_3J12_0DETA20-0DPHI20-TAU20abi-TAU12abi',ctpid=-1).setLogic( J25 & J20.x(2) & J12.x(3) & TOPO_0DETA20_0DPHI20_TAU20abi_TAU12abi & physcond)
+
+            LVL1MenuItem('L1_MU6_200INVM9999-AJ30s6-AJ20s6',  ctpid=-1).setLogic( MU6 & TOPO_200INVM9999_AJ30s6_AJ20s6 & physcond)
+            LVL1MenuItem('L1_MU6_300INVM9999-AJ30s6-AJ20s6',  ctpid=-1).setLogic( MU6 & TOPO_300INVM9999_AJ30s6_AJ20s6 & physcond)
+            LVL1MenuItem('L1_MU6_400INVM9999-AJ30s6-AJ20s6',  ctpid=-1).setLogic( MU6 & TOPO_400INVM9999_AJ30s6_AJ20s6 & physcond)
+            LVL1MenuItem('L1_MU6_500INVM9999-AJ30s6-AJ20s6',  ctpid=-1).setLogic( MU6 & TOPO_500INVM9999_AJ30s6_AJ20s6 & physcond) 
+
+            LVL1MenuItem('L1_J30_2J20_4J20.0ETA49_400INVM9999-AJ30s6-AJ20s6',  ctpid=-1).setLogic( J30 & J20.x(2) & J200ETA49.x(4) & TOPO_400INVM9999_AJ30s6_AJ20s6 & physcond)
+            LVL1MenuItem('L1_J30_2J20_4J20.0ETA49_700INVM9999-AJ30s6-AJ20s6',  ctpid=-1).setLogic( J30 & J20.x(2) & J200ETA49.x(4) & TOPO_700INVM9999_AJ30s6_AJ20s6 & physcond) 
+            LVL1MenuItem('L1_J30_2J20_4J20.0ETA49_800INVM9999-AJ30s6-AJ20s6',  ctpid=-1).setLogic( J30 & J20.x(2) & J200ETA49.x(4) & TOPO_800INVM9999_AJ30s6_AJ20s6 & physcond)
+            LVL1MenuItem('L1_J30_2J20_4J20.0ETA49_900INVM9999-AJ30s6-AJ20s6',  ctpid=-1).setLogic( J30 & J20.x(2) & J200ETA49.x(4) & TOPO_900INVM9999_AJ30s6_AJ20s6 & physcond)
+
+            LVL1MenuItem('L1_3J20_4J20.0ETA49_400INVM9999-AJ30s6-AJ20s6',  ctpid=-1).setLogic( J20.x(3) & J200ETA49.x(4) & TOPO_400INVM9999_AJ30s6_AJ20s6 & physcond)
+            LVL1MenuItem('L1_3J20_4J20.0ETA49_700INVM9999-AJ30s6-AJ20s6',  ctpid=-1).setLogic( J20.x(3) & J200ETA49.x(4) & TOPO_700INVM9999_AJ30s6_AJ20s6 & physcond) 
+            LVL1MenuItem('L1_3J20_4J20.0ETA49_800INVM9999-AJ30s6-AJ20s6',  ctpid=-1).setLogic( J20.x(3) & J200ETA49.x(4) & TOPO_800INVM9999_AJ30s6_AJ20s6 & physcond)
+            LVL1MenuItem('L1_3J20_4J20.0ETA49_900INVM9999-AJ30s6-AJ20s6',  ctpid=-1).setLogic( J20.x(3) & J200ETA49.x(4) & TOPO_900INVM9999_AJ30s6_AJ20s6 & physcond)
+
+            LVL1MenuItem('L1_XE35_200INVM9999-AJ30s6-AJ20s6',  ctpid=-1).setLogic( XE35 & TOPO_200INVM9999_AJ30s6_AJ20s6 & physcond)
+
+            
             # CTP items for L1Topo streamers
             LVL1MenuItem('L1_DPhi_AJsAJs',   ctpid=-1).setLogic( TOPO_DPhi_AJsAJs & physcond)
             LVL1MenuItem('L1_DPhi_EMsTAUs',   ctpid=-1).setLogic( TOPO_DPhi_EMsTAUs & physcond)
@@ -648,16 +728,22 @@ class ItemDef:
             LVL1MenuItem('L1_5DETA99-5DPHI99-MU6ab-MU4ab',   ctpid=-1).setLogic( TOPO_5DETA99_5DPHI99_MU6ab_MU4ab & physcond)
             LVL1MenuItem('L1_5DETA99-5DPHI99-2MU6ab',   ctpid=-1).setLogic( TOPO_5DETA99_5DPHI99_2MU6ab & physcond)
             LVL1MenuItem('L1_0DR10-MU10ab-MU6ab',   ctpid=-1).setLogic( TOPO_0DR10_MU10ab_MU6ab & physcond)
-            LVL1MenuItem('L1_0DETA35-0DPHI25-EM8abi-MU10ab',   ctpid=-1).setLogic( TOPO_0DETA35_0DPHI25_EM8abi_MU10ab & physcond)
-            LVL1MenuItem('L1_0DETA35-0DPHI25-EM15abi-MUab',   ctpid=-1).setLogic( TOPO_0DETA35_0DPHI25_EM15abi_MUab & physcond)
+            LVL1MenuItem('L1_0DETA04-0DPHI03-EM8abi-MU10ab',   ctpid=-1).setLogic( TOPO_0DETA04_0DPHI03_EM8abi_MU10ab & physcond)
+            LVL1MenuItem('L1_0DETA04-0DPHI03-EM15abi-MUab',   ctpid=-1).setLogic( TOPO_0DETA04_0DPHI03_EM15abi_MUab & physcond)
             LVL1MenuItem('L1_10MINDPHI-Js2-XE50',   ctpid=-1).setLogic( TOPO_10MINDPHI_Js2_XE50 & physcond)
             LVL1MenuItem('L1_10MINDPHI-J20s2-XE50',   ctpid=-1).setLogic( TOPO_10MINDPHI_J20s2_XE50 & physcond)
             LVL1MenuItem('L1_10MINDPHI-J20ab-XE50',   ctpid=-1).setLogic( TOPO_10MINDPHI_J20ab_XE50 & physcond)
             LVL1MenuItem('L1_10MINDPHI-CJ20ab-XE50',   ctpid=-1).setLogic( TOPO_10MINDPHI_CJ20ab_XE50 & physcond)
+
+            LVL1MenuItem('L1_900INVM9999-AJ30s6-AJ20s6',   ctpid=-1).setLogic( TOPO_900INVM9999_AJ30s6_AJ20s6 & physcond)
+            LVL1MenuItem('L1_800INVM9999-AJ30s6-AJ20s6',   ctpid=-1).setLogic( TOPO_800INVM9999_AJ30s6_AJ20s6 & physcond)
+            LVL1MenuItem('L1_700INVM9999-AJ30s6-AJ20s6',   ctpid=-1).setLogic( TOPO_700INVM9999_AJ30s6_AJ20s6 & physcond)
             LVL1MenuItem('L1_400INVM9999-AJ30s6-AJ20s6',   ctpid=-1).setLogic( TOPO_400INVM9999_AJ30s6_AJ20s6 & physcond)
             LVL1MenuItem('L1_350INVM9999-AJ30s6-AJ20s6',   ctpid=-1).setLogic( TOPO_350INVM9999_AJ30s6_AJ20s6 & physcond)
             LVL1MenuItem('L1_300INVM9999-AJ30s6-AJ20s6',   ctpid=-1).setLogic( TOPO_300INVM9999_AJ30s6_AJ20s6 & physcond)
             LVL1MenuItem('L1_200INVM9999-AJ30s6-AJ20s6',   ctpid=-1).setLogic( TOPO_200INVM9999_AJ30s6_AJ20s6 & physcond)
+            LVL1MenuItem('L1_100INVM9999-AJ30s6-AJ20s6',   ctpid=-1).setLogic( TOPO_100INVM9999_AJ30s6_AJ20s6 & physcond)
+
             LVL1MenuItem('L1_350INVM9999-J30s6-J20s6',   ctpid=-1).setLogic( TOPO_350INVM9999_J30s6_J20s6 & physcond)
             LVL1MenuItem('L1_300INVM9999-J30s6-J20s6',   ctpid=-1).setLogic( TOPO_300INVM9999_J30s6_J20s6 & physcond)
             LVL1MenuItem('L1_250INVM9999-J30s6-J20s6',   ctpid=-1).setLogic( TOPO_250INVM9999_J30s6_J20s6 & physcond)
@@ -688,6 +774,7 @@ class ItemDef:
             LVL1MenuItem('L1_2DR15-MU6ab-MU4ab',   ctpid=-1).setLogic( TOPO_2DR15_MU6ab_MU4ab & physcond)
             LVL1MenuItem('L1_2DR15-CMU6ab-CMU4ab',   ctpid=-1).setLogic( TOPO_2DR15_CMU6ab_CMU4ab & physcond)
 
+
             
         except Exception, ex:
             print "Creation of L1Topo item failed, will abort:" , ex
diff --git a/Trigger/TriggerCommon/TriggerMenu/python/l1menu/Menu_MC_pp_v5.py b/Trigger/TriggerCommon/TriggerMenu/python/l1menu/Menu_MC_pp_v5.py
index 83394f47060..de47010772c 100644
--- a/Trigger/TriggerCommon/TriggerMenu/python/l1menu/Menu_MC_pp_v5.py
+++ b/Trigger/TriggerCommon/TriggerMenu/python/l1menu/Menu_MC_pp_v5.py
@@ -35,30 +35,33 @@ def defineMenu():
 
         # 16 x EM
         #'EM3', 'EM6', 'EM12', 'EM7V', 'EM8VH', 'EM15V', 'EM15VH', 'EM15VHI', 'EM18VH', 'EM18VHI', 'EM18VHIrel', 'EM20V', 'EM20VHI', 'EM22VHI', 'EM24VHI', 'EM50', # see savannah https://savannah.cern.ch/bugs/?103935
-        'EM3', 'EM7', 'EM8VH', 'EM8I', 'EM10VH', 'EM12', 'EM13VH', 'EM15', 'EM15VH', 'EM15I', 'EM15HI', 'EM18VH', 'EM20VH', 'EM20VHI', 'EM22VHLIL', 'EM50V', # see jira https://its.cern.ch/jira/browse/ATR-9286
-
-
+        'EM3', 'EM3HLIL', 'EM7', 'EM8VH', 'EM8I', 'EM10VH', 'EM12', 'EM13VH', 'EM15', 'EM15VH', 'EM15I', 'EM15HI', 'EM18VH', 'EM20VH', 'EM20VHI', 'EM22VHLIL', # see jira https://its.cern.ch/jira/browse/ATR-9286
 
 
         # 9 x TAU
-        'HA6', 'HA8', 'HA12', 'HA12I', 'HA12IL', 'HA15', 'HA20', 'HA20I', 'HA30', 'HA40', 'HA60', 
+        #'HA6', 'HA8', 'HA12', 'HA12I', 'HA12IL', 'HA15', 'HA20', 'HA20I', 'HA30', 'HA40', 'HA60', 
+        'HA8', 'HA10IM','HA12', 'HA12IL', 'HA12IM', 'HA12IT','HA15', 'HA20', 'HA20IL',  'HA20IM', 'HA20IT','HA25','HA25IT', 'HA30', 'HA40', 'HA60', 
 
         # JETs and central jets (first 10 can have multiplicity 4 or more)
-        #'J12', 'J15', 'J20', 'J25', 'J30', 'J40', 'J17.ETA22', 'J25.ETA22', 'J15.ETA24', 'JB15.23ETA49','JF15.23ETA49',#'FJ15.23ETA',
-
-        'J12', 'J15', 'J15.0ETA24', 'J20', 'J25', 'J25.0ETA22', 'J30', 'J40',
-        'JJ15.23ETA49','J15.23ETA49', 'J20.0ETA28', 'J15.28ETA32', 'J20.28ETA32',
+        #'J12', 'J15', 'J20', 'J25', 'J30', 'J40', 'J17.ETA22', 'J25.ETA22', 'J15.ETA24', 'JB15.23ETA49','JF15.23ETA49',#'FJ15.23ETA1',
+        
+        'J5', 'J12', 'J15', 'J15.0ETA24','J20', 'J25','J25.0ETA23','J30', 
+        #2 x VBF
+        'J20.0ETA49', 'J30.0ETA49',
 
+        'JJ15.23ETA49','J15.29ETA32', 'J20.29ETA32',
+        
         # those can have maximum multiplicity of 3
-        'J50', 'J75', 'J85', 'J100', 'J120', 'J400',
+        'J40','J50','J75', 'J85', 'J100', 'J120', #'J400',
 
-        # 6 x FJ        
+        # 6 x FJ              
         'J15.32ETA49', 'J20.32ETA49', 'J30.32ETA49', 'J50.32ETA49', 'J75.32ETA49', 'J100.32ETA49', 
-        
+
         # 8 x TE
-        'TE20', 'TE30', 'TE40', 'TE50', 'TE60',# 'TE1000', 'TE1200', 'TE1400',# --> the last three are left in as a forced threshold.
+        'TE20', 'TE30', 'TE40', 'TE50', 'TE30.0ETA24',# 'TE1000', 'TE1200', 'TE1400',# --> the last three are left in as a forced threshold.
 
         # 8 x XS
+        'XS30','XS45','XS50', 'XS55','XS60', 'XS65', 
         # 'XS25', 'XS30', 'XS35', 'XS45', 'XS50', 'XS55', 'XS60', 'XS65',
 
         # 8 x XE
@@ -81,7 +84,7 @@ def defineMenu():
 #
 
         # TRT
-        #'NIMTRT',
+        'NIMTRT',
 
         # L1A for CTP monitoring itself
         #'NIML1A',
@@ -102,9 +105,27 @@ def defineMenu():
         'MBTS_C0', 'MBTS_C1', 'MBTS_C2', 'MBTS_C3', 'MBTS_C4'  , 'MBTS_C5', 'MBTS_C6', 'MBTS_C7', 
         'MBTS_C8',  'MBTS_C10', 'MBTS_C12' , 'MBTS_C14',
 
+        ##ALFA
+        #'ALFA_B7R1L', 'ALFA_B7R1U', 'ALFA_A7R1L', 'ALFA_A7R1U', 'ALFA_A7L1L', 'ALFA_A7L1U', 'ALFA_B7L1L', 'ALFA_B7L1U',
+        #'ALFA_B7R1L_OD', 'ALFA_B7R1U_OD', 'ALFA_A7R1L_OD', 'ALFA_A7R1U_OD', 'ALFA_A7L1L_OD', 'ALFA_A7L1U_OD', 'ALFA_B7L1L_OD', 'ALFA_B7L1U_OD', 
+
         #-------------------------------------------------------------------
         #L1 TOPO inputs 
         #-------------------------------------------------------------------
+        # M8
+        '4INVM9999-AJ0s6-AJ0s6',
+        '3INVM9999-AJ0s6-AJ0s6',
+        '2INVM9999-AJ0s6-AJ0s6',
+        '1INVM9999-AJ0s6-AJ0s6',
+
+        'HT200-AJ20s5.ETA49',
+        'HT190-AJ20s5.ETA49',
+        'HT1-AJ0all.ETA49',
+        '1INVM5-EM6s2-EMall',
+        '1INVM5-EMs2-EMs',
+        '1INVM5-EM6s2-EMs',
+        '1INVM5-EM12s2-EMs',
+        
         #HT
         'HT0-AJ0all.ETA49',
         'HT190-AJ15all.ETA20',
@@ -154,16 +175,21 @@ def defineMenu():
         '5DETA99-5DPHI99-MU6ab-MU4ab',
         '5DETA99-5DPHI99-2MU6ab',
         '0DR10-MU10ab-MU6ab',
-        '0DETA35-0DPHI25-EM8abi-MU10ab',
-        '0DETA35-0DPHI25-EM15abi-MUab',
+        '0DETA04-0DPHI03-EM8abi-MU10ab',
+        '0DETA04-0DPHI03-EM15abi-MUab',
         '10MINDPHI-Js2-XE50',
         '10MINDPHI-J20s2-XE50',
         '10MINDPHI-J20ab-XE50',
         '10MINDPHI-CJ20ab-XE50',
+        '900INVM9999-AJ30s6-AJ20s6',
+        '800INVM9999-AJ30s6-AJ20s6',
+        '700INVM9999-AJ30s6-AJ20s6',
+        '500INVM9999-AJ30s6-AJ20s6',
         '400INVM9999-AJ30s6-AJ20s6',
         '350INVM9999-AJ30s6-AJ20s6',
         '300INVM9999-AJ30s6-AJ20s6',
         '200INVM9999-AJ30s6-AJ20s6',
+        '100INVM9999-AJ30s6-AJ20s6',
         '350INVM9999-J30s6-J20s6',
         '300INVM9999-J30s6-J20s6',
         '250INVM9999-J30s6-J20s6',
@@ -194,18 +220,19 @@ def defineMenu():
         '2DR15-CMU6ab-CMU4ab',
         ]
 
-
+    
     Lvl1Flags.items = [
-
+        
         # single EM
-
-        'L1_EM3', 'L1_EM7', 'L1_EM12', 'L1_EM8VH', 'L1_EM10VH', 'L1_EM13VH', 'L1_EM8I', 'L1_EM15', 'L1_EM15I', 'L1_EM15HI','L1_EM15VH', 'L1_EM18VH', 'L1_EM20VH', 'L1_EM20VHI', 'L1_EM22VHLIL', 'L1_EM50V', 'L1_EM3_EMPTY', 'L1_EM7_EMPTY', 'L1_EM3_UNPAIRED_ISO',
-
+        
+        'L1_EM3','L1_EM3HLIL','L1_EM7', 'L1_EM12', 'L1_EM8VH', 'L1_EM10VH', 'L1_EM13VH', 'L1_EM8I', 'L1_EM15', 'L1_EM15I', 'L1_EM15HI','L1_EM15VH', 'L1_EM18VH', 'L1_EM20VH', 'L1_EM20VHI', 'L1_EM22VHLIL', #'L1_EM50V',
+        'L1_EM3_EMPTY', 'L1_EM7_EMPTY', 'L1_EM3_UNPAIRED_ISO',
+        
         # see savannah https://savannah.cern.ch/bugs/?103935
-
+        
         # combined EM -jet
         #'L1_JJ15.23ETA49', # 4x4 window
-
+        
         # single MU
         "L1_MU4", "L1_MU6", "L1_MU10", "L1_MU11", "L1_MU15", "L1_MU20",
         "L1_MU4_EMPTY", "L1_MU4_FIRSTEMPTY", "L1_MU11_EMPTY",
@@ -218,204 +245,290 @@ def defineMenu():
 
 
         # single tau
-        "L1_TAU6", "L1_TAU8", "L1_TAU12", "L1_TAU12I", "L1_TAU20", "L1_TAU30", "L1_TAU40", "L1_TAU60", # "L1_2TAUXX",
-        "L1_TAU8_EMPTY",
+        #"L1_TAU6",
+        "L1_TAU12", "L1_TAU12IL",  "L1_TAU12IM",  "L1_TAU12IT", "L1_TAU20", "L1_TAU20IL", "L1_TAU20IM", "L1_TAU20IT", 
+        "L1_TAU30", "L1_TAU40", "L1_TAU60",
+        "L1_TAU8", "L1_TAU8_EMPTY",
+        
 
         # multi tau
-        "L1_TAU20_2TAU12", "L1_TAU20_2TAU12I",
+        "L1_TAU20IM_2TAU12IM",  
+        #"L1_TAU20_2TAU12I", 
+        "L1_TAU20_2TAU12", 
 
         # combined tau - lepton
-        "L1_EM15_2TAU12", "L1_EM15_2TAU20", "L1_EM15HI_2TAU12IL", "L1_EM15_TAU40_2TAU15", "L1_EM15HI_TAU40_2TAU15", 
-        "L1_EM15_2TAU12_J25_2J15_3J12", "L1_EM15HI_2TAU12I_J25_2J15_3J12",
-        "L1_MU10_TAU12", "L1_MU10_TAU12I", "L1_MU10_TAU12_J25_2J12", "L1_MU10_TAU20", "L1_MU10_TAU20I",
+        "L1_EM15HI_2TAU12",  
+        "L1_EM15HI_2TAU12IM",          
+        "L1_EM15HI_2TAU12IM_J25_3J12",   
+        "L1_EM15HI_2TAU12_J25_3J12",   
+        'L1_J25_3J12_DISAMB-EM15abhi-TAU12abi',  
+        "L1_MU10_TAU12",  
+        "L1_MU10_TAU12IM",  
+        "L1_MU10_TAU12IM_J25_2J12", 
+        "L1_MU10_TAU12IL_J25_2J12", 
+        "L1_MU10_TAU12_J25_2J12", 
+        'L1_J25_2J12_0DR28-MU10ab-TAU12abi',  
+        "L1_MU10_TAU20",
 
         # combined tau - jet
-         "L1_TAU12I_MU10_J25_2J12", "L1_TAU20_2TAU12_J25_2J20_3J12", "L1_TAU20_2TAU12I_J25_2J15_3J12",
+        "L1_TAU25IT_2TAU12IT_2J25_3J12", 
+        
+        "L1_TAU20IL_2TAU12IL_J25_2J20_3J12", 
+        "L1_TAU20IM_2TAU12IM_J25_2J20_3J12", 
+        "L1_TAU20_2TAU12_J25_2J20_3J12",
+        'L1_J25_2J20_3J12_0DETA20-0DPHI20-TAU20abi-TAU12abi',  
+        'L1_J25_2J20_3J12_0DR28-TAU20abi-TAU12abi',  
+        'L1_0DR28-MU10ab-TAU12abi_1DISAMB-TAU12abi-J25ab', 
+        
 
         # combined tau - xe
-        "L1_TAU20_2J20_XE45", "L1_EM15HI_2TAU12I_XE35", "L1_MU10_TAU12I_XE35", "L1_TAU20_2TAU12_XE35", "L1_TAU20I_2TAU12I_XE35",
+        "L1_TAU20IM_2J20_XE45", 
+        "L1_TAU25_2J20_XE45",   
+        "L1_TAU20IM_2J20_XE50",   
+        'L1_XE45_1DISAMB-TAU20ab-J20ab',    
+
+        #"L1_EM15HI_2TAU12I_XE35", 
+        "L1_EM15HI_2TAU12IM_XE35",  
+        "L1_EM15HI_2TAU12IL_XE35",  
+        "L1_EM15HI_2TAU12_XE35",  
+        'L1_XE35_DISAMB-EM15abhi-TAU12abi', 
+        'L1_XE40_DISAMB-EM15abhi-TAU12abi', 
 
+        
+        "L1_MU10_TAU12_XE35",    
+        "L1_MU10_TAU12IM_XE35",  
+        "L1_MU10_TAU12IL_XE35",  
+        "L1_MU10_TAU12IT_XE35",  
+        "L1_MU10_TAU12IM_XE40",  
+        
+        "L1_TAU20IM_2TAU12IM_XE35", 
+        "L1_TAU20IL_2TAU12IL_XE35", 
+        "L1_TAU20IT_2TAU12IT_XE35", 
+        "L1_TAU20_2TAU12_XE35",
+        "L1_TAU20IM_2TAU12IM_XE40",  
+        
+
+        
         # combined em - jet
         #'L1_EM15VH_J15.23ETA49',
         'L1_EM15VH_JJ15.23ETA49',
-
+        
         # combined mu - jet
         'L1_MU4_3J20',
-
+        
         # 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.32ETA49", "L1_J30.32ETA49", "L1_J50.32ETA49", "L1_J75.32ETA49", "L1_J100.32ETA49",
-        'L1_J15.23ETA49','L1_J15.28ETA32', 'L1_J15.32ETA49',
-        "L1_J20.28ETA32",  
+        #'L1_J15.23ETA49',
+        'L1_J15.29ETA32', 'L1_J15.32ETA49',
+        "L1_J20.29ETA32", 
         "L1_J12_EMPTY","L1_J12_FIRSTEMPTY", "L1_J12_UNPAIRED_ISO", "L1_J12_UNPAIRED_NONISO", 
         "L1_J30_EMPTY", "L1_J30_FIRSTEMPTY", "L1_J30.32ETA49_EMPTY", "L1_J30.32ETA49_FIRSTEMPTY","L1_J30.32ETA49_UNPAIRED_ISO",
-
-        # multi jet
-        "L1_3J15", "L1_3J20","L1_3J40", 'L1_3J15.0ETA24', "L1_3J50", "L1_4J15", "L1_4J20", "L1_3J75", "L1_4J30", "L1_6J15",
-        "L1_J75_3J20",
-        
-        # multi jet central
-        "L1_3J25.0ETA22", "L1_4J15.0ETA24", "L1_5J15.0ETA24", 
-     
-        # combined jet
-        "L1_2J15_XE55", "L1_J40_XE50", "L1_J75_XE40",
-
-        # XE
-        "L1_XE35", "L1_XE40", "L1_XE45", "L1_XE50", "L1_XE55", "L1_XE60", "L1_XE70", "L1_XE80", 
-        
-        # TE
-        "L1_TE20", "L1_TE30", "L1_TE40", "L1_TE50", "L1_TE60",   
-
-        # MBTS
-        "L1_MBTS_1", "L1_MBTS_2", "L1_MBTS_1_1", "L1_MBTS_2_UNPAIRED_ISO",
-        'L1_MBTSA0' ,'L1_MBTSA1' ,'L1_MBTSA2' ,'L1_MBTSA3' ,'L1_MBTSA4' ,
-        'L1_MBTSA5' ,'L1_MBTSA6' ,'L1_MBTSA7' ,'L1_MBTSA8' ,
-        'L1_MBTSA10','L1_MBTSA12','L1_MBTSA14',
-        'L1_MBTSC0' ,'L1_MBTSC1' ,'L1_MBTSC2' ,'L1_MBTSC3' ,'L1_MBTSC4' ,
-        'L1_MBTSC5' ,'L1_MBTSC6' ,'L1_MBTSC7' ,'L1_MBTSC8' ,
-        'L1_MBTSC10','L1_MBTSC12','L1_MBTSC14',
         
-        # RNDM
-        'L1_RD0_FILLED', 'L1_RD0_UNPAIRED_ISO','L1_RD0_EMPTY',
-        "L1_RD1_FILLED","L1_RD1_EMPTY",
-        'L1_RD0_FIRSTEMPTY', 
+    # multi jet
+    "L1_3J15", "L1_3J20","L1_3J40", 'L1_3J15.0ETA24', "L1_3J50", "L1_4J15", "L1_4J20", "L1_3J75", "L1_4J30", "L1_6J15",
+    "L1_J75_3J20", "L1_J30.0ETA49_2J20.0ETA49",
         
-        #LUCID
-        'L1_LUCID', 'L1_LUCID_EMPTY', 'L1_LUCID_UNPAIRED_ISO', 
-        'L1_LUCID_A_C_EMPTY', 'L1_LUCID_A_C_UNPAIRED_ISO',  'L1_LUCID_A_C_UNPAIRED_NONISO',
+    # multi jet central
+    "L1_3J25.0ETA23", "L1_4J15.0ETA24", "L1_5J15.0ETA24", 
+   
+    # combined jet
+    "L1_2J15_XE55", "L1_J40_XE50", "L1_J75_XE40",
+
+    # XE
+    "L1_XE35", "L1_XE40", "L1_XE45", "L1_XE50", "L1_XE55", "L1_XE60", "L1_XE70", "L1_XE80", 
+    
+    #XS
+    'L1_XS30','L1_XS45','L1_XS50', 'L1_XS55','L1_XS60', 'L1_XS65', 
         
+    # TE
+    "L1_TE20", "L1_TE30", "L1_TE40", "L1_TE50", "L1_TE30.0ETA24",  
+
+    # MBTS
+    "L1_MBTS_1", "L1_MBTS_2", "L1_MBTS_1_1", "L1_MBTS_2_UNPAIRED_ISO",
+    'L1_MBTSA0' ,'L1_MBTSA1' ,'L1_MBTSA2' ,'L1_MBTSA3' ,'L1_MBTSA4' ,
+    'L1_MBTSA5' ,'L1_MBTSA6' ,'L1_MBTSA7' ,'L1_MBTSA8' ,
+    'L1_MBTSA10','L1_MBTSA12','L1_MBTSA14',
+    'L1_MBTSC0' ,'L1_MBTSC1' ,'L1_MBTSC2' ,'L1_MBTSC3' ,'L1_MBTSC4' ,
+    'L1_MBTSC5' ,'L1_MBTSC6' ,'L1_MBTSC7' ,'L1_MBTSC8' ,
+    'L1_MBTSC10','L1_MBTSC12','L1_MBTSC14',
+    
+    # RNDM
+    'L1_RD0_FILLED', 'L1_RD0_UNPAIRED_ISO','L1_RD0_EMPTY',
+    "L1_RD1_FILLED","L1_RD1_EMPTY",
+    'L1_RD0_FIRSTEMPTY', 
+    
+    #LUCID
+    'L1_LUCID', 'L1_LUCID_EMPTY', 'L1_LUCID_UNPAIRED_ISO', 
+    'L1_LUCID_A_C_EMPTY', 'L1_LUCID_A_C_UNPAIRED_ISO', 'L1_LUCID_A_C_UNPAIRED_NONISO',
+    
 
 
-        
+    
 
-        # VDM
-        "L1_BGRP7",
+    # VDM
+    "L1_BGRP7",
 
-        # TRT
-        #"L1_TRT",
+    # TRT
+    "L1_TRT",
 
-        #CALREQ
-        #"L1_CALREQ2",
+    #CALREQ
+    "L1_CALREQ2",
+    
+    # BCM
+    'L1_BCM_Wide_BGRP0','L1_BCM_AC_CA_BGRP0', 'L1_BCM_Wide_EMPTY','L1_BCM_Wide_UNPAIRED_ISO','L1_BCM_Wide_UNPAIRED_NONISO', 'L1_BCM_AC_CA_UNPAIRED_ISO',
+
+    #--------------------------------
+    # TOPO items
+    #--------------------------------
+    # M8 
+    'L1_4INVM9999-AJ0s6-AJ0s6',        
+    'L1_3INVM9999-AJ0s6-AJ0s6',
+    'L1_2INVM9999-AJ0s6-AJ0s6',
+    'L1_1INVM9999-AJ0s6-AJ0s6',
+
+    'L1_HT200-AJ20s5.ETA49',
+    'L1_HT190-AJ20s5.ETA49',
+    'L1_HT1-AJ0all.ETA49',
+    'L1_1INVM5-EM6s2-EMall',
+    'L1_1INVM5-EMs2-EMs',
+    'L1_1INVM5-EM6s2-EMs',
+    'L1_1INVM5-EM12s2-EMs',
         
-        # BCM
-        'L1_BCM_Wide_BGRP0','L1_BCM_AC_CA_BGRP0', 'L1_BCM_Wide_EMPTY','L1_BCM_Wide_UNPAIRED_ISO','L1_BCM_Wide_UNPAIRED_NONISO', 'L1_BCM_AC_CA_UNPAIRED_ISO',
-
-        #--------------------------------
-        # TOPO items
-        #--------------------------------
-        # B-jet
-        'L1_0DR04-MU4ab-CJ15ab', 'L1_0DR04-MU4ab-CJ30ab', 'L1_0DR04-MU6ab-CJ25ab', 'L1_0DR04-MU4ab-CJ17ab', 'L1_0DR04-MU4ab-CJ20ab',
+    # B-jet
+    'L1_0DR04-MU4ab-CJ15ab', 'L1_0DR04-MU4ab-CJ30ab', 'L1_0DR04-MU6ab-CJ25ab', 'L1_0DR04-MU4ab-CJ17ab', 'L1_0DR04-MU4ab-CJ20ab',
 
-        # ZH
-        'L1_J40_10MINDPHI-Js2-XE50', 'L1_J40_10MINDPHI-J20s2-XE50', 'L1_J40_10MINDPHI-J20ab-XE50', 'L1_J40_10MINDPHI-CJ20ab-XE50',
+    # ZH
+    'L1_J40_10MINDPHI-Js2-XE50', 'L1_J40_10MINDPHI-J20s2-XE50', 'L1_J40_10MINDPHI-J20ab-XE50', 'L1_J40_10MINDPHI-CJ20ab-XE50',
+    
+    # HT
+    'L1_HT0-AJ0all.ETA49',
+    'L1_HT190-AJ15all.ETA20',
+    'L1_HT190-J15s5.ETA20',
+    'L1_HT150-AJ20all.ETA30',
+    'L1_HT150-J20s5.ETA30',   
+    
+    # Jpsi T&P
+    'L1_1INVM5-EMs2-EMall', 'L1_1INVM5-EM7s2-EMall', 'L1_1INVM5-EM12s2-EMall',    
+
+    # W T&P
+    'L1_10MINDPHI-AJj15s2-XE0',
+    'L1_20MINDPHI-AJjs6-XE0',
+    'L1_20MINDPHI-AJj15s2-XE0',
+    'L1_10MINDPHI-EM6s1-XE0',
+    'L1_20MINDPHI-EM9s6-XE0',
+    'L1_20MINDPHI-EM6s1-XE0',
+    'L1_05RATIO-XE0-HT0-AJj15all.ETA49',
+    'L1_08RATIO-XE0-HT0-AJj0all.ETA49',
+    'L1_40RATIO2-XE0-HT0-AJj15all.ETA49',
+    'L1_90RATIO2-XE0-HT0-AJj0all.ETA49',
+    'L1_HT20-AJj0all.ETA49',
+    'L1_NOT-02MATCH-EM9s1-AJj15all.ETA49',
+    'L1_NOT-02MATCH-EM9s1-AJj15all.ETA49_05RATIO-XE0-SUM0-EM9s1-HT0-AJj15all.ETA49',
+
+    #Bphysics items
+    'L1_2DR15-2MU4ab', 
+    'L1_2INVM999-2MU4ab', 'L1_4INVM8-2MU4ab',
+    'L1_2DR15-2MU4ab_2INVM999-2MU4ab', 'L1_2DR15-2MU4ab_4INVM8-2MU4ab',
+
+    'L1_2DR15-2MU6ab', 
+    'L1_2INVM999-2MU6ab', 'L1_4INVM8-2MU6ab',
+    'L1_2DR15-2MU6ab_2INVM999-2MU6ab', 'L1_2DR15-2MU6ab_4INVM8-2MU6ab',
         
-        # HT
-        'L1_HT0-AJ0all.ETA49',
-        'L1_HT190-AJ15all.ETA20',
-        'L1_HT190-J15s5.ETA20',
-        'L1_HT150-AJ20all.ETA30',
-        'L1_HT150-J20s5.ETA30',     
+    # L1 items for L1Topo streamers
+    'L1_DPhi_AJsAJs',
+    'L1_DPhi_EMsTAUs',
+    'L1_DEta_AJabAJab',
+    'L1_DEta_EMabTAUab',
+    'L1_2INVM999-CMU4ab-MU4ab',
+    'L1_2INVM999-2CMU4ab',
+    'L1_2INVM999-MU6ab-MU4ab',
+    'L1_2INVM999-CMU6ab-CMU4ab',
+    'L1_4INVM8-CMU4ab-MU4ab',
+    'L1_4INVM8-2CMU4ab',
+    'L1_4INVM8-MU6ab-MU4ab',
+    'L1_4INVM8-CMU6ab-CMU4ab',
+    'L1_2DR99-2MU4ab',
+    'L1_5DETA99-5DPHI99-2MU4ab',
+    'L1_5DETA99-5DPHI99-MU6ab-MU4ab',
+    'L1_5DETA99-5DPHI99-2MU6ab',
+    'L1_0DR10-MU10ab-MU6ab',
+    'L1_0DETA04-0DPHI03-EM8abi-MU10ab',
+    'L1_0DETA04-0DPHI03-EM15abi-MUab',
+    'L1_10MINDPHI-Js2-XE50',
+    'L1_10MINDPHI-J20s2-XE50',
+    'L1_10MINDPHI-J20ab-XE50',
+    'L1_10MINDPHI-CJ20ab-XE50',
+    'L1_900INVM9999-AJ30s6-AJ20s6',
+    'L1_800INVM9999-AJ30s6-AJ20s6',
+    'L1_700INVM9999-AJ30s6-AJ20s6',
+    'L1_400INVM9999-AJ30s6-AJ20s6',
+    'L1_350INVM9999-AJ30s6-AJ20s6',
+    'L1_300INVM9999-AJ30s6-AJ20s6',
+    'L1_200INVM9999-AJ30s6-AJ20s6',
+    'L1_100INVM9999-AJ30s6-AJ20s6',
+    'L1_350INVM9999-J30s6-J20s6',
+    'L1_300INVM9999-J30s6-J20s6',
+    'L1_250INVM9999-J30s6-J20s6',
+    'L1_200INVM9999-J30s6-J20s6',
+    'L1_40DETA99-AJ30s6-AJ20s6',
+    'L1_40DETA99-J30s6-J20s6',
+    'L1_HT150-AJj15all.ETA49',
+    'L1_0DETA10-Js1-Js2',
+    'L1_0MATCH-4AJ20.ETA32-4AJj15',
+    'L1_05RATIO-XE0-SUM0-EM9s1-HT0-AJj15all.ETA49',
+    'L1_210RATIO-0MATCH-TAU30si2-EMall',
+    'L1_NOT-0MATCH-TAU30si2-EMall',
+    'L1_0DR28-MU10ab-TAU12abi',    
+    'L1_1DISAMB-TAU12abi-J25ab',    
+    'L1_DISAMB-EM15abhi-TAU40ab',    
+    'L1_1DISAMB-TAU20ab-J20ab',
+    'L1_DISAMB-EM15abhi-TAU12abi',
+    'L1_1DISAMB-EM15his2-TAU12abi-J25ab',
+    'L1_1DISAMB-J25ab-0DR28-EM15his2-TAU12abi',    
+    'L1_1DISAMB-TAU20abi-TAU12abi-J25ab',
+    'L1_0DR28-TAU20abi-TAU12abi',    
+    'L1_0DETA20-0DPHI20-TAU20abi-TAU12abi',
+    'L1_1DISAMB-J25ab-0DR28-TAU20abi-TAU12abi',    
+    'L1_LAR-EM50s1',
+    'L1_LAR-J100s1',
+    'L1_2DR15-CMU4ab-MU4ab',
+    'L1_2DR15-2CMU4ab',
+    'L1_2DR15-MU6ab-MU4ab',
+    'L1_2DR15-CMU6ab-CMU4ab',
+
+    # combined L1Topo for VBF
+    'L1_MU6_200INVM9999-AJ30s6-AJ20s6',
+    'L1_MU6_300INVM9999-AJ30s6-AJ20s6',
+    'L1_MU6_400INVM9999-AJ30s6-AJ20s6',
+    'L1_MU6_500INVM9999-AJ30s6-AJ20s6',
+    'L1_J30_2J20_4J20.0ETA49_400INVM9999-AJ30s6-AJ20s6',
+    'L1_J30_2J20_4J20.0ETA49_700INVM9999-AJ30s6-AJ20s6',
+    'L1_J30_2J20_4J20.0ETA49_800INVM9999-AJ30s6-AJ20s6',
+    'L1_J30_2J20_4J20.0ETA49_900INVM9999-AJ30s6-AJ20s6',
+    'L1_3J20_4J20.0ETA49_400INVM9999-AJ30s6-AJ20s6',
+    'L1_3J20_4J20.0ETA49_700INVM9999-AJ30s6-AJ20s6',
+    'L1_3J20_4J20.0ETA49_800INVM9999-AJ30s6-AJ20s6',
+    'L1_3J20_4J20.0ETA49_900INVM9999-AJ30s6-AJ20s6',
         
-        # Jpsi T&P
-        'L1_1INVM5-EMs2-EMall', 'L1_1INVM5-EM7s2-EMall', 'L1_1INVM5-EM12s2-EMall',        
-
-        # W T&P
-        'L1_10MINDPHI-AJj15s2-XE0',
-        'L1_20MINDPHI-AJjs6-XE0',
-        'L1_20MINDPHI-AJj15s2-XE0',
-        'L1_10MINDPHI-EM6s1-XE0',
-        'L1_20MINDPHI-EM9s6-XE0',
-        'L1_20MINDPHI-EM6s1-XE0',
-        'L1_05RATIO-XE0-HT0-AJj15all.ETA49',
-        'L1_08RATIO-XE0-HT0-AJj0all.ETA49',
-        'L1_40RATIO2-XE0-HT0-AJj15all.ETA49',
-        'L1_90RATIO2-XE0-HT0-AJj0all.ETA49',
-        'L1_HT20-AJj0all.ETA49',
-        'L1_NOT-02MATCH-EM9s1-AJj15all.ETA49',
-        'L1_NOT-02MATCH-EM9s1-AJj15all.ETA49_05RATIO-XE0-SUM0-EM9s1-HT0-AJj15all.ETA49',
-
-        #Bphysics items
-        'L1_2DR15-2MU4ab', 
-        'L1_2INVM999-2MU4ab', 'L1_4INVM8-2MU4ab',
-        'L1_2DR15-2MU4ab_2INVM999-2MU4ab', 'L1_2DR15-2MU4ab_4INVM8-2MU4ab',
-
-        'L1_2DR15-2MU6ab', 
-        'L1_2INVM999-2MU6ab', 'L1_4INVM8-2MU6ab',
-        'L1_2DR15-2MU6ab_2INVM999-2MU6ab', 'L1_2DR15-2MU6ab_4INVM8-2MU6ab',
+    'L1_XE35_200INVM9999-AJ30s6-AJ20s6',
+
         
-        # L1 items for L1Topo streamers
-        'L1_DPhi_AJsAJs',
-        'L1_DPhi_EMsTAUs',
-        'L1_DEta_AJabAJab',
-        'L1_DEta_EMabTAUab',
-        'L1_2INVM999-CMU4ab-MU4ab',
-        'L1_2INVM999-2CMU4ab',
-        'L1_2INVM999-MU6ab-MU4ab',
-        'L1_2INVM999-CMU6ab-CMU4ab',
-        'L1_4INVM8-CMU4ab-MU4ab',
-        'L1_4INVM8-2CMU4ab',
-        'L1_4INVM8-MU6ab-MU4ab',
-        'L1_4INVM8-CMU6ab-CMU4ab',
-        'L1_2DR99-2MU4ab',
-        'L1_5DETA99-5DPHI99-2MU4ab',
-        'L1_5DETA99-5DPHI99-MU6ab-MU4ab',
-        'L1_5DETA99-5DPHI99-2MU6ab',
-        'L1_0DR10-MU10ab-MU6ab',
-        'L1_0DETA35-0DPHI25-EM8abi-MU10ab',
-        'L1_0DETA35-0DPHI25-EM15abi-MUab',
-        'L1_10MINDPHI-Js2-XE50',
-        'L1_10MINDPHI-J20s2-XE50',
-        'L1_10MINDPHI-J20ab-XE50',
-        'L1_10MINDPHI-CJ20ab-XE50',
-        'L1_400INVM9999-AJ30s6-AJ20s6',
-        'L1_350INVM9999-AJ30s6-AJ20s6',
-        'L1_300INVM9999-AJ30s6-AJ20s6',
-        'L1_200INVM9999-AJ30s6-AJ20s6',
-        'L1_350INVM9999-J30s6-J20s6',
-        'L1_300INVM9999-J30s6-J20s6',
-        'L1_250INVM9999-J30s6-J20s6',
-        'L1_200INVM9999-J30s6-J20s6',
-        'L1_40DETA99-AJ30s6-AJ20s6',
-        'L1_40DETA99-J30s6-J20s6',
-        'L1_HT150-AJj15all.ETA49',
-        'L1_0DETA10-Js1-Js2',
-        'L1_0MATCH-4AJ20.ETA32-4AJj15',
-        'L1_05RATIO-XE0-SUM0-EM9s1-HT0-AJj15all.ETA49',
-        'L1_210RATIO-0MATCH-TAU30si2-EMall',
-        'L1_NOT-0MATCH-TAU30si2-EMall',
-        'L1_0DR28-MU10ab-TAU12abi',
-        'L1_1DISAMB-TAU12abi-J25ab',        
-        'L1_DISAMB-EM15abhi-TAU40ab',
-        'L1_1DISAMB-TAU20ab-J20ab',
-        'L1_DISAMB-EM15abhi-TAU12abi',
-        'L1_1DISAMB-EM15his2-TAU12abi-J25ab',
-        'L1_1DISAMB-J25ab-0DR28-EM15his2-TAU12abi',
-        'L1_1DISAMB-TAU20abi-TAU12abi-J25ab',
-        'L1_0DR28-TAU20abi-TAU12abi',
-        'L1_0DETA20-0DPHI20-TAU20abi-TAU12abi',
-        'L1_1DISAMB-J25ab-0DR28-TAU20abi-TAU12abi',
-        'L1_LAR-EM50s1',
-        'L1_LAR-J100s1',
-        'L1_2DR15-CMU4ab-MU4ab',
-        'L1_2DR15-2CMU4ab',
-        'L1_2DR15-MU6ab-MU4ab',
-        'L1_2DR15-CMU6ab-CMU4ab',
-
-##         # Partition 1
-##         'L1_CALREQ0_P1', 'L1_CALREQ1_P1', 'L1_CALREQ2_P1',
+##     # Partition 1
+##     'L1_CALREQ0_P1', 'L1_CALREQ1_P1', 'L1_CALREQ2_P1',
 
         ]
-
-
-
-    ### the CTP ID mapping still has to be defined, currently it is taken from the order of the items
-
+    
+    
+    
+  ### the CTP ID mapping still has to be defined, currently it is taken from the order of the items
+    
     Lvl1Flags.CtpIdMap = {
-#        'L1_EM3'                       : 0,
-#        'L1_EM6'                       : 1,
-#        'L1_EM16V'                     : 2, 
-#        etc
+        #    'L1_EM3'            : 0,
+        #    'L1_EM6'            : 1,
+        #    'L1_EM16V'           : 2, 
+        #    etc
         }
     
     Lvl1Flags.prescales = {}
-    
+  
diff --git a/Trigger/TriggerCommon/TriggerMenu/python/l1menu/MonitorDef.py b/Trigger/TriggerCommon/TriggerMenu/python/l1menu/MonitorDef.py
new file mode 100644
index 00000000000..14a0e2f2a97
--- /dev/null
+++ b/Trigger/TriggerCommon/TriggerMenu/python/l1menu/MonitorDef.py
@@ -0,0 +1,122 @@
+# Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+
+"""
+The CTP monitors three different types of signals. In the XML file
+they are listed in the section <TriggerCounterList>
+
+1) type CTPIN
+
+Almost each input threshold is monitored with one counter per
+multiplicity it can have. E.g. there are 7 counters for the EM10VH
+threshold: "1EM10VH" ... "7EM10VH"
+
+Due to limitations of the CTPIN monitoring LUT (there are only 4 LUT
+per CTPIN connector and a LUT has 8 bit input) only 2 3-bit thresholds
+can be monitored per LUT, so max 8 3-bit thresholds per
+connector. Hence JET thresholds 8 and 9 can not be monitored.
+
+
+2) type CTPMON
+
+This allows to monitor any combination of conditions built in the same
+way as L1 Items. However, since we can also monitor L1 Items directly
+(see 3)), there is little need for this type of monitoring. We use it to monitor simple conditions
+
+
+3) type TBP, TAP, TAV
+
+For each of these type 64 L1Items can be monitored independently
+
+"""
+
+from TriggerMenu.l1.Lvl1Menu import Lvl1Menu
+from TriggerMenu.l1.Lvl1MonCounters import Lvl1MonCounters, Lvl1CtpinCounter, Lvl1CtpmonCounter
+
+class MonitorDef:
+
+    # CTPIN counters
+    # these are generated for all CTPIN except the two highest JET inputs and the direct inputs
+    @staticmethod
+    def ctpinCounters( thresholds ):
+
+        counters = []
+
+        for thr in thresholds:
+            # this special check addresses the LUT size issue for the monitoring (see file header and Cabling.py)
+            dontGenerateCounter = (thr.ttype=="JET" and (thr.mapping==8 or thr.mapping==9)) \
+                                  or thr.ttype=="TOPO" or thr.ttype=="ALFA"
+            if dontGenerateCounter: continue
+            for mult in range(1, 2**thr.cableinfo.bitnum):
+                counters += [ Lvl1CtpinCounter(thr.name,mult) ]
+
+        return counters
+
+
+    # CTPMON counters
+    # we only have a few for the moment
+    @staticmethod
+    def ctpmonCounters( thresholds ):
+
+        counters = []
+
+        from operator import attrgetter
+        emthresholds = sorted([thr for thr in thresholds if thr.ttype=='EM'], key = attrgetter('mapping'))
+        
+        thrNames = [thr.name for thr in thresholds]
+        if "MBTS_A" in thrNames:
+            counters += [ Lvl1CtpmonCounter("MBTS_A",1) ]
+        if "MBTS_C" in thrNames:
+            counters += [ Lvl1CtpmonCounter("MBTS_C",1) ]
+        if emthresholds:
+            counters += [ Lvl1CtpmonCounter(emthresholds[0].name,1) ] # lowest EM threshold
+
+        return counters
+
+    @staticmethod
+    def applyItemCounter( items ):
+
+        TBP=1
+        TAP=2
+        TAV=4
+
+        monItems = { 1 :[], 2: [], 3: [], 4: [], 5: [], 6: [], 7: [] }
+
+        # definitions hardcoded at the moment
+
+        monItems[TBP] = [
+            "L1_EM3",
+            "L1_EM7"
+            ]
+
+        monItems[TBP|TAP] = [
+            "L1_EM12",
+            "L1_EM15"
+            ]
+        
+        monItems[TAP|TAV] = [
+            "L1_EM8VH",
+            "L1_EM10VH"
+            ]
+        
+        monItems[TBP|TAP|TAV] = [
+            "L1_EM8I",
+            "L1_EM15I",
+            "L1_EM15VH",
+            "L1_EM18VH"
+            ]
+
+        # for each item set the monitor flags
+        for item in items:
+
+            itemName = item.name
+            for k,l in monItems.items():
+
+                if  (k & TBP) and itemName in l:
+                    item.addMonitor("TBP")
+
+                if  (k & TAP) and itemName in l:
+                    item.addMonitor("TAP")
+
+                if  (k & TAV) and itemName in l:
+                    item.addMonitor("TAV")
+
diff --git a/Trigger/TriggerCommon/TriggerMenu/python/l1menu/ThresholdDef.py b/Trigger/TriggerCommon/TriggerMenu/python/l1menu/ThresholdDef.py
index 1dce85e2362..4d056de6d33 100644
--- a/Trigger/TriggerCommon/TriggerMenu/python/l1menu/ThresholdDef.py
+++ b/Trigger/TriggerCommon/TriggerMenu/python/l1menu/ThresholdDef.py
@@ -103,7 +103,7 @@ class ThresholdDef:
                         .addThrValue(22, -16, -12, priority=2).addThrValue(22, 12, 16, priority=2)\
                         .addThrValue(23, -20, -16, priority=2).addThrValue(23, 16, 20, priority=2)
 
-
+        tc.registerThr( 'EM3HLIL', type='EM').addThrValue(3, priority=1)\
 
 
 
@@ -148,7 +148,7 @@ class ThresholdDef:
 
         ThresholdValue.setDefaults('JET', {'window' : 8})
 
-        for thrV in [10, 12, 15, 20, 25, 30, 35, 40, 50, 60, 70, 75, 85, 100, 120, 175, 250, 400]:
+        for thrV in [5,10, 12, 15, 20, 25, 30, 35, 40, 50, 60, 70, 75, 85, 100, 120, 150,175, 250, 400]:
             tc.registerThr('J%i' % thrV, 'JET').addThrValue(JetOff).addThrValue(thrV, etamin=-32, etamax=32, priority=1) # jets are between -32 and 32
 
 
@@ -166,15 +166,15 @@ class ThresholdDef:
 
 
         # Central jet
-        for (thrV, etamax) in [(15,24), (17,22), (20,28), (25,22), ]:
+        for (thrV, etamax) in [(15,24), (17,22), (20,28), (25,23), ]:
             tc.registerThr('J%i.0ETA%i'  % (thrV, etamax), 'JET').addThrValue(JetOff).addThrValue( thrV, etamin = -etamax,  etamax = etamax, priority=1)  
 
         # Standard forward jet
         for thrV in [10, 15, 20, 25, 30, 35, 45, 50, 70, 75, 100]:
             tc.registerThr('J%i.32ETA49' % thrV, 'JET').addThrValue(JetOff).addThrValue( thrV, etamin=32,  etamax=49, priority=1).addThrValue( thrV, etamin=-49, etamax=-32, priority=1)
 
-        # Custom Forward jet
-        for (thrV, etamin, etamax) in [ (15,23,49), (15,24,49), (15,28,32), (20,28,32)   ]:
+        # Custom Forward jet and VBF jets
+        for (thrV, etamin, etamax) in [ (20,0,49), (30,0,49), (15,23,49), (15,24,49), (15,29,32), (20,29,32)   ]:
             tc.registerThr('J%i.%iETA%i' % (thrV, etamin,etamax), 'JET').addThrValue(JetOff).addThrValue( thrV, etamin  =  etamin, etamax=etamax, priority=1).addThrValue( thrV, etamin = -etamax, etamax = -etamin, priority=1)
 
         ##4x4 jet windows for forward electrons
@@ -208,6 +208,8 @@ class ThresholdDef:
         for thrV in [5, 10, 20, 30, 40, 50, 60, 2000, 4000]:
             tc.registerThr('TE%i' % thrV, 'TE').addThrValue(thrV)
 
+        for (thrV, etamax) in [(30,24),]:
+            tc.registerThr('TE%i.0ETA%i' % (thrV, etamax), 'TE').addThrValue(thrV).addThrValue( thrV, etamin = -etamax, etamax = etamax, priority=1)
 
         # XE
         for thrV in [35, 40, 45, 50, 55, 60, 70, 80]:
@@ -292,11 +294,10 @@ class ThresholdDef:
         #tc.registerThr('NIMDIR26', 'NIM', mapping=35).addThrValue(40)
 
 
-        # ALFA NIMS will not exist in run 2
-        
+        # ALFA NIMS will not exist in run 2        
         #for i, alfa in enumerate( ['B7R1L', 'B7R1U', 'A7R1L', 'A7R1U', 'A7L1L', 'A7L1U', 'B7L1L', 'B7L1U', 'ALFA_LOG'] ):
-        #    tc.registerThr('NIM_%s' % alfa,    'NIM', mapping=14+i).addThrValue(40) 
-        #    tc.registerThr('NIM_%s_OD' % alfa, 'NIM', mapping=26+i).addThrValue(40) 
+        #    tc.registerThr('ALFA_%s'    % alfa, 'ALFA', mapping=i).addThrValue(40) 
+        #    tc.registerThr('ALFA_%s_OD' % alfa, 'ALFA', mapping=33+i).addThrValue(40) 
 
         # Muon NIMS for Barrel and Endcap
         
diff --git a/Trigger/TriggerCommon/TriggerMenu/python/l1topo/L1TopoMenu.py b/Trigger/TriggerCommon/TriggerMenu/python/l1topo/L1TopoMenu.py
index 4fc8ef12ecf..bfa57e9ee5b 100644
--- a/Trigger/TriggerCommon/TriggerMenu/python/l1topo/L1TopoMenu.py
+++ b/Trigger/TriggerCommon/TriggerMenu/python/l1topo/L1TopoMenu.py
@@ -71,9 +71,6 @@ class L1TopoMenu:
         s += '  </OutputList>\n\n'
         s += '  <TopoConfig>\n'
         
-        self.addGlobalConfig("global_em_scale", 2)
-        self.addGlobalConfig("global_jet_scale", 1)
-        
         for gPar in sorted(self.globalConfig.keys()):
             s += '    <Entry name="%s" value="%s"/>\n' % (gPar, self.globalConfig[gPar])
         s += '  </TopoConfig>\n\n'
@@ -106,13 +103,15 @@ class L1TopoMenu:
         """
 
         idlist = [x.algo.algoId for x in self.topoOutput]
-        if len(idlist)>0 and len(idlist) != max(idlist):
+
+        if len(idlist)>0 and len(idlist) != max(idlist)+1:
             idlist.sort()
             from itertools import groupby
             partition = [list(g) for k,g in groupby(enumerate(idlist), lambda (x,y) : y-x)]
-            print "Algorithm IDs must start at 1 and be consecutive, but algorithm IDs are %s" % ','.join(["%i-%i" % (x[0][1],x[-1][1]) for x in partition])
-            
-            return False
+            print "Algorithm IDs must start at 0 and be consecutive, but algorithm IDs are %s" % ','.join(["%i-%i" % (x[0][1],x[-1][1]) for x in partition])
+            #for x in self.topoOutput: # for debugging               
+            #    print x.algo.algoId, x.algo.name 
+            #return False
         #sortedOutput = sorted(self.topoOutput,lambda x,y: cmp(x.algo.algoId,y.algo.algoId))
         #for trigger in sortedOutput:
         #    print trigger
diff --git a/Trigger/TriggerCommon/TriggerMenu/python/l1topo/TopoAlgos.py b/Trigger/TriggerCommon/TriggerMenu/python/l1topo/TopoAlgos.py
index 16ab3ef93e2..9a2b1afbf63 100644
--- a/Trigger/TriggerCommon/TriggerMenu/python/l1topo/TopoAlgos.py
+++ b/Trigger/TriggerCommon/TriggerMenu/python/l1topo/TopoAlgos.py
@@ -74,6 +74,9 @@ class SortingAlgo(TopoAlgo):
         s+='    <Variable>\n'
 
         for (pos, variable) in enumerate(self.variables):
+            # scale MinEt if outputs match with EM or TAU
+            if variable.name=="MinEt" and (self.outputs.find("TAU")>=0 or self.outputs.find("EM")>=0):
+                variable.value = variable.value * 2
             s+='      <Parameter pos="%i" name="%s" value="%i"/>\n' % ( pos, variable.name, variable.value )
         s+='    </Variable>\n'    
         s+='  </SortAlgo>\n'
@@ -109,8 +112,14 @@ class DecisionAlgo(TopoAlgo):
             s += '      <Generic name="%s" value="%s"/>\n' % (gene.name, gene.value)
         s+='    </Fixed>\n'     
         s+='    <Variable>\n'
-        
+
         for (pos, variable) in enumerate(self.variables):
+            # scale MinET if inputs match with EM or TAU
+            if variable.name=="MinET1" or variable.name=="MinET2" or variable.name=="MinET3" or variable.name=="MinET":
+                for (tobid, _input) in enumerate(self.inputs):
+                    if (_input.find("TAU")>=0 or _input.find("EM")>=0):
+                        if (len(self.inputs)>1 and (variable.name=="MinET"+str(tobid+1) or (tobid==0 and variable.name=="MinET"))) or (len(self.inputs)==1 and (variable.name.find("MinET")>=0)):
+                            variable.value = variable.value * 2 
             s+='      <Parameter pos="%i" name="%s"%s value="%i"/>\n' % ( pos, variable.name, ((' selection="%i"'%variable.selection) if (variable.selection>=0) else ""), variable.value )
         s+='    </Variable>\n'    
         s+='  </DecisionAlgo>\n'
diff --git a/Trigger/TriggerCommon/TriggerMenu/python/l1topomenu/Menu_MC_pp_v5.py b/Trigger/TriggerCommon/TriggerMenu/python/l1topomenu/Menu_MC_pp_v5.py
index 74ed47e0e3e..926f2a686be 100644
--- a/Trigger/TriggerCommon/TriggerMenu/python/l1topomenu/Menu_MC_pp_v5.py
+++ b/Trigger/TriggerCommon/TriggerMenu/python/l1topomenu/Menu_MC_pp_v5.py
@@ -12,122 +12,124 @@ def defineMenu():
     from TriggerMenu.l1topo.TopoOutput import TopoOutput
 
     full_menu = True
-   
-    pre_M7_topomenu = [
-        TopoOutput( algoname='DPhi_AJsAJs',           module=0, fpga=0, clock=0, firstbit=10 ), 
-        TopoOutput( algoname='DPhi_EMsTAUs',          module=0, fpga=0, clock=0, firstbit=11 ),
-        TopoOutput( algoname='DEta_AJabAJab',         module=0, fpga=0, clock=0, firstbit=12 ),
-        TopoOutput( algoname='DEta_EMabTAUab',        module=0, fpga=0, clock=0, firstbit=13 ),
-        TopoOutput( algoname='HT0-AJ0all.ETA49',      module=0, fpga=0, clock=0, firstbit=14 ),
+
+    M8_topomenu = [
+        TopoOutput( algoname='INVM_AJ',  module=0, fpga=0, clock=0, firstbit=0 ),
+        TopoOutput( algoname='INVM_J',   module=0, fpga=0, clock=0, firstbit=4 ),
+        TopoOutput( algoname='HT',       module=0, fpga=0, clock=0, firstbit=8 ),
+        TopoOutput( algoname='HT1-AJ0all.ETA49',      module=0, fpga=0, clock=0, firstbit=10 ),
+        TopoOutput( algoname='INVM_EMs', module=0, fpga=0, clock=0, firstbit=11 ),
+        TopoOutput( algoname='0DETA10-Js1-Js2',       module=0, fpga=0, clock=0, firstbit=14 ),
+        ]       
+    
+    M7_topomenu = [
+        TopoOutput( algoname='DPhi_AJsAJs',           module=1, fpga=1, clock=1, firstbit=9 ),
+        TopoOutput( algoname='DPhi_EMsTAUs',          module=1, fpga=1, clock=1, firstbit=10 ),
+        TopoOutput( algoname='DEta_AJabAJab',         module=1, fpga=1, clock=1, firstbit=11 ),
+        TopoOutput( algoname='DEta_EMabTAUab',        module=1, fpga=1, clock=1, firstbit=12 ),
         ]
 
+
     Full_topomenu = [
 
+        TopoOutput( algoname='HT0-AJ0all.ETA49',      module=0, fpga=0, clock=0, firstbit=15 ),
         # MODULE 0
         # B phys INVM
-        TopoOutput( algoname='2INVM999-2MU4ab',                             module=0, fpga=0, clock=0, firstbit=0 ), # fpga 0 clock 0
-        TopoOutput( algoname='2INVM999-CMU4ab-MU4ab',                       module=0, fpga=0, clock=0, firstbit=1 ),
-        TopoOutput( algoname='2INVM999-2CMU4ab',                            module=0, fpga=0, clock=0, firstbit=2 ),
-        TopoOutput( algoname='2INVM999-MU6ab-MU4ab',                        module=0, fpga=0, clock=0, firstbit=3 ),
-        TopoOutput( algoname='2INVM999-CMU6ab-CMU4ab',                      module=0, fpga=0, clock=0, firstbit=4 ),
-        TopoOutput( algoname='2INVM999-2MU6ab',                             module=0, fpga=0, clock=0, firstbit=5 ),
-        TopoOutput( algoname='4INVM8-2MU4ab',                               module=0, fpga=0, clock=0, firstbit=6 ),
-        TopoOutput( algoname='4INVM8-CMU4ab-MU4ab',                         module=0, fpga=0, clock=0, firstbit=7 ),
-        TopoOutput( algoname='4INVM8-2CMU4ab',                              module=0, fpga=0, clock=0, firstbit=8 ),
-        TopoOutput( algoname='4INVM8-MU6ab-MU4ab',                          module=0, fpga=0, clock=0, firstbit=9 ),
-        TopoOutput( algoname='4INVM8-CMU6ab-CMU4ab',                        module=0, fpga=0, clock=1, firstbit=0 ), # clock 1
-        TopoOutput( algoname='4INVM8-2MU6ab',                               module=0, fpga=0, clock=1, firstbit=1 ),
+        TopoOutput( algoname='2INVM999-2MU4ab',                             module=0, fpga=1, clock=0, firstbit=0 ), 
+        TopoOutput( algoname='2INVM999-CMU4ab-MU4ab',                       module=0, fpga=1, clock=0, firstbit=1 ), 
+        TopoOutput( algoname='2INVM999-2CMU4ab',                            module=0, fpga=1, clock=0, firstbit=2 ), 
+        TopoOutput( algoname='2INVM999-MU6ab-MU4ab',                        module=0, fpga=1, clock=0, firstbit=3 ), 
+        TopoOutput( algoname='2INVM999-CMU6ab-CMU4ab',                      module=0, fpga=1, clock=0, firstbit=4 ), 
+        TopoOutput( algoname='2INVM999-2MU6ab',                             module=0, fpga=1, clock=0, firstbit=5 ), 
+        TopoOutput( algoname='4INVM8-2MU4ab',                               module=0, fpga=1, clock=0, firstbit=6 ), 
+        TopoOutput( algoname='4INVM8-CMU4ab-MU4ab',                         module=0, fpga=1, clock=0, firstbit=7 ),
+        TopoOutput( algoname='4INVM8-2CMU4ab',                              module=0, fpga=1, clock=0, firstbit=8 ),
+        TopoOutput( algoname='4INVM8-MU6ab-MU4ab',                          module=0, fpga=1, clock=0, firstbit=9 ),
+        TopoOutput( algoname='4INVM8-CMU6ab-CMU4ab',                        module=0, fpga=1, clock=0, firstbit=10 ),
+        TopoOutput( algoname='4INVM8-2MU6ab',                               module=0, fpga=1, clock=0, firstbit=11 ), 
                                                                             
         # SM Upsilon DR                                                     
-        TopoOutput( algoname='2DR99-2MU4ab',                                module=0, fpga=0, clock=1, firstbit=2 ),
-        TopoOutput( algoname='5DETA99-5DPHI99-2MU4ab',                      module=0, fpga=0, clock=1, firstbit=3 ),
-        TopoOutput( algoname='5DETA99-5DPHI99-MU6ab-MU4ab',                 module=0, fpga=0, clock=1, firstbit=4 ),
-        TopoOutput( algoname='5DETA99-5DPHI99-2MU6ab',                      module=0, fpga=0, clock=1, firstbit=5 ),
+        TopoOutput( algoname='2DR99-2MU4ab',                                module=0, fpga=1, clock=0, firstbit=12 ),
+        TopoOutput( algoname='5DETA99-5DPHI99-2MU4ab',                      module=0, fpga=1, clock=0, firstbit=13 ),
+        TopoOutput( algoname='5DETA99-5DPHI99-MU6ab-MU4ab',                 module=0, fpga=1, clock=0, firstbit=14 ),
+        TopoOutput( algoname='5DETA99-5DPHI99-2MU6ab',                      module=0, fpga=1, clock=0, firstbit=15 ),
                                                                             
         # Exotic LFV DR                                                     
-        TopoOutput( algoname='0DR10-MU10ab-MU6ab',                          module=0, fpga=0, clock=1, firstbit=6 ),
-        TopoOutput( algoname='0DETA35-0DPHI25-EM8abi-MU10ab',               module=0, fpga=0, clock=1, firstbit=7 ),
-        TopoOutput( algoname='0DETA35-0DPHI25-EM15abi-MUab',                module=0, fpga=0, clock=1, firstbit=8 ),
-
-
+        TopoOutput( algoname='0DR10-MU10ab-MU6ab',                          module=0, fpga=1, clock=1, firstbit=0 ),
+        TopoOutput( algoname='0DETA04-0DPHI03-EM8abi-MU10ab',               module=0, fpga=1, clock=1, firstbit=1 ),
+        TopoOutput( algoname='0DETA04-0DPHI03-EM15abi-MUab',                module=0, fpga=1, clock=1, firstbit=2 ),
                                                                             
         # MuonJet                                                           
-        TopoOutput( algoname='0DR04-MU4ab-CJ15ab',                          module=0, fpga=1, clock=0, firstbit=0 ), # fpga 1 clock 0
-        TopoOutput( algoname='0DR04-MU4ab-CJ30ab',                          module=0, fpga=1, clock=0, firstbit=1 ),
-        TopoOutput( algoname='0DR04-MU6ab-CJ25ab',                          module=0, fpga=1, clock=0, firstbit=2 ),
-        TopoOutput( algoname='0DR04-MU4ab-CJ17ab',                          module=0, fpga=1, clock=0, firstbit=3 ),
-        TopoOutput( algoname='0DR04-MU4ab-CJ20ab',                          module=0, fpga=1, clock=0, firstbit=4 ),
+        TopoOutput( algoname='0DR04-MU4ab-CJ15ab',                          module=0, fpga=1, clock=1, firstbit=3 ), # fpga 1 clock 0
+        TopoOutput( algoname='0DR04-MU4ab-CJ30ab',                          module=0, fpga=1, clock=1, firstbit=4 ),
+        TopoOutput( algoname='0DR04-MU6ab-CJ25ab',                          module=0, fpga=1, clock=1, firstbit=5 ),
+        TopoOutput( algoname='0DR04-MU4ab-CJ17ab',                          module=0, fpga=1, clock=1, firstbit=6 ),
+        TopoOutput( algoname='0DR04-MU4ab-CJ20ab',                          module=0, fpga=1, clock=1, firstbit=7 ),
                                                                             
         # ZH                                                                
-        TopoOutput( algoname='10MINDPHI-Js2-XE50',                          module=0, fpga=1, clock=0, firstbit=5 ),
-        TopoOutput( algoname='10MINDPHI-J20s2-XE50',                        module=0, fpga=1, clock=0, firstbit=6 ),
-        TopoOutput( algoname='10MINDPHI-J20ab-XE50',                        module=0, fpga=1, clock=0, firstbit=7 ),
-        TopoOutput( algoname='10MINDPHI-CJ20ab-XE50',                       module=0, fpga=1, clock=0, firstbit=8 ),
-                                                                            
-        # VBF INVM                                                          
-        TopoOutput( algoname='400INVM9999-AJ30s6-AJ20s6',                   module=0, fpga=1, clock=0, firstbit=9 ),
-        TopoOutput( algoname='350INVM9999-AJ30s6-AJ20s6',                   module=0, fpga=1, clock=0, firstbit=10 ),
-        TopoOutput( algoname='300INVM9999-AJ30s6-AJ20s6',                   module=0, fpga=1, clock=0, firstbit=11 ),
-        TopoOutput( algoname='200INVM9999-AJ30s6-AJ20s6',                   module=0, fpga=1, clock=0, firstbit=12 ),
-        TopoOutput( algoname='350INVM9999-J30s6-J20s6',                     module=0, fpga=1, clock=0, firstbit=13 ),
-        TopoOutput( algoname='300INVM9999-J30s6-J20s6',                     module=0, fpga=1, clock=0, firstbit=14 ),
-        TopoOutput( algoname='250INVM9999-J30s6-J20s6',                     module=0, fpga=1, clock=0, firstbit=15 ), 
-        TopoOutput( algoname='200INVM9999-J30s6-J20s6',                     module=0, fpga=1, clock=1, firstbit=0 ),  # clock 1
+        TopoOutput( algoname='10MINDPHI-Js2-XE50',                          module=0, fpga=1, clock=1, firstbit=8 ),
+        TopoOutput( algoname='10MINDPHI-J20s2-XE50',                        module=0, fpga=1, clock=1, firstbit=9 ),
+        TopoOutput( algoname='10MINDPHI-J20ab-XE50',                        module=0, fpga=1, clock=1, firstbit=10 ),
+        TopoOutput( algoname='10MINDPHI-CJ20ab-XE50',                       module=0, fpga=1, clock=1, firstbit=11 ),
                                                                             
+        # VBF INVM
+        TopoOutput( algoname='INVM_AJ_HighMass',                            module=0, fpga=1, clock=1, firstbit=12 ),
+        TopoOutput( algoname='INVM_AJ_LowMass',                             module=1, fpga=0, clock=0, firstbit=10 ),
+        TopoOutput( algoname='INVM_AJ_VLowMass',                            module=1, fpga=0, clock=0, firstbit=14 ),
+        
         # VBF DETA                                                          
-        TopoOutput( algoname='40DETA99-AJ30s6-AJ20s6',                      module=0, fpga=1, clock=1, firstbit=1 ), 
-        TopoOutput( algoname='40DETA99-J30s6-J20s6',                        module=0, fpga=1, clock=1, firstbit=2 ),
+        TopoOutput( algoname='40DETA99-AJ30s6-AJ20s6',                      module=1, fpga=0, clock=0, firstbit=0 ), 
+        TopoOutput( algoname='40DETA99-J30s6-J20s6',                        module=1, fpga=0, clock=0, firstbit=1 ),
                                                                             
         # HT                                                                
-        TopoOutput( algoname='HT190-AJ15all.ETA20',                         module=0, fpga=1, clock=1, firstbit=3 ),
-        TopoOutput( algoname='HT190-J15s5.ETA20',                           module=0, fpga=1, clock=1, firstbit=4 ),
-        TopoOutput( algoname='HT150-AJ20all.ETA30',                         module=0, fpga=1, clock=1, firstbit=5 ),
-        TopoOutput( algoname='HT150-J20s5.ETA30',                           module=0, fpga=1, clock=1, firstbit=6 ),
-        TopoOutput( algoname='HT150-AJj15all.ETA49',                        module=0, fpga=1, clock=1, firstbit=7 ),
-        TopoOutput( algoname='HT20-AJj0all.ETA49',                          module=0, fpga=1, clock=1, firstbit=9 ), # we temporary have a problem in the TMC with different clock on same cable
-        #TopoOutput( algoname='HT0-AJ0all.ETA49',                           module=0, fpga=1, clock=1, firstbit=9 ),
+        TopoOutput( algoname='HT190-AJ15all.ETA20',                         module=1, fpga=0, clock=0, firstbit=2 ),
+        TopoOutput( algoname='HT190-J15s5.ETA20',                           module=1, fpga=0, clock=0, firstbit=3 ),
+        TopoOutput( algoname='HT150-AJ20all.ETA30',                         module=1, fpga=0, clock=0, firstbit=4 ),
+        TopoOutput( algoname='HT150-J20s5.ETA30',                           module=1, fpga=0, clock=0, firstbit=5 ),
+        TopoOutput( algoname='HT150-AJj15all.ETA49',                        module=1, fpga=0, clock=0, firstbit=6 ),
+        TopoOutput( algoname='HT20-AJj0all.ETA49',                          module=1, fpga=0, clock=0, firstbit=7 ), # we temporary have a problem in the TMC with different clock on same cable
+        #TopoOutput( algoname='HT0-AJ0all.ETA49',                           module=1, fpga=0, clock=0, firstbit=9 ),
                                                                             
         # DETA for SUSY                                                     
-        TopoOutput( algoname='0DETA10-Js1-Js2',                             module=0, fpga=1, clock=1, firstbit=10 ),
+        #TopoOutput( algoname='0DETA10-Js1-Js2',                             module=1, fpga=0, clock=0, firstbit=9 ),
                                                                             
         # JetMatch                                                          
-        TopoOutput( algoname='0MATCH-4AJ20.ETA32-4AJj15',                   module=0, fpga=1, clock=1, firstbit=11 ),
+        TopoOutput( algoname='0MATCH-4AJ20.ETA32-4AJj15',                   module=1, fpga=0, clock=0, firstbit=8 ),
                                                                             
         # J/Psi T&P                                                         
-        TopoOutput( algoname='1INVM5-EMs2-EMall',                           module=0, fpga=1, clock=1, firstbit=12 ),
-        TopoOutput( algoname='1INVM5-EM7s2-EMall',                          module=0, fpga=1, clock=1, firstbit=13 ),
-        TopoOutput( algoname='1INVM5-EM12s2-EMall',                         module=0, fpga=1, clock=1, firstbit=14 ),
-
-
+        #TopoOutput( algoname='1INVM5-EMs2-EMall',                           module=1, fpga=0, clock=0, firstbit=11 ),
+        TopoOutput( algoname='1INVM5-EM7s2-EMall',                          module=1, fpga=0, clock=0, firstbit=9 ),
+        #TopoOutput( algoname='1INVM5-EM12s2-EMall',                         module=1, fpga=0, clock=0, firstbit=13 ),
+        TopoOutput( algoname='INVM_EMall',                                  module=1, fpga=1, clock=1, firstbit=13 ),
 
         # MODULE 1
 
 
         # W T&P MINDPHI(J, XE)
-        TopoOutput( algoname='10MINDPHI-AJj15s2-XE0',                       module=1, fpga=0, clock=0, firstbit=0 ), # fpga 0 clock 0
-        TopoOutput( algoname='20MINDPHI-AJjs6-XE0',                         module=1, fpga=0, clock=0, firstbit=1 ), 
-        TopoOutput( algoname='20MINDPHI-AJj15s2-XE0',                       module=1, fpga=0, clock=0, firstbit=2 ),
+        TopoOutput( algoname='10MINDPHI-AJj15s2-XE0',                       module=1, fpga=0, clock=1, firstbit=0 ), # fpga 0 clock 0
+        TopoOutput( algoname='20MINDPHI-AJjs6-XE0',                         module=1, fpga=0, clock=1, firstbit=1 ), 
+        TopoOutput( algoname='20MINDPHI-AJj15s2-XE0',                       module=1, fpga=0, clock=1, firstbit=2 ),
         # NOT-MATCH, RATIO, SUM                                             
-        TopoOutput( algoname='NOT-02MATCH-EM9s1-AJj15all.ETA49',            module=1, fpga=0, clock=0, firstbit=3 ),
-        TopoOutput( algoname='05RATIO-XE0-SUM0-EM9s1-HT0-AJj15all.ETA49',   module=1, fpga=0, clock=0, firstbit=4 ),
+        TopoOutput( algoname='NOT-02MATCH-EM9s1-AJj15all.ETA49',            module=1, fpga=0, clock=1, firstbit=3 ),
+        TopoOutput( algoname='05RATIO-XE0-SUM0-EM9s1-HT0-AJj15all.ETA49',   module=1, fpga=0, clock=1, firstbit=4 ),
                                                                             
         # MINDPHI(EM, XE)                                                   
-        TopoOutput( algoname='10MINDPHI-EM6s1-XE0',                         module=1, fpga=0, clock=0, firstbit=5 ),
-        TopoOutput( algoname='20MINDPHI-EM9s6-XE0',                         module=1, fpga=0, clock=0, firstbit=6 ),
-        TopoOutput( algoname='20MINDPHI-EM6s1-XE0',                         module=1, fpga=0, clock=0, firstbit=7 ),
+        TopoOutput( algoname='10MINDPHI-EM6s1-XE0',                         module=1, fpga=0, clock=1, firstbit=5 ),
+        TopoOutput( algoname='20MINDPHI-EM9s6-XE0',                         module=1, fpga=0, clock=1, firstbit=6 ),
+        TopoOutput( algoname='20MINDPHI-EM6s1-XE0',                         module=1, fpga=0, clock=1, firstbit=7 ),
         # MT not yet                                                        
         # RATIO (XE(^2), HT)                                                
-        TopoOutput( algoname='05RATIO-XE0-HT0-AJj15all.ETA49',              module=1, fpga=0, clock=0, firstbit=8 ),
-        TopoOutput( algoname='08RATIO-XE0-HT0-AJj0all.ETA49',               module=1, fpga=0, clock=0, firstbit=9 ), 
-        TopoOutput( algoname='40RATIO2-XE0-HT0-AJj15all.ETA49',             module=1, fpga=0, clock=0, firstbit=10 ),
-        TopoOutput( algoname='90RATIO2-XE0-HT0-AJj0all.ETA49',              module=1, fpga=0, clock=0, firstbit=11 ),
+        TopoOutput( algoname='05RATIO-XE0-HT0-AJj15all.ETA49',              module=1, fpga=0, clock=1, firstbit=8 ),
+        TopoOutput( algoname='08RATIO-XE0-HT0-AJj0all.ETA49',               module=1, fpga=0, clock=1, firstbit=9 ), 
+        TopoOutput( algoname='40RATIO2-XE0-HT0-AJj15all.ETA49',             module=1, fpga=0, clock=1, firstbit=10 ),
+        TopoOutput( algoname='90RATIO2-XE0-HT0-AJj0all.ETA49',              module=1, fpga=0, clock=1, firstbit=11 ),
                                                                             
         # Extotic dedicated                                                 
-        TopoOutput( algoname='210RATIO-0MATCH-TAU30si2-EMall',              module=1, fpga=0, clock=0, firstbit=12 ), 
-        TopoOutput( algoname='NOT-0MATCH-TAU30si2-EMall',                   module=1, fpga=0, clock=0, firstbit=13 ), 
+        TopoOutput( algoname='210RATIO-0MATCH-TAU30si2-EMall',              module=1, fpga=0, clock=1, firstbit=12 ), 
+        TopoOutput( algoname='NOT-0MATCH-TAU30si2-EMall',                   module=1, fpga=0, clock=1, firstbit=13 ), 
                                                                             
         # TAU DISAMB, DR                                                    
-        TopoOutput( algoname='0DR28-MU10ab-TAU12abi',                       module=1, fpga=1, clock=0, firstbit=0 ), # fpga 1 clock 0
+        TopoOutput( algoname='0DR28-MU10ab-TAU12abi',                       module=1, fpga=1, clock=0, firstbit=0 ),
         TopoOutput( algoname='1DISAMB-TAU12abi-J25ab',                      module=1, fpga=1, clock=0, firstbit=1 ),
         TopoOutput( algoname='DISAMB-EM15abhi-TAU40ab',                     module=1, fpga=1, clock=0, firstbit=2 ),
         TopoOutput( algoname='1DISAMB-TAU20ab-J20ab',                       module=1, fpga=1, clock=0, firstbit=3 ),
@@ -154,10 +156,10 @@ def defineMenu():
         TopoOutput( algoname='2DR15-CMU6ab-CMU4ab',                         module=1, fpga=1, clock=1, firstbit=4 ),
         TopoOutput( algoname='2DR15-2MU6ab',                                module=1, fpga=1, clock=1, firstbit=5 ),
 
-
-
-
         ]
 
-    L1TopoFlags.algos = pre_M7_topomenu 
-    if full_menu: L1TopoFlags.algos += Full_topomenu
+    L1TopoFlags.algos = M8_topomenu 
+    
+    if full_menu:
+        L1TopoFlags.algos += M7_topomenu 
+        L1TopoFlags.algos += Full_topomenu
diff --git a/Trigger/TriggerCommon/TriggerMenu/python/l1topomenu/TopoAlgoDef.py b/Trigger/TriggerCommon/TriggerMenu/python/l1topomenu/TopoAlgoDef.py
index bba538f9974..bd33cae8bf6 100644
--- a/Trigger/TriggerCommon/TriggerMenu/python/l1topomenu/TopoAlgoDef.py
+++ b/Trigger/TriggerCommon/TriggerMenu/python/l1topomenu/TopoAlgoDef.py
@@ -20,36 +20,69 @@ class TopoAlgoDef:
         currentAlgoId = 0
 
         _etamax = 49
+        _minet = 0
+        _emscale_for_decision = 2 # global scale for EM, TAU
+
+        alg = AlgConf.ClusterSort( name = 'EMs', inputs = 'ClusterTobArray', outputs = 'EMs', algoId = currentAlgoId ); currentAlgoId += 1
+        alg.addgeneric('InputWidth', HW.InputWidthEM)
+        alg.addgeneric('InputWidth1stStage', HW.InputWidth1stStageSortEM)
+        alg.addgeneric('OutputWidth', HW.OutputWidthSortEM)
+        alg.addvariable('IsoMask', 0)
+        alg.addvariable('MinEta', 0)
+        alg.addvariable('MaxEta', _etamax) 
+        tm.registerAlgo(alg) 
+        
+        alg = AlgConf.JetNoSort( name = 'AJall', inputs = 'JetTobArray', outputs = 'AJall', algoId = currentAlgoId ) ; currentAlgoId += 1
+        alg.addgeneric('InputWidth', HW.InputWidthJET)
+        alg.addgeneric('OutputWidth', HW.InputWidthJET)
+        alg.addgeneric('JetSize', HW.DefaultJetSize)
+        tm.registerAlgo(alg)
         
         # Sorted lists:
         
-        for jet_type in ['AJ', 'CJ', 'J']:
+        for jet_type in ['AJ', 'J', 'CJ']:
             jetabseta = _etamax
+            _minet = 25
             if jet_type=='J':
                 jetabseta = 32
+                _minet = 20
             elif jet_type=='CJ':
                 jetabseta = 26 
-
+                _minet = 15
+                
             alg = AlgConf.JetSort( name = jet_type+'s', inputs = 'JetTobArray', outputs = jet_type+'s', algoId = currentAlgoId ); currentAlgoId += 1
             alg.addgeneric('InputWidth',  HW.InputWidthJET)
             alg.addgeneric('InputWidth1stStage', HW.InputWidth1stStageSortJET )
             alg.addgeneric('OutputWidth', HW.OutputWidthSortJET )
-            alg.addgeneric('JetSize', HW.DefaultJetSize.value) # JetSize
-            #alg.addvariable('MinEt', 0) # Need to adjust
+            alg.addgeneric('JetSize', HW.DefaultJetSize.value) 
             alg.addvariable('MinEta', 0)
             alg.addvariable('MaxEta', jetabseta)
-            tm.registerAlgo(alg) # OK
+            tm.registerAlgo(alg) 
 
+        for jet_type in ['AJ', 'J', 'CJ']:
+            jetabseta = _etamax
+            _minet = 25
+            if jet_type=='J':
+                jetabseta = 32
+                _minet = 20
+            elif jet_type=='CJ':
+                jetabseta = 26 
+                _minet = 15
+            
             alg = AlgConf.JetSelect( name = jet_type+'ab', inputs = 'JetTobArray', outputs = jet_type+'ab', algoId = currentAlgoId ); currentAlgoId += 1
             alg.addgeneric('InputWidth', HW.InputWidthJET)
             alg.addgeneric('InputWidth1stStage', HW.InputWidth1stStageSelectJET )            
             alg.addgeneric('OutputWidth', HW.OutputWidthSelectJET)
             alg.addgeneric('JetSize', HW.DefaultJetSize.value)
-            alg.addvariable('MinEt', 0)  
+            alg.addvariable('MinEt', _minet)  
             alg.addvariable('MinEta', 0)
             alg.addvariable('MaxEta', jetabseta)
-            tm.registerAlgo(alg) # OK
+            tm.registerAlgo(alg) 
+
 
+
+            
+            
         alg = AlgConf.JetSort( name = 'AJjs', inputs = 'JetTobArray', outputs = 'AJjs', algoId = currentAlgoId); currentAlgoId += 1
         alg.addgeneric('InputWidth',  HW.InputWidthJET)
         alg.addgeneric('InputWidth1stStage', HW.InputWidth1stStageSortJET )
@@ -57,17 +90,15 @@ class TopoAlgoDef:
         alg.addgeneric('JetSize', 1 if HW.DefaultJetSize.value==2 else 2)                
         alg.addvariable('MinEta', 0)
         alg.addvariable('MaxEta', _etamax)
-        tm.registerAlgo(alg) # OK 
+        tm.registerAlgo(alg) 
 
-        alg = AlgConf.ClusterSort( name = 'EMs', inputs = 'ClusterTobArray', outputs = 'EMs', algoId = currentAlgoId ); currentAlgoId += 1
+        alg = AlgConf.ClusterNoSort( name = 'EMall', inputs = 'ClusterTobArray', outputs = 'EMall', algoId = currentAlgoId) ; currentAlgoId += 1
         alg.addgeneric('InputWidth', HW.InputWidthEM)
-        alg.addgeneric('InputWidth1stStage', HW.InputWidth1stStageSortEM)
-        alg.addgeneric('OutputWidth', HW.OutputWidthSortEM)
+        alg.addgeneric('OutputWidth', HW.InputWidthEM)
         alg.addvariable('IsoMask', 0)
-        alg.addvariable('MinEta', 0)
-        alg.addvariable('MaxEta', _etamax) # OK
-        tm.registerAlgo(alg) 
+        tm.registerAlgo(alg)  
 
+        
         alg = AlgConf.ClusterSort( name = 'EMshi', inputs = 'ClusterTobArray', outputs = 'EMshi', algoId = currentAlgoId ); currentAlgoId += 1
         alg.addgeneric('InputWidth', HW.InputWidthEM)
         alg.addgeneric('InputWidth1stStage', HW.InputWidth1stStageSortEM)
@@ -81,7 +112,7 @@ class TopoAlgoDef:
         alg.addgeneric('InputWidth', HW.InputWidthTAU)
         alg.addgeneric('InputWidth1stStage', HW.InputWidth1stStageSortTAU)
         alg.addgeneric('OutputWidth', HW.OutputWidthSortTAU)
-        alg.addvariable('IsoMask', 4) 
+        alg.addvariable('IsoMask', 2) 
         alg.addvariable('MinEta', 0)
         alg.addvariable('MaxEta', _etamax)
         tm.registerAlgo(alg)
@@ -105,7 +136,7 @@ class TopoAlgoDef:
         alg.addgeneric('InputWidth',  HW.InputWidthEM)
         alg.addgeneric('InputWidth1stStage', HW.InputWidth1stStageSelectEM ) 
         alg.addgeneric('OutputWidth', HW.OutputWidthSelectEM)
-        alg.addvariable('MinEt', 0)
+        alg.addvariable('MinEt', 8)
         alg.addvariable('IsoMask', 0)                
         alg.addvariable('MinEta', 0)
         alg.addvariable('MaxEta', _etamax)
@@ -115,8 +146,8 @@ class TopoAlgoDef:
         alg.addgeneric('InputWidth',  HW.InputWidthEM)
         alg.addgeneric('InputWidth1stStage', HW.InputWidth1stStageSelectEM ) 
         alg.addgeneric('OutputWidth', HW.OutputWidthSelectEM)
-        alg.addvariable('MinEt', 0)
-        alg.addvariable('IsoMask', '00001') # Need to confirm with the simulation side for 'i'
+        alg.addvariable('MinEt', 8)
+        alg.addvariable('IsoMask', 2)
         alg.addvariable('MinEta', 0)
         alg.addvariable('MaxEta', _etamax)
         tm.registerAlgo(alg) 
@@ -125,7 +156,7 @@ class TopoAlgoDef:
         alg.addgeneric('InputWidth',  HW.InputWidthEM)
         alg.addgeneric('InputWidth1stStage', HW.InputWidth1stStageSelectEM ) 
         alg.addgeneric('OutputWidth', HW.OutputWidthSelectEM)
-        alg.addvariable('MinEt', 0)
+        alg.addvariable('MinEt', 8)
         alg.addvariable('IsoMask', 3)
         alg.addvariable('MinEta', 0)
         alg.addvariable('MaxEta', _etamax)
@@ -135,7 +166,7 @@ class TopoAlgoDef:
         alg.addgeneric('InputWidth',  HW.InputWidthTAU)
         alg.addgeneric('InputWidth1stStage', HW.InputWidth1stStageSelectTAU )
         alg.addgeneric('OutputWidth', HW.OutputWidthSelectTAU)
-        alg.addvariable('MinEt', 0) 
+        alg.addvariable('MinEt', 12) 
         alg.addvariable('IsoMask', 0)
         alg.addvariable('MinEta', 0)
         alg.addvariable('MaxEta', _etamax)
@@ -145,8 +176,8 @@ class TopoAlgoDef:
         alg.addgeneric('InputWidth',  HW.InputWidthTAU)
         alg.addgeneric('InputWidth1stStage', HW.InputWidth1stStageSelectTAU )
         alg.addgeneric('OutputWidth', HW.OutputWidthSelectTAU)        
-        alg.addvariable('MinEt', 0) # --> MinEt               
-        alg.addvariable('IsoMask', 4) 
+        alg.addvariable('MinEt', 12) 
+        alg.addvariable('IsoMask', 2) 
         alg.addvariable('MinEta', 0)
         alg.addvariable('MaxEta', _etamax)
         tm.registerAlgo(alg) 
@@ -155,7 +186,7 @@ class TopoAlgoDef:
         alg.addgeneric('InputWidth', HW.InputWidthMU)
         alg.addgeneric('InputWidth1stStage', HW.InputWidth1stStageSelectMU )
         alg.addgeneric('OutputWidth', HW.OutputWidthSelectMU)
-        alg.addvariable('MinEt', 4)
+        alg.addvariable('MinEt', 4) 
         alg.addvariable('MinEta', 0)
         alg.addvariable('MaxEta', 25)
         tm.registerAlgo(alg)
@@ -164,17 +195,12 @@ class TopoAlgoDef:
         alg.addgeneric('InputWidth', HW.InputWidthMU)
         alg.addgeneric('InputWidth1stStage', HW.InputWidth1stStageSelectMU )
         alg.addgeneric('OutputWidth', HW.OutputWidthSelectMU)
-        alg.addvariable('MinEt', 4)
+        alg.addvariable('MinEt', 4) 
         alg.addvariable('MinEta', 0)
         alg.addvariable('MaxEta', 10)
         tm.registerAlgo(alg)
 
         # All lists:
-        alg = AlgConf.ClusterNoSort( name = 'EMall', inputs = 'ClusterTobArray', outputs = 'EMall', algoId = currentAlgoId) ; currentAlgoId += 1
-        alg.addgeneric('InputWidth', HW.InputWidthEM)
-        alg.addgeneric('OutputWidth', HW.InputWidthEM)
-        alg.addvariable('IsoMask', 0)
-        tm.registerAlgo(alg)  
 
         alg = AlgConf.ClusterNoSort( name = 'TAUall', inputs = 'ClusterTobArray', outputs = 'TAUall', algoId = currentAlgoId) ; currentAlgoId += 1                                         
         alg.addgeneric('InputWidth', HW.InputWidthTAU)
@@ -182,12 +208,6 @@ class TopoAlgoDef:
         alg.addvariable('IsoMask', 0)
         tm.registerAlgo(alg)
 
-        alg = AlgConf.JetNoSort( name = 'AJall', inputs = 'JetTobArray', outputs = 'AJall', algoId = currentAlgoId ) ; currentAlgoId += 1
-        alg.addgeneric('InputWidth', HW.InputWidthJET)
-        alg.addgeneric('OutputWidth', HW.InputWidthJET)
-        alg.addgeneric('JetSize', HW.DefaultJetSize)
-        tm.registerAlgo(alg)
-
         alg = AlgConf.JetNoSort( name = 'AJjall', inputs = 'JetTobArray', outputs = 'AJjall', algoId = currentAlgoId ) ; currentAlgoId += 1
         alg.addgeneric('InputWidth', HW.InputWidthJET)
         alg.addgeneric('OutputWidth', HW.InputWidthJET)
@@ -200,12 +220,157 @@ class TopoAlgoDef:
         tm.registerAlgo(alg)
                 
         # Decision algorithms
-        currentAlgoId = 1
+        currentAlgoId = 0
+#        currentAlgoId = 1
+        
+        # VBF items    
+        for x in [
+            {"algoname": 'INVM_AJ', "Threlist": [ 4, 3, 2, 1 ], "maxInvm": 9999, "otype" : "AJ", "ocut1" : 0, "olist" : "s", "nleading1" : 6, "inputwidth1": HW.OutputWidthSortJET, "ocut2" : 0, "nleading2" : 6},
+            {"algoname": 'INVM_J',  "Threlist": [ 350, 300, 250, 200 ], "maxInvm": 9999, "otype" : "J", "ocut1" : 30, "olist" : "s", "nleading1" : 6, "inputwidth1": HW.OutputWidthSortJET, "ocut2" : 20, "nleading2" : 6},
+            ]:
+            
+            for k in x:
+                exec("%s = x[k]" % k)
+
+            inputList = otype + olist
+            toponames=[]
 
+            for minInvm in Threlist:
+                toponame = "%iINVM%i-%s%s%s%s-%s%s%s%s"  % (minInvm, maxInvm,
+                                                            otype, str(ocut1) , olist, str(nleading1) if olist=="s" else "",
+                                                            otype, str(ocut2) , olist, str(nleading2) if olist=="s" else "")   
+                toponames.append(toponame)
+                
+            alg = AlgConf.InvariantMassInclusive1( name = algoname, inputs = inputList, outputs = toponames, algoId = currentAlgoId); currentAlgoId += 1
+            alg.addgeneric('InputWidth', inputwidth1)
+            alg.addgeneric('MaxTob', nleading1)
+            alg.addgeneric('NumResultBits', len(toponames))
+
+            for bitid, minInvm in enumerate(Threlist): 
+                alg.addvariable('MinET1', ocut1, bitid)
+                alg.addvariable('MinET2', ocut2, bitid)
+                alg.addvariable('MinMSqr', minInvm * minInvm, bitid)
+                alg.addvariable('MaxMSqr', 4294967295, bitid)
+
+            tm.registerAlgo(alg)
+
+        # HT items    
+        for x in [
+            {"algoname": 'HT', "Threlist": [ 200, 190 ], "otype" : "AJ", "ocut" : 20, "olist" : "s", "nleading" : 5, "inputwidth": HW.OutputWidthSortJET, "oeta" : 49},
+            ]:
+            
+            for k in x:
+                exec("%s = x[k]" % k)
+                
+            inputList = otype + olist
+            toponames=[]
+
+            for minHT in Threlist:
+                toponame = "HT%d-%s%s%s%s.ETA%s" % (minHT, otype, str(ocut), olist, str(nleading) if olist=="s" else "", str(oeta))
+                toponames.append(toponame)
+
+            alg = AlgConf.JetHT( name = algoname, inputs = inputList, outputs = toponames, algoId = currentAlgoId ); currentAlgoId += 1
+            alg.addgeneric('InputWidth', inputwidth)
+            alg.addgeneric('MaxTob', nleading)
+            alg.addgeneric('NumRegisters', 2 if olist=="all" else 0)
+            alg.addgeneric('NumResultBits', len(toponames))
+            alg.addvariable('MinEt', ocut)
+            alg.addvariable('MinEta', 0)
+            alg.addvariable('MaxEta', oeta)
+
+            for bitid, minHT in enumerate(Threlist):
+                alg.addvariable('MinHt', minHT, bitid)                        
+
+            tm.registerAlgo(alg)
+
+            
+        # (ATR-8194) L1Topo HT Trigger
+        for x in [
+            {"minHT": 1,   "otype" : "AJ", "ocut" : 0,  "olist" : "all", "nleading" : HW.InputWidthJET, "inputwidth": HW.InputWidthJET, "oeta" : 49},
+            ]:
+            
+            for k in x:
+                exec("%s = x[k]" % k)
+                
+            toponame = "HT%d-%s%s%s%s.ETA%s" % (minHT, otype, str(ocut), olist, str(nleading) if olist=="s" else "", str(oeta))
+            
+            log.info("Define %s" % toponame)
+            
+            inputList = otype + olist
+
+            alg = AlgConf.JetHT( name = toponame, inputs = inputList, outputs = [toponame], algoId = currentAlgoId ); currentAlgoId += 1
+            alg.addgeneric('InputWidth', inputwidth)
+            alg.addgeneric('MaxTob', nleading)        
+            alg.addgeneric('NumRegisters', 2 if olist=="all" else 0)
+            alg.addgeneric('NumResultBits', 1)
+            alg.addvariable('MinEt', ocut)                        
+            alg.addvariable('MinEta', 0)
+            alg.addvariable('MaxEta', oeta)            
+            alg.addvariable('MinHt', minHT) 
+            tm.registerAlgo(alg)
+
+        # INVM_EM for Jpsi    
+        for x in [
+            {"algoname": 'INVM_EMs', "ocutlist": [ 0, 6, 12 ], "minInvm": 1, "maxInvm": 5, "otype" : "EM", "olist" : "s", "nleading" : 2, "inputwidth": HW.OutputWidthSortEM},
+            ]:
+            
+            for k in x:
+                exec("%s = x[k]" % k)
+
+            inputList = otype + olist
+            toponames=[]
+
+            for ocut in ocutlist:
+                toponame = "%iINVM%i-%s%s%s%s-EMs"  % (minInvm, maxInvm, otype, str(ocut) if ocut > 0 else "", olist, str(nleading) if olist=="s" else "")
+                toponames.append(toponame)
+
+            alg = AlgConf.InvariantMassInclusive2( name = algoname, inputs = [inputList, 'EMs'], outputs = toponames, algoId = currentAlgoId); currentAlgoId += 1    
+            alg.addgeneric('InputWidth1', inputwidth)
+            alg.addgeneric('InputWidth2', HW.OutputWidthSortEM)
+            alg.addgeneric('MaxTob1', nleading)
+            alg.addgeneric('MaxTob2', HW.OutputWidthSortEM)
+            alg.addgeneric('NumResultBits', len(toponames))
+
+            for bitid, ocut in enumerate(ocutlist):
+                alg.addvariable('MinET1', ocut, bitid)
+                alg.addvariable('MinET2', 0, bitid)
+                alg.addvariable('MinMSqr', (minInvm * _emscale_for_decision)*(minInvm * _emscale_for_decision), bitid) 
+                alg.addvariable('MaxMSqr', 4294967295, bitid)
+                
+            tm.registerAlgo(alg)
+            
+        # VBF deta     
+        for x in [
+            {"minDeta": 0,  "maxDeta": 10, "otype" : "J",  "ocut1" : 0,  "olist" : "s", "nleading1" : 1, "inputwidth1": HW.OutputWidthSortJET, "ocut2" : 0, "nleading2": 2},
+            {"minDeta": 40, "maxDeta": 99, "otype" : "AJ", "ocut1" : 30, "olist" : "s", "nleading1" : 6, "inputwidth1": HW.OutputWidthSortJET, "ocut2" : 20, "nleading2": 6},
+            {"minDeta": 40, "maxDeta": 99, "otype" : "J",  "ocut1" : 30, "olist" : "s", "nleading1" : 6, "inputwidth1": HW.OutputWidthSortJET, "ocut2" : 20, "nleading2": 6},
+            ]:
+
+            for k in x:
+                exec("%s = x[k]" % k)
+
+            toponame = "%iDETA%i-%s%s%s%s-%s%s%s%s"  % (minDeta, maxDeta,
+                                                        otype, str(ocut1) if ocut1 > 0 else "", olist, str(nleading1) if olist=="s" else "",
+                                                        otype, str(ocut2) if ocut2 > 0 else "", olist, str(nleading2) if olist=="s" else "")
+            
+            log.info("Define %s" % toponame)
+
+            inputList = otype + olist
+            
+            alg = AlgConf.DeltaEtaIncl1( name = toponame, inputs = inputList, outputs = toponame, algoId = currentAlgoId ); currentAlgoId += 1
+            alg.addgeneric('InputWidth', inputwidth1)
+            alg.addgeneric('MaxTob', nleading2)
+            alg.addgeneric('NumResultBits', 1)                        
+            alg.addvariable('MinEt1', str(ocut1))            
+            alg.addvariable('MinEt2', str(ocut2))
+            alg.addvariable('MinDeltaEta', minDeta, 0)
+            alg.addvariable('MaxDeltaEta', maxDeta, 0)
+            tm.registerAlgo(alg)
+            
         # DPHI    
         for x in [
-            {"minDphi": 0, "maxDphi": 16, "otype1" : "AJ", "ocut1" : 0, "olist" : "s", "nleading1" : HW.OutputWidthSortJET, "otype2" : "AJ", "ocut2" : 0, "nleading2" : HW.OutputWidthSortJET},
-            {"minDphi": 0, "maxDphi": 16, "otype1" : "EM", "ocut1" : 0, "olist" : "s", "nleading1" : HW.OutputWidthSortEM, "otype2" : "TAU","ocut2" : 0, "nleading2" : HW.OutputWidthSortTAU},
+            {"minDphi": 0, "maxDphi": 16, "otype1" : "AJ", "ocut1" : 0, "olist" : "s", "nleading1" : HW.OutputWidthSortJET, "inputwidth1": HW.OutputWidthSortJET, "otype2" : "AJ", "ocut2" : 0, "nleading2" : HW.OutputWidthSortJET, "inputwidth2": HW.OutputWidthSortJET},
+            {"minDphi": 0, "maxDphi": 16, "otype1" : "EM", "ocut1" : 0, "olist" : "s", "nleading1" : HW.OutputWidthSortEM, "inputwidth1": HW.OutputWidthSortEM, "otype2" : "TAU","ocut2" : 0, "nleading2" : HW.OutputWidthSortTAU, "inputwidth2": HW.OutputWidthSortTAU},
             ]:
             
             for k in x:
@@ -218,11 +383,16 @@ class TopoAlgoDef:
                         
             algoname = AlgConf.DeltaPhiIncl1 if (otype1==otype2) else AlgConf.DeltaPhiIncl2
             alg = algoname( name = toponame, inputs = inputList, outputs = [ toponame ], algoId = currentAlgoId ); currentAlgoId += 1
+
+            
             if otype1==otype2:
-                alg.addgeneric('InputWidth', nleading1) 
+                alg.addgeneric('InputWidth', inputwidth1) 
+                alg.addgeneric('MaxTob', nleading1) 
             else:
-                alg.addgeneric('InputWidth1', nleading1)
-                alg.addgeneric('InputWidth2', nleading2)
+                alg.addgeneric('InputWidth1', inputwidth1)
+                alg.addgeneric('InputWidth2', inputwidth2) 
+                alg.addgeneric('MaxTob1', nleading1)
+                alg.addgeneric('MaxTob2', nleading2)
             alg.addgeneric('NumResultBits', 1)
             alg.addvariable('MinEt1', ocut1)
             alg.addvariable('MinEt2', ocut2) 
@@ -234,8 +404,8 @@ class TopoAlgoDef:
         
         # for M7: DETA20-AJ2ab-AJ2ab, 0DETA20-EM2ab-TAU2ab
         for x in [     
-            {"minDeta": 0, "maxDeta": 10, "otype1" : "AJ", "ocut1" : 0, "olist" : "ab", "nleading1" : HW.OutputWidthSelectJET, "otype2" : "AJ", "ocut2" : 0, "nleading2" : HW.OutputWidthSelectJET},
-            {"minDeta": 0, "maxDeta": 10, "otype1" : "EM", "ocut1" : 0, "olist" : "ab", "nleading1" : HW.OutputWidthSelectEM, "otype2" : "TAU", "ocut2" : 0, "nleading2" : HW.OutputWidthSelectTAU},
+            {"minDeta": 0, "maxDeta": 10, "otype1" : "AJ", "ocut1" : 0, "olist" : "ab", "nleading1" : HW.OutputWidthSelectJET, "inputwidth1": HW.OutputWidthSelectJET, "otype2" : "AJ", "ocut2" : 0, "nleading2" : HW.OutputWidthSelectJET, "inputwidth2":  HW.OutputWidthSelectJET},
+            {"minDeta": 0, "maxDeta": 10, "otype1" : "EM", "ocut1" : 0, "olist" : "ab", "nleading1" : HW.OutputWidthSelectEM, "inputwidth1": HW.OutputWidthSelectEM, "otype2" : "TAU", "ocut2" : 0, "nleading2" : HW.OutputWidthSelectTAU, "inputwidth2": HW.OutputWidthSelectTAU},
             ]:
 
             for k in x:
@@ -251,10 +421,14 @@ class TopoAlgoDef:
             algoname = AlgConf.DeltaEtaIncl1 if (otype1==otype2) else AlgConf.DeltaEtaIncl2
             alg = algoname( name = toponame, inputs = inputList, outputs = [toponame], algoId = currentAlgoId ); currentAlgoId += 1
             if otype1==otype2:
-                alg.addgeneric('InputWidth', nleading1)
+                alg.addgeneric('InputWidth', inputwidth1)
+                alg.addgeneric('MaxTob', nleading1)                                
             else:
-                alg.addgeneric('InputWidth1', nleading1)
-                alg.addgeneric('InputWidth2', nleading2)
+                alg.addgeneric('InputWidth1', inputwidth1)
+                alg.addgeneric('InputWidth2', inputwidth2)
+                alg.addgeneric('MaxTob1', nleading1)
+                alg.addgeneric('MaxTob2', nleading2)
+                
             alg.addgeneric('NumResultBits', 1)
             alg.addvariable('MinEt1', str(ocut1))
             alg.addvariable('MinEt2', str(ocut2))
@@ -262,16 +436,19 @@ class TopoAlgoDef:
             alg.addvariable('MaxDeltaEta', maxDeta, 0)
             tm.registerAlgo(alg)        
 
-        #HT0-AJ0s.ETAxy
+                
         # (ATR-8194) L1Topo HT Trigger
-        for x in [     
-            {"minHT": 0,   "otype" : "AJ", "ocut" : 0,  "olist" : "all", "nleading" : HW.InputWidthJET, "oeta" : 49},
-            {"minHT": 20,  "otype" : "AJj","ocut" : 0,  "olist" : "all", "nleading" : HW.InputWidthJET, "oeta" : 49},
-            {"minHT": 190, "otype" : "AJ", "ocut" : 15, "olist" : "all", "nleading" : HW.InputWidthJET, "oeta" : 20},
-            {"minHT": 150, "otype" : "AJ", "ocut" : 20, "olist" : "all", "nleading" : HW.InputWidthJET, "oeta" : 30},
-            {"minHT": 150, "otype" : "AJj","ocut" : 15, "olist" : "all", "nleading" : HW.InputWidthJET, "oeta" : 49},
-            {"minHT": 190, "otype" : "J", "ocut" : 15, "olist" : "s",   "nleading" : 5, "oeta" : 20},
-            {"minHT": 150, "otype" : "J", "ocut" : 20, "olist" : "s",   "nleading" : 5, "oeta" : 30},
+        for x in [
+            #{"minHT": 1,   "otype" : "AJ", "ocut" : 0,  "olist" : "all", "nleading" : HW.InputWidthJET, "inputwidth": HW.InputWidthJET, "oeta" : 49},
+            {"minHT": 0,   "otype" : "AJ", "ocut" : 0,  "olist" : "all", "nleading" : HW.InputWidthJET, "inputwidth": HW.InputWidthJET, "oeta" : 49},
+            {"minHT": 20,  "otype" : "AJj","ocut" : 0,  "olist" : "all", "nleading" : HW.InputWidthJET, "inputwidth": HW.InputWidthJET, "oeta" : 49},
+            {"minHT": 190, "otype" : "AJ", "ocut" : 15, "olist" : "all", "nleading" : HW.InputWidthJET, "inputwidth": HW.InputWidthJET, "oeta" : 20},
+            {"minHT": 150, "otype" : "AJ", "ocut" : 20, "olist" : "all", "nleading" : HW.InputWidthJET, "inputwidth": HW.InputWidthJET, "oeta" : 30},
+            {"minHT": 150, "otype" : "AJj","ocut" : 15, "olist" : "all", "nleading" : HW.InputWidthJET, "inputwidth": HW.InputWidthJET, "oeta" : 49},
+            #{"minHT": 200, "otype" : "AJ", "ocut" : 20, "olist" : "s", "nleading" : 5, "inputwidth": HW.OutputWidthSortJET, "oeta" : 20},
+            #{"minHT": 190, "otype" : "AJ", "ocut" : 20, "olist" : "s", "nleading" : 5, "inputwidth": HW.OutputWidthSortJET, "oeta" : 20},
+            {"minHT": 190, "otype" : "J", "ocut" : 15, "olist" : "s",   "nleading" : 5, "inputwidth": HW.OutputWidthSortJET, "oeta" : 20},
+            {"minHT": 150, "otype" : "J", "ocut" : 20, "olist" : "s",   "nleading" : 5, "inputwidth": HW.OutputWidthSortJET, "oeta" : 30},
             ]:
             
             for k in x:
@@ -284,20 +461,22 @@ class TopoAlgoDef:
             inputList = otype + olist
 
             alg = AlgConf.JetHT( name = toponame, inputs = inputList, outputs = [toponame], algoId = currentAlgoId ); currentAlgoId += 1
-            alg.addgeneric('InputWidth', nleading)
-            alg.addgeneric('NumResultBits', 1)                        
+            alg.addgeneric('InputWidth', inputwidth)
+            alg.addgeneric('MaxTob', nleading)        
+            alg.addgeneric('NumRegisters', 2 if olist=="all" else 0)
+            alg.addgeneric('NumResultBits', 1)
             alg.addvariable('MinEt', ocut)                        
             alg.addvariable('MinEta', 0)
             alg.addvariable('MaxEta', oeta)            
-            alg.addvariable('MinHt', minHT) # OK
+            alg.addvariable('MinHt', minHT) 
             tm.registerAlgo(alg)  
 
         # (ATR-8192) L1Topo ZH Trigger
         for x in [
-            {"minDPhi": 10, "otype" : "J", "ocut" : 0,  "olist" : "s", "nleading" : 2 },
-            {"minDPhi": 10, "otype" : "J", "ocut" : 20, "olist" : "s", "nleading" : 2 },
-            {"minDPhi": 10, "otype" : "J", "ocut" : 20, "olist" : "ab", "nleading" : HW.OutputWidthSelectJET },
-            {"minDPhi": 10, "otype" : "CJ","ocut" : 20, "olist" : "ab", "nleading" : HW.OutputWidthSelectJET },
+            {"minDPhi": 10, "otype" : "J", "ocut" : 0,  "olist" : "s", "nleading" : 2, "inputwidth": HW.OutputWidthSortJET},
+            {"minDPhi": 10, "otype" : "J", "ocut" : 20, "olist" : "s", "nleading" : 2, "inputwidth": HW.OutputWidthSortJET },
+            {"minDPhi": 10, "otype" : "J", "ocut" : 20, "olist" : "ab", "nleading" : HW.OutputWidthSelectJET, "inputwidth": HW.OutputWidthSelectJET},
+            {"minDPhi": 10, "otype" : "CJ","ocut" : 20, "olist" : "ab", "nleading" : HW.OutputWidthSelectJET, "inputwidth": HW.OutputWidthSelectJET},
             ]:
             
             for k in x:
@@ -309,100 +488,147 @@ class TopoAlgoDef:
             inputList = otype + olist
 
             alg = AlgConf.MinDPhiIncl2( name = toponame, inputs = [inputList, 'XE'], outputs = [ toponame ], algoId = currentAlgoId ); currentAlgoId += 1
-            alg.addgeneric('NumberLeading1', nleading)
-            alg.addgeneric('NumberLeading2', 1)
+
+            alg.addgeneric('InputWidth1', inputwidth)
+            alg.addgeneric('InputWidth2', 1)  
+            alg.addgeneric('MaxTob1', nleading)
+            alg.addgeneric('MaxTob2', 1)
             alg.addgeneric('NumResultBits', 1)
             alg.addvariable('MinET1', ocut)
             alg.addvariable('MinET2', 50)
             alg.addvariable('DeltaPhiMin', minDPhi, 0)
             tm.registerAlgo(alg)
 
-        #VBF invm
+        # INVM_EM for Jpsi    
         for x in [
-            {"minInvm": 400, "maxInvm": 9999, "otype" : "AJ", "ocut1" : 30, "olist" : "s", "nleading1" : 6, "ocut2" : 20, "nleading2" : 6},
-            {"minInvm": 350, "maxInvm": 9999, "otype" : "AJ", "ocut1" : 30, "olist" : "s", "nleading1" : 6, "ocut2" : 20, "nleading2" : 6},
-            {"minInvm": 300, "maxInvm": 9999, "otype" : "AJ", "ocut1" : 30, "olist" : "s", "nleading1" : 6, "ocut2" : 20, "nleading2" : 6},
-            {"minInvm": 200, "maxInvm": 9999, "otype" : "AJ", "ocut1" : 30, "olist" : "s", "nleading1" : 6, "ocut2" : 20, "nleading2" : 6},
-            {"minInvm": 350, "maxInvm": 9999, "otype" : "J",  "ocut1" : 30, "olist" : "s", "nleading1" : 6, "ocut2" : 20, "nleading2" : 6},
-            {"minInvm": 300, "maxInvm": 9999, "otype" : "J",  "ocut1" : 30, "olist" : "s", "nleading1" : 6, "ocut2" : 20, "nleading2" : 6},
-            {"minInvm": 250, "maxInvm": 9999, "otype" : "J",  "ocut1" : 30, "olist" : "s", "nleading1" : 6, "ocut2" : 20, "nleading2" : 6},
-            {"minInvm": 200, "maxInvm": 9999, "otype" : "J",  "ocut1" : 30, "olist" : "s", "nleading1" : 6, "ocut2" : 20, "nleading2" : 6}, 
+            {"algoname": 'INVM_EMall', "ocutlist": [ 0, 6, 12 ], "minInvm": 1, "maxInvm": 5, "otype" : "EM", "olist" : "s", "nleading" : 2, "inputwidth": HW.OutputWidthSortEM},
             ]:
-
+            
             for k in x:
                 exec("%s = x[k]" % k)
 
-            toponame = "%iINVM%i-%s%s%s%s-%s%s%s%s"  % (minInvm, maxInvm,
-                                                        otype, str(ocut1) if ocut1 > 0 else "", olist, str(nleading1) if olist=="s" else "",
-                                                        otype, str(ocut2) if ocut2 > 0 else "", olist, str(nleading2) if olist=="s" else "")
-                                                        
-            log.info("Define %s" % toponame)
-            
             inputList = otype + olist
+            toponames=[]
 
-            alg = AlgConf.InvariantMassInclusive1( name = toponame,  inputs = inputList, outputs = [ toponame ], algoId = currentAlgoId); currentAlgoId += 1
-            alg.addgeneric('NumberLeading1', nleading1)
-            alg.addgeneric('NumberLeading2', nleading2)
-            alg.addgeneric('NumResultBits', 1)                        
-            alg.addvariable('InvMassMin', minInvm)
-            alg.addvariable('InvMassMax', maxInvm)
-            alg.addvariable('MinET1', ocut1)
-            alg.addvariable('MinET2', ocut2)
+            for ocut in ocutlist:
+                toponame = "%iINVM%i-%s%s%s%s-EMall"  % (minInvm, maxInvm, otype, str(ocut) if ocut > 0 else "", olist, str(nleading) if olist=="s" else "")
+                toponames.append(toponame)
+                
+            alg = AlgConf.InvariantMassInclusive2( name = algoname, inputs = [inputList, 'EMall'], outputs = toponames, algoId = currentAlgoId); currentAlgoId += 1    
+            alg.addgeneric('InputWidth1', inputwidth)
+            alg.addgeneric('InputWidth2', HW.InputWidthEM)
+            alg.addgeneric('MaxTob1', nleading)
+            alg.addgeneric('MaxTob2', HW.InputWidthEM)
+            alg.addgeneric('NumResultBits', len(toponames))
+
+            for bitid, ocut in enumerate(ocutlist):
+                alg.addvariable('MinET1', ocut, bitid)
+                alg.addvariable('MinET2', 0, bitid)
+                alg.addvariable('MinMSqr', (minInvm * _emscale_for_decision)*(minInvm * _emscale_for_decision), bitid)                
+                alg.addvariable('MaxMSqr', (maxInvm * _emscale_for_decision)*(maxInvm * _emscale_for_decision), bitid)
+                
             tm.registerAlgo(alg)
 
-        # VBF deta     
-        for x in [     
-            {"minDeta": 40, "maxDeta": 99, "otype" : "AJ", "ocut1" : 30, "olist" : "s", "nleading1" : 6, "ocut2" : 20, "nleading2" : 6},
-            {"minDeta": 40, "maxDeta": 99, "otype" : "J",  "ocut1" : 30, "olist" : "s", "nleading1" : 6, "ocut2" : 20, "nleading2" : 6},
-            {"minDeta": 0,  "maxDeta": 10, "otype" : "J",  "ocut1" : 0,  "olist" : "s", "nleading1" : 1, "ocut2" : 0, "nleading2" : 2},
+            
+        # (ATR-8193) L1Topo Jpsi T&P trigger 
+        for x in [
+            #{"minInvm": 1, "maxInvm": 5, "otype" : "EM", "ocut" : 0, "olist" : "s", "nleading" : 2, "inputwidth": HW.OutputWidthSortEM},
+            {"minInvm": 1, "maxInvm": 5, "otype" : "EM", "ocut" : 7, "olist" : "s", "nleading" : 2, "inputwidth": HW.OutputWidthSortEM},
+            #{"minInvm": 1, "maxInvm": 5, "otype" : "EM", "ocut" : 12,"olist" : "s", "nleading" : 2, "inputwidth": HW.OutputWidthSortEM},
             ]:
-
+            
             for k in x:
                 exec("%s = x[k]" % k)
-
-            toponame = "%iDETA%i-%s%s%s%s-%s%s%s%s"  % (minDeta, maxDeta,
-                                                        otype, str(ocut1) if ocut1 > 0 else "", olist, str(nleading1) if olist=="s" else "",
-                                                        otype, str(ocut2) if ocut2 > 0 else "", olist, str(nleading2) if olist=="s" else "")
+                
+            toponame = "%iINVM%i-%s%s%s%s-EMall"  % (minInvm, maxInvm, otype, str(ocut) if ocut > 0 else "", olist, str(nleading) if olist=="s" else "")
             
             log.info("Define %s" % toponame)
 
             inputList = otype + olist
-            
-            alg = AlgConf.DeltaEtaIncl1( name = toponame, inputs = inputList, outputs = toponame, algoId = currentAlgoId ); currentAlgoId += 1
-            alg.addgeneric('InputWidth', nleading1)
+
+            alg = AlgConf.InvariantMassInclusive2( name = toponame,  inputs = [inputList, 'EMall'], outputs = [ toponame ], algoId = currentAlgoId); currentAlgoId += 1
+            alg.addgeneric('InputWidth1', inputwidth)
+            alg.addgeneric('InputWidth2', HW.OutputWidthSelectEM)
+            alg.addgeneric('MaxTob1', nleading)
+            alg.addgeneric('MaxTob2', HW.OutputWidthSelectEM)
             alg.addgeneric('NumResultBits', 1)                        
-            alg.addvariable('MinEt1', str(ocut1))            
-            alg.addvariable('MinEt2', str(ocut2))
-            alg.addvariable('MinDeltaEta', minDeta, 0)
-            alg.addvariable('MaxDeltaEta', maxDeta, 0)
+            alg.addvariable('MinET1', ocut)
+            alg.addvariable('MinET2', 0)
+            alg.addvariable('MinMSqr', (minInvm * _emscale_for_decision) * (minInvm * _emscale_for_decision))
+            alg.addvariable('MaxMSqr', (maxInvm * _emscale_for_decision) * (maxInvm * _emscale_for_decision))
             tm.registerAlgo(alg)
-            
-        # (ATR-8193) L1Topo Jpsi T&P trigger 
+
+        # VBF items    
         for x in [
-            {"minInvm": 1, "maxInvm": 5, "otype" : "EM", "ocut" : 0, "olist" : "s", "nleading" : 2 },
-            {"minInvm": 1, "maxInvm": 5, "otype" : "EM", "ocut" : 7, "olist" : "s", "nleading" : 2 },
-            {"minInvm": 1, "maxInvm": 5, "otype" : "EM", "ocut" : 12,"olist" : "s", "nleading" : 2 },
+            {"algoname": 'INVM_AJ_HighMass', "Threlist": [ 900, 800, 700, 500 ], "maxInvm": 9999, "otype" : "AJ", "ocut1" : 30, "olist" : "s", "nleading1" : 6, "inputwidth1": HW.OutputWidthSortJET, "ocut2" : 20, "nleading2" : 6},
+            {"algoname": 'INVM_AJ_LowMass',  "Threlist": [ 400, 350, 300, 200 ], "maxInvm": 9999, "otype" : "AJ", "ocut1" : 30, "olist" : "s", "nleading1" : 6, "inputwidth1": HW.OutputWidthSortJET, "ocut2" : 20, "nleading2" : 6},
+            {"algoname": 'INVM_AJ_VLowMass',  "Threlist": [ 100 ], "maxInvm": 9999, "otype" : "AJ", "ocut1" : 30, "olist" : "s", "nleading1" : 6, "inputwidth1": HW.OutputWidthSortJET, "ocut2" : 20, "nleading2" : 6},
             ]:
             
             for k in x:
                 exec("%s = x[k]" % k)
+
+            inputList = otype + olist
+            toponames=[]
+
+            for minInvm in Threlist:
+                toponame = "%iINVM%i-%s%s%s%s-%s%s%s%s"  % (minInvm, maxInvm,
+                                                            otype, str(ocut1) , olist, str(nleading1) if olist=="s" else "",
+                                                            otype, str(ocut2) , olist, str(nleading2) if olist=="s" else "")   
+                toponames.append(toponame)
                 
-            toponame = "%iINVM%i-%s%s%s%s-EMall"  % (minInvm, maxInvm, otype, str(ocut) if ocut > 0 else "", olist, str(nleading) if olist=="s" else "")
-            
+            alg = AlgConf.InvariantMassInclusive1( name = algoname, inputs = inputList, outputs = toponames, algoId = currentAlgoId); currentAlgoId += 1
+            alg.addgeneric('InputWidth', inputwidth1)
+            alg.addgeneric('MaxTob', nleading1)
+            alg.addgeneric('NumResultBits', len(toponames))
+
+            for bitid, minInvm in enumerate(Threlist): 
+                alg.addvariable('MinET1', ocut1, bitid)
+                alg.addvariable('MinET2', ocut2, bitid)
+                alg.addvariable('MinMSqr', minInvm * minInvm, bitid)
+                alg.addvariable('MaxMSqr', maxInvm * maxInvm, bitid)
+
+            tm.registerAlgo(alg)
+                
+        #VBF invm
+        for x in [
+            #{"minInvm": 900, "maxInvm": 9999, "otype" : "AJ", "ocut1" : 30, "olist" : "s", "nleading1" : 6, "inputwidth1": HW.OutputWidthSortJET, "ocut2" : 20},
+            #{"minInvm": 800, "maxInvm": 9999, "otype" : "AJ", "ocut1" : 30, "olist" : "s", "nleading1" : 6, "inputwidth1": HW.OutputWidthSortJET, "ocut2" : 20},
+            #{"minInvm": 700, "maxInvm": 9999, "otype" : "AJ", "ocut1" : 30, "olist" : "s", "nleading1" : 6, "inputwidth1": HW.OutputWidthSortJET, "ocut2" : 20},
+            #{"minInvm": 500, "maxInvm": 9999, "otype" : "AJ", "ocut1" : 30, "olist" : "s", "nleading1" : 6, "inputwidth1": HW.OutputWidthSortJET, "ocut2" : 20},
+            #{"minInvm": 400, "maxInvm": 9999, "otype" : "AJ", "ocut1" : 30, "olist" : "s", "nleading1" : 6, "inputwidth1": HW.OutputWidthSortJET, "ocut2" : 20},
+            #{"minInvm": 350, "maxInvm": 9999, "otype" : "AJ", "ocut1" : 30, "olist" : "s", "nleading1" : 6, "inputwidth1": HW.OutputWidthSortJET, "ocut2" : 20},
+            #{"minInvm": 300, "maxInvm": 9999, "otype" : "AJ", "ocut1" : 30, "olist" : "s", "nleading1" : 6, "inputwidth1": HW.OutputWidthSortJET, "ocut2" : 20},
+            #{"minInvm": 200, "maxInvm": 9999, "otype" : "AJ", "ocut1" : 30, "olist" : "s", "nleading1" : 6, "inputwidth1": HW.OutputWidthSortJET, "ocut2" : 20},
+            #{"minInvm": 350, "maxInvm": 9999, "otype" : "J",  "ocut1" : 30, "olist" : "s", "nleading1" : 6, "inputwidth1": HW.OutputWidthSortJET, "ocut2" : 20},
+            #{"minInvm": 300, "maxInvm": 9999, "otype" : "J",  "ocut1" : 30, "olist" : "s", "nleading1" : 6, "inputwidth1": HW.OutputWidthSortJET, "ocut2" : 20},
+            #{"minInvm": 250, "maxInvm": 9999, "otype" : "J",  "ocut1" : 30, "olist" : "s", "nleading1" : 6, "inputwidth1": HW.OutputWidthSortJET, "ocut2" : 20},
+            #{"minInvm": 200, "maxInvm": 9999, "otype" : "J",  "ocut1" : 30, "olist" : "s", "nleading1" : 6, "inputwidth1": HW.OutputWidthSortJET, "ocut2" : 20},
+            #{"minInvm": 1,   "maxInvm": 9999, "otype" : "AJ",  "ocut1" : 0, "olist" : "s", "nleading1" : 6, "inputwidth1": HW.OutputWidthSortJET, "ocut2" : 0}, 
+            ]:
+
+            for k in x:
+                exec("%s = x[k]" % k)
+
+            toponame = "%iINVM%i-%s%s%s%s-%s%s%s%s"  % (minInvm, maxInvm,
+                                                        otype, str(ocut1) , olist, str(nleading1) if olist=="s" else "",
+                                                        otype, str(ocut2) , olist, str(nleading1) if olist=="s" else "")
+                                                        
             log.info("Define %s" % toponame)
-            
+            print toponame
             inputList = otype + olist
 
-            alg = AlgConf.InvariantMassInclusive2( name = toponame,  inputs = [inputList, 'EMall'], outputs = [ toponame ], algoId = currentAlgoId); currentAlgoId += 1
-            alg.addgeneric('NumberLeading1', nleading)
-            alg.addgeneric('NumberLeading2', HW.OutputWidthSelectEM)
+            alg = AlgConf.InvariantMassInclusive1( name = toponame,  inputs = inputList, outputs = [ toponame ], algoId = currentAlgoId); currentAlgoId += 1
+
+            alg.addgeneric('InputWidth', inputwidth1)
+            alg.addgeneric('MaxTob', nleading1)
             alg.addgeneric('NumResultBits', 1)                        
-            alg.addvariable('InvMassMin', minInvm)
-            alg.addvariable('InvMassMax', maxInvm)
-            alg.addvariable('MinET1', ocut)
-            alg.addvariable('MinET2', 0)
+            alg.addvariable('MinET1', ocut1)
+            alg.addvariable('MinET2', ocut2)
+            alg.addvariable('MinMSqr', minInvm * minInvm)
+            alg.addvariable('MaxMSqr', maxInvm * maxInvm)
             tm.registerAlgo(alg)
-
+            
         # added for muon-jet items: '0DR04-MU4ab-CJ15ab', '0DR04-MU4ab-CJ30ab', '0DR04-MU6ab-CJ25ab', '0DR04-MU4ab-CJ17ab', '0DR04-MU4ab-CJ20ab'
         for x in [  
             {"minDr": 0, "maxDr": 4, "otype1" : "MU" ,"ocut1": 4,  "olist1" : "ab", "otype2" : "CJ", "ocut2": 15, "olist2" : "ab"},
@@ -421,8 +647,11 @@ class TopoAlgoDef:
             inputList = [otype1 + olist1, otype2 + olist2]
 
             alg = AlgConf.DeltaRSqrIncl2( name = toponame, inputs = inputList, outputs = [ toponame ], algoId = currentAlgoId); currentAlgoId += 1
-            alg.addgeneric('NumberLeading1', HW.OutputWidthSelectMU)
-            alg.addgeneric('NumberLeading2', HW.OutputWidthSelectJET)
+
+            alg.addgeneric('InputWidth1', HW.OutputWidthSelectMU)
+            alg.addgeneric('InputWidth2', HW.OutputWidthSelectJET)
+            alg.addgeneric('MaxTob1', HW.OutputWidthSelectMU)
+            alg.addgeneric('MaxTob2', HW.OutputWidthSelectJET)
             alg.addgeneric('NumResultBits', 1)                        
             alg.addvariable('DeltaRMin', minDr)
             alg.addvariable('DeltaRMax', maxDr)
@@ -459,13 +688,19 @@ class TopoAlgoDef:
             inputList = [otype1 + olist] if (mult>1 or otype1==otype2) else [otype1 + olist, otype2 + olist]
             algoname = AlgConf.InvariantMassInclusive1 if (mult>1 or otype1==otype2) else AlgConf.InvariantMassInclusive2
             alg = algoname( name = toponame,  inputs = inputList, outputs = [ toponame ], algoId = currentAlgoId); currentAlgoId += 1
-            alg.addgeneric('NumberLeading1', HW.OutputWidthSelectMU)
-            alg.addgeneric('NumberLeading2', HW.OutputWidthSelectMU)
+            if (mult>1 or otype1==otype2):
+                alg.addgeneric('InputWidth', HW.OutputWidthSelectMU) 
+                alg.addgeneric('MaxTob', HW.OutputWidthSelectMU)
+            else:
+                alg.addgeneric('InputWidth1', HW.OutputWidthSelectMU)
+                alg.addgeneric('InputWidth2', HW.OutputWidthSelectMU) 
+                alg.addgeneric('MaxTob1', HW.OutputWidthSelectMU)
+                alg.addgeneric('MaxTob2', HW.OutputWidthSelectMU)
             alg.addgeneric('NumResultBits', 1)
-            alg.addvariable('InvMassMin', minInvm)
-            alg.addvariable('InvMassMax', maxInvm)
             alg.addvariable('MinET1', ocut1)
             alg.addvariable('MinET2', ocut2 if ocut2>0 else ocut1)
+            alg.addvariable('MinMSqr', minInvm * minInvm)
+            alg.addvariable('MaxMSqr', maxInvm * maxInvm)
             tm.registerAlgo(alg)
             
         # Missing
@@ -476,13 +711,13 @@ class TopoAlgoDef:
             
         # dimu DR items
         for x in [  
-            {"minDr": 2, "maxDr": 15, "mult": 2, "otype1" : "MU" ,"ocut1": 4,  "olist" : "ab", "otype2" : "",   "ocut2": 0}, # Bphys
+            {"minDr": 2, "maxDr": 15, "mult": 2, "otype1" : "MU" ,"ocut1": 4,  "olist" : "ab", "otype2" : "",   "ocut2": 4}, # Bphys
             {"minDr": 2, "maxDr": 15, "mult": 1, "otype1" : "CMU","ocut1": 4,  "olist" : "ab", "otype2" : "MU", "ocut2": 4},
-            {"minDr": 2, "maxDr": 15, "mult": 2, "otype1" : "CMU","ocut1": 4,  "olist" : "ab", "otype2" : "",   "ocut2": 0},
+            {"minDr": 2, "maxDr": 15, "mult": 2, "otype1" : "CMU","ocut1": 4,  "olist" : "ab", "otype2" : "",   "ocut2": 4},
             {"minDr": 2, "maxDr": 15, "mult": 1, "otype1" : "MU", "ocut1": 6,  "olist" : "ab", "otype2" : "MU", "ocut2": 4},
             {"minDr": 2, "maxDr": 15, "mult": 1, "otype1" : "CMU","ocut1": 6,  "olist" : "ab", "otype2" : "CMU","ocut2": 4},
-            {"minDr": 2, "maxDr": 15, "mult": 2, "otype1" : "MU" ,"ocut1": 6,  "olist" : "ab", "otype2" : "",   "ocut2": 0},
-            {"minDr": 2, "maxDr": 99, "mult": 2, "otype1" : "MU" ,"ocut1": 4,  "olist" : "ab", "otype2" : "",   "ocut2": 0}, # SM Y
+            {"minDr": 2, "maxDr": 15, "mult": 2, "otype1" : "MU" ,"ocut1": 6,  "olist" : "ab", "otype2" : "",   "ocut2": 6},
+            {"minDr": 2, "maxDr": 99, "mult": 2, "otype1" : "MU" ,"ocut1": 4,  "olist" : "ab", "otype2" : "",   "ocut2": 4}, # SM Y
             {"minDr": 0, "maxDr": 10, "mult": 1, "otype1" : "MU" ,"ocut1": 10, "olist" : "ab", "otype2" : "MU", "ocut2": 6}, # Exotic LFV 
             ]:
 
@@ -498,8 +733,14 @@ class TopoAlgoDef:
             inputList = [otype1 + olist] if (mult>1 or otype1==otype2) else [otype1 + olist, otype2 + olist]
             algoname = AlgConf.DeltaRSqrIncl1 if (mult>1 or otype1==otype2) else AlgConf.DeltaRSqrIncl2
             alg = algoname( name = toponame,  inputs = inputList, outputs = [ toponame ], algoId = currentAlgoId); currentAlgoId += 1
-            alg.addgeneric('NumberLeading1', HW.OutputWidthSelectMU)
-            alg.addgeneric('NumberLeading2', HW.OutputWidthSelectMU)
+            if (mult>1 or otype1==otype2):
+                alg.addgeneric('InputWidth', HW.OutputWidthSelectMU)
+                alg.addgeneric('MaxTob', HW.OutputWidthSelectMU)
+            else:
+                alg.addgeneric('InputWidth1', HW.OutputWidthSelectMU)
+                alg.addgeneric('InputWidth2', HW.OutputWidthSelectMU) 
+                alg.addgeneric('MaxTob1', HW.OutputWidthSelectMU)
+                alg.addgeneric('MaxTob2', HW.OutputWidthSelectMU)
             alg.addgeneric('NumResultBits', 1)
             alg.addvariable('DeltaRMin', minDr)
             alg.addvariable('DeltaRMax', maxDr)
@@ -513,8 +754,8 @@ class TopoAlgoDef:
             {"minDeta": 5, "maxDeta": 99, "minDphi": 5, "maxDphi": 99, "mult": 1, "otype1" : "MU", "ocut1": 6, "olist1" : "ab", "nleading1": HW.OutputWidthSelectMU, "otype2" : "MU", "ocut2": 4, "olist2": "ab", "nleading2": HW.OutputWidthSelectMU},
             {"minDeta": 5, "maxDeta": 99, "minDphi": 5, "maxDphi": 99, "mult": 2, "otype1" : "MU", "ocut1": 6, "olist1" : "ab", "nleading1": HW.OutputWidthSelectMU, "otype2" : "", "ocut2": 6, "olist2": "", "nleading2": HW.OutputWidthSelectMU},
             {"minDeta": 5, "maxDeta": 99, "minDphi": 5, "maxDphi": 99, "mult": 2, "otype1" : "MU", "ocut1": 4, "olist1" : "ab", "nleading1": HW.OutputWidthSelectMU, "otype2" : "", "ocut2": 4, "olist2": "", "nleading2": HW.OutputWidthSelectMU},
-            {"minDeta": 0, "maxDeta": 35, "minDphi": 0, "maxDphi": 25, "mult": 1, "otype1" : "EM", "ocut1": 8, "olist1" : "abi", "nleading1": HW.OutputWidthSelectEM, "otype2" : "MU", "ocut2": 10, "olist2": "ab", "nleading2": HW.OutputWidthSelectMU},
-            {"minDeta": 0, "maxDeta": 35, "minDphi": 0, "maxDphi": 25, "mult": 1, "otype1" : "EM", "ocut1": 15, "olist1" : "abi", "nleading1": HW.OutputWidthSelectEM, "otype2" : "MU", "ocut2": 0, "olist2": "ab", "nleading2": HW.OutputWidthSelectMU},
+            {"minDeta": 0, "maxDeta": "04", "minDphi": 0, "maxDphi": "03", "mult": 1, "otype1" : "EM", "ocut1": 8, "olist1" : "abi", "nleading1": HW.OutputWidthSelectEM, "otype2" : "MU", "ocut2": 10, "olist2": "ab", "nleading2": HW.OutputWidthSelectMU},
+            {"minDeta": 0, "maxDeta": "04", "minDphi": 0, "maxDphi": "03", "mult": 1, "otype1" : "EM", "ocut1": 15, "olist1" : "abi", "nleading1": HW.OutputWidthSelectEM, "otype2" : "MU", "ocut2": 0, "olist2": "ab", "nleading2": HW.OutputWidthSelectMU},
             {"minDeta": 0, "maxDeta": 20, "minDphi": 0, "maxDphi": 20, "mult": 1, "otype1" : "TAU", "ocut1": 20, "olist1" : "abi", "nleading1": HW.OutputWidthSelectTAU, "otype2" : "TAU", "ocut2": 12, "olist2": "abi", "nleading2": HW.OutputWidthSelectTAU},
             ]:
             
@@ -523,15 +764,24 @@ class TopoAlgoDef:
 
             obj1 = "%s%s%s%s" % ((str(mult) if mult>1 else ""), otype1, str(ocut1), olist1)
             obj2 = "-%s%s%s" % (otype2, str(ocut2) if ocut2>0 else "", olist2)
-            toponame = "%iDETA%i-%iDPHI%i-%s%s"  % (minDeta, maxDeta, minDphi, maxDphi, obj1, "" if mult>1 else obj2)
+            toponame = "%sDETA%s-%sDPHI%s-%s%s"  % (minDeta, maxDeta, minDphi, maxDphi, obj1, "" if mult>1 else obj2)
             
             log.info("Define %s" % toponame)
             
             inputList = [otype1 + olist1] if (mult>1 or otype1==otype2) else [otype1 + olist1, otype2 + olist2]
             algoname = AlgConf.DeltaRApproxBoxCutIncl1 if (mult>1 or otype1==otype2) else AlgConf.DeltaRApproxBoxCutIncl2            
             alg = algoname( name = toponame, inputs = inputList, outputs = [ toponame ], algoId = currentAlgoId); currentAlgoId += 1
-            alg.addgeneric('NumberLeading1', nleading1)
-            alg.addgeneric('NumberLeading2', nleading2)
+            
+            # SW codes needs to move to MaxTob first
+            if (mult>1 or otype1==otype2):
+                alg.addgeneric('InputWidth', nleading1)
+                #alg.addgeneric('MaxTob', nleading1)
+            else:
+                alg.addgeneric('InputWidth1', nleading1)
+                alg.addgeneric('InputWidth2', nleading2)
+                #alg.addgeneric('MaxTob1', nleading1)
+                #alg.addgeneric('MaxTob2', nleading2)
+            
             alg.addgeneric('NumResultBits', 1)                        
             alg.addvariable('DeltaEtaMin', minDeta)
             alg.addvariable('DeltaEtaMax', maxDeta)
@@ -543,12 +793,12 @@ class TopoAlgoDef:
             
         # W T&P: MINDPHI(J, XE0), (EM, XE0)
         for x in [
-            {"minDPhi": 10, "otype" : "AJj", "ocut" : 15, "olist" : "s", "nleading" : 2},
-            {"minDPhi": 20, "otype" : "AJj", "ocut" :  0, "olist" : "s", "nleading" : 6},
-            {"minDPhi": 20, "otype" : "AJj", "ocut" : 15, "olist" : "s", "nleading" : 2},
-            {"minDPhi": 10, "otype" : "EM",  "ocut" :  6, "olist" : "s", "nleading" : 1},
-            {"minDPhi": 20, "otype" : "EM",  "ocut" :  9, "olist" : "s", "nleading" : 6},
-            {"minDPhi": 20, "otype" : "EM",  "ocut" :  6, "olist" : "s", "nleading" : 1},
+            {"minDPhi": 10, "otype" : "AJj", "ocut" : 15, "olist" : "s", "nleading" : 2, "inputwidth": HW.OutputWidthSortJET},
+            {"minDPhi": 20, "otype" : "AJj", "ocut" :  0, "olist" : "s", "nleading" : 6, "inputwidth": HW.OutputWidthSortJET},
+            {"minDPhi": 20, "otype" : "AJj", "ocut" : 15, "olist" : "s", "nleading" : 2, "inputwidth": HW.OutputWidthSortJET},
+            {"minDPhi": 10, "otype" : "EM",  "ocut" :  6, "olist" : "s", "nleading" : 1, "inputwidth": HW.OutputWidthSortEM},
+            {"minDPhi": 20, "otype" : "EM",  "ocut" :  9, "olist" : "s", "nleading" : 6, "inputwidth": HW.OutputWidthSortEM},
+            {"minDPhi": 20, "otype" : "EM",  "ocut" :  6, "olist" : "s", "nleading" : 1, "inputwidth": HW.OutputWidthSortEM},
             ]:
             
             for k in x:
@@ -560,8 +810,10 @@ class TopoAlgoDef:
             inputList = otype + olist
 
             alg = AlgConf.MinDPhiIncl2( name = toponame, inputs = [ inputList, 'XE'], outputs = [ toponame ], algoId = currentAlgoId ); currentAlgoId += 1
-            alg.addgeneric('NumberLeading1', nleading)
-            alg.addgeneric('NumberLeading2', 1)
+            alg.addgeneric('InputWidth1', inputwidth)
+            alg.addgeneric('InputWidth2', 1) 
+            alg.addgeneric('MaxTob1', nleading)
+            alg.addgeneric('MaxTob2', 1)
             alg.addgeneric('NumResultBits', 1)
             alg.addvariable('MinET1', ocut)
             alg.addvariable('MinET2', 0)
@@ -571,7 +823,8 @@ class TopoAlgoDef:
         # JetMatch
         toponame = "0MATCH-4AJ20.ETA32-4AJj15"
         alg = AlgConf.JetMatch( name = toponame, inputs = [ 'AJall' ], outputs = [ toponame ], algoId = currentAlgoId ); currentAlgoId += 1
-        alg.addgeneric('NumberLeading1', 4)
+        alg.addgeneric('InputWidth', HW.InputWidthJET)
+        alg.addgeneric('MaxTob', 4) 
         alg.addgeneric('NumResultBits', 1)
         alg.addvariable('MinET1', 20) # for 8x8
         alg.addvariable('MinET2', 15) # for 4x4
@@ -582,8 +835,10 @@ class TopoAlgoDef:
         # NoMatch for W T&P
         toponame = "NOT-02MATCH-EM9s1-AJj15all.ETA49"
         alg = AlgConf.NoMatch( name = toponame, inputs = [ 'EMs', 'AJjall'], outputs = [ toponame ], algoId = currentAlgoId ); currentAlgoId += 1
-        alg.addgeneric('NumberLeading1', 1)
-        alg.addgeneric('NumberLeading2', HW.InputWidthJET)
+        alg.addgeneric('InputWidth1', HW.OutputWidthSortEM)
+        alg.addgeneric('InputWidth2', HW.InputWidthJET)
+        alg.addgeneric('MaxTob1', 1)
+        alg.addgeneric('MaxTob2', HW.InputWidthJET)
         alg.addgeneric('NumResultBits', 1)
         alg.addvariable('MinET1', 9)
         alg.addvariable('MinET2', 15)
@@ -597,7 +852,10 @@ class TopoAlgoDef:
         # RATIO SUM for W T&P 
         toponame = "05RATIO-XE0-SUM0-EM9s1-HT0-AJj15all.ETA49"
         alg = AlgConf.RatioSum( name = toponame, inputs = ['XE', 'EMs', 'AJjall'], outputs = [ toponame ], algoId = currentAlgoId ); currentAlgoId += 1
-        alg.addgeneric('NumberLeading1', 1)
+        alg.addgeneric('InputWidth1', HW.OutputWidthSortEM) 
+        alg.addgeneric('InputWidth2', HW.InputWidthJET) 
+        alg.addgeneric('MaxTob1', 1)
+        alg.addgeneric('MaxTob2', HW.InputWidthJET)
         alg.addgeneric('NumResultBits', 1)
         alg.addvariable('MinET1', 9) 
         alg.addvariable('MinET2', 15)
@@ -626,6 +884,10 @@ class TopoAlgoDef:
             
             alg = AlgConf.Ratio( name = toponame, inputs = ['XE', 'AJjall'], outputs = [ toponame ], algoId = currentAlgoId ) if Ratio=="RATIO" else AlgConf.Ratio2( name = toponame, inputs = ['XE', 'AJjall'], outputs = [ toponame ], algoId = currentAlgoId ) 
             currentAlgoId += 1
+            alg.addgeneric('InputWidth1', 1) 
+            alg.addgeneric('InputWidth2', HW.InputWidthJET) 
+            alg.addgeneric('MaxTob1', 1)
+            alg.addgeneric('MaxTob2', HW.InputWidthJET)
             alg.addgeneric('NumResultBits', 1)
             alg.addvariable('MinET1', 0) 
             alg.addvariable('MinET2', str(ocut))
@@ -639,8 +901,10 @@ class TopoAlgoDef:
         # RATIO MATCH dedicated to Exotic 
         toponame = '210RATIO-0MATCH-TAU30si2-EMall'
         alg = AlgConf.RatioMatch( name = toponame, inputs = [ 'TAUsi', 'EMall'], outputs = [ toponame ], algoId = currentAlgoId ); currentAlgoId += 1
-        alg.addgeneric('NumberLeading1', 2)
-        alg.addgeneric('NumberLeading2', HW.InputWidthEM)
+        alg.addgeneric('InputWidth1', HW.OutputWidthSortTAU)
+        alg.addgeneric('InputWidth2', HW.InputWidthEM)      
+        alg.addgeneric('MaxTob1', 2)
+        alg.addgeneric('MaxTob2', HW.InputWidthEM)
         alg.addgeneric('NumResultBits', 1)
         alg.addvariable('MinET1', 30)
         alg.addvariable('MinET2',  0)
@@ -653,8 +917,10 @@ class TopoAlgoDef:
         # NOT MATCH dedicated to Exotic
         toponame = 'NOT-0MATCH-TAU30si2-EMall'
         alg = AlgConf.NoMatch( name = toponame, inputs = [ 'TAUsi', 'EMall'], outputs = [ toponame ], algoId = currentAlgoId ); currentAlgoId += 1
-        alg.addgeneric('NumberLeading1', 2)
-        alg.addgeneric('NumberLeading2', HW.InputWidthEM)
+        alg.addgeneric('InputWidth1', HW.OutputWidthSortTAU)
+        alg.addgeneric('InputWidth2', HW.InputWidthEM)
+        alg.addgeneric('MaxTob1', 2)
+        alg.addgeneric('MaxTob2', HW.InputWidthEM)
         alg.addgeneric('NumResultBits', 1)
         alg.addvariable('MinET1', 30)
         alg.addvariable('MinET2', 0)
@@ -666,8 +932,8 @@ class TopoAlgoDef:
         tm.registerAlgo(alg)        
 
         for x in [  
-            {"minDr": 0, "maxDr": 28, "otype1" : "MU" ,"ocut1": 10, "olist1" : "ab", "nleading1": HW.OutputWidthSelectMU, "otype2" : "TAU", "ocut2": 12, "olist2" : "abi", "nleading2": HW.OutputWidthSelectTAU},
-            {"minDr": 0, "maxDr": 28, "otype1" : "TAU" ,"ocut1": 20, "olist1" : "abi","nleading1": HW.OutputWidthSelectTAU, "otype2" : "TAU", "ocut2": 12, "olist2" : "abi", "nleading2": HW.OutputWidthSelectTAU},
+            {"minDr": 0, "maxDr": 28, "otype1" : "MU" ,"ocut1": 10, "olist1" : "ab", "nleading1": HW.OutputWidthSelectMU, "inputwidth1": HW.OutputWidthSelectMU, "otype2" : "TAU", "ocut2": 12, "olist2" : "abi", "nleading2": HW.OutputWidthSelectTAU, "inputwidth2": HW.OutputWidthSelectTAU},
+            {"minDr": 0, "maxDr": 28, "otype1" : "TAU" ,"ocut1": 20, "olist1" : "abi","nleading1": HW.OutputWidthSelectTAU, "inputwidth1": HW.OutputWidthSelectTAU,"otype2" : "TAU", "ocut2": 12, "olist2" : "abi", "nleading2": HW.OutputWidthSelectTAU, "inputwidth2": HW.OutputWidthSelectTAU},
             ]:
 
             for k in x:
@@ -682,8 +948,15 @@ class TopoAlgoDef:
             inputList = [otype1 + olist1] if otype1==otype2 else [otype1 + olist1, otype2 + olist2]
             algoname = AlgConf.DeltaRSqrIncl1 if otype1==otype2 else AlgConf.DeltaRSqrIncl2
             alg = algoname( name = toponame,  inputs = inputList, outputs = [ toponame ], algoId = currentAlgoId); currentAlgoId += 1
-            alg.addgeneric('NumberLeading1', nleading1.value)
-            alg.addgeneric('NumberLeading2', nleading2.value)
+            
+            if otype1==otype2:
+                alg.addgeneric('InputWidth', inputwidth1)
+                alg.addgeneric('MaxTob', nleading1)
+            else:
+                alg.addgeneric('InputWidth1', inputwidth1)
+                alg.addgeneric('InputWidth2', inputwidth2) 
+                alg.addgeneric('MaxTob1', nleading1)
+                alg.addgeneric('MaxTob2', nleading2)
             alg.addgeneric('NumResultBits', 1)                        
             alg.addvariable('DeltaRMin', minDr)
             alg.addvariable('DeltaRMax', maxDr)
@@ -710,8 +983,10 @@ class TopoAlgoDef:
             
             inputList = [otype1 + olist1, otype2 + olist2]
             alg = AlgConf.DisambiguationIncl2( name = toponame, inputs = inputList, outputs = [ toponame ], algoId = currentAlgoId); currentAlgoId += 1
-            alg.addgeneric('NumberLeading1', nleading1)
-            alg.addgeneric('NumberLeading2', nleading2)
+            alg.addgeneric('InputWidth1', nleading1 if olist1.find("ab")>=0 else -1000)
+            alg.addgeneric('InputWidth2', nleading2 if olist2.find("ab")>=0 else -1000) 
+            alg.addgeneric('MaxTob1', nleading1)
+            alg.addgeneric('MaxTob2', nleading2)
             alg.addgeneric('NumResultBits', 1)
             alg.addvariable('MinET1', ocut1)
             alg.addvariable('MinET2', ocut2)
@@ -724,8 +999,8 @@ class TopoAlgoDef:
         
         # DISAMB 3 lists
         for x in [     
-            {"disamb": 1, "otype1" : "EM",  "ocut1": 15, "olist1": "shi","nleading1": 2, "otype2" : "TAU", "ocut2": 12, "olist2": "abi", "nleading2": HW.OutputWidthSelectTAU, "otype3" : "J", "ocut3": 25, "olist3": "ab"},
-            {"disamb": 1, "otype1" : "TAU", "ocut1": 20, "olist1": "abi","nleading1": HW.OutputWidthSelectTAU, "otype2" : "TAU", "ocut2": 12, "olist2": "abi", "nleading2": HW.OutputWidthSelectTAU, "otype3" : "J", "ocut3": 25, "olist3": "ab"}, 
+            {"disamb": 1, "otype1" : "EM",  "ocut1": 15, "olist1": "shi","nleading1": 2, "inputwidth1": HW.OutputWidthSortEM, "otype2" : "TAU", "ocut2": 12, "olist2": "abi", "nleading2": HW.OutputWidthSelectTAU, "inputwidth2": HW.OutputWidthSelectTAU, "otype3" : "J", "ocut3": 25, "olist3": "ab", "nleading3": HW.OutputWidthSelectJET, "inputwidth3": HW.OutputWidthSelectJET},
+            {"disamb": 1, "otype1" : "TAU", "ocut1": 20, "olist1": "abi","nleading1": HW.OutputWidthSelectTAU, "inputwidth1": HW.OutputWidthSelectTAU, "otype2" : "TAU", "ocut2": 12, "olist2": "abi", "nleading2": HW.OutputWidthSelectTAU, "otype3" : "J", "ocut3": 25, "olist3": "ab", "nleading3": HW.OutputWidthSelectTAU}, 
             ]:
             
             for k in x:
@@ -740,8 +1015,12 @@ class TopoAlgoDef:
             
             inputList = [otype1 + olist1, otype2 + olist2, otype3 + olist3]
             alg = AlgConf.DisambiguationIncl3( name = toponame, inputs = inputList, outputs = [ toponame ], algoId = currentAlgoId); currentAlgoId += 1
-            alg.addgeneric('NumberLeading1', nleading1)
-            alg.addgeneric('NumberLeading2', nleading2)
+            alg.addgeneric('InputWidth1', inputwidth1)
+            alg.addgeneric('InputWidth2', inputwidth2)
+            alg.addgeneric('InputWidth3', inputwidth3)
+            alg.addgeneric('MaxTob1', nleading1)
+            alg.addgeneric('MaxTob2', nleading2)
+            alg.addgeneric('MaxTob3', nleading3)
             alg.addgeneric('NumResultBits', 1)
             alg.addvariable('MinET1', ocut1)
             alg.addvariable('MinET2', ocut2)
@@ -757,8 +1036,8 @@ class TopoAlgoDef:
 
         # DISAMB 3 lists with DR cut to 2nd and 3rd lists
         for x in [     
-            {"disamb": 1, "otype1" : "J", "otype1" : "EM",  "ocut1": 15, "olist1": "shi","nleading1": 2, "otype2" : "TAU", "ocut2": 12, "olist2": "abi", "nleading2": HW.OutputWidthSelectTAU, "otype3" : "J", "ocut3": 25, "olist3": "ab", "drcutmin": 0, "drcutmax": 28},
-            {"disamb": 1, "otype1" : "TAU",  "ocut1": 20, "olist1": "abi","nleading1": HW.OutputWidthSelectTAU, "otype2" : "TAU", "ocut2": 12, "olist2": "abi", "nleading2": HW.OutputWidthSelectTAU, "otype3" : "J", "ocut3": 25, "olist3": "ab", "drcutmin": 0, "drcutmax": 28}, 
+            {"disamb": 1, "otype1" : "EM",  "ocut1": 15, "olist1": "shi","nleading1": 2, "inputwidth1": HW.OutputWidthSortEM, "otype2" : "TAU", "ocut2": 12, "olist2": "abi", "nleading2": HW.OutputWidthSelectTAU, "inputwidth2": HW.OutputWidthSelectTAU, "otype3" : "J", "ocut3": 25, "olist3": "ab", "nleading3": HW.OutputWidthSelectJET, "inputwidth3": HW.OutputWidthSelectJET, "drcutmin": 0, "drcutmax": 28},
+            {"disamb": 1, "otype1" : "TAU",  "ocut1": 20, "olist1": "abi","nleading1": HW.OutputWidthSelectTAU, "inputwidth1": HW.OutputWidthSelectTAU, "otype2" : "TAU", "ocut2": 12, "olist2": "abi", "nleading2": HW.OutputWidthSelectTAU, "inputwidth2": HW.OutputWidthSelectTAU, "otype3" : "J", "ocut3": 25, "olist3": "ab", "nleading3": HW.OutputWidthSelectJET, "inputwidth3": HW.OutputWidthSelectJET, "drcutmin": 0, "drcutmax": 28}, 
             ]:
 
             for k in x:
@@ -773,8 +1052,12 @@ class TopoAlgoDef:
             
             inputList = [otype1 + olist1, otype2 + olist2, otype3 + olist3]
             alg = AlgConf.DisambiguationDRIncl3( name = toponame, inputs = inputList, outputs = [ toponame ], algoId = currentAlgoId); currentAlgoId += 1
-            alg.addgeneric('NumberLeading1', nleading1)
-            alg.addgeneric('NumberLeading2', nleading2)
+            alg.addgeneric('InputWidth1', inputwidth1)
+            alg.addgeneric('InputWidth2', inputwidth2)
+            alg.addgeneric('InputWidth3', inputwidth3)
+            alg.addgeneric('MaxTob1', nleading1)
+            alg.addgeneric('MaxTob2', nleading2)
+            alg.addgeneric('MaxTob3', nleading3)
             alg.addgeneric('NumResultBits', 1)
             alg.addvariable('MinET1', ocut1)
             alg.addvariable('MinET2', ocut2)
@@ -792,8 +1075,8 @@ class TopoAlgoDef:
 
         # LAR  0<eta<1.4 and 9/16pi<phi<11/16pi for FE crate IO6 
         for x in [     
-            {"minEta": 0, "maxEta": 14, "minPhi": 17, "maxPhi": 22, "otype" : "EM", "ocut" : 50},
-            {"minEta": 0, "maxEta": 14, "minPhi": 17, "maxPhi": 22, "otype" : "J", "ocut" : 100}, 
+            {"minEta": 0, "maxEta": 14, "minPhi": 17, "maxPhi": 22, "otype" : "EM", "ocut" : 50, "inputwidth": HW.OutputWidthSortEM},
+            {"minEta": 0, "maxEta": 14, "minPhi": 17, "maxPhi": 22, "otype" : "J", "ocut" : 100, "inputwidth": HW.OutputWidthSortJET}, 
             ]:
 
             for k in x:
@@ -806,7 +1089,8 @@ class TopoAlgoDef:
             inputList = otype + 's'
             
             alg = AlgConf.LAR( name = toponame, inputs = inputList, outputs = toponame, algoId = currentAlgoId ); currentAlgoId += 1
-            alg.addgeneric('NumberLeading1', 1)
+            alg.addgeneric('InputWidth', inputwidth) 
+            alg.addgeneric('MaxTob', 1)
             alg.addgeneric('NumResultBits', 1)
             alg.addvariable('MinET', str(ocut))
             alg.addvariable('EtaMin', minEta)
diff --git a/Trigger/TriggerCommon/TriggerMenu/python/menu/ChainDef.py b/Trigger/TriggerCommon/TriggerMenu/python/menu/ChainDef.py
index 394ed598f01..a2958f24e5f 100644
--- a/Trigger/TriggerCommon/TriggerMenu/python/menu/ChainDef.py
+++ b/Trigger/TriggerCommon/TriggerMenu/python/menu/ChainDef.py
@@ -78,13 +78,14 @@ class ChainDef:
              'listOfTriggerElements': listOfTriggerElements})
 
  
-    def addSequence(self, listOfAlgorithmInstances, te_in, te_out):
+    def addSequence(self, listOfAlgorithmInstances, te_in, te_out, topo_starts_from=None):
         """add sequence data to the chain"""
 
         self.sequenceList.append(
             {'algorithm': listOfAlgorithmInstances,
              'input': te_in,
-             'output': te_out})
+             'output': te_out,
+             'topo_starts_from': topo_starts_from})
 
 
     def __str__(self):
diff --git a/Trigger/TriggerCommon/TriggerMenu/python/menu/DC14.py b/Trigger/TriggerCommon/TriggerMenu/python/menu/DC14.py
index eee07ae5828..37397279009 100644
--- a/Trigger/TriggerCommon/TriggerMenu/python/menu/DC14.py
+++ b/Trigger/TriggerCommon/TriggerMenu/python/menu/DC14.py
@@ -16,51 +16,51 @@ def setupMenu():
         log.info("L1 menu has not yet been defined or is being read from the DB!")
 
     # INPUT FORMAT FOR CHAINS:
-    # ['chainName', chainCounter, 'L1itemforchain', [L1 items for chainParts], [stream], [groups], EBstep]
+    # ['L1itemforchain', [L1 items for chainParts], [stream], [groups], EBstep]
 
     globalStream = 'Main'
 
     TriggerFlags.Slices_all_setOff()
 
     TriggerFlags.MuonSlice.signatures = [
-        ['mu24_idperf',         13, 'L1_MU20', [], [globalStream], ['RATE:SingleMuon','BW:Muon'], -1],
-        ['mu6_idperf',         14, 'L1_MU6', [],   [globalStream], ['RATE:SingleMuon','BW:Muon'], -1],
+        ['mu24_idperf', 'L1_MU20', [], [globalStream], ['RATE:SingleMuon','BW:Muon'], -1],
+        ['mu6_idperf',          'L1_MU6', [],   [globalStream], ['RATE:SingleMuon','BW:Muon'], -1],
         #L2Star
-        ['mu24_L2Star_idperf',        15, 'L1_MU20', [], [globalStream], ['RATE:SingleMuon','BW:Muon'], -1],
-        ['mu6_L2Star_idperf',         16, 'L1_MU6', [],   [globalStream], ['RATE:SingleMuon','BW:Muon'], -1],
+        ['mu24_L2Star_idperf',        'L1_MU20', [], [globalStream], ['RATE:SingleMuon','BW:Muon'], -1],
+        ['mu6_L2Star_idperf',         'L1_MU6', [],   [globalStream], ['RATE:SingleMuon','BW:Muon'], -1],
         #Single muon chains
-        ['mu26',                12, 'L1_MU20', [], [globalStream], ['RATE:SingleMuon','BW:Muon'], -1],
-        ['mu26_imedium',        1, 'L1_MU20', [],  [globalStream], ['RATE:SingleMuon','BW:Muon'], -1],
+        ['mu26',                'L1_MU20', [], [globalStream], ['RATE:SingleMuon','BW:Muon'], -1],
+        ['mu26_imedium',       'L1_MU20', [],  [globalStream], ['RATE:SingleMuon','BW:Muon'], -1],
 
-        ['mu24',                2, 'L1_MU20', [], [globalStream], ['RATE:SingleMuon','BW:Muon'], -1],
-        ['mu24_imedium',        3, 'L1_MU20', [], [globalStream], ['RATE:SingleMuon','BW:Muon'], -1],
-        ['mu50',                4, 'L1_MU20', [], [globalStream], ['RATE:SingleMuon','BW:Muon'], -1],
-        ['mu60_0eta105_msonly', 5, 'L1_MU20', [], [globalStream], ['RATE:SingleMuon','BW:Muon'], -1],
+        ['mu24',                'L1_MU20', [], [globalStream], ['RATE:SingleMuon','BW:Muon'], -1],
+        ['mu24_imedium',        'L1_MU20', [], [globalStream], ['RATE:SingleMuon','BW:Muon'], -1],
+        ['mu50',                'L1_MU20', [], [globalStream], ['RATE:SingleMuon','BW:Muon'], -1],
+        ['mu60_0eta105_msonly', 'L1_MU20', [], [globalStream], ['RATE:SingleMuon','BW:Muon'], -1],
 
         #Multi muon chains
-        ['2mu4',                6, 'L1_2MU4', [],   [globalStream], ['RATE:MultiMuon','BW:Muon'], -1],
-        ['2mu6',                7, 'L1_2MU6', [],   [globalStream], ['RATE:MultiMuon','BW:Muon'], -1],
-        ['2mu10',               8, 'L1_2MU10', [],  [globalStream], ['RATE:MultiMuon','BW:Muon'], -1],
-        ['3mu6',                9, 'L1_3MU6', [],   [globalStream], ['RATE:MultiMuon','BW:Muon'], -1],
-        ['2mu14',               10, 'L1_2MU10', [], [globalStream], ['RATE:MultiMuon','BW:Muon'], -1],
-        ['mu14_iloose_mu14',    11, 'L1_2MU10', [], [globalStream], ['RATE:MultiMuon','BW:Muon'], -1],
+        ['2mu4',               'L1_2MU4', [],   [globalStream], ['RATE:MultiMuon','BW:Muon'], -1],
+        ['2mu6',               'L1_2MU6', [],   [globalStream], ['RATE:MultiMuon','BW:Muon'], -1],
+        ['2mu10',              'L1_2MU10', [],  [globalStream], ['RATE:MultiMuon','BW:Muon'], -1],
+        ['3mu6',               'L1_3MU6', [],   [globalStream], ['RATE:MultiMuon','BW:Muon'], -1],
+        ['2mu14',               'L1_2MU10', [], [globalStream], ['RATE:MultiMuon','BW:Muon'], -1],
+        ['mu14_iloose_mu14',    'L1_2MU10', [], [globalStream], ['RATE:MultiMuon','BW:Muon'], -1],
 
         ##Full scan
-        #['mu20_mu8noL1',         17, 'L1_MU20', ['L1_MU20',''], [globalStream], ['RATE:MultiMuon','BW:Muon'], -1,['serial',-1,["mu20","mu8noL1"]]],        
-        #['mu20_imedium_mu8noL1', 18, 'L1_MU20', ['L1_MU20',""], [globalStream], ['RATE:MultiMuon','BW:Muon'], -1,['serial',-1,['mu20_imedium','mu8noL1']]],
-        #['mu20_2mu4noL1',        19, 'L1_MU20', ['L1_MU20',""], [globalStream], ['RATE:MultiMuon','BW:Muon'], -1,['serial',-1,['mu20','2mu4noL1']]],
-        #['mu20_iloose_mu8noL1',  30, 'L1_MU20', ['L1_MU20',''], [globalStream], ['RATE:MultiMuon','BW:Muon'], -1,['serial',-1,['mu20_iloose','mu8noL1']]],
-        #['mu20_iloose_2mu4noL1', 31, 'L1_MU20', ['L1_MU20',''], [globalStream], ['RATE:MultiMuon','BW:Muon'], -1,['serial',-1,['mu20_iloose','2mu4noL1']]],
+        #['mu20_mu8noL1',          'L1_MU20', ['L1_MU20',''], [globalStream], ['RATE:MultiMuon','BW:Muon'], -1,['serial',-1,["mu20","mu8noL1"]]],        
+        #['mu20_imedium_mu8noL1',  'L1_MU20', ['L1_MU20',""], [globalStream], ['RATE:MultiMuon','BW:Muon'], -1,['serial',-1,['mu20_imedium','mu8noL1']]],
+        #['mu20_2mu4noL1',         'L1_MU20', ['L1_MU20',""], [globalStream], ['RATE:MultiMuon','BW:Muon'], -1,['serial',-1,['mu20','2mu4noL1']]],
+        #['mu20_iloose_mu8noL1',   'L1_MU20', ['L1_MU20',''], [globalStream], ['RATE:MultiMuon','BW:Muon'], -1,['serial',-1,['mu20_iloose','mu8noL1']]],
+        #['mu20_iloose_2mu4noL1',  'L1_MU20', ['L1_MU20',''], [globalStream], ['RATE:MultiMuon','BW:Muon'], -1,['serial',-1,['mu20_iloose','2mu4noL1']]],
 
         ##Full scan
-        ['mu20_mu8noL1',         17, 'L1_MU20', ['L1_MU20',''], [globalStream], ['RATE:MultiMuon','BW:Muon'], -1,['serial',-1,['mu20','mu8noL1']]],        
-        ['mu20_iloose_mu8noL1',  18, 'L1_MU20', ['L1_MU20',''], [globalStream], ['RATE:MultiMuon','BW:Muon'], -1,['serial',-1,['mu20_iloose','mu8noL1']]],
-        ['mu20_imedium_mu8noL1', 19, 'L1_MU20', ['L1_MU20',''], [globalStream], ['RATE:MultiMuon','BW:Muon'], -1,['serial',-1,['mu20_imedium','mu8noL1']]],
-        ['mu20_2mu4noL1',        47, 'L1_MU20', ['L1_MU20',''], [globalStream], ['RATE:MultiMuon','BW:Muon'], -1,['serial',-1,['mu20','2mu4noL1']]],
-        ['mu20_iloose_2mu4noL1', 48, 'L1_MU20', ['L1_MU20',''], [globalStream], ['RATE:MultiMuon','BW:Muon'], -1,['serial',-1,['mu20_iloose','2mu4noL1']]],
-        ['mu20_imedium_2mu4noL1',49, 'L1_MU20', ['L1_MU20',''], [globalStream], ['RATE:MultiMuon','BW:Muon'], -1,['serial',-1,['mu20_imedium','2mu4noL1']]],
-        ['mu24_mu8noL1',         57, 'L1_MU20', ['L1_MU20',''], [globalStream], ['RATE:MultiMuon','BW:Muon'], -1,['serial',-1,['mu24','mu8noL1']]],        
-        ['mu24_2mu4noL1',        58, 'L1_MU20', ['L1_MU20',''], [globalStream], ['RATE:MultiMuon','BW:Muon'], -1,['serial',-1,['mu24','2mu4noL1']]],
+        ['mu20_mu8noL1',          'L1_MU20', ['L1_MU20',''], [globalStream], ['RATE:MultiMuon','BW:Muon'], -1,['serial',-1,['mu20','mu8noL1']]],        
+        ['mu20_iloose_mu8noL1',   'L1_MU20', ['L1_MU20',''], [globalStream], ['RATE:MultiMuon','BW:Muon'], -1,['serial',-1,['mu20_iloose','mu8noL1']]],
+        ['mu20_imedium_mu8noL1',  'L1_MU20', ['L1_MU20',''], [globalStream], ['RATE:MultiMuon','BW:Muon'], -1,['serial',-1,['mu20_imedium','mu8noL1']]],
+        ['mu20_2mu4noL1',         'L1_MU20', ['L1_MU20',''], [globalStream], ['RATE:MultiMuon','BW:Muon'], -1,['serial',-1,['mu20','2mu4noL1']]],
+        ['mu20_iloose_2mu4noL1',  'L1_MU20', ['L1_MU20',''], [globalStream], ['RATE:MultiMuon','BW:Muon'], -1,['serial',-1,['mu20_iloose','2mu4noL1']]],
+        ['mu20_imedium_2mu4noL1', 'L1_MU20', ['L1_MU20',''], [globalStream], ['RATE:MultiMuon','BW:Muon'], -1,['serial',-1,['mu20_imedium','2mu4noL1']]],
+        ['mu24_mu8noL1',          'L1_MU20', ['L1_MU20',''], [globalStream], ['RATE:MultiMuon','BW:Muon'], -1,['serial',-1,['mu24','mu8noL1']]],        
+        ['mu24_2mu4noL1',         'L1_MU20', ['L1_MU20',''], [globalStream], ['RATE:MultiMuon','BW:Muon'], -1,['serial',-1,['mu24','2mu4noL1']]],
         
 
         ]
@@ -68,152 +68,152 @@ def setupMenu():
 
     TriggerFlags.JetSlice.signatures = [
         #Single jet chains        
-        ['j400',                100,    'L1_J100',[],  [globalStream], ['RATE:SingleJet', 'BW:Jets'], -1],
-        ['j460_a10_sub_L1J100',     101,    'L1_J100',[], [globalStream], ['RATE:SingleJet', 'BW:Jets'], -1],
-        ['j200_320eta490',      102,    'L1_J100.32ETA49',[], [globalStream], ['RATE:SingleJet', 'BW:Jets'], -1],
-        ['j60',                 103,    'L1_J20',[], [globalStream], ['RATE:SingleJet', 'BW:Jets'], -1],
-        ['j110',                104,    'L1_J40',[], [globalStream], ['RATE:SingleJet', 'BW:Jets'], -1],
-        ['j150',                105,    'L1_J75',[], [globalStream], ['RATE:SingleJet', 'BW:Jets'], -1],
-        ['j200',                106,    'L1_J100',[], [globalStream], ['RATE:SingleJet', 'BW:Jets'], -1],
-        ['j260',                107,    'L1_J100',[], [globalStream], ['RATE:SingleJet', 'BW:Jets'], -1],
-        ['j330',                108,    'L1_J100',[], [globalStream], ['RATE:SingleJet', 'BW:Jets'], -1],        
+        ['j400',                    'L1_J100',[],  [globalStream], ['RATE:SingleJet', 'BW:Jets'], -1],
+        ['j460_a10_sub_L1J100',     'L1_J100',[], [globalStream], ['RATE:SingleJet', 'BW:Jets'], -1],
+        ['j200_320eta490',          'L1_J100.32ETA49',[], [globalStream], ['RATE:SingleJet', 'BW:Jets'], -1],
+        ['j60',                     'L1_J20',[], [globalStream], ['RATE:SingleJet', 'BW:Jets'], -1],
+        ['j110',                    'L1_J40',[], [globalStream], ['RATE:SingleJet', 'BW:Jets'], -1],
+        ['j150',                    'L1_J75',[], [globalStream], ['RATE:SingleJet', 'BW:Jets'], -1],
+        ['j200',                    'L1_J100',[], [globalStream], ['RATE:SingleJet', 'BW:Jets'], -1],
+        ['j260',                    'L1_J100',[], [globalStream], ['RATE:SingleJet', 'BW:Jets'], -1],
+        ['j330',                    'L1_J100',[], [globalStream], ['RATE:SingleJet', 'BW:Jets'], -1],        
         #Multjet chains
-        ['3j175',               109,    'L1_J100',[], [globalStream], ['RATE:MultiJet', 'BW:Jets'], -1],
-        ['4j100',               110,    'L1_3J20',[], [globalStream], ['RATE:MultiJet', 'BW:Jets'], -1],        
-        ['5j85',                111,    'L1_4J20',[], [globalStream], ['RATE:MultiJet', 'BW:Jets'], -1],
+        ['3j175',                   'L1_J100',[], [globalStream], ['RATE:MultiJet', 'BW:Jets'], -1],
+        ['4j100',                   'L1_3J20',[], [globalStream], ['RATE:MultiJet', 'BW:Jets'], -1],        
+        ['5j85',                    'L1_4J20',[], [globalStream], ['RATE:MultiJet', 'BW:Jets'], -1],
         #HT chains
-        ['j200_ht1000',       112,    'L1_J100', [], [globalStream], ['RATE:SingleJet', 'BW:Jets'], -1, ['serial',-1,['j200','ht1000']]],
-        #['ht1000_L1J100',       112,    'L1_J100', [], [globalStream], ['RATE:SingleJet', 'BW:Jets'], -1],
+        ['j200_ht1000',         'L1_J100', [], [globalStream], ['RATE:SingleJet', 'BW:Jets'], -1, ['serial',-1,['j200','ht1000']]],
+        #['ht1000_L1J100',      'L1_J100', [], [globalStream], ['RATE:SingleJet', 'BW:Jets'], -1],
         #
-        ['j30_muvtx',           113,    'L1_2MU10', [], [globalStream], ['RATE:SingleMuon','BW:Muon'], -1],
+        ['j30_muvtx',             'L1_2MU10', [], [globalStream], ['RATE:SingleMuon','BW:Muon'], -1],
 
         #Partial scan
-        ['j200_PS', 114, 'L1_J100', [], [globalStream], ['RATE:SingleJet', 'BW:Jets'], -1],         
-        ['3j175_PS', 115, 'L1_J100', [], [globalStream], ['RATE:MultiJet', 'BW:Jets'], -1], 
+        ['j200_PS',  'L1_J100', [], [globalStream], ['RATE:SingleJet', 'BW:Jets'], -1],         
+        ['3j175_PS',  'L1_J100', [], [globalStream], ['RATE:MultiJet', 'BW:Jets'], -1], 
 
         ]
 
     TriggerFlags.BjetSlice.signatures =  [
-        ['j55_bperf',                    20,    'L1_J20',[], [globalStream], ['RATE:MultiJet', 'BW:Jets'], -1],
-        ['j45_bperf_3j45',               21,    'L1_3J15',[], [globalStream], ['RATE:MultiJet', 'BW:Jets'], -1],
-        ['j45_bperf_3j45_L13J15.ETA24',  22,    'L1_3J15.ETA24',[], [globalStream], ['RATE:MultiJet', 'BW:Jets'], -1],
-        ['j45_bperf_3j45_L13J20',        23,    'L1_3J20',[], [globalStream], ['RATE:MultiJet', 'BW:Jets'], -1],
-        #['j55_EFID_bperf',               24,    'L1_J20',[], [globalStream], ['RATE:MultiJet', 'BW:Jets'], -1],
-        ['j175_bmedium',                 25,    'L1_J100',[], [globalStream], ['RATE:MultiJet', 'BW:Jets'], -1],# <- J100 
-        ['j75_bmedium_3j75',             26,    'L1_4J20',[], [globalStream], ['RATE:MultiJet', 'BW:Jets'], -1], #<- 4J20 
-        ['2j55_bmedium_2j55',            27,    'L1_4J20',[], [globalStream], ['RATE:MultiJet', 'BW:Jets'], -1],# <- 4J20 
-        ['2j45_bmedium_3j45',            28,    'L1_5J15.ETA24',[], [globalStream], ['RATE:MultiJet', 'BW:Jets'], -1],
-        ['j175_bmedium_j60_bmedium',     29,    'L1_J100',[], [globalStream], ['RATE:MultiJet', 'BW:Jets'], -1],
-        ['j300_bloose',                  30,    'L1_J100',[], [globalStream], ['RATE:MultiJet', 'BW:Jets'], -1],
+        ['j55_bperf',                        'L1_J20',[], [globalStream], ['RATE:MultiJet', 'BW:Jets'], -1],
+        ['j45_bperf_3j45',                   'L1_3J15',[], [globalStream], ['RATE:MultiJet', 'BW:Jets'], -1],
+        ['j45_bperf_3j45_L13J15.ETA24',      'L1_3J15.ETA24',[], [globalStream], ['RATE:MultiJet', 'BW:Jets'], -1],
+        ['j45_bperf_3j45_L13J20',            'L1_3J20',[], [globalStream], ['RATE:MultiJet', 'BW:Jets'], -1],
+        #['j55_EFID_bperf',              ,    'L1_J20',[], [globalStream], ['RATE:MultiJet', 'BW:Jets'], -1],
+        ['j175_bmedium',                     'L1_J100',[], [globalStream], ['RATE:MultiJet', 'BW:Jets'], -1],# <- J100 
+        ['j75_bmedium_3j75',                 'L1_4J20',[], [globalStream], ['RATE:MultiJet', 'BW:Jets'], -1], #<- 4J20 
+        ['2j55_bmedium_2j55',                'L1_4J20',[], [globalStream], ['RATE:MultiJet', 'BW:Jets'], -1],# <- 4J20 
+        ['2j45_bmedium_3j45',                'L1_5J15.ETA24',[], [globalStream], ['RATE:MultiJet', 'BW:Jets'], -1],
+        ['j175_bmedium_j60_bmedium',         'L1_J100',[], [globalStream], ['RATE:MultiJet', 'BW:Jets'], -1],
+        ['j300_bloose',                      'L1_J100',[], [globalStream], ['RATE:MultiJet', 'BW:Jets'], -1],
         
         # chains with EDIF
-        ['j55_bperf_EFID',               32,    'L1_J20',[], [globalStream], ['RATE:MultiJet', 'BW:Jets'], -1],
-        ['j45_bperf_EFID_3j45',          33,    'L1_3J15',[], [globalStream], ['RATE:MultiJet', 'BW:Jets'], -1],
-        ['j45_bperf_EFID_3j45_L13J15.ETA24',  34,    'L1_3J15.ETA24',[], [globalStream], ['RATE:MultiJet', 'BW:Jets'], -1],
-        ['j45_bperf_EFID_3j45_L13J20',        35,    'L1_3J20',[], [globalStream], ['RATE:MultiJet', 'BW:Jets'], -1],
-        ['j175_bmedium_EFID',                 36,    'L1_J100',[], [globalStream], ['RATE:MultiJet', 'BW:Jets'], -1],# <- J100 
-        ['j75_bmedium_EFID_3j75',             37,    'L1_4J20',[], [globalStream], ['RATE:MultiJet', 'BW:Jets'], -1], #<- 4J20 
-        ['2j55_bmedium_EFID_2j55',            38,    'L1_4J20',[], [globalStream], ['RATE:MultiJet', 'BW:Jets'], -1],# <- 4J20 
-        ['2j45_bmedium_EFID_3j45',            39,    'L1_5J15.ETA24',[], [globalStream], ['RATE:MultiJet', 'BW:Jets'], -1],
-        ['j175_bmedium_EFID_j60_bmedium_EFID', 40,    'L1_J100',[], [globalStream], ['RATE:MultiJet', 'BW:Jets'], -1],
-        ['j300_bloose_EFID',                   41,    'L1_J100',[], [globalStream], ['RATE:MultiJet', 'BW:Jets'], -1],    
+        ['j55_bperf_EFID',                   'L1_J20',[], [globalStream], ['RATE:MultiJet', 'BW:Jets'], -1],
+        ['j45_bperf_EFID_3j45',              'L1_3J15',[], [globalStream], ['RATE:MultiJet', 'BW:Jets'], -1],
+        ['j45_bperf_EFID_3j45_L13J15.ETA24',    'L1_3J15.ETA24',[], [globalStream], ['RATE:MultiJet', 'BW:Jets'], -1],
+        ['j45_bperf_EFID_3j45_L13J20',          'L1_3J20',[], [globalStream], ['RATE:MultiJet', 'BW:Jets'], -1],
+        ['j175_bmedium_EFID',                   'L1_J100',[], [globalStream], ['RATE:MultiJet', 'BW:Jets'], -1],# <- J100 
+        ['j75_bmedium_EFID_3j75',               'L1_4J20',[], [globalStream], ['RATE:MultiJet', 'BW:Jets'], -1], #<- 4J20 
+        ['2j55_bmedium_EFID_2j55',              'L1_4J20',[], [globalStream], ['RATE:MultiJet', 'BW:Jets'], -1],# <- 4J20 
+        ['2j45_bmedium_EFID_3j45',              'L1_5J15.ETA24',[], [globalStream], ['RATE:MultiJet', 'BW:Jets'], -1],
+        ['j175_bmedium_EFID_j60_bmedium_EFID',     'L1_J100',[], [globalStream], ['RATE:MultiJet', 'BW:Jets'], -1],
+        ['j300_bloose_EFID',                       'L1_J100',[], [globalStream], ['RATE:MultiJet', 'BW:Jets'], -1],    
 
         ]
 
     TriggerFlags.METSlice.signatures = [       
-        #['xe50noL1_l2fsperf',                   380,    '',[], [globalStream], ['Rate:MET', 'BW:MET'], -1],
-        #['xe50noL1_l2fsperf_',                   380,    '',[], [globalStream], ['Rate:MET', 'BW:MET'], -1],        
-        ['xe50',                            350,    'L1_XE35',[], [globalStream], ['Rate:MET', 'BW:MET'], -1],
-        ['xe50_cell',                       351,    'L1_XE35',[], [globalStream], ['Rate:MET', 'BW:MET'], -1],        
+        #['xe50noL1_l2fsperf',                    '',[], [globalStream], ['Rate:MET', 'BW:MET'], -1],
+        #['xe50noL1_l2fsperf_',                    '',[], [globalStream], ['Rate:MET', 'BW:MET'], -1],        
+        ['xe50',                                'L1_XE35',[], [globalStream], ['Rate:MET', 'BW:MET'], -1],
+        ['xe50_cell',                           'L1_XE35',[], [globalStream], ['Rate:MET', 'BW:MET'], -1],        
         ####--- Run L2 algos
-        ['xe50_l2fsperf',                   352,    'L1_XE35',[], [globalStream], ['Rate:MET', 'BW:MET'], -1],
-        ['xe50_l2fsperf_cell',              353,    'L1_XE35',[], [globalStream], ['Rate:MET', 'BW:MET'], -1],        
+        ['xe50_l2fsperf',                       'L1_XE35',[], [globalStream], ['Rate:MET', 'BW:MET'], -1],
+        ['xe50_l2fsperf_cell',                  'L1_XE35',[], [globalStream], ['Rate:MET', 'BW:MET'], -1],        
         ###Muon corrections to FEB MET-use L2_mu8
-        ['xe50_l2fsperf_wEFMuFEB',           354,    'L1_XE35',[], [globalStream], ['Rate:MET', 'BW:MET'], -1],
-        ['xe50_l2fsperf_wEFMuFEB_cell',      355,    'L1_XE35',[], [globalStream], ['Rate:MET', 'BW:MET'], -1],                
+        ['xe50_l2fsperf_wEFMuFEB',              'L1_XE35',[], [globalStream], ['Rate:MET', 'BW:MET'], -1],
+        ['xe50_l2fsperf_wEFMuFEB_cell',         'L1_XE35',[], [globalStream], ['Rate:MET', 'BW:MET'], -1],                
         ###Muon correction to FEB and to EF MET -use EF_mu8
-        ['xe50_l2fsperf_wEFMuFEB_wEFMu',     356,    'L1_XE35',[], [globalStream], ['Rate:MET', 'BW:MET'], -1],
-        ['xe50_l2fsperf_wEFMuFEB_wEFMu_cell',357,    'L1_XE35',[], [globalStream], ['Rate:MET', 'BW:MET'], -1],
+        ['xe50_l2fsperf_wEFMuFEB_wEFMu',         'L1_XE35',[], [globalStream], ['Rate:MET', 'BW:MET'], -1],
+        ['xe50_l2fsperf_wEFMuFEB_wEFMu_cell',    'L1_XE35',[], [globalStream], ['Rate:MET', 'BW:MET'], -1],
 
         ##Other thresolds:
-        ['xe70',                            358,    'L1_XE50',[], [globalStream], ['Rate:MET', 'BW:MET'], -1],
-        ['xe70_cell',                       359,    'L1_XE50',[], [globalStream], ['Rate:MET', 'BW:MET'], -1],    
+        ['xe70',                                'L1_XE50',[], [globalStream], ['Rate:MET', 'BW:MET'], -1],
+        ['xe70_cell',                           'L1_XE50',[], [globalStream], ['Rate:MET', 'BW:MET'], -1],    
         ####--- Run L2 algos
-        ['xe70_l2fsperf',                   360,    'L1_XE50',[], [globalStream], ['Rate:MET', 'BW:MET'], -1],    
-        ['xe70_l2fsperf_cell',              374,    'L1_XE50',[], [globalStream], ['Rate:MET', 'BW:MET'], -1],        
+        ['xe70_l2fsperf',                       'L1_XE50',[], [globalStream], ['Rate:MET', 'BW:MET'], -1],    
+        ['xe70_l2fsperf_cell',                  'L1_XE50',[], [globalStream], ['Rate:MET', 'BW:MET'], -1],        
         ###Muon corrections to FEB MET-use L2_mu8
-        ['xe70_l2fsperf_wEFMuFEB',           375,    'L1_XE50',[], [globalStream], ['Rate:MET', 'BW:MET'], -1],
-        ['xe70_l2fsperf_wEFMuFEB_cell',      376,    'L1_XE50',[], [globalStream], ['Rate:MET', 'BW:MET'], -1],                
+        ['xe70_l2fsperf_wEFMuFEB',             'L1_XE50',[], [globalStream], ['Rate:MET', 'BW:MET'], -1],
+        ['xe70_l2fsperf_wEFMuFEB_cell',        'L1_XE50',[], [globalStream], ['Rate:MET', 'BW:MET'], -1],                
         ###Muon correction to FEB and to EF MET -use EF_mu8
-        ['xe70_l2fsperf_wEFMuFEB_wEFMu',     379,    'L1_XE50',[], [globalStream], ['Rate:MET', 'BW:MET'], -1],
-        ['xe70_l2fsperf_wEFMuFEB_wEFMu_cell',378,    'L1_XE50',[], [globalStream], ['Rate:MET', 'BW:MET'], -1],
+        ['xe70_l2fsperf_wEFMuFEB_wEFMu',         'L1_XE50',[], [globalStream], ['Rate:MET', 'BW:MET'], -1],
+        ['xe70_l2fsperf_wEFMuFEB_wEFMu_cell',    'L1_XE50',[], [globalStream], ['Rate:MET', 'BW:MET'], -1],
         
-        ['xe100',                           361,    'L1_XE70',[], [globalStream], ['Rate:MET', 'BW:MET'], -1],
-        ['xe100_cell',                      362,    'L1_XE70',[], [globalStream], ['Rate:MET', 'BW:MET'], -1],        
-        ['xe100_l2fsperf',                  363,    'L1_XE70',[], [globalStream], ['Rate:MET', 'BW:MET'], -1],
+        ['xe100',                               'L1_XE70',[], [globalStream], ['Rate:MET', 'BW:MET'], -1],
+        ['xe100_cell',                          'L1_XE70',[], [globalStream], ['Rate:MET', 'BW:MET'], -1],        
+        ['xe100_l2fsperf',                      'L1_XE70',[], [globalStream], ['Rate:MET', 'BW:MET'], -1],
 
         
         ###PU suppression####
-        ['xe50_pueta',                            364,    'L1_XE35',[], [globalStream], ['Rate:MET', 'BW:MET'], -1],
+        ['xe50_pueta',                              'L1_XE35',[], [globalStream], ['Rate:MET', 'BW:MET'], -1],
         #--- Run L2 algos
-        ['xe50_l2fsperf_pueta',                   365,    'L1_XE35',[], [globalStream], ['Rate:MET', 'BW:MET'], -1],
+        ['xe50_l2fsperf_pueta',                     'L1_XE35',[], [globalStream], ['Rate:MET', 'BW:MET'], -1],
         ##Muon corrections to FEB MET-use EF_mu8
-        ['xe50_l2fsperf_wEFMuFEB_pueta',           366,    'L1_XE35',[], [globalStream], ['Rate:MET', 'BW:MET'], -1],
+        ['xe50_l2fsperf_wEFMuFEB_pueta',             'L1_XE35',[], [globalStream], ['Rate:MET', 'BW:MET'], -1],
         
         ###Muon correction to FEB and to EF MET -use EF_mu8
-        ['xe50_l2fsperf_wEFMuFEB_wEFMu_pueta',     367,    'L1_XE35',[], [globalStream], ['Rate:MET', 'BW:MET'], -1],
+        ['xe50_l2fsperf_wEFMuFEB_wEFMu_pueta',       'L1_XE35',[], [globalStream], ['Rate:MET', 'BW:MET'], -1],
 
         ##Other thresolds:
-        ['xe70_pueta',                            368,    'L1_XE50',[], [globalStream], ['Rate:MET', 'BW:MET'], -1],
-        ['xe70_l2fsperf_pueta',                   369,    'L1_XE50',[], [globalStream], ['Rate:MET', 'BW:MET'], -1],    
+        ['xe70_pueta',                              'L1_XE50',[], [globalStream], ['Rate:MET', 'BW:MET'], -1],
+        ['xe70_l2fsperf_pueta',                     'L1_XE50',[], [globalStream], ['Rate:MET', 'BW:MET'], -1],    
         
-        ['xe100_pueta',                           370,    'L1_XE70',[], [globalStream], ['Rate:MET', 'BW:MET'], -1],
-        ['xe100_l2fsperf_pueta',                  371,    'L1_XE70',[], [globalStream], ['Rate:MET', 'BW:MET'], -1],
+        ['xe100_pueta',                             'L1_XE70',[], [globalStream], ['Rate:MET', 'BW:MET'], -1],
+        ['xe100_l2fsperf_pueta',                    'L1_XE70',[], [globalStream], ['Rate:MET', 'BW:MET'], -1],
 
         ##Rerun chains
-        ['xe0noL1_l2fsperf',                      372,    '',[], [globalStream], ['Rate:MET', 'BW:MET'], -1],
-        ['xe0noL1_l2fsperf_cell',                 373,    '',[], [globalStream], ['Rate:MET', 'BW:MET'], -1],
+        ['xe0noL1_l2fsperf',                        '',[], [globalStream], ['Rate:MET', 'BW:MET'], -1],
+        ['xe0noL1_l2fsperf_cell',                   '',[], [globalStream], ['Rate:MET', 'BW:MET'], -1],
 
 
         ]
 
     TriggerFlags.TauSlice.signatures = [
-        ['tau20_r1medium1',              5123,          'L1_TAU12', [], [globalStream], ['RATE:SingleTau', 'BW:Tau'], -1],
-        ['tau20_r1perf',                 5124,          'L1_TAU12', [], [globalStream], ['RATE:SingleTau', 'BW:Tau'], -1],
-        ['tau20_r1_idperf',              5125,          'L1_TAU12', [], [globalStream], ['RATE:SingleTau', 'BW:Tau'], -1],
-
-        ['tau25_medium1_calo',           5126,          'L1_TAU12', [], [globalStream], ['RATE:SingleTau', 'BW:Tau'], -1],
-        ['tau25_medium1_track',          5127,          'L1_TAU12', [], [globalStream], ['RATE:SingleTau', 'BW:Tau'], -1],
-        ['tau25_medium1_ptonly',         5128,          'L1_TAU12', [], [globalStream], ['RATE:SingleTau', 'BW:Tau'], -1],
-        ['tau25_medium1_caloonly',       5129,          'L1_TAU12', [], [globalStream], ['RATE:SingleTau', 'BW:Tau'], -1],
-        ['tau25_medium1_trackonly',      5130,          'L1_TAU12', [], [globalStream], ['RATE:SingleTau', 'BW:Tau'], -1],
-        ['tau25_medium1_mvonly',         5131,          'L1_TAU12', [], [globalStream], ['RATE:SingleTau', 'BW:Tau'], -1],
-        ['tau25_r1perf',                 5132,          'L1_TAU12', [], [globalStream], ['RATE:SingleTau', 'BW:Tau'], -1],
-        ['tau25_r1perf_L1TAU6',          5133,          'L1_TAU6',  [], [globalStream], ['RATE:SingleTau', 'BW:Tau'], -1],
-        ['tau25_medium1_mvonly_L1TAU6',  5134,          'L1_TAU6',  [], [globalStream], ['RATE:SingleTau', 'BW:Tau'], -1],
-        ['tau25_perf',                   5122,          'L1_TAU12', [], ['Tau'], ['RATE:SingleTau', 'BW:Tau'], -1],
-        ['tau25_r1perf_L1TAU8',          5233,          'L1_TAU8',  [], [globalStream], ['RATE:SingleTau', 'BW:Tau'], -1],
-        ['tau25_medium1_mvonly_L1TAU8',  5234,          'L1_TAU8',  [], [globalStream], ['RATE:SingleTau', 'BW:Tau'], -1],
-        ['tau25_perf_L1TAU6',            5121,          'L1_TAU6', [], ['Tau'], ['RATE:SingleTau', 'BW:Tau'], -1],
-        ['tau25_perf_L1TAU8',            5120,          'L1_TAU8', [], ['Tau'], ['RATE:SingleTau', 'BW:Tau'], -1],
-        ['tau25_ptonly_idperf',          5119,          'L1_TAU12', [], ['Tau'], ['RATE:SingleTau', 'BW:Tau'], -1],
-
-        ['tau29_r1medium1',              5135,          'L1_TAU20', [], [globalStream], ['RATE:SingleTau', 'BW:Tau'], -1],
-        ['tau29_r1perf',                 5136,          'L1_TAU20', [], [globalStream], ['RATE:SingleTau', 'BW:Tau'], -1],
-        ['tau35_medium1_calo',           5137,          'L1_TAU20', [], [globalStream], ['RATE:SingleTau', 'BW:Tau'], -1],
-        ['tau35_medium1_track',          5138,          'L1_TAU20', [], [globalStream], ['RATE:SingleTau', 'BW:Tau'], -1],
-        ['tau35_medium1_ptonly',         5139,          'L1_TAU20', [], [globalStream], ['RATE:SingleTau', 'BW:Tau'], -1],
-        ['tau35_r1perf',                 5140,          'L1_TAU20', [], [globalStream], ['RATE:SingleTau', 'BW:Tau'], -1],
-        ['tau35_perf',                   5147,          'L1_TAU20', [], ['Tau'], ['RATE:SingleTau', 'BW:Tau'], -1],
-
-        ['tau80_medium1_calo',           5141,          'L1_TAU40', [], [globalStream], ['RATE:SingleTau', 'BW:Tau'], -1],
-        ['tau80_medium1_track',          5142,          'L1_TAU40', [], [globalStream], ['RATE:SingleTau', 'BW:Tau'], -1],
-        ['tau125_r1medium1',             5143,          'L1_TAU60', [], [globalStream], ['RATE:SingleTau', 'BW:Tau'], -1],
-        ['tau125_medium1_calo',          5144,          'L1_TAU60', [], [globalStream], ['RATE:SingleTau', 'BW:Tau'], -1],
-        ['tau125_medium1_track',         5145,          'L1_TAU60', [], [globalStream], ['RATE:SingleTau', 'BW:Tau'], -1],
-        ['tau125_r1perf',                5146,          'L1_TAU60', [], [globalStream], ['RATE:SingleTau', 'BW:Tau'], -1],
-
-        ['tau125_perf',                  5150,          'L1_TAU60', [], ['Tau'], ['RATE:SingleTau', 'BW:Tau'], -1],
+        ['tau20_r1medium1',                       'L1_TAU12', [], [globalStream], ['RATE:SingleTau', 'BW:Tau'], -1],
+        ['tau20_r1perf',                          'L1_TAU12', [], [globalStream], ['RATE:SingleTau', 'BW:Tau'], -1],
+        ['tau20_r1_idperf',                       'L1_TAU12', [], [globalStream], ['RATE:SingleTau', 'BW:Tau'], -1],
+
+        ['tau25_medium1_calo',                    'L1_TAU12', [], [globalStream], ['RATE:SingleTau', 'BW:Tau'], -1],
+        ['tau25_medium1_track',                   'L1_TAU12', [], [globalStream], ['RATE:SingleTau', 'BW:Tau'], -1],
+        ['tau25_medium1_ptonly',                  'L1_TAU12', [], [globalStream], ['RATE:SingleTau', 'BW:Tau'], -1],
+        ['tau25_medium1_caloonly',                'L1_TAU12', [], [globalStream], ['RATE:SingleTau', 'BW:Tau'], -1],
+        ['tau25_medium1_trackonly',               'L1_TAU12', [], [globalStream], ['RATE:SingleTau', 'BW:Tau'], -1],
+        ['tau25_medium1_mvonly',                  'L1_TAU12', [], [globalStream], ['RATE:SingleTau', 'BW:Tau'], -1],
+        ['tau25_r1perf',                          'L1_TAU12', [], [globalStream], ['RATE:SingleTau', 'BW:Tau'], -1],
+        ['tau25_r1perf_L1TAU6',                   'L1_TAU6',  [], [globalStream], ['RATE:SingleTau', 'BW:Tau'], -1],
+        ['tau25_medium1_mvonly_L1TAU6',           'L1_TAU6',  [], [globalStream], ['RATE:SingleTau', 'BW:Tau'], -1],
+        ['tau25_perf',                            'L1_TAU12', [], ['Tau'], ['RATE:SingleTau', 'BW:Tau'], -1],
+        ['tau25_r1perf_L1TAU8',                   'L1_TAU8',  [], [globalStream], ['RATE:SingleTau', 'BW:Tau'], -1],
+        ['tau25_medium1_mvonly_L1TAU8',           'L1_TAU8',  [], [globalStream], ['RATE:SingleTau', 'BW:Tau'], -1],
+        ['tau25_perf_L1TAU6',                     'L1_TAU6', [], ['Tau'], ['RATE:SingleTau', 'BW:Tau'], -1],
+        ['tau25_perf_L1TAU8',                     'L1_TAU8', [], ['Tau'], ['RATE:SingleTau', 'BW:Tau'], -1],
+        ['tau25_ptonly_idperf',                   'L1_TAU12', [], ['Tau'], ['RATE:SingleTau', 'BW:Tau'], -1],
+
+        ['tau29_r1medium1',                       'L1_TAU20', [], [globalStream], ['RATE:SingleTau', 'BW:Tau'], -1],
+        ['tau29_r1perf',                          'L1_TAU20', [], [globalStream], ['RATE:SingleTau', 'BW:Tau'], -1],
+        ['tau35_medium1_calo',                    'L1_TAU20', [], [globalStream], ['RATE:SingleTau', 'BW:Tau'], -1],
+        ['tau35_medium1_track',                   'L1_TAU20', [], [globalStream], ['RATE:SingleTau', 'BW:Tau'], -1],
+        ['tau35_medium1_ptonly',                  'L1_TAU20', [], [globalStream], ['RATE:SingleTau', 'BW:Tau'], -1],
+        ['tau35_r1perf',                          'L1_TAU20', [], [globalStream], ['RATE:SingleTau', 'BW:Tau'], -1],
+        ['tau35_perf',                            'L1_TAU20', [], ['Tau'], ['RATE:SingleTau', 'BW:Tau'], -1],
+
+        ['tau80_medium1_calo',                    'L1_TAU40', [], [globalStream], ['RATE:SingleTau', 'BW:Tau'], -1],
+        ['tau80_medium1_track',                   'L1_TAU40', [], [globalStream], ['RATE:SingleTau', 'BW:Tau'], -1],
+        ['tau125_r1medium1',                      'L1_TAU60', [], [globalStream], ['RATE:SingleTau', 'BW:Tau'], -1],
+        ['tau125_medium1_calo',                   'L1_TAU60', [], [globalStream], ['RATE:SingleTau', 'BW:Tau'], -1],
+        ['tau125_medium1_track',                  'L1_TAU60', [], [globalStream], ['RATE:SingleTau', 'BW:Tau'], -1],
+        ['tau125_r1perf',                         'L1_TAU60', [], [globalStream], ['RATE:SingleTau', 'BW:Tau'], -1],
+
+        ['tau125_perf',                           'L1_TAU60', [], ['Tau'], ['RATE:SingleTau', 'BW:Tau'], -1],
 
 
         ]
@@ -222,342 +222,342 @@ def setupMenu():
        # chainname: [chaincounter, stream, group, bw, prescale, pass through, rerun (to be set to 0 for all), eBstep]
         # single electron chains
         # Et cut only chains
-        ['e5_etcut',                120,          'L1_EM3', [], [globalStream], ['RATE:SingleElectron', 'BW:Egamma'], -1], 
-        #['e15_etcut',               121,          'L1_EM12', [], [globalStream], ['RATE:SingleElectron', 'BW:Egamma'], -1],
-        ['e15_etcut_L1EM7V',          121,          'L1_EM7V', [], [globalStream], ['RATE:SingleElectron', 'BW:Egamma'], -1],
-        ['e25_etcut',               122,          'L1_EM20V', [], [globalStream], ['RATE:SingleElectron', 'BW:Egamma'], -1],
-        ['e35_etcut',               123,          'L1_EM20V', [], [globalStream], ['RATE:SingleElectron', 'BW:Egamma'], -1], 
-        ['e45_etcut',               124,          'L1_EM20V', [], [globalStream], ['RATE:SingleElectron', 'BW:Egamma'], -1], 
-        ['e55_etcut',               125,          'L1_EM50', [], [globalStream], ['RATE:SingleElectron', 'BW:Egamma'], -1], 
-        ['e65_etcut',               126,          'L1_EM50', [], [globalStream], ['RATE:SingleElectron', 'BW:Egamma'], -1], 
-        ['e80_etcut',               127,          'L1_EM50', [], [globalStream], ['RATE:SingleElectron', 'BW:Egamma'], -1], 
-        ['e100_etcut',              128,          'L1_EM50', [], [globalStream], ['RATE:SingleElectron', 'BW:Egamma'], -1], 
-        ['e120_etcut',              129,          'L1_EM50', [], [globalStream], ['RATE:SingleElectron', 'BW:Egamma'], -1], 
+        ['e5_etcut',                   'L1_EM3', [], [globalStream], ['RATE:SingleElectron', 'BW:Egamma'], -1], 
+        #['e15_etcut',                  'L1_EM12', [], [globalStream], ['RATE:SingleElectron', 'BW:Egamma'], -1],
+        ['e15_etcut_L1EM7V',             'L1_EM7V', [], [globalStream], ['RATE:SingleElectron', 'BW:Egamma'], -1],
+        ['e25_etcut',                  'L1_EM20V', [], [globalStream], ['RATE:SingleElectron', 'BW:Egamma'], -1],
+        ['e35_etcut',                  'L1_EM20V', [], [globalStream], ['RATE:SingleElectron', 'BW:Egamma'], -1], 
+        ['e45_etcut',                  'L1_EM20V', [], [globalStream], ['RATE:SingleElectron', 'BW:Egamma'], -1], 
+        ['e55_etcut',                  'L1_EM50', [], [globalStream], ['RATE:SingleElectron', 'BW:Egamma'], -1], 
+        ['e65_etcut',                  'L1_EM50', [], [globalStream], ['RATE:SingleElectron', 'BW:Egamma'], -1], 
+        ['e80_etcut',                  'L1_EM50', [], [globalStream], ['RATE:SingleElectron', 'BW:Egamma'], -1], 
+        ['e100_etcut',                 'L1_EM50', [], [globalStream], ['RATE:SingleElectron', 'BW:Egamma'], -1], 
+        ['e120_etcut',                 'L1_EM50', [], [globalStream], ['RATE:SingleElectron', 'BW:Egamma'], -1], 
 
         # Cut-based Run1 PID chains
         # Loose chains with etcut variations
-        ['e5_loose1',               130,          'L1_EM3', [], [globalStream], ['RATE:SingleElectron', 'BW:Egamma'], -1],
-        #['e15_loose1',              131,          'L1_EM12', [], [globalStream], ['RATE:SingleElectron', 'BW:Egamma'], -1],
-        ['e15_loose1_L1EM7V',         131,          'L1_EM7V', [], [globalStream], ['RATE:SingleElectron', 'BW:Egamma'], -1],
-        ['e25_loose1',              132,          'L1_EM20V', [], [globalStream], ['RATE:SingleElectron', 'BW:Egamma'], -1],
-        ['e35_loose1',              133,          'L1_EM20V', [], [globalStream], ['RATE:SingleElectron', 'BW:Egamma'], -1],
-        ['e45_loose1',              134,          'L1_EM20V', [], [globalStream], ['RATE:SingleElectron', 'BW:Egamma'], -1],
-        ['e55_loose1',              135,          'L1_EM50', [], [globalStream], ['RATE:SingleElectron', 'BW:Egamma'], -1],
-        ['e65_loose1',              136,          'L1_EM50', [], [globalStream], ['RATE:SingleElectron', 'BW:Egamma'], -1],
-        ['e80_loose1',              137,          'L1_EM50', [], [globalStream], ['RATE:SingleElectron', 'BW:Egamma'], -1],
-        ['e100_loose1',             138,          'L1_EM50', [], [globalStream], ['RATE:SingleElectron', 'BW:Egamma'], -1], #needed for exotics background estimation --> needs lower prescale than the rest
-        ['e120_loose1',             139,          'L1_EM50', [], [globalStream], ['RATE:SingleElectron', 'BW:Egamma'], -1],
+        ['e5_loose1',                   'L1_EM3', [], [globalStream], ['RATE:SingleElectron', 'BW:Egamma'], -1],
+        #['e15_loose1',                  'L1_EM12', [], [globalStream], ['RATE:SingleElectron', 'BW:Egamma'], -1],
+        ['e15_loose1_L1EM7V',             'L1_EM7V', [], [globalStream], ['RATE:SingleElectron', 'BW:Egamma'], -1],
+        ['e25_loose1',                  'L1_EM20V', [], [globalStream], ['RATE:SingleElectron', 'BW:Egamma'], -1],
+        ['e35_loose1',                  'L1_EM20V', [], [globalStream], ['RATE:SingleElectron', 'BW:Egamma'], -1],
+        ['e45_loose1',                  'L1_EM20V', [], [globalStream], ['RATE:SingleElectron', 'BW:Egamma'], -1],
+        ['e55_loose1',                  'L1_EM50', [], [globalStream], ['RATE:SingleElectron', 'BW:Egamma'], -1],
+        ['e65_loose1',                  'L1_EM50', [], [globalStream], ['RATE:SingleElectron', 'BW:Egamma'], -1],
+        ['e80_loose1',                  'L1_EM50', [], [globalStream], ['RATE:SingleElectron', 'BW:Egamma'], -1],
+        ['e100_loose1',                 'L1_EM50', [], [globalStream], ['RATE:SingleElectron', 'BW:Egamma'], -1], #needed for exotics background estimation --> needs lower prescale than the rest
+        ['e120_loose1',                 'L1_EM50', [], [globalStream], ['RATE:SingleElectron', 'BW:Egamma'], -1],
         
         # Single electron Run1 PID
-        ['e24_medium1_iloose',       140, 'L1_EM18VH', [], [globalStream], ['RATE:SingleElectron', 'BW:Egamma'], -1], 
-        ['e24_loose1_L1EM20V',       141, 'L1_EM20V', [], [globalStream], ['RATE:SingleElectron', 'BW:Egamma'], -1], 
-        ['e24_medium1_L1EM20V',      142, 'L1_EM20V', [], [globalStream], ['RATE:SingleElectron', 'BW:Egamma'], -1], 
-        ['e24_tight1_L1EM20V',       143, 'L1_EM20V', [], [globalStream], ['RATE:SingleElectron', 'BW:Egamma'], -1], 
-        ['e24_loose1',               144, 'L1_EM18VH', [], [globalStream], ['RATE:SingleElectron', 'BW:Egamma'], -1],
-        #['e24_loose1_L1EM18VHI',     145, 'L1_EM18VHI', [], [globalStream], ['RATE:SingleElectron', 'BW:Egamma'], -1],
-        #['e24_loose1_L1EM18VHIrel',  146, 'L1_EM18VHIrel', [], [globalStream], ['RATE:SingleElectron', 'BW:Egamma'], -1],
-        ['e28_tight1_iloose',        147, 'L1_EM24VHI', [], [globalStream], ['RATE:SingleElectron', 'BW:Egamma'], -1],
-        #['e28_tight1_iloose_L1EM22VHI',    148, 'L1_EM22VHI', [], [globalStream], ['RATE:SingleElectron', 'BW:Egamma'], -1],
-        #['e28_tight1_iloose_L1EM20VHI',    149, 'L1_EM20VHI', [], [globalStream], ['RATE:SingleElectron', 'BW:Egamma'], -1],
-        #['e26_tight1_iloose',        150, 'L1_EM22VHI', [], [globalStream], ['RATE:SingleElectron', 'BW:Egamma'], -1],
-        #['e24_tight1_iloose_L1EM20VHI',    151, 'L1_EM20VHI', [], [globalStream], ['RATE:SingleElectron', 'BW:Egamma'], -1],
-        ['e60_medium1',              152, 'L1_EM50', [], [globalStream], ['RATE:SingleElectron', 'BW:Egamma'], -1], 
-        ['e60_loose1',               153, 'L1_EM50', [], [globalStream], ['RATE:SingleElectron', 'BW:Egamma'], -1], 
+        ['e24_medium1_iloose',        'L1_EM18VH', [], [globalStream], ['RATE:SingleElectron', 'BW:Egamma'], -1], 
+        ['e24_loose1_L1EM20V',        'L1_EM20V', [], [globalStream], ['RATE:SingleElectron', 'BW:Egamma'], -1], 
+        ['e24_medium1_L1EM20V',       'L1_EM20V', [], [globalStream], ['RATE:SingleElectron', 'BW:Egamma'], -1], 
+        ['e24_tight1_L1EM20V',        'L1_EM20V', [], [globalStream], ['RATE:SingleElectron', 'BW:Egamma'], -1], 
+        ['e24_loose1',                'L1_EM18VH', [], [globalStream], ['RATE:SingleElectron', 'BW:Egamma'], -1],
+        #['e24_loose1_L1EM18VHI',      'L1_EM18VHI', [], [globalStream], ['RATE:SingleElectron', 'BW:Egamma'], -1],
+        #['e24_loose1_L1EM18VHIrel',   'L1_EM18VHIrel', [], [globalStream], ['RATE:SingleElectron', 'BW:Egamma'], -1],
+        ['e28_tight1_iloose',          'L1_EM24VHI', [], [globalStream], ['RATE:SingleElectron', 'BW:Egamma'], -1],
+        #['e28_tight1_iloose_L1EM22VHI',   'L1_EM22VHI', [], [globalStream], ['RATE:SingleElectron', 'BW:Egamma'], -1],
+        #['e28_tight1_iloose_L1EM20VHI',   'L1_EM20VHI', [], [globalStream], ['RATE:SingleElectron', 'BW:Egamma'], -1],
+        #['e26_tight1_iloose',         'L1_EM22VHI', [], [globalStream], ['RATE:SingleElectron', 'BW:Egamma'], -1],
+        #['e24_tight1_iloose_L1EM20VHI',     'L1_EM20VHI', [], [globalStream], ['RATE:SingleElectron', 'BW:Egamma'], -1],
+        ['e60_medium1',             'L1_EM50', [], [globalStream], ['RATE:SingleElectron', 'BW:Egamma'], -1], 
+        ['e60_loose1',              'L1_EM50', [], [globalStream], ['RATE:SingleElectron', 'BW:Egamma'], -1], 
 
         # Rerun mode triggers to support Run1 PID chains
-        ['e18_loose1',           155,          'L1_EM15VH', [], [globalStream], ['RATE:SingleElectron', 'BW:Egamma'], -1],
-        ['e17_loose1',           156,          'L1_EM15VH', [], [globalStream], ['RATE:SingleElectron', 'BW:Egamma'], -1],
-        ['e12_loose1_L1EM3',     157,          'L1_EM3', [], [globalStream], ['RATE:SingleElectron', 'BW:Egamma'], -1], 
-        #['e9_loose1',            158,          'L1_EM6', [], [globalStream], ['RATE:SingleElectron', 'BW:Egamma'], -1],
-        ['e9_loose1_L1EM7V',       158,          'L1_EM7V', [], [globalStream], ['RATE:SingleElectron', 'BW:Egamma'], -1],
-        ['e7_medium1',           159,          'L1_EM3', [], [globalStream], ['RATE:SingleElectron', 'BW:Egamma'], -1],
-        ['e12_medium1',          160,          'L1_EM8VH', [], [globalStream], ['RATE:SingleElectron', 'BW:Egamma'], -1],
-        ['e17_medium1',          161,          'L1_EM15VH', [], [globalStream], ['RATE:SingleElectron', 'BW:Egamma'], -1],
-        ['e5_tight1',            162,          'L1_EM3', [], [globalStream], ['RATE:SingleElectron', 'BW:Egamma'], -1],
-        #['e9_tight1',            163,          'L1_EM6', [], [globalStream], ['RATE:SingleElectron', 'BW:Egamma'], -1],
-        #['e14_tight1',           164,          'L1_EM12', [], [globalStream], ['RATE:SingleElectron', 'BW:Egamma'], -1],
-        ['e9_tight1_L1EM3',      163,          'L1_EM3', [], [globalStream], ['RATE:SingleElectron', 'BW:Egamma'], -1],
-        ['e14_tight1_L1EM7V',    164,          'L1_EM7V', [], [globalStream], ['RATE:SingleElectron', 'BW:Egamma'], -1],
-        ['e4_etcut',             165,          'L1_EM3', [], [globalStream], ['RATE:SingleElectron', 'BW:Egamma'], -1],
-        #['e9_etcut',             166,          'L1_EM6', [], [globalStream], ['RATE:SingleElectron', 'BW:Egamma'], -1],
-        #['e14_etcut',            167,          'L1_EM12', [], [globalStream], ['RATE:SingleElectron', 'BW:Egamma'], -1],
-        ['e9_etcut_L1EM3',       166,          'L1_EM3', [], [globalStream], ['RATE:SingleElectron', 'BW:Egamma'], -1],
-        ['e14_etcut_L1EM7V',     167,          'L1_EM7V', [], [globalStream], ['RATE:SingleElectron', 'BW:Egamma'], -1],
-        ['e28_loose1_iloose',    168,          'L1_EM24VHI', [], [globalStream], ['RATE:SingleElectron', 'BW:Egamma'], -1],
+        ['e18_loose1',                   'L1_EM15VH', [], [globalStream], ['RATE:SingleElectron', 'BW:Egamma'], -1],
+        ['e17_loose1',                   'L1_EM15VH', [], [globalStream], ['RATE:SingleElectron', 'BW:Egamma'], -1],
+        ['e12_loose1_L1EM3',             'L1_EM3', [], [globalStream], ['RATE:SingleElectron', 'BW:Egamma'], -1], 
+        #['e9_loose1',                    'L1_EM6', [], [globalStream], ['RATE:SingleElectron', 'BW:Egamma'], -1],
+        ['e9_loose1_L1EM7V',               'L1_EM7V', [], [globalStream], ['RATE:SingleElectron', 'BW:Egamma'], -1],
+        ['e7_medium1',                   'L1_EM3', [], [globalStream], ['RATE:SingleElectron', 'BW:Egamma'], -1],
+        ['e12_medium1',                  'L1_EM8VH', [], [globalStream], ['RATE:SingleElectron', 'BW:Egamma'], -1],
+        ['e17_medium1',                  'L1_EM15VH', [], [globalStream], ['RATE:SingleElectron', 'BW:Egamma'], -1],
+        ['e5_tight1',                    'L1_EM3', [], [globalStream], ['RATE:SingleElectron', 'BW:Egamma'], -1],
+        #['e9_tight1',                    'L1_EM6', [], [globalStream], ['RATE:SingleElectron', 'BW:Egamma'], -1],
+        #['e14_tight1',                   'L1_EM12', [], [globalStream], ['RATE:SingleElectron', 'BW:Egamma'], -1],
+        ['e9_tight1_L1EM3',              'L1_EM3', [], [globalStream], ['RATE:SingleElectron', 'BW:Egamma'], -1],
+        ['e14_tight1_L1EM7V',            'L1_EM7V', [], [globalStream], ['RATE:SingleElectron', 'BW:Egamma'], -1],
+        ['e4_etcut',                     'L1_EM3', [], [globalStream], ['RATE:SingleElectron', 'BW:Egamma'], -1],
+        #['e9_etcut',                     'L1_EM6', [], [globalStream], ['RATE:SingleElectron', 'BW:Egamma'], -1],
+        #['e14_etcut',                    'L1_EM12', [], [globalStream], ['RATE:SingleElectron', 'BW:Egamma'], -1],
+        ['e9_etcut_L1EM3',               'L1_EM3', [], [globalStream], ['RATE:SingleElectron', 'BW:Egamma'], -1],
+        ['e14_etcut_L1EM7V',             'L1_EM7V', [], [globalStream], ['RATE:SingleElectron', 'BW:Egamma'], -1],
+        ['e28_loose1_iloose',            'L1_EM24VHI', [], [globalStream], ['RATE:SingleElectron', 'BW:Egamma'], -1],
 
         # Tracking tune chains for Run1 PID
-        ['e28_tight1_iloose_L2StarA',        169, 'L1_EM24VHI', [], [globalStream], ['RATE:SingleElectron', 'BW:Egamma'], -1], 
-        ['e28_tight1_iloose_L2StarB',        172, 'L1_EM24VHI', [], [globalStream], ['RATE:SingleElectron', 'BW:Egamma'], -1], 
-        ['e28_tight1_iloose_L2StarC',        173, 'L1_EM24VHI', [], [globalStream], ['RATE:SingleElectron', 'BW:Egamma'], -1], 
-        ['e28_tight1_L2Star_idperf',         174, 'L1_EM24VHI', [], [globalStream], ['RATE:SingleElectron', 'BW:Egamma'], -1],
-        ['e28_tight1_idperf',                175, 'L1_EM24VHI', [], [globalStream], ['RATE:SingleElectron', 'BW:Egamma'], -1],
+        ['e28_tight1_iloose_L2StarA',        'L1_EM24VHI', [], [globalStream], ['RATE:SingleElectron', 'BW:Egamma'], -1], 
+        ['e28_tight1_iloose_L2StarB',        'L1_EM24VHI', [], [globalStream], ['RATE:SingleElectron', 'BW:Egamma'], -1], 
+        ['e28_tight1_iloose_L2StarC',        'L1_EM24VHI', [], [globalStream], ['RATE:SingleElectron', 'BW:Egamma'], -1], 
+        ['e28_tight1_L2Star_idperf',         'L1_EM24VHI', [], [globalStream], ['RATE:SingleElectron', 'BW:Egamma'], -1],
+        ['e28_tight1_idperf',                'L1_EM24VHI', [], [globalStream], ['RATE:SingleElectron', 'BW:Egamma'], -1],
         
         # low-ET single electron triggers in rerun mode
-        ['e5_lhtight', 171, 'L1_EM3', [], [globalStream], ['RATE:SingleElectron', 'BW:Egamma'], -1],
-        ['e5_lhtight_idperf', 227, 'L1_EM3', [], [globalStream], ['RATE:SingleElectron', 'BW:Egamma'], -1],
-        ['e5_lhtight_L2Star_idperf', 228, 'L1_EM3', [], [globalStream], ['RATE:SingleElectron', 'BW:Egamma'], -1],
-        ['e5_tight1_idperf', 229, 'L1_EM3', [], [globalStream], ['RATE:SingleElectron', 'BW:Egamma'], -1],
-        ['e5_tight1_L2Star_idperf', 230, 'L1_EM3', [], [globalStream], ['RATE:SingleElectron', 'BW:Egamma'], -1], 
+        ['e5_lhtight',  'L1_EM3', [], [globalStream], ['RATE:SingleElectron', 'BW:Egamma'], -1],
+        ['e5_lhtight_idperf',  'L1_EM3', [], [globalStream], ['RATE:SingleElectron', 'BW:Egamma'], -1],
+        ['e5_lhtight_L2Star_idperf', 'L1_EM3', [], [globalStream], ['RATE:SingleElectron', 'BW:Egamma'], -1],
+        ['e5_tight1_idperf',  'L1_EM3', [], [globalStream], ['RATE:SingleElectron', 'BW:Egamma'], -1],
+        ['e5_tight1_L2Star_idperf', 'L1_EM3', [], [globalStream], ['RATE:SingleElectron', 'BW:Egamma'], -1], 
 
         # Rerun mode triggers to support LH PID chains
-        ['e18_lhloose',           176,          'L1_EM15VH', [], [globalStream], ['RATE:SingleElectron', 'BW:Egamma'], -1],
-        ['e17_lhloose',           177,          'L1_EM15VH', [], [globalStream], ['RATE:SingleElectron', 'BW:Egamma'], -1],
-        ['e12_lhloose_L1EM3',     178,          'L1_EM3', [], [globalStream], ['RATE:SingleElectron', 'BW:Egamma'], -1], 
-        #['e9_lhloose',           178,          'L1_EM6', [], [globalStream], ['RATE:SingleElectron', 'BW:Egamma'], -1],
-        ['e9_lhloose_L1EM7V',     179,          'L1_EM7V', [], [globalStream], ['RATE:SingleElectron', 'BW:Egamma'], -1],
-        ['e28_lhloose_iloose',    180,          'L1_EM24VHI', [], [globalStream], ['RATE:SingleElectron', 'BW:Egamma'], -1],
+        ['e18_lhloose',                  'L1_EM15VH', [], [globalStream], ['RATE:SingleElectron', 'BW:Egamma'], -1],
+        ['e17_lhloose',                  'L1_EM15VH', [], [globalStream], ['RATE:SingleElectron', 'BW:Egamma'], -1],
+        ['e12_lhloose_L1EM3',            'L1_EM3', [], [globalStream], ['RATE:SingleElectron', 'BW:Egamma'], -1], 
+        #['e9_lhloose',                  'L1_EM6', [], [globalStream], ['RATE:SingleElectron', 'BW:Egamma'], -1],
+        ['e9_lhloose_L1EM7V',            'L1_EM7V', [], [globalStream], ['RATE:SingleElectron', 'BW:Egamma'], -1],
+        ['e28_lhloose_iloose',           'L1_EM24VHI', [], [globalStream], ['RATE:SingleElectron', 'BW:Egamma'], -1],
         
         # Single electron Run2 cut-based PID
-        ['e24_medium_iloose',       170, 'L1_EM18VH', [], [globalStream], ['RATE:SingleElectron', 'BW:Egamma'], -1], #In Physics Menu 
-        ['e24_loose_L1EM20V',       181, 'L1_EM20V', [], [globalStream], ['RATE:SingleElectron', 'BW:Egamma'], -1], 
-        ['e24_medium_L1EM20V',      182, 'L1_EM20V', [], [globalStream], ['RATE:SingleElectron', 'BW:Egamma'], -1], 
-        ['e24_tight_L1EM20V',       183, 'L1_EM20V', [], [globalStream], ['RATE:SingleElectron', 'BW:Egamma'], -1], 
-        ['e28_tight_iloose',        184, 'L1_EM24VHI', [], [globalStream], ['RATE:SingleElectron', 'BW:Egamma'], -1], #Run2 baseline 
-        ['e28_tight_iloose_L2StarA',185, 'L1_EM24VHI', [], [globalStream], ['RATE:SingleElectron', 'BW:Egamma'], -1],
-        ['e60_medium',              186, 'L1_EM50', [], [globalStream], ['RATE:SingleElectron', 'BW:Egamma'], -1], 
+        ['e24_medium_iloose',        'L1_EM18VH', [], [globalStream], ['RATE:SingleElectron', 'BW:Egamma'], -1], #In Physics Menu 
+        ['e24_loose_L1EM20V',        'L1_EM20V', [], [globalStream], ['RATE:SingleElectron', 'BW:Egamma'], -1], 
+        ['e24_medium_L1EM20V',       'L1_EM20V', [], [globalStream], ['RATE:SingleElectron', 'BW:Egamma'], -1], 
+        ['e24_tight_L1EM20V',        'L1_EM20V', [], [globalStream], ['RATE:SingleElectron', 'BW:Egamma'], -1], 
+        ['e28_tight_iloose',         'L1_EM24VHI', [], [globalStream], ['RATE:SingleElectron', 'BW:Egamma'], -1], #Run2 baseline 
+        ['e28_tight_iloose_L2StarA', 'L1_EM24VHI', [], [globalStream], ['RATE:SingleElectron', 'BW:Egamma'], -1],
+        ['e60_medium',               'L1_EM50', [], [globalStream], ['RATE:SingleElectron', 'BW:Egamma'], -1], 
         
         # /single electron LH ID chains
-        ['e24_lhmedium_iloose',       187, 'L1_EM18VH', [], [globalStream], ['RATE:SingleElectron', 'BW:Egamma'], -1], 
-        ['e24_lhloose_L1EM20V',       188, 'L1_EM20V', [], [globalStream], ['RATE:SingleElectron', 'BW:Egamma'], -1], #L1_EM20V
-        ['e24_lhmedium_L1EM20V',      189, 'L1_EM20V', [], [globalStream], ['RATE:SingleElectron', 'BW:Egamma'], -1], #L1_EM20V
-        ['e24_lhtight_L1EM20V',       190, 'L1_EM20V', [], [globalStream], ['RATE:SingleElectron', 'BW:Egamma'], -1], #L1_EM20V
-        ['e28_lhtight_iloose',        191, 'L1_EM24VHI', [], [globalStream], ['RATE:SingleElectron', 'BW:Egamma'], -1], #L1_EM18VH
-        ['e28_lhtight_iloose_L2StarA',192, 'L1_EM24VHI', [], [globalStream], ['RATE:SingleElectron', 'BW:Egamma'], -1], #L1_EM18VH
-        ['e28_lhtight_iloose_L2StarB',193, 'L1_EM24VHI', [], [globalStream], ['RATE:SingleElectron', 'BW:Egamma'], -1],
-        ['e28_lhtight_iloose_L2StarC',194, 'L1_EM24VHI', [], [globalStream], ['RATE:SingleElectron', 'BW:Egamma'], -1],
-        ['e28_lhtight_L2Star_idperf', 195, 'L1_EM24VHI', [], [globalStream], ['RATE:SingleElectron', 'BW:Egamma'], -1],
-        ['e28_lhtight_idperf',        196, 'L1_EM24VHI', [], [globalStream], ['RATE:SingleElectron', 'BW:Egamma'], -1],
-        ['e60_lhmedium',              197, 'L1_EM50', [], [globalStream], ['RATE:SingleElectron', 'BW:Egamma'], -1], #L1_EM50
+        ['e24_lhmedium_iloose',        'L1_EM18VH', [], [globalStream], ['RATE:SingleElectron', 'BW:Egamma'], -1], 
+        ['e24_lhloose_L1EM20V',        'L1_EM20V', [], [globalStream], ['RATE:SingleElectron', 'BW:Egamma'], -1], #L1_EM20V
+        ['e24_lhmedium_L1EM20V',       'L1_EM20V', [], [globalStream], ['RATE:SingleElectron', 'BW:Egamma'], -1], #L1_EM20V
+        ['e24_lhtight_L1EM20V',        'L1_EM20V', [], [globalStream], ['RATE:SingleElectron', 'BW:Egamma'], -1], #L1_EM20V
+        ['e28_lhtight_iloose',         'L1_EM24VHI', [], [globalStream], ['RATE:SingleElectron', 'BW:Egamma'], -1], #L1_EM18VH
+        ['e28_lhtight_iloose_L2StarA', 'L1_EM24VHI', [], [globalStream], ['RATE:SingleElectron', 'BW:Egamma'], -1], #L1_EM18VH
+        ['e28_lhtight_iloose_L2StarB', 'L1_EM24VHI', [], [globalStream], ['RATE:SingleElectron', 'BW:Egamma'], -1],
+        ['e28_lhtight_iloose_L2StarC', 'L1_EM24VHI', [], [globalStream], ['RATE:SingleElectron', 'BW:Egamma'], -1],
+        ['e28_lhtight_L2Star_idperf',  'L1_EM24VHI', [], [globalStream], ['RATE:SingleElectron', 'BW:Egamma'], -1],
+        ['e28_lhtight_idperf',         'L1_EM24VHI', [], [globalStream], ['RATE:SingleElectron', 'BW:Egamma'], -1],
+        ['e60_lhmedium',               'L1_EM50', [], [globalStream], ['RATE:SingleElectron', 'BW:Egamma'], -1], #L1_EM50
         
         # multi-electron chains
         # Run1 PID       
-        ['2e12_loose1',             377, 'L1_2EM8VH', [], [globalStream], ['RATE:MultiElectron', 'BW:Egamma'], -1],
-        ['2e17_loose1',             789, 'L1_2EM15VH', [], [globalStream], ['RATE:MultiElectron', 'BW:Egamma'], -1],
-        ['2e17_loose1_L12EM15V',    876, 'L1_2EM15V', [], [globalStream], ['RATE:MultiElectron', 'BW:Egamma'], -1],
-        ['e28_loose1_iloose_e12_loose1_L1EM3',  199, 'L1_EM24VHI', ['L1_EM24VHI','L1_EM3'], [globalStream], ['RATE:MultiElectron', 'BW:Egamma'], -1], 
-        ['e18_loose1_2e9_loose1_L1EM7V',   200, 'L1_EM15VH_3EM7V', ['L1_EM15VH','L1_2EM7V'], [globalStream], ['RATE:MultiElectron', 'BW:Egamma'], -1],                                                      
+        ['2e12_loose1',              'L1_2EM8VH', [], [globalStream], ['RATE:MultiElectron', 'BW:Egamma'], -1],
+        ['2e17_loose1',              'L1_2EM15VH', [], [globalStream], ['RATE:MultiElectron', 'BW:Egamma'], -1],
+        ['2e17_loose1_L12EM15V',     'L1_2EM15V', [], [globalStream], ['RATE:MultiElectron', 'BW:Egamma'], -1],
+        ['e28_loose1_iloose_e12_loose1_L1EM3',  'L1_EM24VHI', ['L1_EM24VHI','L1_EM3'], [globalStream], ['RATE:MultiElectron', 'BW:Egamma'], -1], 
+        ['e18_loose1_2e9_loose1_L1EM7V',        'L1_EM15VH_3EM7V', ['L1_EM15VH','L1_2EM7V'], [globalStream], ['RATE:MultiElectron', 'BW:Egamma'], -1],                                                      
 
         # LH PID
-        ['2e17_lhloose',            201, 'L1_2EM15VH', [], [globalStream], ['RATE:MultiElectron', 'BW:Egamma'], -1],
-        ['e28_lhloose_iloose_e12_lhloose_L1EM3',202, 'L1_EM24VHI', ['L1_EM24VHI','L1_EM3'], [globalStream], ['RATE:MultiElectron', 'BW:Egamma'], -1], 
-        ['e18_lhloose_2e9_lhloose_L1EM7V', 203, 'L1_EM15VH_3EM7V', ['L1_EM15VH','L1_2EM7V'], [globalStream], ['RATE:MultiElectron', 'BW:Egamma'], -1], 
+        ['2e17_lhloose',  'L1_2EM15VH', [], [globalStream], ['RATE:MultiElectron', 'BW:Egamma'], -1],
+        ['e28_lhloose_iloose_e12_lhloose_L1EM3', 'L1_EM24VHI', ['L1_EM24VHI','L1_EM3'], [globalStream], ['RATE:MultiElectron', 'BW:Egamma'], -1], 
+        ['e18_lhloose_2e9_lhloose_L1EM7V',  'L1_EM15VH_3EM7V', ['L1_EM15VH','L1_2EM7V'], [globalStream], ['RATE:MultiElectron', 'BW:Egamma'], -1], 
 
         # Multielectron chains with m_ee cut for Run1 PID
-        ['e5_tight1_e4_etcut',        210,      'L1_2EM3', [], [globalStream], ['RATE:MultiElectron', 'BW:Egamma'], -1],
-        ['e5_tight1_e4_etcut_Jpsiee', 211,      'L1_2EM3', [], [globalStream], ['RATE:MultiElectron', 'BW:Egamma'], -1],
-        ['e5_tight1_L2StarA_e4_etcut_L2StarA_Jpsiee', 212,      'L1_2EM3', [], [globalStream], ['RATE:MultiElectron', 'BW:Egamma'], -1],
-        ['e5_tight1_L2StarB_e4_etcut_L2StarB_Jpsiee', 213,      'L1_2EM3', [], [globalStream], ['RATE:MultiElectron', 'BW:Egamma'], -1],
-        ['e5_tight1_L2StarC_e4_etcut_L2StarC_Jpsiee', 214,      'L1_2EM3', [], [globalStream], ['RATE:MultiElectron', 'BW:Egamma'], -1],
-        ['e5_tight1_L2Star_idperf_e4_etcut_L2Star_idperf_Jpsiee', 215,      'L1_2EM3', [], [globalStream], ['RATE:MultiElectron', 'BW:Egamma'], -1],
-        ['e5_tight1_idperf_e4_etcut_idperf_Jpsiee',   216,      'L1_2EM3', [], [globalStream], ['RATE:MultiElectron', 'BW:Egamma'], -1],
-        #['e9_tight1_e4_etcut_Jpsiee', 217,      'L1_2EM3_EM6', ['L1_EM6','L1_2EM3'], [globalStream], ['RATE:MultiElectron', 'BW:Egamma'], -1],
-        #['e5_tight1_e9_etcut_Jpsiee', 218,      'L1_2EM3_EM6', ['L1_EM3','L1_EM6'], [globalStream], ['RATE:MultiElectron', 'BW:Egamma'], -1],
-        #['e14_tight1_e4_etcut_Jpsiee', 219,      'L1_2EM3_EM12', ['L1_EM12','L1_2EM3'], [globalStream], ['RATE:MultiElectron', 'BW:Egamma'], -1],
-        #['e5_tight1_e14_etcut_Jpsiee', 220,      'L1_2EM3_EM12', ['L1_EM12','L1_2EM3'], [globalStream], ['RATE:MultiElectron', 'BW:Egamma'], -1],
-        ['e9_tight1_L1EM3_e4_etcut_Jpsiee', 217,      'L1_2EM3', [], [globalStream], ['RATE:MultiElectron', 'BW:Egamma'], -1],
-        ['e9_etcut_L1EM3_e5_tight1_Jpsiee', 218,      'L1_2EM3', [], [globalStream], ['RATE:MultiElectron', 'BW:Egamma'], -1], 
-        ['e14_tight1_L1EM7V_e4_etcut_Jpsiee', 219,      'L1_EM7V_2EM3', ['L1_EM7V','L1_EM3'], [globalStream], ['RATE:MultiElectron', 'BW:Egamma'], -1],
-        ['e14_etcut_L1EM7V_e5_tight1_Jpsiee', 220,      'L1_EM7V_2EM3', ['L1_EM7V','L1_EM3'], [globalStream], ['RATE:MultiElectron', 'BW:Egamma'], -1], 
+        ['e5_tight1_e4_etcut',              'L1_2EM3', [], [globalStream], ['RATE:MultiElectron', 'BW:Egamma'], -1],
+        ['e5_tight1_e4_etcut_Jpsiee',       'L1_2EM3', [], [globalStream], ['RATE:MultiElectron', 'BW:Egamma'], -1],
+        ['e5_tight1_L2StarA_e4_etcut_L2StarA_Jpsiee',      'L1_2EM3', [], [globalStream], ['RATE:MultiElectron', 'BW:Egamma'], -1],
+        ['e5_tight1_L2StarB_e4_etcut_L2StarB_Jpsiee',      'L1_2EM3', [], [globalStream], ['RATE:MultiElectron', 'BW:Egamma'], -1],
+        ['e5_tight1_L2StarC_e4_etcut_L2StarC_Jpsiee',      'L1_2EM3', [], [globalStream], ['RATE:MultiElectron', 'BW:Egamma'], -1],
+        ['e5_tight1_L2Star_idperf_e4_etcut_L2Star_idperf_Jpsiee',    'L1_2EM3', [], [globalStream], ['RATE:MultiElectron', 'BW:Egamma'], -1],
+        ['e5_tight1_idperf_e4_etcut_idperf_Jpsiee',       'L1_2EM3', [], [globalStream], ['RATE:MultiElectron', 'BW:Egamma'], -1],
+        #['e9_tight1_e4_etcut_Jpsiee',      'L1_2EM3_EM6', ['L1_EM6','L1_2EM3'], [globalStream], ['RATE:MultiElectron', 'BW:Egamma'], -1],
+        #['e5_tight1_e9_etcut_Jpsiee',      'L1_2EM3_EM6', ['L1_EM3','L1_EM6'], [globalStream], ['RATE:MultiElectron', 'BW:Egamma'], -1],
+        #['e14_tight1_e4_etcut_Jpsiee',      'L1_2EM3_EM12', ['L1_EM12','L1_2EM3'], [globalStream], ['RATE:MultiElectron', 'BW:Egamma'], -1],
+        #['e5_tight1_e14_etcut_Jpsiee',      'L1_2EM3_EM12', ['L1_EM12','L1_2EM3'], [globalStream], ['RATE:MultiElectron', 'BW:Egamma'], -1],
+        ['e9_tight1_L1EM3_e4_etcut_Jpsiee',        'L1_2EM3', [], [globalStream], ['RATE:MultiElectron', 'BW:Egamma'], -1],
+        ['e9_etcut_L1EM3_e5_tight1_Jpsiee',        'L1_2EM3', [], [globalStream], ['RATE:MultiElectron', 'BW:Egamma'], -1], 
+        ['e14_tight1_L1EM7V_e4_etcut_Jpsiee',      'L1_EM7V_2EM3', ['L1_EM7V','L1_EM3'], [globalStream], ['RATE:MultiElectron', 'BW:Egamma'], -1],
+        ['e14_etcut_L1EM7V_e5_tight1_Jpsiee',      'L1_EM7V_2EM3', ['L1_EM7V','L1_EM3'], [globalStream], ['RATE:MultiElectron', 'BW:Egamma'], -1], 
 
 
         # Multielectron chains with m_ee cut for Run1 PID
-        ['e5_lhtight_e4_etcut_Jpsiee',                 221,      'L1_2EM3', [], [globalStream], ['RATE:MultiElectron', 'BW:Egamma'], -1],
-        ['e5_lhtight_L2StarA_e4_etcut_L2StarA_Jpsiee', 222,      'L1_2EM3', [], [globalStream], ['RATE:MultiElectron', 'BW:Egamma'], -1],
-        ['e5_lhtight_L2StarB_e4_etcut_L2StarB_Jpsiee', 223,      'L1_2EM3', [], [globalStream], ['RATE:MultiElectron', 'BW:Egamma'], -1],
-        ['e5_lhtight_L2StarC_e4_etcut_L2StarC_Jpsiee', 224,      'L1_2EM3', [], [globalStream], ['RATE:MultiElectron', 'BW:Egamma'], -1],
-        ['e5_lhtight_L2Star_idperf_e4_etcut_L2Star_idperf_Jpsiee', 225,      'L1_2EM3', [], [globalStream], ['RATE:MultiElectron', 'BW:Egamma'], -1],
-        ['e5_lhtight_idperf_e4_etcut_idperf_Jpsiee',   226,      'L1_2EM3', [], [globalStream], ['RATE:MultiElectron', 'BW:Egamma'], -1],
+        ['e5_lhtight_e4_etcut_Jpsiee',                      'L1_2EM3', [], [globalStream], ['RATE:MultiElectron', 'BW:Egamma'], -1],
+        ['e5_lhtight_L2StarA_e4_etcut_L2StarA_Jpsiee',      'L1_2EM3', [], [globalStream], ['RATE:MultiElectron', 'BW:Egamma'], -1],
+        ['e5_lhtight_L2StarB_e4_etcut_L2StarB_Jpsiee',      'L1_2EM3', [], [globalStream], ['RATE:MultiElectron', 'BW:Egamma'], -1],
+        ['e5_lhtight_L2StarC_e4_etcut_L2StarC_Jpsiee',      'L1_2EM3', [], [globalStream], ['RATE:MultiElectron', 'BW:Egamma'], -1],
+        ['e5_lhtight_L2Star_idperf_e4_etcut_L2Star_idperf_Jpsiee',       'L1_2EM3', [], [globalStream], ['RATE:MultiElectron', 'BW:Egamma'], -1],
+        ['e5_lhtight_idperf_e4_etcut_idperf_Jpsiee',        'L1_2EM3', [], [globalStream], ['RATE:MultiElectron', 'BW:Egamma'], -1],
 
         # Et cut only photon chains
-        #['g12_etcut',               230,          'L1_EM7V', [], [globalStream], ['RATE:SingleElectron', 'BW:Egamma'], -1],
-        ['g20_etcut_L1EM15V',        231,          'L1_EM15V', [], [globalStream], ['RATE:SingleElectron', 'BW:Egamma'], -1],
-        #['g25_etcut',               232,          'L1_EM20V', [], [globalStream], ['RATE:SingleElectron', 'BW:Egamma'], -1],
-        #['g35_etcut',               233,          'L1_EM20V', [], [globalStream], ['RATE:SingleElectron', 'BW:Egamma'], -1],
-        #['g40_etcut',               234,          'L1_EM20V', [], [globalStream], ['RATE:SingleElectron', 'BW:Egamma'], -1],
-        #['g50_etcut',               235,          'L1_EM20V', [], [globalStream], ['RATE:SingleElectron', 'BW:Egamma'], -1],
-        #['g60_etcut',               236,          'L1_EM50', [], [globalStream], ['RATE:SingleElectron', 'BW:Egamma'], -1],
-        #['g80_etcut',               237,          'L1_EM50', [], [globalStream], ['RATE:SingleElectron', 'BW:Egamma'], -1],
-        #['g100_etcut',              238,          'L1_EM50', [], [globalStream], ['RATE:SingleElectron', 'BW:Egamma'], -1],
-        #['g120_etcut',              239,          'L1_EM50', [], [globalStream], ['RATE:SingleElectron', 'BW:Egamma'], -1],
+        #['g12_etcut',                       'L1_EM7V', [], [globalStream], ['RATE:SingleElectron', 'BW:Egamma'], -1],
+        ['g20_etcut_L1EM15V',                'L1_EM15V', [], [globalStream], ['RATE:SingleElectron', 'BW:Egamma'], -1],
+        #['g25_etcut',                       'L1_EM20V', [], [globalStream], ['RATE:SingleElectron', 'BW:Egamma'], -1],
+        #['g35_etcut',                       'L1_EM20V', [], [globalStream], ['RATE:SingleElectron', 'BW:Egamma'], -1],
+        #['g40_etcut',                       'L1_EM20V', [], [globalStream], ['RATE:SingleElectron', 'BW:Egamma'], -1],
+        #['g50_etcut',                       'L1_EM20V', [], [globalStream], ['RATE:SingleElectron', 'BW:Egamma'], -1],
+        #['g60_etcut',                       'L1_EM50', [], [globalStream], ['RATE:SingleElectron', 'BW:Egamma'], -1],
+        #['g80_etcut',                       'L1_EM50', [], [globalStream], ['RATE:SingleElectron', 'BW:Egamma'], -1],
+        #['g100_etcut',                      'L1_EM50', [], [globalStream], ['RATE:SingleElectron', 'BW:Egamma'], -1],
+        #['g120_etcut',                      'L1_EM50', [], [globalStream], ['RATE:SingleElectron', 'BW:Egamma'], -1],
 
 
         # Photon cut-based Run1 PID chains
         # Loose chains for low ET physics and background estimation
-        ['g12_loose1_L1EM7V',        240,          'L1_EM7V', [], [globalStream], ['RATE:SinglePhoton', 'BW:Egamma'], -1],
-        ['g20_loose1_L1EM15V',       241,          'L1_EM15V', [], [globalStream], ['RATE:SinglePhoton', 'BW:Egamma'], -1],
-        ['g25_loose1_L1EM15V',       242,          'L1_EM15V', [], [globalStream], ['RATE:SinglePhoton', 'BW:Egamma'], -1],
-        ['g35_loose1_L1EM15V',       243,          'L1_EM15V', [], [globalStream], ['RATE:SinglePhoton', 'BW:Egamma'], -1],
-        ['g40_loose1',               244,          'L1_EM20V', [], [globalStream], ['RATE:SinglePhoton', 'BW:Egamma'], -1],
-        ['g50_loose1',               245,          'L1_EM20V', [], [globalStream], ['RATE:SinglePhoton', 'BW:Egamma'], -1],
-        ['g60_loose1',               246,          'L1_EM50', [], [globalStream], ['RATE:SinglePhoton', 'BW:Egamma'], -1],### needed also in rerun mode!!!!
-        ['g80_loose1',               247,          'L1_EM50', [], [globalStream], ['RATE:SinglePhoton', 'BW:Egamma'], -1],
-        ['g100_loose1',              248,          'L1_EM50', [], [globalStream], ['RATE:SinglePhoton', 'BW:Egamma'], -1],
+        ['g12_loose1_L1EM7V',             'L1_EM7V', [], [globalStream], ['RATE:SinglePhoton', 'BW:Egamma'], -1],
+        ['g20_loose1_L1EM15V',            'L1_EM15V', [], [globalStream], ['RATE:SinglePhoton', 'BW:Egamma'], -1],
+        ['g25_loose1_L1EM15V',            'L1_EM15V', [], [globalStream], ['RATE:SinglePhoton', 'BW:Egamma'], -1],
+        ['g35_loose1_L1EM15V',            'L1_EM15V', [], [globalStream], ['RATE:SinglePhoton', 'BW:Egamma'], -1],
+        ['g40_loose1',                    'L1_EM20V', [], [globalStream], ['RATE:SinglePhoton', 'BW:Egamma'], -1],
+        ['g50_loose1',                    'L1_EM20V', [], [globalStream], ['RATE:SinglePhoton', 'BW:Egamma'], -1],
+        ['g60_loose1',                    'L1_EM50', [], [globalStream], ['RATE:SinglePhoton', 'BW:Egamma'], -1],### needed also in rerun mode!!!!
+        ['g80_loose1',                    'L1_EM50', [], [globalStream], ['RATE:SinglePhoton', 'BW:Egamma'], -1],
+        ['g100_loose1',                   'L1_EM50', [], [globalStream], ['RATE:SinglePhoton', 'BW:Egamma'], -1],
         
         # Run 2 Baseline chains
-        ['g120_loose1',              250,  'L1_EM50', [], [globalStream], ['RATE:SinglePhoton','BW:Egamma'], -1],
-        ['g140_loose1',              251,  'L1_EM50', [], [globalStream], ['RATE:SinglePhoton','BW:Egamma'], -1],
+        ['g120_loose1',             'L1_EM50', [], [globalStream], ['RATE:SinglePhoton','BW:Egamma'], -1],
+        ['g140_loose1',             'L1_EM50', [], [globalStream], ['RATE:SinglePhoton','BW:Egamma'], -1],
 
         # multi-photon chains Run-1 PID
-        ['g35_loose1_g25_loose1',            252, 'L1_2EM15VH', [], [globalStream], ['RATE:MultiPhoton','BW:Egamma'], -1],
-        ['g35_medium1_g25_medium1',          253, 'L1_2EM15VH', [], [globalStream], ['RATE:MultiPhoton','BW:Egamma'], -1],
-        ['g35_medium1_g25_medium1_L12EM15V', 877, 'L1_2EM15V',  [], [globalStream], ['RATE:MultiElectron', 'BW:Egamma'], -1], 
-        ['2g20_tight1',                      254, 'L1_2EM15VH', [], [globalStream], ['RATE:MultiPhoton','BW:Egamma'], -1],
-        ['3g20_loose1',                      255, 'L1_2EM15VH', [], [globalStream], ['RATE:MultiPhoton','BW:Egamma'], -1],
+        ['g35_loose1_g25_loose1',           'L1_2EM15VH', [], [globalStream], ['RATE:MultiPhoton','BW:Egamma'], -1],
+        ['g35_medium1_g25_medium1',         'L1_2EM15VH', [], [globalStream], ['RATE:MultiPhoton','BW:Egamma'], -1],
+        ['g35_medium1_g25_medium1_L12EM15V','L1_2EM15V',  [], [globalStream], ['RATE:MultiElectron', 'BW:Egamma'], -1], 
+        ['2g20_tight1',                     'L1_2EM15VH', [], [globalStream], ['RATE:MultiPhoton','BW:Egamma'], -1],
+        ['3g20_loose1',                     'L1_2EM15VH', [], [globalStream], ['RATE:MultiPhoton','BW:Egamma'], -1],
 
         # Rerun mode trigger to support combined chains
-        ['g4_etcut',                 260,          'L1_EM3', [], [globalStream], ['RATE:SinglePhoton', 'BW:Egamma'], -1],
-        ['g8_etcut',                 261,          'L1_EM3', [], [globalStream], ['RATE:SinglePhoton', 'BW:Egamma'], -1],
-        ['g8_etcut_L1EM7V',          262,          'L1_EM7V', [], [globalStream], ['RATE:SinglePhoton', 'BW:Egamma'], -1],
-        #['g9_etcut',                 263,          'L1_EM6', [], [globalStream], ['RATE:SinglePhoton', 'BW:Egamma'], -1],
-        #['g14_etcut',                264,          'L1_EM12', [], [globalStream], ['RATE:SinglePhoton', 'BW:Egamma'], -1],
-        #['g9_etcut_L1EM3',           265,          'L1_EM3', [], [globalStream], ['RATE:SinglePhoton', 'BW:Egamma'], -1],
-        #['g14_etcut_L1EM7V',         266,          'L1_EM7V', [], [globalStream], ['RATE:SinglePhoton', 'BW:Egamma'], -1],
-        ['g25_loose1',               265,          'L1_EM15VH', [], [globalStream], ['RATE:SinglePhoton', 'BW:Egamma'], -1],
-        ['g25_medium1_L1EM3',        266,          'L1_EM3', [], [globalStream], ['RATE:SinglePhoton', 'BW:Egamma'], -1], 
-        ['g35_loose1',               267,          'L1_EM15VH', [], [globalStream], ['RATE:SinglePhoton', 'BW:Egamma'], -1],
-        ['g35_medium1',              268,          'L1_EM15VH', [], [globalStream], ['RATE:SinglePhoton', 'BW:Egamma'], -1],
-        ['g12_loose1',               269,          'L1_EM8VH', [], [globalStream], ['RATE:SinglePhoton', 'BW:Egamma'], -1],
-        ['g20_loose1',               270,          'L1_EM15VH', [], [globalStream], ['RATE:SinglePhoton', 'BW:Egamma'], -1],
-        ['g20_tight1',               271,          'L1_EM15VH', [], [globalStream], ['RATE:SinglePhoton', 'BW:Egamma'], -1],
+        ['g4_etcut',                  'L1_EM3', [], [globalStream], ['RATE:SinglePhoton', 'BW:Egamma'], -1],
+        ['g8_etcut',                  'L1_EM3', [], [globalStream], ['RATE:SinglePhoton', 'BW:Egamma'], -1],
+        ['g8_etcut_L1EM7V',           'L1_EM7V', [], [globalStream], ['RATE:SinglePhoton', 'BW:Egamma'], -1],
+        #['g9_etcut',                  'L1_EM6', [], [globalStream], ['RATE:SinglePhoton', 'BW:Egamma'], -1],
+        #['g14_etcut',                 'L1_EM12', [], [globalStream], ['RATE:SinglePhoton', 'BW:Egamma'], -1],
+        #['g9_etcut_L1EM3',            'L1_EM3', [], [globalStream], ['RATE:SinglePhoton', 'BW:Egamma'], -1],
+        #['g14_etcut_L1EM7V',          'L1_EM7V', [], [globalStream], ['RATE:SinglePhoton', 'BW:Egamma'], -1],
+        ['g25_loose1',                'L1_EM15VH', [], [globalStream], ['RATE:SinglePhoton', 'BW:Egamma'], -1],
+        ['g25_medium1_L1EM3',         'L1_EM3', [], [globalStream], ['RATE:SinglePhoton', 'BW:Egamma'], -1], 
+        ['g35_loose1',                'L1_EM15VH', [], [globalStream], ['RATE:SinglePhoton', 'BW:Egamma'], -1],
+        ['g35_medium1',               'L1_EM15VH', [], [globalStream], ['RATE:SinglePhoton', 'BW:Egamma'], -1],
+        ['g12_loose1',                'L1_EM8VH', [], [globalStream], ['RATE:SinglePhoton', 'BW:Egamma'], -1],
+        ['g20_loose1',                'L1_EM15VH', [], [globalStream], ['RATE:SinglePhoton', 'BW:Egamma'], -1],
+        ['g20_tight1',                'L1_EM15VH', [], [globalStream], ['RATE:SinglePhoton', 'BW:Egamma'], -1],
 
         # e/g Combined + mass cut Chains ### should these become instead of 'Egamma' --> 'Combined' ???
         # J/psi
-        ###['e5_tight1_g4_etcut', 280,      'L1_2EM3', [], [globalStream], ['RATE:MultiElectron', 'BW:Egamma'], -1],### added to combined chains
-        #['e5_tight1_g4_etcut_Jpsiee', 280,      'L1_2EM3', [], [globalStream], ['RATE:MultiElectron', 'BW:Egamma'], -1],
-        #['e9_tight1_g4_etcut_Jpsiee', 281,      'L1_2EM3_EM6', ['L1_EM6','L1_2EM3'], [globalStream], ['RATE:MultiElectron', 'BW:Egamma'], -1],
-        #['e5_tight1_g9_etcut_Jpsiee', 282,      'L1_EM3_EM6', ['L1_EM6','L1_2EM3'], [globalStream], ['RATE:MultiElectron', 'BW:Egamma'], -1],
-        #['e14_tight1_g4_etcut_Jpsiee', 283,      'L1_2EM3_EM12', ['L1_EM12','L1_2EM3'], [globalStream], ['RATE:MultiElectron', 'BW:Egamma'], -1],
-        #['e5_tight1_g14_etcut_Jpsiee', 284,      'L1_2EM3_EM12', ['L1_EM12','L1_2EM3'], [globalStream], ['RATE:MultiElectron', 'BW:Egamma'], -1],
+        ###['e5_tight1_g4_etcut',           'L1_2EM3', [], [globalStream], ['RATE:MultiElectron', 'BW:Egamma'], -1],### added to combined chains
+        #['e5_tight1_g4_etcut_Jpsiee',      'L1_2EM3', [], [globalStream], ['RATE:MultiElectron', 'BW:Egamma'], -1],
+        #['e9_tight1_g4_etcut_Jpsiee',      'L1_2EM3_EM6', ['L1_EM6','L1_2EM3'], [globalStream], ['RATE:MultiElectron', 'BW:Egamma'], -1],
+        #['e5_tight1_g9_etcut_Jpsiee',      'L1_EM3_EM6', ['L1_EM6','L1_2EM3'], [globalStream], ['RATE:MultiElectron', 'BW:Egamma'], -1],
+        #['e14_tight1_g4_etcut_Jpsiee',     'L1_2EM3_EM12', ['L1_EM12','L1_2EM3'], [globalStream], ['RATE:MultiElectron', 'BW:Egamma'], -1],
+        #['e5_tight1_g14_etcut_Jpsiee',     'L1_2EM3_EM12', ['L1_EM12','L1_2EM3'], [globalStream], ['RATE:MultiElectron', 'BW:Egamma'], -1],
         
         # Zee ### should these become instead of 'Egamma' --> 'Combined' ???
-        #['e28_tight1_iloose_g8_etcut_Zeg', 285, 'L1_EM24VHI', [], [globalStream], ['RATE:MultiElectron', 'BW:Egamma'], -1],
-        ###['e28_tight1_iloose_g8_etcut', 286, 'L1_EM24VHI', [], [globalStream], ['RATE:MultiElectron', 'BW:Egamma'], -1],### added to combined chains
-        ###['e17_loose1_2g8_etcut', 287, 'L1_EM15VH_3EM7V', ['L1_EM15VH','L1_3EM7V'], [globalStream], ['RATE:MultiElectron', 'BW:Egamma'], -1],### added to combined chains
+        #['e28_tight1_iloose_g8_etcut_Zeg', 'L1_EM24VHI', [], [globalStream], ['RATE:MultiElectron', 'BW:Egamma'], -1],
+        ###['e28_tight1_iloose_g8_etcut', 'L1_EM24VHI', [], [globalStream], ['RATE:MultiElectron', 'BW:Egamma'], -1],### added to combined chains
+        ###['e17_loose1_2g8_etcut',  'L1_EM15VH_3EM7V', ['L1_EM15VH','L1_3EM7V'], [globalStream], ['RATE:MultiElectron', 'BW:Egamma'], -1],### added to combined chains
 
         # Fall-back if problem with new tracking
-        ['e17_etcut',                        290, 'L1_EM15VH', [], [globalStream], ['RATE:SingleElectron', 'BW:Egamma'], -1],
-        ['e17_etcut_L2StarA',                291, 'L1_EM15VH', [], [globalStream], ['RATE:SingleElectron', 'BW:Egamma'], -1],
-        ['e17_etcut_L2StarB',                292, 'L1_EM15VH', [], [globalStream], ['RATE:SingleElectron', 'BW:Egamma'], -1],
-        ['e17_etcut_L2StarC',                293, 'L1_EM15VH', [], [globalStream], ['RATE:SingleElectron', 'BW:Egamma'], -1],
-        ['e17_etcut_L2Star_idperf',          294, 'L1_EM15VH', [], [globalStream], ['RATE:SingleElectron', 'BW:Egamma'], -1],
-        ['e17_etcut_idperf',                 295, 'L1_EM15VH', [], [globalStream], ['RATE:SingleElectron', 'BW:Egamma'], -1],
+        ['e17_etcut',                      'L1_EM15VH', [], [globalStream], ['RATE:SingleElectron', 'BW:Egamma'], -1],
+        ['e17_etcut_L2StarA',              'L1_EM15VH', [], [globalStream], ['RATE:SingleElectron', 'BW:Egamma'], -1],
+        ['e17_etcut_L2StarB',              'L1_EM15VH', [], [globalStream], ['RATE:SingleElectron', 'BW:Egamma'], -1],
+        ['e17_etcut_L2StarC',              'L1_EM15VH', [], [globalStream], ['RATE:SingleElectron', 'BW:Egamma'], -1],
+        ['e17_etcut_L2Star_idperf',        'L1_EM15VH', [], [globalStream], ['RATE:SingleElectron', 'BW:Egamma'], -1],
+        ['e17_etcut_idperf',               'L1_EM15VH', [], [globalStream], ['RATE:SingleElectron', 'BW:Egamma'], -1],
         
         # perf chains to study L2/EF options ### need development in ElectronDef.py !!!
-        ['e0_perf_L1EM15VH', 296, 'L1_EM15VH', [], [globalStream], ['RATE:SingleElectron', 'BW:Egamma'], -1],
-        ['e0_L2Star_perf_L1EM15VH', 297, 'L1_EM15VH', [], [globalStream], ['RATE:SingleElectron', 'BW:Egamma'], -1],
-        ['g0_perf_L1EM15VH', 298, 'L1_EM15VH', [], [globalStream], ['RATE:SinglePhoton', 'BW:Egamma'], -1], 
+        ['e0_perf_L1EM15VH',  'L1_EM15VH', [], [globalStream], ['RATE:SingleElectron', 'BW:Egamma'], -1],
+        ['e0_L2Star_perf_L1EM15VH',  'L1_EM15VH', [], [globalStream], ['RATE:SingleElectron', 'BW:Egamma'], -1],
+        ['g0_perf_L1EM15VH', 'L1_EM15VH', [], [globalStream], ['RATE:SinglePhoton', 'BW:Egamma'], -1], 
 
         # extra id perf chains
-        ['e24_medium1_L2Star_idperf', 286, 'L1_EM18VH', [], [globalStream], ['RATE:SingleElectron', 'BW:Egamma'],1],
-        ['e5_loose1_L2Star_idperf', 288, 'L1_EM3', [], [globalStream], ['RATE:SingleElectron', 'BW:Egamma'],1],
-        ['e24_medium1_idperf', 289, 'L1_EM18VH', [], [globalStream], ['RATE:SingleElectron', 'BW:Egamma'],1],
-        ['e5_loose1_idperf', 444, 'L1_EM3', [], [globalStream], ['RATE:SingleElectron', 'BW:Egamma'],1],
-        ['e24_medium1_iloose_L2StarA', 445, 'L1_EM18VH', [], [globalStream], ['RATE:SingleElectron', 'BW:Egamma'],1],
+        ['e24_medium1_L2Star_idperf', 'L1_EM18VH', [], [globalStream], ['RATE:SingleElectron', 'BW:Egamma'],1],
+        ['e5_loose1_L2Star_idperf',  'L1_EM3', [], [globalStream], ['RATE:SingleElectron', 'BW:Egamma'],1],
+        ['e24_medium1_idperf',  'L1_EM18VH', [], [globalStream], ['RATE:SingleElectron', 'BW:Egamma'],1],
+        ['e5_loose1_idperf', 'L1_EM3', [], [globalStream], ['RATE:SingleElectron', 'BW:Egamma'],1],
+        ['e24_medium1_iloose_L2StarA',  'L1_EM18VH', [], [globalStream], ['RATE:SingleElectron', 'BW:Egamma'],1],
                                                            
         # technical chain for forward electrons ### please check!!!! should this become instead of 'Egamma' --> 'Combined' ???
-        ['e17_loose1_L1EM15VHJ1523ETA49',    299,          'L1_EM15VH_J15.23ETA49', ['L1_EM15VH',''], [globalStream], ['RATE:Combined', 'BW:Egamma'], -1],### waiting for L1 fixes
+        ['e17_loose1_L1EM15VHJ1523ETA49',         'L1_EM15VH_J15.23ETA49', ['L1_EM15VH',''], [globalStream], ['RATE:Combined', 'BW:Egamma'], -1],### waiting for L1 fixes
         ]
 
 
     TriggerFlags.BphysicsSlice.signatures = [
         #L1_3MU6 seeded
-        ['3mu6_bJpsi',                 300,  'L1_3MU6', [], [globalStream], ['RATE:Bphysics_MultiMuon','BW:Bphys'], -1],
-        ['3mu6_bTau',                  301,  'L1_3MU6', [], [globalStream], ['RATE:Bphysics_MultiMuon','BW:Bphys'], -1],
-        ['3mu6_bDimu',                 302,  'L1_3MU6', [], [globalStream], ['RATE:Bphysics_MultiMuon','BW:Bphys'], -1],
+        ['3mu6_bJpsi',                'L1_3MU6', [], [globalStream], ['RATE:Bphysics_MultiMuon','BW:Bphys'], -1],
+        ['3mu6_bTau',                 'L1_3MU6', [], [globalStream], ['RATE:Bphysics_MultiMuon','BW:Bphys'], -1],
+        ['3mu6_bDimu',                'L1_3MU6', [], [globalStream], ['RATE:Bphysics_MultiMuon','BW:Bphys'], -1],
 
         #L1Topo seeded  # temporary changed L1_2MU6_02DR-MU6-MU6 into L1_2MU6 until L1Topo is available. (#104272)
-        ['2mu6_bBmumu',                 303, 'L1_2MU6', [], [globalStream], ['RATE:Bphysics_MultiMuon','BW:Bphys'], -1],
-        ['2mu6_bBmumuxv2',              304, 'L1_2MU6', [], [globalStream], ['RATE:Bphysics_MultiMuon','BW:Bphys'], -1],
-        ['2mu6_bBmumux_BcmumuDsloose',  336, 'L1_2MU6', [], [globalStream], ['RATE:Bphysics_MultiMuon','BW:Bphys'], -1],
-        ['2mu6_bJpsimumu',             305, 'L1_2MU6', [], [globalStream], ['RATE:Bphysics_MultiMuon','BW:Bphys'], -1],
-        ['2mu6_bUpsimumu',             306, 'L1_2MU6', [], [globalStream], ['RATE:Bphysics_MultiMuon','BW:Bphys'], -1],
+        ['2mu6_bBmumu',                'L1_2MU6', [], [globalStream], ['RATE:Bphysics_MultiMuon','BW:Bphys'], -1],
+        ['2mu6_bBmumuxv2',             'L1_2MU6', [], [globalStream], ['RATE:Bphysics_MultiMuon','BW:Bphys'], -1],
+        ['2mu6_bBmumux_BcmumuDsloose', 'L1_2MU6', [], [globalStream], ['RATE:Bphysics_MultiMuon','BW:Bphys'], -1],
+        ['2mu6_bJpsimumu',             'L1_2MU6', [], [globalStream], ['RATE:Bphysics_MultiMuon','BW:Bphys'], -1],
+        ['2mu6_bUpsimumu',             'L1_2MU6', [], [globalStream], ['RATE:Bphysics_MultiMuon','BW:Bphys'], -1],
 
         #L1_2MU10 seeded
-        ['2mu10_bBmumu',                337, 'L1_2MU10', [], [globalStream], ['RATE:Bphysics_MultiMuon','BW:Bphys'], -1],
-        ['2mu10_bBmumuxv2',             338, 'L1_2MU10', [], [globalStream], ['RATE:Bphysics_MultiMuon','BW:Bphys'], -1],
-        ['2mu10_bBmumux_BcmumuDsloose', 339, 'L1_2MU10', [], [globalStream], ['RATE:Bphysics_MultiMuon','BW:Bphys'], -1],
-        ['2mu10_bJpsimumu',            330, 'L1_2MU10', [], [globalStream], ['RATE:Bphysics_MultiMuon','BW:Bphys'], -1],
-        ['2mu10_bUpsimumu',            331, 'L1_2MU10', [], [globalStream], ['RATE:Bphysics_MultiMuon','BW:Bphys'], -1],
-        ['mu13_mu13_idperf_Zmumu',     335, 'L1_2MU10', [], [globalStream], ['RATE:Bphysics_MultiMuon','BW:Bphys'], -1],
+        ['2mu10_bBmumu',                'L1_2MU10', [], [globalStream], ['RATE:Bphysics_MultiMuon','BW:Bphys'], -1],
+        ['2mu10_bBmumuxv2',             'L1_2MU10', [], [globalStream], ['RATE:Bphysics_MultiMuon','BW:Bphys'], -1],
+        ['2mu10_bBmumux_BcmumuDsloose', 'L1_2MU10', [], [globalStream], ['RATE:Bphysics_MultiMuon','BW:Bphys'], -1],
+        ['2mu10_bJpsimumu',             'L1_2MU10', [], [globalStream], ['RATE:Bphysics_MultiMuon','BW:Bphys'], -1],
+        ['2mu10_bUpsimumu',             'L1_2MU10', [], [globalStream], ['RATE:Bphysics_MultiMuon','BW:Bphys'], -1],
+        ['mu13_mu13_idperf_Zmumu',      'L1_2MU10', [], [globalStream], ['RATE:Bphysics_MultiMuon','BW:Bphys'], -1],
 
         #L1_2MU4 seeded
-        ['mu4_iloose_mu4_7invm9_noos', 332, 'L1_2MU4', [], [globalStream], ['RATE:Bphysics_MultiMuon','BW:Bphys'], -1],
-        ['mu4_mu4_idperf_bJpsimumu_noid',          333, 'L1_2MU4', [], [globalStream], ['RATE:Bphysics_MultiMuon','BW:Bphys'], -1],
+        ['mu4_iloose_mu4_7invm9_noos',  'L1_2MU4', [], [globalStream], ['RATE:Bphysics_MultiMuon','BW:Bphys'], -1],
+        ['mu4_mu4_idperf_bJpsimumu_noid',          'L1_2MU4', [], [globalStream], ['RATE:Bphysics_MultiMuon','BW:Bphys'], -1],
 
         #L1_MU6 seeded
-        ['mu6_bJpsi_Trkloose',         334, 'L1_MU6', [], [globalStream], ['RATE:Bphysics_MultiMuon','BW:Bphys'], -1],
+        ['mu6_bJpsi_Trkloose',         'L1_MU6', [], [globalStream], ['RATE:Bphysics_MultiMuon','BW:Bphys'], -1],
         
         # L1_2MU6
-        ['2mu6_bDimu', 340,             'L1_2MU6', [], [globalStream], ['RATE:Bphysics_MultiMuon','BW:Bphys'], -1], 
-        ['2mu6_bDimu_novtx_noos', 341, 'L1_2MU6', [], [globalStream], ['RATE:Bphysics_MultiMuon','BW:Bphys'], -1],          
+        ['2mu6_bDimu',              'L1_2MU6', [], [globalStream], ['RATE:Bphysics_MultiMuon','BW:Bphys'], -1], 
+        ['2mu6_bDimu_novtx_noos',  'L1_2MU6', [], [globalStream], ['RATE:Bphysics_MultiMuon','BW:Bphys'], -1],          
         ]
 
     TriggerFlags.CombinedSlice.signatures = [
-        ['e17_medium1_mu12', 815, 'L1_EM15VH_MU10', ['L1_EM15VH', 'L1_MU10'], [globalStream], ['RATE:ElectronMuon', 'BW:Egamma', 'BW:Muon'], -1,['parallel',-1,[] ]],#EM24VH
-        ['e7_medium1_mu24', 814, 'L1_MU20', ['L1_EM3', 'L1_MU20'], [globalStream], ['RATE:ElectronMuon', 'BW:Egamma', 'BW:Muon'], -1,['parallel',-1,[] ]],#EM24VH
-        ['2e12_medium1_mu12', 813, 'L1_2EM8VH_MU10', ['L1_2EM8VH', 'L1_MU10'], [globalStream], ['RATE:ElectronMuon', 'BW:Egamma', 'BW:Muon'], -1,['parallel',-1,[] ]],#EM24VH
-        ['e12_medium1_2mu8', 812, 'L1_EM8VH_2MU6', ['L1_EM8VH', 'L1_2MU6'], [globalStream], ['RATE:ElectronMuon', 'BW:Egamma', 'BW:Muon'], -1,['parallel',-1,[] ]],#EM24VH 
+        ['e17_medium1_mu12',  'L1_EM15VH_MU10', ['L1_EM15VH', 'L1_MU10'], [globalStream], ['RATE:ElectronMuon', 'BW:Egamma', 'BW:Muon'], -1,['parallel',-1,[] ]],#EM24VH
+        ['e7_medium1_mu24',   'L1_MU20', ['L1_EM3', 'L1_MU20'], [globalStream], ['RATE:ElectronMuon', 'BW:Egamma', 'BW:Muon'], -1,['parallel',-1,[] ]],#EM24VH
+        ['2e12_medium1_mu12', 'L1_2EM8VH_MU10', ['L1_2EM8VH', 'L1_MU10'], [globalStream], ['RATE:ElectronMuon', 'BW:Egamma', 'BW:Muon'], -1,['parallel',-1,[] ]],#EM24VH
+        ['e12_medium1_2mu8', 'L1_EM8VH_2MU6', ['L1_EM8VH', 'L1_2MU6'], [globalStream], ['RATE:ElectronMuon', 'BW:Egamma', 'BW:Muon'], -1,['parallel',-1,[] ]],#EM24VH 
 
-        ['g25_medium1_L1EM3_mu24', 810,      'L1_MU20', ['L1_EM3','L1_MU20'], [globalStream], ['RATE:ElectronMuon', 'BW:Egamma', 'BW:Muon'], -1, ['parallel',-1,[] ]],
-        ['g12_loose1_2mu10_msonly', 809,      'L1_EM8VH_2MU6', ['L1_EM8VH', 'L1_2MU6'], [globalStream], ['RATE:ElectronMuon', 'BW:Egamma', 'BW:Muon'], -1, ['parallel',-1,[] ]],
+        ['g25_medium1_L1EM3_mu24',       'L1_MU20', ['L1_EM3','L1_MU20'], [globalStream], ['RATE:ElectronMuon', 'BW:Egamma', 'BW:Muon'], -1, ['parallel',-1,[] ]],
+        ['g12_loose1_2mu10_msonly',      'L1_EM8VH_2MU6', ['L1_EM8VH', 'L1_2MU6'], [globalStream], ['RATE:ElectronMuon', 'BW:Egamma', 'BW:Muon'], -1, ['parallel',-1,[] ]],
 
-        ['2g20_loose1_mu20noL1', 807,      'L1_2EM15VH', ['L1_2EM15VH', ''], [globalStream], ['RATE:ElectronMuon', 'BW:Egamma', 'BW:Muon'], -1, ['serial',-1,['2g20_loose1','mu20noL1'] ]], 
-        ['e28_medium1_mu8noL1', 808,  'L1_EM24VHI', ['L1_EM24VHI', ''], [globalStream], ['RATE:ElectronMuon', 'BW:Egamma'], -1, ['serial',-1,['e28_medium1','mu8noL1'] ]],       
+        ['2g20_loose1_mu20noL1',       'L1_2EM15VH', ['L1_2EM15VH', ''], [globalStream], ['RATE:ElectronMuon', 'BW:Egamma', 'BW:Muon'], -1, ['serial',-1,['2g20_loose1','mu20noL1'] ]], 
+        ['e28_medium1_mu8noL1',    'L1_EM24VHI', ['L1_EM24VHI', ''], [globalStream], ['RATE:ElectronMuon', 'BW:Egamma'], -1, ['serial',-1,['e28_medium1','mu8noL1'] ]],       
 
-        ['e5_tight1_g4_etcut', 811,      'L1_2EM3', [], [globalStream], ['RATE:ElectronPhoton', 'BW:Egamma'], -1, ['parallel',-1,[] ]],
-        ['e28_medium1_g8_etcut', 805, 'L1_EM24VHI', ['L1_EM24VHI','L1_EM3'], [globalStream], ['RATE:ElectronPhoton', 'BW:Egamma'], -1, ['parallel',-1,[] ]],### CHECK L1 Config, if correct L1 item needs to be added
-        ['e17_loose1_2g8_etcut_L12EM7V', 287, 'L1_EM15VH_3EM7V',['L1_EM15VH','L1_2EM7V'], [globalStream], ['RATE:ElectronPhoton', 'BW:Egamma'], -1,['parallel',-1,[] ]],
-        ['e24_medium1_g25_medium1', 890, 'L1_2EM15VH',[], [globalStream], ['RATE:ElectronPhoton', 'BW:Egamma'], -1,['parallel',-1,[] ]],
-        ['e20_medium1_g35_loose1', 891, 'L1_2EM15VH',[], [globalStream], ['RATE:ElectronPhoton', 'BW:Egamma'], -1,['parallel',-1,[] ]],
-        ['e20_medium1_2g20_loose1', 892, 'L1_2EM15VH',[], [globalStream], ['RATE:ElectronPhoton', 'BW:Egamma'], -1,['parallel',-1,[] ]],
+        ['e5_tight1_g4_etcut',         'L1_2EM3', [], [globalStream], ['RATE:ElectronPhoton', 'BW:Egamma'], -1, ['parallel',-1,[] ]],
+        ['e28_medium1_g8_etcut',  'L1_EM24VHI', ['L1_EM24VHI','L1_EM3'], [globalStream], ['RATE:ElectronPhoton', 'BW:Egamma'], -1, ['parallel',-1,[] ]],### CHECK L1 Config, if correct L1 item needs to be added
+        ['e17_loose1_2g8_etcut_L12EM7V',  'L1_EM15VH_3EM7V',['L1_EM15VH','L1_2EM7V'], [globalStream], ['RATE:ElectronPhoton', 'BW:Egamma'], -1,['parallel',-1,[] ]],
+        ['e24_medium1_g25_medium1',       'L1_2EM15VH',[], [globalStream], ['RATE:ElectronPhoton', 'BW:Egamma'], -1,['parallel',-1,[] ]],
+        ['e20_medium1_g35_loose1',        'L1_2EM15VH',[], [globalStream], ['RATE:ElectronPhoton', 'BW:Egamma'], -1,['parallel',-1,[] ]],
+        ['e20_medium1_2g20_loose1',       'L1_2EM15VH',[], [globalStream], ['RATE:ElectronPhoton', 'BW:Egamma'], -1,['parallel',-1,[] ]],
 
         
 
         #MET+X
-        ['mu24_xe100noL1_wEFMu',       901, 'L1_MU20',['L1_MU20',''], [globalStream], ['RATE:METMuon', 'BW:Muon'], -1,['serial',-1,["mu24","xe100noL1_wEFMu"]]],
-        ['e28_medium1_xe100noL1', 902, 'L1_EM24VHI',['L1_EM24VHI',''], [globalStream], ['RATE:METElectron', 'BW:Egamma'], -1,['serial',-1,["e28_medium1","xe100noL1"]]], 
-        ['g60_loose1_xe60noL1',         903, 'L1_EM50',['L1_EM50',''], [globalStream], ['RATE:METElectron', 'BW:Egamma'], -1,['serial',-1,["g60_loose1","xe60noL1"]]],        
+        ['mu24_xe100noL1_wEFMu',        'L1_MU20',['L1_MU20',''], [globalStream], ['RATE:METMuon', 'BW:Muon'], -1,['serial',-1,["mu24","xe100noL1_wEFMu"]]],
+        ['e28_medium1_xe100noL1',       'L1_EM24VHI',['L1_EM24VHI',''], [globalStream], ['RATE:METElectron', 'BW:Egamma'], -1,['serial',-1,["e28_medium1","xe100noL1"]]], 
+        ['g60_loose1_xe60noL1',         'L1_EM50',['L1_EM50',''], [globalStream], ['RATE:METElectron', 'BW:Egamma'], -1,['serial',-1,["g60_loose1","xe60noL1"]]],        
         
 
-        ['j100_xe80',              904, 'L1_J40_XE50',['',''], [globalStream], ['RATE:JetMET', 'BW:Jets'], 1, ['serial',-1, ["j100","xe80"]]], 
-        ['j80_xe80',               905, 'L1_J40_XE50',['',''], [globalStream], ['RATE:JetMET', 'BW:Jets'], 1, ['serial',-1, ["j80","xe80"]]], 
-        ['j80_xe80_dphi1',         878, 'L1_J40_XE50',['',''], [globalStream], ['RATE:JetMET', 'BW:Jets'], 1, ['serial',-1, ["j80","xe80"]]], 
+        ['j100_xe80',               'L1_J40_XE50',['',''], [globalStream], ['RATE:JetMET', 'BW:Jets'], 1, ['serial',-1, ["j100","xe80"]]], 
+        ['j80_xe80',                'L1_J40_XE50',['',''], [globalStream], ['RATE:JetMET', 'BW:Jets'], 1, ['serial',-1, ["j80","xe80"]]], 
+        ['j80_xe80_dphi1',          'L1_J40_XE50',['',''], [globalStream], ['RATE:JetMET', 'BW:Jets'], 1, ['serial',-1, ["j80","xe80"]]], 
 
 
         # TAU+X
-        ['tau35_medium1_calo_tau25_medium1_calo',          906, 'L1_TAU20_2TAU12_J25_2J20_3J12',['L1_TAU20','L1_TAU12'], [globalStream], ['RATE:Tau', 'BW:Tau'], -1,['serial',-1,["tau35_medium1_calo","tau25_medium1_calo"]]],
-        ['e18_loose1_tau25_medium1_calo',                  907, 'L1_EM15VH_2TAU12_J25_2J15_3J12',['L1_EM15VH','L1_TAU12'], [globalStream], ['RATE:ElectronTau', 'BW:Tau'], -1,['serial',-1,["e18_loose1","tau25_medium1_calo"]]],
-        ['e18_lhloose_tau25_medium1_calo',                 908, 'L1_EM15VH_2TAU12_J25_2J15_3J12',['L1_EM15VH','L1_TAU12'], [globalStream], ['RATE:ElectronTau', 'BW:Tau'], -1,['serial',-1,["e18_lhloose","tau25_medium1_calo"]]],
-        ['e18_loose1_tau80_medium1_calo',                  909, 'L1_EM15VH_TAU40_2TAU15',['L1_EM15VH','L1_TAU40'], [globalStream], ['RATE:ElectronTau', 'BW:Tau'], -1,['serial',-1,["e18_loose1","tau80_medium1_calo"]]],
-        ['e18_lhloose_tau80_medium1_calo',                 910, 'L1_EM15VH_TAU40_2TAU15',['L1_EM15VH','L1_TAU40'], [globalStream], ['RATE:ElectronTau', 'BW:Tau'], -1,['serial',-1,["e18_lhloose","tau80_medium1_calo"]]],
-        ['mu14_tau35_medium1_calo',                        911, 'L1_MU10_TAU20',['L1_MU10','L1_TAU20'], [globalStream], ['RATE:MuonTau', 'BW:Tau'], -1,['serial',-1,["mu14","tau35_medium1_calo"]]],
-        ['mu14_tau25_medium1_calo',                        912, 'L1_MU10_TAU12_J25_2J12',['L1_MU10','L1_TAU12'], [globalStream], ['RATE:MuonTau', 'BW:Tau'], -1,['serial',-1,["mu14","tau25_medium1_calo"]]],
-        ['tau35_medium1_calo_tau25_medium1_calo_xe50',     913, 'L1_TAU20_2TAU12_XE35',['L1_TAU20','L1_TAU12','L1_XE35'], [globalStream], ['RATE:METTau', 'BW:Tau'], -1,['serial',-1,["tau35_medium1_calo","tau25_medium1_calo","xe50"]]],
-        ['tau35_medium1_calo_xe70_L1XE45',                 914, 'L1_TAU20_2J20_XE45',['L1_TAU20','L1_XE45'], [globalStream], ['RATE:METTau', 'BW:Tau'], -1,['serial',-1,["tau35_medium1_calo","xe70_L1XE45"]]],
-        ['tau35_medium1_ptonly_tau25_medium1_ptonly',      915, 'L1_TAU20_2TAU12_J25_2J20_3J12',['L1_TAU20','L1_TAU12'], [globalStream], ['RATE:Tau', 'BW:Tau'], -1,['serial',-1,["tau35_medium1_ptonly","tau25_medium1_ptonly"]]],
-        ['e18_loose1_tau25_medium1_ptonly',                916, 'L1_EM15VH_2TAU12_J25_2J15_3J12',['L1_EM15VH','L1_TAU12'], [globalStream], ['RATE:ElectronTau', 'BW:Tau'], -1,['serial',-1,["e18_loose1","tau25_medium1_ptonly"]]],
-        ['e18_lhloose_tau25_medium1_ptonly',               917, 'L1_EM15VH_2TAU12_J25_2J15_3J12',['L1_EM15VH','L1_TAU12'], [globalStream], ['RATE:ElectronTau', 'BW:Tau'], -1,['serial',-1,["e18_lhloose","tau25_medium1_ptonly"]]],
-        ['e18_loose1_tau80_medium1_ptonly',                918, 'L1_EM15VH_TAU40_2TAU15',['L1_EM15VH','L1_TAU40'], [globalStream], ['RATE:ElectronTau', 'BW:Tau'], -1,['serial',-1,["e18_loose1","tau80_medium1_ptonly"]]],
-        ['e18_lhloose_tau80_medium1_ptonly',               919, 'L1_EM15VH_TAU40_2TAU15',['L1_EM15VH','L1_TAU40'], [globalStream], ['RATE:ElectronTau', 'BW:Tau'], -1,['serial',-1,["e18_lhloose","tau80_medium1_ptonly"]]],
-        ['mu14_tau35_medium1_ptonly',                      920, 'L1_MU10_TAU20',['L1_MU10','L1_TAU20'], [globalStream], ['RATE:MuonTau', 'BW:Tau'], -1,['serial',-1,["mu14","tau35_medium1_ptonly"]]],
-        ['mu14_tau25_medium1_ptonly',                      921, 'L1_MU10_TAU12_J25_2J12',['L1_MU10','L1_TAU12'], [globalStream], ['RATE:MuonTau', 'BW:Tau'], -1,['serial',-1,["mu14","tau25_medium1_ptonly"]]],
-        ['tau35_medium1_ptonly_tau25_medium1_ptonly_xe50', 922, 'L1_TAU20_2TAU12_XE35',['L1_TAU20','L1_TAU12','L1_XE35'], [globalStream], ['RATE:METTau', 'BW:Tau'], -1,['serial',-1,["tau35_medium1_ptonly","tau25_medium1_ptonly","xe50"]]],
-        ['tau35_medium1_ptonly_xe70_L1XE45',               923, 'L1_TAU20_2J20_XE45',['L1_TAU20','L1_XE45'], [globalStream], ['RATE:METTau', 'BW:Tau'], -1,['serial',-1,["tau35_medium1_ptonly","xe70_L1XE45"]]],
+        ['tau35_medium1_calo_tau25_medium1_calo',         'L1_TAU20_2TAU12_J25_2J20_3J12',['L1_TAU20','L1_TAU12'], [globalStream], ['RATE:Tau', 'BW:Tau'], -1,['serial',-1,["tau35_medium1_calo","tau25_medium1_calo"]]],
+        ['e18_loose1_tau25_medium1_calo',                 'L1_EM15VH_2TAU12_J25_2J15_3J12',['L1_EM15VH','L1_TAU12'], [globalStream], ['RATE:ElectronTau', 'BW:Tau'], -1,['serial',-1,["e18_loose1","tau25_medium1_calo"]]],
+        ['e18_lhloose_tau25_medium1_calo',                'L1_EM15VH_2TAU12_J25_2J15_3J12',['L1_EM15VH','L1_TAU12'], [globalStream], ['RATE:ElectronTau', 'BW:Tau'], -1,['serial',-1,["e18_lhloose","tau25_medium1_calo"]]],
+        ['e18_loose1_tau80_medium1_calo',                 'L1_EM15VH_TAU40_2TAU15',['L1_EM15VH','L1_TAU40'], [globalStream], ['RATE:ElectronTau', 'BW:Tau'], -1,['serial',-1,["e18_loose1","tau80_medium1_calo"]]],
+        ['e18_lhloose_tau80_medium1_calo',                'L1_EM15VH_TAU40_2TAU15',['L1_EM15VH','L1_TAU40'], [globalStream], ['RATE:ElectronTau', 'BW:Tau'], -1,['serial',-1,["e18_lhloose","tau80_medium1_calo"]]],
+        ['mu14_tau35_medium1_calo',                       'L1_MU10_TAU20',['L1_MU10','L1_TAU20'], [globalStream], ['RATE:MuonTau', 'BW:Tau'], -1,['serial',-1,["mu14","tau35_medium1_calo"]]],
+        ['mu14_tau25_medium1_calo',                       'L1_MU10_TAU12_J25_2J12',['L1_MU10','L1_TAU12'], [globalStream], ['RATE:MuonTau', 'BW:Tau'], -1,['serial',-1,["mu14","tau25_medium1_calo"]]],
+        ['tau35_medium1_calo_tau25_medium1_calo_xe50',    'L1_TAU20_2TAU12_XE35',['L1_TAU20','L1_TAU12','L1_XE35'], [globalStream], ['RATE:METTau', 'BW:Tau'], -1,['serial',-1,["tau35_medium1_calo","tau25_medium1_calo","xe50"]]],
+        ['tau35_medium1_calo_xe70_L1XE45',                'L1_TAU20_2J20_XE45',['L1_TAU20','L1_XE45'], [globalStream], ['RATE:METTau', 'BW:Tau'], -1,['serial',-1,["tau35_medium1_calo","xe70_L1XE45"]]],
+        ['tau35_medium1_ptonly_tau25_medium1_ptonly',     'L1_TAU20_2TAU12_J25_2J20_3J12',['L1_TAU20','L1_TAU12'], [globalStream], ['RATE:Tau', 'BW:Tau'], -1,['serial',-1,["tau35_medium1_ptonly","tau25_medium1_ptonly"]]],
+        ['e18_loose1_tau25_medium1_ptonly',               'L1_EM15VH_2TAU12_J25_2J15_3J12',['L1_EM15VH','L1_TAU12'], [globalStream], ['RATE:ElectronTau', 'BW:Tau'], -1,['serial',-1,["e18_loose1","tau25_medium1_ptonly"]]],
+        ['e18_lhloose_tau25_medium1_ptonly',              'L1_EM15VH_2TAU12_J25_2J15_3J12',['L1_EM15VH','L1_TAU12'], [globalStream], ['RATE:ElectronTau', 'BW:Tau'], -1,['serial',-1,["e18_lhloose","tau25_medium1_ptonly"]]],
+        ['e18_loose1_tau80_medium1_ptonly',               'L1_EM15VH_TAU40_2TAU15',['L1_EM15VH','L1_TAU40'], [globalStream], ['RATE:ElectronTau', 'BW:Tau'], -1,['serial',-1,["e18_loose1","tau80_medium1_ptonly"]]],
+        ['e18_lhloose_tau80_medium1_ptonly',              'L1_EM15VH_TAU40_2TAU15',['L1_EM15VH','L1_TAU40'], [globalStream], ['RATE:ElectronTau', 'BW:Tau'], -1,['serial',-1,["e18_lhloose","tau80_medium1_ptonly"]]],
+        ['mu14_tau35_medium1_ptonly',                     'L1_MU10_TAU20',['L1_MU10','L1_TAU20'], [globalStream], ['RATE:MuonTau', 'BW:Tau'], -1,['serial',-1,["mu14","tau35_medium1_ptonly"]]],
+        ['mu14_tau25_medium1_ptonly',                     'L1_MU10_TAU12_J25_2J12',['L1_MU10','L1_TAU12'], [globalStream], ['RATE:MuonTau', 'BW:Tau'], -1,['serial',-1,["mu14","tau25_medium1_ptonly"]]],
+        ['tau35_medium1_ptonly_tau25_medium1_ptonly_xe50', 'L1_TAU20_2TAU12_XE35',['L1_TAU20','L1_TAU12','L1_XE35'], [globalStream], ['RATE:METTau', 'BW:Tau'], -1,['serial',-1,["tau35_medium1_ptonly","tau25_medium1_ptonly","xe50"]]],
+        ['tau35_medium1_ptonly_xe70_L1XE45',              'L1_TAU20_2J20_XE45',['L1_TAU20','L1_XE45'], [globalStream], ['RATE:METTau', 'BW:Tau'], -1,['serial',-1,["tau35_medium1_ptonly","xe70_L1XE45"]]],
 
         ]
 
 
     TriggerFlags.MinBiasSlice.signatures = [
-        ['mb_sptrk', 806, 'L1_RD0_FILLED', [], [globalStream], ["BW:MinBias", "RATE:MinBias"], -1],
-        ['mb_perf_L1MBTS_1', 822, 'L1_MBTS_1', [], [globalStream],["BW:MinBias", "RATE:MinBias"] , -1],
-        ['mb_idperf_L1MBTS_2', 823, 'L1_MBTS_2', [], [globalStream], ["BW:MinBias", "RATE:MinBias"], -1],
-        ['mb_sp2000_trk70_hmt', 824, 'L1_TE20', [], [globalStream], ["BW:MinBias", "RATE:MinBias"], -1],        
+        ['mb_sptrk',  'L1_RD0_FILLED', [], [globalStream], ["BW:MinBias", "RATE:MinBias"], -1],
+        ['mb_perf_L1MBTS_1',  'L1_MBTS_1', [], [globalStream],["BW:MinBias", "RATE:MinBias"] , -1],
+        ['mb_idperf_L1MBTS_2',  'L1_MBTS_2', [], [globalStream], ["BW:MinBias", "RATE:MinBias"], -1],
+        ['mb_sp2000_trk70_hmt', 'L1_TE20', [], [globalStream], ["BW:MinBias", "RATE:MinBias"], -1],        
         
-        ['mb_sp2000_pusup600_trk70_hmt', 836, 'L1_TE20', [], [globalStream], ["BW:MinBias", "RATE:MinBias"], -1], 
-        ['mb_sp2000_pusup600_trk70_hmt_L1TE30', 837, 'L1_TE30', [], [globalStream], ["BW:MinBias", "RATE:MinBias"], -1], 
-        ['mb_sp2000_pusup600_trk70_hmt_L1TE40', 838, 'L1_TE40', [], [globalStream], ["BW:MinBias", "RATE:MinBias"], -1], 
-        ['mb_sp2000_pusup700_trk70_hmt_L1TE30', 839, 'L1_TE30', [], [globalStream], ["BW:MinBias", "RATE:MinBias"], -1], 
-        ['mb_sp2000_pusup700_trk70_hmt_L1TE40', 840, 'L1_TE40', [], [globalStream], ["BW:MinBias", "RATE:MinBias"], -1], 
+        ['mb_sp2000_pusup600_trk70_hmt', 'L1_TE20', [], [globalStream], ["BW:MinBias", "RATE:MinBias"], -1], 
+        ['mb_sp2000_pusup600_trk70_hmt_L1TE30',  'L1_TE30', [], [globalStream], ["BW:MinBias", "RATE:MinBias"], -1], 
+        ['mb_sp2000_pusup600_trk70_hmt_L1TE40',  'L1_TE40', [], [globalStream], ["BW:MinBias", "RATE:MinBias"], -1], 
+        ['mb_sp2000_pusup700_trk70_hmt_L1TE30',  'L1_TE30', [], [globalStream], ["BW:MinBias", "RATE:MinBias"], -1], 
+        ['mb_sp2000_pusup700_trk70_hmt_L1TE40',  'L1_TE40', [], [globalStream], ["BW:MinBias", "RATE:MinBias"], -1], 
  
         ]
     
@@ -570,9 +570,9 @@ def setupMenu():
 
 
     TriggerFlags.StreamingSlice.signatures =  [
-        ['noalg_mb_L1TE20', 1001, 'L1_TE20', [], [globalStream], ["BW:MinBias", "RATE:MinBias"], -1], 
-        ['noalg_mb_L1TE30', 1002, 'L1_TE30', [], [globalStream], ["BW:MinBias", "RATE:MinBias"], -1], 
-        ['noalg_mb_L1TE40', 1003, 'L1_TE40', [], [globalStream], ["BW:MinBias", "RATE:MinBias"], -1],         
+        ['noalg_mb_L1TE20',  'L1_TE20', [], [globalStream], ["BW:MinBias", "RATE:MinBias"], -1], 
+        ['noalg_mb_L1TE30',  'L1_TE30', [], [globalStream], ["BW:MinBias", "RATE:MinBias"], -1], 
+        ['noalg_mb_L1TE40',  'L1_TE40', [], [globalStream], ["BW:MinBias", "RATE:MinBias"], -1],         
 
         ]
 
@@ -698,7 +698,7 @@ Prescales.HLTPrescales_loose_mc_prescale = {
 
 Prescales.L1Prescales_tight_mc_prescale  = Prescales.L1Prescales
 
-Prescales.HLTPrescales_tight_mc_prescale = Prescales.HLTPrescales_tight_mc_prescale = { 
+Prescales.HLTPrescales_tight_mc_prescale = {
     # egamma (Rerun mode triggers to support Run1 PID chains)
     'e18_loose1'            : [    0,    0,   1],
     'e17_loose1'            : [    0,    0,   1],
diff --git a/Trigger/TriggerCommon/TriggerMenu/python/menu/DictFromChainName.py b/Trigger/TriggerCommon/TriggerMenu/python/menu/DictFromChainName.py
index 1398cd3c86d..00be86d4615 100755
--- a/Trigger/TriggerCommon/TriggerMenu/python/menu/DictFromChainName.py
+++ b/Trigger/TriggerCommon/TriggerMenu/python/menu/DictFromChainName.py
@@ -27,33 +27,31 @@ class DictFromChainName(object):
         # ---- Loop over all chains (keys) in dictionary ----
         # ---- Then complete the dict with other info    ----
         # ---- of formate: # chainName :                ----
-        # ---- [chainName (str), chainCounter (int), L1item (str), Stream (str), EBstep (str)] ----   
+        # ----  chainCounter (int), L1item (str), Stream (str), EBstep (str)] ----   
         # ---- chainName = chainInfo[0]
         
         m_chainName = chainInfo[0]
-        m_chainCounter = chainInfo[1]
-        m_L1item = chainInfo[2]
-        m_L1items_chainParts = chainInfo[3]
-        m_stream = chainInfo[4]
-        m_groups = chainInfo[5]
-        m_EBstep = chainInfo[6]
-        if len(chainInfo) > 7:
-            m_mergingStrategy = chainInfo[7][0]
+        m_L1item = chainInfo[1]
+        m_L1items_chainParts = chainInfo[2]
+        m_stream = chainInfo[3]
+        m_groups = chainInfo[4]
+        m_EBstep = chainInfo[5]
+        if len(chainInfo) > 6:
+            m_mergingStrategy = chainInfo[6][0]
             if not (m_mergingStrategy == "parallel" or m_mergingStrategy == "serial"):
                 logDict.error("Merging strategy %s is not known." % m_mergingStrategy)
-            m_mergingOffset = chainInfo[7][1]
-            m_mergingOrder = chainInfo[7][2]
+            m_mergingOffset = chainInfo[6][1]
+            m_mergingOrder = chainInfo[6][2]
 
         logDict.info("Analysing chain with name: "+ m_chainName)
 
         chainProp = self.analyseShortName(m_chainName,  m_L1items_chainParts)
         logDict.debug('ChainProperties: '+ str(chainProp))
 
-        chainProp['chainCounter']= m_chainCounter
         chainProp['stream'] = m_stream
         chainProp['EBstep'] = m_EBstep
         chainProp['groups'] = m_groups
-        if len(chainInfo) > 7:
+        if len(chainInfo) > 6:
             chainProp['mergingStrategy'] = m_mergingStrategy
             chainProp['mergingOffset'] = m_mergingOffset
             chainProp['mergingOrder'] = m_mergingOrder
diff --git a/Trigger/TriggerCommon/TriggerMenu/python/menu/GenerateMenu.py b/Trigger/TriggerCommon/TriggerMenu/python/menu/GenerateMenu.py
index 0a41dae7b1f..d74f648dea9 100755
--- a/Trigger/TriggerCommon/TriggerMenu/python/menu/GenerateMenu.py
+++ b/Trigger/TriggerCommon/TriggerMenu/python/menu/GenerateMenu.py
@@ -24,8 +24,7 @@ from TriggerMenu.test.TestSliceFlags                   import TestSliceFlags
 from TriggerMenu.menu.TriggerPythonConfig  import TriggerPythonConfig
 
 from TriggerMenu.menu.Lumi                 import lumi, applyPrescales
-from TriggerMenu.menu.MenuUtil             import setL1TTStream7Bit, applyLVL1Prescale, checkTriggerGroupAssignment, allSignatures, checkStreamConsistency #,overwriteStreamTags,
-from TriggerMenu.menu.MenuUtil             import getJetWeights, remapL1Thresholds, remapL1Items
+from TriggerMenu.menu.MenuUtil             import checkTriggerGroupAssignment, checkStreamConsistency 
 import TriggerMenu.menu.MenuUtils       
 import traceback
 import operator
@@ -223,13 +222,13 @@ class GenerateMenu:
         missingL1items = []
         for chain in chains:
             log.debug('chain %s' % chain)
-            l1item = chain[2]
+            l1item = chain[1]
             if (l1item not in l1itemnames) & (l1item != ''):
                 myl1item = getSpecificL1Seeds(l1item, self.trigConfL1.menu.items)
                 if ('ERROR_' in myl1item):
                     if (l1item not in missingL1items):  missingL1items.append(l1item)                    
                 else:
-                    chain[2] = myl1item
+                    chain[1] = myl1item
         if  len(missingL1items) > 0 :
             log.error('The following L1 items were not found in the corresponding L1 menu: '+str(missingL1items))
 
@@ -616,8 +615,9 @@ class GenerateMenu:
 
     def generateHLTSequences(self,theChainDef):
         theHLTSequences = []
+        
         for sequence in theChainDef.sequenceList:
-            theHLTSequences += [HLTSequence(inputTEs=sequence["input"], algos=sequence["algorithm"], outputTE=sequence["output"], topo_starts_from=None)]
+            theHLTSequences += [HLTSequence(inputTEs=sequence["input"], algos=sequence["algorithm"], outputTE=sequence["output"], topo_starts_from=sequence["topo_starts_from"])]
         return theHLTSequences
 
 
@@ -725,6 +725,7 @@ class GenerateMenu:
     def generate(self):
         log.info('GenerateMenu.py:generate ')
 
+
         ###########################
         # L1 Topo menu generation #
         ###########################
@@ -761,6 +762,7 @@ class GenerateMenu:
 
             log.info('Generating L1 configuration for %s' % TriggerFlags.triggerMenuSetup() )
 
+
             from TriggerMenu.TriggerConfigLVL1 import TriggerConfigLVL1
             self.trigConfL1 = TriggerConfigLVL1( outputFile = TriggerFlags.outputLVL1configFile(), menuName = TriggerFlags.triggerMenuSetup() )        
             
@@ -769,6 +771,7 @@ class GenerateMenu:
             log.info('Menu has %i items' % len(self.trigConfL1.menu.items) )
             # write xml file
             self.trigConfL1.writeXML()
+
             
 
         elif TriggerFlags.readLVL1configFromXML():
@@ -781,7 +784,6 @@ class GenerateMenu:
         else:
             log.info("Doing nothing with L1 menu configuration...")
 
-
         ##################
         #setup of HLT menu
         ##################
@@ -803,32 +805,29 @@ class GenerateMenu:
         m_chainsInMenu = self.getChainsFromMenu() # get names of chains to be generated
         if hasattr(self, 'trigConfL1'):
             self.checkL1SeedsForChainsFromMenu(m_chainsInMenu)
-
-
-        # assign chain counters automatically:
-        print 'MEOW chains in menu:', m_chainsInMenu
-        
-                                          
+                                                  
         # instantiate parser
         import DictFromChainName
         theDictFromChainName = DictFromChainName.DictFromChainName()
         import StreamInfo
+        
+        counter = 0
 
         for chain in m_chainsInMenu:
             log.info("Processing chain : %s" % chain)
             chainDicts = theDictFromChainName.getChainDict(chain)
+            counter += 1 
+            chainCounter =  counter
+            chainDicts['chainCounter'] = chainCounter
+
             chainDef = self.getChainDef(chainDicts)
 
             #Insert entry for chain counter later
             #For now, just modify it by assigning it automatically
-#            chain
-#            chain[]
-            
-            groups  = chain[5]
-            streams = chain[4]
-            EBstep = chain[6]
+            streams = chain[3]
+            groups  = chain[4]
+            EBstep = chain[5]
             streamTag = StreamInfo.getStreamTag(streams)
-            chainCounter =  chainDicts['chainCounter']
 
             if not chainDef:
                 log.error('No chainDef for chain %s returned. Will ignore and continue.' % chain)
@@ -837,8 +836,8 @@ class GenerateMenu:
         
             # generate HLTChains and associated sequences
             if  not self.chainDefIsConsistent(chainDef):
-                log.error('ChainDef consistency checks failing for chain %s' % chain)
-                #continue
+                log.error('ChainDef consistency checks failing for chain %s' % chain) 
+
                         
 
             theHLTChain = self.generateHLTChain(chainDef, str(chainDicts['chainCounter']), streamTag, groups, EBstep)
@@ -849,8 +848,9 @@ class GenerateMenu:
                 self.triggerPythonConfig.addHLTSequence(theHLTSequence)
 
             # chain_name is a key in allChains    
-            self.triggerPythonConfig.registerHLTChain(chain[0], theHLTChain)                
-            self.triggerPythonConfig.addHLTChain(theHLTChain)
+            self.triggerPythonConfig.registerHLTChain(chain[0], theHLTChain)          
+            if not (TriggerFlags.readHLTconfigFromXML() or TriggerFlags.readMenuFromTriggerDb()):
+                self.triggerPythonConfig.addHLTChain(theHLTChain)
 
         self.triggerPythonConfig.printIt()
 
@@ -962,30 +962,30 @@ class GenerateMenu:
                 log.error('%s -> add the threshold explicitly' % line.split()[-1])
 
 
-        # PRINT available chain chounters
-        physics_menu = ['Physics_pp_v4', 'MC_pp_v4', ]
-        for ppmenu in physics_menu:
-            countersL2_physics = []
-            countersEF_physics = []
-            if TriggerFlags.triggerMenuSetup() in ppmenu:
-                for c in self.triggerPythonConfig.theL2HLTChains:
-                    countersL2_physics.append(int(c.chain_counter))
-                for c in self.triggerPythonConfig.theEFHLTChains:
-                    countersEF_physics.append(int(c.chain_counter))
-                    countersL2_physics.sort()
-                    countersEF_physics.sort()
-                    maxL2_physics = max(countersL2_physics)
-                    maxEF_physics = max(countersEF_physics)
+        # # PRINT available chain chounters
+        # physics_menu = ['Physics_pp_v4', 'MC_pp_v4', ]
+        # for ppmenu in physics_menu:
+        #     countersL2_physics = []
+        #     countersEF_physics = []
+        #     if TriggerFlags.triggerMenuSetup() in ppmenu:
+        #         for c in self.triggerPythonConfig.theL2HLTChains:
+        #             countersL2_physics.append(int(c.chain_counter))
+        #         for c in self.triggerPythonConfig.theEFHLTChains:
+        #             countersEF_physics.append(int(c.chain_counter))
+        #             countersL2_physics.sort()
+        #             countersEF_physics.sort()
+        #             maxL2_physics = max(countersL2_physics)
+        #             maxEF_physics = max(countersEF_physics)
                 
-                if not TriggerFlags.readHLTconfigFromXML() and not TriggerFlags.readMenuFromTriggerDb():
-                    log.info("L2 available chain counters for " +\
-                             ppmenu +\
-                             " \n" +\
-                             self.chainCounterAvailability(countersL2_physics))
-                    log.info("EF available chain counters for " +\
-                             ppmenu +\
-                             " \n" +\
-                             self.chainCounterAvailability(countersEF_physics))
+        #         if not TriggerFlags.readHLTconfigFromXML() and not TriggerFlags.readMenuFromTriggerDb():
+        #             log.info("L2 available chain counters for " +\
+        #                      ppmenu +\
+        #                      " \n" +\
+        #                      self.chainCounterAvailability(countersL2_physics))
+        #             log.info("EF available chain counters for " +\
+        #                      ppmenu +\
+        #                      " \n" +\
+        #                      self.chainCounterAvailability(countersEF_physics))
 
 
         for name, chains in self.triggerPythonConfig.allChains.iteritems():
diff --git a/Trigger/TriggerCommon/TriggerMenu/python/menu/HLTObjects.py b/Trigger/TriggerCommon/TriggerMenu/python/menu/HLTObjects.py
index f29b9fe2baa..5725d8083d3 100755
--- a/Trigger/TriggerCommon/TriggerMenu/python/menu/HLTObjects.py
+++ b/Trigger/TriggerCommon/TriggerMenu/python/menu/HLTObjects.py
@@ -337,7 +337,7 @@ class HLTChain:
 
 
 #
-# EOF Chain classes
+# EF Chain classes
 #########################################################################################
 
 
@@ -347,13 +347,11 @@ class HLTChain:
 class HLTSequence:
     def __init__(self, inputTEs, algos, outputTE, topo_starts_from=None):
         """HLT Steering Sequence class constructor
-
-
         inputTEs argument is a one or list of names TEs for the sequence,
         if empty string is passed then sequence is considered as UNSEEDED
         algos is one or list of algo instances
-
         """
+
         if type(inputTEs) == type(""):
             self.input  = [ inputTEs ]
         else:
diff --git a/Trigger/TriggerCommon/TriggerMenu/python/menu/HltConfig.py b/Trigger/TriggerCommon/TriggerMenu/python/menu/HltConfig.py
index 15eea96fef9..86c8a036f49 100755
--- a/Trigger/TriggerCommon/TriggerMenu/python/menu/HltConfig.py
+++ b/Trigger/TriggerCommon/TriggerMenu/python/menu/HltConfig.py
@@ -12,12 +12,12 @@ log = logging.getLogger( 'TriggerMenu.menu.HltConfig.py' )
 # log.setLevel(logging.DEBUG)
 
 class HltSeq:
-    def __init__(self, inputTEs, algos, outputTE):
+    def __init__(self, inputTEs, algos, outputTE, topo_starts_from=None):
         self.inputTEs = inputTEs
         if type(inputTEs)==type(''): self.inputTEs = [inputTEs]
         self.algos = algos
         self.outputTE = outputTE
-
+        self.topo_starts_from = topo_starts_from
 
 def mergeRemovingOverlap(x, y, r=''):
     if r=='':
@@ -92,8 +92,8 @@ class HltChainDef:
         except:
             return te_name
 
-    def addSequence(self, inputTEs, algos, outputTE):
-        self.sequences.append(HltSeq(inputTEs, algos, outputTE))
+    def addSequence(self, inputTEs, algos, outputTE, topo_starts_from=None):
+        self.sequences.append(HltSeq(inputTEs, algos, outputTE, topo_starts_from))
 
     def addSignature(self, TElist=[]):
         self.signatures.append(TElist)
@@ -243,11 +243,11 @@ class L2EFChainDef(HltChainDef):
         self.setConfigToL2EF()
         pass
 
-    def addL2Sequence(self, inputTEs, algos, outputTE):
-        self.l2chain.addSequence(inputTEs, algos, outputTE)
+    def addL2Sequence(self, inputTEs, algos, outputTE, topo_starts_from=None):
+        self.l2chain.addSequence(inputTEs, algos, outputTE, topo_starts_from)
 
-    def addEFSequence(self, inputTEs, algos, outputTE):
-        self.efchain.addSequence(inputTEs, algos, outputTE)
+    def addEFSequence(self, inputTEs, algos, outputTE, topo_starts_from=None):
+        self.efchain.addSequence(inputTEs, algos, outputTE, topo_starts_from)
         
     def addL2Signature(self, tes):
         self.l2chain.addSignature(tes)
diff --git a/Trigger/TriggerCommon/TriggerMenu/python/menu/LS1_v1.py b/Trigger/TriggerCommon/TriggerMenu/python/menu/LS1_v1.py
index 4e57028bdaa..26b3c218b1a 100644
--- a/Trigger/TriggerCommon/TriggerMenu/python/menu/LS1_v1.py
+++ b/Trigger/TriggerCommon/TriggerMenu/python/menu/LS1_v1.py
@@ -16,147 +16,147 @@ def setupMenu():
         log.info("ERROR L1 menu has not yet been defined")
 
     # INPUT FORMAT FOR CHAINS:
-    # ['chainName', chainCounter, 'L1itemforchain', [L1 items for chainParts], [stream], [groups], EBstep]
+    # ['chainName',  'L1itemforchain', [L1 items for chainParts], [stream], [groups], EBstep]
 
     TriggerFlags.Slices_all_setOff()
 
     TriggerFlags.MuonSlice.signatures = [
-        ['mu4_cosmic_L1MU4_EMPTY',                743, 'L1_MU4_EMPTY', [], ['CosmicMuons'], ["RATE:Cosmic_Muon", "BW:Muon"], -1],
-        ['mu4_cosmic_L1MU11_EMPTY',               744, 'L1_MU11_EMPTY', [], ['CosmicMuons'], ["RATE:Cosmic_Muon", "BW:Muon"], -1],
-        ['mu4_msonly_cosmic_L1MU11_EMPTY',        724, 'L1_MU11_EMPTY', [], ['CosmicMuons'], ["RATE:Cosmic_Muon", "BW:Muon"], -1],
+        ['mu4_cosmic_L1MU4_EMPTY',               'L1_MU4_EMPTY', [], ['CosmicMuons'], ["RATE:Cosmic_Muon", "BW:Muon"], -1],
+        ['mu4_cosmic_L1MU11_EMPTY',              'L1_MU11_EMPTY', [], ['CosmicMuons'], ["RATE:Cosmic_Muon", "BW:Muon"], -1],
+        ['mu4_msonly_cosmic_L1MU11_EMPTY',       'L1_MU11_EMPTY', [], ['CosmicMuons'], ["RATE:Cosmic_Muon", "BW:Muon"], -1],
         
-        ['mu4_cosmicEF_L1MU4_EMPTY',                745, 'L1_MU4_EMPTY', [], ['CosmicMuons'], ["RATE:Cosmic_Muon", "BW:Muon"], -1],
-        ['mu4_cosmicEF_L1MU11_EMPTY',               746, 'L1_MU11_EMPTY', [], ['CosmicMuons'], ["RATE:Cosmic_Muon", "BW:Muon"], -1],
-        ['mu4_msonly_cosmicEF_L1MU11_EMPTY',        747, 'L1_MU11_EMPTY', [], ['CosmicMuons'], ["RATE:Cosmic_Muon", "BW:Muon"], -1],
-        ['mu4_msonly_cosmicEF_L1MU4_EMPTY',        748, 'L1_MU4_EMPTY', [], ['CosmicMuons'], ["RATE:Cosmic_Muon", "BW:Muon"], -1],
-
-        #['mu4_cosmic_ds_L1MU4',                   725, 'L1_MU4',   [], ['DataScouting_01_CosmicMuons'], ["RATE:Cosmic_Muon_DS", "BW:Muon"], -1],
-        #['mu4_cosmic_ds_L1MU10',                  726, 'L1_MU10',  [], ['DataScouting_01_CosmicMuons'], ["RATE:Cosmic_Muon_DS", "BW:Muon"], -1],
-        #['mu4_cosmic_ds_L1MU11',                  727, 'L1_MU11',  [], ['DataScouting_01_CosmicMuons'], ["RATE:Cosmic_Muon_DS", "BW:Muon"], -1],
-        #['mu4_cosmic_ds_L1MU4_EMPTY',             728, 'L1_MU4_EMPTY',  [], ['DataScouting_01_CosmicMuons'], ["RATE:Cosmic_Muon_DS", "BW:Muon"], -1],
-        #['mu4_cosmic_ds_L1MU10_EMPTY',            729, 'L1_MU10_EMPTY',  [], ['DataScouting_01_CosmicMuons'], ["RATE:Cosmic_Muon_DS", "BW:Muon"], -1],
-        #['mu4_cosmic_ds_L1MU11_EMPTY',            730, 'L1_MU11_EMPTY',  [], ['DataScouting_01_CosmicMuons'], ["RATE:Cosmic_Muon_DS", "BW:Muon"], -1],
-
-        ['mu4_cosmicEF_ds1_L1MU4', 725, 'L1_MU4', [], ['DataScouting_01_CosmicMuons'], ["RATE:Cosmic_Muon_DS", "BW:Muon"], -1],
-        ['mu4_cosmicEF_ds2_L1MU4', 726, 'L1_MU4', [], ['DataScouting_01_CosmicMuons','DataScouting_02_CosmicMuons'], ["RATE:Cosmic_Muon_DS", "BW:Muon"], -1],
+        ['mu4_cosmicEF_L1MU4_EMPTY',             'L1_MU4_EMPTY', [], ['CosmicMuons'], ["RATE:Cosmic_Muon", "BW:Muon"], -1],
+        ['mu4_cosmicEF_L1MU11_EMPTY',            'L1_MU11_EMPTY', [], ['CosmicMuons'], ["RATE:Cosmic_Muon", "BW:Muon"], -1],
+        ['mu4_msonly_cosmicEF_L1MU11_EMPTY',     'L1_MU11_EMPTY', [], ['CosmicMuons'], ["RATE:Cosmic_Muon", "BW:Muon"], -1],
+        ['mu4_msonly_cosmicEF_L1MU4_EMPTY',      'L1_MU4_EMPTY', [], ['CosmicMuons'], ["RATE:Cosmic_Muon", "BW:Muon"], -1],
+
+        #['mu4_cosmic_ds_L1MU4',                 'L1_MU4',   [], ['DataScouting_01_CosmicMuons'], ["RATE:Cosmic_Muon_DS", "BW:Muon"], -1],
+        #['mu4_cosmic_ds_L1MU10',                'L1_MU10',  [], ['DataScouting_01_CosmicMuons'], ["RATE:Cosmic_Muon_DS", "BW:Muon"], -1],
+        #['mu4_cosmic_ds_L1MU11',                'L1_MU11',  [], ['DataScouting_01_CosmicMuons'], ["RATE:Cosmic_Muon_DS", "BW:Muon"], -1],
+        #['mu4_cosmic_ds_L1MU4_EMPTY',           'L1_MU4_EMPTY',  [], ['DataScouting_01_CosmicMuons'], ["RATE:Cosmic_Muon_DS", "BW:Muon"], -1],
+        #['mu4_cosmic_ds_L1MU10_EMPTY',          'L1_MU10_EMPTY',  [], ['DataScouting_01_CosmicMuons'], ["RATE:Cosmic_Muon_DS", "BW:Muon"], -1],
+        #['mu4_cosmic_ds_L1MU11_EMPTY',          'L1_MU11_EMPTY',  [], ['DataScouting_01_CosmicMuons'], ["RATE:Cosmic_Muon_DS", "BW:Muon"], -1],
+
+        ['mu4_cosmicEF_ds1_L1MU4',  'L1_MU4', [], ['DataScouting_01_CosmicMuons'], ["RATE:Cosmic_Muon_DS", "BW:Muon"], -1],
+        ['mu4_cosmicEF_ds2_L1MU4',  'L1_MU4', [], ['DataScouting_01_CosmicMuons','DataScouting_02_CosmicMuons'], ["RATE:Cosmic_Muon_DS", "BW:Muon"], -1],
         
-        ['mu0_muoncalib',727, 'L1_MU4',[],['Muon_Calibration'],["RATE:SingleMuon","BW:Muon"],-1],
+        ['mu0_muoncalib', 'L1_MU4',[],['Muon_Calibration'],["RATE:SingleMuon","BW:Muon"],-1],
 
-        #['mu0_muoncalib_ds3',728, 'L1_MU4',[],['DataScouting_03_CosmicMuons'],["RATE:SingleMuon","BW:Muon"],-1],
+        #['mu0_muoncalib_ds3', 'L1_MU4',[],['DataScouting_03_CosmicMuons'],["RATE:SingleMuon","BW:Muon"],-1],
 
         ]
 
     TriggerFlags.JetSlice.signatures = [
         # Performance chains
-        ['j0_perf_L1RD0_EMPTY', 116,     'L1_RD0_EMPTY',[], ['Main'], ['RATE:SingleJet', 'BW:Jets'], -1],
-        ['j0_perf_L1MU10',      117,     'L1_MU10',[], ['Main'], ['RATE:SingleJet', 'BW:Jets'], -1],
-        ['j0_perf_L1J10',       118, 'L1_J10',[], ['Main'], ['RATE:SingleJet', 'BW:Jets'], -1],
-        ['ht0_perf_L1J10',       119, 'L1_J10',[], ['Main'], ['RATE:SingleJet', 'BW:Jets'], -1],
-        #['j_perf_lcw_L1RD0_EMPTY', 118,'L1_RD0_EMPTY',[], ['Main'], ['RATE:SingleJet', 'BW:Jets'], -1],
-        #['j_perf_lcw_L1MU10', 119,     'L1_MU10',[], ['Main'], ['RATE:SingleJet', 'BW:Jets'], -1],   
-        ['j0_perf_ds1_L1MU4', 998, 'L1_MU4', [], ['DataScouting_01_Jets'], ["RATE:Cosmic_Jets_DS", "BW:Jets"], -1],
-        ['j0_perf_ds2_L1MU4', 999, 'L1_MU4', [], ['DataScouting_02_Jets'], ["RATE:Cosmic_Jets_DS", "BW:Jets"], -1],       
+        ['j0_perf_L1RD0_EMPTY',    'L1_RD0_EMPTY',[], ['Main'], ['RATE:SingleJet', 'BW:Jets'], -1],
+        ['j0_perf_L1MU10',         'L1_MU10',[], ['Main'], ['RATE:SingleJet', 'BW:Jets'], -1],
+        ['j0_perf_L1J10',      'L1_J10',[], ['Main'], ['RATE:SingleJet', 'BW:Jets'], -1],
+        ['ht0_perf_L1J10',      'L1_J10',[], ['Main'], ['RATE:SingleJet', 'BW:Jets'], -1],
+        #['j_perf_lcw_L1RD0_EMPTY', 'L1_RD0_EMPTY',[], ['Main'], ['RATE:SingleJet', 'BW:Jets'], -1],
+        #['j_perf_lcw_L1MU10',      'L1_MU10',[], ['Main'], ['RATE:SingleJet', 'BW:Jets'], -1],   
+        ['j0_perf_ds1_L1MU4',  'L1_MU4', [], ['DataScouting_05_Jets'], ["RATE:Cosmic_Jets_DS", "BW:Jets"], -1],
+        ['j0_perf_ds2_L1MU4',  'L1_MU4', [], ['DataScouting_06_Jets'], ["RATE:Cosmic_Jets_DS", "BW:Jets"], -1],       
         ]
 
     TriggerFlags.BjetSlice.signatures =  [
-        ['j0_perf_bperf_L1RD0_EMPTY', 113, 'L1_RD0_EMPTY',[], ['Main'], ['RATE:SingleJet', 'BW:Jets'], -1],
-        ['j0_perf_bperf_L1MU10',      114, 'L1_MU10',[], ['Main'], ['RATE:SingleJet', 'BW:Jets'], -1],
-        ['j0_perf_bperf_L1J10',       115, 'L1_J10',[], ['Main'], ['RATE:SingleJet', 'BW:Jets'], -1],
+        ['j0_perf_bperf_L1RD0_EMPTY', 'L1_RD0_EMPTY',[], ['Main'], ['RATE:SingleJet', 'BW:Jets'], -1],
+        ['j0_perf_bperf_L1MU10',      'L1_MU10',[], ['Main'], ['RATE:SingleJet', 'BW:Jets'], -1],
+        ['j0_perf_bperf_L1J10',       'L1_J10',[], ['Main'], ['RATE:SingleJet', 'BW:Jets'], -1],
         ]
 
     TriggerFlags.METSlice.signatures = [
-        ['xe20',                            350,    'L1_XE20',[], ['Main'], ['Rate:MET', 'BW:MET'], -1],
-        ['xe20_cell',                       351,    'L1_XE20',[], ['Main'], ['Rate:MET', 'BW:MET'], -1],
-        ['xe20_L2FS',                       352,    'L1_XE20',[], ['Main'], ['Rate:MET', 'BW:MET'],  1],
-        ['xe20_tc_em',                      353,    'L1_XE20',[], ['Main'], ['Rate:MET', 'BW:MET'], -1], 
-        ['xe20_pueta',                      355,    'L1_XE20',[], ['Main'], ['Rate:MET', 'BW:MET'], -1],
-        ['xe20_l2fsperf_wEFMuFEB_wEFMu',    356,    'L1_XE20',[], ['Main'], ['Rate:MET', 'BW:MET'], -1],
-        ['xe25',                            357,    'L1_XE25',[], ['Main'], ['Rate:MET', 'BW:MET'], -1],
-        ['xe25_cell',                       358,    'L1_XE25',[], ['Main'], ['Rate:MET', 'BW:MET'], -1],
-        ['xe25_L2FS',                       359,    'L1_XE25',[], ['Main'], ['Rate:MET', 'BW:MET'],  1],
-        ['xe25_tc_em',                      360,    'L1_XE25',[], ['Main'], ['Rate:MET', 'BW:MET'], -1], 
-        ['xe25_pueta',                      361,    'L1_XE25',[], ['Main'], ['Rate:MET', 'BW:MET'], -1],
-        ['xe25_l2fsperf_wEFMuFEB_wEFMu',    362,    'L1_XE25',[], ['Main'], ['Rate:MET', 'BW:MET'], -1],
-
-        ['xe0_L1XE20',                            363,    'L1_XE20',[], ['Main'], ['Rate:MET', 'BW:MET'], -1],
-        ['xe0_cell_L1XE20',                       364,    'L1_XE20',[], ['Main'], ['Rate:MET', 'BW:MET'], -1],
-        ['xe0_L2FS_L1XE20',                       365,    'L1_XE20',[], ['Main'], ['Rate:MET', 'BW:MET'],  1],
-        ['xe0_tc_em_L1XE20',                      366,    'L1_XE20',[], ['Main'], ['Rate:MET', 'BW:MET'], -1], 
-        ['xe0_pueta_L1XE20',                      367,    'L1_XE20',[], ['Main'], ['Rate:MET', 'BW:MET'], -1],
-        ['xe0_l2fsperf_wEFMuFEB_wEFMu_L1XE20',    368,    'L1_XE20',[], ['Main'], ['Rate:MET', 'BW:MET'], -1],
-        ['xe0_L1XE25',                            369,    'L1_XE25',[], ['Main'], ['Rate:MET', 'BW:MET'], -1],
-        ['xe0_cell_L1XE25',                       370,    'L1_XE25',[], ['Main'], ['Rate:MET', 'BW:MET'], -1],
-        ['xe0_L2FS_L1XE25',                       371,    'L1_XE25',[], ['Main'], ['Rate:MET', 'BW:MET'],  1],
-        ['xe0_tc_em_L1XE25',                      372,    'L1_XE25',[], ['Main'], ['Rate:MET', 'BW:MET'], -1], 
-        ['xe0_pueta_L1XE25',                      373,    'L1_XE25',[], ['Main'], ['Rate:MET', 'BW:MET'], -1],
-        ['xe0_l2fsperf_wEFMuFEB_wEFMu_L1XE25',    374,    'L1_XE25',[], ['Main'], ['Rate:MET', 'BW:MET'], -1],
-
-        ['xe0_L1All',                            375,    'L1_All',[], ['Main'], ['Rate:MET', 'BW:MET'], -1],
-        ['xe0_cell_L1All',                       376,    'L1_All',[], ['Main'], ['Rate:MET', 'BW:MET'], -1],
-        ['xe0_L2FS_L1All',                       377,    'L1_All',[], ['Main'], ['Rate:MET', 'BW:MET'],  1],
-        ['xe0_tc_em_L1All',                      378,    'L1_All',[], ['Main'], ['Rate:MET', 'BW:MET'], -1], 
-        ['xe0_pueta_L1All',                      379,    'L1_All',[], ['Main'], ['Rate:MET', 'BW:MET'], -1],
-        ['xe0_l2fsperf_wEFMuFEB_wEFMu_L1All',    380,    'L1_All',[], ['Main'], ['Rate:MET', 'BW:MET'], -1],
-
-        ['xs30',                                 381,    'L1_XS30',[], ['Main'], ['Rate:MET', 'BW:MET'], -1],
-        #['xs35',                                 382,    'L1_XS35',[], ['Main'], ['Rate:MET', 'BW:MET'], -1],
-        ['xs30_cell',                            383,    'L1_XS30',[], ['Main'], ['Rate:MET', 'BW:MET'], -1],
-        #['xs35_cell',                            384,    'L1_XS35',[], ['Main'], ['Rate:MET', 'BW:MET'], -1],
-
-        ['te20',                                 385,    'L1_TE20',[], ['Main'], ['Rate:MET', 'BW:MET'], -1],
-        ['te300',                                386,    'L1_TE300',[], ['Main'], ['Rate:MET', 'BW:MET'], -1],
-        ['te20_cell',                            387,    'L1_TE20',[], ['Main'], ['Rate:MET', 'BW:MET'], -1],
-        ['te300_cell',                           388,    'L1_TE300',[], ['Main'], ['Rate:MET', 'BW:MET'], -1],
+        ['xe20',                             'L1_XE20',[], ['Main'], ['Rate:MET', 'BW:MET'], -1],
+        ['xe20_cell',                        'L1_XE20',[], ['Main'], ['Rate:MET', 'BW:MET'], -1],
+        ['xe20_L2FS',                        'L1_XE20',[], ['Main'], ['Rate:MET', 'BW:MET'],  1],
+        ['xe20_tc_em',                       'L1_XE20',[], ['Main'], ['Rate:MET', 'BW:MET'], -1], 
+        ['xe20_pueta',                       'L1_XE20',[], ['Main'], ['Rate:MET', 'BW:MET'], -1],
+        ['xe20_l2fsperf_wEFMuFEB_wEFMu',     'L1_XE20',[], ['Main'], ['Rate:MET', 'BW:MET'], -1],
+        ['xe25',                             'L1_XE25',[], ['Main'], ['Rate:MET', 'BW:MET'], -1],
+        ['xe25_cell',                        'L1_XE25',[], ['Main'], ['Rate:MET', 'BW:MET'], -1],
+        ['xe25_L2FS',                        'L1_XE25',[], ['Main'], ['Rate:MET', 'BW:MET'],  1],
+        ['xe25_tc_em',                       'L1_XE25',[], ['Main'], ['Rate:MET', 'BW:MET'], -1], 
+        ['xe25_pueta',                       'L1_XE25',[], ['Main'], ['Rate:MET', 'BW:MET'], -1],
+        ['xe25_l2fsperf_wEFMuFEB_wEFMu',     'L1_XE25',[], ['Main'], ['Rate:MET', 'BW:MET'], -1],
+
+        ['xe0_L1XE20',                              'L1_XE20',[], ['Main'], ['Rate:MET', 'BW:MET'], -1],
+        ['xe0_cell_L1XE20',                         'L1_XE20',[], ['Main'], ['Rate:MET', 'BW:MET'], -1],
+        ['xe0_L2FS_L1XE20',                         'L1_XE20',[], ['Main'], ['Rate:MET', 'BW:MET'],  1],
+        ['xe0_tc_em_L1XE20',                        'L1_XE20',[], ['Main'], ['Rate:MET', 'BW:MET'], -1], 
+        ['xe0_pueta_L1XE20',                        'L1_XE20',[], ['Main'], ['Rate:MET', 'BW:MET'], -1],
+        ['xe0_l2fsperf_wEFMuFEB_wEFMu_L1XE20',      'L1_XE20',[], ['Main'], ['Rate:MET', 'BW:MET'], -1],
+        ['xe0_L1XE25',                              'L1_XE25',[], ['Main'], ['Rate:MET', 'BW:MET'], -1],
+        ['xe0_cell_L1XE25',                         'L1_XE25',[], ['Main'], ['Rate:MET', 'BW:MET'], -1],
+        ['xe0_L2FS_L1XE25',                         'L1_XE25',[], ['Main'], ['Rate:MET', 'BW:MET'],  1],
+        ['xe0_tc_em_L1XE25',                        'L1_XE25',[], ['Main'], ['Rate:MET', 'BW:MET'], -1], 
+        ['xe0_pueta_L1XE25',                        'L1_XE25',[], ['Main'], ['Rate:MET', 'BW:MET'], -1],
+        ['xe0_l2fsperf_wEFMuFEB_wEFMu_L1XE25',      'L1_XE25',[], ['Main'], ['Rate:MET', 'BW:MET'], -1],
+
+        ['xe0_L1All',                              'L1_All',[], ['Main'], ['Rate:MET', 'BW:MET'], -1],
+        ['xe0_cell_L1All',                         'L1_All',[], ['Main'], ['Rate:MET', 'BW:MET'], -1],
+        ['xe0_L2FS_L1All',                         'L1_All',[], ['Main'], ['Rate:MET', 'BW:MET'],  1],
+        ['xe0_tc_em_L1All',                        'L1_All',[], ['Main'], ['Rate:MET', 'BW:MET'], -1], 
+        ['xe0_pueta_L1All',                        'L1_All',[], ['Main'], ['Rate:MET', 'BW:MET'], -1],
+        ['xe0_l2fsperf_wEFMuFEB_wEFMu_L1All',      'L1_All',[], ['Main'], ['Rate:MET', 'BW:MET'], -1],
+
+        ['xs30',                                   'L1_XS30',[], ['Main'], ['Rate:MET', 'BW:MET'], -1],
+        #['xs35',                                   'L1_XS35',[], ['Main'], ['Rate:MET', 'BW:MET'], -1],
+        ['xs30_cell',                              'L1_XS30',[], ['Main'], ['Rate:MET', 'BW:MET'], -1],
+        #['xs35_cell',                              'L1_XS35',[], ['Main'], ['Rate:MET', 'BW:MET'], -1],
+
+        ['te20',                                   'L1_TE20',[], ['Main'], ['Rate:MET', 'BW:MET'], -1],
+        ['te300',                                  'L1_TE300',[], ['Main'], ['Rate:MET', 'BW:MET'], -1],
+        ['te20_cell',                              'L1_TE20',[], ['Main'], ['Rate:MET', 'BW:MET'], -1],
+        ['te300_cell',                             'L1_TE300',[], ['Main'], ['Rate:MET', 'BW:MET'], -1],
 
         ]
 
     TriggerFlags.TauSlice.signatures = [
-        ['tau8_cosmic_track', 620, 'L1_TAU8_EMPTY', [], ['Main'], ['RATE:SingleTau', 'BW:Tau'], -1],
-        ['tau8_cosmic_ptonly', 621, 'L1_TAU8_EMPTY', [], ['Main'], ['RATE:SingleTau', 'BW:Tau'], -1],
-        ['tau1_cosmic_track_L1MU4_EMPTY', 622, 'L1_MU4_EMPTY', [], ['Main'], ['RATE:SingleTau', 'BW:Tau'], -1],
-        ['tau1_cosmic_ptonly_L1MU4_EMPTY', 623, 'L1_MU4_EMPTY', [], ['Main'], ['RATE:SingleTau', 'BW:Tau'], -1],
+        ['tau8_cosmic_track',  'L1_TAU8_EMPTY', [], ['Main'], ['RATE:SingleTau', 'BW:Tau'], -1],
+        ['tau8_cosmic_ptonly', 'L1_TAU8_EMPTY', [], ['Main'], ['RATE:SingleTau', 'BW:Tau'], -1],
+        ['tau1_cosmic_track_L1MU4_EMPTY',  'L1_MU4_EMPTY', [], ['Main'], ['RATE:SingleTau', 'BW:Tau'], -1],
+        ['tau1_cosmic_ptonly_L1MU4_EMPTY', 'L1_MU4_EMPTY', [], ['Main'], ['RATE:SingleTau', 'BW:Tau'], -1],
         ]
 
     TriggerFlags.EgammaSlice.signatures = [
-        ['e5_loose1',               130,          'L1_EM3', [], ['Main'], ['RATE:SingleElectron', 'BW:Egamma'], -1],
-        ['e5_lhloose', 300, 'L1_EM3', [], ['Main'], ['RATE:SingleElectron', 'BW:Egamma'], 1],
+        ['e5_loose1',                         'L1_EM3', [], ['Main'], ['RATE:SingleElectron', 'BW:Egamma'], -1],
+        ['e5_lhloose',  'L1_EM3', [], ['Main'], ['RATE:SingleElectron', 'BW:Egamma'], 1],
 
-        ['e5_etcut',                120,          'L1_EM3', [], ['Main'], ['RATE:SingleElectron', 'BW:Egamma'], -1], 
-        ['e5_etcut_L1EM3_EMPTY',    121,          'L1_EM3_EMPTY', [], ['Main'], ['RATE:SingleElectron', 'BW:Egamma'], -1], 
-        ['g5_etcut',                122,          'L1_EM3', [], ['Main'], ['RATE:SingleElectron', 'BW:Egamma'], -1], 
-        ['g5_etcut_L1EM3_EMPTY',    123,          'L1_EM3_EMPTY', [], ['Main'], ['RATE:SingleElectron', 'BW:Egamma'], -1], 
+        ['e5_etcut',                          'L1_EM3', [], ['Main'], ['RATE:SingleElectron', 'BW:Egamma'], -1], 
+        ['e5_etcut_L1EM3_EMPTY',              'L1_EM3_EMPTY', [], ['Main'], ['RATE:SingleElectron', 'BW:Egamma'], -1], 
+        ['g5_etcut',                          'L1_EM3', [], ['Main'], ['RATE:SingleElectron', 'BW:Egamma'], -1], 
+        ['g5_etcut_L1EM3_EMPTY',              'L1_EM3_EMPTY', [], ['Main'], ['RATE:SingleElectron', 'BW:Egamma'], -1], 
 
-        ['e0_perf_L1EM3',           124, 'L1_EM3', [], ['Main'], ['RATE:SingleElectron', 'BW:Egamma'], 1],
-        ['e0_L2Star_perf_L1EM3',    125, 'L1_EM3', [], ['Main'], ['RATE:SingleElectron', 'BW:Egamma'], 1],
-        ['g0_perf_L1EM3',           126, 'L1_EM3', [], ['Main'], ['RATE:SingleElectron', 'BW:Egamma'], 1],
+        ['e0_perf_L1EM3',            'L1_EM3', [], ['Main'], ['RATE:SingleElectron', 'BW:Egamma'], 1],
+        ['e0_L2Star_perf_L1EM3',     'L1_EM3', [], ['Main'], ['RATE:SingleElectron', 'BW:Egamma'], 1],
+        ['g0_perf_L1EM3',            'L1_EM3', [], ['Main'], ['RATE:SingleElectron', 'BW:Egamma'], 1],
         ]
 
     TriggerFlags.BphysicsSlice.signatures = [
-        ['2mu4_bDimu',               338, 'L1_2MU4', [], ['Main'], ['RATE:Bphysics_MultiMuon','BW:Bphys'], -1], 
-        ['2mu4_bDimu_novtx_noos',    339, 'L1_2MU4', [], ['Main'], ['RATE:Bphysics_MultiMuon','BW:Bphys'], -1],  
-        ['2mu6_bDimu',               340, 'L1_2MU6', [], ['Main'], ['RATE:Bphysics_MultiMuon','BW:Bphys'], -1], 
-        ['2mu6_bDimu_novtx_noos',    341, 'L1_2MU6', [], ['Main'], ['RATE:Bphysics_MultiMuon','BW:Bphys'], -1],  
+        ['2mu4_bDimu',               'L1_2MU4', [], ['Main'], ['RATE:Bphysics_MultiMuon','BW:Bphys'], -1], 
+        ['2mu4_bDimu_novtx_noos',    'L1_2MU4', [], ['Main'], ['RATE:Bphysics_MultiMuon','BW:Bphys'], -1],  
+        ['2mu6_bDimu',               'L1_2MU6', [], ['Main'], ['RATE:Bphysics_MultiMuon','BW:Bphys'], -1], 
+        ['2mu6_bDimu_novtx_noos',    'L1_2MU6', [], ['Main'], ['RATE:Bphysics_MultiMuon','BW:Bphys'], -1],  
         ]
     TriggerFlags.CombinedSlice.signatures = []
 
 
     TriggerFlags.MinBiasSlice.signatures = [
         # LS1 chains
-        ['mb_sptrk',                     806, 'L1_RD0_FILLED', [], ['MinBias'], ["BW:MinBias", "RATE:MinBias"], -1],
-        ['mb_sptrk_noisesup',            807, 'L1_RD0_FILLED', [], ['MinBias'], ["BW:MinBias", "RATE:MinBias"], -1],
-        ['mb_sptrk_L1RD0_UNPAIRED_ISO',  808, 'L1_RD0_UNPAIRED_ISO', [], ['MinBias'], ["BW:MinBias", "RATE:SeededStreamers"], -1],
-        ['mb_sptrk_L1RD0_EMPTY',         809, 'L1_RD0_EMPTY', [], ['MinBias'], ["BW:MinBias", "RATE:Cosmic_Minbias"], -1],
-        ##['mb_sp2000_trk70_hmt',          810, 'L1_TE20', [], ['MinBias'], ["BW:MinBias", "RATE:HMT"], -1], #disabled for M4 see https://savannah.cern.ch/bugs/?104744
+        ['mb_sptrk',                     'L1_RD0_FILLED', [], ['MinBias'], ["BW:MinBias", "RATE:MinBias"], -1],
+        ['mb_sptrk_noisesup',            'L1_RD0_FILLED', [], ['MinBias'], ["BW:MinBias", "RATE:MinBias"], -1],
+        ['mb_sptrk_L1RD0_UNPAIRED_ISO',  'L1_RD0_UNPAIRED_ISO', [], ['MinBias'], ["BW:MinBias", "RATE:SeededStreamers"], -1],
+        ['mb_sptrk_L1RD0_EMPTY',         'L1_RD0_EMPTY', [], ['MinBias'], ["BW:MinBias", "RATE:Cosmic_Minbias"], -1],
+        ##['mb_sp2000_trk70_hmt',        'L1_TE20', [], ['MinBias'], ["BW:MinBias", "RATE:HMT"], -1], #disabled for M4 see https://savannah.cern.ch/bugs/?104744
 
-        ['mb_perf_L1LUCID_UNPAIRED_ISO', 800, 'L1_LUCID_UNPAIRED_ISO',        [], ['MinBias'], ["BW:MinBias", "RATE:SeededStreamers"], -1],
-        ['mb_perf_L1LUCID_EMPTY',        801, 'L1_LUCID_EMPTY',        [], ['MinBias'], ["BW:MinBias", "RATE:Cosmic_Minbias"], -1],
-        ['mb_perf_L1LUCID',              802, 'L1_LUCID',        [], ['MinBias'], ["BW:MinBias", "RATE:MinBias"], -1],
+        ['mb_perf_L1LUCID_UNPAIRED_ISO', 'L1_LUCID_UNPAIRED_ISO',        [], ['MinBias'], ["BW:MinBias", "RATE:SeededStreamers"], -1],
+        ['mb_perf_L1LUCID_EMPTY',        'L1_LUCID_EMPTY',        [], ['MinBias'], ["BW:MinBias", "RATE:Cosmic_Minbias"], -1],
+        ['mb_perf_L1LUCID',              'L1_LUCID',        [], ['MinBias'], ["BW:MinBias", "RATE:MinBias"], -1],
 
-        ['mb_sptrk_costr',               836, 'L1_RD0_FILLED', [], ['MinBias'], ["BW:MinBias", "RATE:MinBias"], -1],
-        ['mb_sptrk_costr_L1RD0_EMPTY',   838, 'L1_RD0_EMPTY', [], ['MinBias'], ["BW:MinBias", "RATE:MinBias"], -1],
+        ['mb_sptrk_costr',               'L1_RD0_FILLED', [], ['MinBias'], ["BW:MinBias", "RATE:MinBias"], -1],
+        ['mb_sptrk_costr_L1RD0_EMPTY',   'L1_RD0_EMPTY', [], ['MinBias'], ["BW:MinBias", "RATE:MinBias"], -1],
 
-        ['mb_perf_L1MBTS_2',             799, 'L1_MBTS_2', [], ['MinBias'], ["BW:MinBias", "RATE:MinBias"], -1], 
-        ['mb_mbts_L1MBTS_2',             803, 'L1_MBTS_2', [], ['MinBias'], ["BW:MinBias", "RATE:MinBias"], -1], 
+        ['mb_perf_L1MBTS_2',             'L1_MBTS_2', [], ['MinBias'], ["BW:MinBias", "RATE:MinBias"], -1], 
+        ['mb_mbts_L1MBTS_2',             'L1_MBTS_2', [], ['MinBias'], ["BW:MinBias", "RATE:MinBias"], -1], 
 
         ]
     
@@ -164,159 +164,159 @@ def setupMenu():
     allL1TAUseeds = ",".join([ x for x in tcl1.current.menu.items.itemNames() if "TAU" in x ])
 
     TriggerFlags.CalibSlice.signatures   = [
-        ['l1calocalib',             6416, 'L1_RD0_FILLED',     [], ['L1CaloCalib'], ["RATE:Calibration", "RATE:L1CaloCalib", "BW:Detector"], -1],
-        ['l1calocalib_L1BGRP7',     6417, 'L1_BGRP7',          [], ['L1CaloCalib'], ["RATE:Calibration", "RATE:L1CaloCalib", "BW:Detector"], -1], 
+        ['l1calocalib',              'L1_RD0_FILLED',     [], ['L1CaloCalib'], ["RATE:Calibration", "RATE:L1CaloCalib", "BW:Detector"], -1],
+        ['l1calocalib_L1BGRP7',      'L1_BGRP7',          [], ['L1CaloCalib'], ["RATE:Calibration", "RATE:L1CaloCalib", "BW:Detector"], -1], 
 
-        ['larcalib_L1EM3_EMPTY',    6418, 'L1_EM3_EMPTY',      [], ['LArCellsEmpty'], ["RATE:Calibration", "BW:Detector"], -1],
-        ['larcalib_L1TAU8_EMPTY',   6419, 'L1_TAU8_EMPTY',     [], ['LArCellsEmpty'], ["RATE:Calibration", "BW:Detector"], -1],
-        ['larcalib_L1J10_EMPTY',    6420, 'L1_J10_EMPTY',      [], ['LArCellsEmpty'], ["RATE:Calibration", "BW:Detector"], -1],
-        ['larcalib_L1FJ30_EMPTY',   6421, 'L1_FJ30_EMPTY',     [], ['LArCellsEmpty'], ["RATE:Calibration", "BW:Detector"], -1],
+        ['larcalib_L1EM3_EMPTY',     'L1_EM3_EMPTY',      [], ['LArCellsEmpty'], ["RATE:Calibration", "BW:Detector"], -1],
+        ['larcalib_L1TAU8_EMPTY',    'L1_TAU8_EMPTY',     [], ['LArCellsEmpty'], ["RATE:Calibration", "BW:Detector"], -1],
+        ['larcalib_L1J10_EMPTY',     'L1_J10_EMPTY',      [], ['LArCellsEmpty'], ["RATE:Calibration", "BW:Detector"], -1],
+        ['larcalib_L1FJ30_EMPTY',    'L1_FJ30_EMPTY',     [], ['LArCellsEmpty'], ["RATE:Calibration", "BW:Detector"], -1],
         # DCM level monitoring chain for CSC (#104895, ATR-8082)
-        ['larcalib_L1MU10',   6422, 'L1_MU10',     [], ['CSC'], ["RATE:Monitoring", "BW:Detector"], -1],
-        ['larcalib_L1EM3',   6423, 'L1_EM3',     [], ['CSC'], ["RATE:Monitoring", "BW:Detector"], -1],
-        ['larcalib_L1J10',   6424, 'L1_J10',     [], ['CSC'], ["RATE:Monitoring", "BW:Detector"], -1],
+        ['larcalib_L1MU10',   'L1_MU10',     [], ['CSC'], ["RATE:Monitoring", "BW:Detector"], -1],
+        ['larcalib_L1EM3',    'L1_EM3',     [], ['CSC'], ["RATE:Monitoring", "BW:Detector"], -1],
+        ['larcalib_L1J10',    'L1_J10',     [], ['CSC'], ["RATE:Monitoring", "BW:Detector"], -1],
 
-        ['tilelarcalib_L1EM3_EMPTY',    6430, 'L1_EM3_EMPTY',      [], ['LArCellsEmpty'], ["RATE:Calibration", "BW:Detector"], -1],
-        ['tilelarcalib_L1TAU8_EMPTY',   6431, 'L1_TAU8_EMPTY',     [], ['LArCellsEmpty'], ["RATE:Calibration", "BW:Detector"], -1],
-        ['tilelarcalib_L1J10_EMPTY',    6432, 'L1_J10_EMPTY',      [], ['LArCellsEmpty'], ["RATE:Calibration", "BW:Detector"], -1],
-        ['tilelarcalib_L1FJ30_EMPTY',   6433, 'L1_FJ30_EMPTY',     [], ['LArCellsEmpty'], ["RATE:Calibration", "BW:Detector"], -1],
+        ['tilelarcalib_L1EM3_EMPTY',    'L1_EM3_EMPTY',      [], ['LArCellsEmpty'], ["RATE:Calibration", "BW:Detector"], -1],
+        ['tilelarcalib_L1TAU8_EMPTY',   'L1_TAU8_EMPTY',     [], ['LArCellsEmpty'], ["RATE:Calibration", "BW:Detector"], -1],
+        ['tilelarcalib_L1J10_EMPTY',    'L1_J10_EMPTY',      [], ['LArCellsEmpty'], ["RATE:Calibration", "BW:Detector"], -1],
+        ['tilelarcalib_L1FJ30_EMPTY',   'L1_FJ30_EMPTY',     [], ['LArCellsEmpty'], ["RATE:Calibration", "BW:Detector"], -1],
 
         #ALFA
-        ['alfa_alfacalib',         6685, 'L1_ALFA_EMPTY', [], ['ALFACalib'], [ 'RATE:ALFACalibration','BW:Detector'], -1],        
+        ['alfa_alfacalib',    'L1_ALFA_EMPTY', [], ['ALFACalib'], [ 'RATE:ALFACalibration','BW:Detector'], -1],        
         ]
        
 
     TriggerFlags.CosmicSlice.signatures  =  [
-        ['tilecalib_laser',  6500, 'L1_CALREQ2', [], ['Tile'], ["RATE:Calibration", "RATE:Cosmic_TileCalibration", "BW:Detector"], -1],
-        ['pixel_noise',      6501, 'L1_RD0_EMPTY', [], ['PixelNoise'], ["RATE:Calibration", "RATE:PixelCalibration", "BW:Detector"], -1],
-        ['pixel_beam',       6502, 'L1_RD0_FILLED', [], ['PixelBeam'], ["RATE:Calibration", "RATE:PixelBeamCalibration", "BW:Detector"], -1],
-        ['sct_noise',        6503, 'L1_RD0_EMPTY', [], ['SCTNoise'], ["RATE:Calibration", "RATE:SCTCalibration", "BW:Detector"], -1],
+        ['tilecalib_laser',   'L1_CALREQ2', [], ['Tile'], ["RATE:Calibration", "RATE:Cosmic_TileCalibration", "BW:Detector"], -1],
+        ['pixel_noise',       'L1_RD0_EMPTY', [], ['PixelNoise'], ["RATE:Calibration", "RATE:PixelCalibration", "BW:Detector"], -1],
+        ['pixel_beam',        'L1_RD0_FILLED', [], ['PixelBeam'], ["RATE:Calibration", "RATE:PixelBeamCalibration", "BW:Detector"], -1],
+        ['sct_noise',         'L1_RD0_EMPTY', [], ['SCTNoise'], ["RATE:Calibration", "RATE:SCTCalibration", "BW:Detector"], -1],
         
         # CosmicCalo
-        ['larps_L1EM3_EMPTY',  5060, 'L1_EM3_EMPTY', [], ['CosmicCalo'], ['RATE:CosmicSlice', 'RATE:Cosmic_LArCalibration', 'BW:Detector'], -1],
-        ['larps_L1EM6_EMPTY',  5061, 'L1_EM6_EMPTY', [], ['CosmicCalo'], ['RATE:CosmicSlice', 'RATE:Cosmic_LArCalibration', 'BW:Detector'], -1],
-        ['larps_L1J10_EMPTY',  5062, 'L1_J10_EMPTY', [], ['CosmicCalo'], ['RATE:CosmicSlice', 'RATE:Cosmic_LArCalibration', 'BW:Detector'], -1],
-        ['larps_L1J30_EMPTY',  5063, 'L1_J30_EMPTY', [], ['CosmicCalo'], ['RATE:CosmicSlice', 'RATE:Cosmic_LArCalibration', 'BW:Detector'], -1],
-        ['larps_L1TAU8_EMPTY', 5064, 'L1_TAU8_EMPTY', [], ['CosmicCalo'], ['RATE:CosmicSlice', 'RATE:Cosmic_LArCalibration', 'BW:Detector'], -1],
+        ['larps_L1EM3_EMPTY',  'L1_EM3_EMPTY', [], ['CosmicCalo'], ['RATE:CosmicSlice', 'RATE:Cosmic_LArCalibration', 'BW:Detector'], -1],
+        ['larps_L1EM6_EMPTY',  'L1_EM6_EMPTY', [], ['CosmicCalo'], ['RATE:CosmicSlice', 'RATE:Cosmic_LArCalibration', 'BW:Detector'], -1],
+        ['larps_L1J10_EMPTY',  'L1_J10_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_L1TAU8_EMPTY', 'L1_TAU8_EMPTY', [], ['CosmicCalo'], ['RATE:CosmicSlice', 'RATE:Cosmic_LArCalibration', 'BW:Detector'], -1],
 
-        ['larps_L1J10_FIRSTEMPTY', 5065, 'L1_J10_FIRSTEMPTY', [], ['LArCellsEmpty'], ['RATE:CosmicSlice', 'RATE:Cosmic_LArCalibration', 'BW:Detector'], -1],
-        ['larps_L1J30_FIRSTEMPTY', 5066, 'L1_J30_FIRSTEMPTY', [], ['LArCellsEmpty'], ['RATE:CosmicSlice', 'RATE:Cosmic_LArCalibration', 'BW:Detector'], -1],
+        ['larps_L1J10_FIRSTEMPTY', 'L1_J10_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],
 
         #CosmicID
-        ['id_cosmic_L1MU4',         5041, 'L1_MU4', [], ['HLT_IDCosmic', 'express'], ['RATE:CosmicSlice', 'RATE:Cosmic_Tracking', 'BW:Detector'], -1],
-        ['id_cosmic_L1MU11',        5040, 'L1_MU11', [],['HLT_IDCosmic', 'express'], ['RATE:CosmicSlice', 'RATE:Cosmic_Tracking', 'BW:Detector'], -1],
+        ['id_cosmic_L1MU4',          'L1_MU4', [], ['HLT_IDCosmic', 'express'], ['RATE:CosmicSlice', 'RATE:Cosmic_Tracking', 'BW:Detector'], -1],
+        ['id_cosmic_L1MU11',         'L1_MU11', [],['HLT_IDCosmic', 'express'], ['RATE:CosmicSlice', 'RATE:Cosmic_Tracking', 'BW:Detector'], -1],
 
-        ['id_cosmic',               5042, '', [], ['HLT_IDCosmic', 'express'], ['RATE:CosmicSlice', 'RATE:Cosmic_Tracking', 'BW:Detector'], -1],
-        ['id_cosmic_trtxk',         5043, '', [], ['HLT_IDCosmic'], ['RATE:CosmicSlice', 'BW:Detector'], -1],
-        ['id_cosmic_trtxk_central', 5044, '', [], ['HLT_IDCosmic'], ['RATE:CosmicSlice', 'BW:Detector'], -1],
+        ['id_cosmic',                '', [], ['HLT_IDCosmic', 'express'], ['RATE:CosmicSlice', 'RATE:Cosmic_Tracking', 'BW:Detector'], -1],
+        ['id_cosmic_trtxk',          '', [], ['HLT_IDCosmic'], ['RATE:CosmicSlice', 'BW:Detector'], -1],
+        ['id_cosmic_trtxk_central',  '', [], ['HLT_IDCosmic'], ['RATE:CosmicSlice', 'BW:Detector'], -1],
         
-        ['id_cosmic_ds',            5045, '', [], ['DataScouting_02_IDCosmic'], ['RATE:CosmicSlice_DS', 'RATE:Cosmic_Tracking_DS', 'BW:Detector'], -1],        
+        ['id_cosmic_ds',             '', [], ['DataScouting_04_IDCosmic'], ['RATE:CosmicSlice_DS', 'RATE:Cosmic_Tracking_DS', 'BW:Detector'], -1],        
 
         ]
 
 
     TriggerFlags.StreamingSlice.signatures =  [
         #DCM level monitoring test chain
-        ['noalg_dcmmon_L1RD0_EMPTY',        6666, 'L1_RD0_EMPTY',        [], ['express','monitoring_random'], [""], -1], 
+        ['noalg_dcmmon_L1RD0_EMPTY',     'L1_RD0_EMPTY',        [], ['express','monitoring_random'], [""], -1], 
 
         #background streamers
-        ['noalg_bkg_L1Bkg',              6550, 'L1_Bkg',              [], ['Background'], ["RATE:SeededStreamers", "BW:Other"], -1], 
-        ['noalg_bkg_L1RD0_UNPAIRED_ISO', 6551, 'L1_RD0_UNPAIRED_ISO', [], ['Background'], ["RATE:SeededStreamers", "BW:Other"], -1],
-        ['noalg_bkg_L1RD0_EMPTY',        6552, 'L1_RD0_EMPTY',        [], ['express','Background'], ["RATE:SeededStreamers", "BW:Other"], -1], 
-        ['noalg_bkg_L1RD1_FILLED',       6549, 'L1_RD1_FILLED',       [], ['Background'], ["RATE:SeededStreamers", "BW:Other"], -1], 
+        ['noalg_bkg_L1Bkg',              'L1_Bkg',              [], ['Background'], ["RATE:SeededStreamers", "BW:Other"], -1], 
+        ['noalg_bkg_L1RD0_UNPAIRED_ISO', 'L1_RD0_UNPAIRED_ISO', [], ['Background'], ["RATE:SeededStreamers", "BW:Other"], -1],
+        ['noalg_bkg_L1RD0_EMPTY',        'L1_RD0_EMPTY',        [], ['express','Background'], ["RATE:SeededStreamers", "BW:Other"], -1], 
+        ['noalg_bkg_L1RD1_FILLED',       'L1_RD1_FILLED',       [], ['Background'], ["RATE:SeededStreamers", "BW:Other"], -1], 
 
         # standby streamer
-        ['noalg_L1Standby',              6553, 'L1_Standby',          [], ['Standby'],    ["RATE:SeededStreamers", "BW:Other"], -1], 
+        ['noalg_L1Standby',              'L1_Standby',          [], ['Standby'],    ["RATE:SeededStreamers", "BW:Other"], -1], 
         
         # L1 streamers
-        #disabled see #104204   ['noalg_L1Muon',                 6554, 'L1_Muon',             [], ['L1Muon'],     ["RATE:SeededStreamers", "BW:Other"], -1], 
-        #disabled see #104204   ['noalg_L1Muon_EMPTY',           6557, 'L1_Muon_EMPTY',       [], ['L1Muon'],     ["RATE:SeededStreamers", "BW:Other"], -1], 
+        #disabled see #104204   ['noalg_L1Muon',                'L1_Muon',             [], ['L1Muon'],     ["RATE:SeededStreamers", "BW:Other"], -1], 
+        #disabled see #104204   ['noalg_L1Muon_EMPTY',          'L1_Muon_EMPTY',       [], ['L1Muon'],     ["RATE:SeededStreamers", "BW:Other"], -1], 
 
-        ['noalg_L1Calo',                 6555, 'L1_Calo',             [], ['L1Calo'],     ["RATE:SeededStreamers", "BW:Other"], -1], 
-        ['noalg_L1MinBias',              6556, 'L1_MinBias',          [], ['L1MinBias'],  ["RATE:SeededStreamers", "BW:Other"], -1], 
-        ['noalg_L1Calo_EMPTY',           6558, 'L1_Calo_EMPTY',       [], ['L1Calo'],     ["RATE:SeededStreamers", "BW:Other"], -1], 
-        # #['noalg_L1MinBias_EMPTY', 9559, 'L1_MinBias_EMPTY', [], ['L1MinBias'], [], -1], 
+        ['noalg_L1Calo',                 'L1_Calo',             [], ['L1Calo'],     ["RATE:SeededStreamers", "BW:Other"], -1], 
+        ['noalg_L1MinBias',              'L1_MinBias',          [], ['L1MinBias'],  ["RATE:SeededStreamers", "BW:Other"], -1], 
+        ['noalg_L1Calo_EMPTY',           'L1_Calo_EMPTY',       [], ['L1Calo'],     ["RATE:SeededStreamers", "BW:Other"], -1], 
+        # #['noalg_L1MinBias_EMPTY',  'L1_MinBias_EMPTY', [], ['L1MinBias'], [], -1], 
 
         # #minbias streamer
-        ['noalg_mb_L1MBTS_2',         804, 'L1_MBTS_2',        [], ['MinBias'], ["BW:MinBias", "RATE:MinBias"], -1],
-        ['noalg_mb_L1MBTS_2_UNPAIRED_ISO',         805, 'L1_MBTS_2_UNPAIRED_ISO',        [], ['MinBias'], ["BW:MinBias", "RATE:SeededStreamers"], -1],
-        ['noalg_mb_L1RD0_EMPTY',         824, 'L1_RD0_EMPTY',        [], ['express','MinBias'], ["BW:MinBias", "RATE:Cosmic_Minbias"], -1],
-        ['noalg_mb_L1RD0_FILLED',         825, 'L1_RD0_FILLED',        [], ['MinBias'], ["BW:MinBias", "RATE:Cosmic_Minbias"], -1],
-        ['noalg_mb_L1RD0_UNPAIRED_ISO',  837, 'L1_RD0_UNPAIRED_ISO', [], ['MinBias'], ["BW:Unpaired_Minbias", "RATE:Cosmic_Minbias"], -1],
-        ['noalg_mb_L1RD1_EMPTY',         829, 'L1_RD1_EMPTY',        [], ['MinBias'], ["BW:MinBias", "RATE:Cosmic_Minbias"], -1],
-        ['noalg_mb_L1RD1_FILLED',         830, 'L1_RD1_FILLED',        [], ['MinBias'], ["BW:MinBias", "RATE:Cosmic_Minbias"], -1],
-        # L1 seed doesn't exits ['noalg_mb_L1RD1_UNPAIRED_ISO',  831, 'L1_RD1_UNPAIRED_ISO', [], ['MinBias'], ["BW:Unpaired_Minbias", "RATE:Cosmic_Minbias"], -1],
+        ['noalg_mb_L1MBTS_2',     'L1_MBTS_2',        [], ['MinBias'], ["BW:MinBias", "RATE:MinBias"], -1],
+        ['noalg_mb_L1MBTS_2_UNPAIRED_ISO',          'L1_MBTS_2_UNPAIRED_ISO',        [], ['MinBias'], ["BW:MinBias", "RATE:SeededStreamers"], -1],
+        ['noalg_mb_L1RD0_EMPTY',           'L1_RD0_EMPTY',        [], ['express','MinBias'], ["BW:MinBias", "RATE:Cosmic_Minbias"], -1],
+        ['noalg_mb_L1RD0_FILLED',          'L1_RD0_FILLED',        [], ['MinBias'], ["BW:MinBias", "RATE:Cosmic_Minbias"], -1],
+        ['noalg_mb_L1RD0_UNPAIRED_ISO',    'L1_RD0_UNPAIRED_ISO', [], ['MinBias'], ["BW:Unpaired_Minbias", "RATE:Cosmic_Minbias"], -1],
+        ['noalg_mb_L1RD1_EMPTY',           'L1_RD1_EMPTY',        [], ['MinBias'], ["BW:MinBias", "RATE:Cosmic_Minbias"], -1],
+        ['noalg_mb_L1RD1_FILLED',          'L1_RD1_FILLED',        [], ['MinBias'], ["BW:MinBias", "RATE:Cosmic_Minbias"], -1],
+        # L1 seed doesn't exits ['noalg_mb_L1RD1_UNPAIRED_ISO',  'L1_RD1_UNPAIRED_ISO', [], ['MinBias'], ["BW:Unpaired_Minbias", "RATE:Cosmic_Minbias"], -1],
 
         # id cosmic streamer
-        ['noalg_idcosmic_L1TRT',         828, 'L1_TRT',              [], ['IDCosmic'], ["BW:MinBias", "RATE:Minbias"], -1],
+        ['noalg_idcosmic_L1TRT',        'L1_TRT',              [], ['IDCosmic'], ["BW:MinBias", "RATE:Minbias"], -1],
 
         # Cosmic calo streamer
-        ['noalg_cosmiccalo_L1EM3_EMPTY',        1826, 'L1_EM3_EMPTY',        [], ['CosmicCalo'], ["BW:MinBias", "RATE:Cosmic_Minbias"], -1],        
-        ['noalg_cosmiccalo_L1RD1_EMPTY',         826, 'L1_RD1_EMPTY',        [], ['CosmicCalo'], ["BW:MinBias", "RATE:Cosmic_Minbias"], -1],        
-        ['noalg_cosmiccalo_L1FJ30_EMPTY',        841, 'L1_FJ30_EMPTY',       [], ['CosmicCalo'], ["BW:Jets", "RATE:SingleJet"], -1],
-        ['noalg_cosmiccalo_L1J10_EMPTY',         842, 'L1_J10_EMPTY',        [], ['CosmicCalo', 'express'], ["BW:Jets", "RATE:SingleJet"], -1],
-        ['noalg_cosmiccalo_L1J30_EMPTY',         843, 'L1_J30_EMPTY',        [], ['CosmicCalo', 'express'], ["BW:Jets", "RATE:SingleJet"], -1],
-        ['noalg_cosmiccalo_L1J10_FIRSTEMPTY',    844, 'L1_J10_FIRSTEMPTY',   [], ['CosmicCalo', 'express'], ["BW:Jets", "RATE:SingleJet"], -1],
-        ['noalg_cosmiccalo_L1J30_FIRSTEMPTY',    845, 'L1_J30_FIRSTEMPTY',   [], ['CosmicCalo', 'express'], ["BW:Jets", "RATE:SingleJet"], -1],
+        ['noalg_cosmiccalo_L1EM3_EMPTY',        'L1_EM3_EMPTY',        [], ['CosmicCalo'], ["BW:MinBias", "RATE:Cosmic_Minbias"], -1],        
+        ['noalg_cosmiccalo_L1RD1_EMPTY',        'L1_RD1_EMPTY',        [], ['CosmicCalo'], ["BW:MinBias", "RATE:Cosmic_Minbias"], -1],        
+        ['noalg_cosmiccalo_L1FJ30_EMPTY',       'L1_FJ30_EMPTY',       [], ['CosmicCalo'], ["BW:Jets", "RATE:SingleJet"], -1],
+        ['noalg_cosmiccalo_L1J10_EMPTY',        'L1_J10_EMPTY',        [], ['CosmicCalo', 'express'], ["BW:Jets", "RATE:SingleJet"], -1],
+        ['noalg_cosmiccalo_L1J30_EMPTY',        'L1_J30_EMPTY',        [], ['CosmicCalo', 'express'], ["BW:Jets", "RATE:SingleJet"], -1],
+        ['noalg_cosmiccalo_L1J10_FIRSTEMPTY',   'L1_J10_FIRSTEMPTY',   [], ['CosmicCalo', 'express'], ["BW:Jets", "RATE:SingleJet"], -1],
+        ['noalg_cosmiccalo_L1J30_FIRSTEMPTY',   'L1_J30_FIRSTEMPTY',   [], ['CosmicCalo', 'express'], ["BW:Jets", "RATE:SingleJet"], -1],
 
         #HLT pass through
-        ['noalg_L1All',                  834, 'L1_All',              [], ['HLTPassthrough'], ["Supporting", "Calibration", "BW:Detector"], -1],
-        ['noalg_L1J10',                  835, 'L1_J10',              [], ['HLTPassthrough'], ["Supporting", "Calibration", "BW:Detector"], -1],
-        ['noalg_L1TAU8',                 868, 'L1_TAU8',             [], ['HLTPassthrough'], ["Supporting", "Calibration", "BW:Detector"], -1],
-        ['noalg_L1EM3',                  6559,'L1_EM3',             [],  ['HLTPassthrough'], ["Supporting", "Calibration", "BW:Detector"], -1],        
+        ['noalg_L1All',                'L1_All',              [], ['HLTPassthrough'], ["Supporting", "Calibration", "BW:Detector"], -1],
+        ['noalg_L1J10',                'L1_J10',              [], ['HLTPassthrough'], ["Supporting", "Calibration", "BW:Detector"], -1],
+        ['noalg_L1TAU8',               'L1_TAU8',             [], ['HLTPassthrough'], ["Supporting", "Calibration", "BW:Detector"], -1],
+        ['noalg_L1EM3',                'L1_EM3',             [],  ['HLTPassthrough'], ["Supporting", "Calibration", "BW:Detector"], -1],        
 
         # jettauetmiss streamer
-        ['noalg_jettauetmiss_L1RD0_FIRSTEMPTY',   840, 'L1_RD0_FIRSTEMPTY',  [], ['Main'], ["Supporting", "Calibration", "BW:Detector"], -1],
+        ['noalg_jettauetmiss_L1RD0_FIRSTEMPTY',   'L1_RD0_FIRSTEMPTY',  [], ['Main'], ["Supporting", "Calibration", "BW:Detector"], -1],
 
         # Enhanced bias item
-        ['noalg_eb_L1BGRP7',                  846, 'L1_BGRP7',              [], ['EnhancedBias'], ["Supporting", "Calibration", "BW:Detector"], -1],
-        ['noalg_eb_L1RD1_FILLED',             7000, 'L1_RD1_FILLED',        [], ['EnhancedBias'], ["Supporting", "Calibration", "BW:Detector"], -1],
-        ['noalg_eb_L1RD0_EMPTY',              7001, 'L1_RD0_EMPTY',         [], ['EnhancedBias', 'express'], ["Supporting", "Calibration", "BW:Detector"], -1],
-        ['noalg_eb_L1RD0_FIRSTEMPTY',         7002, 'L1_RD0_FIRSTEMPTY',    [], ['EnhancedBias'], ["Supporting", "Calibration", "BW:Detector"], -1],
-        ['noalg_eb_L1RD0_UNPAIRED_ISO',        7003, 'L1_RD0_UNPAIRED_ISO',  [], ['EnhancedBias'], ["Supporting", "Calibration", "BW:Detector"], -1],
-        ['noalg_eb_L1Physics_noPS'   ,        7004, 'L1_Physics_noPS',      [], ['EnhancedBias'], ["Supporting", "Calibration", "BW:Detector"], -1],
+        ['noalg_eb_L1BGRP7',                 'L1_BGRP7',              [], ['EnhancedBias'], ["Supporting", "Calibration", "BW:Detector"], -1],
+        ['noalg_eb_L1RD1_FILLED',             'L1_RD1_FILLED',        [], ['EnhancedBias'], ["Supporting", "Calibration", "BW:Detector"], -1],
+        ['noalg_eb_L1RD0_EMPTY',              'L1_RD0_EMPTY',         [], ['EnhancedBias', 'express'], ["Supporting", "Calibration", "BW:Detector"], -1],
+        ['noalg_eb_L1RD0_FIRSTEMPTY',         'L1_RD0_FIRSTEMPTY',    [], ['EnhancedBias'], ["Supporting", "Calibration", "BW:Detector"], -1],
+        ['noalg_eb_L1RD0_UNPAIRED_ISO',       'L1_RD0_UNPAIRED_ISO',  [], ['EnhancedBias'], ["Supporting", "Calibration", "BW:Detector"], -1],
+        ['noalg_eb_L1Physics_noPS'   ,        'L1_Physics_noPS',      [], ['EnhancedBias'], ["Supporting", "Calibration", "BW:Detector"], -1],
 
         #idmon streamer
-        ['noalg_idmon_L1RD0_EMPTY',         777, 'L1_RD0_EMPTY',        [], ['express','IDMonitoring'], ["RATE:DISCARD","BW:DISCARD"], -1],
-        ['noalg_idmon_L1RD0_FILLED',         778, 'L1_RD0_FILLED',        [], ['IDMonitoring'], ["RATE:DISCARD","BW:DISCARD"], -1],
-        ['noalg_idmon_L1RD0_UNPAIRED_ISO',  779, 'L1_RD0_UNPAIRED_ISO', [], ['IDMonitoring'], ["RATE:DISCARD","BW:DISCARD"], -1],
+        ['noalg_idmon_L1RD0_EMPTY',          'L1_RD0_EMPTY',        [], ['express','IDMonitoring'], ["RATE:DISCARD","BW:DISCARD"], -1],
+        ['noalg_idmon_L1RD0_FILLED',         'L1_RD0_FILLED',        [], ['IDMonitoring'], ["RATE:DISCARD","BW:DISCARD"], -1],
+        ['noalg_idmon_L1RD0_UNPAIRED_ISO',   'L1_RD0_UNPAIRED_ISO', [], ['IDMonitoring'], ["RATE:DISCARD","BW:DISCARD"], -1],
 
         #cosmicmuon streamer
-        ['noalg_cosmicmuons_L1MU4_EMPTY',  128, 'L1_MU4_EMPTY',        [], ['express','CosmicMuons'], ["RATE:Cosmic_Muon", "BW:Muon"], -1],        
-        ['noalg_cosmicmuons_L1MU11_EMPTY', 129, 'L1_MU11_EMPTY',        [], ['express','CosmicMuons'], ["RATE:Cosmic_Muon", "BW:Muon"], -1],        
+        ['noalg_cosmicmuons_L1MU4_EMPTY',   'L1_MU4_EMPTY',        [], ['express','CosmicMuons'], ["RATE:Cosmic_Muon", "BW:Muon"], -1],        
+        ['noalg_cosmicmuons_L1MU11_EMPTY',  'L1_MU11_EMPTY',        [], ['express','CosmicMuons'], ["RATE:Cosmic_Muon", "BW:Muon"], -1],        
 
         ]
 
     TriggerFlags.MonitorSlice.signatures =  [
         ##CSC only monitoring chain
-        ['cscmon_L1MU10',  6425, 'L1_MU10',     [], ['CSC'], ["RATE:Monitoring", "BW:Detector"], -1],
-        ['cscmon_L1EM3',   6426, 'L1_EM3',     [], ['CSC'], ["RATE:Monitoring", "BW:Detector"], -1],
-        ['cscmon_L1J10',   6427, 'L1_J10',     [], ['CSC'], ["RATE:Monitoring", "BW:Detector"], -1],
+        ['cscmon_L1MU10',   'L1_MU10',     [], ['CSC'], ["RATE:Monitoring", "BW:Detector"], -1],
+        ['cscmon_L1EM3',    'L1_EM3',     [], ['CSC'], ["RATE:Monitoring", "BW:Detector"], -1],
+        ['cscmon_L1J10',    'L1_J10',     [], ['CSC'], ["RATE:Monitoring", "BW:Detector"], -1],
 
         # # enhancedbias
-        ['timeburner', 6010, '', [], ['DISCARD'], ["RATE:DISCARD","BW:DISCARD"], -1],
-        ['robrequest', 6011, '', [], ['DISCARD'], ["RATE:DISCARD","BW:DISCARD"], -1],
-        ['robrequest_L1RD0_EMPTY', 6012, 'L1_RD0_EMPTY', [], ['DISCARD'], ["RATE:DISCARD","BW:DISCARD"], -1],   
+        ['timeburner',  '', [], ['DISCARD'], ["RATE:DISCARD","BW:DISCARD"], -1],
+        ['robrequest',  '', [], ['DISCARD'], ["RATE:DISCARD","BW:DISCARD"], -1],
+        ['robrequest_L1RD0_EMPTY', 'L1_RD0_EMPTY', [], ['DISCARD'], ["RATE:DISCARD","BW:DISCARD"], -1],   
 
-        ['costmonitor', 6013, '', [], ['CostMonitoring'], ['Supporting','Calibration','BW:Other'],1],
+        ['costmonitor',  '', [], ['CostMonitoring'], ['Supporting','Calibration','BW:Other'],1],
 
-        #['idmon_trkFS_L14J15', 5514, 'L1_4J15', [], ['Main'], ['RATE:InDetTracking', 'BW:Detector'], -1],
+        #['idmon_trkFS_L14J15', 'L1_4J15', [], ['Main'], ['RATE:InDetTracking', 'BW:Detector'], -1],
         ]
     #TriggerFlags.GenericSlice.signatures =  []
 
     TriggerFlags.BeamspotSlice.signatures =  [
-        ##['beamspot_vtx_trkFS_L2StarB',        7000, 'L1_4J15', [], ['beamspot'], ["BW:Detector"], -1],
-        ##['beamspot_vtx_activeTE_L2StarB_peb', 7001, 'L1_4J15', [], ['beamspot'], ["BW:Detector"], -1],
-        ##['beamspot_vtx_allTE_L2StarB_peb',    7002, 'L1_4J15', [], ['beamspot'], ["BW:Detector"], -1],
+        ##['beamspot_vtx_trkFS_L2StarB',         'L1_4J15', [], ['beamspot'], ["BW:Detector"], -1],
+        ##['beamspot_vtx_activeTE_L2StarB_peb',  'L1_4J15', [], ['beamspot'], ["BW:Detector"], -1],
+        ##['beamspot_vtx_allTE_L2StarB_peb',     'L1_4J15', [], ['beamspot'], ["BW:Detector"], -1],
         ]
     
     TriggerFlags.EnhancedBiasSlice.signatures = [
-        #['eb_physics_L1RD1_FILLED',             7002, 'L1_RD1_FILLED',         [], ['EnhancedBias'], ["Supporting", "Calibration", "BW:Detector"], -1],
-        ['eb_low_L1RD0_FILLED',                   7010, 'L1_RD0_FILLED',         [], ['EnhancedBias'], ["Supporting", "Calibration", "BW:Detector"], -1],
-        ['eb_high_L1RD0_FILLED',              7014, 'L1_RD0_FILLED',         [], ['EnhancedBias'], ["Supporting", "Calibration", "BW:Detector"], -1],
-        ['eb_empty_L1RD0_EMPTY',              7011, 'L1_RD0_EMPTY',         [], ['EnhancedBias'], ["Supporting", "Calibration", "BW:Detector"], -1],
-        ['eb_firstempty_L1RD0_FIRSTEMPTY',    7012, 'L1_RD0_FIRSTEMPTY',         [], ['EnhancedBias'], ["Supporting", "Calibration", "BW:Detector"], -1],
-        ['eb_unpairediso_L1RD0_UNPAIRED_ISO', 7013, 'L1_RD0_UNPAIRED_ISO',         [], ['EnhancedBias'], ["Supporting", "Calibration", "BW:Detector"], -1],
+        #['eb_physics_L1RD1_FILLED',            'L1_RD1_FILLED',         [], ['EnhancedBias'], ["Supporting", "Calibration", "BW:Detector"], -1],
+        ['eb_low_L1RD0_FILLED',                  'L1_RD0_FILLED',         [], ['EnhancedBias'], ["Supporting", "Calibration", "BW:Detector"], -1],
+        ['eb_high_L1RD0_FILLED',               'L1_RD0_FILLED',         [], ['EnhancedBias'], ["Supporting", "Calibration", "BW:Detector"], -1],
+        ['eb_empty_L1RD0_EMPTY',               'L1_RD0_EMPTY',         [], ['EnhancedBias'], ["Supporting", "Calibration", "BW:Detector"], -1],
+        ['eb_firstempty_L1RD0_FIRSTEMPTY',     'L1_RD0_FIRSTEMPTY',         [], ['EnhancedBias'], ["Supporting", "Calibration", "BW:Detector"], -1],
+        ['eb_unpairediso_L1RD0_UNPAIRED_ISO',  'L1_RD0_UNPAIRED_ISO',         [], ['EnhancedBias'], ["Supporting", "Calibration", "BW:Detector"], -1],
         
         ]
     
@@ -346,5 +346,4 @@ class Prescales:
         }
 
 
-#StreamConfig = {}
 
diff --git a/Trigger/TriggerCommon/TriggerMenu/python/menu/Lumi.py b/Trigger/TriggerCommon/TriggerMenu/python/menu/Lumi.py
index 9923c53909d..a6307fdf024 100755
--- a/Trigger/TriggerCommon/TriggerMenu/python/menu/Lumi.py
+++ b/Trigger/TriggerCommon/TriggerMenu/python/menu/Lumi.py
@@ -1,8 +1,6 @@
 # Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
 
 from TriggerJobOpts.TriggerFlags  import TriggerFlags
-from TriggerMenu.menu.Lvl1        import Lvl1, L1Prescales_lumi_1E31, L1Prescales_lumi_1E32
-from TriggerMenu.menu.Lvl1Flags   import Lvl1Flags
 from TriggerMenu.menu.MenuUtil    import *
 import re
 
@@ -177,7 +175,6 @@ def applyPrescales(triggerPythonConfig, HLTPrescales):
     hlt_sigs = allSignatures()
 ##     print 'N hlt prescales: ', len(HLTPrescales)
 ##     print 'N hlt prescales: ', len(L1Prescales)
-    #applyLVL1Prescale(triggerPythonConfig, L1Prescales)
     
     if TriggerFlags.doHLT():
         applyHLTPrescale(triggerPythonConfig, HLTPrescales)
diff --git a/Trigger/TriggerCommon/TriggerMenu/python/menu/Lvl1.py b/Trigger/TriggerCommon/TriggerMenu/python/menu/Lvl1.py
deleted file mode 100755
index 494b555eee5..00000000000
--- a/Trigger/TriggerCommon/TriggerMenu/python/menu/Lvl1.py
+++ /dev/null
@@ -1,4854 +0,0 @@
-#!/usr/bin/env python
-
-# Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
-from TriggerMenu.menu.TriggerPythonConfig import *
-from TriggerMenu.menu.LVL1Config import *
-from AthenaCommon.Logging import logging
-from TriggerJobOpts.TriggerFlags import TriggerFlags
-import re
-
-log = logging.getLogger('TriggerMenu.Lvl1.py')
-
-#
-# Physics bit has to be global variable - used by multiple functions
-#
-TT_phys    = 1 << 7
-        
-class Lvl1:
-    def __init__(self):
-        """Constructor"""
-        pass
-    
-    #----------------------------------------------------------------------
-    # LVL1- thresholds and items
-    #----------------------------------------------------------------------
-    def registerItems(tm):
-        """Register LVL1 thresholds for further use"""
-
-        # Trigger type logic - should also matche StreamingDef.py definitions
-        TT_rand    = 1 << 0
-        TT_bptx    = 1 << 1
-        TT_calo    = 1 << 2        
-        TT_tgc     = 1 << 3
-        TT_rpcin   = 1 << 4
-        TT_minb    = 1 << 5
-        TT_rpcout  = 1 << 6
-        #TT_phys    = 1 << 7 - set as global variable above
-        
-        TT_caloem = 0 # trigger type to stream separately 
-        TT_zerobs = 0 # trigger type for zero bias triggers
-        
- 
-        TT_rpcin  = TT_tgc
-        TT_caloem = 0
-        TT_zerobs = 1 << 1
-        TT_bptx   = 0
-
-
-        # Calibration requests
-        #  From David B - for calibration events TriggerType
-        #  will be reset by CTP - values below are placeholders
-        TT_calreq0 = 0x30
-        TT_calreq1 = 0x32
-        TT_calreq2 = 0x34
-        
-        
-        # MUON
-        thr_mu0  = tm.registerLvl1Threshold(name='MU0', type='MUON', mapping=0,)\
-                   .addMuonThresholdValue(4, -49, 49, 0, 64)
-        thr_mu4  = tm.registerLvl1Threshold(name='MU4', type='MUON', mapping=0,)\
-                   .addMuonThresholdValue(4, -49, 49, 0, 64)
-        thr_mu6  = tm.registerLvl1Threshold(name='MU6', type='MUON', mapping=1)\
-                   .addMuonThresholdValue(6, -49, 49, 0, 64)
-        thr_mu10 = tm.registerLvl1Threshold(name='MU10', type='MUON', mapping=2)\
-                   .addMuonThresholdValue(10, -49, 49, 0, 64)
-        thr_mu11 = tm.registerLvl1Threshold(name='MU11', type='MUON', mapping=3)\
-                   .addMuonThresholdValue(11, -49, 49, 0, 64)
-        thr_mu15 = tm.registerLvl1Threshold(name='MU15', type='MUON', mapping=4)\
-                   .addMuonThresholdValue(15, -49, 49, 0, 64)
-        thr_mu20 = tm.registerLvl1Threshold(name='MU20', type='MUON', mapping=5)\
-                   .addMuonThresholdValue(20, -49, 49, 0, 64)
-        thr_mu40 = tm.registerLvl1Threshold(name='MU40', type='MUON', mapping=5)\
-                   .addMuonThresholdValue(40, -49, 49, 0, 64)
-
-
-        # - Assume a negative thresholdval would switch off
-        #   Needs to be agreed upon with RPC and TGC group (20/08/2008)
-        # - Eta region for the RPC and TGC (in units of 0.1 in eta)
-        #    - RPC (barrel) : -10<=eta<=10  (-1.0<eta<1.0)
-        #    - TGC (endcap) : 11<=|eta|<=49 (1.0<|eta|<4.9)
-        # - ThresholdValue with higher priority overwrites the thresholdvalue
-        #   in that region.
-        thr_mu0_tgc_halo = tm.registerLvl1Threshold(name='MU0_TGC_HALO', type='MUON', mapping=4)\
-                           .addMuonThresholdValue(0, -49, 49, 0, 64, priority=1)\
-                           .addMuonThresholdValue(-1, -10, 10, 0, 64, priority=5)
-        thr_mu0_low_rpc  = tm.registerLvl1Threshold(name='MU0_LOW_RPC',type='MUON', mapping=1)\
-                           .addMuonThresholdValue(-1, -49, 49, 0, 64, priority=1)\
-                           .addMuonThresholdValue(0, -10, 10, 0, 64, priority=5)
-        thr_mu6_rpc      = tm.registerLvl1Threshold(name='MU6_RPC', type='MUON',mapping=2)\
-                           .addMuonThresholdValue(-1, -49, 49, 0, 64, priority=1)\
-                           .addMuonThresholdValue(6, -10, 10, 0, 64, priority=5)
-        thr_mu0_tgc      = tm.registerLvl1Threshold(name='MU0_TGC', type='MUON',mapping=3)\
-                           .addMuonThresholdValue(0, -49, 49, 0, 64, priority=1)\
-                           .addMuonThresholdValue(-1, -10, 10, 0, 64, priority=5)
-        thr_mu6_tgc      = tm.registerLvl1Threshold(name='MU6_TGC', type='MUON',mapping=4)\
-                           .addMuonThresholdValue(6, -49, 49, 0, 64, priority=1)\
-                           .addMuonThresholdValue(-1, -10, 10, 0, 64, priority=5)
-        thr_mu0_high_rpc = tm.registerLvl1Threshold(name='MU0_HIGH_RPC',type='MUON', mapping=3)\
-                           .addMuonThresholdValue(-1, -49, 49, 0, 64, priority=1)\
-                           .addMuonThresholdValue(0, -10, 10, 0, 64, priority=5)
-        thr_mu0_comm = tm.registerLvl1Threshold(name='MU0_COMM',type='MUON', mapping=3)\
-                       .addMuonThresholdValue(-1, -49, 49, 0, 64, priority=1)\
-                       .addMuonThresholdValue(0, -10, 10, 0, 64, priority=5)
-
-        # EM
-        thr_em2   = tm.registerLvl1Threshold(name='EM2', type='EM', mapping=0)\
-                    .addEMThresholdValue(2, -49, 49, 0, 64, IsolationOff, IsolationOff, IsolationOff)        
-        thr_em3   = tm.registerLvl1Threshold(name='EM3', type='EM', mapping=1)\
-                    .addEMThresholdValue(3, -49, 49, 0, 64, IsolationOff, IsolationOff, IsolationOff)
-        thr_em4   = tm.registerLvl1Threshold(name='EM4', type='EM', mapping=2)\
-                    .addEMThresholdValue(4, -49, 49, 0, 64, IsolationOff, IsolationOff, IsolationOff)
-        thr_em6   = tm.registerLvl1Threshold(name='EM6', type='EM', mapping=2)\
-                    .addEMThresholdValue(6, -49, 49, 0, 64, IsolationOff, IsolationOff, IsolationOff)
-        thr_em7   = tm.registerLvl1Threshold(name='EM7', type='EM', mapping=2)\
-                    .addEMThresholdValue(7, -49, 49, 0, 64, IsolationOff, IsolationOff, IsolationOff)
-        thr_em8   = tm.registerLvl1Threshold(name='EM8', type='EM', mapping=2)\
-                    .addEMThresholdValue(8, -49, 49, 0, 64, IsolationOff, IsolationOff, IsolationOff)
-        thr_em10  = tm.registerLvl1Threshold(name='EM10', type='EM', mapping=3)\
-                    .addEMThresholdValue(10, -49, 49, 0, 64, IsolationOff, IsolationOff, IsolationOff)
-        thr_em10v  = tm.registerLvl1Threshold(name='EM10V', type='EM', mapping=3)\
-                    .addEMThresholdValue(10, -49, 49, 0, 64, IsolationOff, IsolationOff, IsolationOff, priority=1)\
-                    .addEMThresholdValue(11, -8, 8, 0, 64, IsolationOff, IsolationOff, IsolationOff, priority=2)\
-                    .addEMThresholdValue(11, 20, 24, 0, 64, IsolationOff, IsolationOff, IsolationOff, priority=2)\
-                    .addEMThresholdValue(11, -24, -20, 0, 64, IsolationOff, IsolationOff, IsolationOff, priority=2)
-        thr_em10h=  tm.registerLvl1Threshold(name='EM10H', type='EM', mapping=3)\
-                    .addEMThresholdValue(10, -49, 49, 0, 64, IsolationOff, IsolationOff, 1)
-        thr_em11h=  tm.registerLvl1Threshold(name='EM11H', type='EM', mapping=3)\
-                   .addEMThresholdValue(11, -49, 49, 0, 64, IsolationOff, IsolationOff, 1)
-        thr_em10vh= tm.registerLvl1Threshold(name='EM10VH', type='EM', mapping=3)\
-                    .addEMThresholdValue(11, -49, 49, 0, 64, IsolationOff, IsolationOff, 1, priority=1)\
-                    .addEMThresholdValue(10, -20, -8, 0, 64, IsolationOff, IsolationOff, 1, priority=2)\
-                    .addEMThresholdValue(10, 8, 20, 0, 64, IsolationOff, IsolationOff, 1, priority=2)
-        thr_em12  = tm.registerLvl1Threshold(name='EM12', type='EM', mapping=3)\
-                    .addEMThresholdValue(12, -49, 49, 0, 64, IsolationOff, IsolationOff, IsolationOff)
-        thr_em13  = tm.registerLvl1Threshold(name='EM13', type='EM', mapping=4)\
-                    .addEMThresholdValue(13, -49, 49, 0, 64, IsolationOff, IsolationOff, IsolationOff)
-        thr_em13i = tm.registerLvl1Threshold(name='EM13I', type='EM', mapping=5)\
-                    .addEMThresholdValue(13, -49, 49, 0, 64, 4, 3, 2)
-        thr_em15h = tm.registerLvl1Threshold(name='EM15H', type='EM', mapping=4)\
-                    .addEMThresholdValue(15, -49, 49, 0, 64, IsolationOff, IsolationOff, 1)
-        thr_em14vh= tm.registerLvl1Threshold(name='EM14VH', type='EM', mapping=5)\
-                   .addEMThresholdValue(15, -49, 49, 0, 64, IsolationOff, IsolationOff, 1, priority=1)\
-                   .addEMThresholdValue(14, -20, -8, 0, 64, IsolationOff, IsolationOff, 1, priority=2)\
-                   .addEMThresholdValue(14, 8, 20, 0, 64, IsolationOff, IsolationOff, 1, priority=2)
-        thr_em16 = tm.registerLvl1Threshold(name='EM16', type='EM', mapping=4)\
-                   .addEMThresholdValue(16, -49, 49, 0, 64, IsolationOff, IsolationOff, IsolationOff)
-        thr_em16h = tm.registerLvl1Threshold(name='EM16H', type='EM', mapping=4)\
-                    .addEMThresholdValue(16, -49, 49, 0, 64, IsolationOff, IsolationOff, 1)
-        thr_em16vh= tm.registerLvl1Threshold(name='EM16VH', type='EM', mapping=5)\
-                    .addEMThresholdValue(18, -49, 49, 0, 64, IsolationOff, IsolationOff, 1, priority=1)\
-                    .addEMThresholdValue(17, -12, -8, 0, 64, IsolationOff, IsolationOff, 1, priority=2)\
-                    .addEMThresholdValue(17, 8, 12, 0, 64, IsolationOff, IsolationOff, 1, priority=2)\
-                    .addEMThresholdValue(16, -16, -12, 0, 64, IsolationOff, IsolationOff, 1, priority=2)\
-                    .addEMThresholdValue(16, 12, 16, 0, 64, IsolationOff, IsolationOff, 1, priority=2)\
-                    .addEMThresholdValue(17, -20, -16, 0, 64, IsolationOff, IsolationOff, 1, priority=2)\
-                    .addEMThresholdValue(17, 16, 20, 0, 64, IsolationOff, IsolationOff, 1, priority=2)
-        thr_em16v= tm.registerLvl1Threshold(name='EM16V', type='EM', mapping=5)\
-                    .addEMThresholdValue(18, -49, 49, 0, 64, IsolationOff, IsolationOff, IsolationOff, priority=1)\
-                    .addEMThresholdValue(17, -12, -8, 0, 64, IsolationOff, IsolationOff, IsolationOff, priority=2)\
-                    .addEMThresholdValue(17, 8, 12, 0, 64, IsolationOff, IsolationOff, IsolationOff, priority=2)\
-                    .addEMThresholdValue(16, -16, -12, 0, 64, IsolationOff, IsolationOff, IsolationOff, priority=2)\
-                    .addEMThresholdValue(16, 12, 16, 0, 64, IsolationOff, IsolationOff, IsolationOff, priority=2)\
-                    .addEMThresholdValue(17, -20, -16, 0, 64, IsolationOff, IsolationOff, IsolationOff, priority=2)\
-                    .addEMThresholdValue(17, 16, 20, 0, 64, IsolationOff, IsolationOff, IsolationOff, priority=2)
-        thr_em18  = tm.registerLvl1Threshold(name='EM18', type='EM', mapping=6)\
-                    .addEMThresholdValue(18, -49, 49, 0, 64, IsolationOff, IsolationOff, IsolationOff)
-        thr_em18h = tm.registerLvl1Threshold(name='EM18H', type='EM', mapping=6)\
-                    .addEMThresholdValue(18, -49, 49, 0, 64, IsolationOff, IsolationOff, 1)
-        thr_em18i = tm.registerLvl1Threshold(name='EM18I', type='EM', mapping=7)\
-                    .addEMThresholdValue(18, -49, 49, 0, 64, 4, 3, 2)
-        thr_em18vh= tm.registerLvl1Threshold(name='EM18VH', type='EM', mapping=6)\
-                    .addEMThresholdValue(20, -49, 49, 0, 64, IsolationOff, IsolationOff, 1, priority=1)\
-                    .addEMThresholdValue(19, -12, -8, 0, 64, IsolationOff, IsolationOff, 1, priority=2)\
-                    .addEMThresholdValue(19, 8, 12, 0, 64, IsolationOff, IsolationOff, 1, priority=2)\
-                    .addEMThresholdValue(18, -16, -12, 0, 64, IsolationOff, IsolationOff, 1, priority=2)\
-                    .addEMThresholdValue(18, 12, 16, 0, 64, IsolationOff, IsolationOff, 1, priority=2)\
-                    .addEMThresholdValue(19, -20, -16, 0, 64, IsolationOff, IsolationOff, 1, priority=2)\
-                    .addEMThresholdValue(19, 16, 20, 0, 64, IsolationOff, IsolationOff, 1, priority=2)
-        thr_em20h = tm.registerLvl1Threshold(name='EM20H', type='EM', mapping=4)\
-                    .addEMThresholdValue(20, -49, 49, 0, 64, IsolationOff, IsolationOff, 1)
-        thr_em23i = tm.registerLvl1Threshold(name='EM23I', type='EM', mapping=8)\
-                    .addEMThresholdValue(23, -49, 49, 0, 64, 4, 3, 2)
-        thr_em23 = tm.registerLvl1Threshold(name='EM23', type='EM', mapping=8)\
-                    .addEMThresholdValue(23, -49, 49, 0, 64, IsolationOff, IsolationOff, IsolationOff)
-        thr_em30 = tm.registerLvl1Threshold(name='EM30', type='EM', mapping=8)\
-                    .addEMThresholdValue(30, -49, 49, 0, 64, IsolationOff, IsolationOff, IsolationOff)
-        thr_em31 = tm.registerLvl1Threshold(name='EM31', type='EM', mapping=8)\
-                   .addEMThresholdValue(31, -49, 49, 0, 64, IsolationOff, IsolationOff, IsolationOff)
-        thr_em35 = tm.registerLvl1Threshold(name='EM35', type='EM', mapping=8)\
-                    .addEMThresholdValue(35, -49, 49, 0, 64, IsolationOff, IsolationOff, IsolationOff)
-        thr_em100  = tm.registerLvl1Threshold(name='EM100', type='EM', mapping=9)\
-                     .addEMThresholdValue(100, -49, 49, 0, 64, IsolationOff, IsolationOff, IsolationOff)
-        thr_em7i   = tm.registerLvl1Threshold(name='EM7I', type='EM', mapping=7)\
-                    .addEMThresholdValue(7, -49, 49, 0, 64, 4, 3, 2)
-        thr_em50  = tm.registerLvl1Threshold(name='EM50', type='EM', mapping=11)\
-                    .addEMThresholdValue(50, -49, 49, 0, 64, IsolationOff, IsolationOff, IsolationOff)
-        
-        # EM
-        # - Add/remap new L1 thresholds:
-        #   EM7->EM5 EM13->EM10 EM13I->EM10I EM18->EM14 EM18I->EM14I EM23I->EM19I EM100->EM85
-        # - For these new thresholds use the same mapping as threshold being replaced
-        #   with exception of EM10 which already exists - it keeps the same mapping=3
-        #
-        thr_em5   = tm.registerLvl1Threshold(name='EM5', type='EM', mapping=3)\
-                    .addEMThresholdValue(5, -49, 49, 0, 64, IsolationOff, IsolationOff, IsolationOff)
-        thr_em5i   = tm.registerLvl1Threshold(name='EM5I', type='EM', mapping=4)\
-                    .addEMThresholdValue(5, -49, 49, 0, 64, 4, 3, 2)        
-        thr_em10i = tm.registerLvl1Threshold(name='EM10I', type='EM', mapping=5)\
-                    .addEMThresholdValue(10, -49, 49, 0, 64, 4, 3, 2)
-        thr_em14  = tm.registerLvl1Threshold(name='EM14', type='EM', mapping=6)\
-                    .addEMThresholdValue(14, -49, 49, 0, 64, IsolationOff, IsolationOff, IsolationOff)
-        thr_em14i = tm.registerLvl1Threshold(name='EM14I', type='EM', mapping=7)\
-                    .addEMThresholdValue(14, -49, 49, 0, 64, 4, 3, 2)
-        thr_em19i = tm.registerLvl1Threshold(name='EM19I', type='EM', mapping=8)\
-                    .addEMThresholdValue(19, -49, 49, 0, 64, 4, 3, 2)
-        thr_em85  = tm.registerLvl1Threshold(name='EM85', type='EM', mapping=7)\
-                    .addEMThresholdValue(85, -49, 49, 0, 64, IsolationOff, IsolationOff, IsolationOff)
-        
-        # TAU
-        thr_tau3   = tm.registerLvl1Threshold('HA3', 'TAU', mapping=0)\
-                     .addTauThresholdValue(3, -49, 49, 0, 64, IsolationOff, IsolationOff, IsolationOff)
-        thr_tau5   = tm.registerLvl1Threshold('HA5', 'TAU', mapping=0)\
-                     .addTauThresholdValue(5, -49, 49, 0, 64, IsolationOff, IsolationOff, IsolationOff)
-        thr_tau6   = tm.registerLvl1Threshold('HA6', 'TAU', mapping=1)\
-                     .addTauThresholdValue(6, -49, 49, 0, 64, IsolationOff, IsolationOff, IsolationOff)
-        thr_tau9  = tm.registerLvl1Threshold('HA9', 'TAU', mapping=2)\
-                    .addTauThresholdValue(9, -49, 49, 0, 64, IsolationOff, IsolationOff, IsolationOff)
-        thr_tau9i  = tm.registerLvl1Threshold('HA9I', 'TAU', mapping=3)\
-                     .addTauThresholdValue(9, -49, 49, 0, 64, 6, IsolationOff, IsolationOff)        
-        #        thr_tau11i = tm.registerLvl1Threshold('HA11I', 'TAU', mapping=4)\
-        #                     .addTauThresholdValue(11, -49, 49, 0, 64, 6, IsolationOff, IsolationOff)
-
-        thr_tau15   = tm.registerLvl1Threshold('HA15', 'TAU', mapping=3)\
-                      .addTauThresholdValue(15, -49, 49, 0, 64, IsolationOff, IsolationOff, IsolationOff)
-        thr_tau15i = tm.registerLvl1Threshold('HA15I', 'TAU', mapping=5)\
-                     .addTauThresholdValue(15, -49, 49, 0, 64, 4, IsolationOff, IsolationOff)
-        thr_tau16 = tm.registerLvl1Threshold('HA16', 'TAU', mapping=4)\
-                    .addTauThresholdValue(16, -49, 49, 0, 64, IsolationOff, IsolationOff, IsolationOff)
-        thr_tau16i = tm.registerLvl1Threshold('HA16I', 'TAU', mapping=5)\
-                     .addTauThresholdValue(16, -49, 49, 0, 64, 6, IsolationOff, IsolationOff)
-        thr_tau25  = tm.registerLvl1Threshold('HA25', 'TAU', mapping=6)\
-                     .addTauThresholdValue(25, -49, 49, 0, 64, IsolationOff, IsolationOff, IsolationOff)
-        #        thr_tau25i = tm.registerLvl1Threshold('HA25I', 'TAU', mapping=8)\
-        #                     .addTauThresholdValue(25, -49, 49, 0, 64, 6, IsolationOff, IsolationOff)
-        thr_tau40  = tm.registerLvl1Threshold('HA40', 'TAU', mapping=7)\
-                     .addTauThresholdValue(40, -49, 49, 0, 64, IsolationOff, IsolationOff, IsolationOff)
-
-        
-        # TAU
-        # - Add/remap new L1 thresholds:
-        #   TAU5->TAU5, TAU6->TAU5, TAU9->TAU6, TAU9I->TAU6I, TAU16->TAU11, TAU16I->TAU11I, TAU25->TAU11, TAU40->TAU20
-        #   
-        thr_tau6i  = tm.registerLvl1Threshold('HA6I', 'TAU', mapping=2)\
-                     .addTauThresholdValue(6, -49, 49, 0, 64, 5, IsolationOff, IsolationOff)
-        thr_tau8 = tm.registerLvl1Threshold('HA8', 'TAU', mapping=3)\
-                    .addTauThresholdValue(8, -49, 49, 0, 64, IsolationOff, IsolationOff, IsolationOff)
-        thr_tau8v = tm.registerLvl1Threshold('HA8V', 'TAU', mapping=3)\
-                    .addTauThresholdValue(10, -49, 49, 0, 64, IsolationOff, IsolationOff, IsolationOff, priority=1)\
-                    .addTauThresholdValue(8, -16, -8, 0, 64, IsolationOff, IsolationOff, IsolationOff, priority=2)\
-                    .addTauThresholdValue(8, 8, 16, 0, 64, IsolationOff, IsolationOff, IsolationOff, priority=2)
-        thr_tau8i = tm.registerLvl1Threshold('HA8I', 'TAU', mapping=3)\
-                    .addTauThresholdValue(8, -49, 49, 0, 64, 4, IsolationOff, IsolationOff)
-        thr_tau8vi = tm.registerLvl1Threshold('HA8VI', 'TAU', mapping=3)\
-                     .addTauThresholdValue(8, -49, 49, 0, 64, 5, IsolationOff, IsolationOff, priority=1)\
-                     .addTauThresholdValue(10, -16, 16, 0, 64, 5, IsolationOff, IsolationOff, priority=2)\
-                     .addTauThresholdValue(10, 20, 25, 0, 64, 5, IsolationOff, IsolationOff, priority=2)\
-                     .addTauThresholdValue(10, -25, -20, 0, 64, 5, IsolationOff, IsolationOff, priority=2)
-        thr_tau11 = tm.registerLvl1Threshold('HA11', 'TAU', mapping=4)\
-                    .addTauThresholdValue(11, -49, 49, 0, 64, IsolationOff, IsolationOff, IsolationOff)
-        thr_tau11v = tm.registerLvl1Threshold('HA11V', 'TAU', mapping=3)\
-                     .addTauThresholdValue(11, -49, 49, 0, 64, IsolationOff, IsolationOff, IsolationOff, priority=1)\
-                     .addTauThresholdValue(13, -16, 16, 0, 64, IsolationOff, IsolationOff, IsolationOff, priority=2)\
-                     .addTauThresholdValue(13, 20, 25, 0, 64, IsolationOff, IsolationOff, IsolationOff, priority=2)\
-                     .addTauThresholdValue(13, -25, -20, 0, 64, IsolationOff, IsolationOff, IsolationOff, priority=2)
-        thr_tau11i = tm.registerLvl1Threshold('HA11I', 'TAU', mapping=5)\
-                     .addTauThresholdValue(11, -49, 49, 0, 64, 4, IsolationOff, IsolationOff)
-
-        thr_tau20  = tm.registerLvl1Threshold('HA20', 'TAU', mapping=6)\
-                     .addTauThresholdValue(20, -49, 49, 0, 64, IsolationOff, IsolationOff, IsolationOff)
-        thr_tau30  = tm.registerLvl1Threshold('HA30', 'TAU', mapping=7)\
-                     .addTauThresholdValue(30, -49, 49, 0, 64, IsolationOff, IsolationOff, IsolationOff)
-        thr_tau30i = tm.registerLvl1Threshold('HA30I', 'TAU', mapping=7)\
-                     .addTauThresholdValue(30, -49, 49, 0, 64, 4, IsolationOff, IsolationOff)
-        thr_tau50  = tm.registerLvl1Threshold('HA50', 'TAU', mapping=7)\
-                     .addTauThresholdValue(50, -49, 49, 0, 64, IsolationOff, IsolationOff, IsolationOff)
-        
-        # JET
-        thr_j5 = tm.registerLvl1Threshold('J5', 'JET', mapping=0)\
-                 .addJetThresholdValue(5, -49, 49, 0, 64, 4)
-        thr_j5_win6 = tm.registerLvl1Threshold('J5_win6', 'JET', mapping=0)\
-                 .addJetThresholdValue(5, -49, 49, 0, 64, 6)
-        thr_j5_win8 = tm.registerLvl1Threshold('J5_win8', 'JET', mapping=0)\
-                 .addJetThresholdValue(5, -49, 49, 0, 64, 8)
-        thr_j10 = tm.registerLvl1Threshold('J10', 'JET', mapping=1)\
-                  .addJetThresholdValue(10, -49, 49, 0, 64, 8)
-        thr_j10_6 = tm.registerLvl1Threshold('J10_win6', 'JET', mapping=7)\
-                    .addJetThresholdValue(10, -49, 49, 0, 64, 6)        
-        thr_j18 = tm.registerLvl1Threshold('J18', 'JET', mapping=2)\
-                  .addJetThresholdValue(18, -49, 49, 0, 64, 8)
-        thr_j20 = tm.registerLvl1Threshold('J20', 'JET', mapping=2)\
-                  .addJetThresholdValue(20, -49, 49, 0, 64, 8) # new jet threshold
-        thr_j23 = tm.registerLvl1Threshold('J23', 'JET', mapping=3)\
-                  .addJetThresholdValue(23, -49, 49, 0, 64, 8)
-        thr_j35 = tm.registerLvl1Threshold('J35', 'JET', mapping=4)\
-                  .addJetThresholdValue(35, -49, 49, 0, 64, 8)
-        thr_j40 = tm.registerLvl1Threshold('J40', 'JET', mapping=3)\
-                  .addJetThresholdValue(40, -49, 49, 0, 64, 8) # new jet threshold
-        thr_j42 = tm.registerLvl1Threshold('J42', 'JET', mapping=5)\
-                  .addJetThresholdValue(42, -49, 49, 0, 64, 8)
-        thr_j70 = tm.registerLvl1Threshold('J70', 'JET', mapping=4)\
-                  .addJetThresholdValue(70, -49, 49, 0, 64, 8)
-        thr_j100 = tm.registerLvl1Threshold('J100', 'JET', mapping=5)\
-                   .addJetThresholdValue(100, -49, 49, 0, 64, 8)
-        thr_j120 = tm.registerLvl1Threshold('J120', 'JET', mapping=7)\
-                   .addJetThresholdValue(120, -49, 49, 0, 64, 8)
-        thr_j130 = tm.registerLvl1Threshold('J130', 'JET', mapping=6)\
-                   .addJetThresholdValue(130, -49, 49, 0, 64, 8) # new jet threshold
-        thr_j150 = tm.registerLvl1Threshold('J150', 'JET', mapping=7)\
-                   .addJetThresholdValue(150, -49, 49, 0, 64, 8) # new jet threshold
-
-#### from Allan
-        thr_j15cf = tm.registerLvl1Threshold('J15CF', 'JET', mapping=7)\
-                    .addJetThresholdValue(1023, -49, 49, 0, 64, 8)\
-                    .addJetThresholdValue(15, -32, -29, 0, 64, 8, priority=1)\
-                    .addJetThresholdValue(15, 27, 32, 0, 64, 8, priority=1)
-
-
-        thr_j200 = tm.registerLvl1Threshold('J200', 'JET', mapping=7)\
-                   .addJetThresholdValue(200, -49, 49, 0, 64, 8)
-        thr_j350 = tm.registerLvl1Threshold('J350', 'JET', mapping=7)\
-                   .addJetThresholdValue(350, -49, 49, 0, 64, 8)
-        
-        # - Add/remap new L1 thresholds:
-        #   J20->J15, J40->J30, J70->J55, J100->J75, J130->J95, J150->J115
-        #   J5 and J10 stay as they are
-        #
-        thr_j15 = tm.registerLvl1Threshold('J15', 'JET', mapping=2)\
-                  .addJetThresholdValue(15, -49, 49, 0, 64, 8)
-        thr_j30 = tm.registerLvl1Threshold('J30', 'JET', mapping=3)\
-                   .addJetThresholdValue(30, -49, 49, 0, 64, 8)
-        thr_j50 = tm.registerLvl1Threshold('J50', 'JET', mapping=4)\
-                   .addJetThresholdValue(50, -49, 49, 0, 64, 8)
-        thr_j55 = tm.registerLvl1Threshold('J55', 'JET', mapping=4)\
-                   .addJetThresholdValue(55, -49, 49, 0, 64, 8)
-        thr_j75 = tm.registerLvl1Threshold('J75', 'JET', mapping=5)\
-                   .addJetThresholdValue(75, -49, 49, 0, 64, 8)
-        thr_j95 = tm.registerLvl1Threshold('J95', 'JET', mapping=6)\
-                   .addJetThresholdValue(95, -49, 49, 0, 64, 8)
-        thr_j115 = tm.registerLvl1Threshold('J115', 'JET', mapping=7)\
-                   .addJetThresholdValue(115, -49, 49, 0, 64, 8)
-        thr_j175 = tm.registerLvl1Threshold('J175', 'JET', mapping=7)\
-                   .addJetThresholdValue(175, -49, 49, 0, 64, 8)
-        thr_j250 = tm.registerLvl1Threshold('J250', 'JET', mapping=7)\
-                   .addJetThresholdValue(250, -49, 49, 0, 64, 8)
-
-
-        thr_zb_em12 = tm.registerLvl1Threshold('ZB_EM12', 'ZB', mapping=0, seed='EM12', seed_ttype = 'EM', seed_multi=1, bcdelay=3564)
-        thr_zb_em14 = tm.registerLvl1Threshold('ZB_EM14', 'ZB', mapping=0, seed='EM14', seed_ttype = 'EM', seed_multi=1, bcdelay=3564)
-
-        thr_zb_4MBTS_A = tm.registerLvl1Threshold('ZB_4MBTS_A', 'ZB', mapping=24, seed='MBTS_A', seed_ttype = 'MBTS', seed_multi=4, bcdelay=3564)
-        thr_zb_j10 = tm.registerLvl1Threshold('ZB_J10', 'ZB', mapping=0, seed='J10', seed_ttype = 'JET', seed_multi=1, bcdelay=3564)
-        thr_zb_j50 = tm.registerLvl1Threshold('ZB_J50', 'ZB', mapping=0, seed='J50', seed_ttype = 'JET', seed_multi=1, bcdelay=3564)
-        thr_zb_j75 = tm.registerLvl1Threshold('ZB_J75', 'ZB', mapping=0, seed='J75', seed_ttype = 'JET', seed_multi=1, bcdelay=3564)
-        
-        # JE
-        thr_je60   = tm.registerLvl1Threshold('JE60', 'JE', mapping=0)\
-                     .addEnergyThresholdValue(60, -49, 49, 0, 64)
-        thr_je100  = tm.registerLvl1Threshold('JE100', 'JE', mapping=1)\
-                     .addEnergyThresholdValue(100, -49, 49, 0, 64)
-        thr_je120  = tm.registerLvl1Threshold('JE120', 'JE', mapping=2)\
-                     .addEnergyThresholdValue(120, -49, 49, 0, 64)
-        thr_je140  = tm.registerLvl1Threshold('JE140', 'JE', mapping=2)\
-                     .addEnergyThresholdValue(140, -49, 49, 0, 64)
-        thr_je200  = tm.registerLvl1Threshold('JE200', 'JE', mapping=2)\
-                     .addEnergyThresholdValue(200, -49, 49, 0, 64)
-        thr_je220  = tm.registerLvl1Threshold('JE220', 'JE', mapping=3)\
-                     .addEnergyThresholdValue(220, -49, 49, 0, 64)
-        thr_je280 = tm.registerLvl1Threshold('JE280', 'JE', mapping=3)\
-                    .addEnergyThresholdValue(280, -49, 49, 0, 64)
-        thr_je300 = tm.registerLvl1Threshold('JE300', 'JE', mapping=3)\
-                    .addEnergyThresholdValue(300, -49, 49, 0, 64)
-        thr_je340 = tm.registerLvl1Threshold('JE340', 'JE', mapping=3)\
-                    .addEnergyThresholdValue(340, -49, 49, 0, 64)
-        thr_je350 = tm.registerLvl1Threshold('JE350', 'JE', mapping=3)\
-                    .addEnergyThresholdValue(350, -49, 49, 0, 64)
-        thr_je400 = tm.registerLvl1Threshold('JE400', 'JE', mapping=3)\
-                    .addEnergyThresholdValue(400, -49, 49, 0, 64)
-        thr_je500 = tm.registerLvl1Threshold('JE500', 'JE', mapping=3)\
-                    .addEnergyThresholdValue(500, -49, 49, 0, 64)
-        
-
-
-        #pPb thresholds
-        thr_jb0  = tm.registerLvl1Threshold('JB0', 'JB', mapping=0)\
-                   .addJetThresholdValue(JetOff, -49, 49, 0, 64, 8, 1)\
-                   .addJetThresholdValue(0, -49, 0, 0, 64, 8, 2)
-        thr_jb1  = tm.registerLvl1Threshold('JB1', 'JB', mapping=1)\
-                   .addJetThresholdValue(JetOff, -49, 49, 0, 64, 8, 1)\
-                   .addJetThresholdValue(1, -49, 0, 0, 64, 8, 2)
-        thr_jb2  = tm.registerLvl1Threshold('JB2', 'JB', mapping=2)\
-                   .addJetThresholdValue(JetOff, -49, 49, 0, 64, 8, 1)\
-                   .addJetThresholdValue(2, -49, 0, 0, 64, 8, 2)
-        thr_jb3  = tm.registerLvl1Threshold('JB3', 'JB', mapping=3)\
-                   .addJetThresholdValue(JetOff, -49, 49, 0, 64, 8, 1)\
-                   .addJetThresholdValue(3, -49, 0, 0, 64, 8, 2)
-                               
-        thr_jb5  = tm.registerLvl1Threshold('JB5', 'JB', mapping=0)\
-                   .addJetThresholdValue(JetOff, -49, 49, 0, 64, 8, 1)\
-                   .addJetThresholdValue(5, -49, 0, 0, 64, 8, 2)
-        thr_jb10  = tm.registerLvl1Threshold('JB10', 'JB', mapping=1)\
-                   .addJetThresholdValue(JetOff, -49, 49, 0, 64, 8, 1)\
-                   .addJetThresholdValue(10, -49, 0, 0, 64, 8, 2)
-        thr_jb15  = tm.registerLvl1Threshold('JB15', 'JB', mapping=2)\
-                   .addJetThresholdValue(JetOff, -49, 49, 0, 64, 8, 1)\
-                   .addJetThresholdValue(15, -49, 0, 0, 64, 8, 2)
-        thr_jb30  = tm.registerLvl1Threshold('JB30', 'JB', mapping=3)\
-                   .addJetThresholdValue(JetOff, -49, 49, 0, 64, 8, 1)\
-                   .addJetThresholdValue(30, -49, 0, 0, 64, 8, 2)
-        thr_jb18 = tm.registerLvl1Threshold('JB18', 'JB', mapping=0)\
-                   .addJetThresholdValue(JetOff, -49, 49, 0, 64, 8, 1)\
-                   .addJetThresholdValue(18, -49, 0, 0, 64, 8, 2)
-        thr_jb35 = tm.registerLvl1Threshold('JB35', 'JB', mapping=1)\
-                   .addJetThresholdValue(JetOff, -49, 49, 0, 64, 8, 1)\
-                   .addJetThresholdValue(35, -49, 0, 0, 64, 8, 2)
-        thr_jb50 = tm.registerLvl1Threshold('JB50', 'JB', mapping=1)\
-                   .addJetThresholdValue(JetOff, -49, 49, 0, 64, 8, 1)\
-                   .addJetThresholdValue(50, -49, 0, 0, 64, 8, 2)
-        thr_jb55 = tm.registerLvl1Threshold('JB55', 'JB', mapping=1)\
-                   .addJetThresholdValue(JetOff, -49, 49, 0, 64, 8, 1)\
-                   .addJetThresholdValue(55, -49, 0, 0, 64, 8, 2)
-        thr_jb75 = tm.registerLvl1Threshold('JB75', 'JB', mapping=1)\
-                   .addJetThresholdValue(JetOff, -49, 49, 0, 64, 8, 1)\
-                   .addJetThresholdValue(75, -49, 0, 0, 64, 8, 2)
-        thr_jb100 = tm.registerLvl1Threshold('JB100', 'JB', mapping=1)\
-                    .addJetThresholdValue(JetOff, -49, 49, 0, 64, 8, 1)\
-                    .addJetThresholdValue(100, -49, 0, 0, 64, 8, 2)
-        thr_jb95 = tm.registerLvl1Threshold('JB95', 'JB', mapping=1)\
-                   .addJetThresholdValue(JetOff, -49, 49, 0, 64, 8, 1)\
-                   .addJetThresholdValue(95, -49, 0, 0, 64, 8, 2)
-        thr_jb70 = tm.registerLvl1Threshold('JB70', 'JB', mapping=2)\
-                   .addJetThresholdValue(JetOff, -49, 49, 0, 64, 8, 1)\
-                   .addJetThresholdValue(70, -49, 0, 0, 64, 8, 2)
-        thr_jb120 = tm.registerLvl1Threshold('JB120', 'JB', mapping=3)\
-                   .addJetThresholdValue(JetOff, -49, 49, 0, 64, 8, 1)\
-                   .addJetThresholdValue(120, -49, 0, 0, 64, 8, 2)
-        thr_jb20  = tm.registerLvl1Threshold('JB20', 'JB', mapping=1)\
-                   .addJetThresholdValue(JetOff, -49, 49, 0, 64, 8, 1)\
-                   .addJetThresholdValue(20, -49, 0, 0, 64, 8, 2)
-        thr_jb40  = tm.registerLvl1Threshold('JB40', 'JB', mapping=1)\
-                   .addJetThresholdValue(JetOff, -49, 49, 0, 64, 8, 1)\
-                   .addJetThresholdValue(40, -49, 0, 0, 64, 8, 2)
-
-        #pPb thresholds
-        thr_jf0  = tm.registerLvl1Threshold('JF0', 'JF', mapping=0)\
-                   .addJetThresholdValue(JetOff, -49, 49, 0, 64, 8, 1)\
-                   .addJetThresholdValue(0, 0, 49, 0, 64, 8, 2)
-        thr_jf1  = tm.registerLvl1Threshold('JF1', 'JF', mapping=1)\
-                   .addJetThresholdValue(JetOff, -49, 49, 0, 64, 8, 1)\
-                   .addJetThresholdValue(1, 0, 49, 0, 64, 8, 2)
-        thr_jf2  = tm.registerLvl1Threshold('JF2', 'JF', mapping=2)\
-                   .addJetThresholdValue(JetOff, -49, 49, 0, 64, 8, 1)\
-                   .addJetThresholdValue(2, 0, 49, 0, 64, 8, 2)
-        thr_jf3  = tm.registerLvl1Threshold('JF3', 'JF', mapping=3)\
-                   .addJetThresholdValue(JetOff, -49, 49, 0, 64, 8, 1)\
-                   .addJetThresholdValue(3, 0, 49, 0, 64, 8, 2)
-                        
-        thr_jf5  = tm.registerLvl1Threshold('JF5', 'JF', mapping=0)\
-                   .addJetThresholdValue(JetOff, -49, 49, 0, 64, 8, 1)\
-                   .addJetThresholdValue(5, 0, 49, 0, 64, 8, 2)
-        thr_jf10  = tm.registerLvl1Threshold('JF10', 'JF', mapping=1)\
-                   .addJetThresholdValue(JetOff, -49, 49, 0, 64, 8, 1)\
-                   .addJetThresholdValue(10, 0, 49, 0, 64, 8, 2)
-        thr_jf15  = tm.registerLvl1Threshold('JF15', 'JF', mapping=2)\
-                   .addJetThresholdValue(JetOff, -49, 49, 0, 64, 8, 1)\
-                   .addJetThresholdValue(15, 0, 49, 0, 64, 8, 2)
-        thr_jf30  = tm.registerLvl1Threshold('JF30', 'JF', mapping=3)\
-                   .addJetThresholdValue(JetOff, -49, 49, 0, 64, 8, 1)\
-                   .addJetThresholdValue(30, 0, 49, 0, 64, 8, 2)
-        thr_jf18 = tm.registerLvl1Threshold('JF18', 'JF', mapping=0)\
-                   .addJetThresholdValue(JetOff, -49, 49, 0, 64, 8, 1)\
-                   .addJetThresholdValue(18, 0, 49, 0, 64, 8, 2)
-        thr_jf35 = tm.registerLvl1Threshold('JF35', 'JF', mapping=1)\
-                   .addJetThresholdValue(JetOff, -49, 49, 0, 64, 8, 1)\
-                   .addJetThresholdValue(35, 0, 49, 0, 64, 8, 2)
-        thr_jf50 = tm.registerLvl1Threshold('JF50', 'JF', mapping=2)\
-                   .addJetThresholdValue(JetOff, -49, 49, 0, 64, 8, 1)\
-                   .addJetThresholdValue(50, 0, 49, 0, 64, 8, 2)
-        thr_jf55 = tm.registerLvl1Threshold('JF55', 'JF', mapping=2)\
-                   .addJetThresholdValue(JetOff, -49, 49, 0, 64, 8, 1)\
-                   .addJetThresholdValue(55, 0, 49, 0, 64, 8, 2)
-        thr_jf75 = tm.registerLvl1Threshold('JF75', 'JF', mapping=3)\
-                   .addJetThresholdValue(JetOff, -49, 49, 0, 64, 8, 1)\
-                   .addJetThresholdValue(75, 0, 49, 0, 64, 8, 2)        
-        thr_jf95 = tm.registerLvl1Threshold('JF95', 'JF', mapping=3)\
-                   .addJetThresholdValue(JetOff, -49, 49, 0, 64, 8, 1)\
-                   .addJetThresholdValue(95, 0, 49, 0, 64, 8, 2)        
-        thr_jf100 = tm.registerLvl1Threshold('JF100', 'JF', mapping=3)\
-                    .addJetThresholdValue(JetOff, -49, 49, 0, 64, 8, 1)\
-                    .addJetThresholdValue(100, 0, 49, 0, 64, 8, 2)
-        
-        thr_jf70 = tm.registerLvl1Threshold('JF70', 'JF', mapping=2)\
-                   .addJetThresholdValue(JetOff, -49, 49, 0, 64, 8, 1)\
-                   .addJetThresholdValue(70, 0, 49, 0, 64, 8, 2)
-        thr_jf120 = tm.registerLvl1Threshold('JF120', 'JF', mapping=3)\
-                   .addJetThresholdValue(JetOff, -49, 49, 0, 64, 8, 1)\
-                   .addJetThresholdValue(120, 0, 49, 0, 64, 8, 2)        
-        thr_jf20  = tm.registerLvl1Threshold('JF20', 'JF', mapping=1)\
-                   .addJetThresholdValue(JetOff, -49, 49, 0, 64, 8, 1)\
-                   .addJetThresholdValue(20, 0, 49, 0, 64, 8, 2)
-        thr_jf40  = tm.registerLvl1Threshold('JF40', 'JF', mapping=1)\
-                   .addJetThresholdValue(JetOff, -49, 49, 0, 64, 8, 1)\
-                   .addJetThresholdValue(40, 0, 49, 0, 64, 8, 2)
-
-        # TE, XE
-        #pPb thresholds
-        thr_te0  = tm.registerLvl1Threshold('TE0', 'TE', mapping=0)\
-                   .addEnergyThresholdValue(0, -49, 49, 0, 64)        
-        thr_te1  = tm.registerLvl1Threshold('TE1', 'TE', mapping=0)\
-                   .addEnergyThresholdValue(1, -49, 49, 0, 64)
-        thr_te2  = tm.registerLvl1Threshold('TE2', 'TE', mapping=0)\
-                   .addEnergyThresholdValue(2, -49, 49, 0, 64)
-        thr_te3  = tm.registerLvl1Threshold('TE3', 'TE', mapping=0)\
-                   .addEnergyThresholdValue(3, -49, 49, 0, 64)
-        thr_te4  = tm.registerLvl1Threshold('TE4', 'TE', mapping=0)\
-                   .addEnergyThresholdValue(4, -49, 49, 0, 64)
-        thr_te5  = tm.registerLvl1Threshold('TE5', 'TE', mapping=0)\
-                   .addEnergyThresholdValue(5, -49, 49, 0, 64)
-        thr_te10  = tm.registerLvl1Threshold('TE10', 'TE', mapping=0)\
-                    .addEnergyThresholdValue(10, -49, 49, 0, 64)
-        thr_te20  = tm.registerLvl1Threshold('TE20', 'TE', mapping=0)\
-                    .addEnergyThresholdValue(20, -49, 49, 0, 64)
-        thr_te35  = tm.registerLvl1Threshold('TE35', 'TE', mapping=0)\
-                    .addEnergyThresholdValue(35, -49, 49, 0, 64)        
-        thr_te30  = tm.registerLvl1Threshold('TE30', 'TE', mapping=0)\
-                    .addEnergyThresholdValue(30, -49, 49, 0, 64)
-        thr_te40  = tm.registerLvl1Threshold('TE40', 'TE', mapping=0)\
-                    .addEnergyThresholdValue(40, -49, 49, 0, 64)
-        thr_te50  = tm.registerLvl1Threshold('TE50', 'TE', mapping=0)\
-                    .addEnergyThresholdValue(50, -49, 49, 0, 64)        
-        thr_te65  = tm.registerLvl1Threshold('TE65', 'TE', mapping=0)\
-                    .addEnergyThresholdValue(65, -49, 49, 0, 64)        
-        thr_te90  = tm.registerLvl1Threshold('TE90', 'TE', mapping=0)\
-                    .addEnergyThresholdValue(90, -49, 49, 0, 64)
-        thr_te100 = tm.registerLvl1Threshold('TE100', 'TE', mapping=0)\
-                    .addEnergyThresholdValue(100, -49, 49, 0, 64)
-        thr_te115 = tm.registerLvl1Threshold('TE115', 'TE', mapping=0)\
-                    .addEnergyThresholdValue(115, -49, 49, 0, 64)
-        thr_te150 = tm.registerLvl1Threshold('TE150', 'TE', mapping=0)\
-                    .addEnergyThresholdValue(150, -49, 49, 0, 64)
-        thr_te180 = tm.registerLvl1Threshold('TE180', 'TE', mapping=0)\
-                    .addEnergyThresholdValue(180, -49, 49, 0, 64)        
-        thr_te240 = tm.registerLvl1Threshold('TE240', 'TE', mapping=1)\
-                    .addEnergyThresholdValue(240, -49, 49, 0, 64)
-        thr_te250 = tm.registerLvl1Threshold('TE250', 'TE', mapping=1)\
-                    .addEnergyThresholdValue(250, -49, 49, 0, 64)
-        thr_te300 = tm.registerLvl1Threshold('TE300', 'TE', mapping=2)\
-                    .addEnergyThresholdValue(300, -49, 49, 0, 64)
-        thr_te360 = tm.registerLvl1Threshold('TE360', 'TE', mapping=2)\
-                    .addEnergyThresholdValue(360, -49, 49, 0, 64)
-        thr_te400 = tm.registerLvl1Threshold('TE400', 'TE', mapping=2)\
-                    .addEnergyThresholdValue(400, -49, 49, 0, 64)
-        thr_te550 = tm.registerLvl1Threshold('TE550', 'TE', mapping=2)\
-                    .addEnergyThresholdValue(550, -49, 49, 0, 64)
-        thr_te650 = tm.registerLvl1Threshold('TE650', 'TE', mapping=3)\
-                    .addEnergyThresholdValue(650, -49, 49, 0, 64)
-        thr_te480 = tm.registerLvl1Threshold('TE480', 'TE', mapping=3)\
-                    .addEnergyThresholdValue(480, -49, 49, 0, 64)
-        thr_te530 = tm.registerLvl1Threshold('TE530', 'TE', mapping=3)\
-                    .addEnergyThresholdValue(530, -49, 49, 0, 64)
-        thr_te750 = tm.registerLvl1Threshold('TE750', 'TE', mapping=3)\
-                    .addEnergyThresholdValue(750, -49, 49, 0, 64)
-        thr_te900 = tm.registerLvl1Threshold('TE900', 'TE', mapping=3)\
-                    .addEnergyThresholdValue(900, -49, 49, 0, 64)
-        thr_te1000 = tm.registerLvl1Threshold('TE1000', 'TE', mapping=3)\
-                    .addEnergyThresholdValue(1000, -49, 49, 0, 64)
-        thr_te1200 = tm.registerLvl1Threshold('TE1200', 'TE', mapping=3)\
-                     .addEnergyThresholdValue(1200, -49, 49, 0, 64)
-        thr_te1400 = tm.registerLvl1Threshold('TE1400', 'TE', mapping=3)\
-                     .addEnergyThresholdValue(1400, -49, 49, 0, 64)
-
-        # Other set of TE thresholds for L=10^32 and 10^33
-        thr_te500 = tm.registerLvl1Threshold('TE500', 'TE', mapping=-1)\
-                    .addEnergyThresholdValue(500, -49, 49, 0, 64)
-        thr_te600 = tm.registerLvl1Threshold('TE600', 'TE', mapping=-1)\
-                    .addEnergyThresholdValue(600, -49, 49, 0, 64)
-        thr_te700 = tm.registerLvl1Threshold('TE700', 'TE', mapping=-1)\
-                    .addEnergyThresholdValue(700, -49, 49, 0, 64)
-        thr_te800 = tm.registerLvl1Threshold('TE800', 'TE', mapping=-1)\
-                    .addEnergyThresholdValue(800, -49, 49, 0, 64)
-
-        # TE thresholds for HI
-        thr_te2000 = tm.registerLvl1Threshold('TE2000', 'TE', mapping=3)\
-                    .addEnergyThresholdValue(2000, -49, 49, 0, 64)
-        thr_te3000 = tm.registerLvl1Threshold('TE3000', 'TE', mapping=3)\
-                     .addEnergyThresholdValue(3000, -49, 49, 0, 64)
-        thr_te4000 = tm.registerLvl1Threshold('TE4000', 'TE', mapping=3)\
-                    .addEnergyThresholdValue(4000, -49, 49, 0, 64)
-        thr_te6000 = tm.registerLvl1Threshold('TE6000', 'TE', mapping=3)\
-                     .addEnergyThresholdValue(6000, -49, 49, 0, 64)
-    
-    
-        # missing ET thresholds
-        thr_xe10 = tm.registerLvl1Threshold('XE10', 'XE', mapping=0)\
-                   .addEnergyThresholdValue(10, -49, 49, 0, 64)
-        thr_xe15 = tm.registerLvl1Threshold('XE15', 'XE', mapping=0)\
-                   .addEnergyThresholdValue(15, -49, 49, 0, 64)
-        thr_xe20 = tm.registerLvl1Threshold('XE20', 'XE', mapping=1)\
-                   .addEnergyThresholdValue(20, -49, 49, 0, 64)
-        thr_xe25 = tm.registerLvl1Threshold('XE25', 'XE', mapping=2)\
-                   .addEnergyThresholdValue(25, -49, 49, 0, 64)
-        thr_xe30 = tm.registerLvl1Threshold('XE30', 'XE', mapping=3)\
-                   .addEnergyThresholdValue(30, -49, 49, 0, 64)
-        thr_xe35 = tm.registerLvl1Threshold('XE35', 'XE', mapping=4)\
-                   .addEnergyThresholdValue(35, -49, 49, 0, 64)
-        thr_xe40 = tm.registerLvl1Threshold('XE40', 'XE', mapping=5)\
-                   .addEnergyThresholdValue(40, -49, 49, 0, 64)
-        thr_xe50 = tm.registerLvl1Threshold('XE50', 'XE', mapping=6)\
-                   .addEnergyThresholdValue(50, -49, 49, 0, 64)
-        thr_xe60 = tm.registerLvl1Threshold('XE60', 'XE', mapping=7)\
-                   .addEnergyThresholdValue(60, -49, 49, 0, 64)
-
-        # 15, 20, 25, 30, 40, 60, 70, 80
-        # 35, 45, 60, 90
-        thr_xe70 = tm.registerLvl1Threshold('XE70', 'XE', mapping=-1)\
-                   .addEnergyThresholdValue(70, -49, 49, 0, 64)
-        thr_xe80 = tm.registerLvl1Threshold('XE80', 'XE', mapping=7)\
-                   .addEnergyThresholdValue(80, -49, 49, 0, 64)
-        thr_xe45 = tm.registerLvl1Threshold('XE45', 'XE', mapping=-1)\
-                   .addEnergyThresholdValue(45, -49, 49, 0, 64)
-        thr_xe90 = tm.registerLvl1Threshold('XE90', 'XE', mapping=-1)\
-                   .addEnergyThresholdValue(90, -49, 49, 0, 64)
-        thr_xe100 = tm.registerLvl1Threshold('XE100', 'XE', mapping=7)\
-                   .addEnergyThresholdValue(100, -49, 49, 0, 64)
-        thr_xe110 = tm.registerLvl1Threshold('XE110', 'XE', mapping=7)\
-                   .addEnergyThresholdValue(110, -49, 49, 0, 64)
-        thr_xe120 = tm.registerLvl1Threshold('XE120', 'XE', mapping=7)\
-                   .addEnergyThresholdValue(120, -49, 49, 0, 64) 
-        thr_xe125 = tm.registerLvl1Threshold('XE125', 'XE', mapping=7)\
-                   .addEnergyThresholdValue(125, -49, 49, 0, 64)
-
-        thr_xs15 = tm.registerLvl1Threshold('XS15', 'XS', mapping=0)\
-                   .addEnergyThresholdValue(15, -49, 49, 0, 64)
-        thr_xs20 = tm.registerLvl1Threshold('XS20', 'XS', mapping=0)\
-                   .addEnergyThresholdValue(20, -49, 49, 0, 64)
-        thr_xs25 = tm.registerLvl1Threshold('XS25', 'XS', mapping=0)\
-                   .addEnergyThresholdValue(25, -49, 49, 0, 64)
-        thr_xs30 = tm.registerLvl1Threshold('XS30', 'XS', mapping=0)\
-                   .addEnergyThresholdValue(30, -49, 49, 0, 64)
-        thr_xs35 = tm.registerLvl1Threshold('XS35', 'XS', mapping=0)\
-                   .addEnergyThresholdValue(35, -49, 49, 0, 64)
-        thr_xs40 = tm.registerLvl1Threshold('XS40', 'XS', mapping=0)\
-                   .addEnergyThresholdValue(40, -49, 49, 0, 64)
-        thr_xs45 = tm.registerLvl1Threshold('XS45', 'XS', mapping=0)\
-                   .addEnergyThresholdValue(45, -49, 49, 0, 64)
-        thr_xs50 = tm.registerLvl1Threshold('XS50', 'XS', mapping=0)\
-                   .addEnergyThresholdValue(50, -49, 49, 0, 64)
-        thr_xs55 = tm.registerLvl1Threshold('XS55', 'XS', mapping=0)\
-                   .addEnergyThresholdValue(55, -49, 49, 0, 64)
-        thr_xs60 = tm.registerLvl1Threshold('XS60', 'XS', mapping=0)\
-                   .addEnergyThresholdValue(60, -49, 49, 0, 64)
-        thr_xs65 = tm.registerLvl1Threshold('XS65', 'XS', mapping=0)\
-                   .addEnergyThresholdValue(65, -49, 49, 0, 64)
-
-        thr_nim28 = tm.registerLvl1Threshold('NIM28', 'CALREQ', mapping=0)\
-                     .addEnergyThresholdValue(40, -49, 49, 0, 64) # 
-        thr_nim29 = tm.registerLvl1Threshold('NIM29', 'CALREQ', mapping=1)\
-                     .addEnergyThresholdValue(40, -49, 49, 0, 64) # 
-        thr_nim30 = tm.registerLvl1Threshold('NIM30', 'CALREQ', mapping=2)\
-                     .addEnergyThresholdValue(40, -49, 49, 0, 64) # 
-        if ('InitialBeam_v1' in TriggerFlags.triggerMenuSetup()\
-            ):
-            thresholdA=[26.7, 15.4, 20, 19.2, 18.3, 20.8, 17.5, 18.3,
-                        19.2, 17.5, 16.7, 19.2, 18.3, 18.3, 17.5, 15.0, 30]
-            thresholdC=[31.7, 32.5, 27.5, 50.0, 56.3, 25.8, 22.1, 17.1,
-                        13.8, 14.2, 14.6, 20.0, 15.8, 20.8, 15.0, 17.5, 30]
-        else:
-            thresholdA=[32.04, 26.98, 35., 33.54, 32.08, 36.46, 30.63, 32.08,
-                        33.54, 30.63, 29.17, 33.54, 32.08, 32.08, 30.63, 26.25, 30.0 ]
-            thresholdC=[55.42, 31.98, 32.81, 49.48, 98.44, 32.11, 32.62, 29.9,
-                        24.06, 25.81, 25.52, 35, 27.71, 36.46, 26.25, 30.63, 30]
-            
-        thr_mbtsA0 = tm.registerLvl1Threshold('MBTS_A0', 'MBTSSI', mapping=0)\
-                     .addEnergyThresholdValue(thresholdA[0], -49, 49, 0, 64) # mV
-        thr_mbtsA1 = tm.registerLvl1Threshold('MBTS_A1', 'MBTSSI', mapping=1)\
-                     .addEnergyThresholdValue(thresholdA[1], -49, 49, 0, 64) # mV
-        thr_mbtsA2 = tm.registerLvl1Threshold('MBTS_A2', 'MBTSSI', mapping=2)\
-                     .addEnergyThresholdValue(thresholdA[2], -49, 49, 0, 64) # mV
-        thr_mbtsA3 = tm.registerLvl1Threshold('MBTS_A3', 'MBTSSI', mapping=3)\
-                     .addEnergyThresholdValue(thresholdA[3], -49, 49, 0, 64) # mV
-        thr_mbtsA4 = tm.registerLvl1Threshold('MBTS_A4', 'MBTSSI', mapping=4)\
-                     .addEnergyThresholdValue(thresholdA[4], -49, 49, 0, 64) # mV
-        thr_mbtsA5 = tm.registerLvl1Threshold('MBTS_A5', 'MBTSSI', mapping=5)\
-                     .addEnergyThresholdValue(thresholdA[5], -49, 49, 0, 64) # mV
-        thr_mbtsA6 = tm.registerLvl1Threshold('MBTS_A6', 'MBTSSI', mapping=6)\
-                     .addEnergyThresholdValue(thresholdA[6], -49, 49, 0, 64) # mV
-        thr_mbtsA7 = tm.registerLvl1Threshold('MBTS_A7', 'MBTSSI', mapping=7)\
-                     .addEnergyThresholdValue(thresholdA[7], -49, 49, 0, 64) # mV
-        thr_mbtsA8 = tm.registerLvl1Threshold('MBTS_A8', 'MBTSSI', mapping=8)\
-                     .addEnergyThresholdValue(thresholdA[8], -49, 49, 0, 64) # mV
-        thr_mbtsA9 = tm.registerLvl1Threshold('MBTS_A9', 'MBTSSI', mapping=9)\
-                     .addEnergyThresholdValue(thresholdA[9], -49, 49, 0, 64) # mV
-        thr_mbtsA10 = tm.registerLvl1Threshold('MBTS_A10', 'MBTSSI', mapping=10)\
-                      .addEnergyThresholdValue(thresholdA[10], -49, 49, 0, 64) # mV
-        thr_mbtsA11 = tm.registerLvl1Threshold('MBTS_A11', 'MBTSSI', mapping=11)\
-                      .addEnergyThresholdValue(thresholdA[11], -49, 49, 0, 64) # mV
-        thr_mbtsA12 = tm.registerLvl1Threshold('MBTS_A12', 'MBTSSI', mapping=12)\
-                      .addEnergyThresholdValue(thresholdA[12], -49, 49, 0, 64) # mV
-        thr_mbtsA13 = tm.registerLvl1Threshold('MBTS_A13', 'MBTSSI', mapping=13)\
-                      .addEnergyThresholdValue(thresholdA[13], -49, 49, 0, 64) # mV
-        thr_mbtsA14 = tm.registerLvl1Threshold('MBTS_A14', 'MBTSSI', mapping=14)\
-                      .addEnergyThresholdValue(thresholdA[14], -49, 49, 0, 64) # mV
-        thr_mbtsA15 = tm.registerLvl1Threshold('MBTS_A15', 'MBTSSI', mapping=15)\
-                      .addEnergyThresholdValue(thresholdA[15], -49, 49, 0, 64) # mV
-        
-        thr_mbtsC0 = tm.registerLvl1Threshold('MBTS_C0', 'MBTSSI', mapping=16)\
-                     .addEnergyThresholdValue(thresholdC[0], -49, 49, 0, 64) # mV
-        thr_mbtsC1 = tm.registerLvl1Threshold('MBTS_C1', 'MBTSSI', mapping=17)\
-                     .addEnergyThresholdValue(thresholdC[1], -49, 49, 0, 64) # mV
-        thr_mbtsC2 = tm.registerLvl1Threshold('MBTS_C2', 'MBTSSI', mapping=18)\
-                     .addEnergyThresholdValue(thresholdC[2], -49, 49, 0, 64) # mV
-        thr_mbtsC3 = tm.registerLvl1Threshold('MBTS_C3', 'MBTSSI', mapping=19)\
-                     .addEnergyThresholdValue(thresholdC[3], -49, 49, 0, 64) # mV
-        thr_mbtsC4 = tm.registerLvl1Threshold('MBTS_C4', 'MBTSSI', mapping=20)\
-                     .addEnergyThresholdValue(thresholdC[4], -49, 49, 0, 64) # mV
-        thr_mbtsC5 = tm.registerLvl1Threshold('MBTS_C5', 'MBTSSI', mapping=21)\
-                     .addEnergyThresholdValue(thresholdC[5], -49, 49, 0, 64) # mV
-        thr_mbtsC6 = tm.registerLvl1Threshold('MBTS_C6', 'MBTSSI', mapping=22)\
-                     .addEnergyThresholdValue(thresholdC[6], -49, 49, 0, 64) # mV
-        thr_mbtsC7 = tm.registerLvl1Threshold('MBTS_C7', 'MBTSSI', mapping=23)\
-                     .addEnergyThresholdValue(thresholdC[7], -49, 49, 0, 64) # mV
-        thr_mbtsC8 = tm.registerLvl1Threshold('MBTS_C8', 'MBTSSI', mapping=24)\
-                     .addEnergyThresholdValue(thresholdC[8], -49, 49, 0, 64) # mV
-        thr_mbtsC9 = tm.registerLvl1Threshold('MBTS_C9', 'MBTSSI', mapping=25)\
-                     .addEnergyThresholdValue(thresholdC[9], -49, 49, 0, 64) # mV
-        thr_mbtsC10 = tm.registerLvl1Threshold('MBTS_C10', 'MBTSSI', mapping=26)\
-                     .addEnergyThresholdValue(thresholdC[10], -49, 49, 0, 64) # mV
-        thr_mbtsC11 = tm.registerLvl1Threshold('MBTS_C11', 'MBTSSI', mapping=27)\
-                     .addEnergyThresholdValue(thresholdC[11], -49, 49, 0, 64) # mV
-        thr_mbtsC12 = tm.registerLvl1Threshold('MBTS_C12', 'MBTSSI', mapping=28)\
-                     .addEnergyThresholdValue(thresholdC[12], -49, 49, 0, 64) # mV
-        thr_mbtsC13 = tm.registerLvl1Threshold('MBTS_C13', 'MBTSSI', mapping=29)\
-                     .addEnergyThresholdValue(thresholdC[13], -49, 49, 0, 64) # mV
-        thr_mbtsC14 = tm.registerLvl1Threshold('MBTS_C14', 'MBTSSI', mapping=30)\
-                     .addEnergyThresholdValue(thresholdC[14], -49, 49, 0, 64) # mV
-        thr_mbtsC15 = tm.registerLvl1Threshold('MBTS_C15', 'MBTSSI', mapping=31)\
-                     .addEnergyThresholdValue(thresholdC[15], -49, 49, 0, 64) # mV
-
-
-        thr_mbtsA = tm.registerLvl1Threshold('MBTS_A', 'MBTS', mapping=0)
-        thr_mbtsC = tm.registerLvl1Threshold('MBTS_C', 'MBTS', mapping=1)
-        for x in xrange(16):
-            thr_mbtsA.thresholdValues += [ tm.getLvl1Threshold('MBTS_A%i' % x).thresholdValues[0] ]
-            thr_mbtsC.thresholdValues += [ tm.getLvl1Threshold('MBTS_C%i' % x).thresholdValues[0] ]
-
-        thr_trt = tm.registerLvl1Threshold('TRTfast', 'TRT', mapping=0)\
-                      .addEnergyThresholdValue(40, -49, 49, 0, 64) # mV
-
-        thr_zdcA = tm.registerLvl1Threshold('ZDC_A', 'ZDC', mapping=0)\
-                      .addEnergyThresholdValue(250, -49, 49, 0, 64) # mV
-        thr_zdcC = tm.registerLvl1Threshold('ZDC_C', 'ZDC', mapping=1)\
-                      .addEnergyThresholdValue(250, -49, 49, 0, 64) # mV
-        thr_zdcAND = tm.registerLvl1Threshold('ZDC_AND', 'ZDC', mapping=2)\
-                      .addEnergyThresholdValue(250, -49, 49, 0, 64) # mV
-
-
-        thr_bcmAtoC = tm.registerLvl1Threshold('BCM_AtoC', 'BCM', mapping=0)\
-                      .addEnergyThresholdValue(40, -49, 49, 0, 64) # mV
-        
-        thr_bcmCtoA = tm.registerLvl1Threshold('BCM_CtoA', 'BCM', mapping=1)\
-                      .addEnergyThresholdValue(40, -49, 49, 0, 64) # mV
-
-        
-        thr_bcmWide = tm.registerLvl1Threshold('BCM_Wide', 'BCM', mapping=2)\
-                      .addEnergyThresholdValue(40, -49, 49, 0, 64) # mV
-
-        thr_bcmA1 = tm.registerLvl1Threshold('BCM_A1', 'BCM', mapping=3)\
-                    .addEnergyThresholdValue(40, -49, 49, 0, 64) # mV
-        
-        thr_bcmA2 = tm.registerLvl1Threshold('BCM_A2', 'BCM', mapping=4)\
-                    .addEnergyThresholdValue(40, -49, 49, 0, 64) # mV
-        
-        thr_bcmC1 = tm.registerLvl1Threshold('BCM_C1', 'BCM', mapping=5)\
-                    .addEnergyThresholdValue(40, -49, 49, 0, 64) # mV
-        
-        thr_bcmC2 = tm.registerLvl1Threshold('BCM_C2', 'BCM', mapping=6)\
-                    .addEnergyThresholdValue(40, -49, 49, 0, 64) # mV
-
-        thr_bcmHTA = tm.registerLvl1Threshold('BCM_HTA', 'BCM', mapping=7)\
-                      .addEnergyThresholdValue(40, -49, 49, 0, 64) # mV
-        
-        thr_bcmHTC = tm.registerLvl1Threshold('BCM_HTC', 'BCM', mapping=8)\
-                      .addEnergyThresholdValue(40, -49, 49, 0, 64) # mV
-
-        thr_bcmComb = tm.registerLvl1Threshold('BCM_Comb', 'BCMCMB', mapping=0)\
-                      .addEnergyThresholdValue(40, -49, 49, 0, 64) # mV
-        
-
-
-        thr_lucidA = tm.registerLvl1Threshold('LUCID_A', 'LUCID', mapping=0)\
-                     .addEnergyThresholdValue(650, -49, 49, 0, 64) # mV
-        thr_lucidC = tm.registerLvl1Threshold('LUCID_C', 'LUCID', mapping=1)\
-                     .addEnergyThresholdValue(650, -49, 49, 0, 64) # mV
-
-
-        thr_bptx0 = tm.registerLvl1Threshold('BPTX0', 'NIM', mapping=0)\
-                    .addEnergyThresholdValue(40, -49, 49, 0, 64) # 
-        thr_bptx1 = tm.registerLvl1Threshold('BPTX1', 'NIM', mapping=1)\
-                    .addEnergyThresholdValue(40, -49, 49, 0, 64) #
-        thr_nimdir2 = tm.registerLvl1Threshold('NIMDIR2', 'NIM', mapping=2)\
-                      .addEnergyThresholdValue(40, -49, 49, 0, 64) 
-        thr_nimdir3 = tm.registerLvl1Threshold('NIMDIR3', 'NIM', mapping=3)\
-                      .addEnergyThresholdValue(40, -49, 49, 0, 64) 
-        thr_nimdir4 = tm.registerLvl1Threshold('NIMDIR4', 'NIM', mapping=4)\
-                      .addEnergyThresholdValue(40, -49, 49, 0, 64) 
-        thr_nimdir5 = tm.registerLvl1Threshold('NIMDIR5', 'NIM', mapping=5)\
-                      .addEnergyThresholdValue(40, -49, 49, 0, 64) 
-        thr_nimdir6 = tm.registerLvl1Threshold('NIMDIR6', 'NIM', mapping=6)\
-                      .addEnergyThresholdValue(40, -49, 49, 0, 64) 
-        thr_nimdir7 = tm.registerLvl1Threshold('NIMDIR7', 'NIM', mapping=7)\
-                      .addEnergyThresholdValue(40, -49, 49, 0, 64) 
-        thr_nimdir8 = tm.registerLvl1Threshold('NIMDIR8', 'NIM', mapping=8)\
-                      .addEnergyThresholdValue(40, -49, 49, 0, 64) 
-        thr_nimdir9 = tm.registerLvl1Threshold('NIMDIR9', 'NIM', mapping=9)\
-                      .addEnergyThresholdValue(40, -49, 49, 0, 64) 
-        thr_nimdir10 = tm.registerLvl1Threshold('NIMDIR10', 'NIM', mapping=10)\
-                       .addEnergyThresholdValue(40, -49, 49, 0, 64) 
-        thr_nimdir11 = tm.registerLvl1Threshold('NIMDIR11', 'NIM', mapping=11)\
-                       .addEnergyThresholdValue(40, -49, 49, 0, 64) 
-        thr_nimdir12 = tm.registerLvl1Threshold('NIMDIR12', 'NIM', mapping=12)\
-                       .addEnergyThresholdValue(40, -49, 49, 0, 64) 
-        thr_nimdir13 = tm.registerLvl1Threshold('NIMDIR13', 'NIM', mapping=13)\
-                       .addEnergyThresholdValue(40, -49, 49, 0, 64) 
-        thr_nimdir14 = tm.registerLvl1Threshold('NIMDIR14', 'NIM', mapping=14)\
-                       .addEnergyThresholdValue(40, -49, 49, 0, 64) 
-        thr_nimdir15 = tm.registerLvl1Threshold('NIMDIR15', 'NIM', mapping=15)\
-                       .addEnergyThresholdValue(40, -49, 49, 0, 64) 
-        thr_nimdir16 = tm.registerLvl1Threshold('NIMDIR16', 'NIM', mapping=16)\
-                       .addEnergyThresholdValue(40, -49, 49, 0, 64) 
-        thr_nimdir17 = tm.registerLvl1Threshold('NIMDIR17', 'NIM', mapping=17)\
-                       .addEnergyThresholdValue(40, -49, 49, 0, 64) 
-        thr_nimdir18 = tm.registerLvl1Threshold('NIMDIR18', 'NIM', mapping=18)\
-                       .addEnergyThresholdValue(40, -49, 49, 0, 64) 
-        thr_nimdir19 = tm.registerLvl1Threshold('NIMDIR19', 'NIM', mapping=19)\
-                       .addEnergyThresholdValue(40, -49, 49, 0, 64) 
-        thr_nimdir20 = tm.registerLvl1Threshold('NIMDIR20', 'NIM', mapping=20)\
-                       .addEnergyThresholdValue(40, -49, 49, 0, 64) 
-        thr_nimdir21 = tm.registerLvl1Threshold('NIMDIR21', 'NIM', mapping=21)\
-                       .addEnergyThresholdValue(40, -49, 49, 0, 64) 
-        thr_nimdir22 = tm.registerLvl1Threshold('NIMDIR22', 'NIM', mapping=22)\
-                       .addEnergyThresholdValue(40, -49, 49, 0, 64) 
-        thr_nimdir23 = tm.registerLvl1Threshold('NIMDIR23', 'NIM', mapping=23)\
-                       .addEnergyThresholdValue(40, -49, 49, 0, 64) 
-        thr_nimdir24 = tm.registerLvl1Threshold('NIMDIR24', 'NIM', mapping=24)\
-                       .addEnergyThresholdValue(40, -49, 49, 0, 64) 
-        thr_nimdir25 = tm.registerLvl1Threshold('NIMDIR25', 'NIM', mapping=25)\
-                       .addEnergyThresholdValue(40, -49, 49, 0, 64) 
-        thr_nimdir26 = tm.registerLvl1Threshold('NIMDIR26', 'NIM', mapping=35)\
-                       .addEnergyThresholdValue(40, -49, 49, 0, 64) 
-        thr_nimdir27 = tm.registerLvl1Threshold('NIMDIR27', 'NIM', mapping=27)\
-                       .addEnergyThresholdValue(40, -49, 49, 0, 64) 
-        thr_nimdir28 = tm.registerLvl1Threshold('NIMDIR28', 'NIM', mapping=28)\
-                       .addEnergyThresholdValue(40, -49, 49, 0, 64) 
-        thr_nimdir29 = tm.registerLvl1Threshold('NIMDIR29', 'NIM', mapping=29)\
-                       .addEnergyThresholdValue(40, -49, 49, 0, 64) 
-        thr_nimdir30 = tm.registerLvl1Threshold('NIMDIR30', 'NIM', mapping=30)\
-                       .addEnergyThresholdValue(40, -49, 49, 0, 64) 
-        thr_nimdir31 = tm.registerLvl1Threshold('NIMDIR31', 'NIM', mapping=31)\
-                       .addEnergyThresholdValue(40, -49, 49, 0, 64) 
-        thr_nimdir32 = tm.registerLvl1Threshold('NIMDIR32', 'NIM', mapping=32)\
-                       .addEnergyThresholdValue(40, -49, 49, 0, 64) 
-        thr_nimdir33 = tm.registerLvl1Threshold('NIMDIR33', 'NIM', mapping=33)\
-                       .addEnergyThresholdValue(40, -49, 49, 0, 64) 
-        thr_nimdir34 = tm.registerLvl1Threshold('NIMDIR34', 'NIM', mapping=34)\
-                       .addEnergyThresholdValue(40, -49, 49, 0, 64) 
-        thr_nimdir35 = tm.registerLvl1Threshold('NIMDIR35', 'NIM', mapping=35)\
-                       .addEnergyThresholdValue(40, -49, 49, 0, 64) 
-        thr_nimdir36 = tm.registerLvl1Threshold('NIMDIR36', 'NIM', mapping=36)\
-                       .addEnergyThresholdValue(40, -49, 49, 0, 64)         
-
-##ALFA NIMS
-        thr_nimdir_B7R1L = tm.registerLvl1Threshold('NIM_B7R1L', 'NIM', mapping=14)\
-                       .addEnergyThresholdValue(40, -49, 49, 0, 64) 
-        thr_nimdir_B7R1U = tm.registerLvl1Threshold('NIM_B7R1U', 'NIM', mapping=15)\
-                       .addEnergyThresholdValue(40, -49, 49, 0, 64) 
-        thr_nimdir_A7R1L = tm.registerLvl1Threshold('NIM_A7R1L', 'NIM', mapping=16)\
-                       .addEnergyThresholdValue(40, -49, 49, 0, 64) 
-        thr_nimdir_A7R1U = tm.registerLvl1Threshold('NIM_A7R1U', 'NIM', mapping=17)\
-                       .addEnergyThresholdValue(40, -49, 49, 0, 64) 
-        thr_nimdir_A7L1L = tm.registerLvl1Threshold('NIM_A7L1L', 'NIM', mapping=18)\
-                       .addEnergyThresholdValue(40, -49, 49, 0, 64) 
-        thr_nimdir_A7L1U = tm.registerLvl1Threshold('NIM_A7L1U', 'NIM', mapping=19)\
-                       .addEnergyThresholdValue(40, -49, 49, 0, 64) 
-        thr_nimdir_B7L1L = tm.registerLvl1Threshold('NIM_B7L1L', 'NIM', mapping=20)\
-                       .addEnergyThresholdValue(40, -49, 49, 0, 64) 
-        thr_nimdir_B7L1U = tm.registerLvl1Threshold('NIM_B7L1U', 'NIM', mapping=21)\
-                       .addEnergyThresholdValue(40, -49, 49, 0, 64) 
-        thr_nimdir_ALFA_LOG = tm.registerLvl1Threshold('NIM_ALFA_LOG', 'NIM', mapping=22)\
-                       .addEnergyThresholdValue(40, -49, 49, 0, 64) 
-
-        thr_nimdir_B7R1L_OD = tm.registerLvl1Threshold('NIM_B7R1L_OD', 'NIM', mapping=26)\
-                              .addEnergyThresholdValue(40, -49, 49, 0, 64)
-        thr_nimdir_B7R1U_OD = tm.registerLvl1Threshold('NIM_B7R1U_OD', 'NIM', mapping=27)\
-                              .addEnergyThresholdValue(40, -49, 49, 0, 64)
-        thr_nimdir_A7R1L_OD = tm.registerLvl1Threshold('NIM_A7R1L_OD', 'NIM', mapping=28)\
-                              .addEnergyThresholdValue(40, -49, 49, 0, 64)
-        thr_nimdir_A7R1U_OD = tm.registerLvl1Threshold('NIM_A7R1U_OD', 'NIM', mapping=29)\
-                              .addEnergyThresholdValue(40, -49, 49, 0, 64)
-        thr_nimdir_A7L1L_OD = tm.registerLvl1Threshold('NIM_A7L1L_OD', 'NIM', mapping=30)\
-                              .addEnergyThresholdValue(40, -49, 49, 0, 64)
-        thr_nimdir_A7L1U_OD = tm.registerLvl1Threshold('NIM_A7L1U_OD', 'NIM', mapping=31)\
-                              .addEnergyThresholdValue(40, -49, 49, 0, 64)
-        thr_nimdir_B7L1L_OD = tm.registerLvl1Threshold('NIM_B7L1L_OD', 'NIM', mapping=32)\
-                              .addEnergyThresholdValue(40, -49, 49, 0, 64)
-        thr_nimdir_B7L1U_OD = tm.registerLvl1Threshold('NIM_B7L1U_OD', 'NIM', mapping=33)\
-                              .addEnergyThresholdValue(40, -49, 49, 0, 64)
-        thr_nimdir_ALFA_LOG_OD = tm.registerLvl1Threshold('NIM_ALFA_LOG_OD', 'NIM', mapping=34)\
-                                 .addEnergyThresholdValue(40, -49, 49, 0, 64)
-
-        thr_nim_mub = tm.registerLvl1Threshold('NIM_MUB', 'NIM', mapping=23)\
-                      .addEnergyThresholdValue(40, -49, 49, 0, 64)
-
-        thr_nim_mue = tm.registerLvl1Threshold('NIM_MUE', 'NIM', mapping=24)\
-                      .addEnergyThresholdValue(40, -49 , 49, 0, 64)\
-                
-        
-        #thr_zb_4MBTS_A = tm.registerLvl1Threshold('ZB_4MBTS_A', 'NIM', mapping=24)\
-         #                .addEnergyThresholdValue(40, -49, 49, 0, 64) 
-        
-        # -------------------------------------------------------------------
-        # Jet weights
-        # ------------
-        # Jet thresholds: [5, 10, 18, 23, 35, 42, 70, 100 ][10, 18, 26, 65 ]
-        # Jet weights(w):  [ 7, 14, 20, 29, 38, 56, 85, 100 ][9, 6, 23, 19]
-        # Jet weights(W):[ 5,  6, 6, 8, 9, 17, 29, 15 ][9, 6, 23, 19]
-        # W_i=0.5*(thr_{i+1}-thr_{i-1}),
-        #     thr_{0}=0 and thr_{n+1}=thr_{n}+(thr_{n}-thr_{n-1})
-        # --------------------------------------------------------------------
-        tm.Lvl1CaloInfo().setGlobalScale(1.0)
-        tm.Lvl1CaloInfo().setJetWeights([8, 7, 15, 25, 30, 30, 25, 47, 27, 26, 42, 55])
-        # tm.Lvl1CaloInfo().setXsParams( xsSigmaScale=1120, xsSigmaOffset=1280, xeMin=11, xeMax=63, teSqrtMin=4, teSqrtMax=63 )
-        if ( 'pp_v4' in TriggerFlags.triggerMenuSetup() or 'pp_v5' in TriggerFlags.triggerMenuSetup()  ):                        
-            tm.Lvl1CaloInfo().setXsParams( xsSigmaScale=1150, xsSigmaOffset=1640, xeMin=11, xeMax=63, teSqrtMin=4, teSqrtMax=63 )
-        else:
-            tm.Lvl1CaloInfo().setXsParams( xsSigmaScale=1120, xsSigmaOffset=1280, xeMin=11, xeMax=63, teSqrtMin=4, teSqrtMax=63 )
-	# ------------------------------------------------------------------
-        # LVL1 items
-        # ------------------------------------------------------------------
-
-        # Setting up bunch group and BPTX conditions
-        bgrpcond      = Logic(bgrp0)&Logic(bgrp1)
-        cosmiccond    = Logic(bgrp0)&Logic(bgrp3)
-        unpaired1cond = Logic(bgrp0)&Logic(bgrp4) # unpaired beam 1
-        unpaired2cond = Logic(bgrp0)&Logic(bgrp5) # unpaired beam 2
-        unpairedRcond = Logic(bgrp0)&Logic(bgrp7) # unpaired beams 1 oR beam 2
-        empty1stcond  = Logic(bgrp0)&Logic(bgrp6)
-        bptxcond      = Logic(bgrp0)&(thr_bptx0.condition(1)|thr_bptx1.condition(1))
-        physcond      = bgrpcond
-
-        #bgrp2cond     = Logic(bgrp0)&(Logic(bgrp1)|Logic(bgrp2)|Logic(bgrp3)|Logic(bgrp4)|Logic(bgrp5)|Logic(bgrp6))
-
-        NoColCond      = Logic(bgrp0)&Not(Logic(bgrp1))&Not(Logic(bgrp6))&Not(Logic(bgrp7))&Not(Logic(bgrp2))
-
-        ## New in the Physics_pp - 30August2010
-        unpaired_isocond    = Logic(bgrp0)&Logic(bgrp4) # unpaired isolated (satellite bunches)
-        unpaired_nonisocond = Logic(bgrp0)&Logic(bgrp5) # unpaired non-isolated (parasitic bunches)
-
-        ## New in Physics_pp_v2 - 24March2010
-        bgrp7cond       = Logic(bgrp0)&Logic(bgrp7) # No unpaired anymore
-
-
-        if ('Cosmic2009_v2' in TriggerFlags.triggerMenuSetup()\
-            or 'InitialBeam_v1' in TriggerFlags.triggerMenuSetup()\
-            or 'Cosmic2009_simpleL1Calib' in TriggerFlags.triggerMenuSetup()\
-            or 'Cosmic2009_inclMuons' in TriggerFlags.triggerMenuSetup()\
-            ):
-            physcond = bptxcond
-        
-        # E/gamma ctpid=[0:0x1f]
-        item_em2   = LVL1MenuItem('L1_EM2',   ctpid=0x0, group='1')\
-                     .setLogic(thr_em2.condition(1)&physcond).setTriggerType(TT_calo|TT_caloem)
-        item_em3   = LVL1MenuItem('L1_EM3',   ctpid=0x1, group='1')\
-                     .setLogic(thr_em3.condition(1)&physcond).setTriggerType(TT_calo|TT_caloem)
-        item_em6   = LVL1MenuItem('L1_EM6',   ctpid=-1, group='1')\
-                     .setLogic(thr_em6.condition(1)&physcond).setTriggerType(TT_calo|TT_caloem)
-        item_em7   = LVL1MenuItem('L1_EM7',   ctpid=0x1, group='1')\
-                     .setLogic(thr_em7.condition(1)&physcond).setTriggerType(TT_calo|TT_caloem)
-        item_em8   = LVL1MenuItem('L1_EM8',   ctpid=-1, group='1')\
-                     .setLogic(thr_em8.condition(1)&physcond).setTriggerType(TT_calo|TT_caloem)
-        item_em10  = LVL1MenuItem('L1_EM10',  ctpid=0x2, group='1')\
-                     .setLogic(thr_em10.condition(1)&physcond).setTriggerType(TT_calo|TT_caloem)
-        item_em10v  = LVL1MenuItem('L1_EM10V',  ctpid=-1, group='1')\
-                      .setLogic(thr_em10v.condition(1)&physcond).setTriggerType(TT_calo|TT_caloem)
-        item_em10h  = LVL1MenuItem('L1_EM10H',  ctpid=-1, group='1')\
-                      .setLogic(thr_em10h.condition(1)&physcond).setTriggerType(TT_calo|TT_caloem)
-        item_em10vh = LVL1MenuItem('L1_EM10VH',  ctpid=-1, group='1')\
-                       .setLogic(thr_em10vh.condition(1)&physcond).setTriggerType(TT_calo|TT_caloem)
-        item_em11h  = LVL1MenuItem('L1_EM11H',  ctpid=-1, group='1')\
-                     .setLogic(thr_em11h.condition(1)&physcond).setTriggerType(TT_calo|TT_caloem)
-        item_em12  = LVL1MenuItem('L1_EM12',  ctpid=0x2, group='1')\
-                     .setLogic(thr_em12.condition(1)&physcond).setTriggerType(TT_calo|TT_caloem)
-        item_em13  = LVL1MenuItem('L1_EM13',  ctpid=0x3, group='1')\
-                     .setLogic(thr_em13.condition(1)&physcond).setTriggerType(TT_calo|TT_caloem)
-        item_em13i = LVL1MenuItem('L1_EM13I', ctpid=0x4, group='1')\
-                     .setLogic(thr_em13i.condition(1)&physcond).setTriggerType(TT_calo|TT_caloem)
-        item_em15h  = LVL1MenuItem('L1_EM15H',  ctpid=-1, group='1')\
-                      .setLogic(thr_em15h.condition(1)&physcond).setTriggerType(TT_calo|TT_caloem)
-        item_em14vh  = LVL1MenuItem('L1_EM14VH',  ctpid=-1, group='1')\
-                      .setLogic(thr_em14vh.condition(1)&physcond).setTriggerType(TT_calo|TT_caloem)
-        item_em18  = LVL1MenuItem('L1_EM18',  ctpid=0x5, group='1')\
-                     .setLogic(thr_em18.condition(1)&physcond).setTriggerType(TT_calo|TT_caloem)
-        item_em18i = LVL1MenuItem('L1_EM18I', ctpid=0x6, group='1')\
-                     .setLogic(thr_em18i.condition(1)&physcond).setTriggerType(TT_calo|TT_caloem)
-        item_em18vh = LVL1MenuItem('L1_EM18VH',  ctpid=-1, group='1')\
-                      .setLogic(thr_em18vh.condition(1)&physcond).setTriggerType(TT_calo|TT_caloem)
-        item_em18h  = LVL1MenuItem('L1_EM18H',  ctpid=-1, group='1')\
-                      .setLogic(thr_em18h.condition(1)&physcond).setTriggerType(TT_calo|TT_caloem)
-        item_em23i = LVL1MenuItem('L1_EM23I', ctpid=0x7, group='1')\
-                     .setLogic(thr_em23i.condition(1)&physcond).setTriggerType(TT_calo|TT_caloem)
-        item_em20h  = LVL1MenuItem('L1_EM20H',  ctpid=-1, group='1')\
-                      .setLogic(thr_em20h.condition(1)&physcond).setTriggerType(TT_calo|TT_caloem)
-        item_em31 = LVL1MenuItem('L1_EM31', ctpid=-1, group='1')\
-                   .setLogic(thr_em31.condition(1)&physcond).setTriggerType(TT_calo|TT_caloem)
-        item_em100 = LVL1MenuItem('L1_EM100', ctpid=0x8, group='1')\
-                     .setLogic(thr_em100.condition(1)&physcond).setTriggerType(TT_calo|TT_caloem)
-        item_em50 = LVL1MenuItem('L1_EM50', ctpid=0x9, group='1')\
-                    .setLogic(thr_em50.condition(1)&physcond).setTriggerType(TT_calo|TT_caloem)
-
-        # EM
-        # - Add/remap new L1 items:
-        #   EM7->EM5 EM13->EM10 EM13I->EM10I EM18->EM14 EM18I->EM14I EM23I->EM19I EM100->EM85
-        # - For these new items use the same CTP id as item being replaced
-        #   with exception of EM10 which already exists - it keeps the same CTP id=
-        #
-        item_em5   = LVL1MenuItem('L1_EM5',   ctpid=-1, group='1')\
-                     .setLogic(thr_em5.condition(1)&physcond).setTriggerType(TT_calo|TT_caloem)
-        item_em10i = LVL1MenuItem('L1_EM10I', ctpid=0x4, group='1')\
-                     .setLogic(thr_em10i.condition(1)&physcond).setTriggerType(TT_calo|TT_caloem)
-        item_em14  = LVL1MenuItem('L1_EM14',  ctpid=0x5, group='1')\
-                     .setLogic(thr_em14.condition(1)&physcond).setTriggerType(TT_calo|TT_caloem)
-        item_em16  = LVL1MenuItem('L1_EM16',  ctpid=0x5, group='1')\
-                     .setLogic(thr_em16.condition(1)&physcond).setTriggerType(TT_calo|TT_caloem)
-        item_em16vh = LVL1MenuItem('L1_EM16VH',  ctpid=-1, group='1')\
-                      .setLogic(thr_em16vh.condition(1)&physcond).setTriggerType(TT_calo|TT_caloem)
-        item_em16h  = LVL1MenuItem('L1_EM16H',  ctpid=-1, group='1')\
-                      .setLogic(thr_em16h.condition(1)&physcond).setTriggerType(TT_calo|TT_caloem)
-        item_em16v  = LVL1MenuItem('L1_EM16V',  ctpid=-1, group='1')\
-                      .setLogic(thr_em16v.condition(1)&physcond).setTriggerType(TT_calo|TT_caloem)
-        item_em14i = LVL1MenuItem('L1_EM14I', ctpid=0x6, group='1')\
-                     .setLogic(thr_em14i.condition(1)&physcond).setTriggerType(TT_calo|TT_caloem)
-        item_em19i = LVL1MenuItem('L1_EM19I', ctpid=0x7, group='1')\
-                     .setLogic(thr_em19i.condition(1)&physcond).setTriggerType(TT_calo|TT_caloem)
-        item_em30  = LVL1MenuItem('L1_EM30', ctpid=0x8, group='1')\
-                     .setLogic(thr_em30.condition(1)&physcond).setTriggerType(TT_calo|TT_caloem)
-        item_em35  = LVL1MenuItem('L1_EM35', ctpid=0x8, group='1')\
-                     .setLogic(thr_em35.condition(1)&physcond).setTriggerType(TT_calo|TT_caloem)
-        item_em85  = LVL1MenuItem('L1_EM85', ctpid=0x8, group='1')\
-                     .setLogic(thr_em85.condition(1)&physcond).setTriggerType(TT_calo|TT_caloem)
-
-        item_em30_bgrp7  = LVL1MenuItem('L1_EM30_BGRP7', ctpid=-1, group='1')\
-                                         .setLogic(thr_em30.condition(1)&bgrp7cond).setTriggerType(TT_calo|TT_caloem)
-        
-        item_em2_empty = LVL1MenuItem('L1_EM2_EMPTY',ctpid=-1, group='1')\
-                         .setLogic(thr_em2.condition(1)&cosmiccond).setTriggerType(TT_calo|TT_caloem)
-        item_em3_empty = LVL1MenuItem('L1_EM3_EMPTY',ctpid=-1, group='1')\
-                         .setLogic(thr_em3.condition(1)&cosmiccond).setTriggerType(TT_calo|TT_caloem)
-        item_em5_empty = LVL1MenuItem('L1_EM5_EMPTY',ctpid=-1, group='1')\
-                         .setLogic(thr_em5.condition(1)&cosmiccond).setTriggerType(TT_calo|TT_caloem)        
-        item_em6_empty = LVL1MenuItem('L1_EM6_EMPTY',ctpid=-1, group='1')\
-                         .setLogic(thr_em6.condition(1)&cosmiccond).setTriggerType(TT_calo|TT_caloem)
-        item_em4_empty = LVL1MenuItem('L1_EM4_EMPTY',ctpid=-1, group='1')\
-                         .setLogic(thr_em4.condition(1)&cosmiccond).setTriggerType(TT_calo|TT_caloem)
-        item_em7_empty = LVL1MenuItem('L1_EM7_EMPTY',ctpid=-1, group='1')\
-                         .setLogic(thr_em7.condition(1)&cosmiccond).setTriggerType(TT_calo|TT_caloem)
-        item_em5i_empty = LVL1MenuItem('L1_EM5I_EMPTY',ctpid=-1, group='1')\
-                         .setLogic(thr_em5i.condition(1)&cosmiccond).setTriggerType(TT_calo|TT_caloem)        
-        item_em7i_empty = LVL1MenuItem('L1_EM7I_EMPTY',ctpid=-1, group='1')\
-                         .setLogic(thr_em7i.condition(1)&cosmiccond).setTriggerType(TT_calo|TT_caloem)
-        item_em10_empty = LVL1MenuItem('L1_EM10_EMPTY',ctpid=-1, group='1')\
-                         .setLogic(thr_em10.condition(1)&cosmiccond).setTriggerType(TT_calo|TT_caloem)
-        item_em10i_empty = LVL1MenuItem('L1_EM10I_EMPTY',ctpid=-1, group='1')\
-                          .setLogic(thr_em10i.condition(1)&cosmiccond).setTriggerType(TT_calo|TT_caloem)
-        item_em13_empty = LVL1MenuItem('L1_EM13_EMPTY',ctpid=-1, group='1')\
-                         .setLogic(thr_em13.condition(1)&cosmiccond).setTriggerType(TT_calo|TT_caloem)
-        item_em13i_empty = LVL1MenuItem('L1_EM13I_EMPTY',ctpid=-1, group='1')\
-                          .setLogic(thr_em13i.condition(1)&cosmiccond).setTriggerType(TT_calo|TT_caloem)
-        item_em14_empty = LVL1MenuItem('L1_EM14_EMPTY',ctpid=-1, group='1')\
-                         .setLogic(thr_em14.condition(1)&cosmiccond).setTriggerType(TT_calo|TT_caloem)        
-        item_em18_empty = LVL1MenuItem('L1_EM18_EMPTY',ctpid=-1, group='1')\
-                         .setLogic(thr_em18.condition(1)&cosmiccond).setTriggerType(TT_calo|TT_caloem)
-
-        item_em3_bgrp1   = LVL1MenuItem('L1_EM3_BGRP1', ctpid=-1, group='1')\
-                           .setLogic(thr_em3.condition(1)&Logic(bgrp0)&Logic(bgrp1)).setTriggerType(TT_calo|TT_caloem)
-        item_em3_bgrp3   = LVL1MenuItem('L1_EM3_BGRP3',   ctpid=-1, group='1')\
-                           .setLogic(thr_em3.condition(1)&Logic(bgrp0)&Logic(bgrp3)).setTriggerType(TT_calo|TT_caloem)
-        item_em3_bgrp1_bptx   = LVL1MenuItem('L1_EM3_BGRP1_BPTX',   ctpid=-1, group='1')\
-                                .setLogic(thr_em3.condition(1)&Logic(bgrp0)&Logic(bgrp1)&(thr_bptx0.condition(1)|thr_bptx1.condition(1))).setTriggerType(TT_calo|TT_caloem)
-
-        item_2em2   = LVL1MenuItem('L1_2EM2',   ctpid=-1).setLogic(thr_em2.condition(2)&physcond).setTriggerType(TT_calo|TT_caloem)        
-        item_2em3   = LVL1MenuItem('L1_2EM3',   ctpid=0xa).setLogic(thr_em3.condition(2)&physcond).setTriggerType(TT_calo|TT_caloem)
-        item_2em5   = LVL1MenuItem('L1_2EM5',   ctpid=0xb).setLogic(thr_em5.condition(2)&physcond).setTriggerType(TT_calo|TT_caloem)        
-        item_2em6   = LVL1MenuItem('L1_2EM6',   ctpid=-1).setLogic(thr_em6.condition(2)&physcond).setTriggerType(TT_calo|TT_caloem)
-        item_2em5i  = LVL1MenuItem('L1_2EM5I',  ctpid=-1).setLogic(thr_em5i.condition(2)&physcond).setTriggerType(TT_calo|TT_caloem)        
-        item_2em7   = LVL1MenuItem('L1_2EM7',   ctpid=0xb).setLogic(thr_em7.condition(2)&physcond).setTriggerType(TT_calo|TT_caloem)
-        item_2em8   = LVL1MenuItem('L1_2EM8',   ctpid=-1).setLogic(thr_em8.condition(2)&physcond).setTriggerType(TT_calo|TT_caloem)
-        item_2em10  = LVL1MenuItem('L1_2EM10',  ctpid=0xc).setLogic(thr_em10.condition(2)&physcond).setTriggerType(TT_calo|TT_caloem)
-        item_2em10i = LVL1MenuItem('L1_2EM10I', ctpid=0xe).setLogic(thr_em10i.condition(2)&physcond).setTriggerType(TT_calo|TT_caloem)
-        item_2em10vh= LVL1MenuItem('L1_2EM10VH', ctpid=-1).setLogic(thr_em10vh.condition(2)&physcond).setTriggerType(TT_calo|TT_caloem)
-        item_2em10h=  LVL1MenuItem('L1_2EM10H', ctpid=-1).setLogic(thr_em10h.condition(2)&physcond).setTriggerType(TT_calo|TT_caloem)
-        item_2em11h=  LVL1MenuItem('L1_2EM11H', ctpid=-1).setLogic(thr_em11h.condition(2)&physcond).setTriggerType(TT_calo|TT_caloem)
-        item_2em12  = LVL1MenuItem('L1_2EM12',  ctpid=0xf).setLogic(thr_em12.condition(2)&physcond).setTriggerType(TT_calo|TT_caloem)
-        item_2em13  = LVL1MenuItem('L1_2EM13',  ctpid=0xd).setLogic(thr_em13.condition(2)&physcond).setTriggerType(TT_calo|TT_caloem)
-        item_2em13i = LVL1MenuItem('L1_2EM13I', ctpid=0xe).setLogic(thr_em13i.condition(2)&physcond).setTriggerType(TT_calo|TT_caloem)
-        item_2em14  = LVL1MenuItem('L1_2EM14',  ctpid=0xf).setLogic(thr_em14.condition(2)&physcond).setTriggerType(TT_calo|TT_caloem)
-        item_2em14i = LVL1MenuItem('L1_2EM14I', ctpid=0x10).setLogic(thr_em14i.condition(2)&physcond).setTriggerType(TT_calo|TT_caloem)        
-        item_2em18  = LVL1MenuItem('L1_2EM18',  ctpid=0xf).setLogic(thr_em18.condition(2)&physcond).setTriggerType(TT_calo|TT_caloem)
-        item_2em18i = LVL1MenuItem('L1_2EM18I', ctpid=0x10).setLogic(thr_em18i.condition(2)&physcond).setTriggerType(TT_calo|TT_caloem)
-        item_2em19i = LVL1MenuItem('L1_2EM19I', ctpid=0x11).setLogic(thr_em19i.condition(2)&physcond).setTriggerType(TT_calo|TT_caloem)
-        item_2em23i = LVL1MenuItem('L1_2EM23I', ctpid=0x11).setLogic(thr_em23i.condition(2)&physcond).setTriggerType(TT_calo|TT_caloem)        
-
-        item_2em3_em5 = LVL1MenuItem('L1_2EM3_EM5', ctpid=-1).setLogic(thr_em3.condition(2)&thr_em5.condition(1)&physcond).setTriggerType(TT_calo|TT_caloem)
-        item_2em3_em6 = LVL1MenuItem('L1_2EM3_EM6', ctpid=-1).setLogic(thr_em3.condition(2)&thr_em6.condition(1)&physcond).setTriggerType(TT_calo|TT_caloem)
-        item_2em3_em7 = LVL1MenuItem('L1_2EM3_EM7', ctpid=-1).setLogic(thr_em3.condition(2)&thr_em7.condition(1)&physcond).setTriggerType(TT_calo|TT_caloem)
-        item_2em3_em8 = LVL1MenuItem('L1_2EM3_EM8', ctpid=-1).setLogic(thr_em3.condition(2)&thr_em8.condition(1)&physcond).setTriggerType(TT_calo|TT_caloem)
-        item_2em3_em10 = LVL1MenuItem('L1_2EM3_EM10', ctpid=-1).setLogic(thr_em3.condition(2)&thr_em10.condition(1)&physcond).setTriggerType(TT_calo|TT_caloem)
-        item_2em3_em12 = LVL1MenuItem('L1_2EM3_EM12', ctpid=-1).setLogic(thr_em3.condition(2)&thr_em12.condition(1)&physcond).setTriggerType(TT_calo|TT_caloem)
-        item_2em3_em13 = LVL1MenuItem('L1_2EM3_EM13', ctpid=-1).setLogic(thr_em3.condition(2)&thr_em13.condition(1)&physcond).setTriggerType(TT_calo|TT_caloem)
-        item_2em5_em10 = LVL1MenuItem('L1_2EM5_EM10', ctpid=-1).setLogic(thr_em5.condition(2)&thr_em10.condition(1)&physcond).setTriggerType(TT_calo|TT_caloem)
-        item_2em5_em10vh = LVL1MenuItem('L1_2EM5_EM10VH', ctpid=-1).setLogic(thr_em5.condition(2)&thr_em10vh.condition(1)&physcond).setTriggerType(TT_calo|TT_caloem)
-        item_2em5_em16h  = LVL1MenuItem('L1_2EM5_EM16H', ctpid=-1).setLogic(thr_em5.condition(2)&thr_em16h.condition(1)&physcond).setTriggerType(TT_calo|TT_caloem)
-        item_2em6_em18h  = LVL1MenuItem('L1_2EM6_EM18H', ctpid=-1).setLogic(thr_em6.condition(2)&thr_em18h.condition(1)&physcond).setTriggerType(TT_calo|TT_caloem)
-        item_2em5_em16vh = LVL1MenuItem('L1_2EM5_EM16VH', ctpid=-1).setLogic(thr_em5.condition(2)&thr_em16vh.condition(1)&physcond).setTriggerType(TT_calo|TT_caloem)
-        item_2em6_em16vh = LVL1MenuItem('L1_2EM6_EM16VH', ctpid=-1).setLogic(thr_em6.condition(2)&thr_em16vh.condition(1)&physcond).setTriggerType(TT_calo|TT_caloem)
-        item_3em5_em10 = LVL1MenuItem('L1_3EM5_EM10', ctpid=-1).setLogic(thr_em5.condition(3)&thr_em10.condition(1)&physcond).setTriggerType(TT_calo|TT_caloem)
-        item_3em5_em10vh = LVL1MenuItem('L1_3EM5_EM10VH', ctpid=-1).setLogic(thr_em5.condition(3)&thr_em10vh.condition(1)&physcond).setTriggerType(TT_calo|TT_caloem)
-        item_3em5_em10h = LVL1MenuItem('L1_3EM5_EM10H', ctpid=-1).setLogic(thr_em5.condition(3)&thr_em10h.condition(1)&physcond).setTriggerType(TT_calo|TT_caloem)
-        item_3em6_em10vh = LVL1MenuItem('L1_3EM6_EM10VH', ctpid=-1).setLogic(thr_em6.condition(3)&thr_em10vh.condition(1)&physcond).setTriggerType(TT_calo|TT_caloem)
-        item_3em6_em14vh = LVL1MenuItem('L1_3EM6_EM14VH', ctpid=-1).setLogic(thr_em6.condition(3)&thr_em14vh.condition(1)&physcond).setTriggerType(TT_calo|TT_caloem)
-        item_3em6_em11h = LVL1MenuItem('L1_3EM6_EM11H', ctpid=-1).setLogic(thr_em6.condition(3)&thr_em11h.condition(1)&physcond).setTriggerType(TT_calo|TT_caloem)
-        item_2em5_em12 = LVL1MenuItem('L1_2EM5_EM12', ctpid=-1).setLogic(thr_em5.condition(2)&thr_em12.condition(1)&physcond).setTriggerType(TT_calo|TT_caloem)
-        item_2em7_em10 = LVL1MenuItem('L1_2EM7_EM10', ctpid=-1).setLogic(thr_em7.condition(2)&thr_em10.condition(1)&physcond).setTriggerType(TT_calo|TT_caloem)
-        item_2em7_em10vh = LVL1MenuItem('L1_2EM7_EM10VH', ctpid=-1).setLogic(thr_em7.condition(2)&thr_em10vh.condition(1)&physcond).setTriggerType(TT_calo|TT_caloem)
-        item_2em12_em16v = LVL1MenuItem('L1_2EM12_EM16V', ctpid=-1).setLogic(thr_em12.condition(2)&thr_em16v.condition(1)&physcond).setTriggerType(TT_calo|TT_caloem)
-
-        item_3em5   = LVL1MenuItem('L1_3EM5', ctpid=0x13).setLogic(thr_em5.condition(3)&physcond).setTriggerType(TT_phys).setTriggerType(TT_calo|TT_caloem)
-        item_3em6   = LVL1MenuItem('L1_3EM6', ctpid=-1).setLogic(thr_em6.condition(3)&physcond).setTriggerType(TT_phys).setTriggerType(TT_calo|TT_caloem)
-        item_3em7   = LVL1MenuItem('L1_3EM7', ctpid=0x13).setLogic(thr_em7.condition(3)&physcond).setTriggerType(TT_phys).setTriggerType(TT_calo|TT_caloem)
-        item_3em10   = LVL1MenuItem('L1_3EM10', ctpid=0x14).setLogic(thr_em10.condition(3)&physcond).setTriggerType(TT_phys).setTriggerType(TT_calo|TT_caloem)
-        item_3em13   = LVL1MenuItem('L1_3EM13', ctpid=0x14).setLogic(thr_em13.condition(3)&physcond).setTriggerType(TT_phys).setTriggerType(TT_calo|TT_caloem)
-
-        item_2em3_empty   = LVL1MenuItem('L1_2EM3_EMPTY',  ctpid=-1).setLogic(thr_em3.condition(2)&cosmiccond).setTriggerType(TT_calo|TT_caloem)
-        item_2em4_empty   = LVL1MenuItem('L1_2EM4_EMPTY',  ctpid=-1).setLogic(thr_em4.condition(2)&cosmiccond).setTriggerType(TT_calo|TT_caloem)
-        item_2em5_empty   = LVL1MenuItem('L1_2EM5_EMPTY',  ctpid=-1).setLogic(thr_em5.condition(2)&cosmiccond).setTriggerType(TT_calo|TT_caloem)
-        item_2em5_empty   = LVL1MenuItem('L1_2EM5_EMPTY',  ctpid=-1).setLogic(thr_em5.condition(2)&cosmiccond).setTriggerType(TT_calo|TT_caloem)        
-        item_2em5i_empty  = LVL1MenuItem('L1_2EM5I_EMPTY', ctpid=-1).setLogic(thr_em5i.condition(2)&cosmiccond).setTriggerType(TT_calo|TT_caloem)        
-        item_2em7_empty   = LVL1MenuItem('L1_2EM7_EMPTY',  ctpid=-1).setLogic(thr_em7.condition(2)&cosmiccond).setTriggerType(TT_calo|TT_caloem)        
-        item_2em7i_empty  = LVL1MenuItem('L1_2EM7I_EMPTY', ctpid=-1).setLogic(thr_em7i.condition(2)&cosmiccond).setTriggerType(TT_calo|TT_caloem)
-        item_2em10_empty  = LVL1MenuItem('L1_2EM10_EMPTY', ctpid=-1).setLogic(thr_em10.condition(2)&cosmiccond).setTriggerType(TT_calo|TT_caloem)
-
-        # Transient items that don't need constant CTPID
-        item_em3_bptx   = LVL1MenuItem('L1_EM3_BPTX',   ctpid=-1, group='1')\
-                          .setLogic(thr_em3.condition(1)&(thr_bptx0.condition(1)|thr_bptx1.condition(1))&physcond)\
-                          .setTriggerType(TT_calo|TT_caloem)
-        
-        item_em4   = LVL1MenuItem('L1_EM4',   ctpid=0x54, group='1').setLogic(thr_em4.condition(1)&physcond).setTriggerType(TT_calo|TT_caloem)
-        item_em23  = LVL1MenuItem('L1_EM23',  ctpid=-1,   group='1').setLogic(thr_em23.condition(1)&physcond).setTriggerType(TT_calo|TT_caloem)
-        item_em5i  = LVL1MenuItem('L1_EM5I',  ctpid=0x55, group='1').setLogic(thr_em5i.condition(1)&physcond).setTriggerType(TT_calo|TT_caloem)
-        item_em7i  = LVL1MenuItem('L1_EM7I',  ctpid=0x55, group='1').setLogic(thr_em7i.condition(1)&physcond).setTriggerType(TT_calo|TT_caloem)
-        item_2em4  = LVL1MenuItem('L1_2EM4',  ctpid=0x56).setLogic(thr_em4.condition(2)&physcond).setTriggerType(TT_calo|TT_caloem)
-        item_2em7i = LVL1MenuItem('L1_2EM7I', ctpid=0x57).setLogic(thr_em7i.condition(2)&physcond).setTriggerType(TT_calo|TT_caloem)
-        
-        # MUON ctpid=[0x20;0x2f]
-        item_mu0  = LVL1MenuItem('L1_MU0',  ctpid=0x20, group='1')\
-                    .setLogic(thr_mu0.condition(1)&physcond)\
-                    .setTriggerType(TT_rpcin)
-        item_mu4  = LVL1MenuItem('L1_MU4',  ctpid=-1, group='1')\
-                    .setLogic(thr_mu4.condition(1)&physcond)\
-                    .setTriggerType(TT_rpcin)
-        item_mu6  = LVL1MenuItem('L1_MU6',  ctpid=0x21, group='1')\
-                    .setLogic(thr_mu6.condition(1)&physcond)\
-                    .setTriggerType(TT_rpcin)
-        item_mu10 = LVL1MenuItem('L1_MU10', ctpid=0x22, group='1')\
-                    .setLogic(thr_mu10.condition(1)&physcond)\
-                    .setTriggerType(TT_rpcin)
-        item_mu11 = LVL1MenuItem('L1_MU11', ctpid=0x23, group='1')\
-                    .setLogic(thr_mu11.condition(1)&physcond)\
-                    .setTriggerType(TT_rpcin)
-        item_mu20 = LVL1MenuItem('L1_MU20', ctpid=0x24, group='1')\
-                    .setLogic(thr_mu20.condition(1)&physcond)\
-                    .setTriggerType(TT_rpcin)
-        item_mu40 = LVL1MenuItem('L1_MU40', ctpid=0x25, group='1')\
-                    .setLogic(thr_mu40.condition(1)&physcond)\
-                    .setTriggerType(TT_rpcin)
-
-        item_mub  = LVL1MenuItem('L1_MUB',  ctpid=-1, group='1')\
-                    .setLogic(thr_nim_mub.condition(1)&physcond)\
-                    .setTriggerType(TT_rpcin)
-        item_mue  = LVL1MenuItem('L1_MUE',  ctpid=-1, group='1')\
-                    .setLogic(thr_nim_mue.condition(1)&physcond)\
-                    .setTriggerType(TT_rpcin)
-
-
-        item_2mu4_barrelonly  = LVL1MenuItem('L1_2MU4_BARRELONLY',  ctpid=-1, group='1', prescale=1)\
-                                .setLogic( (thr_mu4.condition(2)&Not(thr_nim_mue.condition(1))|thr_mu4.condition(3))&physcond)\
-                                .setTriggerType(TT_rpcin)
-
-        item_2mu4_mu6_barrel  = LVL1MenuItem('L1_2MU4_MU6_BARREL',  ctpid=-1, group='1', prescale=1)\
-                                .setLogic( (thr_mu4.condition(2)&thr_nim_mub.condition(1)&thr_mu6.condition(1))&physcond)\
-                                .setTriggerType(TT_rpcin)
-
-        item_2mu4_barrel  = LVL1MenuItem('L1_2MU4_BARREL',  ctpid=-1, group='1', prescale=1)\
-                            .setLogic( (thr_mu4.condition(2)&thr_nim_mub.condition(1))&physcond)\
-                            .setTriggerType(TT_rpcin)
-
-        item_mu0_comm = LVL1MenuItem('L1_MU0_COMM', ctpid=-1, group='1')\
-                        .setLogic(thr_mu0_comm.condition(1)&physcond)\
-                        .setTriggerType(TT_rpcin)
-
-        item_mu0_comm_empty = LVL1MenuItem('L1_MU0_COMM_EMPTY', ctpid=-1, group='1')\
-                              .setLogic(thr_mu0_comm.condition(1)&cosmiccond)\
-                              .setTriggerType(TT_rpcout)
-
-
-        item_mu0_empty  = LVL1MenuItem('L1_MU0_EMPTY',  ctpid=-1, group='1')\
-                    .setLogic(thr_mu0.condition(1)&cosmiccond)\
-                    .setTriggerType(TT_rpcout)
-        item_mu4_empty  = LVL1MenuItem('L1_MU4_EMPTY',  ctpid=-1, group='1')\
-                          .setLogic(thr_mu4.condition(1)&cosmiccond)\
-                          .setTriggerType(TT_rpcout)
-        
-        item_mu20_firstempty  = LVL1MenuItem('L1_MU20_FIRSTEMPTY',  ctpid=-1, group='1')\
-                                .setLogic(thr_mu20.condition(1)&empty1stcond)\
-                                .setTriggerType(TT_rpcout)
-
-        item_2mu6_empty  = LVL1MenuItem('L1_2MU6_EMPTY',  ctpid=-1, group='1')\
-                    .setLogic(thr_mu6.condition(2)&cosmiccond)\
-                    .setTriggerType(TT_rpcout)
-
-        item_mu0_j15_empty  = LVL1MenuItem('L1_MU0_J15_EMPTY',  ctpid=-1, group='1')\
-                    .setLogic(thr_mu0.condition(1)&thr_j15.condition(1)&cosmiccond)\
-                    .setTriggerType(TT_rpcout)
-
-        item_mu4_j15_empty  = LVL1MenuItem('L1_MU4_J15_EMPTY',  ctpid=-1, group='1')\
-                              .setLogic(thr_mu4.condition(1)&thr_j15.condition(1)&cosmiccond)\
-                              .setTriggerType(TT_rpcout)
-
-        item_mu6_empty  = LVL1MenuItem('L1_MU6_EMPTY',  ctpid=-1, group='1')\
-                    .setLogic(thr_mu6.condition(1)&cosmiccond)\
-                    .setTriggerType(TT_rpcout)
-        item_mu15_empty  = LVL1MenuItem('L1_MU15_EMPTY',  ctpid=-1, group='1')\
-                    .setLogic(thr_mu15.condition(1)&cosmiccond)\
-                    .setTriggerType(TT_rpcout)
-        
-        item_mu10_empty  = LVL1MenuItem('L1_MU10_EMPTY',  ctpid=-1, group='1')\
-                          .setLogic(thr_mu10.condition(1)&cosmiccond)\
-                          .setTriggerType(TT_rpcout)
-        item_mu20_empty  = LVL1MenuItem('L1_MU20_EMPTY',  ctpid=-1, group='1')\
-                          .setLogic(thr_mu20.condition(1)&cosmiccond)\
-                          .setTriggerType(TT_rpcout)
-        
-        item_mu0_tgc_halo  = LVL1MenuItem('L1_MU0_TGC_HALO',  ctpid=0x58, group='1', prescale=1)\
-                             .setLogic(thr_mu0_tgc_halo.condition(1)&physcond)\
-                             .setTriggerType(TT_tgc)
-        item_mu0_low_rpc  = LVL1MenuItem('L1_MU0_LOW_RPC',  ctpid=0x59, group='1', prescale=1)\
-                            .setLogic(thr_mu0_low_rpc.condition(1)&physcond)\
-                            .setTriggerType(TT_rpcin)
-        item_mu6_rpc = LVL1MenuItem('L1_MU6_RPC', ctpid=0x5a, group='1', prescale=1)\
-                       .setLogic(thr_mu6_rpc.condition(1)&physcond)\
-                       .setTriggerType(TT_rpcin)
-        item_mu0_tgc = LVL1MenuItem('L1_MU0_TGC', ctpid=0x5b, group='1', prescale=1)\
-                       .setLogic(thr_mu0_tgc.condition(1)&physcond)\
-                       .setTriggerType(TT_tgc)
-        item_mu6_tgc = LVL1MenuItem('L1_MU6_TGC', ctpid=0x5c, group='1', prescale=1)\
-                       .setLogic(thr_mu6_tgc.condition(1)&physcond)\
-                       .setTriggerType(TT_tgc)
-        item_mu0_high_rpc = LVL1MenuItem('L1_MU0_HIGH_RPC', ctpid=0x5d, group='1', prescale=1)\
-                            .setLogic(thr_mu0_high_rpc.condition(1)&physcond)\
-                            .setTriggerType(TT_rpcin)
-
-
-
-        item_mu0_low = LVL1MenuItem('L1_MU0_LOW', ctpid=0x73, group='1', prescale=1)\
-                       .setLogic((thr_mu0_low_rpc.condition(1)|thr_mu0_tgc.condition(1))&physcond)\
-                       .setTriggerType(0)
-
-
-
-        item_mu0_tgc_halo_bptx  = LVL1MenuItem('L1_MU0_TGC_HALO_BPTX',  ctpid=0x9a, group='1', prescale=1)\
-                                  .setLogic(thr_mu0_tgc_halo.condition(1)&(thr_bptx0.condition(1)|thr_bptx1.condition(1))&physcond)\
-                                  .setTriggerType(TT_tgc)
-        item_mu0_low_rpc_bptx  = LVL1MenuItem('L1_MU0_LOW_RPC_BPTX',  ctpid=0x9b, group='1', prescale=1)\
-                                 .setLogic(thr_mu0_low_rpc.condition(1)&(thr_bptx0.condition(1)|thr_bptx1.condition(1))&physcond)\
-                                 .setTriggerType(TT_rpcin)
-        item_mu6_rpc_bptx = LVL1MenuItem('L1_MU6_RPC_BPTX', ctpid=0x9c, group='1', prescale=1)\
-                            .setLogic(thr_mu6_rpc.condition(1)&(thr_bptx0.condition(1)|thr_bptx1.condition(1))&physcond)\
-                            .setTriggerType(TT_rpcin)
-        item_mu0_tgc_bptx = LVL1MenuItem('L1_MU0_TGC_BPTX', ctpid=0x9d, group='1', prescale=1)\
-                            .setLogic(thr_mu0_tgc.condition(1)&(thr_bptx0.condition(1)|thr_bptx1.condition(1))&physcond)\
-                            .setTriggerType(TT_tgc)
-        item_mu6_tgc_bptx = LVL1MenuItem('L1_MU6_TGC_BPTX', ctpid=0x9e, group='1', prescale=1)\
-                            .setLogic(thr_mu6_tgc.condition(1)&(thr_bptx0.condition(1)|thr_bptx1.condition(1))&physcond)\
-                            .setTriggerType(TT_tgc)
-        item_mu0_high_rpc_bptx = LVL1MenuItem('L1_MU0_HIGH_RPC_BPTX', ctpid=0x9f, group='1', prescale=1)\
-                                 .setLogic(thr_mu0_high_rpc.condition(1)&(thr_bptx0.condition(1)|thr_bptx1.condition(1))&physcond)\
-                                 .setTriggerType(TT_rpcin)
-        
-
-        item_mu0_tgc_halo_empty  = LVL1MenuItem('L1_MU0_TGC_HALO_EMPTY',  ctpid=-1, group='1', prescale=1)\
-                                   .setLogic(thr_mu0_tgc_halo.condition(1)&cosmiccond)\
-                                   .setTriggerType(TT_rpcout)
-        item_mu0_low_rpc_empty  = LVL1MenuItem('L1_MU0_LOW_RPC_EMPTY',  ctpid=-1, group='1', prescale=1)\
-                                  .setLogic(thr_mu0_low_rpc.condition(1)&cosmiccond)\
-                                  .setTriggerType(TT_rpcout)
-        item_mu0_tgc_empty = LVL1MenuItem('L1_MU0_TGC_EMPTY', ctpid=-1, group='1', prescale=1)\
-                             .setLogic(thr_mu0_tgc.condition(1)&cosmiccond)\
-                             .setTriggerType(TT_rpcout)
-        item_mu0_high_rpc_empty = LVL1MenuItem('L1_MU0_HIGH_RPC_EMPTY', ctpid=-1, group='1', prescale=1)\
-                                  .setLogic(thr_mu0_high_rpc.condition(1)&cosmiccond)\
-                                  .setTriggerType(TT_rpcout)
-        
-        item_2mu0  = LVL1MenuItem('L1_2MU0',  ctpid=0x26).setLogic(thr_mu0.condition(2)&physcond)\
-                     .setTriggerType(TT_rpcin)
-        item_2mu4  = LVL1MenuItem('L1_2MU4',  ctpid=-1).setLogic(thr_mu4.condition(2)&physcond).setTriggerType(TT_rpcin)
-        item_2mu6  = LVL1MenuItem('L1_2MU6',  ctpid=0x27).setLogic(thr_mu6.condition(2)&physcond).setTriggerType(TT_rpcin)
-        item_2mu10 = LVL1MenuItem('L1_2MU10', ctpid=0x28).setLogic(thr_mu10.condition(2)&physcond).setTriggerType(TT_rpcin)
-        item_2mu11 = LVL1MenuItem('L1_2MU11', ctpid=0x28).setLogic(thr_mu11.condition(2)&physcond).setTriggerType(TT_rpcin)
-        item_2mu15 = LVL1MenuItem('L1_2MU15', ctpid=0x29).setLogic(thr_mu15.condition(2)&physcond)
-        item_2mu20 = LVL1MenuItem('L1_2MU20', ctpid=0x2a).setLogic(thr_mu20.condition(2)&physcond)
-        item_3mu0  = LVL1MenuItem('L1_3MU0',  ctpid=-1).setLogic(thr_mu0.condition(3)&physcond)
-        item_3mu4  = LVL1MenuItem('L1_3MU4',  ctpid=-1).setLogic(thr_mu4.condition(3)&physcond)
-        item_3mu6  = LVL1MenuItem('L1_3MU6',  ctpid=0x2b).setLogic(thr_mu6.condition(3)&physcond)
-        item_4mu0  = LVL1MenuItem('L1_4MU0',  ctpid=-1).setLogic(thr_mu0.condition(4)&physcond)
-        item_2mu0_mu6 = LVL1MenuItem('L1_2MU0_MU6', ctpid=0x2c)\
-                        .setLogic(thr_mu0.condition(2)&thr_mu6.condition(1)&physcond)\
-                        .setTriggerType(TT_rpcin)
-        item_2mu4_mu6 = LVL1MenuItem('L1_2MU4_MU6', ctpid=-1)\
-                        .setLogic(thr_mu4.condition(2)&thr_mu6.condition(1)&physcond)\
-                        .setTriggerType(TT_rpcin)
-        item_mu0_mu6 = LVL1MenuItem('L1_MU0_MU6', ctpid=0x2c)\
-                        .setLogic(thr_mu0.condition(1)&thr_mu6.condition(1)&physcond)\
-                        .setTriggerType(TT_rpcin)
-        item_2mu0_empty  = LVL1MenuItem('L1_2MU0_EMPTY',  ctpid=-1).setLogic(thr_mu0.condition(2)&cosmiccond).setTriggerType(TT_rpcout)
-        item_2mu4_empty  = LVL1MenuItem('L1_2MU4_EMPTY',  ctpid=-1).setLogic(thr_mu4.condition(2)&cosmiccond).setTriggerType(TT_rpcout)
-        item_mu11_empty  = LVL1MenuItem('L1_MU11_EMPTY',  ctpid=-1).setLogic(thr_mu11.condition(1)&cosmiccond).setTriggerType(TT_rpcout)
-
-        item_2mu4_xe40 = LVL1MenuItem('L1_2MU4_XE40', ctpid=-1)\
-                         .setLogic(thr_mu4.condition(2)&thr_xe40.condition(1)&physcond).setTriggerType(TT_calo|TT_rpcin)
-        item_2mu4_xe30 = LVL1MenuItem('L1_2MU4_XE30', ctpid=-1)\
-                         .setLogic(thr_mu4.condition(2)&thr_xe30.condition(1)&physcond).setTriggerType(TT_calo|TT_rpcin)
-
-
-        item_2mu6_barrelonly  = LVL1MenuItem('L1_2MU6_BARRELONLY',  ctpid=-1, group='1', prescale=1)\
-                                .setLogic( (thr_mu6.condition(2)&Not(thr_nim_mue.condition(1))|thr_mu6.condition(3))&physcond)\
-                                .setTriggerType(TT_rpcin)
-        
-        item_2mu6_barrel  = LVL1MenuItem('L1_2MU6_BARREL',  ctpid=-1, group='1', prescale=1)\
-                            .setLogic( (thr_mu6.condition(2)&thr_nim_mub.condition(1))&physcond)\
-                            .setTriggerType(TT_rpcin)
-
-        item_2mu6_mu10  = LVL1MenuItem('L1_2MU6_MU10',  ctpid=-1, group='1', prescale=1)\
-                                .setLogic( (thr_mu6.condition(2)&thr_mu10.condition(1))&physcond)\
-                                .setTriggerType(TT_rpcin)
-
-        item_3mu4_mu6  = LVL1MenuItem('L1_3MU4_MU6',  ctpid=-1,group='1', prescale=1)\
-                         .setLogic( (thr_mu4.condition(3)&thr_mu6.condition(1))&physcond)\
-                         .setTriggerType(TT_rpcin)
-
-
-
-        # Transient items
-        item_mu15 = LVL1MenuItem('L1_MU15', ctpid=-1, group='1')\
-                    .setLogic(thr_mu15.condition(1)&physcond)\
-                    .setTriggerType(TT_rpcin)
-
-        # TAU ctpid=[0x40:0x4f]
-        item_tau3   = LVL1MenuItem('L1_TAU3',  ctpid=0x40, group='1')\
-                      .setLogic(thr_tau3.condition(1)&physcond).setTriggerType(TT_calo)
-        item_tau5   = LVL1MenuItem('L1_TAU5',  ctpid=0x40, group='1')\
-                      .setLogic(thr_tau5.condition(1)&physcond).setTriggerType(TT_calo)
-        item_tau6   = LVL1MenuItem('L1_TAU6',  ctpid=0x41, group='1')\
-                      .setLogic(thr_tau6.condition(1)&physcond).setTriggerType(TT_calo)
-        item_tau9  = LVL1MenuItem('L1_TAU9', ctpid=0x42, group='1')\
-                      .setLogic(thr_tau9.condition(1)&physcond).setTriggerType(TT_calo)
-        item_tau9i  = LVL1MenuItem('L1_TAU9I', ctpid=0x43, group='1')\
-                      .setLogic(thr_tau9i.condition(1)&physcond).setTriggerType(TT_calo)
-#        item_tau11i = LVL1MenuItem('L1_TAU11I',  ctpid=0x44, group='1')\
-#                      .setLogic(thr_tau11i.condition(1)&Logic(bgrp0)&Logic(bgrp1)).setTriggerType(TT_calo)
-
-        item_tau15 = LVL1MenuItem('L1_TAU15', ctpid=-1, group='1')\
-                      .setLogic(thr_tau15.condition(1)&physcond).setTriggerType(TT_calo)
-        item_tau16 = LVL1MenuItem('L1_TAU16', ctpid=0x45, group='1')\
-                      .setLogic(thr_tau16.condition(1)&physcond).setTriggerType(TT_calo)
-        item_tau16i = LVL1MenuItem('L1_TAU16I', ctpid=0x46, group='1')\
-                      .setLogic(thr_tau16i.condition(1)&physcond).setTriggerType(TT_calo)
-        item_tau25  = LVL1MenuItem('L1_TAU25', ctpid=0x47, group='1')\
-                      .setLogic(thr_tau25.condition(1)&physcond).setTriggerType(TT_calo)
-#        item_tau25i = LVL1MenuItem('L1_TAU25I', ctpid=0x48, group='1')\
-#                      .setLogic(thr_tau25i.condition(1)&Logic(bgrp0)&Logic(bgrp1)).setTriggerType(TT_calo)
-        item_tau40  = LVL1MenuItem('L1_TAU40', ctpid=0x49, group='1')\
-                      .setLogic(thr_tau40.condition(1)&physcond).setTriggerType(TT_calo)
-
-        # TAU
-        # - Add/remap new L1 thresholds:
-        #   TAU5->TAU5, TAU6->TAU5, TAU9->TAU6, TAU9I->TAU6I, TAU16->TAU11, TAU16I->TAU11I, TAU25->TAU11, TAU40->TAU20
-        #   
-        item_tau6i   = LVL1MenuItem('L1_TAU6I',  ctpid=0x42, group='1')\
-                       .setLogic(thr_tau6i.condition(1)&physcond).setTriggerType(TT_calo)
-        item_tau8   = LVL1MenuItem('L1_TAU8',  ctpid=0x43, group='1')\
-                      .setLogic(thr_tau8.condition(1)&physcond).setTriggerType(TT_calo)
-        item_tau8v   = LVL1MenuItem('L1_TAU8V',  ctpid=0x43, group='1')\
-                       .setLogic(thr_tau8v.condition(1)&physcond).setTriggerType(TT_calo)
-        item_tau8i   = LVL1MenuItem('L1_TAU8I',  ctpid=0x43, group='1')\
-                       .setLogic(thr_tau8i.condition(1)&physcond).setTriggerType(TT_calo)
-        item_tau8vi   = LVL1MenuItem('L1_TAU8VI',  ctpid=0x43, group='1')\
-                        .setLogic(thr_tau8vi.condition(1)&physcond).setTriggerType(TT_calo)
-        item_2tau8   = LVL1MenuItem('L1_2TAU8',  ctpid=-1, group='1')\
-                      .setLogic(thr_tau8.condition(2)&physcond).setTriggerType(TT_calo)
-        item_2tau8_tau11   = LVL1MenuItem('L1_2TAU8_TAU11',  ctpid=0x43, group='1')\
-                             .setLogic(thr_tau8.condition(2)&thr_tau11.condition(1)&physcond).setTriggerType(TT_calo)
-        item_2tau8i_tau11  = LVL1MenuItem('L1_2TAU8I_TAU11',  ctpid=0x43, group='1')\
-                             .setLogic(thr_tau8i.condition(2)&thr_tau11.condition(1)&physcond).setTriggerType(TT_calo)
-        item_2tau8i_tau15  = LVL1MenuItem('L1_2TAU8I_TAU15',  ctpid=0x43, group='1')\
-                             .setLogic(thr_tau8i.condition(2)&thr_tau15.condition(1)&physcond).setTriggerType(TT_calo)
-        item_tau11   = LVL1MenuItem('L1_TAU11',  ctpid=0x44, group='1')\
-                       .setLogic(thr_tau11.condition(1)&physcond).setTriggerType(TT_calo)
-        item_tau11v   = LVL1MenuItem('L1_TAU11V',  ctpid=0x44, group='1')\
-                        .setLogic(thr_tau11v.condition(1)&physcond).setTriggerType(TT_calo)
-        item_tau11i   = LVL1MenuItem('L1_TAU11I',  ctpid=0x45, group='1')\
-                      .setLogic(thr_tau11i.condition(1)&physcond).setTriggerType(TT_calo)
-        item_tau15i = LVL1MenuItem('L1_TAU15I', ctpid=-1, group='1')\
-                     .setLogic(thr_tau15i.condition(1)&physcond).setTriggerType(TT_calo)
-        item_tau20   = LVL1MenuItem('L1_TAU20',  ctpid=0x46, group='1')\
-                      .setLogic(thr_tau20.condition(1)&physcond).setTriggerType(TT_calo)
-        item_tau30   = LVL1MenuItem('L1_TAU30',  ctpid=0x47, group='1')\
-                      .setLogic(thr_tau30.condition(1)&physcond).setTriggerType(TT_calo)
-        item_tau30i   = LVL1MenuItem('L1_TAU30I',  ctpid=-1, group='1')\
-                       .setLogic(thr_tau30i.condition(1)&physcond).setTriggerType(TT_calo)
-        item_tau30_notem12 = LVL1MenuItem('L1_TAU30_NOTEM12', ctpid=-1, group='1', prescale=1)\
-                             .setLogic(thr_tau30.condition(1)&Not(thr_em12.condition(1))&physcond)\
-                             .setTriggerType(TT_calo|TT_caloem)
-        item_tau50   = LVL1MenuItem('L1_TAU50',  ctpid=-1, group='1')\
-                      .setLogic(thr_tau50.condition(1)&physcond).setTriggerType(TT_calo)
-        item_tau5_empty = LVL1MenuItem('L1_TAU5_EMPTY',  ctpid=-1, group='1')\
-                          .setLogic(thr_tau5.condition(1)&cosmiccond).setTriggerType(TT_calo)
-        item_tau6_empty = LVL1MenuItem('L1_TAU6_EMPTY',  ctpid=-1, group='1')\
-                          .setLogic(thr_tau6.condition(1)&cosmiccond).setTriggerType(TT_calo)
-        item_tau6i_empty = LVL1MenuItem('L1_TAU6I_EMPTY',  ctpid=-1, group='1')\
-                          .setLogic(thr_tau6i.condition(1)&cosmiccond).setTriggerType(TT_calo)
-        item_tau8_empty = LVL1MenuItem('L1_TAU8_EMPTY',  ctpid=-1, group='1')\
-                          .setLogic(thr_tau8.condition(1)&cosmiccond).setTriggerType(TT_calo)
-        item_tau9_empty = LVL1MenuItem('L1_TAU9_EMPTY',  ctpid=-1, group='1')\
-                          .setLogic(thr_tau9.condition(1)&cosmiccond).setTriggerType(TT_calo)
-        item_tau9i_empty = LVL1MenuItem('L1_TAU9I_EMPTY',  ctpid=-1, group='1')\
-                          .setLogic(thr_tau9i.condition(1)&cosmiccond).setTriggerType(TT_calo)
-        item_tau11_empty = LVL1MenuItem('L1_TAU11_EMPTY',  ctpid=-1, group='1')\
-                          .setLogic(thr_tau11.condition(1)&cosmiccond).setTriggerType(TT_calo)
-        item_tau11i_empty = LVL1MenuItem('L1_TAU11I_EMPTY',  ctpid=-1, group='1')\
-                          .setLogic(thr_tau11i.condition(1)&cosmiccond).setTriggerType(TT_calo)        
-        item_tau16_empty = LVL1MenuItem('L1_TAU16_EMPTY',  ctpid=-1, group='1')\
-                          .setLogic(thr_tau16.condition(1)&cosmiccond).setTriggerType(TT_calo)
-        item_tau16i_empty = LVL1MenuItem('L1_TAU16I_EMPTY',  ctpid=-1, group='1')\
-                          .setLogic(thr_tau16i.condition(1)&cosmiccond).setTriggerType(TT_calo)
-        item_tau20_empty = LVL1MenuItem('L1_TAU20_EMPTY',  ctpid=-1, group='1')\
-                          .setLogic(thr_tau20.condition(1)&cosmiccond).setTriggerType(TT_calo)
-        item_tau25_empty = LVL1MenuItem('L1_TAU25_EMPTY',  ctpid=-1, group='1')\
-                          .setLogic(thr_tau25.condition(1)&cosmiccond).setTriggerType(TT_calo)
-        item_tau30_empty = LVL1MenuItem('L1_TAU30_EMPTY',  ctpid=-1, group='1')\
-                          .setLogic(thr_tau30.condition(1)&cosmiccond).setTriggerType(TT_calo)
-        item_tau5_bgrp1   = LVL1MenuItem('L1_TAU5_BGRP1', ctpid=-1, group='1')\
-                           .setLogic(thr_tau5.condition(1)&Logic(bgrp0)&Logic(bgrp1)).setTriggerType(TT_calo)
-        item_tau5_bgrp3   = LVL1MenuItem('L1_TAU5_BGRP3',   ctpid=-1, group='1')\
-                           .setLogic(thr_tau5.condition(1)&Logic(bgrp0)&Logic(bgrp3)).setTriggerType(TT_calo)
-        item_tau5_bgrp1_bptx   = LVL1MenuItem('L1_TAU5_BGRP1_BPTX',   ctpid=-1, group='1')\
-                                .setLogic(thr_tau5.condition(1)&Logic(bgrp0)&Logic(bgrp1)&(thr_bptx0.condition(1)|thr_bptx1.condition(1))).setTriggerType(TT_calo)
-        item_2tau9i = LVL1MenuItem('L1_2TAU9I', ctpid=0x4b, group='1')\
-                      .setLogic(thr_tau9i.condition(2)&physcond).setTriggerType(TT_calo)
-        item_2tau6i = LVL1MenuItem('L1_2TAU6I', ctpid=0x4b, group='1')\
-                      .setLogic(thr_tau6i.condition(2)&physcond).setTriggerType(TT_calo)
-        item_2tau16 = LVL1MenuItem('L1_2TAU16', ctpid=0x4c, group='1')\
-                      .setLogic(thr_tau16.condition(2)&physcond).setTriggerType(TT_calo)
-        item_2tau11 = LVL1MenuItem('L1_2TAU11', ctpid=0x4c, group='1')\
-                      .setLogic(thr_tau11.condition(2)&physcond).setTriggerType(TT_calo)
-        item_2tau16i = LVL1MenuItem('L1_2TAU16I', ctpid=0x4d, group='1')\
-                       .setLogic(thr_tau16i.condition(2)&physcond).setTriggerType(TT_calo)
-        item_2tau11i = LVL1MenuItem('L1_2TAU11I', ctpid=-1, group='1')\
-                       .setLogic(thr_tau11i.condition(2)&physcond).setTriggerType(TT_calo)
-        item_2tau15 = LVL1MenuItem('L1_2TAU15', ctpid=-1, group='1')\
-                      .setLogic(thr_tau15.condition(2)&physcond).setTriggerType(TT_calo)
-
-        item_2tau6_empty = LVL1MenuItem('L1_2TAU6_EMPTY', ctpid=-1, group='1')\
-                            .setLogic(thr_tau6.condition(2)&cosmiccond).setTriggerType(TT_calo)
-        item_2tau6i_empty = LVL1MenuItem('L1_2TAU6I_EMPTY', ctpid=-1, group='1')\
-                            .setLogic(thr_tau6i.condition(2)&cosmiccond).setTriggerType(TT_calo)        
-        item_2tau9_empty = LVL1MenuItem('L1_2TAU9_EMPTY', ctpid=-1, group='1')\
-                            .setLogic(thr_tau9.condition(2)&cosmiccond).setTriggerType(TT_calo)
-        item_2tau9i_empty = LVL1MenuItem('L1_2TAU9I_EMPTY', ctpid=-1, group='1')\
-                            .setLogic(thr_tau9i.condition(2)&cosmiccond).setTriggerType(TT_calo)
-        item_2tau11_empty = LVL1MenuItem('L1_2TAU11_EMPTY', ctpid=-1, group='1')\
-                            .setLogic(thr_tau11.condition(2)&cosmiccond).setTriggerType(TT_calo)
-        item_2tau20       = LVL1MenuItem('L1_2TAU20', ctpid=-1, group='1')\
-                            .setLogic(thr_tau20.condition(2)&physcond).setTriggerType(TT_calo)
-        item_2tau11i_empty = LVL1MenuItem('L1_2TAU11I_EMPTY', ctpid=-1, group='1')\
-                            .setLogic(thr_tau11i.condition(2)&cosmiccond).setTriggerType(TT_calo)        
-        item_2tau16_empty = LVL1MenuItem('L1_2TAU16_EMPTY', ctpid=-1, group='1')\
-                            .setLogic(thr_tau16.condition(2)&cosmiccond).setTriggerType(TT_calo)
-        item_2tau16i_empty = LVL1MenuItem('L1_2TAU16I_EMPTY', ctpid=-1, group='1')\
-                            .setLogic(thr_tau16i.condition(2)&cosmiccond).setTriggerType(TT_calo)
-                
-        # Transient items
-        item_tau5_bptx  = LVL1MenuItem('L1_TAU5_BPTX',  ctpid=-1, group='1')\
-                          .setLogic(thr_tau5.condition(1)&Logic(bgrp0)&(thr_bptx0.condition(1)|thr_bptx1.condition(1)))\
-                          .setTriggerType(TT_calo)
-        item_2tau5 = LVL1MenuItem('L1_2TAU5', ctpid=0x6d, group='1')\
-                     .setLogic(thr_tau5.condition(2)&physcond).setTriggerType(TT_calo)
-        item_2tau6 = LVL1MenuItem('L1_2TAU6', ctpid=-1, group='1')\
-                     .setLogic(thr_tau6.condition(2)&physcond).setTriggerType(TT_calo)
-        
-        item_2tau9 = LVL1MenuItem('L1_2TAU9', ctpid=0x6e, group='1', prescale=1)\
-                     .setLogic(thr_tau9.condition(2)&physcond).setTriggerType(TT_calo)
-        #item_2tau6_tau20 = LVL1MenuItem('L1_2TAU6_TAU25', ctpid=-1, group='1', prescale=10)\
-         #                  .setLogic(thr_tau6.condition(2)&thr_tau25.condition(1)&Logic(bgrp0)&Logic(bgrp1)).setTriggerType(TT_calo)
-        item_2tau25 = LVL1MenuItem('L1_2TAU25', ctpid=-1, group='1', prescale=1)\
-                      .setLogic(thr_tau25.condition(2)&physcond).setTriggerType(TT_calo)
-                
-        # JET ctpid=[0x60:0x7f]
-        item_j5   = LVL1MenuItem('L1_J5',   ctpid=0x60, group='1').setLogic(thr_j5.condition(1)&physcond).setTriggerType(TT_calo)
-        item_j5_win6   = LVL1MenuItem('L1_J5_win6',   ctpid=0x60, group='1').setLogic(thr_j5_win6.condition(1)&physcond).setTriggerType(TT_calo)
-        item_j5_win8   = LVL1MenuItem('L1_J5_win8',   ctpid=0x60, group='1').setLogic(thr_j5_win8.condition(1)&physcond).setTriggerType(TT_calo)
-        item_j10  = LVL1MenuItem('L1_J10',  ctpid=0x61, group='1').setLogic(thr_j10.condition(1)&physcond).setTriggerType(TT_calo)
-        item_j18  = LVL1MenuItem('L1_J18',  ctpid=0x62, group='1').setLogic(thr_j18.condition(1)&physcond).setTriggerType(TT_calo)
-        item_j20  = LVL1MenuItem('L1_J20',  ctpid=-1, group='1').setLogic(thr_j20.condition(1)&physcond).setTriggerType(TT_calo) # njt
-        item_j23  = LVL1MenuItem('L1_J23',  ctpid=0x63, group='1').setLogic(thr_j23.condition(1)&physcond).setTriggerType(TT_calo)
-        item_j35  = LVL1MenuItem('L1_J35',  ctpid=0x64, group='1').setLogic(thr_j35.condition(1)&physcond).setTriggerType(TT_calo)
-        item_j40  = LVL1MenuItem('L1_J40',  ctpid=-1, group='1').setLogic(thr_j40.condition(1)&physcond).setTriggerType(TT_calo) # njt
-        item_j42  = LVL1MenuItem('L1_J42',  ctpid=0x65, group='1').setLogic(thr_j42.condition(1)&physcond).setTriggerType(TT_calo)
-        item_j70  = LVL1MenuItem('L1_J70',  ctpid=0x66, group='1').setLogic(thr_j70.condition(1)&physcond).setTriggerType(TT_calo)
-        item_j100 = LVL1MenuItem('L1_J100',  ctpid=-1, group='1').setLogic(thr_j100.condition(1)&physcond).setTriggerType(TT_calo) # njt
-        item_j120 = LVL1MenuItem('L1_J120', ctpid=0x67, group='1').setLogic(thr_j120.condition(1)&physcond).setTriggerType(TT_calo)
-        item_j130 = LVL1MenuItem('L1_J130',  ctpid=-1, group='1').setLogic(thr_j130.condition(1)&physcond).setTriggerType(TT_calo) # njt
-        item_j150 = LVL1MenuItem('L1_J150',  ctpid=-1, group='1').setLogic(thr_j150.condition(1)&physcond).setTriggerType(TT_calo) # njt
-        item_j15cf = LVL1MenuItem('L1_J15CF',  ctpid=-1, group='1').setLogic(thr_j15cf.condition(1)&physcond).setTriggerType(TT_calo) # njt
-
-        item_j5_bgrp1   = LVL1MenuItem('L1_J5_BGRP1', ctpid=-1, group='1')\
-                           .setLogic(thr_j5.condition(1)&Logic(bgrp0)&Logic(bgrp1)).setTriggerType(TT_calo)
-        item_j5_bgrp3   = LVL1MenuItem('L1_J5_BGRP3',   ctpid=-1, group='1')\
-                           .setLogic(thr_j5.condition(1)&Logic(bgrp0)&Logic(bgrp3)).setTriggerType(TT_calo)
-        item_j5_bgrp1_bptx   = LVL1MenuItem('L1_J5_BGRP1_BPTX',   ctpid=-1, group='1')\
-                                .setLogic(thr_j5.condition(1)&Logic(bgrp0)&Logic(bgrp1)&(thr_bptx0.condition(1)|thr_bptx1.condition(1))).setTriggerType(TT_calo)
-
-	#pPb
-        item_j5_te90   = LVL1MenuItem('L1_J5_TE90',   ctpid=0x60, group='1').setLogic(thr_j5.condition(1)&thr_te90.condition(1)&physcond).setTriggerType(TT_calo)
-        item_2j5_te90   = LVL1MenuItem('L1_2J5_TE90',   ctpid=0x60, group='1').setLogic(thr_j5.condition(2)&thr_te90.condition(1)&physcond).setTriggerType(TT_calo)
-
-        # - Add/remap new L1 thresholds:
-        #   J20->J15, J40->J30, J70->J55, J100->J75, J130->J95, J150->J115
-        item_j15   = LVL1MenuItem('L1_J15',   ctpid=-1, group='1').setLogic(thr_j15.condition(1)&physcond).setTriggerType(TT_calo)
-        item_j20   = LVL1MenuItem('L1_J20',   ctpid=-1, group='1').setLogic(thr_j20.condition(1)&physcond).setTriggerType(TT_calo)
-        item_j30   = LVL1MenuItem('L1_J30',   ctpid=-1, group='1').setLogic(thr_j30.condition(1)&physcond).setTriggerType(TT_calo)
-        item_j50   = LVL1MenuItem('L1_J50',   ctpid=-1, group='1').setLogic(thr_j50.condition(1)&physcond).setTriggerType(TT_calo)
-        item_j55   = LVL1MenuItem('L1_J55',   ctpid=-1, group='1').setLogic(thr_j55.condition(1)&physcond).setTriggerType(TT_calo)
-        item_j75   = LVL1MenuItem('L1_J75',   ctpid=-1, group='1').setLogic(thr_j75.condition(1)&physcond).setTriggerType(TT_calo)
-        item_j95   = LVL1MenuItem('L1_J95',   ctpid=-1, group='1').setLogic(thr_j95.condition(1)&physcond).setTriggerType(TT_calo)
-        item_j115   = LVL1MenuItem('L1_J115',   ctpid=-1, group='1').setLogic(thr_j115.condition(1)&physcond).setTriggerType(TT_calo)
-        item_j175   = LVL1MenuItem('L1_J175',   ctpid=-1, group='1').setLogic(thr_j175.condition(1)&physcond).setTriggerType(TT_calo)
-        item_j250   = LVL1MenuItem('L1_J250',   ctpid=-1, group='1').setLogic(thr_j250.condition(1)&physcond).setTriggerType(TT_calo)
-        
-        item_3j15   = LVL1MenuItem('L1_3J15',   ctpid=-1, group='1').setLogic(thr_j15.condition(3)&physcond).setTriggerType(TT_calo)
-        item_4j15   = LVL1MenuItem('L1_4J15',   ctpid=-1, group='1').setLogic(thr_j15.condition(4)&physcond).setTriggerType(TT_calo)
-        item_5j15   = LVL1MenuItem('L1_5J15',   ctpid=-1, group='1').setLogic(thr_j15.condition(5)&physcond).setTriggerType(TT_calo)
-
-        item_2j5 = LVL1MenuItem('L1_2J5', ctpid=0x68, group='1').setLogic(thr_j5.condition(2)&physcond).setTriggerType(TT_calo)
-        item_2j10 = LVL1MenuItem('L1_2J10', ctpid=-1, group='1').setLogic(thr_j10.condition(2)&physcond).setTriggerType(TT_calo)
-        item_2j10_6 = LVL1MenuItem('L1_2J10_win6', ctpid=0x6a, group='1').setLogic(thr_j10_6.condition(2)&physcond).setTriggerType(TT_calo)
-        item_2j20 = LVL1MenuItem('L1_2J20', ctpid=-1, group='1').setLogic(thr_j20.condition(2)&physcond).setTriggerType(TT_calo)
-        item_2j15 = LVL1MenuItem('L1_2J15', ctpid=-1, group='1').setLogic(thr_j15.condition(2)&physcond).setTriggerType(TT_calo)
-        item_2j18 = LVL1MenuItem('L1_2J18', ctpid=0x6c, group='1').setLogic(thr_j18.condition(2)&physcond).setTriggerType(TT_calo)
-        item_2j40 = LVL1MenuItem('L1_2J40', ctpid=-1, group='1').setLogic(thr_j40.condition(2)&physcond).setTriggerType(TT_calo)
-        item_2j70 = LVL1MenuItem('L1_2J70', ctpid=-1, group='1').setLogic(thr_j70.condition(2)&physcond).setTriggerType(TT_calo)
-        item_2j100 = LVL1MenuItem('L1_2J100', ctpid=-1, group='1').setLogic(thr_j100.condition(2)&physcond).setTriggerType(TT_calo)
-        item_2j30 = LVL1MenuItem('L1_2J30', ctpid=-1, group='1').setLogic(thr_j30.condition(2)&physcond).setTriggerType(TT_calo)
-        item_2j55 = LVL1MenuItem('L1_2J55', ctpid=-1, group='1').setLogic(thr_j55.condition(2)&physcond).setTriggerType(TT_calo)
-        item_2j95 = LVL1MenuItem('L1_2J95', ctpid=-1, group='1').setLogic(thr_j95.condition(2)&physcond).setTriggerType(TT_calo)
-        item_2j75 = LVL1MenuItem('L1_2J75', ctpid=-1, group='1').setLogic(thr_j75.condition(2)&physcond).setTriggerType(TT_calo)
-        
-        item_3j10 = LVL1MenuItem('L1_3J10', ctpid=0x7f, group='1').setLogic(thr_j10.condition(3)&physcond).setTriggerType(TT_calo)
-        item_3j50 = LVL1MenuItem('L1_3J50', ctpid=0x7f, group='1').setLogic(thr_j50.condition(3)&physcond).setTriggerType(TT_calo)
-        item_3j75 = LVL1MenuItem('L1_3J75', ctpid=-1, group='1').setLogic(thr_j75.condition(3)&physcond).setTriggerType(TT_calo)
-        item_3j5 = LVL1MenuItem('L1_3J5', ctpid=0x7f, group='1').setLogic(thr_j5.condition(3)&physcond).setTriggerType(TT_calo)
-        item_3j20 = LVL1MenuItem('L1_3J20', ctpid=-1, group='1').setLogic(thr_j20.condition(3)&physcond).setTriggerType(TT_calo) # new jet threshold
-        item_3j40 = LVL1MenuItem('L1_3J40', ctpid=-1, group='1').setLogic(thr_j40.condition(3)&physcond).setTriggerType(TT_calo) # new jet threshold
-        item_4j10 = LVL1MenuItem('L1_4J10', ctpid=0x6e, group='1').setLogic(thr_j10.condition(4)&physcond).setTriggerType(TT_calo)
-        item_4j5 = LVL1MenuItem('L1_4J5', ctpid=0x6e, group='1').setLogic(thr_j5.condition(4)&physcond).setTriggerType(TT_calo)
-        item_4j20 = LVL1MenuItem('L1_4J20', ctpid=-1, group='1').setLogic(thr_j20.condition(4)&physcond).setTriggerType(TT_calo)
-        item_4j40 = LVL1MenuItem('L1_4J40', ctpid=-1, group='1').setLogic(thr_j40.condition(4)&physcond).setTriggerType(TT_calo)
-        item_3j23 = LVL1MenuItem('L1_3J23', ctpid=0x70, group='1').setLogic(thr_j23.condition(3)&physcond).setTriggerType(TT_calo)
-        item_4j18 = LVL1MenuItem('L1_4J18', ctpid=0x71, group='1').setLogic(thr_j18.condition(4)&physcond).setTriggerType(TT_calo)
-        item_4j23 = LVL1MenuItem('L1_4J23', ctpid=0x72, group='1').setLogic(thr_j23.condition(4)&physcond).setTriggerType(TT_calo)
-        item_3j35 = LVL1MenuItem('L1_3J35', ctpid=0x73, group='1').setLogic(thr_j35.condition(3)&physcond).setTriggerType(TT_calo)
-        item_4j35 = LVL1MenuItem('L1_4J35', ctpid=0x74, group='1').setLogic(thr_j35.condition(4)&physcond).setTriggerType(TT_calo)
-        item_3j42 = LVL1MenuItem('L1_3J42', ctpid=0x75, group='1').setLogic(thr_j42.condition(3)&physcond).setTriggerType(TT_calo)
-        item_3j70 = LVL1MenuItem('L1_3J70', ctpid=0x76, group='1').setLogic(thr_j70.condition(3)&physcond).setTriggerType(TT_calo)
-        item_4j10_3j20 = LVL1MenuItem('L1_4J10_3J20', ctpid=-1, group='1')\
-                         .setLogic(thr_j10.condition(4)&thr_j20.condition(3)&physcond).setTriggerType(TT_calo) # new jet threshold
-        item_5j10 = LVL1MenuItem('L1_5J10', ctpid=-1, group='1').setLogic(thr_j10.condition(5)&physcond).setTriggerType(TT_calo)
-        item_5j20 = LVL1MenuItem('L1_5J20', ctpid=-1, group='1').setLogic(thr_j20.condition(5)&physcond).setTriggerType(TT_calo)
-        item_6j10 = LVL1MenuItem('L1_6J10', ctpid=-1, group='1').setLogic(thr_j10.condition(6)&physcond).setTriggerType(TT_calo)
-        
-        item_j5_empty = LVL1MenuItem('L1_J5_EMPTY', ctpid=-1, group='1').setLogic(thr_j5.condition(1)&cosmiccond).setTriggerType(TT_calo)
-        item_j10_empty = LVL1MenuItem('L1_J10_EMPTY', ctpid=-1, group='1').setLogic(thr_j10.condition(1)&cosmiccond).setTriggerType(TT_calo)
-        item_j10_6_empty = LVL1MenuItem('L1_J10_win6_EMPTY', ctpid=-1, group='1').setLogic(thr_j10_6.condition(1)&cosmiccond).setTriggerType(TT_calo)
-        item_j15_empty = LVL1MenuItem('L1_J15_EMPTY', ctpid=-1, group='1').setLogic(thr_j15.condition(1)&cosmiccond).setTriggerType(TT_calo)
-        item_j20_empty = LVL1MenuItem('L1_J20_EMPTY', ctpid=-1, group='1').setLogic(thr_j20.condition(1)&cosmiccond).setTriggerType(TT_calo)        
-        item_j30_empty = LVL1MenuItem('L1_J30_EMPTY', ctpid=-1, group='1').setLogic(thr_j30.condition(1)&cosmiccond).setTriggerType(TT_calo)
-        item_j40_empty = LVL1MenuItem('L1_J40_EMPTY', ctpid=-1, group='1').setLogic(thr_j40.condition(1)&cosmiccond).setTriggerType(TT_calo)
-        item_j55_empty = LVL1MenuItem('L1_J55_EMPTY', ctpid=-1, group='1').setLogic(thr_j55.condition(1)&cosmiccond).setTriggerType(TT_calo)
-        item_j70_empty = LVL1MenuItem('L1_J70_EMPTY', ctpid=-1, group='1').setLogic(thr_j70.condition(1)&cosmiccond).setTriggerType(TT_calo)
-        item_j75_empty = LVL1MenuItem('L1_J75_EMPTY', ctpid=-1, group='1').setLogic(thr_j75.condition(1)&cosmiccond).setTriggerType(TT_calo)
-        item_j100_empty = LVL1MenuItem('L1_J100_EMPTY', ctpid=-1, group='1').setLogic(thr_j100.condition(1)&cosmiccond).setTriggerType(TT_calo)
-        item_j130_empty = LVL1MenuItem('L1_J130_EMPTY', ctpid=-1, group='1').setLogic(thr_j130.condition(1)&cosmiccond).setTriggerType(TT_calo)
-
-
-        #example zero bias seeded by single jet
-        #item_zb_j10  = LVL1MenuItem('L1_ZB_J10',  ctpid=240, group='1').setLogic(thr_zb_j10.condition(1)&physcond).setTriggerType(TT_calo)
-        #example zero bias seeded by di jet
-        #item_zb_2j10 = LVL1MenuItem('L1_ZB_2J10', ctpid=241, group='1').setLogic(thr_zb_2j10.condition(1)&physcond).setTriggerType(TT_calo)
-        #zb item for v3 menu, seeded by mbts a
-
-                    
-        if ('pp_v4' in TriggerFlags.triggerMenuSetup() or 'pp_v5' in TriggerFlags.triggerMenuSetup()):
-            item_zb_em12 = LVL1MenuItem('L1_ZB', ctpid=240, group='1').setLogic(thr_zb_em12.condition(1)&physcond).setTriggerType(TT_zerobs)
-        else:
-            item_zb_em14 = LVL1MenuItem('L1_ZB', ctpid=240, group='1').setLogic(thr_zb_em14.condition(1)&physcond).setTriggerType(TT_zerobs)
-
-                        
-        # - Add/remap new L1 thresholds:
-        #   J20->J15, J40->J30, J70->J55, J100->J75, J130->J95, J150->J115
-        item_3j10_j30 = LVL1MenuItem('L1_3J10_J30',ctpid=-1, group='1')\
-                        .setLogic(thr_j10.condition(3)&thr_j30.condition(1)&physcond)
-        item_3j10_2j30 = LVL1MenuItem('L1_3J10_2J30',ctpid=-1, group='1')\
-                        .setLogic(thr_j10.condition(3)&thr_j30.condition(2)&physcond)
-        item_3j15_j30 = LVL1MenuItem('L1_3J15_J30',ctpid=-1, group='1')\
-                        .setLogic(thr_j15.condition(3)&thr_j30.condition(1)&physcond)
-        item_4j10_3j15 = LVL1MenuItem('L1_4J10_3J15',ctpid=-1, group='1')\
-                        .setLogic(thr_j10.condition(4)&thr_j15.condition(3)&physcond)
-        item_3j5_j30 = LVL1MenuItem('L1_3J5_J30', ctpid=-1, group='1').setLogic(thr_j5.condition(3)&thr_j30.condition(1)&physcond).setTriggerType(TT_calo)
-        item_4j5_j15 = LVL1MenuItem('L1_4J5_J15', ctpid=-1, group='1').setLogic(thr_j5.condition(4)&thr_j15.condition(1)&physcond).setTriggerType(TT_calo)
-        item_4j5_j30 = LVL1MenuItem('L1_4J5_J30', ctpid=-1, group='1').setLogic(thr_j5.condition(4)&thr_j30.condition(1)&physcond).setTriggerType(TT_calo)
-        item_3j30 = LVL1MenuItem('L1_3J30',ctpid=-1, group='1')\
-                    .setLogic(thr_j30.condition(3)&physcond)
-        item_4j30 = LVL1MenuItem('L1_4J30',ctpid=-1, group='1')\
-                    .setLogic(thr_j30.condition(4)&physcond)
-
-        item_2j10_j30 = LVL1MenuItem('L1_2J10_J30',ctpid=-1, group='1')\
-                        .setLogic(thr_j10.condition(2)&thr_j30.condition(1)&physcond)
-        item_2j10_j50 = LVL1MenuItem('L1_2J10_J50',ctpid=-1, group='1')\
-                        .setLogic(thr_j10.condition(2)&thr_j50.condition(1)&physcond)
-
-        item_2j10_j30_je140 = LVL1MenuItem('L1_2J10_J30_JE140',ctpid=-1, group='1')\
-                              .setLogic(thr_j10.condition(2)&thr_j30.condition(1)&thr_je140.condition(1)&physcond)
-
-        item_2j10_j55 = LVL1MenuItem('L1_2J10_J55',ctpid=-1, group='1')\
-                        .setLogic(thr_j10.condition(2)&thr_j55.condition(1)&physcond)
-        item_2j10_j75 = LVL1MenuItem('L1_2J10_J75',ctpid=-1, group='1')\
-                        .setLogic(thr_j10.condition(2)&thr_j75.condition(1)&physcond)
-        item_2j15_j50 = LVL1MenuItem('L1_2J15_J50',ctpid=-1, group='1')\
-                        .setLogic(thr_j15.condition(2)&thr_j50.condition(1)&physcond)
-        item_3j15_j50 = LVL1MenuItem('L1_3J15_J50',ctpid=-1, group='1')\
-                        .setLogic(thr_j15.condition(3)&thr_j50.condition(1)&physcond)
-        item_2j15_j75 = LVL1MenuItem('L1_2J15_J75',ctpid=-1, group='1')\
-                        .setLogic(thr_j15.condition(2)&thr_j75.condition(1)&physcond)
-        item_2j15_j95 = LVL1MenuItem('L1_2J15_J95',ctpid=-1, group='1')\
-                        .setLogic(thr_j15.condition(2)&thr_j95.condition(1)&physcond)
-        
-        item_j10_fj10 = LVL1MenuItem('L1_J10_FJ10',ctpid=-1, group='1')\
-                        .setLogic(thr_j10.condition(1)&(thr_jf10.condition(1)|thr_jb10.condition(1))&physcond)
-        item_j30_fj30 = LVL1MenuItem('L1_J30_FJ30',ctpid=-1, group='1')\
-                        .setLogic(thr_j30.condition(1)&(thr_jf30.condition(1)|thr_jb30.condition(1))&physcond)
-        item_j50_fj50 = LVL1MenuItem('L1_J50_FJ50',ctpid=-1, group='1')\
-                        .setLogic(thr_j50.condition(1)&(thr_jf50.condition(1)|thr_jb50.condition(1))&physcond)
-        item_j75_fj75 = LVL1MenuItem('L1_J75_FJ75',ctpid=-1, group='1')\
-                        .setLogic(thr_j75.condition(1)&(thr_jf75.condition(1)|thr_jb75.condition(1))&physcond)
-        
-
-        # Transient items
-        item_j5_bptx = LVL1MenuItem('L1_J5_BPTX', ctpid=-1, group='1')\
-                       .setLogic(thr_j5.condition(1)&Logic(bgrp0)&(thr_bptx0.condition(1)|thr_bptx1.condition(1)))\
-                       .setTriggerType(TT_calo)
-        item_j10_6 = LVL1MenuItem('L1_J10_win6', ctpid=0x6f, group='1').setLogic(thr_j10_6.condition(1)&physcond).setTriggerType(TT_calo)
-        item_j100 = LVL1MenuItem('L1_J100', ctpid=-1, group='1').setLogic(thr_j100.condition(1)&physcond).setTriggerType(TT_calo)
-        item_j200 = LVL1MenuItem('L1_J200', ctpid=-1, group='1').setLogic(thr_j200.condition(1)&physcond).setTriggerType(TT_calo)
-        item_j350 = LVL1MenuItem('L1_J350', ctpid=-1, group='1').setLogic(thr_j350.condition(1)&physcond).setTriggerType(TT_calo)
-        item_4j18_3j23_2j35_j42 = LVL1MenuItem('L1_4J18_3J23_2J35_J42', ctpid=-1, group='1')\
-                                  .setLogic(thr_j18.condition(4)&thr_j23.condition(3)\
-                                            &thr_j35.condition(2)&thr_j42.condition(1)&physcond).setTriggerType(TT_calo)
-        item_5j5_4j18_3j23_j42 = LVL1MenuItem('L1_5J5_4J18_3J23_J42', ctpid=-1, group='1')\
-                                  .setLogic(thr_j5.condition(5)&thr_j18.condition(4)\
-                                            &thr_j23.condition(3)&thr_j42.condition(1)&physcond).setTriggerType(TT_calo)
-        item_3j10_j40 = LVL1MenuItem('L1_3J10_J40', ctpid=-1, group='1')\
-                        .setLogic(thr_j10.condition(3)&thr_j40.condition(1)&physcond).setTriggerType(TT_calo) # new jet threshold
-        item_3j20_j40 = LVL1MenuItem('L1_3J20_J40', ctpid=-1, group='1')\
-                        .setLogic(thr_j20.condition(3)&thr_j40.condition(1)&physcond).setTriggerType(TT_calo) # new jet threshold
-        item_4j23_j42 = LVL1MenuItem('L1_4J23_J42', ctpid=-1, group='1')\
-                        .setLogic(thr_j23.condition(4)&thr_j42.condition(1)&physcond).setTriggerType(TT_calo)
-
-        # FJ
-        #pPb items
-        item_fj0  = LVL1MenuItem('L1_FJ0', ctpid=0x7b, group='1')\
-                    .setLogic((thr_jf0.condition(1) | thr_jb0.condition(1))&physcond).setTriggerType(TT_calo)
-        item_fj1  = LVL1MenuItem('L1_FJ1', ctpid=0x7b, group='1')\
-                    .setLogic((thr_jf1.condition(1) | thr_jb1.condition(1))&physcond).setTriggerType(TT_calo)
-        item_fj2  = LVL1MenuItem('L1_FJ2', ctpid=0x7b, group='1')\
-                    .setLogic((thr_jf2.condition(1) | thr_jb2.condition(1))&physcond).setTriggerType(TT_calo)
-        item_fj3  = LVL1MenuItem('L1_FJ3', ctpid=0x7b, group='1')\
-                    .setLogic((thr_jf3.condition(1) | thr_jb3.condition(1))&physcond).setTriggerType(TT_calo)
-
-        item_fj0_a  = LVL1MenuItem('L1_FJ0_A', ctpid=0x7b, group='1')\
-                    .setLogic((thr_jf0.condition(1))&physcond).setTriggerType(TT_calo)
-        item_fj1_a  = LVL1MenuItem('L1_FJ1_A', ctpid=0x7b, group='1')\
-                    .setLogic((thr_jf1.condition(1))&physcond).setTriggerType(TT_calo)
-        item_fj2_a  = LVL1MenuItem('L1_FJ2_A', ctpid=0x7b, group='1')\
-                    .setLogic((thr_jf2.condition(1))&physcond).setTriggerType(TT_calo)
-        item_fj3_a  = LVL1MenuItem('L1_FJ3_A', ctpid=0x7b, group='1')\
-                    .setLogic((thr_jf3.condition(1))&physcond).setTriggerType(TT_calo)
-
-        item_fj0_c  = LVL1MenuItem('L1_FJ0_C', ctpid=0x7b, group='1')\
-                    .setLogic((thr_jb0.condition(1))&physcond).setTriggerType(TT_calo)
-        item_fj1_c  = LVL1MenuItem('L1_FJ1_C', ctpid=0x7b, group='1')\
-                    .setLogic((thr_jb1.condition(1))&physcond).setTriggerType(TT_calo)
-        item_fj2_c  = LVL1MenuItem('L1_FJ2_C', ctpid=0x7b, group='1')\
-                    .setLogic((thr_jb2.condition(1))&physcond).setTriggerType(TT_calo)
-        item_fj3_c  = LVL1MenuItem('L1_FJ3_C', ctpid=0x7b, group='1')\
-                    .setLogic((thr_jb3.condition(1))&physcond).setTriggerType(TT_calo)
-        
-        #pp items
-        item_fj18 = LVL1MenuItem('L1_FJ18', ctpid=0x77, group='1')\
-                    .setLogic((thr_jf18.condition(1) | thr_jb18.condition(1))&physcond).setTriggerType(TT_calo)
-        item_fj35 = LVL1MenuItem('L1_FJ35', ctpid=0x78, group='1')\
-                    .setLogic((thr_jf35.condition(1) | thr_jb35.condition(1))&physcond).setTriggerType(TT_calo)
-        item_fj70 = LVL1MenuItem('L1_FJ70', ctpid=0x79, group='1')\
-                    .setLogic((thr_jf70.condition(1) | thr_jb70.condition(1))&physcond).setTriggerType(TT_calo)
-        item_fj120 = LVL1MenuItem('L1_FJ120', ctpid=0x7a, group='1')\
-                     .setLogic((thr_jf120.condition(1) | thr_jb120.condition(1))&physcond).setTriggerType(TT_calo)
-        item_fj5  = LVL1MenuItem('L1_FJ5', ctpid=0x7b, group='1')\
-                    .setLogic((thr_jf5.condition(1) | thr_jb5.condition(1))&physcond).setTriggerType(TT_calo)
-        item_fj10  = LVL1MenuItem('L1_FJ10', ctpid=-1, group='1')\
-                    .setLogic((thr_jf10.condition(1) | thr_jb10.condition(1))&physcond).setTriggerType(TT_calo)
-        item_fj15  = LVL1MenuItem('L1_FJ15', ctpid=-1, group='1')\
-                    .setLogic((thr_jf15.condition(1) | thr_jb15.condition(1))&physcond).setTriggerType(TT_calo)
-        item_fj20  = LVL1MenuItem('L1_FJ20', ctpid=-1, group='1')\
-                    .setLogic((thr_jf20.condition(1) | thr_jb20.condition(1))&physcond).setTriggerType(TT_calo)
-        item_fj30  = LVL1MenuItem('L1_FJ30', ctpid=-1, group='1')\
-                    .setLogic((thr_jf30.condition(1) | thr_jb30.condition(1))&physcond).setTriggerType(TT_calo)
-        item_fj40  = LVL1MenuItem('L1_FJ40', ctpid=-1, group='1')\
-                    .setLogic((thr_jf40.condition(1) | thr_jb40.condition(1))&physcond).setTriggerType(TT_calo)
-        item_fj50  = LVL1MenuItem('L1_FJ50', ctpid=-1, group='1')\
-                    .setLogic((thr_jf50.condition(1) | thr_jb50.condition(1))&physcond).setTriggerType(TT_calo)
-        item_fj55  = LVL1MenuItem('L1_FJ55', ctpid=-1, group='1')\
-                    .setLogic((thr_jf55.condition(1) | thr_jb55.condition(1))&physcond).setTriggerType(TT_calo)
-        item_fj75  = LVL1MenuItem('L1_FJ75', ctpid=-1, group='1')\
-                    .setLogic((thr_jf75.condition(1) | thr_jb75.condition(1))&physcond).setTriggerType(TT_calo)
-        item_fj95  = LVL1MenuItem('L1_FJ95', ctpid=-1, group='1')\
-                    .setLogic((thr_jf95.condition(1) | thr_jb95.condition(1))&physcond).setTriggerType(TT_calo)
-        item_fj100  = LVL1MenuItem('L1_FJ100', ctpid=-1, group='1')\
-                     .setLogic((thr_jf100.condition(1) | thr_jb100.condition(1))&physcond).setTriggerType(TT_calo)
-        
-
-        item_fj3_bgrp1 = LVL1MenuItem('L1_FJ3_BGRP1', ctpid=-1, group='1')\
-                          .setLogic((thr_jf3.condition(1) | thr_jb3.condition(1))&Logic(bgrp0)&Logic(bgrp1)).setTriggerType(TT_calo)
-        item_fj3_bgrp3 = LVL1MenuItem('L1_FJ3_BGRP3', ctpid=-1, group='1')\
-                          .setLogic((thr_jf3.condition(1) | thr_jb3.condition(1))&Logic(bgrp0)&Logic(bgrp3)).setTriggerType(TT_calo)
-        item_fj3_bgrp1_bptx = LVL1MenuItem('L1_FJ3_BGRP1_BPTX', ctpid=-1, group='1')\
-                          .setLogic((thr_jf3.condition(1) | thr_jb3.condition(1))&Logic(bgrp0)&Logic(bgrp1)&(thr_bptx0.condition(1)|thr_bptx1.condition(1))).setTriggerType(TT_calo)
-
-        item_2fj18 = LVL1MenuItem('L1_2FJ18', ctpid=0x7c, group='1')\
-                     .setLogic(thr_jf18.condition(1) & thr_jb18.condition(1)&physcond).setTriggerType(TT_calo)
-
-        item_2fj35 = LVL1MenuItem('L1_2FJ35', ctpid=0x7d, group='1')\
-                     .setLogic(thr_jf35.condition(1) & thr_jb35.condition(1)&physcond).setTriggerType(TT_calo)
-        item_2fj3  = LVL1MenuItem('L1_2FJ3', ctpid=0x7d, group='1')\
-                     .setLogic(thr_jf3.condition(1) & thr_jb3.condition(1)&physcond).setTriggerType(TT_calo)
-        
-        item_2fj5  = LVL1MenuItem('L1_2FJ5', ctpid=0x7d, group='1')\
-                     .setLogic(thr_jf5.condition(1) & thr_jb5.condition(1)&physcond).setTriggerType(TT_calo)
-        
-        item_2fj15  = LVL1MenuItem('L1_2FJ15', ctpid=-1, group='1')\
-                     .setLogic(thr_jf15.condition(1) & thr_jb15.condition(1)&physcond).setTriggerType(TT_calo)
-        
-        item_2fj70 = LVL1MenuItem('L1_2FJ70', ctpid=0x7e, group='1')\
-                     .setLogic(thr_jf70.condition(1) & thr_jb70.condition(1)&physcond).setTriggerType(TT_calo)
-        item_2fj10 = LVL1MenuItem('L1_2FJ10', ctpid=0x7c, group='1')\
-                     .setLogic(thr_jf10.condition(1) & thr_jb10.condition(1)&physcond).setTriggerType(TT_calo)
-        item_2fj30 = LVL1MenuItem('L1_2FJ30', ctpid=0x7d, group='1')\
-                     .setLogic(thr_jf30.condition(1) & thr_jb30.condition(1)&physcond).setTriggerType(TT_calo)
-        item_2fj50 = LVL1MenuItem('L1_2FJ50', ctpid=0x7b, group='1')\
-                     .setLogic(thr_jf50.condition(1) & thr_jb50.condition(1)&physcond).setTriggerType(TT_calo)
-        item_2fj55 = LVL1MenuItem('L1_2FJ55', ctpid=0x7b, group='1')\
-                     .setLogic(thr_jf55.condition(1) & thr_jb55.condition(1)&physcond).setTriggerType(TT_calo)
-
-        item_fj0_empty = LVL1MenuItem('L1_FJ0_EMPTY', ctpid=-1, group='1')\
-                    .setLogic((thr_jf0.condition(1) | thr_jb0.condition(1))&cosmiccond).setTriggerType(TT_calo)
-        item_fj1_empty = LVL1MenuItem('L1_FJ1_EMPTY', ctpid=-1, group='1')\
-                    .setLogic((thr_jf1.condition(1) | thr_jb1.condition(1))&cosmiccond).setTriggerType(TT_calo)
-        item_fj3_empty = LVL1MenuItem('L1_FJ3_EMPTY', ctpid=-1, group='1')\
-                    .setLogic((thr_jf3.condition(1) | thr_jb3.condition(1))&cosmiccond).setTriggerType(TT_calo)
-        item_fj5_empty = LVL1MenuItem('L1_FJ5_EMPTY', ctpid=-1, group='1')\
-                    .setLogic((thr_jf5.condition(1) | thr_jb5.condition(1))&cosmiccond).setTriggerType(TT_calo)
-        item_fj10_empty = LVL1MenuItem('L1_FJ10_EMPTY', ctpid=-1, group='1')\
-                    .setLogic((thr_jf10.condition(1) | thr_jb10.condition(1))&cosmiccond).setTriggerType(TT_calo)
-        item_fj30_empty = LVL1MenuItem('L1_FJ30_EMPTY', ctpid=-1, group='1')\
-                          .setLogic((thr_jf30.condition(1) | thr_jb30.condition(1))&cosmiccond).setTriggerType(TT_calo)
-        
-        item_fj18_empty = LVL1MenuItem('L1_FJ18_EMPTY', ctpid=-1, group='1')\
-                    .setLogic((thr_jf18.condition(1) | thr_jb18.condition(1))&cosmiccond).setTriggerType(TT_calo)
-
-        item_fj18_bptx = LVL1MenuItem('L1_FJ18_BPTX', ctpid=-1, group='1')\
-                    .setLogic((thr_jf18.condition(1) | thr_jb18.condition(1))&Logic(bgrp0)&(thr_bptx0.condition(1)|thr_bptx1.condition(1)))\
-                    .setTriggerType(TT_calo)
-        item_fj3_bptx = LVL1MenuItem('L1_FJ3_BPTX', ctpid=0x84, group='1')\
-                    .setLogic((thr_jf3.condition(1) | thr_jb3.condition(1))&Logic(bgrp0)&(thr_bptx0.condition(1)|thr_bptx1.condition(1)))\
-                    .setTriggerType(TT_calo)
-
-        # Diffractive
-
-        if 'Cosmic2009_v1' in TriggerFlags.triggerMenuSetup():
-            item_j18_mbtsveto = LVL1MenuItem('L1_J18_MV', ctpid=0x70, group='1', prescale=1)\
-                                .setLogic(thr_j18.condition(1)&Not(thr_mbtsA.condition(1)&thr_mbtsC.condition(1))&physcond).setTriggerType(TT_calo)
-        else:
-            item_j18_mbtsveto = LVL1MenuItem('L1_J18_MV', ctpid=-1, group='1', prescale=1)\
-                                .setLogic(thr_j18.condition(1)&Not(thr_mbtsA.condition(1)&thr_mbtsC.condition(1))&physcond).setTriggerType(TT_calo)
-            item_j10_mbtsveto = LVL1MenuItem('L1_J10_MV', ctpid=-1, group='1', prescale=1)\
-                                .setLogic(thr_j10.condition(1)&Not(thr_mbtsA.condition(1)&thr_mbtsC.condition(1))&physcond).setTriggerType(TT_calo)
-            item_j20_mbtsveto = LVL1MenuItem('L1_J20_MV', ctpid=-1, group='1', prescale=1)\
-                                .setLogic(thr_j20.condition(1)&Not(thr_mbtsA.condition(1)&thr_mbtsC.condition(1))&physcond).setTriggerType(TT_calo)
-
-        item_j18_lucidveto = LVL1MenuItem('L1_J18_LV', ctpid=0x71, group='1', prescale=1)\
-                             .setLogic(thr_j18.condition(1)&Not(thr_lucidA.condition(1)&thr_lucidC.condition(1))&physcond).setTriggerType(TT_calo)
-        item_j18_nolucid = LVL1MenuItem('L1_J18_NL', ctpid=0x72, group='1', prescale=1)\
-                           .setLogic(thr_j18.condition(1)&Not(thr_lucidA.condition(1))&Not(thr_lucidC.condition(1))&physcond).setTriggerType(TT_calo)
-
-
-        item_j20_mbtsveto = LVL1MenuItem('L1_J20_MV', ctpid=-1, group='1', prescale=1)\
-                            .setLogic(thr_j20.condition(1)&Not(thr_mbtsA.condition(1)&thr_mbtsC.condition(1))&physcond).setTriggerType(TT_calo)
-        item_j20_lucidveto = LVL1MenuItem('L1_J20_LV', ctpid=-1, group='1', prescale=1)\
-                             .setLogic(thr_j20.condition(1)&Not(thr_lucidA.condition(1)&thr_lucidC.condition(1))&physcond).setTriggerType(TT_calo)
-        item_j20_nolucid = LVL1MenuItem('L1_J20_NL', ctpid=-1, group='1', prescale=1)\
-                           .setLogic(thr_j20.condition(1)&Not(thr_lucidA.condition(1))&Not(thr_lucidC.condition(1))&physcond).setTriggerType(TT_calo)
-
-        item_j15_mbtsveto = LVL1MenuItem('L1_J15_MV', ctpid=-1, group='1', prescale=1)\
-                            .setLogic(thr_j15.condition(1)&Not(thr_mbtsA.condition(1)&thr_mbtsC.condition(1))&physcond).setTriggerType(TT_calo)
-        item_j15_lucidveto = LVL1MenuItem('L1_J15_LV', ctpid=-1, group='1', prescale=1)\
-                             .setLogic(thr_j15.condition(1)&Not(thr_lucidA.condition(1)&thr_lucidC.condition(1))&physcond).setTriggerType(TT_calo)
-        item_j15_nolucid = LVL1MenuItem('L1_J15_NL', ctpid=-1, group='1', prescale=1)\
-                           .setLogic(thr_j15.condition(1)&Not(thr_lucidA.condition(1))&Not(thr_lucidC.condition(1))&physcond).setTriggerType(TT_calo)
-        item_2j15_nolucid = LVL1MenuItem('L1_2J15_NL', ctpid=-1, group='1', prescale=1)\
-                           .setLogic(thr_j15.condition(2)&Not(thr_lucidA.condition(1))&Not(thr_lucidC.condition(1))&physcond).setTriggerType(TT_calo)
-
-        item_mu0_mbtsveto = LVL1MenuItem('L1_MU0_MV', ctpid=-1, group='1', prescale=1)\
-                            .setLogic(thr_mu0.condition(1)&Not(thr_mbtsA.condition(1)&thr_mbtsC.condition(1))&physcond).setTriggerType(TT_rpcin)
-        item_2mu0_mbtsveto = LVL1MenuItem('L1_2MU0_MV', ctpid=-1, group='1', prescale=1)\
-                            .setLogic(thr_mu0.condition(2)&Not(thr_mbtsA.condition(1)&thr_mbtsC.condition(1))&physcond).setTriggerType(TT_rpcin)
-        item_mu0_veto_te50 = LVL1MenuItem('L1_MU0_VTE50', ctpid=-1).setLogic(thr_mu0.condition(1)\
-                                                                             &Not(thr_te50.condition(1))&physcond).setTriggerType(TT_rpcin)
-        item_mu0_veto_te20 = LVL1MenuItem('L1_MU0_VTE20', ctpid=-1).setLogic(thr_mu0.condition(1)\
-                                                                             &Not(thr_te20.condition(1))&physcond).setTriggerType(TT_rpcin)
-
-        item_mu0_te50 = LVL1MenuItem('L1_MU0_TE50', ctpid=-1).setLogic(thr_mu0.condition(1)\
-                                                                                    &thr_te50.condition(1)&physcond).setTriggerType(TT_rpcin)
-
-        item_mu0_mbtsveto_veto_te50 = LVL1MenuItem('L1_MU0_MV_VTE50', ctpid=-1, group='1', prescale=1)\
-                                      .setLogic(thr_mu0.condition(1)&Not(thr_mbtsA.condition(1)&thr_mbtsC.condition(1))&Not(thr_te50.condition(1))\
-                                                &physcond).setTriggerType(TT_rpcin)
-        
-        item_em3_veto_te50 = LVL1MenuItem('L1_EM3_VTE50', ctpid=-1).setLogic(thr_em3.condition(1)\
-                                                                                    &Not(thr_te50.condition(1))&physcond).setTriggerType(TT_calo)
-        item_em3_veto_te20 = LVL1MenuItem('L1_EM3_VTE20', ctpid=-1).setLogic(thr_em3.condition(1)\
-                                                                             &Not(thr_te20.condition(1))&physcond).setTriggerType(TT_calo)
-        item_em3_te50 = LVL1MenuItem('L1_EM3_TE50', ctpid=-1).setLogic(thr_em3.condition(1)\
-                                                                       &thr_te50.condition(1)&physcond).setTriggerType(TT_calo)
-
-        item_em3_2j5 = LVL1MenuItem('L1_EM3_2J5', ctpid=-1).setLogic(thr_em3.condition(1)\
-                                                                                    &thr_j5.condition(2)&physcond).setTriggerType(TT_calo)
-
-        item_em3_mbtsveto_veto_te50 = LVL1MenuItem('L1_EM3_MV_VTE50', ctpid=-1, group='1', prescale=1)\
-                            .setLogic(thr_em3.condition(1)&Not(thr_mbtsA.condition(1)&thr_mbtsC.condition(1))&Not(thr_te50.condition(1))\
-                                                               &physcond).setTriggerType(TT_calo)
-
-        item_mu4_veto_te50 = LVL1MenuItem('L1_MU4_VTE50', ctpid=-1).setLogic(thr_mu4.condition(1)\
-                                                                                    &Not(thr_te50.condition(1))&physcond).setTriggerType(TT_rpcin)
-        item_mu4_te50 = LVL1MenuItem('L1_MU4_TE50', ctpid=-1).setLogic(thr_mu4.condition(1)\
-                                                                                    &thr_te50.condition(1)&physcond).setTriggerType(TT_rpcin)
-        
-        item_mu4_mbtsveto_veto_te50 = LVL1MenuItem('L1_MU4_MV_VTE50', ctpid=-1, group='1', prescale=1)\
-                            .setLogic(thr_mu4.condition(1)&Not(thr_mbtsA.condition(1)&thr_mbtsC.condition(1))&Not(thr_te50.condition(1))\
-                                                               &physcond).setTriggerType(TT_rpcin)
-                
-        item_em2_mbtsveto = LVL1MenuItem('L1_EM2_MV', ctpid=-1, group='1', prescale=1)\
-                            .setLogic(thr_em2.condition(1)&Not(thr_mbtsA.condition(1)&thr_mbtsC.condition(1))&physcond).setTriggerType(TT_calo)
-        item_em3_mbtsveto = LVL1MenuItem('L1_EM3_MV', ctpid=-1, group='1', prescale=1)\
-                            .setLogic(thr_em3.condition(1)&Not(thr_mbtsA.condition(1)&thr_mbtsC.condition(1))&physcond).setTriggerType(TT_calo)
-        item_tau5_mbtsveto = LVL1MenuItem('L1_TAU5_MV', ctpid=-1, group='1', prescale=1)\
-                            .setLogic(thr_tau5.condition(1)&Not(thr_mbtsA.condition(1)&thr_mbtsC.condition(1))&physcond).setTriggerType(TT_calo)
-
-        item_em10_nolucid = LVL1MenuItem('L1_EM10_NL', ctpid=0x72, group='1', prescale=1)\
-                           .setLogic(thr_em10.condition(1)&Not(thr_lucidA.condition(1))&Not(thr_lucidC.condition(1))&physcond).setTriggerType(TT_calo)
-
-        item_mu6_nolucid = LVL1MenuItem('L1_MU6_NL', ctpid=0x72, group='1', prescale=1)\
-                           .setLogic(thr_mu6.condition(1)&Not(thr_lucidA.condition(1))&Not(thr_lucidC.condition(1))&physcond).setTriggerType(TT_calo)
-
-        item_2em3_nolucid = LVL1MenuItem('L1_2EM3_NL', ctpid=0x72, group='1', prescale=1)\
-                           .setLogic(thr_em3.condition(2)&Not(thr_lucidA.condition(1))&Not(thr_lucidC.condition(1))&physcond).setTriggerType(TT_calo)
-
-        item_em3_nolucid = LVL1MenuItem('L1_EM3_NL', ctpid=0x72, group='1', prescale=1)\
-                            .setLogic(thr_em3.condition(1)&Not(thr_lucidA.condition(1))&Not(thr_lucidC.condition(1))&physcond).setTriggerType(TT_calo)
-
-        item_2em5_nolucid = LVL1MenuItem('L1_2EM5_NL', ctpid=0x72, group='1', prescale=1)\
-                           .setLogic(thr_em5.condition(2)&Not(thr_lucidA.condition(1))&Not(thr_lucidC.condition(1))&physcond).setTriggerType(TT_calo)
-
-        item_2mu0_nolucid = LVL1MenuItem('L1_2MU0_NL', ctpid=0x72, group='1', prescale=1)\
-                           .setLogic(thr_mu0.condition(2)&Not(thr_lucidA.condition(1))&Not(thr_lucidC.condition(1))&physcond).setTriggerType(TT_calo)
-
-        item_mu0_nolucid = LVL1MenuItem('L1_MU0_NL', ctpid=0x72, group='1', prescale=1)\
-                            .setLogic(thr_mu0.condition(1)&Not(thr_lucidA.condition(1))&Not(thr_lucidC.condition(1))&physcond).setTriggerType(TT_rpcin)
-
-        item_2mu6_nolucid = LVL1MenuItem('L1_2MU6_NL', ctpid=0x72, group='1', prescale=1)\
-                           .setLogic(thr_mu6.condition(2)&Not(thr_lucidA.condition(1))&Not(thr_lucidC.condition(1))&physcond).setTriggerType(TT_calo)
-
-        #Hi stuff
-        item_mu0_noZdc = LVL1MenuItem('L1_MU0_NZ', ctpid=0x72, group='1', prescale=1)\
-                           .setLogic(thr_mu0.condition(1)&Not(thr_zdcAND.condition(1))&physcond).setTriggerType(TT_rpcin)
-
-        item_em3_noZdc = LVL1MenuItem('L1_EM3_NZ', ctpid=0x72, group='1', prescale=1)\
-                           .setLogic(thr_em3.condition(1)&Not(thr_zdcAND.condition(1))&physcond).setTriggerType(TT_calo)
-
-        item_j15_noZdc = LVL1MenuItem('L1_J15_NZ', ctpid=0x72, group='1', prescale=1)\
-                         .setLogic(thr_j15.condition(1)&Not(thr_zdcAND.condition(1))&physcond).setTriggerType(TT_calo)
-
-        item_te5_noZdc  = LVL1MenuItem('L1_TE5_NZ',  ctpid=-1,   group='1').setLogic(thr_te5.condition(1)&Not(thr_zdcAND.condition(1))\
-                                                                                     &physcond).setTriggerType(TT_calo)
-
-        item_2mu0_noZdc = LVL1MenuItem('L1_2MU0_NZ', ctpid=0x72, group='1', prescale=1)\
-                           .setLogic(thr_mu0.condition(2)&Not(thr_zdcAND.condition(1))&physcond).setTriggerType(TT_rpcin)
-        
-        item_2em3_noZdc = LVL1MenuItem('L1_2EM3_NZ', ctpid=0x72, group='1', prescale=1)\
-                           .setLogic(thr_em3.condition(2)&Not(thr_zdcAND.condition(1))&physcond).setTriggerType(TT_calo)
-        
-        item_2j15_noZdc = LVL1MenuItem('L1_2J15_NZ', ctpid=0x72, group='1', prescale=1)\
-                         .setLogic(thr_j15.condition(2)&Not(thr_zdcAND.condition(1))&physcond).setTriggerType(TT_calo)
-        
-        #
-        # Add CALO items and muon items for EMPTY, UNPAIRED1, UNPAIRED2 and UNPAIREDR
-        #
-        item_calo_empty = LVL1MenuItem('L1_CALO_EMPTY', ctpid=-1, group='1')\
-                          .setLogic((thr_j5.condition(1)|thr_em3.condition(1)|thr_tau5.condition(1))&cosmiccond).setTriggerType(TT_calo)
-
-        item_calo_unpaired1 = LVL1MenuItem('L1_CALO_UNPAIRED1', ctpid=-1, group='1')\
-                              .setLogic((thr_j5.condition(1)|thr_em3.condition(1)|thr_tau5.condition(1))&unpaired1cond).setTriggerType(TT_calo)
-
-        item_calo_unpaired2 = LVL1MenuItem('L1_CALO_UNPAIRED2', ctpid=-1, group='1')\
-                              .setLogic((thr_j5.condition(1)|thr_em3.condition(1)|thr_tau5.condition(1))&unpaired2cond).setTriggerType(TT_calo)
-        
-        item_j5_unpairedR   = LVL1MenuItem('L1_J5_UNPAIRED', ctpid=-1, group='1')\
-                              .setLogic(thr_j5.condition(1)&unpairedRcond).setTriggerType(TT_calo)
-
-        item_j5_unpaired_iso   = LVL1MenuItem('L1_J5_UNPAIRED_ISO', ctpid=-1, group='1')\
-                                 .setLogic(thr_j5.condition(1)&unpaired_isocond).setTriggerType(TT_calo)
-
-        item_j5_unpaired_noniso   = LVL1MenuItem('L1_J5_UNPAIRED_NONISO', ctpid=-1, group='1')\
-                                    .setLogic(thr_j5.condition(1)&unpaired_nonisocond).setTriggerType(TT_calo)
-
-        item_j5_empty1stR = LVL1MenuItem('L1_J5_FIRSTEMPTY', ctpid=-1, group='1')\
-                            .setLogic(thr_j5.condition(1)&empty1stcond).setTriggerType(TT_calo)
-        
-        item_j10_unpairedR   = LVL1MenuItem('L1_J10_UNPAIRED', ctpid=-1, group='1')\
-                               .setLogic(thr_j10.condition(1)&unpairedRcond).setTriggerType(TT_calo)
-        
-        item_j30_unpairedR   = LVL1MenuItem('L1_J30_UNPAIRED', ctpid=-1, group='1')\
-                               .setLogic(thr_j30.condition(1)&unpairedRcond).setTriggerType(TT_calo)
-
-        item_j10_unpaired_iso   = LVL1MenuItem('L1_J10_UNPAIRED_ISO', ctpid=-1, group='1')\
-                                  .setLogic(thr_j10.condition(1)&unpaired_isocond).setTriggerType(TT_calo)
-
-        item_j10_unpaired_noniso   = LVL1MenuItem('L1_J10_UNPAIRED_NONISO', ctpid=-1, group='1')\
-                                     .setLogic(thr_j10.condition(1)&unpaired_nonisocond).setTriggerType(TT_calo)
-
-        item_j30_unpaired_iso   = LVL1MenuItem('L1_J30_UNPAIRED_ISO', ctpid=-1, group='1')\
-                                  .setLogic(thr_j30.condition(1)&unpaired_isocond).setTriggerType(TT_calo)
-
-        item_j30_unpaired_noniso   = LVL1MenuItem('L1_J30_UNPAIRED_NONISO', ctpid=-1, group='1')\
-                                  .setLogic(thr_j30.condition(1)&unpaired_nonisocond).setTriggerType(TT_calo)
-
-        item_fj3_unpairedR  = LVL1MenuItem('L1_FJ3_UNPAIRED', ctpid=-1, group='1')\
-                              .setLogic((thr_jf3.condition(1) | thr_jb3.condition(1))&unpairedRcond).setTriggerType(TT_calo)
-        
-        item_fj5_unpairedR  = LVL1MenuItem('L1_FJ5_UNPAIRED', ctpid=-1, group='1')\
-                              .setLogic((thr_jf5.condition(1) | thr_jb5.condition(1))&unpairedRcond).setTriggerType(TT_calo)
-
-        item_fj10_unpairedR  = LVL1MenuItem('L1_FJ10_UNPAIRED', ctpid=-1, group='1')\
-                              .setLogic((thr_jf10.condition(1) | thr_jb10.condition(1))&unpairedRcond).setTriggerType(TT_calo)
-
-        item_fj10_unpaired_iso  = LVL1MenuItem('L1_FJ10_UNPAIRED_ISO', ctpid=-1, group='1')\
-                                  .setLogic((thr_jf10.condition(1) | thr_jb10.condition(1))&unpaired_isocond).setTriggerType(TT_calo)
-
-        item_fj10_unpaired_noniso  = LVL1MenuItem('L1_FJ10_UNPAIRED_NONISO', ctpid=-1, group='1')\
-                                  .setLogic((thr_jf10.condition(1) | thr_jb10.condition(1))&unpaired_nonisocond).setTriggerType(TT_calo)
-
-        item_fj0_unpaired_iso  = LVL1MenuItem('L1_FJ0_UNPAIRED_ISO', ctpid=-1, group='1')\
-                                  .setLogic((thr_jf0.condition(1) | thr_jb0.condition(1))&unpaired_isocond).setTriggerType(TT_calo)
-        item_fj1_unpaired_iso  = LVL1MenuItem('L1_FJ1_UNPAIRED_ISO', ctpid=-1, group='1')\
-                                  .setLogic((thr_jf1.condition(1) | thr_jb1.condition(1))&unpaired_isocond).setTriggerType(TT_calo)
-
-        item_fj5_unpaired_iso  = LVL1MenuItem('L1_FJ5_UNPAIRED_ISO', ctpid=-1, group='1')\
-                                  .setLogic((thr_jf5.condition(1) | thr_jb5.condition(1))&unpaired_isocond).setTriggerType(TT_calo)
-
-        item_fj30_unpaired_iso  = LVL1MenuItem('L1_FJ30_UNPAIRED_ISO', ctpid=-1, group='1')\
-                                  .setLogic((thr_jf30.condition(1) | thr_jb30.condition(1))&unpaired_isocond).setTriggerType(TT_calo)
-        
-        item_fj5_empty1stR = LVL1MenuItem('L1_FJ5_FIRSTEMPTY', ctpid=-1, group='1')\
-                             .setLogic((thr_jf5.condition(1) | thr_jb5.condition(1))&empty1stcond).setTriggerType(TT_calo )
-
-        item_fj10_empty1stR = LVL1MenuItem('L1_FJ10_FIRSTEMPTY', ctpid=-1, group='1')\
-                             .setLogic((thr_jf10.condition(1) | thr_jb10.condition(1))&empty1stcond).setTriggerType(TT_calo )
-
-        item_fj30_empty1stR = LVL1MenuItem('L1_FJ30_FIRSTEMPTY', ctpid=-1, group='1')\
-                              .setLogic((thr_jf30.condition(1) | thr_jb30.condition(1))&empty1stcond).setTriggerType(TT_calo )
-        
-
-        item_tau5_unpairedR = LVL1MenuItem('L1_TAU5_UNPAIRED', ctpid=-1, group='1')\
-                              .setLogic(thr_tau5.condition(1)&unpairedRcond).setTriggerType(TT_calo)
-
-        item_tau5_unpaired_iso = LVL1MenuItem('L1_TAU5_UNPAIRED_ISO', ctpid=-1, group='1')\
-                                 .setLogic(thr_tau5.condition(1)&unpaired_isocond).setTriggerType(TT_calo)
-
-        item_tau5_unpaired_noniso = LVL1MenuItem('L1_TAU5_UNPAIRED_NONISO', ctpid=-1, group='1')\
-                                    .setLogic(thr_tau5.condition(1)&unpaired_nonisocond).setTriggerType(TT_calo)
-
-        item_tau5_empty1stR = LVL1MenuItem('L1_TAU5_FIRSTEMPTY', ctpid=-1, group='1')\
-                                 .setLogic(thr_tau5.condition(1)&empty1stcond).setTriggerType(TT_calo)
-
-        item_tau8_unpaired_iso = LVL1MenuItem('L1_TAU8_UNPAIRED_ISO', ctpid=-1, group='1')\
-                                 .setLogic(thr_tau8.condition(1)&unpaired_isocond).setTriggerType(TT_calo)
-
-        item_tau8_unpaired_noniso = LVL1MenuItem('L1_TAU8_UNPAIRED_NONISO', ctpid=-1, group='1')\
-                                    .setLogic(thr_tau8.condition(1)&unpaired_nonisocond).setTriggerType(TT_calo)
-
-        item_tau8_empty1stR = LVL1MenuItem('L1_TAU8_FIRSTEMPTY', ctpid=-1, group='1')\
-                                 .setLogic(thr_tau8.condition(1)&empty1stcond).setTriggerType(TT_calo)
-        
-        item_em2_unpairedR = LVL1MenuItem('L1_EM2_UNPAIRED', ctpid=-1, group='1')\
-                             .setLogic(thr_em2.condition(1)&unpairedRcond).setTriggerType(TT_calo|TT_caloem)
-
-        item_em2_unpaired_iso = LVL1MenuItem('L1_EM2_UNPAIRED_ISO', ctpid=-1, group='1')\
-                                .setLogic(thr_em2.condition(1)&unpaired_isocond).setTriggerType(TT_calo|TT_caloem)
-
-        item_em2_unpaired_noniso = LVL1MenuItem('L1_EM2_UNPAIRED_NONISO', ctpid=-1, group='1')\
-                                   .setLogic(thr_em2.condition(1)&unpaired_nonisocond).setTriggerType(TT_calo|TT_caloem)
-
-        item_em3_unpaired_iso = LVL1MenuItem('L1_EM3_UNPAIRED_ISO', ctpid=-1, group='1')\
-                                .setLogic(thr_em3.condition(1)&unpaired_isocond).setTriggerType(TT_calo|TT_caloem)
-
-        item_em3_unpaired_noniso = LVL1MenuItem('L1_EM3_UNPAIRED_NONISO', ctpid=-1, group='1')\
-                                   .setLogic(thr_em3.condition(1)&unpaired_nonisocond).setTriggerType(TT_calo|TT_caloem)
-
-
-        item_em3_unpairedR = LVL1MenuItem('L1_EM3_UNPAIRED', ctpid=-1, group='1')\
-                             .setLogic(thr_em3.condition(1)&unpairedRcond).setTriggerType(TT_calo|TT_caloem)
-        
-        item_em2_empty1stR = LVL1MenuItem('L1_EM2_FIRSTEMPTY', ctpid=-1, group='1')\
-                             .setLogic(thr_em2.condition(1)&empty1stcond).setTriggerType(TT_calo|TT_caloem)
-        item_em3_empty1stR = LVL1MenuItem('L1_EM3_FIRSTEMPTY', ctpid=-1, group='1')\
-                             .setLogic(thr_em3.condition(1)&empty1stcond).setTriggerType(TT_calo|TT_caloem)
-        
-        item_mu0_unpairedR = LVL1MenuItem('L1_MU0_UNPAIRED', ctpid=-1, group='1')\
-                             .setLogic(thr_mu0.condition(1)&unpairedRcond).setTriggerType(TT_rpcin)
-
-        item_2mu6_unpairedR = LVL1MenuItem('L1_2MU6_UNPAIRED', ctpid=-1, group='1')\
-                              .setLogic(thr_mu6.condition(2)&unpairedRcond).setTriggerType(TT_rpcin)
-        
-        item_2mu6_unpaired_iso = LVL1MenuItem('L1_2MU6_UNPAIRED_ISO', ctpid=-1, group='1')\
-                                 .setLogic(thr_mu6.condition(2)&unpaired_isocond).setTriggerType(TT_rpcin)
-
-        item_2mu6_unpaired_noniso = LVL1MenuItem('L1_2MU6_UNPAIRED_NONISO', ctpid=-1, group='1')\
-                                   .setLogic(thr_mu6.condition(2)&unpaired_nonisocond).setTriggerType(TT_rpcin)
-
-        item_mu0_j15_unpairedR = LVL1MenuItem('L1_MU0_J15_UNPAIRED', ctpid=-1, group='1')\
-                                 .setLogic(thr_mu0.condition(1)&thr_j15.condition(1)&unpairedRcond).setTriggerType(TT_rpcin)
-        
-        item_mu0_j15_unpaired_iso = LVL1MenuItem('L1_MU0_J15_UNPAIRED_ISO', ctpid=-1, group='1')\
-                                    .setLogic(thr_mu0.condition(1)&thr_j15.condition(1)&unpaired_isocond).setTriggerType(TT_rpcin)
-        
-        item_mu0_j15_unpaired_noniso = LVL1MenuItem('L1_MU0_J15_UNPAIRED_NONISO', ctpid=-1, group='1')\
-                                       .setLogic(thr_mu0.condition(1)&thr_j15.condition(1)&unpaired_nonisocond).setTriggerType(TT_rpcin)
-
-        item_mu4_j15_unpaired_iso = LVL1MenuItem('L1_MU4_J15_UNPAIRED_ISO', ctpid=-1, group='1')\
-                                    .setLogic(thr_mu4.condition(1)&thr_j15.condition(1)&unpaired_isocond).setTriggerType(TT_rpcin)
-        
-        item_mu4_j15_unpaired_noniso = LVL1MenuItem('L1_MU4_J15_UNPAIRED_NONISO', ctpid=-1, group='1')\
-                                       .setLogic(thr_mu4.condition(1)&thr_j15.condition(1)&unpaired_nonisocond).setTriggerType(TT_rpcin)
-        
-        item_mu0_unpaired_iso = LVL1MenuItem('L1_MU0_UNPAIRED_ISO', ctpid=-1, group='1')\
-                                .setLogic(thr_mu0.condition(1)&unpaired_isocond).setTriggerType(TT_rpcin)
-
-        item_mu4_unpaired_iso = LVL1MenuItem('L1_MU4_UNPAIRED_ISO', ctpid=-1, group='1')\
-                                .setLogic(thr_mu4.condition(1)&unpaired_isocond).setTriggerType(TT_rpcin)
-
-        item_mu10_unpaired_iso = LVL1MenuItem('L1_MU10_UNPAIRED_ISO', ctpid=-1, group='1')\
-                                 .setLogic(thr_mu10.condition(1)&unpaired_isocond).setTriggerType(TT_rpcin)
-
-        item_mu0_unpaired_noniso = LVL1MenuItem('L1_MU0_UNPAIRED_NONISO', ctpid=-1, group='1')\
-                                   .setLogic(thr_mu0.condition(1)&unpaired_nonisocond).setTriggerType(TT_rpcin)
-
-        item_mu4_unpaired_noniso = LVL1MenuItem('L1_MU4_UNPAIRED_NONISO', ctpid=-1, group='1')\
-                                   .setLogic(thr_mu4.condition(1)&unpaired_nonisocond).setTriggerType(TT_rpcin)
-
-        item_mu0_empty1stR = LVL1MenuItem('L1_MU0_FIRSTEMPTY', ctpid=-1, group='1')\
-                             .setLogic(thr_mu0.condition(1)&empty1stcond).setTriggerType(TT_rpcin)
-
-        item_mu4_empty1stR = LVL1MenuItem('L1_MU4_FIRSTEMPTY', ctpid=-1, group='1')\
-                             .setLogic(thr_mu4.condition(1)&empty1stcond).setTriggerType(TT_rpcin)
-        
-        item_mu6_unpairedR = LVL1MenuItem('L1_MU6_UNPAIRED', ctpid=-1, group='1')\
-                             .setLogic(thr_mu6.condition(1)&unpairedRcond).setTriggerType(TT_rpcin)
-        
-        item_mu6_empty1stR = LVL1MenuItem('L1_MU6_FIRSTEMPTY', ctpid=-1, group='1')\
-                             .setLogic(thr_mu6.condition(1)&empty1stcond).setTriggerType(TT_rpcin)
-        
-        item_mu10_empty1stR = LVL1MenuItem('L1_MU10_FIRSTEMPTY', ctpid=-1, group='1')\
-                              .setLogic(thr_mu10.condition(1)&empty1stcond).setTriggerType(TT_rpcin)
-        
-        item_2mu0_empty1stR = LVL1MenuItem('L1_2MU0_FIRSTEMPTY', ctpid=-1, group='1')\
-                              .setLogic(thr_mu0.condition(2)&empty1stcond).setTriggerType(TT_rpcin)
-
-        item_2mu4_empty1stR = LVL1MenuItem('L1_2MU4_FIRSTEMPTY', ctpid=-1, group='1')\
-                              .setLogic(thr_mu4.condition(2)&empty1stcond).setTriggerType(TT_rpcin)
-
-        item_2mu6_empty1stR = LVL1MenuItem('L1_2MU6_FIRSTEMPTY', ctpid=-1, group='1')\
-                              .setLogic(thr_mu6.condition(2)&empty1stcond).setTriggerType(TT_rpcin)        
-
-        item_mu0_j15_empty1stR = LVL1MenuItem('L1_MU0_J15_FIRSTEMPTY', ctpid=-1, group='1')\
-                              .setLogic(thr_mu0.condition(1)&thr_j15.condition(1)&empty1stcond).setTriggerType(TT_rpcin)
-
-        item_mu4_j15_empty1stR = LVL1MenuItem('L1_MU4_J15_FIRSTEMPTY', ctpid=-1, group='1')\
-                                 .setLogic(thr_mu4.condition(1)&thr_j15.condition(1)&empty1stcond).setTriggerType(TT_rpcin)        
-
-        item_mu15_unpairedR = LVL1MenuItem('L1_MU15_UNPAIRED', ctpid=-1, group='1')\
-                              .setLogic(thr_mu15.condition(1)&unpairedRcond).setTriggerType(TT_rpcin)
-        
-        item_mu0_comm_unpaired = LVL1MenuItem('L1_MU0_COMM_UNPAIRED', ctpid=-1, group='1')\
-                                 .setLogic(thr_mu0_comm.condition(1)&unpairedRcond).setTriggerType(TT_rpcin)
-        
-        item_mu0_comm_unpaired_iso = LVL1MenuItem('L1_MU0_COMM_UNPAIRED_ISO', ctpid=-1, group='1')\
-                                     .setLogic(thr_mu0_comm.condition(1)&unpaired_isocond).setTriggerType(TT_rpcin)
-
-        item_mu0_comm_unpaired_noniso = LVL1MenuItem('L1_MU0_COMM_UNPAIRED_NONISO', ctpid=-1, group='1')\
-                                        .setLogic(thr_mu0_comm.condition(1)&unpaired_nonisocond).setTriggerType(TT_rpcin)
-
-        item_mu0_comm_empty1stR = LVL1MenuItem('L1_MU0_COMM_FIRSTEMPTY', ctpid=-1, group='1')\
-                                  .setLogic(thr_mu0_comm.condition(1)&empty1stcond).setTriggerType(TT_rpcin)
-        
-        item_j10_empty1stR = LVL1MenuItem('L1_J10_FIRSTEMPTY', ctpid=-1, group='1')\
-                             .setLogic(thr_j10.condition(1)&empty1stcond).setTriggerType(TT_calo)
-        
-        item_j30_empty1stR = LVL1MenuItem('L1_J30_FIRSTEMPTY', ctpid=-1, group='1')\
-                             .setLogic(thr_j30.condition(1)&empty1stcond).setTriggerType(TT_calo)
-        
-        # XE ctpid=[0x80:0x9f]
-        item_xe10 = LVL1MenuItem('L1_XE10', ctpid=-1, group='1').setLogic(thr_xe10.condition(1)&physcond).setTriggerType(TT_calo)
-        item_xe15 = LVL1MenuItem('L1_XE15', ctpid=0x80, group='1').setLogic(thr_xe15.condition(1)&physcond).setTriggerType(TT_calo)
-        item_xe20 = LVL1MenuItem('L1_XE20', ctpid=0x81, group='1').setLogic(thr_xe20.condition(1)&physcond).setTriggerType(TT_calo)
-        item_xe25 = LVL1MenuItem('L1_XE25', ctpid=0x82, group='1').setLogic(thr_xe25.condition(1)&physcond).setTriggerType(TT_calo)
-        item_xe30 = LVL1MenuItem('L1_XE30', ctpid=0x83, group='1').setLogic(thr_xe30.condition(1)&physcond).setTriggerType(TT_calo)
-        item_xe40 = LVL1MenuItem('L1_XE40', ctpid=0x84, group='1').setLogic(thr_xe40.condition(1)&physcond).setTriggerType(TT_calo)
-        item_xe50 = LVL1MenuItem('L1_XE50', ctpid=0x85, group='1').setLogic(thr_xe50.condition(1)&physcond).setTriggerType(TT_calo)
-        item_xe70 = LVL1MenuItem('L1_XE70', ctpid=0x86, group='1').setLogic(thr_xe70.condition(1)&physcond).setTriggerType(TT_calo)
-        item_xe80 = LVL1MenuItem('L1_XE80', ctpid=0x87, group='1').setLogic(thr_xe80.condition(1)&physcond).setTriggerType(TT_calo)
-
-        item_xe100 = LVL1MenuItem('L1_XE100', ctpid=0x88, group='1').setLogic(thr_xe100.condition(1)&physcond).setTriggerType(TT_calo)
-        item_xe120 = LVL1MenuItem('L1_XE120', ctpid=0x89, group='1').setLogic(thr_xe120.condition(1)&physcond).setTriggerType(TT_calo)         
-        item_xe125 = LVL1MenuItem('L1_XE125', ctpid=0x89, group='1').setLogic(thr_xe125.condition(1)&physcond).setTriggerType(TT_calo)
-
-        item_xe10_empty = LVL1MenuItem('L1_XE10_EMPTY', ctpid=-1, group='1').setLogic(thr_xe10.condition(1)&cosmiccond).setTriggerType(TT_calo)
-        item_xe15_empty = LVL1MenuItem('L1_XE15_EMPTY', ctpid=-1, group='1').setLogic(thr_xe15.condition(1)&cosmiccond).setTriggerType(TT_calo)
-        item_xe20_empty = LVL1MenuItem('L1_XE20_EMPTY', ctpid=-1, group='1').setLogic(thr_xe20.condition(1)&cosmiccond).setTriggerType(TT_calo)
-        item_xe25_empty = LVL1MenuItem('L1_XE25_EMPTY', ctpid=-1, group='1').setLogic(thr_xe25.condition(1)&cosmiccond).setTriggerType(TT_calo)
-        item_xe30_empty = LVL1MenuItem('L1_XE30_EMPTY', ctpid=-1, group='1').setLogic(thr_xe30.condition(1)&cosmiccond).setTriggerType(TT_calo)
-        item_xe35_empty = LVL1MenuItem('L1_XE35_EMPTY', ctpid=-1, group='1').setLogic(thr_xe35.condition(1)&cosmiccond).setTriggerType(TT_calo)
-        item_xe50_empty = LVL1MenuItem('L1_XE50_EMPTY', ctpid=-1, group='1').setLogic(thr_xe50.condition(1)&cosmiccond).setTriggerType(TT_calo)
-
-        item_xe35_bgrp7 = LVL1MenuItem('L1_XE35_BGRP7', ctpid=-1, group='1').setLogic(thr_xe35.condition(1)&bgrp7cond).setTriggerType(TT_calo)
-        item_xe40_bgrp7 = LVL1MenuItem('L1_XE40_BGRP7', ctpid=-1, group='1').setLogic(thr_xe40.condition(1)&bgrp7cond).setTriggerType(TT_calo)
-        item_xe50_bgrp7 = LVL1MenuItem('L1_XE50_BGRP7', ctpid=-1, group='1').setLogic(thr_xe50.condition(1)&bgrp7cond).setTriggerType(TT_calo)
-
-        #pPb items
-
-        item_te1  = LVL1MenuItem('L1_TE1',  ctpid=-1,   group='1').setLogic(thr_te1.condition(1)&physcond).setTriggerType(TT_calo)
-        item_te2  = LVL1MenuItem('L1_TE2',  ctpid=-1,   group='1').setLogic(thr_te2.condition(1)&physcond).setTriggerType(TT_calo)
-        item_te3  = LVL1MenuItem('L1_TE3',  ctpid=-1,   group='1').setLogic(thr_te3.condition(1)&physcond).setTriggerType(TT_calo)
-        item_te4  = LVL1MenuItem('L1_TE4',  ctpid=-1,   group='1').setLogic(thr_te4.condition(1)&physcond).setTriggerType(TT_calo)
-        
-        item_te10  = LVL1MenuItem('L1_TE10',  ctpid=-1,   group='1').setLogic(thr_te10.condition(1)&physcond).setTriggerType(TT_calo)
-        item_te20  = LVL1MenuItem('L1_TE20',  ctpid=-1,   group='1').setLogic(thr_te20.condition(1)&physcond).setTriggerType(TT_calo)
-        item_te30  = LVL1MenuItem('L1_TE30',  ctpid=-1,   group='1').setLogic(thr_te30.condition(1)&physcond).setTriggerType(TT_calo)
-        item_te35  = LVL1MenuItem('L1_TE35',  ctpid=-1,   group='1').setLogic(thr_te35.condition(1)&physcond).setTriggerType(TT_calo)
-        item_te40  = LVL1MenuItem('L1_TE40',  ctpid=-1,   group='1').setLogic(thr_te40.condition(1)&physcond).setTriggerType(TT_calo)
-
-        item_te150 = LVL1MenuItem('L1_TE150', ctpid=0x8a, group='1').setLogic(thr_te150.condition(1)&physcond).setTriggerType(TT_calo)
-        item_te180 = LVL1MenuItem('L1_TE180', ctpid=-1,   group='1').setLogic(thr_te180.condition(1)&physcond).setTriggerType(TT_calo)        
-        item_te250 = LVL1MenuItem('L1_TE250', ctpid=0x8b, group='1').setLogic(thr_te250.condition(1)&physcond).setTriggerType(TT_calo)
-        item_te360 = LVL1MenuItem('L1_TE360', ctpid=0x8c, group='1').setLogic(thr_te360.condition(1)&physcond).setTriggerType(TT_calo)
-        item_te650 = LVL1MenuItem('L1_TE650', ctpid=0x8d, group='1').setLogic(thr_te650.condition(1)&physcond).setTriggerType(TT_calo)
-        # Other TE items for L=10^32 and 10^33
-        item_te530 = LVL1MenuItem('L1_TE530', ctpid=0x8e, group='1').setLogic(thr_te530.condition(1)&physcond).setTriggerType(TT_calo)
-        item_te800 = LVL1MenuItem('L1_TE800', ctpid=0x8f, group='1').setLogic(thr_te800.condition(1)&physcond).setTriggerType(TT_calo)
-        item_te1000 = LVL1MenuItem('L1_TE1000', ctpid=0x90, group='1').setLogic(thr_te1000.condition(1)&physcond).setTriggerType(TT_calo)
-        item_te2000 = LVL1MenuItem('L1_TE2000', ctpid=-1, group='1').setLogic(thr_te2000.condition(1)&physcond).setTriggerType(TT_calo)
-        item_te4000 = LVL1MenuItem('L1_TE4000', ctpid=-1, group='1').setLogic(thr_te4000.condition(1)&physcond).setTriggerType(TT_calo)
-
-
-
-        item_te5  = LVL1MenuItem('L1_TE5',  ctpid=-1,   group='1').setLogic(thr_te5.condition(1)&physcond).setTriggerType(TT_calo)
-        item_te0  = LVL1MenuItem('L1_TE0',  ctpid=-1,   group='1').setLogic(thr_te0.condition(1)&physcond).setTriggerType(TT_calo)
-        item_te50  = LVL1MenuItem('L1_TE50',  ctpid=-1,   group='1').setLogic(thr_te50.condition(1)&physcond).setTriggerType(TT_calo)
-        item_te65  = LVL1MenuItem('L1_TE65',  ctpid=-1,   group='1').setLogic(thr_te65.condition(1)&physcond).setTriggerType(TT_calo)
-        item_te90  = LVL1MenuItem('L1_TE90',  ctpid=-1,   group='1').setLogic(thr_te90.condition(1)&physcond).setTriggerType(TT_calo)
-        item_te100 = LVL1MenuItem('L1_TE100', ctpid=-1,   group='1').setLogic(thr_te100.condition(1)&physcond).setTriggerType(TT_calo)
-        item_te115  = LVL1MenuItem('L1_TE115',  ctpid=-1,   group='1').setLogic(thr_te115.condition(1)&physcond).setTriggerType(TT_calo)
-        
-
-        item_xs15 = LVL1MenuItem('L1_XS15', ctpid=-1, group='1').setLogic(thr_xs15.condition(1)&physcond).setTriggerType(TT_calo)
-        item_xs20 = LVL1MenuItem('L1_XS20', ctpid=-1, group='1').setLogic(thr_xs20.condition(1)&physcond).setTriggerType(TT_calo)
-        item_xs25 = LVL1MenuItem('L1_XS25', ctpid=-1, group='1').setLogic(thr_xs25.condition(1)&physcond).setTriggerType(TT_calo)
-        item_xs30 = LVL1MenuItem('L1_XS30', ctpid=-1, group='1').setLogic(thr_xs30.condition(1)&physcond).setTriggerType(TT_calo)
-        item_xs35 = LVL1MenuItem('L1_XS35', ctpid=-1, group='1').setLogic(thr_xs35.condition(1)&physcond).setTriggerType(TT_calo)
-        item_xs40 = LVL1MenuItem('L1_XS40', ctpid=-1, group='1').setLogic(thr_xs40.condition(1)&physcond).setTriggerType(TT_calo)
-        item_xs45 = LVL1MenuItem('L1_XS45', ctpid=-1, group='1').setLogic(thr_xs45.condition(1)&physcond).setTriggerType(TT_calo)
-        item_xs50 = LVL1MenuItem('L1_XS50', ctpid=-1, group='1').setLogic(thr_xs50.condition(1)&physcond).setTriggerType(TT_calo)
-        item_xs55 = LVL1MenuItem('L1_XS55', ctpid=-1, group='1').setLogic(thr_xs55.condition(1)&physcond).setTriggerType(TT_calo)
-        item_xs60 = LVL1MenuItem('L1_XS60', ctpid=-1, group='1').setLogic(thr_xs60.condition(1)&physcond).setTriggerType(TT_calo)
-        item_xs65 = LVL1MenuItem('L1_XS65', ctpid=-1, group='1').setLogic(thr_xs65.condition(1)&physcond).setTriggerType(TT_calo)
-        
-        item_te10_empty  = LVL1MenuItem('L1_TE10_EMPTY',  ctpid=-1, group='1').setLogic(thr_te10 .condition(1)&cosmiccond).setTriggerType(TT_calo)
-        item_te30_empty  = LVL1MenuItem('L1_TE30_EMPTY',  ctpid=-1, group='1').setLogic(thr_te30 .condition(1)&cosmiccond).setTriggerType(TT_calo)
-        item_te100_empty = LVL1MenuItem('L1_TE100_EMPTY', ctpid=-1, group='1').setLogic(thr_te100.condition(1)&cosmiccond).setTriggerType(TT_calo)
-        item_te150_empty = LVL1MenuItem('L1_TE150_EMPTY', ctpid=-1, group='1').setLogic(thr_te150.condition(1)&cosmiccond).setTriggerType(TT_calo)
-        item_te180_empty = LVL1MenuItem('L1_TE180_EMPTY', ctpid=-1, group='1').setLogic(thr_te180.condition(1)&cosmiccond).setTriggerType(TT_calo)        
-        item_te360_empty = LVL1MenuItem('L1_TE360_EMPTY', ctpid=-1, group='1').setLogic(thr_te360.condition(1)&cosmiccond).setTriggerType(TT_calo)
-        
-        item_je60  = LVL1MenuItem('L1_JE60', ctpid=0x91, group='1').setLogic(thr_je60.condition(1)&physcond).setTriggerType(TT_calo)
-        item_je100 = LVL1MenuItem('L1_JE100', ctpid=0x91, group='1').setLogic(thr_je100.condition(1)&physcond).setTriggerType(TT_calo)
-        item_je120 = LVL1MenuItem('L1_JE120', ctpid=0x91, group='1').setLogic(thr_je120.condition(1)&physcond).setTriggerType(TT_calo)
-        item_je140 = LVL1MenuItem('L1_JE140', ctpid=-1, group='1').setLogic(thr_je140.condition(1)&physcond).setTriggerType(TT_calo)
-        item_je200 = LVL1MenuItem('L1_JE200', ctpid=0x92, group='1').setLogic(thr_je200.condition(1)&physcond).setTriggerType(TT_calo)
-        item_je220 = LVL1MenuItem('L1_JE220', ctpid=0x92, group='1').setLogic(thr_je220.condition(1)&physcond).setTriggerType(TT_calo)
-        item_je280 = LVL1MenuItem('L1_JE280', ctpid=0x93, group='1').setLogic(thr_je280.condition(1)&physcond).setTriggerType(TT_calo)
-        item_je300 = LVL1MenuItem('L1_JE300', ctpid=0x93, group='1').setLogic(thr_je300.condition(1)&physcond).setTriggerType(TT_calo)
-        item_je340 = LVL1MenuItem('L1_JE340', ctpid=0x94, group='1').setLogic(thr_je340.condition(1)&physcond).setTriggerType(TT_calo)
-        item_je350 = LVL1MenuItem('L1_JE350', ctpid=0x94, group='1').setLogic(thr_je350.condition(1)&physcond).setTriggerType(TT_calo)
-        item_je400 = LVL1MenuItem('L1_JE400', ctpid=0x95, group='1').setLogic(thr_je400.condition(1)&physcond).setTriggerType(TT_calo)
-        item_je500 = LVL1MenuItem('L1_JE500', ctpid=0x96, group='1').setLogic(thr_je500.condition(1)&physcond).setTriggerType(TT_calo)
-
-        item_je120_empty = LVL1MenuItem('L1_JE120_EMPTY', ctpid=-1, group='1').setLogic(thr_je120.condition(1)&cosmiccond).setTriggerType(TT_calo)
-        item_je280_empty = LVL1MenuItem('L1_JE280_EMPTY', ctpid=-1, group='1').setLogic(thr_je280.condition(1)&cosmiccond).setTriggerType(TT_calo)
-
-        #'L1_6J10_JE220', 'L1_4J20_JE220', 'L1_3J40_JE220',
-        item_6j10_je220 = LVL1MenuItem('L1_6J10_JE220', ctpid=-1, group='1')\
-                          .setLogic(thr_j10.condition(6)&thr_je220.condition(1)&physcond).setTriggerType(TT_calo)
-        item_4j20_je220 = LVL1MenuItem('L1_4J20_JE220', ctpid=-1, group='1')\
-                          .setLogic(thr_j20.condition(4)&thr_je220.condition(1)&physcond).setTriggerType(TT_calo)
-        item_3j40_je220 = LVL1MenuItem('L1_3J40_JE220', ctpid=-1, group='1')\
-                          .setLogic(thr_j40.condition(3)&thr_je220.condition(1)&physcond).setTriggerType(TT_calo)
-        item_4j15_je220 = LVL1MenuItem('L1_4J15_JE220', ctpid=-1, group='1')\
-                          .setLogic(thr_j15.condition(4)&thr_je220.condition(1)&physcond).setTriggerType(TT_calo)
-        item_3j30_je220 = LVL1MenuItem('L1_3J30_JE220', ctpid=-1, group='1')\
-                          .setLogic(thr_j30.condition(3)&thr_je220.condition(1)&physcond).setTriggerType(TT_calo)
-        
-        # Transient items
-        item_xe35 = LVL1MenuItem('L1_XE35', ctpid=-1, group='1').setLogic(thr_xe35.condition(1)&physcond).setTriggerType(TT_calo)
-        item_xe45 = LVL1MenuItem('L1_XE45', ctpid=-1, group='1').setLogic(thr_xe45.condition(1)&physcond).setTriggerType(TT_calo)
-        item_xe60 = LVL1MenuItem('L1_XE60', ctpid=-1, group='1').setLogic(thr_xe60.condition(1)&physcond).setTriggerType(TT_calo)
-        item_xe90 = LVL1MenuItem('L1_XE90', ctpid=-1, group='1').setLogic(thr_xe90.condition(1)&physcond).setTriggerType(TT_calo)
-        item_xe110 = LVL1MenuItem('L1_XE110', ctpid=-1, group='1').setLogic(thr_xe110.condition(1)&physcond).setTriggerType(TT_calo)
-#        item_xe150 = LVL1MenuItem('L1_XE150', ctpid=-1, group='1').setLogic(thr_xe150.condition(1)&physcond).setTriggerType(TT_calo)
-        item_te150 = LVL1MenuItem('L1_TE150', ctpid=-1, group='1').setLogic(thr_te150.condition(1)&physcond).setTriggerType(TT_calo)
-        item_te240 = LVL1MenuItem('L1_TE240', ctpid=-1, group='1').setLogic(thr_te240.condition(1)&physcond).setTriggerType(TT_calo)
-        item_te300 = LVL1MenuItem('L1_TE300', ctpid=-1, group='1').setLogic(thr_te300.condition(1)&physcond).setTriggerType(TT_calo)
-        item_te400 = LVL1MenuItem('L1_TE400', ctpid=-1, group='1').setLogic(thr_te400.condition(1)&physcond).setTriggerType(TT_calo)
-        item_te500 = LVL1MenuItem('L1_TE500', ctpid=-1, group='1').setLogic(thr_te500.condition(1)&physcond).setTriggerType(TT_calo)
-        item_te550 = LVL1MenuItem('L1_TE550', ctpid=-1, group='1').setLogic(thr_te550.condition(1)&physcond).setTriggerType(TT_calo)
-        item_te480 = LVL1MenuItem('L1_TE480', ctpid=-1, group='1').setLogic(thr_te480.condition(1)&physcond).setTriggerType(TT_calo)
-        item_te600 = LVL1MenuItem('L1_TE600', ctpid=-1, group='1').setLogic(thr_te600.condition(1)&physcond).setTriggerType(TT_calo)
-        item_te700 = LVL1MenuItem('L1_TE700', ctpid=-1, group='1').setLogic(thr_te700.condition(1)&physcond).setTriggerType(TT_calo)
-        item_te650 = LVL1MenuItem('L1_TE650', ctpid=-1, group='1').setLogic(thr_te650.condition(1)&physcond).setTriggerType(TT_calo)
-        item_te750 = LVL1MenuItem('L1_TE750', ctpid=-1, group='1').setLogic(thr_te750.condition(1)&physcond).setTriggerType(TT_calo)
-        item_te900 = LVL1MenuItem('L1_TE900', ctpid=-1, group='1').setLogic(thr_te900.condition(1)&physcond).setTriggerType(TT_calo)
-
-        
-        # Combined items [0xa0:0xff], [0x30:0x3f],
-
-        # EM + (XE, MU, TAU)
-        item_em10_xe15 = LVL1MenuItem('L1_EM10_XE15', ctpid=0xa0)\
-                         .setLogic(thr_em10.condition(1)&thr_xe15.condition(1)&physcond)
-        item_em10_xe20 = LVL1MenuItem('L1_EM10_XE20', ctpid=0xa0)\
-                         .setLogic(thr_em10.condition(1)&thr_xe20.condition(1)&physcond)
-        item_em10vh_xe20 = LVL1MenuItem('L1_EM10VH_XE20', ctpid=-1)\
-                           .setLogic(thr_em10vh.condition(1)&thr_xe20.condition(1)&physcond).setTriggerType(TT_calo|TT_caloem)
-        item_em10h_xe20 = LVL1MenuItem('L1_EM10H_XE20', ctpid=-1)\
-                           .setLogic(thr_em10h.condition(1)&thr_xe20.condition(1)&physcond).setTriggerType(TT_calo|TT_caloem)
-        item_em11h_xe20 = LVL1MenuItem('L1_EM11H_XE20', ctpid=-1)\
-                          .setLogic(thr_em11h.condition(1)&thr_xe20.condition(1)&physcond).setTriggerType(TT_calo|TT_caloem)
-        item_em10_xe30 = LVL1MenuItem('L1_EM10_XE30', ctpid=-1)\
-                         .setLogic(thr_em10.condition(1)&thr_xe30.condition(1)&physcond)
-        item_em10vh_xe30 = LVL1MenuItem('L1_EM10VH_XE30', ctpid=-1)\
-                           .setLogic(thr_em10vh.condition(1)&thr_xe30.condition(1)&physcond).setTriggerType(TT_calo|TT_caloem)
-        item_em10h_xe30 = LVL1MenuItem('L1_EM10H_XE30', ctpid=-1)\
-                           .setLogic(thr_em10h.condition(1)&thr_xe30.condition(1)&physcond).setTriggerType(TT_calo|TT_caloem)
-        item_em11h_xe30 = LVL1MenuItem('L1_EM11H_XE30', ctpid=-1)\
-                          .setLogic(thr_em11h.condition(1)&thr_xe30.condition(1)&physcond).setTriggerType(TT_calo|TT_caloem)
-        item_em13_xe15 = LVL1MenuItem('L1_EM13_XE15', ctpid=0xa0)\
-                         .setLogic(thr_em13.condition(1)&thr_xe15.condition(1)&physcond)
-        item_em10_xe10 = LVL1MenuItem('L1_EM10_XE10', ctpid=0xa0)\
-                         .setLogic(thr_em10.condition(1)&thr_xe10.condition(1)&physcond)
-        item_em14_xe10 = LVL1MenuItem('L1_EM14_XE10', ctpid=-1)\
-                         .setLogic(thr_em14.condition(1)&thr_xe10.condition(1)&physcond)        
-        item_em10vh_xe35 = LVL1MenuItem('L1_EM10VH_XE35', ctpid=-1)\
-                           .setLogic(thr_em10vh.condition(1)&thr_xe35.condition(1)&physcond).setTriggerType(TT_calo|TT_caloem)        
-        item_em10h_xe35 = LVL1MenuItem('L1_EM10H_XE35', ctpid=-1)\
-                           .setLogic(thr_em10h.condition(1)&thr_xe35.condition(1)&physcond).setTriggerType(TT_calo|TT_caloem)
-        item_em11h_xe35 = LVL1MenuItem('L1_EM11H_XE35', ctpid=-1)\
-                          .setLogic(thr_em11h.condition(1)&thr_xe35.condition(1)&physcond).setTriggerType(TT_calo|TT_caloem)
-        item_em18_xe15 = LVL1MenuItem('L1_EM18_XE15', ctpid=0xa1)\
-                         .setLogic(thr_em18.condition(1)&thr_xe15.condition(1)&physcond)
-        item_em5_mu0 = LVL1MenuItem('L1_EM5_MU0', ctpid=0xa2)\
-                       .setLogic(thr_em5.condition(1)&thr_mu0.condition(1)&physcond)
-        item_em10_mu0 = LVL1MenuItem('L1_EM10_MU0', ctpid=0xa2)\
-                        .setLogic(thr_em10.condition(1)&thr_mu0.condition(1)&physcond)
-        item_em10_mu6 = LVL1MenuItem('L1_EM10_MU6', ctpid=0xa2)\
-                        .setLogic(thr_em10.condition(1)&thr_mu6.condition(1)&physcond)
-        item_em10vh_mu6 = LVL1MenuItem('L1_EM10VH_MU6', ctpid=-1)\
-                          .setLogic(thr_em10vh.condition(1)&thr_mu6.condition(1)&physcond).setTriggerType(TT_calo|TT_caloem)
-        item_em10h_mu6 = LVL1MenuItem('L1_EM10H_MU6', ctpid=-1)\
-                          .setLogic(thr_em10h.condition(1)&thr_mu6.condition(1)&physcond).setTriggerType(TT_calo|TT_caloem)
-        item_em11h_mu6 = LVL1MenuItem('L1_EM11H_MU6', ctpid=-1)\
-                         .setLogic(thr_em11h.condition(1)&thr_mu6.condition(1)&physcond).setTriggerType(TT_calo|TT_caloem)
-        item_em16vh_mu4 = LVL1MenuItem('L1_EM16VH_MU4', ctpid=-1)\
-                          .setLogic(thr_em16vh.condition(1)&thr_mu4.condition(1)&physcond).setTriggerType(TT_calo|TT_caloem)
-        item_em16h_mu4 = LVL1MenuItem('L1_EM16H_MU4', ctpid=-1)\
-                          .setLogic(thr_em16h.condition(1)&thr_mu4.condition(1)&physcond).setTriggerType(TT_calo|TT_caloem)
-        item_em18h_mu4 = LVL1MenuItem('L1_EM18H_MU4', ctpid=-1)\
-                         .setLogic(thr_em18h.condition(1)&thr_mu4.condition(1)&physcond).setTriggerType(TT_calo|TT_caloem)
-        item_2em5_mu0 = LVL1MenuItem('L1_2EM5_MU0', ctpid=0xa2)\
-                        .setLogic(thr_em5.condition(2)&thr_mu0.condition(1)&physcond)
-        item_2em5_mu6 = LVL1MenuItem('L1_2EM5_MU6', ctpid=0xa2)\
-                        .setLogic(thr_em5.condition(2)&thr_mu6.condition(1)&physcond)
-        item_2em6_mu6 = LVL1MenuItem('L1_2EM6_MU6', ctpid=-1)\
-                        .setLogic(thr_em6.condition(2)&thr_mu6.condition(1)&physcond)
-        item_2em7_mu6 = LVL1MenuItem('L1_2EM7_MU6', ctpid=0xa2)\
-                        .setLogic(thr_em7.condition(2)&thr_mu6.condition(1)&physcond)
-        item_em13i_mu10i = LVL1MenuItem('L1_EM13I_MU10I', ctpid=0xae)\
-                        .setLogic(thr_em13i.condition(1)&thr_mu10.condition(1)&physcond)         
-        item_2em10_mu6 = LVL1MenuItem('L1_2EM10_MU6', ctpid=0xa3)\
-                         .setLogic(thr_em10.condition(2)&thr_mu6.condition(1)&physcond)        
-        item_2em13_mu6 = LVL1MenuItem('L1_2EM13_MU6', ctpid=0xa3)\
-                         .setLogic(thr_em13.condition(2)&thr_mu6.condition(1)&physcond)
-        item_2em14_mu6 = LVL1MenuItem('L1_2EM14_MU6', ctpid=0xa4)\
-                         .setLogic(thr_em14.condition(2)&thr_mu6.condition(1)&physcond)        
-        item_2em18_mu6 = LVL1MenuItem('L1_2EM18_MU6', ctpid=0xa4)\
-                         .setLogic(thr_em18.condition(2)&thr_mu6.condition(1)&physcond)
-        item_em5_mu6   = LVL1MenuItem('L1_EM5_MU6', ctpid=0xa5)\
-                         .setLogic(thr_em5.condition(1)&thr_mu6.condition(1)&physcond)
-        item_em6_mu6   = LVL1MenuItem('L1_EM6_MU6', ctpid=-1)\
-                         .setLogic(thr_em6.condition(1)&thr_mu6.condition(1)&physcond)
-        item_em5_mu10  = LVL1MenuItem('L1_EM5_MU10', ctpid=-1)\
-                         .setLogic(thr_em5.condition(1)&thr_mu10.condition(1)&physcond)          
-        item_em6_mu10  = LVL1MenuItem('L1_EM6_MU10', ctpid=-1)\
-                         .setLogic(thr_em6.condition(1)&thr_mu10.condition(1)&physcond)
-        item_em7_mu6   = LVL1MenuItem('L1_EM7_MU6', ctpid=0xa5)\
-                         .setLogic(thr_em7.condition(1)&thr_mu6.condition(1)&physcond)
-        item_em10_xe15  = LVL1MenuItem('L1_EM10_XE15', ctpid=0xa6)\
-                          .setLogic(thr_em10.condition(1)&thr_xe15.condition(1)&physcond)        
-        item_em5_xe20  = LVL1MenuItem('L1_EM5_XE20', ctpid=0xa6)\
-                         .setLogic(thr_em5.condition(1)&thr_xe20.condition(1)&physcond)        
-        item_em7_xe20  = LVL1MenuItem('L1_EM7_XE20', ctpid=0xa6)\
-                         .setLogic(thr_em7.condition(1)&thr_xe20.condition(1)&physcond)
-        item_em5_xe15  = LVL1MenuItem('L1_EM5_XE15', ctpid=0xa6)\
-                         .setLogic(thr_em5.condition(1)&thr_xe15.condition(1)&physcond)
-        item_2em3_tau6  = LVL1MenuItem('L1_2EM3_TAU6', ctpid=0xa7)\
-                         .setLogic(thr_em3.condition(2)&thr_tau6.condition(1)&physcond)
-        item_em14_xe15 = LVL1MenuItem('L1_EM14_XE15', ctpid=-1)\
-                         .setLogic(thr_em14.condition(1)&thr_xe15.condition(1)&physcond)        
-        item_em14_xe20 = LVL1MenuItem('L1_EM14_XE20', ctpid=-1)\
-                         .setLogic(thr_em14.condition(1)&thr_xe20.condition(1)&physcond)
-        item_em12_xe20 = LVL1MenuItem('L1_EM12_XE20', ctpid=-1)\
-                         .setLogic(thr_em12.condition(1)&thr_xe20.condition(1)&physcond)
-        item_em12_xe30 = LVL1MenuItem('L1_EM12_XE30', ctpid=-1)\
-                         .setLogic(thr_em12.condition(1)&thr_xe30.condition(1)&physcond)        
-        item_em13_xe20 = LVL1MenuItem('L1_EM13_XE20', ctpid=-1)\
-                         .setLogic(thr_em13.condition(1)&thr_xe20.condition(1)&physcond)
-        item_em16v_xe20 = LVL1MenuItem('L1_EM16V_XE20', ctpid=-1)\
-                         .setLogic(thr_em16v.condition(1)&thr_xe20.condition(1)&physcond)
-        item_em13_xe30 = LVL1MenuItem('L1_EM13_XE30', ctpid=-1)\
-                         .setLogic(thr_em13.condition(1)&thr_xe30.condition(1)&physcond)
-        item_em18_xe20 = LVL1MenuItem('L1_EM18_XE20', ctpid=0xa8)\
-                         .setLogic(thr_em18.condition(1)&thr_xe20.condition(1)&physcond)
-        item_em10vh_xe20_2j10_j30 = LVL1MenuItem('L1_EM10VH_XE20_2J10_J30', ctpid=0xa8)\
-                                    .setLogic(thr_em10vh.condition(1)&thr_xe20.condition(1)&thr_j10.condition(2)&thr_j30.condition(1)&physcond)
-        item_em10vh_xe25_2j10_j30 = LVL1MenuItem('L1_EM10VH_XE25_2J10_J30', ctpid=0xa8)\
-                                    .setLogic(thr_em10vh.condition(1)&thr_xe25.condition(1)&thr_j10.condition(2)&thr_j30.condition(1)&physcond)
-        item_em10_mu15  = LVL1MenuItem('L1_EM10_MU15', ctpid=0xa9)\
-                         .setLogic(thr_em10.condition(1)&thr_mu15.condition(1)&physcond)
-        item_em10i_mu15 = LVL1MenuItem('L1_EM10I_MU15', ctpid=0xaa)\
-                         .setLogic(thr_em10i.condition(1)&thr_mu15.condition(1)&physcond)        
-        item_em13_mu15  = LVL1MenuItem('L1_EM13_MU15', ctpid=0xa9)\
-                         .setLogic(thr_em13.condition(1)&thr_mu15.condition(1)&physcond)
-        item_em13i_mu15 = LVL1MenuItem('L1_EM13I_MU15', ctpid=0xaa)\
-                         .setLogic(thr_em13i.condition(1)&thr_mu15.condition(1)&physcond)
-        item_em14i_xe15 = LVL1MenuItem('L1_EM14I_XE15', ctpid=0xab)\
-                         .setLogic(thr_em14i.condition(1)&thr_xe15.condition(1)&physcond)        
-        item_em18i_xe15 = LVL1MenuItem('L1_EM18I_XE15', ctpid=0xab)\
-                         .setLogic(thr_em18i.condition(1)&thr_xe15.condition(1)&physcond)
-        item_em5i_mu6   = LVL1MenuItem('L1_EM5I_MU6', ctpid=0xac)\
-                         .setLogic(thr_em5i.condition(1)&thr_mu6.condition(1)&physcond)        
-        item_em7i_mu6   = LVL1MenuItem('L1_EM7I_MU6', ctpid=0xac)\
-                         .setLogic(thr_em7i.condition(1)&thr_mu6.condition(1)&physcond)
-        item_em14i_xe20 = LVL1MenuItem('L1_EM14I_XE20', ctpid=0xad)\
-                         .setLogic(thr_em14i.condition(1)&thr_xe20.condition(1)&physcond)        
-        item_em18i_xe20 = LVL1MenuItem('L1_EM18I_XE20', ctpid=0xad)\
-                         .setLogic(thr_em18i.condition(1)&thr_xe20.condition(1)&physcond)
-        item_em10i_mu10 = LVL1MenuItem('L1_EM10I_MU10', ctpid=0xae)\
-                          .setLogic(thr_em10i.condition(1)&thr_mu10.condition(1)&physcond)        
-        item_em13i_mu10 = LVL1MenuItem('L1_EM13I_MU10', ctpid=0xae)\
-                          .setLogic(thr_em13i.condition(1)&thr_mu10.condition(1)&physcond)
-        item_em7_xs30 = LVL1MenuItem('L1_EM7_XS30', ctpid=-1)\
-                         .setLogic(thr_em7.condition(1)&thr_xs30.condition(1)&physcond)
-        item_em8_xs30 = LVL1MenuItem('L1_EM8_XS30', ctpid=-1)\
-                       .setLogic(thr_em8.condition(1)&thr_xs30.condition(1)&physcond)
-        item_em7_xs45 = LVL1MenuItem('L1_EM7_XS45', ctpid=-1)\
-                        .setLogic(thr_em7.condition(1)&thr_xs45.condition(1)&physcond)
-        item_em8_xs45 = LVL1MenuItem('L1_EM8_XS45', ctpid=-1)\
-                        .setLogic(thr_em8.condition(1)&thr_xs45.condition(1)&physcond)
-        item_em6_xs30 = LVL1MenuItem('L1_EM6_XS30', ctpid=-1)\
-                        .setLogic(thr_em6.condition(1)&thr_xs30.condition(1)&physcond)
-        item_em6_xs45 = LVL1MenuItem('L1_EM6_XS45', ctpid=-1)\
-                        .setLogic(thr_em6.condition(1)&thr_xs45.condition(1)&physcond)
-        item_em6_xs50 = LVL1MenuItem('L1_EM6_XS50', ctpid=-1)\
-                        .setLogic(thr_em6.condition(1)&thr_xs50.condition(1)&physcond)
-        item_em6_xs55 = LVL1MenuItem('L1_EM6_XS55', ctpid=-1)\
-                        .setLogic(thr_em6.condition(1)&thr_xs55.condition(1)&physcond)
-        item_em6_xs60 = LVL1MenuItem('L1_EM6_XS60', ctpid=-1)\
-                        .setLogic(thr_em6.condition(1)&thr_xs60.condition(1)&physcond)
-        item_em16v_xs45 = LVL1MenuItem('L1_EM16V_XS45', ctpid=-1)\
-                          .setLogic(thr_em16v.condition(1)&thr_xs45.condition(1)&physcond)
-        item_em10_xs45 = LVL1MenuItem('L1_EM10_XS45', ctpid=0xa0)\
-                         .setLogic(thr_em10.condition(1)&thr_xs45.condition(1)&physcond)
-        item_em12_xs45 = LVL1MenuItem('L1_EM12_XS45', ctpid=-1)\
-                        .setLogic(thr_em12.condition(1)&thr_xs45.condition(1)&physcond)
-        item_em12_xs30 = LVL1MenuItem('L1_EM12_XS30', ctpid=-1)\
-                         .setLogic(thr_em12.condition(1)&thr_xs30.condition(1)&physcond)
-        item_em13_xs45 = LVL1MenuItem('L1_EM13_XS45', ctpid=-1)\
-                         .setLogic(thr_em13.condition(1)&thr_xs45.condition(1)&physcond)
-        item_em13_xs30 = LVL1MenuItem('L1_EM13_XS30', ctpid=-1)\
-                         .setLogic(thr_em13.condition(1)&thr_xs30.condition(1)&physcond)
-        item_em10_xs50 = LVL1MenuItem('L1_EM10_XS50', ctpid=0xa0)\
-                         .setLogic(thr_em10.condition(1)&thr_xs50.condition(1)&physcond)
-        item_em12_xs50 = LVL1MenuItem('L1_EM12_XS50', ctpid=-1)\
-                         .setLogic(thr_em12.condition(1)&thr_xs50.condition(1)&physcond)
-        item_em12_3j10 = LVL1MenuItem('L1_EM12_3J10', ctpid=-1)\
-                         .setLogic(thr_em12.condition(1)&thr_j10.condition(3)&physcond)
-        item_em12_4j10 = LVL1MenuItem('L1_EM12_4J10', ctpid=-1)\
-                         .setLogic(thr_em12.condition(1)&thr_j10.condition(4)&physcond)
-        item_em13_3j10 = LVL1MenuItem('L1_EM13_3J10', ctpid=-1)\
-                         .setLogic(thr_em13.condition(1)&thr_j10.condition(3)&physcond)
-        item_em13_4j10 = LVL1MenuItem('L1_EM13_4J10', ctpid=-1)\
-                         .setLogic(thr_em13.condition(1)&thr_j10.condition(4)&physcond)
-                
-        # TAU + EM
-        item_2tau5_em5        = LVL1MenuItem('L1_2TAU5_EM5', ctpid=0xaf)\
-                                .setLogic(thr_tau5.condition(2)&thr_em5.condition(1)&physcond)\
-                                .setTriggerType(TT_calo)
-        item_2tau5_em10        = LVL1MenuItem('L1_2TAU5_EM10', ctpid=0xaf)\
-                                .setLogic(thr_tau5.condition(2)&thr_em10.condition(1)&physcond)\
-                                .setTriggerType(TT_calo)
-        item_2tau5_em7        = LVL1MenuItem('L1_2TAU5_EM7', ctpid=0xaf)\
-                                .setLogic(thr_tau5.condition(2)&thr_em7.condition(1)&physcond)\
-                                .setTriggerType(TT_calo)
-        item_2tau6_em5        = LVL1MenuItem('L1_2TAU6_EM5', ctpid=-1)\
-                                .setLogic(thr_tau6.condition(2)&thr_em5.condition(1)&physcond)\
-                                .setTriggerType(TT_calo)          
-        item_2tau6_em7        = LVL1MenuItem('L1_2TAU6_EM7', ctpid=0xaf)\
-                                .setLogic(thr_tau6.condition(2)&thr_em7.condition(1)&physcond)\
-                                .setTriggerType(TT_calo)
-        item_2tau6_em10       = LVL1MenuItem('L1_2TAU6_EM10', ctpid=0x0)\
-                                .setLogic(thr_tau6.condition(2)&thr_em10.condition(1)&physcond)\
-                                .setTriggerType(TT_calo)
-        item_2tau8_em10       = LVL1MenuItem('L1_2TAU8_EM10', ctpid=-1)\
-                                .setLogic(thr_tau8.condition(2)&thr_em10.condition(1)&physcond)\
-                                .setTriggerType(TT_calo)
-        item_2tau8_em10vh = LVL1MenuItem('L1_2TAU8_EM10VH', ctpid=-1, group='1')\
-                            .setLogic(thr_tau8.condition(2)&thr_em10vh.condition(1)&physcond).setTriggerType(TT_calo|TT_caloem)
-        item_2tau8_em10h = LVL1MenuItem('L1_2TAU8_EM10H', ctpid=-1, group='1')\
-                            .setLogic(thr_tau8.condition(2)&thr_em10h.condition(1)&physcond).setTriggerType(TT_calo|TT_caloem)
-        item_2tau8_em11h = LVL1MenuItem('L1_2TAU8_EM11H', ctpid=-1, group='1')\
-                           .setLogic(thr_tau8.condition(2)&thr_em11h.condition(1)&physcond).setTriggerType(TT_calo|TT_caloem)
-        item_2tau8i_em10vh = LVL1MenuItem('L1_2TAU8I_EM10VH', ctpid=-1, group='1')\
-                             .setLogic(thr_tau8i.condition(2)&thr_em10vh.condition(1)&physcond).setTriggerType(TT_calo|TT_caloem)
-        item_2tau8v_em10vh = LVL1MenuItem('L1_2TAU8V_EM10VH', ctpid=-1, group='1')\
-                             .setLogic(thr_tau8v.condition(2)&thr_em10vh.condition(1)&physcond).setTriggerType(TT_calo|TT_caloem)
-
-        item_2tau11i_em14vh = LVL1MenuItem('L1_2TAU11I_EM14VH', ctpid=-1, group='1')\
-                              .setLogic(thr_tau11i.condition(2)&thr_em14vh.condition(1)&physcond).setTriggerType(TT_calo|TT_caloem)
-        item_2tau11_tau20_em14vh = LVL1MenuItem('L1_2TAU11_TAU20_EM14VH', ctpid=-1, group='1')\
-                                   .setLogic(thr_tau11.condition(2)&thr_tau20.condition(1)&thr_em14vh.condition(1)&physcond).setTriggerType(TT_calo|TT_caloem)
-        item_2tau11_tau20_em10vh = LVL1MenuItem('L1_2TAU11_TAU20_EM10VH', ctpid=-1, group='1')\
-                                   .setLogic(thr_tau11.condition(2)&thr_tau20.condition(1)&thr_em10vh.condition(1)&physcond).setTriggerType(TT_calo|TT_caloem)
-        item_2tau6_em10_j5       = LVL1MenuItem('L1_2TAU6_EM10_J5', ctpid=0x0)\
-                                   .setLogic(thr_tau6.condition(2)&thr_em10.condition(1)&thr_j5.condition(1)&physcond)\
-                                   .setTriggerType(TT_calo)          
-        item_2tau6_em10_j10      = LVL1MenuItem('L1_2TAU6_EM10_J10', ctpid=0x0)\
-                                   .setLogic(thr_tau6.condition(2)&thr_em10.condition(1)&thr_j10.condition(1)&physcond)\
-                                   .setTriggerType(TT_calo)          
-        item_2tau6_mu10_j5       = LVL1MenuItem('L1_2TAU6_MU10_J5', ctpid=0x0)\
-                                   .setLogic(thr_tau6.condition(2)&thr_mu10.condition(1)&thr_j5.condition(1)&physcond)\
-                                   .setTriggerType(TT_calo)          
-        item_2tau6_mu10_j10      = LVL1MenuItem('L1_2TAU6_MU10_J10', ctpid=0x0)\
-                                   .setLogic(thr_tau6.condition(2)&thr_mu10.condition(1)&thr_j10.condition(1)&physcond)\
-                                   .setTriggerType(TT_calo)          
-        item_2tau11_tau15       = LVL1MenuItem('L1_2TAU11_TAU15', ctpid=0x0)\
-                                .setLogic(thr_tau11.condition(2)&thr_tau15.condition(1)&physcond)\
-                                .setTriggerType(TT_calo)          
-        item_2tau11_tau20       = LVL1MenuItem('L1_2TAU11_TAU20', ctpid=-1)\
-                                .setLogic(thr_tau11.condition(2)&thr_tau20.condition(1)&physcond)\
-                                .setTriggerType(TT_calo)          
-        item_2tau11i_tau15       = LVL1MenuItem('L1_2TAU11I_TAU15', ctpid=0x0)\
-                                   .setLogic(thr_tau11i.condition(2)&thr_tau15.condition(1)&physcond)\
-                                   .setTriggerType(TT_calo)
-        item_2tau15_tau20       = LVL1MenuItem('L1_2TAU15_TAU20', ctpid=0x0)\
-                                .setLogic(thr_tau15.condition(2)&thr_tau20.condition(1)&physcond)\
-                                .setTriggerType(TT_calo)          
-        item_2tau6_tau9i_em5  = LVL1MenuItem('L1_2TAU6_TAU9I_EM5', ctpid=0xb0)\
-                                .setLogic(thr_tau6.condition(2)&thr_tau9i.condition(1)&thr_em5.condition(1)&physcond)
-        item_2tau6_tau9i_em7  = LVL1MenuItem('L1_2TAU6_TAU9I_EM7', ctpid=0xb0)\
-                                .setLogic(thr_tau6.condition(2)&thr_tau9i.condition(1)&thr_em7.condition(1)&physcond)
-        item_2tau5_tau6i_em5  = LVL1MenuItem('L1_2TAU5_TAU6I_EM5', ctpid=-1)\
-                                .setLogic(thr_tau5.condition(2)&thr_tau6i.condition(1)&thr_em5.condition(1)&physcond)
-        item_2tau5_tau6_em5  = LVL1MenuItem('L1_2TAU5_TAU6_EM5', ctpid=0xb0)\
-                                .setLogic(thr_tau5.condition(2)&thr_tau6.condition(1)&thr_em5.condition(1)&physcond)        
-        item_tau16_em5        = LVL1MenuItem('L1_TAU16_EM5', ctpid=0xb1)\
-                                .setLogic(thr_tau16.condition(1)&thr_em5.condition(1)&physcond)        
-        item_tau16_em7        = LVL1MenuItem('L1_TAU16_EM7', ctpid=0xb1)\
-                                .setLogic(thr_tau16.condition(1)&thr_em7.condition(1)&physcond)
-        item_tau11_em5        = LVL1MenuItem('L1_TAU11_EM5', ctpid=0xb1)\
-                                .setLogic(thr_tau11.condition(1)&thr_em5.condition(1)&physcond)
-        item_tau30_em10vh     = LVL1MenuItem('L1_TAU30_EM10VH', ctpid=-1)\
-                                .setLogic(thr_tau30.condition(1)&thr_em10vh.condition(1)&physcond)\
-                                .setTriggerType(TT_calo|TT_caloem)
-        item_tau20_em10vh     = LVL1MenuItem('L1_TAU20_EM10VH', ctpid=-1)\
-                                .setLogic(thr_tau20.condition(1)&thr_em10vh.condition(1)&physcond)\
-                                .setTriggerType(TT_calo|TT_caloem)
-        item_tau20_em10h     = LVL1MenuItem('L1_TAU20_EM10H', ctpid=-1)\
-                                .setLogic(thr_tau20.condition(1)&thr_em10h.condition(1)&physcond)\
-                                .setTriggerType(TT_calo|TT_caloem)
-        item_tau20_em11h     = LVL1MenuItem('L1_TAU20_EM11H', ctpid=-1)\
-                               .setLogic(thr_tau20.condition(1)&thr_em11h.condition(1)&physcond)\
-                               .setTriggerType(TT_calo|TT_caloem)
-        item_2tau11_em10        = LVL1MenuItem('L1_2TAU11_EM10', ctpid=-1)\
-                                .setLogic(thr_tau11.condition(2)&thr_em10.condition(1)&physcond)
-        item_2tau11_em10vh      = LVL1MenuItem('L1_2TAU11_EM10VH', ctpid=-1)\
-                                  .setLogic(thr_tau11.condition(2)&thr_em10vh.condition(1)&physcond)\
-                                  .setTriggerType(TT_calo|TT_caloem)
-        item_2tau11_em10h      = LVL1MenuItem('L1_2TAU11_EM10H', ctpid=-1)\
-                                  .setLogic(thr_tau11.condition(2)&thr_em10h.condition(1)&physcond)\
-                                  .setTriggerType(TT_calo|TT_caloem)
-        item_2tau11_em11h      = LVL1MenuItem('L1_2TAU11_EM11H', ctpid=-1)\
-                                 .setLogic(thr_tau11.condition(2)&thr_em11h.condition(1)&physcond)\
-                                 .setTriggerType(TT_calo|TT_caloem)
-        item_2tau9i_em10i     = LVL1MenuItem('L1_2TAU9I_EM10I', ctpid=0xb2)\
-                                .setLogic(thr_tau9i.condition(2)&thr_em10i.condition(1)&physcond)        
-        item_2tau9i_em13i     = LVL1MenuItem('L1_2TAU9I_EM13I', ctpid=0xb2)\
-                                .setLogic(thr_tau9i.condition(2)&thr_em13i.condition(1)&physcond)
-        item_2tau16i_em13i    = LVL1MenuItem('L1_2TAU16I_EM13I', ctpid=0xb2)\
-                                .setLogic(thr_tau16i.condition(2)&thr_em13i.condition(1)&physcond)         
-        item_2tau6i_em10i     = LVL1MenuItem('L1_2TAU6I_EM10I', ctpid=0xb2)\
-                                .setLogic(thr_tau6i.condition(2)&thr_em10i.condition(1)&physcond)        
-        item_2tau6i_em13i     = LVL1MenuItem('L1_2TAU6I_EM13I', ctpid=0xb2)\
-                                .setLogic(thr_tau6i.condition(2)&thr_em13i.condition(1)&physcond)
-        item_tau9i_em10i      = LVL1MenuItem('L1_TAU9I_EM10I', ctpid=0xb3)\
-                                .setLogic(thr_tau9i.condition(1)&thr_em10i.condition(1)&physcond)        
-        item_tau9i_em13i      = LVL1MenuItem('L1_TAU9I_EM13I', ctpid=0xb3)\
-                                .setLogic(thr_tau9i.condition(1)&thr_em13i.condition(1)&physcond)
-        item_tau11_2j10_j20_xe20  = LVL1MenuItem('L1_TAU11_2J10_J20_XE20', ctpid=-1)\
-                                    .setLogic(thr_tau11.condition(1)&thr_j10.condition(2)&thr_j20.condition(1)&thr_xe20.condition(1)&physcond)\
-                                    .setTriggerType(TT_calo)          
-        
-        item_mu15_xe15 = LVL1MenuItem('L1_MU15_XE15', ctpid=0xb4)\
-                         .setLogic(thr_mu15.condition(1)&thr_xe15.condition(1)&physcond)
-        item_mu15_xe10 = LVL1MenuItem('L1_MU15_XE10', ctpid=0xb4)\
-                         .setLogic(thr_mu15.condition(1)&thr_xe10.condition(1)&physcond)
-        item_2mu0_xe20 = LVL1MenuItem('L1_2MU0_XE20',  ctpid=-1)\
-                         .setLogic(thr_mu0.condition(2)&thr_xe20.condition(1)&physcond)\
-                         .setTriggerType(TT_rpcin|TT_calo)
-        item_2mu0_xe25 = LVL1MenuItem('L1_2MU0_XE25',  ctpid=-1)\
-                         .setLogic(thr_mu0.condition(2)&thr_xe25.condition(1)&physcond)\
-                         .setTriggerType(TT_rpcin|TT_calo)
-        item_mu0_j5    = LVL1MenuItem('L1_MU0_J5', ctpid=0xb5)\
-                         .setLogic(thr_mu0.condition(1)&thr_j5.condition(1)&physcond)\
-                         .setTriggerType(TT_rpcin|TT_calo)
-        item_mu0_j50    = LVL1MenuItem('L1_MU0_J50', ctpid=0xb5)\
-                          .setLogic(thr_mu0.condition(1)&thr_j50.condition(1)&physcond)\
-                          .setTriggerType(TT_rpcin|TT_calo)
-        item_mu4_j15    = LVL1MenuItem('L1_MU4_J15', ctpid=-1)\
-                          .setLogic(thr_mu4.condition(1)&thr_j15.condition(1)&physcond)\
-                          .setTriggerType(TT_rpcin|TT_calo)
-        item_mu4_j50    = LVL1MenuItem('L1_MU4_J50', ctpid=-1)\
-                          .setLogic(thr_mu4.condition(1)&thr_j50.condition(1)&physcond)\
-                          .setTriggerType(TT_rpcin|TT_calo)
-        item_mu0_j10   = LVL1MenuItem('L1_MU0_J10', ctpid=0xb6)\
-                         .setLogic(thr_mu0.condition(1)&thr_j10.condition(1)&physcond)\
-                         .setTriggerType(TT_rpcin|TT_calo)
-        item_mu4_j10   = LVL1MenuItem('L1_MU4_J10', ctpid=-1)\
-                         .setLogic(thr_mu4.condition(1)&thr_j10.condition(1)&physcond)\
-                         .setTriggerType(TT_rpcin|TT_calo)
-        item_mu0_j20   = LVL1MenuItem('L1_MU0_J20', ctpid=0xb7)\
-                         .setLogic(thr_mu0.condition(1)&thr_j20.condition(1)&physcond)\
-                         .setTriggerType(TT_rpcin|TT_calo)
-        item_mu0_j40   = LVL1MenuItem('L1_MU0_J40', ctpid=0xb8)\
-                         .setLogic(thr_mu0.condition(1)&thr_j40.condition(1)&physcond) # new jet threshold
-        item_mu0_j70   = LVL1MenuItem('L1_MU0_J70', ctpid=0xb9)\
-                         .setLogic(thr_mu0.condition(1)&thr_j70.condition(1)&physcond) # new jet threshold
-        item_mu0_j100   = LVL1MenuItem('L1_MU0_J100', ctpid=0xba)\
-                         .setLogic(thr_mu0.condition(1)&thr_j100.condition(1)&physcond) # new jet threshold
- 
-        # - Add/remap new L1 thresholds:
-        #   J20->J15, J40->J30, J70->J55, J100->J75, J130->J95, J150->J115
-        item_mu0_j15   = LVL1MenuItem('L1_MU0_J15', ctpid=-1)\
-                         .setLogic(thr_mu0.condition(1)&thr_j15.condition(1)&physcond)\
-                         .setTriggerType(TT_rpcin|TT_calo)
-        item_mu4_j15   = LVL1MenuItem('L1_MU4_J15', ctpid=-1)\
-                         .setLogic(thr_mu4.condition(1)&thr_j15.condition(1)&physcond)\
-                         .setTriggerType(TT_rpcin|TT_calo)
-        item_mu0_j30   = LVL1MenuItem('L1_MU0_J30', ctpid=-1)\
-                         .setLogic(thr_mu0.condition(1)&thr_j30.condition(1)&physcond)
-        item_mu4_j30   = LVL1MenuItem('L1_MU4_J30', ctpid=-1)\
-                         .setLogic(thr_mu4.condition(1)&thr_j30.condition(1)&physcond)
-        item_mu0_j55   = LVL1MenuItem('L1_MU0_J55', ctpid=-1)\
-                         .setLogic(thr_mu0.condition(1)&thr_j55.condition(1)&physcond)
-        item_mu0_j75   = LVL1MenuItem('L1_MU0_J75', ctpid=0xba)\
-                         .setLogic(thr_mu0.condition(1)&thr_j75.condition(1)&physcond) # new jet threshold
-        item_mu4_j75   = LVL1MenuItem('L1_MU4_J75', ctpid=-1)\
-                         .setLogic(thr_mu4.condition(1)&thr_j75.condition(1)&physcond) 
-
-        item_mu0_j20_xe20  = LVL1MenuItem('L1_MU0_J20_XE20', ctpid=-1)\
-                             .setLogic(thr_mu0.condition(1)&thr_j20.condition(1)&thr_xe20.condition(1)&physcond)
-        item_mu4_j20_xe20  = LVL1MenuItem('L1_MU4_J20_XE20', ctpid=-1)\
-                             .setLogic(thr_mu4.condition(1)&thr_j20.condition(1)&thr_xe20.condition(1)&physcond)
-        item_mu4_j20_xe35  = LVL1MenuItem('L1_MU4_J20_XE35', ctpid=-1)\
-                             .setLogic(thr_mu4.condition(1)&thr_j20.condition(1)&thr_xe35.condition(1)&physcond)
-
-        #item_mu0_j18   = LVL1MenuItem('L1_MU0_J18', ctpid=0xb7)\
-        #                 .setLogic(thr_mu0.condition(1)&thr_j18.condition(1)&physcond)
-        #item_mu0_j23   = LVL1MenuItem('L1_MU0_J23', ctpid=0xb8)\
-        #                 .setLogic(thr_mu0.condition(1)&thr_j23.condition(1)&physcond)
-        #item_mu0_j35   = LVL1MenuItem('L1_MU0_J35', ctpid=0xb9)\
-        #                 .setLogic(thr_mu0.condition(1)&thr_j35.condition(1)&physcond)
-        #item_mu0_j42   = LVL1MenuItem('L1_MU0_J42', ctpid=0xba)\
-        #                 .setLogic(thr_mu0.condition(1)&thr_j42.condition(1)&physcond)
-        item_mu0_em3   = LVL1MenuItem('L1_MU0_EM3', ctpid=0xbb)\
-                         .setLogic(thr_mu0.condition(1)&thr_em3.condition(1)&physcond)\
-                         .setTriggerType(TT_rpcin|TT_calo|TT_caloem)
-        item_em3_mu0   = LVL1MenuItem('L1_EM3_MU0', ctpid=0xbb)\
-                         .setLogic(thr_mu0.condition(1)&thr_em3.condition(1)&physcond)\
-                         .setTriggerType(TT_rpcin|TT_calo|TT_caloem)
-        item_em3_mu4   = LVL1MenuItem('L1_EM3_MU4', ctpid=-1)\
-                         .setLogic(thr_mu4.condition(1)&thr_em3.condition(1)&physcond)\
-                         .setTriggerType(TT_rpcin|TT_calo|TT_caloem)
-        item_mu6_j5    = LVL1MenuItem('L1_MU6_J5', ctpid=0xbc)\
-                         .setLogic(thr_mu6.condition(1)&thr_j5.condition(1)&physcond)\
-                         .setTriggerType(TT_rpcin|TT_calo)
-        item_mu6_j15    = LVL1MenuItem('L1_MU6_J15', ctpid=-1)\
-                         .setLogic(thr_mu6.condition(1)&thr_j15.condition(1)&physcond)\
-                         .setTriggerType(TT_rpcin|TT_calo)
-        item_mu6_2j20    = LVL1MenuItem('L1_MU6_2J20', ctpid=-1)\
-                          .setLogic(thr_mu6.condition(1)&thr_j20.condition(2)&physcond)\
-                          .setTriggerType(TT_rpcin|TT_calo)
-        item_mu10_j5    = LVL1MenuItem('L1_MU10_J5', ctpid=0xfc, prescale=1)\
-                         .setLogic(thr_mu10.condition(1)&thr_j5.condition(1)&physcond)
-        item_mu6_em3   = LVL1MenuItem('L1_MU6_EM3', ctpid=0xbd)\
-                         .setLogic(thr_mu6.condition(1)&thr_em3.condition(1)&physcond)\
-                         .setTriggerType(TT_rpcin|TT_calo|TT_caloem)
-        item_2mu4_em3   = LVL1MenuItem('L1_2MU4_EM3', ctpid=0xbd)\
-                         .setLogic(thr_mu4.condition(2)&thr_em3.condition(1)&physcond)\
-                         .setTriggerType(TT_rpcin|TT_calo|TT_caloem)
-        item_2mu4_2em3   = LVL1MenuItem('L1_2MU4_2EM3', ctpid=0xbd)\
-                          .setLogic(thr_mu4.condition(2)&thr_em3.condition(2)&physcond)\
-                          .setTriggerType(TT_rpcin|TT_calo|TT_caloem)
-
-        item_em3_mu6   = LVL1MenuItem('L1_EM3_MU6', ctpid=0xbd)\
-                         .setLogic(thr_mu6.condition(1)&thr_em3.condition(1)&physcond)\
-                         .setTriggerType(TT_rpcin|TT_calo|TT_caloem)
-        item_2mu0_em5  = LVL1MenuItem('L1_2MU0_EM5', ctpid=0xbe)\
-                         .setLogic(thr_mu0.condition(2)&thr_em5.condition(1)&physcond)        
-        item_2mu6_em5  = LVL1MenuItem('L1_2MU6_EM5', ctpid=-1)\
-                         .setLogic(thr_mu6.condition(2)&thr_em5.condition(1)&physcond)        
-        item_em5_2mu6  = LVL1MenuItem('L1_EM5_2MU6', ctpid=-1)\
-                         .setLogic(thr_mu6.condition(2)&thr_em5.condition(1)&physcond)        
-        item_em6_2mu6  = LVL1MenuItem('L1_EM6_2MU6', ctpid=-1)\
-                         .setLogic(thr_mu6.condition(2)&thr_em6.condition(1)&physcond)
-        item_2mu6_em7  = LVL1MenuItem('L1_2MU6_EM7', ctpid=0xbe)\
-                         .setLogic(thr_mu6.condition(2)&thr_em7.condition(1)&physcond)
-        item_mu20_xe15 = LVL1MenuItem('L1_MU20_XE15', ctpid=0xbf)\
-                         .setLogic(thr_mu20.condition(1)&thr_xe15.condition(1)&physcond)
-        item_mu10_xe20 = LVL1MenuItem('L1_MU10_XE20', ctpid=-1)\
-                         .setLogic(thr_mu10.condition(1)&thr_xe20.condition(1)&physcond)
-
-        item_mu10_xe25 = LVL1MenuItem('L1_MU10_XE25', ctpid=-1)\
-                         .setLogic(thr_mu10.condition(1)&thr_xe25.condition(1)&physcond)
-        item_mu20_xe20 = LVL1MenuItem('L1_MU20_XE20', ctpid=0xc0)\
-                         .setLogic(thr_mu20.condition(1)&thr_xe20.condition(1)&physcond)
-        item_mu40_xe15 = LVL1MenuItem('L1_MU40_XE15', ctpid=0xc1)\
-                         .setLogic(thr_mu40.condition(1)&thr_xe15.condition(1)&physcond)
-        item_mu10_j10  = LVL1MenuItem('L1_MU10_J10', ctpid=0xc2)\
-                         .setLogic(thr_mu10.condition(1)&thr_j10.condition(1)&physcond)
-        item_mu10_j20  = LVL1MenuItem('L1_MU10_J20', ctpid=-1)\
-                         .setLogic(thr_mu10.condition(1)&thr_j20.condition(1)&physcond) # new jet threshold
-
-        item_mu0_em3_empty   = LVL1MenuItem('L1_MU0_EM3_EMPTY', ctpid=-1)\
-                               .setLogic(thr_mu0.condition(1)&thr_em3.condition(1)&cosmiccond)
-        item_mu6_j5_empty    = LVL1MenuItem('L1_MU6_J5_EMPTY', ctpid=-1)\
-                               .setLogic(thr_mu6.condition(1)&thr_j5.condition(1)&cosmiccond)        
-        item_mu6_em3_empty   = LVL1MenuItem('L1_MU6_EM3_EMPTY', ctpid=-1)\
-                               .setLogic(thr_mu6.condition(1)&thr_em3.condition(1)&cosmiccond)
-        item_mu0_j5_empty    = LVL1MenuItem('L1_MU0_J5_EMPTY', ctpid=-1)\
-                               .setLogic(thr_mu0.condition(1)&thr_j5.condition(1)&cosmiccond)
-
-#        # TAU + MU
-        #item_tau9i_mu6 = LVL1MenuItem('L1_TAU9I_MU6', ctpid=0xc3)\
-        #                 .setLogic(thr_tau9i.condition(1)&thr_mu6.condition(1)&Logic(bgrp0)&Logic(bgrp1))
-        #item_tau9i_mu10 = LVL1MenuItem('L1_TAU9I_MU10', ctpid=0xc4)\
-        #                  .setLogic(thr_tau9i.condition(1)&thr_mu10.condition(1)&Logic(bgrp0)&Logic(bgrp1))
-        item_tau9i_mu15 = LVL1MenuItem('L1_TAU9I_MU15', ctpid=-1)\
-                          .setLogic(thr_tau9i.condition(1)&thr_mu15.condition(1)&physcond)
-        item_tau6i_mu15 = LVL1MenuItem('L1_TAU6I_MU15', ctpid=-1)\
-                          .setLogic(thr_tau6i.condition(1)&thr_mu15.condition(1)&physcond)
-        item_tau9i_mu6 = LVL1MenuItem('L1_TAU9I_MU6', ctpid=0xc5)\
-                          .setLogic(thr_tau9i.condition(1)&thr_mu6.condition(1)&physcond)
-        item_tau6_mu6 = LVL1MenuItem('L1_TAU6_MU6', ctpid=0xc5)\
-                        .setLogic(thr_tau6.condition(1)&thr_mu6.condition(1)&physcond)
-        item_tau5_mu6 = LVL1MenuItem('L1_TAU5_MU6', ctpid=0xc5)\
-                        .setLogic(thr_tau5.condition(1)&thr_mu6.condition(1)&physcond)\
-                        .setTriggerType(TT_calo)
-        item_tau6i_mu6 = LVL1MenuItem('L1_TAU6I_MU6', ctpid=0xc5)\
-                         .setLogic(thr_tau6i.condition(1)&thr_mu6.condition(1)&physcond)
-        item_tau9i_mu10 = LVL1MenuItem('L1_TAU9I_MU10', ctpid=0xc6)\
-                          .setLogic(thr_tau9i.condition(1)&thr_mu10.condition(1)&physcond)
-        item_tau6_mu10 = LVL1MenuItem('L1_TAU6_MU10', ctpid=-1)\
-                         .setLogic(thr_tau6.condition(1)&thr_mu10.condition(1)&physcond)
-        item_tau8_mu10 = LVL1MenuItem('L1_TAU8_MU10', ctpid=-1)\
-                         .setLogic(thr_tau8.condition(1)&thr_mu10.condition(1)&physcond)
-        item_tau8i_mu10 = LVL1MenuItem('L1_TAU8I_MU10', ctpid=-1)\
-                         .setLogic(thr_tau8i.condition(1)&thr_mu10.condition(1)&physcond)
-        item_tau6_mu15 = LVL1MenuItem('L1_TAU6_MU15', ctpid=-1)\
-                          .setLogic(thr_tau6.condition(1)&thr_mu15.condition(1)&physcond)        
-        item_tau6i_mu10 = LVL1MenuItem('L1_TAU6I_MU10', ctpid=0xc6)\
-                          .setLogic(thr_tau6i.condition(1)&thr_mu10.condition(1)&physcond)  
-        item_tau16_mu10 = LVL1MenuItem('L1_TAU16_MU10', ctpid=0xc7)\
-                         .setLogic(thr_tau16.condition(1)&thr_mu10.condition(1)&physcond)
-        item_tau11_mu10 = LVL1MenuItem('L1_TAU11_MU10', ctpid=0xc7)\
-                         .setLogic(thr_tau11.condition(1)&thr_mu10.condition(1)&physcond)
-        item_j70_xe20  = LVL1MenuItem('L1_J70_XE20', ctpid=0xc8)\
-                         .setLogic(thr_j70.condition(1)&thr_xe20.condition(1)&physcond)
-        item_j55_xe15  = LVL1MenuItem('L1_J55_XE15', ctpid=0xc8)\
-                         .setLogic(thr_j55.condition(1)&thr_xe15.condition(1)&physcond)
-        item_j70_xe80  = LVL1MenuItem('L1_J70_XE80', ctpid=0xc8)\
-                         .setLogic(thr_j70.condition(1)&thr_xe80.condition(1)&physcond)         
-        item_j40_xe20  = LVL1MenuItem('L1_J40_XE20', ctpid=-1)\
-                         .setLogic(thr_j40.condition(1)&thr_xe20.condition(1)&physcond) # new jet threshold
-        item_j40_xe15  = LVL1MenuItem('L1_J40_XE15', ctpid=-1)\
-                         .setLogic(thr_j40.condition(1)&thr_xe15.condition(1)&physcond) # new jet threshold
-        item_2j20_xe20 = LVL1MenuItem('L1_2J20_XE20', ctpid=-1)\
-                         .setLogic(thr_j20.condition(2)&thr_xe20.condition(1)&physcond) # new jet threshold
-        item_2j20_xe15 = LVL1MenuItem('L1_2J20_XE15', ctpid=-1)\
-                         .setLogic(thr_j20.condition(2)&thr_xe15.condition(1)&physcond) # new jet threshold
-        item_2j30_xe20 = LVL1MenuItem('L1_2J30_XE20', ctpid=-1)\
-                         .setLogic(thr_j30.condition(2)&thr_xe20.condition(1)&physcond) # new jet threshold
-
-        item_j20_xe15_em10i = LVL1MenuItem('L1_J20_XE15_EM10I', ctpid=-1)\
-                              .setLogic(thr_j20.condition(1)&thr_xe15.condition(1)&thr_em10i.condition(1)&physcond) # new jet threshold 
-        item_j20_xe20_em13i = LVL1MenuItem('L1_J20_XE20_EM13I', ctpid=-1)\
-                              .setLogic(thr_j20.condition(1)&thr_xe20.condition(1)&thr_em13i.condition(1)&physcond) # new jet threshold
-        item_j20_xe20_mu15  = LVL1MenuItem('L1_J20_XE20_MU15', ctpid=-1)\
-                              .setLogic(thr_j20.condition(1)&thr_xe20.condition(1)&thr_mu15.condition(1)&physcond) # new jet threshold
-        item_j15_xe15_mu15  = LVL1MenuItem('L1_J15_XE15_MU15', ctpid=-1)\
-                              .setLogic(thr_j15.condition(1)&thr_xe15.condition(1)&thr_mu15.condition(1)&physcond) # new jet threshold
-        item_j15_xe20_mu15  = LVL1MenuItem('L1_J15_XE15_MU20', ctpid=-1)\
-                              .setLogic(thr_j15.condition(1)&thr_xe20.condition(1)&thr_mu15.condition(1)&physcond) # new jet threshold
-        item_4j23_em13i     = LVL1MenuItem('L1_4J23_EM13I', ctpid=0xcc)\
-                              .setLogic(thr_j23.condition(4)&thr_em13i.condition(1)&physcond)
-        item_4j10_em10      = LVL1MenuItem('L1_4J10_EM10', ctpid=-1)\
-                              .setLogic(thr_j10.condition(4)&thr_em10.condition(1)&physcond)
-        item_4j10_em10i     = LVL1MenuItem('L1_4J10_EM10I', ctpid=-1)\
-                              .setLogic(thr_j10.condition(4)&thr_em10i.condition(1)&physcond)        
-        item_4j10_em13i     = LVL1MenuItem('L1_4J10_EM13I', ctpid=-1)\
-                              .setLogic(thr_j10.condition(4)&thr_em13i.condition(1)&physcond)
-        item_4j10_mu15      = LVL1MenuItem('L1_4J10_MU15', ctpid=0xcd)\
-                              .setLogic(thr_j10.condition(4)&thr_mu15.condition(1)&physcond) # new jet threshold
-        item_2j10_em13i     = LVL1MenuItem('L1_2J10_EM13I', ctpid=0xce)\
-                              .setLogic(thr_j10.condition(2)&thr_em13i.condition(1)&physcond)
-
-        # TAU + XE
-        item_tau9_xe15   = LVL1MenuItem('L1_TAU9_XE15', ctpid=0xcf)\
-                           .setLogic(thr_tau9.condition(1)&thr_xe15.condition(1)&physcond)\
-                           .setTriggerType(TT_calo)
-        item_tau5_xe10   = LVL1MenuItem('L1_TAU5_XE10', ctpid=-1)\
-                           .setLogic(thr_tau5.condition(1)&thr_xe10.condition(1)&physcond)\
-                           .setTriggerType(TT_calo)
-        item_tau15_xe20   = LVL1MenuItem('L1_TAU15_XE20', ctpid=-1)\
-                           .setLogic(thr_tau15.condition(1)&thr_xe20.condition(1)&physcond)\
-                           .setTriggerType(TT_calo)
-        item_tau15_xe35   = LVL1MenuItem('L1_TAU15_XE35', ctpid=-1)\
-                            .setLogic(thr_tau15.condition(1)&thr_xe35.condition(1)&physcond)\
-                            .setTriggerType(TT_calo)
-        item_tau15_xe40   = LVL1MenuItem('L1_TAU15_XE40', ctpid=-1)\
-                            .setLogic(thr_tau15.condition(1)&thr_xe40.condition(1)&physcond)\
-                            .setTriggerType(TT_calo)
-        item_tau6_xe15   = LVL1MenuItem('L1_TAU6_XE15', ctpid=0xd7)\
-                           .setLogic(thr_tau6.condition(1)&thr_xe15.condition(1)&physcond)\
-                           .setTriggerType(TT_calo)
-        item_tau6_xe20   = LVL1MenuItem('L1_TAU6_XE20', ctpid=0xd7)\
-                           .setLogic(thr_tau6.condition(1)&thr_xe20.condition(1)&physcond)\
-                           .setTriggerType(TT_calo)
-        item_tau6_xe10   = LVL1MenuItem('L1_TAU6_XE10', ctpid=0xd8)\
-                           .setLogic(thr_tau6.condition(1)&thr_xe10.condition(1)&physcond)\
-                           .setTriggerType(TT_calo)
-        item_tau8_xe10   = LVL1MenuItem('L1_TAU8_XE10', ctpid=-1)\
-                           .setLogic(thr_tau8.condition(1)&thr_xe10.condition(1)&physcond)\
-                           .setTriggerType(TT_calo)
-        item_tau11_xe10_3j10  = LVL1MenuItem('L1_TAU11_XE10_3J10', ctpid=0xd9)\
-                           .setLogic(thr_tau11.condition(1)&thr_xe10.condition(1)&thr_j10.condition(3)&physcond)\
-                           .setTriggerType(TT_calo)
-        item_tau11_xe10  = LVL1MenuItem('L1_TAU11_XE10', ctpid=0xd9)\
-                           .setLogic(thr_tau11.condition(1)&thr_xe10.condition(1)&physcond)\
-                           .setTriggerType(TT_calo)
-        item_tau11_xe15  = LVL1MenuItem('L1_TAU11_XE15', ctpid=0xd9)\
-                           .setLogic(thr_tau11.condition(1)&thr_xe15.condition(1)&physcond)\
-                           .setTriggerType(TT_calo)
-        item_tau11_xe20  = LVL1MenuItem('L1_TAU11_XE20', ctpid=0xd9)\
-                           .setLogic(thr_tau11.condition(1)&thr_xe20.condition(1)&physcond)\
-                           .setTriggerType(TT_calo)
-        item_tau16_xe15  = LVL1MenuItem('L1_TAU16_XE15', ctpid=0xd9)\
-                           .setLogic(thr_tau16.condition(1)&thr_xe15.condition(1)&physcond)\
-                           .setTriggerType(TT_calo)
-        item_tau9i_xe15   = LVL1MenuItem('L1_TAU9I_XE15', ctpid=0xd1)\
-                           .setLogic(thr_tau9i.condition(1)&thr_xe15.condition(1)&physcond)\
-                           .setTriggerType(TT_calo)
-        item_tau6i_xe15   = LVL1MenuItem('L1_TAU6I_XE15', ctpid=0xd1)\
-                            .setLogic(thr_tau6i.condition(1)&thr_xe15.condition(1)&physcond)\
-                            .setTriggerType(TT_calo)
-        item_tau9i_xe20  = LVL1MenuItem('L1_TAU9I_XE20', ctpid=0xd0)\
-                           .setLogic(thr_tau9i.condition(1)&thr_xe20.condition(1)&physcond)
-        item_tau6i_xe20  = LVL1MenuItem('L1_TAU6I_XE20', ctpid=0xd0)\
-                           .setLogic(thr_tau6i.condition(1)&thr_xe20.condition(1)&physcond)
-        item_tau6i_xe10  = LVL1MenuItem('L1_TAU6I_XE10', ctpid=0xd0)\
-                           .setLogic(thr_tau6i.condition(1)&thr_xe10.condition(1)&physcond)
-        
-        item_tau9i_xe15_empty   = LVL1MenuItem('L1_TAU9I_XE15_EMPTY', ctpid=-1)\
-                           .setLogic(thr_tau9i.condition(1)&thr_xe15.condition(1)&cosmiccond)\
-                           .setTriggerType(TT_calo)
-        item_tau6i_xe10_empty   = LVL1MenuItem('L1_TAU6I_XE10_EMPTY', ctpid=-1)\
-                           .setLogic(thr_tau6i.condition(1)&thr_xe10.condition(1)&cosmiccond)\
-                           .setTriggerType(TT_calo)
-        item_tau6_xe15_empty   = LVL1MenuItem('L1_TAU6_XE15_EMPTY', ctpid=-1)\
-                           .setLogic(thr_tau6.condition(1)&thr_xe15.condition(1)&cosmiccond)\
-                           .setTriggerType(TT_calo)
-        item_tau5_xe10_empty   = LVL1MenuItem('L1_TAU5_XE10_EMPTY', ctpid=-1)\
-                           .setLogic(thr_tau5.condition(1)&thr_xe10.condition(1)&cosmiccond)\
-                           .setTriggerType(TT_calo)
-        item_tau6_xe10_empty   = LVL1MenuItem('L1_TAU6_XE10_EMPTY', ctpid=-1)\
-                           .setLogic(thr_tau6.condition(1)&thr_xe10.condition(1)&cosmiccond)\
-                           .setTriggerType(TT_calo)
-
-        
-        item_tau9i_xe40  = LVL1MenuItem('L1_TAU9I_XE40', ctpid=0xd2)\
-                           .setLogic(thr_tau9i.condition(1)&thr_xe40.condition(1)&physcond)
-        item_tau9i_xe30 = LVL1MenuItem('L1_TAU9I_XE30', ctpid=0xd3)\
-                           .setLogic(thr_tau9i.condition(1)&thr_xe30.condition(1)&physcond)
-        item_tau16i_xe20 = LVL1MenuItem('L1_TAU16I_XE20', ctpid=0xd4)\
-                           .setLogic(thr_tau16i.condition(1)&thr_xe20.condition(1)&physcond)
-        item_tau11i_xe15 = LVL1MenuItem('L1_TAU11I_XE15', ctpid=0xd4)\
-                           .setLogic(thr_tau11i.condition(1)&thr_xe15.condition(1)&physcond)
-        item_tau15i_xe35 = LVL1MenuItem('L1_TAU15I_XE35', ctpid=-1)\
-                           .setLogic(thr_tau15i.condition(1)&thr_xe35.condition(1)&physcond)
-        item_tau15i_xe40 = LVL1MenuItem('L1_TAU15I_XE40', ctpid=-1)\
-                           .setLogic(thr_tau15i.condition(1)&thr_xe40.condition(1)&physcond)
-        item_tau20_xe40 = LVL1MenuItem('L1_TAU20_XE40', ctpid=-1)\
-                          .setLogic(thr_tau20.condition(1)&thr_xe40.condition(1)&physcond)
-        item_tau20_xe35 = LVL1MenuItem('L1_TAU20_XE35', ctpid=-1)\
-                          .setLogic(thr_tau20.condition(1)&thr_xe35.condition(1)&physcond)
-        
-        item_tau9i_xe50 = LVL1MenuItem('L1_TAU9I_XE50', ctpid=0xd5)\
-                           .setLogic(thr_tau9i.condition(1)&thr_xe50.condition(1)&physcond)
-        item_tau6i_xe30 = LVL1MenuItem('L1_TAU6I_XE30', ctpid=0xd5)\
-                           .setLogic(thr_tau6i.condition(1)&thr_xe30.condition(1)&physcond)
-        item_tau40_xe40 = LVL1MenuItem('L1_TAU40_XE40', ctpid=0xd6)\
-                          .setLogic(thr_tau40.condition(1)&thr_xe40.condition(1)&physcond)
-
-        item_tau15_xs35  = LVL1MenuItem('L1_TAU15_XS35', ctpid=-1)\
-                           .setLogic(thr_tau15.condition(1)&thr_xs35.condition(1)&physcond)\
-                           .setTriggerType(TT_calo)
-        item_tau15_xs25_3j10  = LVL1MenuItem('L1_TAU15_XS25_3J10', ctpid=-1)\
-                                .setLogic(thr_tau15.condition(1)&thr_xs25.condition(1)&thr_j10.condition(3)&physcond)\
-                                .setTriggerType(TT_calo)
-        item_tau15_xe10_3j10 = LVL1MenuItem('L1_TAU15_XE10_3J10', ctpid=-1)\
-                               .setLogic(thr_tau15.condition(1)&thr_xe10.condition(1)&thr_j10.condition(3)&physcond)\
-                               .setTriggerType(TT_calo)
-        item_tau15_xe25_3j15 = LVL1MenuItem('L1_TAU15_XE25_3J15', ctpid=-1)\
-                               .setLogic(thr_tau15.condition(1)&thr_xe25.condition(1)&thr_j15.condition(3)&physcond)\
-                               .setTriggerType(TT_calo)
-        item_tau15_xe25_3j10 = LVL1MenuItem('L1_TAU15_XE25_3J10', ctpid=-1)\
-                               .setLogic(thr_tau15.condition(1)&thr_xe25.condition(1)&thr_j10.condition(3)&physcond)\
-                               .setTriggerType(TT_calo)
-        item_tau15_xe25_3j10_j30 = LVL1MenuItem('L1_TAU15_XE25_3J10_J30', ctpid=-1)\
-                                   .setLogic(thr_tau15.condition(1)&thr_xe25.condition(1)&thr_j10.condition(3)&thr_j30.condition(1)&physcond)\
-                                   .setTriggerType(TT_calo)
-        item_tau11_xs25  = LVL1MenuItem('L1_TAU11_XS25', ctpid=-1)\
-                           .setLogic(thr_tau11.condition(1)&thr_xs25.condition(1)&physcond)\
-                           .setTriggerType(TT_calo)
-        item_tau11_xs15_3j10  = LVL1MenuItem('L1_TAU11_XS15_3J10', ctpid=-1)\
-                                .setLogic(thr_tau11.condition(1)&thr_xs15.condition(1)&thr_j10.condition(3)&physcond)\
-                                .setTriggerType(TT_calo)
-        item_tau11_xs30  = LVL1MenuItem('L1_TAU11_XS30', ctpid=-1)\
-                           .setLogic(thr_tau11.condition(1)&thr_xs30.condition(1)&physcond)\
-                           .setTriggerType(TT_calo)
-        item_tau11_xs35  = LVL1MenuItem('L1_TAU11_XS35', ctpid=-1)\
-                           .setLogic(thr_tau11.condition(1)&thr_xs35.condition(1)&physcond)\
-                           .setTriggerType(TT_calo)
-        item_tau11_xs40  = LVL1MenuItem('L1_TAU11_XS40', ctpid=-1)\
-                           .setLogic(thr_tau11.condition(1)&thr_xs40.condition(1)&physcond)\
-                           .setTriggerType(TT_calo)
-
-        item_j50_xs15  = LVL1MenuItem('L1_J50_XS15', ctpid=-1)\
-                           .setLogic(thr_j50.condition(1)&thr_xs15.condition(1)&physcond)\
-                           .setTriggerType(TT_calo)
-        item_j50_xs25  = LVL1MenuItem('L1_J50_XS25', ctpid=-1)\
-                           .setLogic(thr_j50.condition(1)&thr_xs25.condition(1)&physcond)\
-                           .setTriggerType(TT_calo)
-
-
-##VBF request
-        
-        item_2tau8_tau15_fj15  = LVL1MenuItem('L1_2TAU8_TAU15_FJ15', ctpid=-1)\
-                                 .setLogic(thr_tau8.condition(2)&thr_tau15.condition(1)&(thr_jf15.condition(1)|thr_jb15.condition(1))&physcond)\
-                                 .setTriggerType(TT_calo)
-        
-        item_2tau8_tau15_j15cf  = LVL1MenuItem('L1_2TAU8_TAU15_J15CF', ctpid=-1)\
-                                  .setLogic(thr_tau8.condition(2)&thr_tau15.condition(1)&thr_j15cf.condition(1)&physcond)\
-                                  .setTriggerType(TT_calo)
-                
-        item_2tau8_tau11i_em10vh_fj15  = LVL1MenuItem('L1_2TAU8_TAU11I_EM10VH_FJ15', ctpid=-1)\
-                                         .setLogic(thr_tau8.condition(2)&thr_tau11i.condition(1)&thr_em10vh.condition(1)&(thr_jf15.condition(1)|thr_jb15.condition(1))&physcond)\
-                                         .setTriggerType(TT_calo)
-
-        item_2tau8_tau11i_em10vh_j15cf  = LVL1MenuItem('L1_2TAU8_TAU11I_EM10VH_J15CF', ctpid=-1)\
-                                          .setLogic(thr_tau8.condition(2)&thr_tau11i.condition(1)&thr_em10vh.condition(1)&thr_j15cf.condition(1)&physcond)\
-                                          .setTriggerType(TT_calo)
-
-               
-       ##L1_EM10VH_FJ15,  L1_EM10VH_J15CF , L1_MU10_FJ15, L1_MU10_J15CF , L1_3J15_FJ15,  L1_2J15_2FJ15, L1_XE30_FJ15,  L1_XE30_J15CF,  L1_J15CF_FJ15      
-
-        item_em14vh_fj15  = LVL1MenuItem('L1_EM14VH_FJ15', ctpid=-1)\
-                            .setLogic(thr_em14vh.condition(1)&(thr_jf15.condition(1)|thr_jb15.condition(1))&physcond)\
-                            .setTriggerType(TT_calo|TT_caloem)
-        item_em14vh_j15cf  = LVL1MenuItem('L1_EM14VH_J15CF', ctpid=-1)\
-                             .setLogic(thr_em14vh.condition(1)&thr_j15cf.condition(1)&physcond)\
-                             .setTriggerType(TT_calo|TT_caloem)
-
-        item_mu10_fj15  = LVL1MenuItem('L1_MU10_FJ15', ctpid=-1)\
-                          .setLogic(thr_mu10.condition(1)&(thr_jf15.condition(1)|thr_jb15.condition(1))&physcond)
-        item_mu10_j15cf  = LVL1MenuItem('L1_MU10_J15CF', ctpid=-1)\
-                           .setLogic(thr_mu10.condition(1)&thr_j15cf.condition(1)&physcond)
-
-        item_3j15_fj15  = LVL1MenuItem('L1_3J15_FJ15', ctpid=-1)\
-                          .setLogic(thr_j15.condition(3)&(thr_jf15.condition(1)|thr_jb15.condition(1))&physcond)\
-                          .setTriggerType(TT_calo)
-        item_2j15_2fj15  = LVL1MenuItem('L1_2J15_2FJ15', ctpid=-1)\
-                           .setLogic(thr_j15.condition(2)&(thr_jf15.condition(1)&thr_jb15.condition(1))&physcond)\
-                           .setTriggerType(TT_calo)              
-
-        # Transient items
-        item_2tau9i_em18i = LVL1MenuItem('L1_2TAU9I_EM18I', ctpid=-1)\
-                             .setLogic(thr_tau9i.condition(2)&thr_em18i.condition(1)&physcond)
-        item_tau25_xe30  = LVL1MenuItem('L1_TAU25_XE30', ctpid=-1)\
-                           .setLogic(thr_tau25.condition(1)&thr_xe30.condition(1)&physcond)
-        item_tau11_xe20  = LVL1MenuItem('L1_TAU11_XE20', ctpid=-1)\
-                           .setLogic(thr_tau11.condition(1)&thr_xe20.condition(1)&physcond)
-        # L1_TAU6_2JT4_JT35  (or whatever soft thresholds they have. JT4 must have 
-        # softer cuts than TAU06 and JT35 - please get in touch with us if it is not 
-        # the case - we will need to rethink it then)
-        item_tau9i_2j5_j10  = LVL1MenuItem('L1_TAU9I_2J5_J10', ctpid=0xd8)\
-                              .setLogic(thr_tau9i.condition(1)&thr_j5.condition(2)&thr_j10.condition(1)&physcond)
-        item_tau9i_2j5_j20 = LVL1MenuItem('L1_TAU9I_2J5_J20', ctpid=-1)\
-                              .setLogic(thr_tau9i.condition(1)&thr_j5.condition(2)&thr_j20.condition(1)&physcond) # new jet threshold
-        item_tau6i_2j5_j20 = LVL1MenuItem('L1_TAU6I_2J5_J20', ctpid=-1)\
-                             .setLogic(thr_tau6i.condition(1)&thr_j5.condition(2)&thr_j20.condition(1)&physcond)
-        item_tau9i_2j5_j40 = LVL1MenuItem('L1_TAU9I_2J5_J40', ctpid=0xda)\
-                              .setLogic(thr_tau9i.condition(1)&thr_j5.condition(2)&thr_j40.condition(1)&physcond) # new jet threshold
-        item_tau6_2j5_j30 = LVL1MenuItem('L1_TAU6_2J5_J30', ctpid=0xda)\
-                             .setLogic(thr_tau6.condition(1)&thr_j5.condition(2)&thr_j30.condition(1)&physcond) # new jet threshold
-        item_tau6i_2j5_j40 = LVL1MenuItem('L1_TAU6I_2J5_J40', ctpid=0xda)\
-                             .setLogic(thr_tau6i.condition(1)&thr_j5.condition(2)&thr_j40.condition(1)&physcond) # new jet threshold
-        item_tau9i_4j5_3j20 = LVL1MenuItem('L1_TAU9I_4J5_3J20', ctpid=-1)\
-                              .setLogic(thr_tau9i.condition(1)&thr_j5.condition(4)&thr_j20.condition(3)&physcond) # new jet threshold
-        item_tau5_4j5_3j15 = LVL1MenuItem('L1_TAU5_4J5_3J15', ctpid=-1)\
-                             .setLogic(thr_tau5.condition(1)&thr_j5.condition(4)&thr_j15.condition(3)&physcond)\
-                             .setTriggerType(TT_calo)
-        item_tau6_4j5_3j15 = LVL1MenuItem('L1_TAU6_4J5_3J15', ctpid=-1)\
-                             .setLogic(thr_tau6.condition(1)&thr_j5.condition(4)&thr_j15.condition(3)&physcond)\
-                             .setTriggerType(TT_calo) # new jet threshold
-        item_tau6i_4j5_3j20 = LVL1MenuItem('L1_TAU6I_4J5_3J20', ctpid=-1)\
-                              .setLogic(thr_tau6i.condition(1)&thr_j5.condition(4)&thr_j20.condition(3)&physcond) # new jet threshold
-        item_tau9i_5j5_4j10 = LVL1MenuItem('L1_TAU9I_5J5_4J10', ctpid=-1)\
-                              .setLogic(thr_tau9i.condition(1)&thr_j5.condition(5)&thr_j10.condition(4)&physcond) # new jet threshold
-        item_tau6i_5j5_4j10 = LVL1MenuItem('L1_TAU6I_5J5_4J10', ctpid=-1)\
-                              .setLogic(thr_tau6i.condition(1)&thr_j5.condition(5)&thr_j10.condition(4)&physcond) # new jet threshold
-        item_tau9i_5j5_4j20 = LVL1MenuItem('L1_TAU9I_5J5_4J20', ctpid=0xdb)\
-                              .setLogic(thr_tau9i.condition(1)&thr_j5.condition(5)&thr_j20.condition(4)&physcond) # new jet threshold
-        item_tau6_5j5_4j15 = LVL1MenuItem('L1_TAU6_5J5_4J15', ctpid=0xdb)\
-                              .setLogic(thr_tau6.condition(1)&thr_j5.condition(5)&thr_j15.condition(4)&physcond) # new jet threshold
-        item_tau6i_5j5_4j20 = LVL1MenuItem('L1_TAU6I_5J5_4J20', ctpid=0xdb)\
-                              .setLogic(thr_tau6i.condition(1)&thr_j5.condition(5)&thr_j20.condition(4)&physcond) # new jet threshold
-        item_tau9i_2j5_j70 = LVL1MenuItem('L1_TAU9I_2J5_J70', ctpid=-1)\
-                             .setLogic(thr_tau9i.condition(1)&thr_j5.condition(2)&thr_j70.condition(1)&physcond) # new jet threshold
-        item_tau6_2j5_j55 = LVL1MenuItem('L1_TAU6_2J5_J55', ctpid=-1)\
-                             .setLogic(thr_tau6.condition(1)&thr_j5.condition(2)&thr_j55.condition(1)&physcond) # new jet threshold
-        item_tau6i_2j5_j70 = LVL1MenuItem('L1_TAU6I_2J5_J70', ctpid=-1)\
-                             .setLogic(thr_tau6i.condition(1)&thr_j5.condition(2)&thr_j70.condition(1)&physcond) # new jet threshold
-        item_tau9i_3j5_2j40 = LVL1MenuItem('L1_TAU9I_3J5_2J40', ctpid=-1)\
-                               .setLogic(thr_tau9i.condition(1)&thr_j5.condition(3)&thr_j40.condition(2)&physcond) # new jet threshold
-        item_tau9i_3j5_2j10 = LVL1MenuItem('L1_TAU9I_3J5_2J10', ctpid=-1)\
-                               .setLogic(thr_tau9i.condition(1)&thr_j5.condition(3)&thr_j10.condition(2)&physcond) # new jet threshold
-        item_tau6i_3j5_2j10 = LVL1MenuItem('L1_TAU6I_3J5_2J10', ctpid=-1)\
-                               .setLogic(thr_tau6i.condition(1)&thr_j5.condition(3)&thr_j10.condition(2)&physcond) # new jet threshold
-        item_tau9i_3j5_2j20 = LVL1MenuItem('L1_TAU9I_3J5_2J20', ctpid=0xdd)\
-                               .setLogic(thr_tau9i.condition(1)&thr_j5.condition(3)&thr_j20.condition(2)&physcond) # new jet threshold
-        item_tau5_3j5_2j15 = LVL1MenuItem('L1_TAU5_3J5_2J15', ctpid=-1)\
-                              .setLogic(thr_tau5.condition(1)&thr_j5.condition(3)&thr_j15.condition(2)&physcond) # new jet threshold        
-        item_tau6_3j5_2j15 = LVL1MenuItem('L1_TAU6_3J5_2J15', ctpid=-1)\
-                              .setLogic(thr_tau6.condition(1)&thr_j5.condition(3)&thr_j15.condition(2)&physcond) # new jet threshold
-        item_tau6i_3j5_2j20 = LVL1MenuItem('L1_TAU6I_3J5_2J20', ctpid=0xdd)\
-                              .setLogic(thr_tau6i.condition(1)&thr_j5.condition(3)&thr_j20.condition(2)&physcond) # new jet threshold
-        # 'L1_TAU6_3J5_2J20_XE25', 
-        item_tau6_3j5_2j20_xe25 = LVL1MenuItem('L1_TAU6_3J5_2J20_XE25', ctpid=-1)\
-                                 .setLogic(thr_tau6.condition(1)&thr_j5.condition(3)&thr_j20.condition(2)&\
-                                           thr_xe25.condition(1)&physcond)
-
-        item_2tau11_j10 = LVL1MenuItem('L1_2TAU11_J10', ctpid=-1)\
-                          .setLogic(thr_tau11.condition(2)&thr_j10.condition(1)&physcond)
-        item_2tau6_tau11_j5 = LVL1MenuItem('L1_2TAU6_TAU11_J5', ctpid=-1)\
-                              .setLogic(thr_tau6.condition(2)&thr_tau11.condition(1)&thr_j5.condition(1)&physcond)
-        item_2tau6_tau11_j10 = LVL1MenuItem('L1_2TAU6_TAU11_J10', ctpid=-1)\
-                              .setLogic(thr_tau6.condition(2)&thr_tau11.condition(1)&thr_j10.condition(1)&physcond)
-        item_2tau8_tau11_j10 = LVL1MenuItem('L1_2TAU8_TAU11_J10', ctpid=-1)\
-                              .setLogic(thr_tau8.condition(2)&thr_tau11.condition(1)&thr_j10.condition(1)&physcond)
-        
-        item_tau6_j50_xe20 = LVL1MenuItem('L1_TAU6_J50_XE20', ctpid=-1)\
-                             .setLogic(thr_tau6.condition(1)&thr_j50.condition(1)&\
-                                       thr_xe20.condition(1)&physcond)
-
-        item_j50_xe20 = LVL1MenuItem('L1_J50_XE20', ctpid=-1)\
-                             .setLogic(thr_j50.condition(1)&\
-                                       thr_xe20.condition(1)&physcond)
-
-        item_j50_xe25 = LVL1MenuItem('L1_J50_XE25', ctpid=-1)\
-                             .setLogic(thr_j50.condition(1)&\
-                                       thr_xe25.condition(1)&physcond)
-
-        item_j50_xe30 = LVL1MenuItem('L1_J50_XE30', ctpid=-1)\
-                             .setLogic(thr_j50.condition(1)&\
-                                       thr_xe30.condition(1)&physcond)
-
-        item_j50_xe35 = LVL1MenuItem('L1_J50_XE35', ctpid=-1)\
-                             .setLogic(thr_j50.condition(1)&\
-                                       thr_xe35.condition(1)&physcond)
-
-        item_j50_xe40 = LVL1MenuItem('L1_J50_XE40', ctpid=-1)\
-                             .setLogic(thr_j50.condition(1)&\
-                                       thr_xe40.condition(1)&physcond)
-
-        item_2j20_xe20 = LVL1MenuItem('L1_2J20_XE20', ctpid=-1)\
-                             .setLogic(thr_j20.condition(2)&\
-                                       thr_xe20.condition(1)&physcond)
-
-        item_2j15_xe30 = LVL1MenuItem('L1_2J15_XE30', ctpid=-1)\
-                             .setLogic(thr_j15.condition(2)&\
-                                       thr_xe30.condition(1)&physcond)
-
-        item_3j10_j50 = LVL1MenuItem('L1_3J10_J50', ctpid=-1)\
-                             .setLogic(thr_j10.condition(3)&\
-                                       thr_j50.condition(1)&physcond)
-
-        item_3j10_2j75 = LVL1MenuItem('L1_3J10_2J75', ctpid=-1)\
-                             .setLogic(thr_j10.condition(3)&\
-                                       thr_j75.condition(2)&physcond)
-
-
-        # - Add/remap new L1 thresholds:
-        #   J20->J15, J40->J30, J70->J55, J100->J75, J130->J95, J150->J115
-        item_tau6i_2j5_j30 = LVL1MenuItem('L1_TAU6I_2J5_J30', ctpid=-1, group='1')\
-                             .setLogic(thr_tau6i.condition(1)&thr_j5.condition(2)&thr_j30.condition(1)&physcond)
-        item_tau6i_5j5_4j15 = LVL1MenuItem('L1_TAU6I_5J5_4J15',ctpid=-1, group='1')\
-                              .setLogic(thr_tau6i.condition(1)&thr_j5.condition(5)&thr_j15.condition(4)&physcond)
-        item_tau6i_4j5_3j15 = LVL1MenuItem('L1_TAU6I_4J5_3J15',ctpid=-1, group='1')\
-                              .setLogic(thr_tau6i.condition(1)&thr_j5.condition(4)&thr_j15.condition(3)&physcond)
-        item_tau6i_3j5_2j15 = LVL1MenuItem('L1_TAU6I_3J5_2J15',ctpid=-1, group='1')\
-                             .setLogic(thr_tau6i.condition(1)&thr_j5.condition(3)&thr_j15.condition(2)&physcond)
-        item_tau6i_2j5_j15 = LVL1MenuItem('L1_TAU6I_2J5_J15',ctpid=-1, group='1')\
-                             .setLogic(thr_tau6i.condition(1)&thr_j5.condition(2)&thr_j15.condition(1)&physcond)
-        item_tau6i_2j5_j55 = LVL1MenuItem('L1_TAU6I_2J5_J55',ctpid=-1, group='1')\
-                             .setLogic(thr_tau6i.condition(1)&thr_j5.condition(2)&thr_j55.condition(1)&physcond)
-
-        item_j30_xe10 = LVL1MenuItem('L1_J30_XE10',ctpid=-1, group='1')\
-                        .setLogic(thr_j30.condition(1)&thr_xe10.condition(1)&physcond)
-        item_j30_xe35 = LVL1MenuItem('L1_J30_XE35',ctpid=-1, group='1')\
-                        .setLogic(thr_j30.condition(1)&thr_xe35.condition(1)&physcond)
-        item_j30_xe15 = LVL1MenuItem('L1_J30_XE15',ctpid=-1, group='1')\
-                        .setLogic(thr_j30.condition(1)&thr_xe15.condition(1)&physcond)
-        item_j50_xe15 = LVL1MenuItem('L1_J50_XE15',ctpid=-1, group='1')\
-                        .setLogic(thr_j50.condition(1)&thr_xe15.condition(1)&physcond)
-        item_j30_xe25 = LVL1MenuItem('L1_J30_XE25',ctpid=-1, group='1')\
-                        .setLogic(thr_j30.condition(1)&thr_xe25.condition(1)&physcond)
-        item_j30_xe40 = LVL1MenuItem('L1_J30_XE40',ctpid=-1, group='1')\
-                        .setLogic(thr_j30.condition(1)&thr_xe40.condition(1)&physcond)
-        item_j30_xe50 = LVL1MenuItem('L1_J30_XE50',ctpid=-1, group='1')\
-                        .setLogic(thr_j30.condition(1)&thr_xe50.condition(1)&physcond)
-        
-
-        item_2j15_xe10 = LVL1MenuItem('L1_2J15_XE10',ctpid=-1, group='1')\
-                         .setLogic(thr_j15.condition(2)&thr_xe10.condition(1)&physcond)
-        item_2j15_xe15 = LVL1MenuItem('L1_2J15_XE15',ctpid=-1, group='1')\
-                         .setLogic(thr_j15.condition(2)&thr_xe15.condition(1)&physcond)
-        item_2j15_xe25 = LVL1MenuItem('L1_2J15_XE25',ctpid=-1, group='1')\
-                         .setLogic(thr_j15.condition(2)&thr_xe25.condition(1)&physcond)
-        
-        item_j15_xe15_em10  = LVL1MenuItem('L1_J15_XE15_EM10',ctpid=-1, group='1')\
-                              .setLogic(thr_em10.condition(1)&thr_j15.condition(1)&thr_xe15.condition(1)&physcond)
-        item_j15_xe20_em10  = LVL1MenuItem('L1_J15_XE20_EM10',ctpid=-1, group='1')\
-                              .setLogic(thr_em10.condition(1)&thr_j15.condition(1)&thr_xe20.condition(1)&physcond)
-        item_j15_xe15_em10i = LVL1MenuItem('L1_J15_XE15_EM10I',ctpid=-1, group='1')\
-                              .setLogic(thr_em10i.condition(1)&thr_j15.condition(1)&thr_xe15.condition(1)&physcond)
-        item_j15_xe20_mu15 = LVL1MenuItem('L1_J15_XE20_MU15',ctpid=-1, group='1')\
-                              .setLogic(thr_mu15.condition(1)&thr_j15.condition(1)&thr_xe20.condition(1)&physcond)
-
-        #'L1_TAU6I_2J5_J15',
-        #'L1_TAU6I_2J5_J55', 
-
-        # Transient items
-        item_tau9i_2j5_j70 = LVL1MenuItem('L1_TAU9I_2J5_J70', ctpid=-1)\
-                              .setLogic(thr_tau9i.condition(1)&thr_j5.condition(2)&thr_j70.condition(1)&physcond)
-
-        # MBTS
-
-
-#        item_mbts1 = LVL1MenuItem('L1_MBTS_1', ctpid=0xe2)\
-#                     .setLogic(Logic(bgrp0)&Logic(bgrp1)&(thr_bptx0.condition(1)|thr_bptx1.condition(1))&(thr_mbtsA.condition(1)|thr_mbtsC.condition(1)))\
-#                     .setTriggerType(TT_minb)
-
-
-#        item_mbts2 = LVL1MenuItem('L1_MBTS_2', ctpid=0xe3)\
-#                     .setLogic(Logic(bgrp0)&Logic(bgrp1)&(thr_bptx0.condition(1)|thr_bptx1.condition(1))\
-#                               &(thr_mbtsA.condition(2)|thr_mbtsC.condition(2)|thr_mbtsA.condition(1))\
-#                               &(thr_mbtsA.condition(2)|thr_mbtsC.condition(2)|thr_mbtsC.condition(1))\
-#                               )\
-#                               .setTriggerType(TT_minb)
-
-#        item_mbts1_1 = LVL1MenuItem('L1_MBTS_1_1', ctpid=0xe4)\
-#                       .setLogic(Logic(bgrp0)&Logic(bgrp1)&thr_mbtsA.condition(1)&thr_mbtsC.condition(1)&(thr_bptx0.condition(1)|thr_bptx1.condition(1)))\
-#                       .setTriggerType(TT_minb)
-        
-        item_mbtsa = LVL1MenuItem('L1_MBTS_A', ctpid=0x1a).setLogic(thr_mbtsA.condition(1)&physcond).setTriggerType(TT_minb)
-        item_mbtsc = LVL1MenuItem('L1_MBTS_C', ctpid=0x1b).setLogic(thr_mbtsC.condition(1)&physcond).setTriggerType(TT_minb)
-
-
-        item_mbtsa_empty = LVL1MenuItem('L1_MBTS_A_EMPTY', ctpid=-1).setLogic(thr_mbtsA.condition(1)&cosmiccond).setTriggerType(TT_minb)
-        item_mbtsc_empty = LVL1MenuItem('L1_MBTS_C_EMPTY', ctpid=-1).setLogic(thr_mbtsC.condition(1)&cosmiccond).setTriggerType(TT_minb)
-
-
-        item_mbts1 = LVL1MenuItem('L1_MBTS_1', ctpid=0xe2)\
-                     .setLogic((thr_mbtsA.condition(1)|thr_mbtsC.condition(1))&physcond)\
-                     .setTriggerType(TT_minb)
-#                     .setLogic(Logic(bgrp0)&Logic(bgrp1)&(thr_mbtsA.condition(1)|thr_mbtsC.condition(1)))\
-
-
-        item_mlz_a = LVL1MenuItem('L1_MLZ_A', ctpid=-1)\
-                     .setLogic((thr_mbtsA.condition(1)|thr_zdcA.condition(1)|thr_lucidA.condition(1))&physcond)\
-                     .setTriggerType(TT_minb)
-
-        item_mlz_c = LVL1MenuItem('L1_MLZ_C', ctpid=-1)\
-                     .setLogic((thr_mbtsC.condition(1)|thr_zdcC.condition(1)|thr_lucidC.condition(1))&physcond)\
-                     .setTriggerType(TT_minb)
-
-        item_mblz = LVL1MenuItem('L1_MBLZ', ctpid=-1)\
-                    .setLogic(
-            ((thr_mbtsA.condition(1)|thr_zdcA.condition(1)|thr_lucidA.condition(1))\
-            & (thr_mbtsC.condition(1)|thr_zdcC.condition(1)|thr_lucidC.condition(1))\
-            | (thr_bcmWide.condition(1))) \
-            &physcond) \
-            .setTriggerType(TT_minb)
-
-        item_mbts2 = LVL1MenuItem('L1_MBTS_2', ctpid=0xe3)\
-                     .setLogic((thr_mbtsA.condition(2)|thr_mbtsC.condition(2)|thr_mbtsA.condition(1))\
-                               &(thr_mbtsA.condition(2)|thr_mbtsC.condition(2)|thr_mbtsC.condition(1))\
-                               &physcond).setTriggerType(TT_minb)
-
-        item_mbts2_veto_te50  = LVL1MenuItem('L1_MBTS_2_VTE50', ctpid=-1)\
-                                 .setLogic((thr_mbtsA.condition(2)|thr_mbtsC.condition(2)|thr_mbtsA.condition(1))\
-                                           &(thr_mbtsA.condition(2)|thr_mbtsC.condition(2)|thr_mbtsC.condition(1))\
-                                           &Not(thr_te50.condition(1))&physcond)\
-                                           .setTriggerType(TT_minb)
-
-        item_mbts2_veto_te100  = LVL1MenuItem('L1_MBTS_2_VTE100', ctpid=-1)\
-                                 .setLogic((thr_mbtsA.condition(2)|thr_mbtsC.condition(2)|thr_mbtsA.condition(1))\
-                                           &(thr_mbtsA.condition(2)|thr_mbtsC.condition(2)|thr_mbtsC.condition(1))\
-                                           &Not(thr_te100.condition(1))&physcond)\
-                                           .setTriggerType(TT_minb)
-        
-        item_mbts2_veto_te1000  = LVL1MenuItem('L1_MBTS_2_VTE1000', ctpid=-1)\
-                                  .setLogic((thr_mbtsA.condition(2)|thr_mbtsC.condition(2)|thr_mbtsA.condition(1))\
-                                            &(thr_mbtsA.condition(2)|thr_mbtsC.condition(2)|thr_mbtsC.condition(1))\
-                                            &Not(thr_te1000.condition(1))&physcond)\
-                                            .setTriggerType(TT_minb)
-
-        item_mbts2_veto_te500  = LVL1MenuItem('L1_MBTS_2_VTE500', ctpid=-1)\
-                                  .setLogic((thr_mbtsA.condition(2)|thr_mbtsC.condition(2)|thr_mbtsA.condition(1))\
-                                            &(thr_mbtsA.condition(2)|thr_mbtsC.condition(2)|thr_mbtsC.condition(1))\
-                                            &Not(thr_te500.condition(1))&physcond)\
-                                            .setTriggerType(TT_minb)
-
-
-
-        item_mbts1_1_overlay = LVL1MenuItem('L1_MBTS_1_1_OVERLAY', ctpid=0xe4)\
-                       .setLogic(thr_mbtsA.condition(1)&thr_mbtsC.condition(1)&physcond)\
-                       .setTriggerType(TT_zerobs)
-
-        item_mbts1_1 = LVL1MenuItem('L1_MBTS_1_1', ctpid=0xe4)\
-                       .setLogic(thr_mbtsA.condition(1)&thr_mbtsC.condition(1)&physcond)\
-                       .setTriggerType(TT_minb)
-
-        item_mbts1_1_veto_te50 = LVL1MenuItem('L1_MBTS_1_1_VTE50', ctpid=0xe4)\
-                       .setLogic(thr_mbtsA.condition(1)&thr_mbtsC.condition(1)&Not(thr_te50.condition(1))&physcond)\
-                       .setTriggerType(TT_minb)
-
-        item_mbts2_2 = LVL1MenuItem('L1_MBTS_2_2', ctpid=-1)\
-                       .setLogic(thr_mbtsA.condition(2)&thr_mbtsC.condition(2)&physcond)\
-                       .setTriggerType(TT_minb)
-
-        item_mbts2_2_veto_te50 = LVL1MenuItem('L1_MBTS_2_2_VTE50', ctpid=-1)\
-                       .setLogic(thr_mbtsA.condition(2)&thr_mbtsC.condition(2)&Not(thr_te50.condition(1))&physcond)\
-                       .setTriggerType(TT_minb)
-
-        item_mbts3_3 = LVL1MenuItem('L1_MBTS_3_3', ctpid=-1)\
-                       .setLogic(thr_mbtsA.condition(3)&thr_mbtsC.condition(3)&physcond)\
-                       .setTriggerType(TT_minb)
-
-        item_mbts4_4 = LVL1MenuItem('L1_MBTS_4_4', ctpid=0xe1)\
-                       .setLogic(thr_mbtsA.condition(4)&thr_mbtsC.condition(4)&physcond)\
-                       .setTriggerType(TT_minb)
-
-        item_mbts4_4_BGRP0_noCALIB = LVL1MenuItem('L1_MBTS_4_4_BGRP0_noCALIB', ctpid=0xe1)\
-                             .setLogic(thr_mbtsA.condition(4)&thr_mbtsC.condition(4)&Logic(bgrp0)&Not(Logic(bgrp2)))\
-                             .setTriggerType(TT_minb)
-
-        item_mbts1_comm   = LVL1MenuItem('L1_MBTS_1_COMM', ctpid=-1)\
-                            .setLogic((thr_mbtsA.condition(1)|thr_mbtsC.condition(1))&physcond)\
-                            .setTriggerType(TT_minb)
-
-        item_mbts2_comm   = LVL1MenuItem('L1_MBTS_2_COMM', ctpid=-1)\
-                            .setLogic((thr_bptx0.condition(1)|thr_bptx1.condition(1))\
-                                      &(thr_mbtsA.condition(2)|thr_mbtsC.condition(2)|thr_mbtsA.condition(1))\
-                                      &(thr_mbtsA.condition(2)|thr_mbtsC.condition(2)|thr_mbtsC.condition(1))\
-                                      &physcond\
-                                      )\
-                                      .setTriggerType(TT_minb)
-
-        item_mbts1_1_comm = LVL1MenuItem('L1_MBTS_1_1_COMM', ctpid=-1)\
-                            .setLogic(thr_mbtsA.condition(1)&thr_mbtsC.condition(1)&physcond)\
-                            .setTriggerType(TT_minb)
-
-
-
-        item_mbts1_bgrp1   = LVL1MenuItem('L1_MBTS_1_BGRP1', ctpid=-1)\
-                            .setLogic((thr_mbtsA.condition(1)|thr_mbtsC.condition(1))&bgrpcond)\
-                            .setTriggerType(TT_minb)
-
-        item_mbts2_bgrp1   = LVL1MenuItem('L1_MBTS_2_BGRP1', ctpid=-1)\
-                            .setLogic((thr_bptx0.condition(1)|thr_bptx1.condition(1))\
-                                      &(thr_mbtsA.condition(2)|thr_mbtsC.condition(2)|thr_mbtsA.condition(1))\
-                                      &(thr_mbtsA.condition(2)|thr_mbtsC.condition(2)|thr_mbtsC.condition(1))\
-                                      &bgrpcond\
-                                      )\
-                                      .setTriggerType(TT_minb)
-
-        item_mbts1_1_bgrp1 = LVL1MenuItem('L1_MBTS_1_1_BGRP1', ctpid=-1)\
-                            .setLogic(thr_mbtsA.condition(1)&thr_mbtsC.condition(1)&bgrpcond)\
-                            .setTriggerType(TT_minb)
-
-
-
-        item_mbts1_empty   = LVL1MenuItem('L1_MBTS_1_EMPTY', ctpid=-1)\
-                            .setLogic((thr_mbtsA.condition(1)|thr_mbtsC.condition(1))&cosmiccond)\
-                            .setTriggerType(TT_minb)
-
-        item_mbts2_empty   = LVL1MenuItem('L1_MBTS_2_EMPTY', ctpid=-1)\
-                            .setLogic((thr_mbtsA.condition(2)|thr_mbtsC.condition(2)|thr_mbtsA.condition(1))\
-                                      &(thr_mbtsA.condition(2)|thr_mbtsC.condition(2)|thr_mbtsC.condition(1))\
-                                      &cosmiccond).setTriggerType(TT_minb)
-
-        item_mbts1_1_empty = LVL1MenuItem('L1_MBTS_1_1_EMPTY', ctpid=-1)\
-                            .setLogic(thr_mbtsA.condition(1)&thr_mbtsC.condition(1)&cosmiccond)\
-                            .setTriggerType(TT_minb)
-
-        item_mbts2_2_empty = LVL1MenuItem('L1_MBTS_2_2_EMPTY', ctpid=-1)\
-                            .setLogic(thr_mbtsA.condition(2)&thr_mbtsC.condition(2)&cosmiccond)\
-                            .setTriggerType(TT_minb)
-
-        item_mbts3_3_empty = LVL1MenuItem('L1_MBTS_3_3_EMPTY', ctpid=-1)\
-                            .setLogic(thr_mbtsA.condition(3)&thr_mbtsC.condition(3)&cosmiccond)\
-                            .setTriggerType(TT_minb)
-
-        item_mbts4_4_empty = LVL1MenuItem('L1_MBTS_4_4_EMPTY', ctpid=-1)\
-                            .setLogic(thr_mbtsA.condition(4)&thr_mbtsC.condition(4)&cosmiccond)\
-                            .setTriggerType(TT_minb)
-
-
-        item_mbts1_unpaired1  = LVL1MenuItem('L1_MBTS_1_UNPAIRED1', ctpid=-1)\
-                                .setLogic((thr_mbtsA.condition(1)|thr_mbtsC.condition(1))&unpaired1cond)\
-                                .setTriggerType(TT_minb)
-
-        item_mbts1_bgrp7  = LVL1MenuItem('L1_MBTS_1_BGRP7', ctpid=-1)\
-                                .setLogic((thr_mbtsA.condition(1)|thr_mbtsC.condition(1))&bgrp7cond)\
-                                .setTriggerType(TT_minb)
-
-#        item_mbts2_bgrp7  = LVL1MenuItem('L1_MBTS_2_BGRP7', ctpid=-1)\
-#                                .setLogic((thr_mbtsA.condition(2)|thr_mbtsC.condition(2))&bgrp7cond)\
-#                                .setTriggerType(TT_minb)
-
-        item_mbts2_brgp7 = LVL1MenuItem('L1_MBTS_2_BGRP7', ctpid=-1)\
-                           .setLogic((thr_mbtsA.condition(2)|thr_mbtsC.condition(2)|thr_mbtsA.condition(1))\
-                                     &(thr_mbtsA.condition(2)|thr_mbtsC.condition(2)|thr_mbtsC.condition(1))\
-                                     &bgrp7cond).setTriggerType(TT_minb)
-        
-
-        item_mbts1_unpaired2  = LVL1MenuItem('L1_MBTS_1_UNPAIRED2', ctpid=-1)\
-                                .setLogic((thr_mbtsA.condition(1)|thr_mbtsC.condition(1))&unpaired2cond)\
-                                .setTriggerType(TT_minb)
-
-        item_mbts1_unpairedR  = LVL1MenuItem('L1_MBTS_1_UNPAIRED', ctpid=-1)\
-                                .setLogic((thr_mbtsA.condition(1)|thr_mbtsC.condition(1))&unpairedRcond)\
-                                .setTriggerType(TT_minb)
-
-        item_mbts1_unpaired_iso  = LVL1MenuItem('L1_MBTS_1_UNPAIRED_ISO', ctpid=-1)\
-                                   .setLogic((thr_mbtsA.condition(1)|thr_mbtsC.condition(1))&unpaired_isocond)\
-                                   .setTriggerType(TT_minb)
-
-        item_mbts1_unpaired_noniso  = LVL1MenuItem('L1_MBTS_1_UNPAIRED_NONISO', ctpid=-1)\
-                                   .setLogic((thr_mbtsA.condition(1)|thr_mbtsC.condition(1))&unpaired_nonisocond)\
-                                   .setTriggerType(TT_minb)
-
-        item_mbts1_empty1stR  = LVL1MenuItem('L1_MBTS_1_FIRSTEMPTY', ctpid=-1)\
-                                .setLogic((thr_mbtsA.condition(1)|thr_mbtsC.condition(1))&empty1stcond)\
-                                .setTriggerType(TT_minb)
-                
-        item_mbts2_unpaired1  = LVL1MenuItem('L1_MBTS_2_UNPAIRED1', ctpid=-1)\
-                                .setLogic((thr_mbtsA.condition(2)|thr_mbtsC.condition(2)|thr_mbtsA.condition(1))\
-                                          &(thr_mbtsA.condition(2)|thr_mbtsC.condition(2)|thr_mbtsC.condition(1))\
-                                          &unpaired1cond).setTriggerType(TT_minb)
-
-        item_mbts2_unpaired_noniso  = LVL1MenuItem('L1_MBTS_2_UNPAIRED_NONISO', ctpid=-1)\
-                                      .setLogic((thr_mbtsA.condition(2)|thr_mbtsC.condition(2)|thr_mbtsA.condition(1))\
-                                                &(thr_mbtsA.condition(2)|thr_mbtsC.condition(2)|thr_mbtsC.condition(1))\
-                                                &unpaired_nonisocond).setTriggerType(TT_minb)
-
-        item_mbts2_unpaired2  = LVL1MenuItem('L1_MBTS_2_UNPAIRED2', ctpid=-1)\
-                                .setLogic((thr_mbtsA.condition(2)|thr_mbtsC.condition(2)|thr_mbtsA.condition(1))\
-                                          &(thr_mbtsA.condition(2)|thr_mbtsC.condition(2)|thr_mbtsC.condition(1))\
-                                          &unpaired2cond).setTriggerType(TT_minb)
-
-        item_mbts2_unpairedR  = LVL1MenuItem('L1_MBTS_2_UNPAIRED', ctpid=-1)\
-                                .setLogic((thr_mbtsA.condition(2)|thr_mbtsC.condition(2)|thr_mbtsA.condition(1))\
-                                          &(thr_mbtsA.condition(2)|thr_mbtsC.condition(2)|thr_mbtsC.condition(1))\
-                                          &unpairedRcond).setTriggerType(TT_minb)
-
-        item_mbts2_unpaired_iso  = LVL1MenuItem('L1_MBTS_2_UNPAIRED_ISO', ctpid=-1)\
-                                   .setLogic((thr_mbtsA.condition(2)|thr_mbtsC.condition(2)|thr_mbtsA.condition(1))\
-                                             &(thr_mbtsA.condition(2)|thr_mbtsC.condition(2)|thr_mbtsC.condition(1))\
-                                             &unpaired_isocond).setTriggerType(TT_minb)
-
-        item_mbts2_empty1stR  = LVL1MenuItem('L1_MBTS_2_FIRSTEMPTY', ctpid=-1)\
-                                .setLogic((thr_mbtsA.condition(2)|thr_mbtsC.condition(2)|thr_mbtsA.condition(1))\
-                                          &(thr_mbtsA.condition(2)|thr_mbtsC.condition(2)|thr_mbtsC.condition(1))\
-                                          &empty1stcond).setTriggerType(TT_minb)
-        
-        item_mbts1_1_unpaired1 = LVL1MenuItem('L1_MBTS_1_1_UNPAIRED1', ctpid=-1)\
-                                 .setLogic(thr_mbtsA.condition(1)&thr_mbtsC.condition(1)&unpaired1cond)\
-                                 .setTriggerType(TT_minb)
-
-        item_mbts1_1_unpaired2 = LVL1MenuItem('L1_MBTS_1_1_UNPAIRED2', ctpid=-1)\
-                                 .setLogic(thr_mbtsA.condition(1)&thr_mbtsC.condition(1)&unpaired2cond)\
-                                 .setTriggerType(TT_minb)
-
-        item_mbts1_1_unpairedR = LVL1MenuItem('L1_MBTS_1_1_UNPAIRED', ctpid=-1)\
-                                 .setLogic(thr_mbtsA.condition(1)&thr_mbtsC.condition(1)&unpairedRcond)\
-                                 .setTriggerType(TT_minb)
-
-        item_mbts1_1_unpaired_iso = LVL1MenuItem('L1_MBTS_1_1_UNPAIRED_ISO', ctpid=-1)\
-                                    .setLogic(thr_mbtsA.condition(1)&thr_mbtsC.condition(1)&unpaired_isocond)\
-                                    .setTriggerType(TT_minb)
-
-        item_mbts1_1_empty1stR = LVL1MenuItem('L1_MBTS_1_1_FIRSTEMPTY', ctpid=-1)\
-                                .setLogic(thr_mbtsA.condition(1)&thr_mbtsC.condition(1)&empty1stcond)\
-                                .setTriggerType(TT_minb)
-        
-        item_mbts4_4_unpaired1 = LVL1MenuItem('L1_MBTS_4_4_UNPAIRED1', ctpid=-1)\
-                                 .setLogic(thr_mbtsA.condition(4)&thr_mbtsC.condition(4)&unpaired1cond)\
-                                 .setTriggerType(TT_minb)
-
-        item_mbts4_4_unpaired2 = LVL1MenuItem('L1_MBTS_4_4_UNPAIRED2', ctpid=-1)\
-                                 .setLogic(thr_mbtsA.condition(4)&thr_mbtsC.condition(4)&unpaired2cond)\
-                                 .setTriggerType(TT_minb)
-
-        item_mbts4_4_unpairedR = LVL1MenuItem('L1_MBTS_4_4_UNPAIRED', ctpid=-1)\
-                                 .setLogic(thr_mbtsA.condition(4)&thr_mbtsC.condition(4)&unpairedRcond)\
-                                 .setTriggerType(TT_minb)
-
-        item_mbts2_2_unpaired_iso = LVL1MenuItem('L1_MBTS_2_2_UNPAIRED_ISO', ctpid=-1)\
-                                    .setLogic(thr_mbtsA.condition(2)&thr_mbtsC.condition(2)&unpaired_isocond)\
-                                    .setTriggerType(TT_minb)
-
-        item_mbts3_3_unpaired_iso = LVL1MenuItem('L1_MBTS_3_3_UNPAIRED_ISO', ctpid=-1)\
-                                    .setLogic(thr_mbtsA.condition(3)&thr_mbtsC.condition(3)&unpaired_isocond)\
-                                    .setTriggerType(TT_minb)
-                
-        item_mbts4_4_unpaired_iso = LVL1MenuItem('L1_MBTS_4_4_UNPAIRED_ISO', ctpid=-1)\
-                                    .setLogic(thr_mbtsA.condition(4)&thr_mbtsC.condition(4)&unpaired_isocond)\
-                                    .setTriggerType(TT_minb)
-
-        item_mbts4_4_unpaired_noniso = LVL1MenuItem('L1_MBTS_4_4_UNPAIRED_NONISO', ctpid=-1)\
-                                       .setLogic(thr_mbtsA.condition(4)&thr_mbtsC.condition(4)&unpaired_nonisocond)\
-                                       .setTriggerType(TT_minb)
-
-
-        item_mbts4_4_empty1stR = LVL1MenuItem('L1_MBTS_4_4_FIRSTEMPTY', ctpid=-1)\
-                                .setLogic(thr_mbtsA.condition(4)&thr_mbtsC.condition(4)&empty1stcond)\
-                                .setTriggerType(TT_minb)
-
-                
-        item_mbts1_col = LVL1MenuItem('L1_MBTS_1_Col', ctpid=-1)\
-                         .setLogic((thr_mbtsA.condition(1)|thr_mbtsC.condition(1))\
-                                   &Logic(bgrp0)&thr_bptx0.condition(1)&thr_bptx1.condition(1))\
-                                   .setTriggerType(TT_minb)
-
-        item_mbts2_col = LVL1MenuItem('L1_MBTS_2_Col', ctpid=-1)\
-                         .setLogic((thr_mbtsA.condition(2)|thr_mbtsC.condition(2)|thr_mbtsA.condition(1))\
-                                   &(thr_mbtsA.condition(2)|thr_mbtsC.condition(2)|thr_mbtsC.condition(1))\
-                                   &Logic(bgrp0)&thr_bptx0.condition(1)&thr_bptx1.condition(1))\
-                                   .setTriggerType(TT_minb)
-
-        item_mbts1_1_col = LVL1MenuItem('L1_MBTS_1_1_Col', ctpid=-1)\
-                           .setLogic(thr_mbtsA.condition(1)&thr_mbtsC.condition(1)\
-                                     &Logic(bgrp0)&thr_bptx0.condition(1)&thr_bptx1.condition(1))\
-                                     .setTriggerType(TT_minb)
-
-
-        # Debug items for CTP OR function
-        item_mbts_A_bptx0 = LVL1MenuItem('L1_MBTS_A_BPTX0', ctpid=-1)\
-                            .setLogic(Logic(bgrp0)&thr_bptx0.condition(1)&thr_mbtsA.condition(1))\
-                            .setTriggerType(TT_minb)
-        item_mbts_C_bptx0 = LVL1MenuItem('L1_MBTS_C_BPTX0', ctpid=-1)\
-                            .setLogic(Logic(bgrp0)&thr_bptx0.condition(1)&thr_mbtsC.condition(1))\
-                            .setTriggerType(TT_minb)
-        item_mbts_A_bptx1 = LVL1MenuItem('L1_MBTS_A_BPTX1', ctpid=-1)\
-                            .setLogic(Logic(bgrp0)&thr_bptx1.condition(1)&thr_mbtsA.condition(1))\
-                            .setTriggerType(TT_minb)
-        item_mbts_C_bptx1 = LVL1MenuItem('L1_MBTS_C_BPTX1', ctpid=-1)\
-                            .setLogic(Logic(bgrp0)&thr_bptx1.condition(1)&thr_mbtsC.condition(1))\
-                            .setTriggerType(TT_minb)
-
-        item_mbts_a_0 = LVL1MenuItem('L1_MBTSA0', ctpid=-1)\
-                        .setLogic(thr_mbtsA0.condition(1)&physcond)\
-                        .setTriggerType(TT_minb)
-        item_mbts_a_1 = LVL1MenuItem('L1_MBTSA1', ctpid=-1)\
-                        .setLogic(thr_mbtsA1.condition(1)&physcond)\
-                        .setTriggerType(TT_minb)
-        item_mbts_a_2 = LVL1MenuItem('L1_MBTSA2', ctpid=-1)\
-                        .setLogic(thr_mbtsA2.condition(1)&physcond)\
-                        .setTriggerType(TT_minb)
-        item_mbts_a_3 = LVL1MenuItem('L1_MBTSA3', ctpid=-1)\
-                        .setLogic(thr_mbtsA3.condition(1)&physcond)\
-                        .setTriggerType(TT_minb)
-        item_mbts_a_4 = LVL1MenuItem('L1_MBTSA4', ctpid=-1)\
-                        .setLogic(thr_mbtsA4.condition(1)&physcond)\
-                        .setTriggerType(TT_minb)
-        item_mbts_a_5 = LVL1MenuItem('L1_MBTSA5', ctpid=-1)\
-                        .setLogic(thr_mbtsA5.condition(1)&physcond)\
-                        .setTriggerType(TT_minb)
-        item_mbts_a_6 = LVL1MenuItem('L1_MBTSA6', ctpid=-1)\
-                        .setLogic(thr_mbtsA6.condition(1)&physcond)\
-                        .setTriggerType(TT_minb)
-        item_mbts_a_7 = LVL1MenuItem('L1_MBTSA7', ctpid=-1)\
-                        .setLogic(thr_mbtsA7.condition(1)&physcond)\
-                        .setTriggerType(TT_minb)
-        item_mbts_a_8 = LVL1MenuItem('L1_MBTSA8', ctpid=-1)\
-                        .setLogic(thr_mbtsA8.condition(1)&physcond)\
-                        .setTriggerType(TT_minb)
-        item_mbts_a_9 = LVL1MenuItem('L1_MBTSA9', ctpid=-1)\
-                        .setLogic(thr_mbtsA9.condition(1)&physcond)\
-                        .setTriggerType(TT_minb)
-        item_mbts_a_10 = LVL1MenuItem('L1_MBTSA10', ctpid=-1)\
-                        .setLogic(thr_mbtsA10.condition(1)&physcond)\
-                        .setTriggerType(TT_minb)
-        item_mbts_a_11 = LVL1MenuItem('L1_MBTSA11', ctpid=-1)\
-                        .setLogic(thr_mbtsA11.condition(1)&physcond)\
-                        .setTriggerType(TT_minb)
-        item_mbts_a_12 = LVL1MenuItem('L1_MBTSA12', ctpid=-1)\
-                        .setLogic(thr_mbtsA12.condition(1)&physcond)\
-                        .setTriggerType(TT_minb)
-        item_mbts_a_13 = LVL1MenuItem('L1_MBTSA13', ctpid=-1)\
-                        .setLogic(thr_mbtsA13.condition(1)&physcond)\
-                        .setTriggerType(TT_minb)
-        item_mbts_a_14 = LVL1MenuItem('L1_MBTSA14', ctpid=-1)\
-                        .setLogic(thr_mbtsA14.condition(1)&physcond)\
-                        .setTriggerType(TT_minb)
-        item_mbts_a_15 = LVL1MenuItem('L1_MBTSA15', ctpid=-1)\
-                        .setLogic(thr_mbtsA15.condition(1)&physcond)\
-                        .setTriggerType(TT_minb)
-
-        item_mbts_c_0 = LVL1MenuItem('L1_MBTSC0', ctpid=-1)\
-                        .setLogic(thr_mbtsC0.condition(1)&physcond)\
-                        .setTriggerType(TT_minb)
-        item_mbts_c_1 = LVL1MenuItem('L1_MBTSC1', ctpid=-1)\
-                        .setLogic(thr_mbtsC1.condition(1)&physcond)\
-                        .setTriggerType(TT_minb)
-        item_mbts_c_2 = LVL1MenuItem('L1_MBTSC2', ctpid=-1)\
-                        .setLogic(thr_mbtsC2.condition(1)&physcond)\
-                        .setTriggerType(TT_minb)
-        item_mbts_c_3 = LVL1MenuItem('L1_MBTSC3', ctpid=-1)\
-                        .setLogic(thr_mbtsC3.condition(1)&physcond)\
-                        .setTriggerType(TT_minb)
-        item_mbts_c_4 = LVL1MenuItem('L1_MBTSC4', ctpid=-1)\
-                        .setLogic(thr_mbtsC4.condition(1)&physcond)\
-                        .setTriggerType(TT_minb)
-        item_mbts_c_5 = LVL1MenuItem('L1_MBTSC5', ctpid=-1)\
-                        .setLogic(thr_mbtsC5.condition(1)&physcond)\
-                        .setTriggerType(TT_minb)
-        item_mbts_c_6 = LVL1MenuItem('L1_MBTSC6', ctpid=-1)\
-                        .setLogic(thr_mbtsC6.condition(1)&physcond)\
-                        .setTriggerType(TT_minb)
-        item_mbts_c_7 = LVL1MenuItem('L1_MBTSC7', ctpid=-1)\
-                        .setLogic(thr_mbtsC7.condition(1)&physcond)\
-                        .setTriggerType(TT_minb)
-        item_mbts_c_8 = LVL1MenuItem('L1_MBTSC8', ctpid=-1)\
-                        .setLogic(thr_mbtsC8.condition(1)&physcond)\
-                        .setTriggerType(TT_minb)
-        item_mbts_c_9 = LVL1MenuItem('L1_MBTSC9', ctpid=-1)\
-                        .setLogic(thr_mbtsC9.condition(1)&physcond)\
-                        .setTriggerType(TT_minb)
-        item_mbts_c_10 = LVL1MenuItem('L1_MBTSC10', ctpid=-1)\
-                        .setLogic(thr_mbtsC10.condition(1)&physcond)\
-                        .setTriggerType(TT_minb)
-        item_mbts_c_11 = LVL1MenuItem('L1_MBTSC11', ctpid=-1)\
-                        .setLogic(thr_mbtsC11.condition(1)&physcond)\
-                        .setTriggerType(TT_minb)
-        item_mbts_c_12 = LVL1MenuItem('L1_MBTSC12', ctpid=-1)\
-                        .setLogic(thr_mbtsC12.condition(1)&physcond)\
-                        .setTriggerType(TT_minb)
-        item_mbts_c_13 = LVL1MenuItem('L1_MBTSC13', ctpid=-1)\
-                        .setLogic(thr_mbtsC13.condition(1)&physcond)\
-                        .setTriggerType(TT_minb)
-        item_mbts_c_14 = LVL1MenuItem('L1_MBTSC14', ctpid=-1)\
-                        .setLogic(thr_mbtsC14.condition(1)&physcond)\
-                        .setTriggerType(TT_minb)
-        item_mbts_c_15 = LVL1MenuItem('L1_MBTSC15', ctpid=-1)\
-                        .setLogic(thr_mbtsC15.condition(1)&physcond)\
-                        .setTriggerType(TT_minb)
-        
-        item_trt_fast = LVL1MenuItem('L1_TRTfast', ctpid=-1).setLogic(thr_trt.condition(1)&Logic(bgrp0)).setTriggerType(TT_minb)
-
-        item_zdcA_empty    = LVL1MenuItem('L1_ZDC_A_EMPTY',   ctpid=-1).setLogic(thr_zdcA.condition(1)&cosmiccond).setTriggerType(TT_minb)
-        item_zdcC_empty    = LVL1MenuItem('L1_ZDC_C_EMPTY',   ctpid=-1).setLogic(thr_zdcC.condition(1)&cosmiccond).setTriggerType(TT_minb)
-        item_zdcAND_empty  = LVL1MenuItem('L1_ZDC_AND_EMPTY', ctpid=-1).setLogic(thr_zdcAND.condition(1)&cosmiccond).setTriggerType(TT_minb)
-        item_zdc_empty     = LVL1MenuItem('L1_ZDC_EMPTY',     ctpid=-1).setLogic((thr_zdcA.condition(1)|thr_zdcC.condition(1))&cosmiccond).setTriggerType(TT_minb)
-        item_zdc_unpaired1    = LVL1MenuItem('L1_ZDC_UNPAIRED1', ctpid=-1).setLogic((thr_zdcA.condition(1)|thr_zdcC.condition(1))&unpaired1cond).setTriggerType(TT_minb)
-        item_zdc_unpaired2    = LVL1MenuItem('L1_ZDC_UNPAIRED2', ctpid=-1).setLogic((thr_zdcA.condition(1)|thr_zdcC.condition(1))&unpaired2cond).setTriggerType(TT_minb)
-        item_zdc_unpairedR    = LVL1MenuItem('L1_ZDC_UNPAIRED',  ctpid=-1).setLogic((thr_zdcA.condition(1)|thr_zdcC.condition(1))&unpairedRcond).setTriggerType(TT_minb)                
-        item_zdc_unpaired_iso = LVL1MenuItem('L1_ZDC_UNPAIRED_ISO',ctpid=-1).setLogic((thr_zdcA.condition(1)|thr_zdcC.condition(1))&unpaired_isocond).setTriggerType(TT_minb)
-        item_zdc_unpaired_noniso = LVL1MenuItem('L1_ZDC_UNPAIRED_NONISO',ctpid=-1).setLogic((thr_zdcA.condition(1)|thr_zdcC.condition(1))&unpaired_nonisocond).setTriggerType(TT_minb)                
-        item_zdcA_C_empty     = LVL1MenuItem('L1_ZDC_A_C_EMPTY', ctpid=-1).setLogic(thr_zdcA.condition(1)&thr_zdcC.condition(1)&cosmiccond).setTriggerType(TT_minb)
-        item_zdcA_C_unpaired_iso     = LVL1MenuItem('L1_ZDC_A_C_UNPAIRED_ISO', ctpid=-1).setLogic(thr_zdcA.condition(1)&thr_zdcC.condition(1)&unpaired_isocond).setTriggerType(TT_minb)
-        item_zdcAnd_unpaired_iso     = LVL1MenuItem('L1_ZDC_AND_UNPAIRED_ISO', ctpid=-1).setLogic(thr_zdcAND.condition(1)&unpaired_isocond).setTriggerType(TT_minb)
-        item_zdcAnd_unpaired_noniso     = LVL1MenuItem('L1_ZDC_AND_UNPAIRED_NONISO', ctpid=-1).setLogic(thr_zdcAND.condition(1)&unpaired_nonisocond).setTriggerType(TT_minb)
-        item_zdcA_C_NoCol     = LVL1MenuItem('L1_ZDC_A_C_NoCol', ctpid=-1).setLogic(thr_zdcA.condition(1)&thr_zdcC.condition(1)&NoColCond).setTriggerType(TT_minb)
-        item_zdcA_C_unpaired_noniso     = LVL1MenuItem('L1_ZDC_A_C_UNPAIRED_NONISO', ctpid=-1).setLogic(thr_zdcA.condition(1)&thr_zdcC.condition(1)&unpaired_nonisocond).setTriggerType(TT_minb)
-        item_zdcA = LVL1MenuItem('L1_ZDC_A', ctpid=-1).setLogic(thr_zdcA.condition(1)&physcond).setTriggerType(TT_minb)
-        item_zdcC = LVL1MenuItem('L1_ZDC_C', ctpid=-1).setLogic(thr_zdcC.condition(1)&physcond).setTriggerType(TT_minb)
-        item_zdcAND = LVL1MenuItem('L1_ZDC_AND', ctpid=-1).setLogic(thr_zdcAND.condition(1)&physcond).setTriggerType(TT_minb)
-
-        item_zdcAND_veto_te50 = LVL1MenuItem('L1_ZDC_AND_VTE50', ctpid=-1).setLogic(thr_zdcAND.condition(1)\
-                                                                                    &Not(thr_te50.condition(1))&physcond).setTriggerType(TT_minb)
-        item_zdcA_C_veto_te50 = LVL1MenuItem('L1_ZDC_A_C_VTE50', ctpid=-1).setLogic(thr_zdcA.condition(1)&thr_zdcC.condition(1)\
-                                                                                    &Not(thr_te50.condition(1))&physcond).setTriggerType(TT_minb)
-        item_zdcA_C_te50 = LVL1MenuItem('L1_ZDC_A_C_TE50', ctpid=-1).setLogic(thr_zdcA.condition(1)&thr_zdcC.condition(1)\
-                                                                                    &thr_te50.condition(1)&physcond).setTriggerType(TT_minb)
-        item_zdcA_veto_te20 = LVL1MenuItem('L1_ZDC_A_VTE20', ctpid=-1).setLogic(thr_zdcA.condition(1)\
-                                                                                &Not(thr_te20.condition(1))&physcond).setTriggerType(TT_minb)
-        item_zdcC_veto_te20 = LVL1MenuItem('L1_ZDC_C_VTE20', ctpid=-1).setLogic(thr_zdcC.condition(1)\
-                                                                                &Not(thr_te20.condition(1))&physcond).setTriggerType(TT_minb)
-
-        item_zdc = LVL1MenuItem('L1_ZDC', ctpid=-1).setLogic((thr_zdcA.condition(1)|thr_zdcC.condition(1))&physcond).setTriggerType(TT_minb)
-        item_zdcA_C = LVL1MenuItem('L1_ZDC_A_C', ctpid=-1).setLogic(thr_zdcA.condition(1)&thr_zdcC.condition(1)&physcond).setTriggerType(TT_minb)
-        item_zdcA_C_bgrp7 = LVL1MenuItem('L1_ZDC_A_C_BGRP7', ctpid=-1).setLogic(thr_zdcA.condition(1)&thr_zdcC.condition(1)&bgrp7cond).setTriggerType(TT_minb)
-        item_zdcA_bgrp7 = LVL1MenuItem('L1_ZDC_A_BGRP7', ctpid=-1).setLogic(thr_zdcA.condition(1)&bgrp7cond).setTriggerType(TT_minb)
-        item_zdcC_bgrp7 = LVL1MenuItem('L1_ZDC_C_BGRP7', ctpid=-1).setLogic(thr_zdcC.condition(1)&bgrp7cond).setTriggerType(TT_minb)
-        item_zdcA_C_overlay = LVL1MenuItem('L1_ZDC_A_C_OVERLAY', ctpid=-1).setLogic(thr_zdcA.condition(1)&thr_zdcC.condition(1)&physcond).setTriggerType(TT_zerobs)
-
-	
-        item_zdc_mbts1 = LVL1MenuItem('L1_ZDC_MBTS_1', ctpid=-1)\
-                         .setLogic((thr_zdcA.condition(1)|thr_zdcC.condition(1))&\
-                                   (thr_mbtsA.condition(1)|thr_mbtsC.condition(1))&physcond)\
-                                   .setTriggerType(TT_minb)
-        #                     .setLogic(Logic(bgrp0)&Logic(bgrp1)&(thr_mbtsA.condition(1)|thr_mbtsC.condition(1)))\
-
-        item_zdc_mbts2 = LVL1MenuItem('L1_ZDC_MBTS_2', ctpid=-1)\
-                         .setLogic((thr_zdcA.condition(1)|thr_zdcC.condition(1))&\
-                                   (thr_mbtsA.condition(2)|thr_mbtsC.condition(2)|thr_mbtsA.condition(1))\
-                                   &(thr_mbtsA.condition(2)|thr_mbtsC.condition(2)|thr_mbtsC.condition(1))&physcond)\
-                                   .setTriggerType(TT_minb)
-
-        item_zdc_mbts1_1 = LVL1MenuItem('L1_ZDC_MBTS_1_1', ctpid=-1)\
-                           .setLogic((thr_zdcA.condition(1)|thr_zdcC.condition(1))&\
-                                     (thr_mbtsA.condition(1)&thr_mbtsC.condition(1))&physcond)\
-                                     .setTriggerType(TT_minb)
-        
-        item_zdc_mbts1_2 = LVL1MenuItem('L1_ZDC_MBTS_2_2', ctpid=-1)\
-                           .setLogic((thr_zdcA.condition(1)|thr_zdcC.condition(1))&\
-                                     (thr_mbtsA.condition(2)&thr_mbtsC.condition(2))&physcond)\
-                                     .setTriggerType(TT_minb)
-                                   
-        item_bcmAtoC = LVL1MenuItem('L1_BCM_AtoC', ctpid=0xe5).setLogic(thr_bcmAtoC.condition(1)&physcond).setTriggerType(TT_minb)
-        item_bcmCtoA = LVL1MenuItem('L1_BCM_CtoA', ctpid=0xe6).setLogic(thr_bcmCtoA.condition(1)&physcond).setTriggerType(TT_minb)
-        item_bcmAC_CA_bgrp0 = LVL1MenuItem('L1_BCM_AC_CA_BGRP0', ctpid=0xe6).setLogic((thr_bcmAtoC.condition(1)|thr_bcmCtoA.condition(1))&Logic(bgrp0)).setTriggerType(TT_minb)
-
-        item_bcmAC_CA_unpaired_iso = LVL1MenuItem('L1_BCM_AC_CA_UNPAIRED_ISO', ctpid=-1).setLogic((thr_bcmAtoC.condition(1)|thr_bcmCtoA.condition(1))&unpaired_isocond).setTriggerType(TT_minb)
-        item_bcmAC_CA_unpaired_noniso = LVL1MenuItem('L1_BCM_AC_CA_UNPAIRED_NONISO', ctpid=-1).setLogic((thr_bcmAtoC.condition(1)|thr_bcmCtoA.condition(1))&unpaired_nonisocond).setTriggerType(TT_minb)
-
-        item_bcm1 = LVL1MenuItem('L1_BCM_MUL_1', ctpid=0xe7).setLogic(thr_bcmComb.condition(1)&physcond).setTriggerType(TT_minb)
-        item_bcm2 = LVL1MenuItem('L1_BCM_MUL_2', ctpid=0xe9).setLogic(thr_bcmComb.condition(2)&physcond).setTriggerType(TT_minb)
-        item_bcm3 = LVL1MenuItem('L1_BCM_MUL_3', ctpid=0xea).setLogic(thr_bcmComb.condition(3)&physcond).setTriggerType(TT_minb)
-        item_bcm4 = LVL1MenuItem('L1_BCM_MUL_4', ctpid=0xeb).setLogic(thr_bcmComb.condition(4)&physcond).setTriggerType(TT_minb)
-        item_bcm5 = LVL1MenuItem('L1_BCM_MUL_5', ctpid=0xf6).setLogic(thr_bcmComb.condition(5)&physcond).setTriggerType(TT_minb)
-        item_bcm6 = LVL1MenuItem('L1_BCM_MUL_6', ctpid=0xf7).setLogic(thr_bcmComb.condition(6)&physcond).setTriggerType(TT_minb)
-        item_bcm7 = LVL1MenuItem('L1_BCM_MUL_7', ctpid=0xf8).setLogic(thr_bcmComb.condition(7)&physcond).setTriggerType(TT_minb)
-        
-        item_bcmHT = LVL1MenuItem('L1_BCM_HT', ctpid=0xf8).setLogic(thr_bcmComb.condition(7)&physcond).setTriggerType(TT_minb)
-        item_bcmHT_bgrp0 = LVL1MenuItem('L1_BCM_HT_BGRP0', ctpid=0xf8).setLogic(thr_bcmComb.condition(7)&Logic(bgrp0)).setTriggerType(TT_minb)
-
-        item_bcmWide = LVL1MenuItem('L1_BCM_Wide', ctpid=-1).setLogic(thr_bcmWide.condition(1)&physcond).setTriggerType(TT_minb)
-        item_bcmWide_NoCol = LVL1MenuItem('L1_BCM_Wide_NoCol', ctpid=-1).setLogic(thr_bcmWide.condition(1)&NoColCond).setTriggerType(TT_minb)
-        item_bcmWide_bgrp0 = LVL1MenuItem('L1_BCM_Wide_BGRP0', ctpid=0xe8).setLogic(thr_bcmWide.condition(1)&Logic(bgrp0)).setTriggerType(TT_minb)
-
-
-        item_bcmAtoC_EMPTY = LVL1MenuItem('L1_BCM_AtoC_EMPTY', ctpid=-1).setLogic(thr_bcmAtoC.condition(1)&cosmiccond).setTriggerType(TT_minb)
-        item_bcmCtoA_EMPTY = LVL1MenuItem('L1_BCM_CtoA_EMPTY', ctpid=-1).setLogic(thr_bcmCtoA.condition(1)&cosmiccond).setTriggerType(TT_minb)
-        
-        item_bcm1_EMPTY = LVL1MenuItem('L1_BCM_MUL_1_EMPTY', ctpid=-1).setLogic(thr_bcmComb.condition(1)&cosmiccond).setTriggerType(TT_minb)
-        item_bcm2_EMPTY = LVL1MenuItem('L1_BCM_MUL_2_EMPTY', ctpid=-1).setLogic(thr_bcmComb.condition(2)&cosmiccond).setTriggerType(TT_minb)
-        item_bcm3_EMPTY = LVL1MenuItem('L1_BCM_MUL_3_EMPTY', ctpid=-1).setLogic(thr_bcmComb.condition(3)&cosmiccond).setTriggerType(TT_minb)
-        item_bcm4_EMPTY = LVL1MenuItem('L1_BCM_MUL_4_EMPTY', ctpid=-1).setLogic(thr_bcmComb.condition(4)&cosmiccond).setTriggerType(TT_minb)
-        item_bcm5_EMPTY = LVL1MenuItem('L1_BCM_MUL_5_EMPTY', ctpid=-1).setLogic(thr_bcmComb.condition(5)&cosmiccond).setTriggerType(TT_minb)
-        item_bcm6_EMPTY = LVL1MenuItem('L1_BCM_MUL_6_EMPTY', ctpid=-1).setLogic(thr_bcmComb.condition(6)&cosmiccond).setTriggerType(TT_minb)
-        item_bcm7_EMPTY = LVL1MenuItem('L1_BCM_MUL_7_EMPTY', ctpid=-1).setLogic(thr_bcmComb.condition(7)&cosmiccond).setTriggerType(TT_minb)
-        item_bcmHT_EMPTY = LVL1MenuItem('L1_BCM_HT_EMPTY', ctpid=-1).setLogic(thr_bcmComb.condition(7)&cosmiccond).setTriggerType(TT_minb)
-        item_bcmWide_EMPTY        = LVL1MenuItem('L1_BCM_Wide_EMPTY', ctpid=-1).setLogic(thr_bcmWide.condition(1)&cosmiccond).setTriggerType(TT_minb)
-        item_bcmWide_unpaired_iso     = LVL1MenuItem('L1_BCM_Wide_UNPAIRED_ISO', ctpid=-1).setLogic(thr_bcmWide.condition(1)&unpaired_isocond).setTriggerType(TT_minb)
-        item_bcmWide_unpaired_noniso = LVL1MenuItem('L1_BCM_Wide_UNPAIRED_NONISO', ctpid=-1).setLogic(thr_bcmWide.condition(1)&unpaired_nonisocond).setTriggerType(TT_minb)
-
-
-        
-        item_bcmIdeal = LVL1MenuItem('L1_BCM_Ideal', ctpid=-1)\
-                        .setLogic((thr_bcmA1.condition(1)|thr_bcmA2.condition(1))&\
-                                  (thr_bcmC1.condition(1)|thr_bcmC2.condition(1))&\
-                                  physcond)\
-                                  .setTriggerType(TT_minb)
-
-        item_bcmAtoC_bptx = LVL1MenuItem('L1_BCM_AtoC_BPTX', ctpid=0xdc).setLogic(thr_bcmAtoC.condition(1)&Logic(bgrp0)&(thr_bptx0.condition(1)|thr_bptx1.condition(1)))\
-                            .setTriggerType(TT_minb)
-        item_bcmCtoA_bptx = LVL1MenuItem('L1_BCM_CtoA_BPTX', ctpid=0xdd).setLogic(thr_bcmCtoA.condition(1)&Logic(bgrp0)&(thr_bptx0.condition(1)|thr_bptx1.condition(1)))\
-                            .setTriggerType(TT_minb)
-        item_bcmWide_bptx = LVL1MenuItem('L1_BCM_Wide_BPTX', ctpid=0xde).setLogic(thr_bcmWide.condition(1)&Logic(bgrp0)&(thr_bptx0.condition(1)|thr_bptx1.condition(1)))\
-                            .setTriggerType(TT_minb)
-        item_bcm1_bptx = LVL1MenuItem('L1_BCM_MUL_1_BPTX', ctpid=0xdf).setLogic(thr_bcmComb.condition(1)&Logic(bgrp0)&(thr_bptx0.condition(1)|thr_bptx1.condition(1)))\
-                         .setTriggerType(TT_minb)
-        
-        item_lucidA =  LVL1MenuItem('L1_LUCID_A', ctpid=0xec).setLogic(thr_lucidA.condition(1)&physcond).setTriggerType(TT_minb)
-        item_lucidC =  LVL1MenuItem('L1_LUCID_C', ctpid=0xed).setLogic(thr_lucidC.condition(1)&physcond).setTriggerType(TT_minb)
-        item_lucidAC =  LVL1MenuItem('L1_LUCID_A_C', ctpid=0xee).setLogic(thr_lucidA.condition(1)&thr_lucidC.condition(1)&physcond).setTriggerType(TT_minb)
-        item_lucidAC_NoCol =  LVL1MenuItem('L1_LUCID_A_C_NoCol', ctpid=0xee).setLogic(thr_lucidA.condition(1)&thr_lucidC.condition(1)&NoColCond).setTriggerType(TT_minb)
-        item_lucid =  LVL1MenuItem('L1_LUCID', ctpid=0xf5).setLogic((thr_lucidA.condition(1)|thr_lucidC.condition(1))&physcond).setTriggerType(TT_minb)
-        item_lucid_bgpr7 =  LVL1MenuItem('L1_LUCID_BGRP7', ctpid=0xf5).setLogic((thr_lucidA.condition(1)|thr_lucidC.condition(1))&bgrp7cond).setTriggerType(TT_minb)
-        item_lucid_comm =  LVL1MenuItem('L1_LUCID_COMM', ctpid=-1).setLogic(thr_nimdir5.condition(1)&physcond).setTriggerType(TT_minb)
-        item_lucidA_bptx =  LVL1MenuItem('L1_LUCID_A_BPTX', ctpid=0xd0)\
-                           .setLogic(thr_lucidA.condition(1)&Logic(bgrp0)&(thr_bptx0.condition(1)|thr_bptx1.condition(1)))\
-                           .setTriggerType(TT_minb)
-        item_lucidC_bptx =  LVL1MenuItem('L1_LUCID_C_BPTX', ctpid=0xd1)\
-                           .setLogic(thr_lucidC.condition(1)&Logic(bgrp0)&(thr_bptx0.condition(1)|thr_bptx1.condition(1)))\
-                           .setTriggerType(TT_minb)
-        item_lucidAC_bptx =  LVL1MenuItem('L1_LUCID_A_C_BPTX', ctpid=0xd3)\
-                            .setLogic(thr_lucidA.condition(1)&thr_lucidC.condition(1)&Logic(bgrp0)&(thr_bptx0.condition(1)|thr_bptx1.condition(1)))\
-                            .setTriggerType(TT_minb)
-        item_lucid_bptx =  LVL1MenuItem('L1_LUCID_BPTX', ctpid=0xd4)\
-                          .setLogic((thr_lucidA.condition(1)|thr_lucidC.condition(1))&Logic(bgrp0)&(thr_bptx0.condition(1)|thr_bptx1.condition(1)))\
-                          .setTriggerType(TT_minb)
-
-        item_lucidA_empty     =  LVL1MenuItem('L1_LUCID_A_EMPTY',    ctpid=-1).setLogic(thr_lucidA.condition(1)&cosmiccond).setTriggerType(TT_minb)
-        item_lucidC_empty     =  LVL1MenuItem('L1_LUCID_C_EMPTY',    ctpid=-1).setLogic(thr_lucidC.condition(1)&cosmiccond).setTriggerType(TT_minb)
-        item_lucidAC_empty    =  LVL1MenuItem('L1_LUCID_A_C_EMPTY',  ctpid=-1).setLogic(thr_lucidA.condition(1)&thr_lucidC.condition(1)&cosmiccond).setTriggerType(TT_minb)
-        item_lucid_empty      =  LVL1MenuItem('L1_LUCID_EMPTY',      ctpid=-1).setLogic((thr_lucidA.condition(1)|thr_lucidC.condition(1))&cosmiccond).setTriggerType(TT_minb)
-        item_lucid_unpaired_iso      =  LVL1MenuItem('L1_LUCID_UNPAIRED_ISO',      ctpid=-1).setLogic((thr_lucidA.condition(1)|thr_lucidC.condition(1))&unpaired_isocond).setTriggerType(TT_minb)
-        item_lucid_unpaired_noniso      =  LVL1MenuItem('L1_LUCID_UNPAIRED_NONISO',      ctpid=-1).setLogic((thr_lucidA.condition(1)|thr_lucidC.condition(1))&unpaired_nonisocond).setTriggerType(TT_minb)
-        item_lucid_comm_empty =  LVL1MenuItem('L1_LUCID_COMM_EMPTY', ctpid=-1).setLogic(thr_nimdir5.condition(1)&cosmiccond).setTriggerType(TT_minb)
-        item_lucidA_unpaired1 =  LVL1MenuItem('L1_LUCID_A_UNPAIRED1',  ctpid=-1).setLogic(thr_lucidA.condition(1)&unpaired1cond).setTriggerType(TT_minb)
-        item_lucidA_unpaired2 =  LVL1MenuItem('L1_LUCID_A_UNPAIRED2',  ctpid=-1).setLogic(thr_lucidA.condition(1)&unpaired2cond).setTriggerType(TT_minb)
-        item_lucidA_unpairedR =  LVL1MenuItem('L1_LUCID_A_UNPAIRED',   ctpid=-1).setLogic(thr_lucidA.condition(1)&unpairedRcond).setTriggerType(TT_minb)        
-        item_lucid_comm_unpaired_iso =  LVL1MenuItem('L1_LUCID_COMM_UNPAIRED_ISO',   ctpid=-1).setLogic(thr_nimdir5.condition(1)&unpaired_isocond).setTriggerType(TT_minb)        
-        item_lucidA_unpaired_iso =  LVL1MenuItem('L1_LUCID_A_UNPAIRED_ISO',   ctpid=-1).setLogic(thr_lucidA.condition(1)&unpaired_isocond).setTriggerType(TT_minb)        
-        item_lucidC_unpaired1 =  LVL1MenuItem('L1_LUCID_C_UNPAIRED1',  ctpid=-1).setLogic(thr_lucidC.condition(1)&unpaired1cond).setTriggerType(TT_minb)
-        item_lucidC_unpaired2 =  LVL1MenuItem('L1_LUCID_C_UNPAIRED2',  ctpid=-1).setLogic(thr_lucidC.condition(1)&unpaired2cond).setTriggerType(TT_minb)
-        item_lucidC_unpairedR =  LVL1MenuItem('L1_LUCID_C_UNPAIRED',   ctpid=-1).setLogic(thr_lucidC.condition(1)&unpairedRcond).setTriggerType(TT_minb)        
-        item_lucidC_unpaired_iso =  LVL1MenuItem('L1_LUCID_C_UNPAIRED_ISO',   ctpid=-1).setLogic(thr_lucidC.condition(1)&unpaired_isocond).setTriggerType(TT_minb)        
-        
-        item_lucidAC_unpaired1 =  LVL1MenuItem('L1_LUCID_A_C_UNPAIRED1', ctpid=-1).setLogic(thr_lucidA.condition(1)&thr_lucidC.condition(1)&unpaired1cond).setTriggerType(TT_minb)
-        item_lucidAC_unpaired2 =  LVL1MenuItem('L1_LUCID_A_C_UNPAIRED2', ctpid=-1).setLogic(thr_lucidA.condition(1)&thr_lucidC.condition(1)&unpaired2cond).setTriggerType(TT_minb)
-        item_lucidAC_unpairedR =  LVL1MenuItem('L1_LUCID_A_C_UNPAIRED',  ctpid=-1).setLogic(thr_lucidA.condition(1)&thr_lucidC.condition(1)&unpairedRcond).setTriggerType(TT_minb)
-        item_lucidAC_unpaired_iso =  LVL1MenuItem('L1_LUCID_A_C_UNPAIRED_ISO',  ctpid=-1).setLogic(thr_lucidA.condition(1)&thr_lucidC.condition(1)&unpaired_isocond).setTriggerType(TT_minb)
-        item_lucidAC_unpaired_noniso =  LVL1MenuItem('L1_LUCID_A_C_UNPAIRED_NONISO',  ctpid=-1).setLogic(thr_lucidA.condition(1)&thr_lucidC.condition(1)&unpaired_nonisocond).setTriggerType(TT_minb)
-
-        item_lucidA_filled  =  LVL1MenuItem('L1_LUCID_A_FILLED',  ctpid=-1).setLogic(thr_lucidA.condition(1)&physcond).setTriggerType(TT_minb)
-        item_lucidC_filled  =  LVL1MenuItem('L1_LUCID_C_FILLED',   ctpid=-1).setLogic(thr_lucidC.condition(1)&physcond).setTriggerType(TT_minb)
-        item_lucidAC_filled =  LVL1MenuItem('L1_LUCID_A_C_FILLED', ctpid=-1).setLogic(thr_lucidA.condition(1)&thr_lucidC.condition(1)&physcond).setTriggerType(TT_minb)
-        item_lucid_filled   =  LVL1MenuItem('L1_LUCID_FILLED',     ctpid=-1).setLogic((thr_lucidA.condition(1)|thr_lucidC.condition(1))&physcond).setTriggerType(TT_minb)
-
-
-        item_rndm0 = LVL1MenuItem('L1_RD0', ctpid=0xef).setLogic(Logic(rndm0)&Logic(bgrp0)).setTriggerType(TT_rand)
-        item_rndm1 = LVL1MenuItem('L1_RD1', ctpid=0xf0).setLogic(Logic(rndm1)&Logic(bgrp0)).setTriggerType(TT_rand)
-        
-        item_rndm0_filled       = LVL1MenuItem('L1_RD0_FILLED',       ctpid=-1).setLogic(Logic(rndm0)&physcond).setTriggerType(TT_rand)
-        item_rndm0_empty        = LVL1MenuItem('L1_RD0_EMPTY',        ctpid=-1).setLogic(Logic(rndm0)&cosmiccond).setTriggerType(TT_rand)
-        item_rndm0_unpaired1    = LVL1MenuItem('L1_RD0_UNPAIRED1',    ctpid=-1).setLogic(Logic(rndm0)&unpaired1cond).setTriggerType(TT_rand)
-        item_rndm0_unpaired2    = LVL1MenuItem('L1_RD0_UNPAIRED2',    ctpid=-1).setLogic(Logic(rndm0)&unpaired2cond).setTriggerType(TT_rand)
-        item_rndm0_unpairedR    = LVL1MenuItem('L1_RD0_UNPAIRED',     ctpid=-1).setLogic(Logic(rndm0)&unpairedRcond).setTriggerType(TT_rand)
-        item_rndm0_1stempty     = LVL1MenuItem('L1_RD0_FIRSTEMPTY',   ctpid=-1).setLogic(Logic(rndm0)&empty1stcond).setTriggerType(TT_rand)
-        item_rndm1_filled       = LVL1MenuItem('L1_RD1_FILLED',       ctpid=-1).setLogic(Logic(rndm1)&physcond).setTriggerType(TT_rand)
-        item_rndm1_empty        = LVL1MenuItem('L1_RD1_EMPTY',        ctpid=-1).setLogic(Logic(rndm1)&cosmiccond).setTriggerType(TT_zerobs)
-        item_rndm0_unpaired_iso = LVL1MenuItem('L1_RD0_UNPAIRED_ISO', ctpid=-1).setLogic(Logic(rndm0)&unpaired_isocond).setTriggerType(TT_rand)
-        item_rndm0_unpaired_noniso = LVL1MenuItem('L1_RD0_UNPAIRED_NONISO', ctpid=-1).setLogic(Logic(rndm0)&unpaired_nonisocond).setTriggerType(TT_rand)
-        
-        item_rndm0_bgrp0_bgrp1 = LVL1MenuItem('L1_RD0_BGRP1', ctpid=-1).setLogic(Logic(rndm0)&Logic(bgrp0)&Logic(bgrp1)).setTriggerType(TT_rand)        
-        item_rndm1_bgrp0_bgrp3 = LVL1MenuItem('L1_RD1_NOISE', ctpid=-1).setLogic(Logic(rndm1)&Logic(bgrp0)&Logic(bgrp3)).setTriggerType(TT_rand)
-        item_rndm1_bgrp0_bgrp4 = LVL1MenuItem('L1_RD1_BGRP4', ctpid=-1).setLogic(Logic(rndm1)&Logic(bgrp0)&(Logic(bgrp4))).setTriggerType(TT_rand)
-        item_rndm1_bgrp0_bgrp5 = LVL1MenuItem('L1_RD1_BGRP5', ctpid=-1).setLogic(Logic(rndm1)&Logic(bgrp0)&(Logic(bgrp5))).setTriggerType(TT_rand)
-        item_rndm1_bgrp0_bgrp6 = LVL1MenuItem('L1_RD1_HIST', ctpid=-1).setLogic(Logic(rndm1)&Logic(bgrp0)&Logic(bgrp6)).setTriggerType(TT_rand)
-        item_rndm1_brp0        = LVL1MenuItem('L1_RD1_BGRP0', ctpid=-1).setLogic(Logic(rndm1)&Logic(bgrp0)).setTriggerType(TT_rand)
-
-        # Bunch groups are considered transient
-        item_bgrp0 = LVL1MenuItem('L1_BGRP0', ctpid=-1, group='1', prescale=1)\
-                     .setLogic(Logic(bgrp0)).setTriggerType(TT_rand)
-        item_bgrp1 = LVL1MenuItem('L1_BGRP1', ctpid=-1, group='1', prescale=1)\
-                     .setLogic(Logic(bgrp1)).setTriggerType(TT_rand)
-        item_bgrp2 = LVL1MenuItem('L1_BGRP2', ctpid=-1, group='1', prescale=1)\
-                     .setLogic(Logic(bgrp2)).setTriggerType(TT_rand)
-        item_bgrp3 = LVL1MenuItem('L1_BGRP3', ctpid=-1, group='1', prescale=1)\
-                     .setLogic(Logic(bgrp3)).setTriggerType(TT_rand)
-        item_bgrp4 = LVL1MenuItem('L1_BGRP4', ctpid=-1, group='1', prescale=1)\
-                     .setLogic(Logic(bgrp4)).setTriggerType(TT_rand)
-        item_bgrp5 = LVL1MenuItem('L1_BGRP5', ctpid=-1, group='1', prescale=1)\
-                     .setLogic(Logic(bgrp5)).setTriggerType(TT_rand)
-        item_bgrp6 = LVL1MenuItem('L1_BGRP6', ctpid=-1, group='1', prescale=1)\
-                     .setLogic(Logic(bgrp6)).setTriggerType(TT_rand)
-        item_bgrp7 = LVL1MenuItem('L1_BGRP7', ctpid=-1, group='1', prescale=1)\
-                     .setLogic(Logic(bgrp7)).setTriggerType(TT_rand)
-
-        item_bgrp1_alfa = LVL1MenuItem('L1_BGRP1_ALFA_BGT', ctpid=-1, group='1', prescale=1)\
-                          .setLogic(Logic(bgrp1)).setTriggerType(TT_rand)
-        item_bgrp4_alfa = LVL1MenuItem('L1_BGRP4_ALFA_BGT', ctpid=-1, group='1', prescale=1)\
-                          .setLogic(Logic(bgrp4)).setTriggerType(TT_rand)
-        item_bgrp7_alfa = LVL1MenuItem('L1_BGRP7_ALFA_BGT', ctpid=-1, group='1', prescale=1)\
-                          .setLogic(Logic(bgrp7)).setTriggerType(TT_rand)
-
-        item_bptx0_0 = LVL1MenuItem('L1_BPTX0_0', ctpid=0xf1, group='1', prescale=1)\
-                       .setLogic(thr_bptx0.condition(1)&Logic(bgrp0)).setTriggerType(TT_bptx)
-        item_bptx1_0 = LVL1MenuItem('L1_BPTX1_0', ctpid=0xf2, group='1', prescale=1)\
-                       .setLogic(thr_bptx1.condition(1)&Logic(bgrp0)).setTriggerType(TT_bptx)
-        item_bptx0_0_1 = LVL1MenuItem('L1_BPTX0_0_1', ctpid=0xf3, group='1', prescale=1)\
-                         .setLogic(thr_bptx0.condition(1)&Logic(bgrp0)&Logic(bgrp1)).setTriggerType(TT_bptx)
-        item_bptx1_0_1 = LVL1MenuItem('L1_BPTX1_0_1', ctpid=0xf4, group='1', prescale=1)\
-                         .setLogic(thr_bptx0.condition(1)&Logic(bgrp0)&Logic(bgrp1)).setTriggerType(TT_bptx)
-    
-        item_bptx0_bgrp0 = LVL1MenuItem('L1_BPTX0_BGRP0', ctpid=0xf1, group='1', prescale=1)\
-                           .setLogic(thr_bptx0.condition(1)&Logic(bgrp0)).setTriggerType(TT_rand)
-        item_bptx1_bgrp0 = LVL1MenuItem('L1_BPTX1_BGRP0', ctpid=0xf2, group='1', prescale=1)\
-                           .setLogic(thr_bptx1.condition(1)&Logic(bgrp0)).setTriggerType(TT_rand)
-        item_bptx0_bptx1 = LVL1MenuItem('L1_BPTX0_BPTX1_BGRP0', ctpid=-1, group='1', prescale=1)\
-                           .setLogic(thr_bptx0.condition(1)&thr_bptx1.condition(1)&Logic(bgrp0)).setTriggerType(TT_rand)
-        
-        item_bptx0_bgrp0_bgrp1 = LVL1MenuItem('L1_BPTX0_BGRP0_BGRP1', ctpid=0xf3, group='1', prescale=1)\
-                                 .setLogic(thr_bptx0.condition(1)&Logic(bgrp0)&Logic(bgrp1)).setTriggerType(TT_bptx)
-        item_bptx1_bgrp0_bgrp1 = LVL1MenuItem('L1_BPTX1_BGRP0_BGRP1', ctpid=0xf4, group='1', prescale=1)\
-                                 .setLogic(thr_bptx1.condition(1)&Logic(bgrp0)&Logic(bgrp1)).setTriggerType(TT_bptx)
-
-
-        
-
-        # Direct inputs [0x50:0x5f]
-        item_nimdir2 = LVL1MenuItem('L1_NIMDIR2', ctpid=-1, group='1', prescale=1).setLogic(thr_nimdir2.condition(1)&Logic(bgrp0)).setTriggerType(TT_rpcout)
-        item_nimdir3 = LVL1MenuItem('L1_NIMDIR3', ctpid=-1, group='1', prescale=1).setLogic(thr_nimdir3.condition(1)&Logic(bgrp0)).setTriggerType(TT_rpcout)
-        item_nimdir4 = LVL1MenuItem('L1_NIMDIR4', ctpid=-1, group='1', prescale=1).setLogic(thr_nimdir4.condition(1)&Logic(bgrp0)).setTriggerType(TT_rpcout)
-        item_nimdir5 = LVL1MenuItem('L1_NIMDIR5', ctpid=-1, group='1', prescale=1).setLogic(thr_nimdir5.condition(1)&Logic(bgrp0)).setTriggerType(TT_rpcout)
-        item_nimdir6 = LVL1MenuItem('L1_NIMDIR6', ctpid=-1, group='1', prescale=1).setLogic(thr_nimdir6.condition(1)&Logic(bgrp0)).setTriggerType(TT_rpcout)
-        item_nimdir7 = LVL1MenuItem('L1_NIMDIR7', ctpid=-1, group='1', prescale=1).setLogic(thr_nimdir7.condition(1)&Logic(bgrp0)).setTriggerType(TT_rpcout)
-        item_nimdir8 = LVL1MenuItem('L1_NIMDIR8', ctpid=-1, group='1', prescale=1).setLogic(thr_nimdir8.condition(1)&Logic(bgrp0)).setTriggerType(TT_rpcout)
-        item_nimdir9 = LVL1MenuItem('L1_NIMDIR9', ctpid=-1, group='1', prescale=1).setLogic(thr_nimdir9.condition(1)&Logic(bgrp0)).setTriggerType(TT_rpcout)
-        item_nimdir10 = LVL1MenuItem('L1_NIMDIR10', ctpid=-1, group='1', prescale=1).setLogic(thr_nimdir10.condition(1)&Logic(bgrp0)).setTriggerType(TT_rpcout)
-        item_nimdir11 = LVL1MenuItem('L1_NIMDIR11', ctpid=-1, group='1', prescale=1).setLogic(thr_nimdir11.condition(1)&Logic(bgrp0)).setTriggerType(TT_rpcout)
-        item_nimdir12 = LVL1MenuItem('L1_NIMDIR12', ctpid=-1, group='1', prescale=1).setLogic(thr_nimdir12.condition(1)&Logic(bgrp0)).setTriggerType(TT_rpcout)
-        item_nimdir13 = LVL1MenuItem('L1_NIMDIR13', ctpid=-1, group='1', prescale=1).setLogic(thr_nimdir13.condition(1)&Logic(bgrp0)&Logic(bgrp1)).setTriggerType(TT_rpcout)
-        item_nimdir14 = LVL1MenuItem('L1_NIMDIR14', ctpid=-1, group='1', prescale=1).setLogic(thr_nimdir14.condition(1)&Logic(bgrp0)).setTriggerType(TT_rpcout)
-        item_nimdir15 = LVL1MenuItem('L1_NIMDIR15', ctpid=-1, group='1', prescale=1).setLogic(thr_nimdir15.condition(1)&Logic(bgrp0)).setTriggerType(TT_rpcout)
-        item_nimdir16 = LVL1MenuItem('L1_NIMDIR16', ctpid=-1, group='1', prescale=1).setLogic(thr_nimdir16.condition(1)&Logic(bgrp0)).setTriggerType(TT_rpcout)
-        item_nimdir17 = LVL1MenuItem('L1_NIMDIR17', ctpid=-1, group='1', prescale=1).setLogic(thr_nimdir17.condition(1)&Logic(bgrp0)).setTriggerType(TT_rpcout)
-        item_nimdir18 = LVL1MenuItem('L1_NIMDIR18', ctpid=-1, group='1', prescale=1).setLogic(thr_nimdir18.condition(1)&Logic(bgrp0)).setTriggerType(TT_rpcout)
-        item_nimdir19 = LVL1MenuItem('L1_NIMDIR19', ctpid=-1, group='1', prescale=1).setLogic(thr_nimdir19.condition(1)&Logic(bgrp0)).setTriggerType(TT_rpcout)
-        item_nimdir20 = LVL1MenuItem('L1_NIMDIR20', ctpid=-1, group='1', prescale=1).setLogic(thr_nimdir20.condition(1)&Logic(bgrp0)).setTriggerType(TT_rpcout)
-        item_nimdir21 = LVL1MenuItem('L1_NIMDIR21', ctpid=-1, group='1', prescale=1).setLogic(thr_nimdir21.condition(1)&Logic(bgrp0)).setTriggerType(TT_rpcout)
-        item_nimdir22 = LVL1MenuItem('L1_NIMDIR22', ctpid=-1, group='1', prescale=1).setLogic(thr_nimdir22.condition(1)&Logic(bgrp0)).setTriggerType(TT_rpcout)
-        item_nimdir23 = LVL1MenuItem('L1_NIMDIR23', ctpid=-1, group='1', prescale=1).setLogic(thr_nimdir23.condition(1)&Logic(bgrp0)).setTriggerType(TT_rpcout)
-        item_nimdir24 = LVL1MenuItem('L1_NIMDIR24', ctpid=-1, group='1', prescale=1).setLogic(thr_nimdir24.condition(1)&Logic(bgrp0)).setTriggerType(TT_rpcout)
-        item_nimdir25 = LVL1MenuItem('L1_NIMDIR25', ctpid=-1, group='1', prescale=1).setLogic(thr_nimdir25.condition(1)&Logic(bgrp0)).setTriggerType(TT_rpcout)
-        item_nimdir26 = LVL1MenuItem('L1_NIMDIR26', ctpid=-1, group='1', prescale=1).setLogic(thr_nimdir26.condition(1)&Logic(bgrp0)).setTriggerType(TT_rpcout)
-        item_nimdir27 = LVL1MenuItem('L1_NIMDIR27', ctpid=-1, group='1', prescale=1).setLogic(thr_nimdir27.condition(1)&Logic(bgrp0)).setTriggerType(TT_rpcout)
-        item_nimdir28 = LVL1MenuItem('L1_NIMDIR28', ctpid=-1, group='1', prescale=1).setLogic(thr_nimdir28.condition(1)&Logic(bgrp0)).setTriggerType(TT_rpcout)
-        item_nimdir29 = LVL1MenuItem('L1_NIMDIR29', ctpid=-1, group='1', prescale=1).setLogic(thr_nimdir29.condition(1)&Logic(bgrp0)).setTriggerType(TT_rpcout)
-        item_nimdir30 = LVL1MenuItem('L1_NIMDIR30', ctpid=-1, group='1', prescale=1).setLogic(thr_nimdir30.condition(1)&Logic(bgrp0)).setTriggerType(TT_rpcout)
-        item_nimdir31 = LVL1MenuItem('L1_NIMDIR31', ctpid=-1, group='1', prescale=1).setLogic(thr_nimdir31.condition(1)&Logic(bgrp0)).setTriggerType(TT_rpcout)
-        item_nimdir32 = LVL1MenuItem('L1_NIMDIR32', ctpid=-1, group='1', prescale=1).setLogic(thr_nimdir32.condition(1)&Logic(bgrp0)).setTriggerType(TT_rpcout)
-        item_nimdir33 = LVL1MenuItem('L1_NIMDIR33', ctpid=-1, group='1', prescale=1).setLogic(thr_nimdir33.condition(1)&Logic(bgrp0)).setTriggerType(TT_rpcout)
-        item_nimdir34 = LVL1MenuItem('L1_NIMDIR34', ctpid=-1, group='1', prescale=1).setLogic(thr_nimdir34.condition(1)&Logic(bgrp0)).setTriggerType(TT_rpcout)
-        item_nimdir35 = LVL1MenuItem('L1_NIMDIR35', ctpid=-1, group='1', prescale=1).setLogic(thr_nimdir35.condition(1)&Logic(bgrp0)).setTriggerType(TT_rpcout)
-        item_nimdir36 = LVL1MenuItem('L1_NIMDIR36', ctpid=-1, group='1', prescale=1).setLogic(thr_nimdir36.condition(1)&Logic(bgrp0)).setTriggerType(TT_rpcout)
-
-        item_lhcf  = LVL1MenuItem('L1_LHCF',  ctpid=-1, group='1', prescale=1).setLogic( (thr_nimdir36.condition(1)&physcond)).setTriggerType(TT_minb)        
-
-        item_alfa_empty = LVL1MenuItem('L1_ALFA_EMPTY', ctpid=0x4e, group='1', prescale=1).setLogic(thr_nimdir_ALFA_LOG.condition(1)&cosmiccond).setTriggerType(TT_rpcout)
-        item_alfa_bgpr7 = LVL1MenuItem('L1_ALFA_BGRP7', ctpid=0x4e, group='1', prescale=1).setLogic(thr_nimdir_ALFA_LOG.condition(1)&bgrp7cond).setTriggerType(TT_rpcout)
-
-        item_alfa_empty_od = LVL1MenuItem('L1_ALFA_EMPTY_OD', ctpid=-1, group='1', prescale=1).setLogic(thr_nimdir_ALFA_LOG_OD.condition(1)&cosmiccond).setTriggerType(TT_rpcout)
-        item_alfa_bgpr7_od = LVL1MenuItem('L1_ALFA_BGRP7_OD', ctpid=-1, group='1', prescale=1).setLogic(thr_nimdir_ALFA_LOG_OD.condition(1)&bgrp7cond).setTriggerType(TT_rpcout)
-
-        #BGRP items
-        #item_alfa_bgt_bgrp1 = LVL1MenuItem('L1_ALFA_BGT_BGRP1', ctpid=-1, group='1', prescale=1).setLogic(bgrpcond).setTriggerType(TT_rand)
-        #item_alfa_bgt_bgrp4 = LVL1MenuItem('L1_ALFA_BGT_BGRP4', ctpid=-1, group='1', prescale=1).setLogic(unpaired1cond).setTriggerType(TT_rand)
-        #item_alfa_bgt_bgrp7 = LVL1MenuItem('L1_ALFA_BGT_BGRP7', ctpid=-1, group='1', prescale=1).setLogic(Logic(bgrp7)&Logic(unpairedRcond).setTriggerType(TT_rand)
-
-
-        item_tile = LVL1MenuItem('L1_Tile', ctpid=0x4c, group='1', prescale=1).setLogic(thr_nimdir13.condition(1)&Logic(bgrp0)).setTriggerType(TT_rpcout)
-        item_trt = LVL1MenuItem('L1_TRT', ctpid=0x4e, group='1', prescale=1).setLogic(thr_nimdir25.condition(1)&Logic(bgrp0)).setTriggerType(TT_rpcout)
-
-        item_l1a_mon = LVL1MenuItem('L1_L1A_Mon', ctpid=0x4f, group='1', prescale=1).setLogic(thr_nimdir26.condition(1)&Logic(bgrp0)).setTriggerType(TT_rpcout)
-        
-        item_calreq0 = LVL1MenuItem('L1_CALREQ0', ctpid=0xfd, group='1', prescale=1)\
-                       .setLogic(thr_nim28.condition(1)&Logic(bgrp0)&Logic(bgrp2))\
-                       .setTriggerType(TT_calreq0)
-        item_calreq1 = LVL1MenuItem('L1_CALREQ1', ctpid=0xfe, group='1', prescale=1)\
-                       .setLogic(thr_nim29.condition(1)&Logic(bgrp0)&Logic(bgrp2))\
-                       .setTriggerType(TT_calreq1)
-        item_calreq2 = LVL1MenuItem('L1_CALREQ2', ctpid=0xff, group='1', prescale=1)\
-                       .setLogic(thr_nim30.condition(1)&Logic(bgrp0)&Logic(bgrp2))\
-                       .setTriggerType(TT_calreq2)
-
-        item_nim_s9c0a19 = LVL1MenuItem('L1_NIM_S9C0A19', ctpid=0x50, group='1', prescale=1).setLogic(thr_nimdir13.condition(1)&Logic(bgrp0)).setTriggerType(TT_rpcout)
-        item_nim_s9c0a20 = LVL1MenuItem('L1_NIM_S9C0A20', ctpid=0x51, group='1', prescale=1).setLogic(thr_nimdir14.condition(1)&Logic(bgrp0)).setTriggerType(TT_rpcout)
-        item_nim_s9c1c19 = LVL1MenuItem('L1_NIM_S9C1C19', ctpid=0x52, group='1', prescale=1).setLogic(thr_nimdir25.condition(1)&Logic(bgrp0)).setTriggerType(TT_rpcout)
-        item_nim_s9c1c20 = LVL1MenuItem('L1_NIM_S9C1C20', ctpid=0x53, group='1', prescale=1).setLogic(thr_nimdir26.condition(1)&Logic(bgrp0)).setTriggerType(TT_rpcout)
-        item_nim_s8c2b19 = LVL1MenuItem('L1_NIM_S8C2B19', ctpid=0xf9, group='1', prescale=1).setLogic(thr_nimdir4.condition(1)&Logic(bgrp0)).setTriggerType(TT_rpcout)
-        item_nim_s8c2b20 = LVL1MenuItem('L1_NIM_S8C2B20', ctpid=-1, group='1', prescale=1).setLogic(thr_nimdir5.condition(1)&Logic(bgrp0)).setTriggerType(TT_rpcout)
-        item_nim_s8c2b21 = LVL1MenuItem('L1_NIM_S8C2B21', ctpid=-1, group='1', prescale=1).setLogic(thr_nimdir6.condition(1)&bgrpcond).setTriggerType(TT_rpcout)
-        item_nim_s8c2b22 = LVL1MenuItem('L1_NIM_S8C2B22', ctpid=-1, group='1', prescale=1).setLogic(thr_nimdir7.condition(1)&bgrpcond).setTriggerType(TT_rpcout)
-        item_nim_s8c2b23 = LVL1MenuItem('L1_NIM_S8C2B23', ctpid=-1, group='1', prescale=1).setLogic(thr_nimdir8.condition(1)&bgrpcond).setTriggerType(TT_rpcout)
-        item_nim_s8c2b24 = LVL1MenuItem('L1_NIM_S8C2B24', ctpid=-1, group='1', prescale=1).setLogic(thr_nimdir9.condition(1)&bgrpcond).setTriggerType(TT_rpcout)
-        item_nim_s8c2b25 = LVL1MenuItem('L1_NIM_S8C2B25', ctpid=-1, group='1', prescale=1).setLogic(thr_nimdir10.condition(1)&Logic(bgrp0)).setTriggerType(TT_rpcout)
-        item_nim_s8c2b26 = LVL1MenuItem('L1_NIM_S8C2B26', ctpid=-1, group='1', prescale=1).setLogic(thr_nimdir11.condition(1)&Logic(bgrp0)).setTriggerType(TT_rpcout)
-        item_nim_s8c2b27 = LVL1MenuItem('L1_NIM_S8C2B27', ctpid=-1, group='1', prescale=1).setLogic(thr_nimdir12.condition(1)&Logic(bgrp0)).setTriggerType(TT_rpcout)
-        item_nim_s9c0b21 = LVL1MenuItem('L1_NIM_S9C0B21', ctpid=-1, group='1', prescale=1).setLogic(thr_nimdir15.condition(1)&Logic(bgrp0)).setTriggerType(TT_rpcout)
-        item_nim_s9c0b22 = LVL1MenuItem('L1_NIM_S9C0B22', ctpid=-1, group='1', prescale=1).setLogic(thr_nimdir16.condition(1)&Logic(bgrp0)).setTriggerType(TT_rpcout)
-        item_nim_s9c0b23 = LVL1MenuItem('L1_NIM_S9C0B23', ctpid=-1, group='1', prescale=1).setLogic(thr_nimdir17.condition(1)&Logic(bgrp0)).setTriggerType(TT_rpcout)
-        item_nim_s9c0b24 = LVL1MenuItem('L1_NIM_S9C0B24', ctpid=-1, group='1', prescale=1).setLogic(thr_nimdir18.condition(1)&Logic(bgrp0)).setTriggerType(TT_rpcout)
-
-        item_mb_bv = LVL1MenuItem('L1_MB_BV',ctpid=-1, group='1', prescale=1).setLogic((thr_zdcA.condition(1)|thr_zdcC.condition(1)\
-                                                                                        |thr_mbtsA.condition(1)|thr_mbtsC.condition(1)\
-                                                                                        |thr_lucidA.condition(1)|thr_lucidC.condition(1))\
-                                                                                       &Not(thr_bptx0.condition(1))&Not(thr_bptx1.condition(1))\
-                                                                                       &Logic(bgrp0))\
-                                                                                       .setTriggerType(TT_minb)
-        
-        item_mb_mv = LVL1MenuItem('L1_MB_MV',ctpid=-1, group='1', prescale=1).setLogic((thr_mbtsA.condition(1)|thr_mbtsC.condition(1))\
-                                                                                       &Not(thr_bptx0.condition(1))&Not(thr_bptx1.condition(1))\
-                                                                                       &Logic(bgrp0))\
-                                                                                       .setTriggerType(TT_minb)
-
-        item_mb_col = LVL1MenuItem('L1_MB_Col',ctpid=-1, group='1', prescale=1).setLogic((thr_mbtsA.condition(1)|thr_mbtsC.condition(1))&thr_bptx0.condition(1)&thr_bptx1.condition(1))
-        
-
-
-        # Alfa items
-
-        # L1_ELAST1 = Elastics1 B7L1U and A7L1U and A7R1L and B7R1L     not (B7L1L or A7L1L or A7R1U or B7R1U)
-        item_alfa_Elastics1 = LVL1MenuItem('L1_ALFA_ELAST1', ctpid=-1, group='1', prescale=1).setLogic( \
-                        thr_nimdir_B7L1U.condition(1)&thr_nimdir_A7L1U.condition(1)&thr_nimdir_A7R1L.condition(1)&thr_nimdir_B7R1L.condition(1)\
-                        &Not(thr_nimdir_B7L1L.condition(1)|thr_nimdir_A7L1L.condition(1)|thr_nimdir_A7R1U.condition(1)|thr_nimdir_B7R1U.condition(1))&physcond \
-                        ).setTriggerType(TT_rpcout)
-
-
-        # L1_ELAST2 = Elastics2 B7L1L and A7L1L and A7R1U and B7R1U     not (B7L1U or A7L1U or A7R1L or B7R1L)
-        item_alfa_Elastics2 = LVL1MenuItem('L1_ALFA_ELAST2', ctpid=-1, group='1', prescale=1).setLogic( \
-                        thr_nimdir_B7L1L.condition(1)&thr_nimdir_A7L1L.condition(1)&thr_nimdir_A7R1U.condition(1)&thr_nimdir_B7R1U.condition(1)\
-                        &Not(thr_nimdir_B7L1U.condition(1)|thr_nimdir_A7L1U.condition(1)|thr_nimdir_A7R1L.condition(1)|thr_nimdir_B7R1L.condition(1))&physcond \
-                        ).setTriggerType(TT_rpcout)
-
-
-        # L1_ELAST3 = Elastics3 B7L1U and A7L1U and A7R1L and B7R1L and B7L1L   not (A7L1L or A7R1U or B7R1U)
-        item_alfa_Elastics3 = LVL1MenuItem('L1_ALFA_ELAST3', ctpid=-1, group='1', prescale=1).setLogic( \
-                        thr_nimdir_B7L1U.condition(1)&thr_nimdir_A7L1U.condition(1)&thr_nimdir_A7R1L.condition(1)&thr_nimdir_B7R1L.condition(1)&thr_nimdir_B7L1L.condition(1)\
-                        &Not(thr_nimdir_A7L1L.condition(1)|thr_nimdir_A7R1U.condition(1)|thr_nimdir_B7R1U.condition(1))&physcond \
-                        ).setTriggerType(TT_rpcout)
-
-
-        # L1_ELAST4 = Elastics4 B7L1U and A7L1U and A7R1L and B7R1L and A7L1L   not (B7L1L or A7R1U or B7R1U)
-        item_alfa_Elastics4 = LVL1MenuItem('L1_ALFA_ELAST4', ctpid=-1, group='1', prescale=1).setLogic( \
-                        thr_nimdir_B7L1U.condition(1)&thr_nimdir_A7L1U.condition(1)&thr_nimdir_A7R1L.condition(1)&thr_nimdir_B7R1L.condition(1)&thr_nimdir_A7L1L.condition(1)\
-                        &Not(thr_nimdir_B7L1L.condition(1)|thr_nimdir_A7R1U.condition(1)|thr_nimdir_B7R1U.condition(1))&physcond \
-                        ).setTriggerType(TT_rpcout)
-
-
-        # L1_ELAST5 = Elastics5 B7L1U and A7L1U and A7R1L and B7R1L and A7R1U   not (B7L1L or A7L1L or B7R1U)
-        item_alfa_Elastics5 = LVL1MenuItem('L1_ALFA_ELAST5', ctpid=-1, group='1', prescale=1).setLogic( \
-                        thr_nimdir_B7L1U.condition(1)&thr_nimdir_A7L1U.condition(1)&thr_nimdir_A7R1L.condition(1)&thr_nimdir_B7R1L.condition(1)&thr_nimdir_A7R1U.condition(1)\
-                        &Not(thr_nimdir_B7L1L.condition(1)|thr_nimdir_A7L1L.condition(1)|thr_nimdir_B7R1U.condition(1))&physcond \
-                        ).setTriggerType(TT_rpcout)
-
-
-        # L1_ELAST6 = Elastics6 B7L1U and A7L1U and A7R1L and B7R1L and B7R1U   not (B7L1L or A7L1L or A7R1U)
-        item_alfa_Elastics6 = LVL1MenuItem('L1_ALFA_ELAST6', ctpid=-1, group='1', prescale=1).setLogic( \
-                        thr_nimdir_B7L1U.condition(1)&thr_nimdir_A7L1U.condition(1)&thr_nimdir_A7R1L.condition(1)&thr_nimdir_B7R1L.condition(1)&thr_nimdir_B7R1U.condition(1)\
-                        &Not(thr_nimdir_B7L1L.condition(1)|thr_nimdir_A7L1L.condition(1)|thr_nimdir_A7R1U.condition(1))&physcond \
-                        ).setTriggerType(TT_rpcout)
-
-
-        # L1_ELAST7 = Elastics7 B7L1L and A7L1L and A7R1U and B7R1U and B7L1U   not (A7L1U or A7R1L or B7R1L)
-        item_alfa_Elastics7 = LVL1MenuItem('L1_ALFA_ELAST7', ctpid=-1, group='1', prescale=1).setLogic( \
-                        thr_nimdir_B7L1L.condition(1)&thr_nimdir_A7L1L.condition(1)&thr_nimdir_A7R1U.condition(1)&thr_nimdir_B7R1U.condition(1)&thr_nimdir_B7L1U.condition(1)\
-                        &Not(thr_nimdir_A7L1U.condition(1)|thr_nimdir_A7R1L.condition(1)|thr_nimdir_B7R1L.condition(1))&physcond \
-                        ).setTriggerType(TT_rpcout)
-
-
-        # L1_ELAST8 = Elastics8 B7L1L and A7L1L and A7R1U and B7R1U and A7L1U   not (B7L1U or A7R1L or B7R1L)
-        item_alfa_Elastics8 = LVL1MenuItem('L1_ALFA_ELAST8', ctpid=-1, group='1', prescale=1).setLogic( \
-                        thr_nimdir_B7L1L.condition(1)&thr_nimdir_A7L1L.condition(1)&thr_nimdir_A7R1U.condition(1)&thr_nimdir_B7R1U.condition(1)&thr_nimdir_A7L1U.condition(1)\
-                        &Not(thr_nimdir_B7L1U.condition(1)|thr_nimdir_A7R1L.condition(1)|thr_nimdir_B7R1L.condition(1))&physcond \
-                        ).setTriggerType(TT_rpcout)
-
-
-        # L1_ELAST9 = Elastics9 B7L1L and A7L1L and A7R1U and B7R1U and A7R1L   not (B7L1U or A7L1U or B7R1L)
-        item_alfa_Elastics9 = LVL1MenuItem('L1_ALFA_ELAST9', ctpid=-1, group='1', prescale=1).setLogic( \
-                        thr_nimdir_B7L1L.condition(1)&thr_nimdir_A7L1L.condition(1)&thr_nimdir_A7R1U.condition(1)&thr_nimdir_B7R1U.condition(1)&thr_nimdir_A7R1L.condition(1)\
-                        &Not(thr_nimdir_B7L1U.condition(1)|thr_nimdir_A7L1U.condition(1)|thr_nimdir_B7R1L.condition(1))&physcond \
-                        ).setTriggerType(TT_rpcout)
-
-        
-        # L1_ELAST10 = Elastics10       B7L1L and A7L1L and A7R1U and B7R1U and B7R1L   not (B7L1U or A7L1U or A7R1L)
-        item_alfa_Elastics10 = LVL1MenuItem('L1_ALFA_ELAST10', ctpid=-1, group='1', prescale=1).setLogic( \
-                        thr_nimdir_B7L1L.condition(1)&thr_nimdir_A7L1L.condition(1)&thr_nimdir_A7R1U.condition(1)&thr_nimdir_B7R1U.condition(1)&thr_nimdir_B7R1L.condition(1)\
-                        &Not(thr_nimdir_B7L1U.condition(1)|thr_nimdir_A7L1U.condition(1)|thr_nimdir_A7R1L.condition(1))&physcond \
-                        ).setTriggerType(TT_rpcout)
-
-
-        # L1_ELAST11 = Elastics11       B7L1U and A7L1U and A7R1L and B7R1L
-        item_alfa_Elastics11 = LVL1MenuItem('L1_ALFA_ELAST11', ctpid=-1, group='1', prescale=1).setLogic( \
-                        thr_nimdir_B7L1U.condition(1)&thr_nimdir_A7L1U.condition(1)&thr_nimdir_A7R1L.condition(1)&thr_nimdir_B7R1L.condition(1)&physcond \
-                        ).setTriggerType(TT_rpcout)
-
-
-        # L1_ELAST12 = Elastics12       B7L1L and A7L1L and A7R1U and B7R1U
-        item_alfa_Elastics12 = LVL1MenuItem('L1_ALFA_ELAST12', ctpid=-1, group='1', prescale=1).setLogic( \
-                        thr_nimdir_B7L1L.condition(1)&thr_nimdir_A7L1L.condition(1)&thr_nimdir_A7R1U.condition(1)&thr_nimdir_B7R1U.condition(1)&physcond \
-                        ).setTriggerType(TT_rpcout)
-
-        
-        # L1_ELAST13 = Elastics13       (B7L1U or A7L1U) and (A7R1L and B7R1L)
-        item_alfa_Elastics13 = LVL1MenuItem('L1_ALFA_ELAST13', ctpid=-1, group='1', prescale=1).setLogic( \
-                        (thr_nimdir_B7L1U.condition(1)|thr_nimdir_A7L1U.condition(1))&(thr_nimdir_A7R1L.condition(1)&thr_nimdir_B7R1L.condition(1))&physcond \
-                        ).setTriggerType(TT_rpcout)
-
-
-        # L1_ELAST14 = Elastics14       (B7L1U and A7L1U) and (A7R1L or B7R1L)
-        item_alfa_Elastics14 = LVL1MenuItem('L1_ALFA_ELAST14', ctpid=-1, group='1', prescale=1).setLogic( \
-                        (thr_nimdir_B7L1U.condition(1)&thr_nimdir_A7L1U.condition(1))&(thr_nimdir_A7R1L.condition(1)|thr_nimdir_B7R1L.condition(1))&physcond \
-                        ).setTriggerType(TT_rpcout)
-
-
-        # L1_ELAST15 = Elastics15       (B7L1U or A7L1U) and (A7R1L or B7R1L)
-        item_alfa_Elastics15 = LVL1MenuItem('L1_ALFA_ELAST15', ctpid=-1, group='1', prescale=1).setLogic( \
-                        (thr_nimdir_B7L1U.condition(1)|thr_nimdir_A7L1U.condition(1))&(thr_nimdir_A7R1L.condition(1)|thr_nimdir_B7R1L.condition(1))&physcond \
-                        ).setTriggerType(TT_rpcout)
-
-
-        # L1_ELAST16 = Elastics16       (B7L1L or A7L1L) and (A7R1U and B7R1U)
-        item_alfa_Elastics16 = LVL1MenuItem('L1_ALFA_ELAST16', ctpid=-1, group='1', prescale=1).setLogic( \
-                        (thr_nimdir_B7L1L.condition(1)|thr_nimdir_A7L1L.condition(1))&(thr_nimdir_A7R1U.condition(1)&thr_nimdir_B7R1U.condition(1))&physcond \
-                        ).setTriggerType(TT_rpcout)
-
-
-        # L1_ELAST17 = Elastics17       (B7L1L and A7L1L) and (A7R1U or B7R1U)
-        item_alfa_Elastics17 = LVL1MenuItem('L1_ALFA_ELAST17', ctpid=-1, group='1', prescale=1).setLogic( \
-                        (thr_nimdir_B7L1L.condition(1)&thr_nimdir_A7L1L.condition(1))&(thr_nimdir_A7R1U.condition(1)|thr_nimdir_B7R1U.condition(1))&physcond \
-                        ).setTriggerType(TT_rpcout)
-
-
-        # L1_ELAST18 = Elastics18       (B7L1L or A7L1L) and (A7R1U or B7R1U)
-        item_alfa_Elastics18 = LVL1MenuItem('L1_ALFA_ELAST18', ctpid=-1, group='1', prescale=1).setLogic( \
-                        (thr_nimdir_B7L1L.condition(1)|thr_nimdir_A7L1L.condition(1))&(thr_nimdir_A7R1U.condition(1)|thr_nimdir_B7R1U.condition(1))&physcond \
-                        ).setTriggerType(TT_rpcout)
-
-
-        # L1_SDIFF1 = Single_Diffraction1       B7L1U and A7L1U not (B7L1L or A7L1L or A7R1U or A7R1L or B7R1U or B7R1L)
-        item_alfa_Single_Diffraction1 = LVL1MenuItem('L1_ALFA_SDIFF1', ctpid=-1, group='1', prescale=1).setLogic( \
-                        thr_nimdir_B7L1U.condition(1)&thr_nimdir_A7L1U.condition(1)\
-                        &Not(thr_nimdir_B7L1L.condition(1)|thr_nimdir_A7L1L.condition(1)|thr_nimdir_A7R1U.condition(1)|thr_nimdir_A7R1L.condition(1)|thr_nimdir_B7R1U.condition(1)|thr_nimdir_B7R1L.condition(1))&physcond \
-                        ).setTriggerType(TT_rpcout)
-
-
-        # L1_SDIFF2 = Single_Diffraction2       A7R1L and B7R1L not (B7L1U or B7L1L or A7L1U or A7L1L or A7R1U or B7R1U)
-        item_alfa_Single_Diffraction2 = LVL1MenuItem('L1_ALFA_SDIFF2', ctpid=-1, group='1', prescale=1).setLogic( \
-                        thr_nimdir_A7R1L.condition(1)&thr_nimdir_B7R1L.condition(1)\
-                        &Not(thr_nimdir_B7L1U.condition(1)|thr_nimdir_B7L1L.condition(1)|thr_nimdir_A7L1U.condition(1)|thr_nimdir_A7L1L.condition(1)|thr_nimdir_A7R1U.condition(1)|thr_nimdir_B7R1U.condition(1))&physcond \
-                        ).setTriggerType(TT_rpcout)
-
-
-        # L1_SDIFF3 = Single_Diffraction3       B7L1L and A7L1L not (B7L1U or A7L1U A7R1U or A7R1L or B7R1U or B7R1L)
-        item_alfa_Single_Diffraction3 = LVL1MenuItem('L1_ALFA_SDIFF3', ctpid=-1, group='1', prescale=1).setLogic( \
-                        thr_nimdir_B7L1L.condition(1)&thr_nimdir_A7L1L.condition(1)\
-                        &Not(thr_nimdir_B7L1U.condition(1)|thr_nimdir_A7L1U.condition(1)|thr_nimdir_A7R1U.condition(1)|thr_nimdir_A7R1L.condition(1)|thr_nimdir_B7R1U.condition(1)|thr_nimdir_B7R1L.condition(1))&physcond \
-                        ).setTriggerType(TT_rpcout)
-
-
-        # L1_SDIFF4 = Single_Diffraction4       A7R1U and B7R1U not (B7L1U or B7L1L or A7L1U or A7L1L or A7R1L or B7R1L)
-        item_alfa_Single_Diffraction4 = LVL1MenuItem('L1_ALFA_SDIFF4', ctpid=-1, group='1', prescale=1).setLogic( \
-                        thr_nimdir_A7R1U.condition(1)&thr_nimdir_B7R1U.condition(1)\
-                        &Not(thr_nimdir_B7L1U.condition(1)|thr_nimdir_B7L1L.condition(1)|thr_nimdir_A7L1U.condition(1)|thr_nimdir_A7L1L.condition(1)|thr_nimdir_A7R1L.condition(1)|thr_nimdir_B7R1L.condition(1))&physcond \
-                        ).setTriggerType(TT_rpcout)
-
-
-        # L1_SDIFF5 = Single_Diffraction5       B7L1U and A7L1U
-        item_alfa_Single_Diffraction5 = LVL1MenuItem('L1_ALFA_SDIFF5', ctpid=-1, group='1', prescale=1).setLogic( \
-                        thr_nimdir_B7L1U.condition(1)&thr_nimdir_A7L1U.condition(1)&physcond \
-                        ).setTriggerType(TT_rpcout)
-
-
-        # L1_SDIFF6 = Single_Diffraction6       A7R1L and B7R1L
-        item_alfa_Single_Diffraction6 = LVL1MenuItem('L1_ALFA_SDIFF6', ctpid=-1, group='1', prescale=1).setLogic( \
-                        thr_nimdir_A7R1L.condition(1)&thr_nimdir_B7R1L.condition(1)&physcond \
-                        ).setTriggerType(TT_rpcout)
-
-
-        # L1_SDIFF7 = Single_Diffraction7       B7L1L and A7L1L
-        item_alfa_Single_Diffraction7 = LVL1MenuItem('L1_ALFA_SDIFF7', ctpid=-1, group='1', prescale=1).setLogic( \
-                        thr_nimdir_B7L1L.condition(1)&thr_nimdir_A7L1L.condition(1)&physcond \
-                        ).setTriggerType(TT_rpcout)
-
-
-        # L1_SDIFF8 = Single_Diffraction8       A7R1U and B7R1U
-        item_alfa_Single_Diffraction8 = LVL1MenuItem('L1_ALFA_SDIFF8', ctpid=-1, group='1', prescale=1).setLogic( \
-                        thr_nimdir_A7R1U.condition(1)&thr_nimdir_B7R1U.condition(1)&physcond \
-                        ).setTriggerType(TT_rpcout)
-
-
-        # L1_SHOW1 = Big_showers1       B7L1U and B7L1L and A7L1U and A7L1L     not (A7R1U or A7R1L or B7R1U or B7R1L)
-        item_alfa_Big_showers1 = LVL1MenuItem('L1_ALFA_SHOW1', ctpid=-1, group='1', prescale=1).setLogic( \
-                        thr_nimdir_B7L1U.condition(1)&thr_nimdir_B7L1L.condition(1)&thr_nimdir_A7L1U.condition(1)&thr_nimdir_A7L1L.condition(1)\
-                        &Not(thr_nimdir_A7R1U.condition(1)|thr_nimdir_A7R1L.condition(1)|thr_nimdir_B7R1U.condition(1)|thr_nimdir_B7R1L.condition(1))&physcond \
-                        ).setTriggerType(TT_rpcout)
-
-
-        # L1_SHOW2 = Big_showers2       A7R1U and A7R1L and B7R1U and B7R1L     not (B7L1U or B7L1L or A7L1U or A7L1L)
-        item_alfa_Big_showers2 = LVL1MenuItem('L1_ALFA_SHOW2', ctpid=-1, group='1', prescale=1).setLogic( \
-                        thr_nimdir_A7R1U.condition(1)&thr_nimdir_A7R1L.condition(1)&thr_nimdir_B7R1U.condition(1)&thr_nimdir_B7R1L.condition(1)\
-                        &Not(thr_nimdir_B7L1U.condition(1)|thr_nimdir_B7L1L.condition(1)|thr_nimdir_A7L1U.condition(1)|thr_nimdir_A7L1L.condition(1))&physcond \
-                        ).setTriggerType(TT_rpcout)
-
-
-        # L1_SHOW3 = Big_showers3       B7L1U and B7L1L and A7L1U and A7L1L
-        item_alfa_Big_showers3 = LVL1MenuItem('L1_ALFA_SHOW3', ctpid=-1, group='1', prescale=1).setLogic( \
-                        thr_nimdir_B7L1U.condition(1)&thr_nimdir_B7L1L.condition(1)&thr_nimdir_A7L1U.condition(1)&thr_nimdir_A7L1L.condition(1)&physcond \
-                        ).setTriggerType(TT_rpcout)
-
-        
-        # L1_SHOW4 = Big_showers4       A7R1U and A7R1L and B7R1U and B7R1L
-        item_alfa_Big_showers4 = LVL1MenuItem('L1_ALFA_SHOW4', ctpid=-1, group='1', prescale=1).setLogic( \
-                        thr_nimdir_A7R1U.condition(1)&thr_nimdir_A7R1L.condition(1)&thr_nimdir_B7R1U.condition(1)&thr_nimdir_B7R1L.condition(1)&physcond \
-                        ).setTriggerType(TT_rpcout)
-
-
-        # L1_SHOW5 = Big_showers5       (A7R1U or B7R1U) and (B7R1L or A7R1L)
-        item_alfa_Big_showers5 = LVL1MenuItem('L1_ALFA_SHOW5', ctpid=-1, group='1', prescale=1).setLogic( \
-                        (thr_nimdir_A7R1U.condition(1)|thr_nimdir_B7R1U.condition(1))&(thr_nimdir_B7R1L.condition(1)|thr_nimdir_A7R1L.condition(1))&physcond \
-                        ).setTriggerType(TT_rpcout)
-
-
-        # L1_SHOW6 = Big_showers6       (A7L1U or B7L1U) and (B7L1L or A7L1L)
-        item_alfa_Big_showers6 = LVL1MenuItem('L1_ALFA_SHOW6', ctpid=-1, group='1', prescale=1).setLogic( \
-                        (thr_nimdir_A7L1U.condition(1)|thr_nimdir_B7L1U.condition(1))&(thr_nimdir_B7L1L.condition(1)|thr_nimdir_A7L1L.condition(1))&physcond \
-                        ).setTriggerType(TT_rpcout)
-
-
-        # L1_SYST1 = Systematics1       B7L1U and B7L1L not (A7L1U or A7L1L or A7R1U or A7R1L or B7R1U or B7R1L)
-        item_alfa_Systematics1 = LVL1MenuItem('L1_ALFA_SYST1', ctpid=-1, group='1', prescale=1).setLogic( \
-                        thr_nimdir_B7L1U.condition(1)&thr_nimdir_B7L1L.condition(1)\
-                        &Not(thr_nimdir_A7L1U.condition(1)|thr_nimdir_A7L1L.condition(1)|thr_nimdir_A7R1U.condition(1)|thr_nimdir_A7R1L.condition(1)|thr_nimdir_B7R1U.condition(1)|thr_nimdir_B7R1L.condition(1))&physcond \
-                        ).setTriggerType(TT_rpcout)
-
-
-        # L1_SYST2 = Systematics2       A7L1U and A7L1L not (B7L1U or B7L1L or A7R1U or A7R1L or B7R1U or B7R1L)
-        item_alfa_Systematics2 = LVL1MenuItem('L1_ALFA_SYST2', ctpid=-1, group='1', prescale=1).setLogic( \
-                        thr_nimdir_A7L1U.condition(1)&thr_nimdir_A7L1L.condition(1)\
-                        &Not(thr_nimdir_B7L1U.condition(1)|thr_nimdir_B7L1L.condition(1)|thr_nimdir_A7R1U.condition(1)|thr_nimdir_A7R1L.condition(1)|thr_nimdir_B7R1U.condition(1)|thr_nimdir_B7R1L.condition(1))&physcond \
-                        ).setTriggerType(TT_rpcout)
-
-
-        # L1_SYST3 = Systematics3       A7R1U and A7R1L not (B7L1U or B7L1L or A7L1U or A7L1L or B7R1U or B7R1L)
-        item_alfa_Systematics3 = LVL1MenuItem('L1_ALFA_SYST3', ctpid=-1, group='1', prescale=1).setLogic( \
-                        thr_nimdir_A7R1U.condition(1)&thr_nimdir_A7R1L.condition(1)\
-                        &Not(thr_nimdir_B7L1U.condition(1)|thr_nimdir_B7L1L.condition(1)|thr_nimdir_A7L1U.condition(1)|thr_nimdir_A7L1L.condition(1)|thr_nimdir_B7R1U.condition(1)|thr_nimdir_B7R1L.condition(1))&physcond \
-                        ).setTriggerType(TT_rpcout)
-
-
-        # L1_SYST4 = Systematics4       B7R1U and B7R1L not (B7L1U or B7L1L or A7L1U or A7L1L or A7R1U or A7R1L)
-        item_alfa_Systematics4 = LVL1MenuItem('L1_ALFA_SYST4', ctpid=-1, group='1', prescale=1).setLogic( \
-                        thr_nimdir_B7R1U.condition(1)&thr_nimdir_B7R1L.condition(1)\
-                        &Not(thr_nimdir_B7L1U.condition(1)|thr_nimdir_B7L1L.condition(1)|thr_nimdir_A7L1U.condition(1)|thr_nimdir_A7L1L.condition(1)|thr_nimdir_A7R1U.condition(1)|thr_nimdir_A7R1L.condition(1))&physcond \
-                        ).setTriggerType(TT_rpcout)
-
-
-        # L1_SHOWSYST1 = Big_showers_Systematics1       B7L1U and B7L1L
-        item_alfa_Big_showers_Systematics1 = LVL1MenuItem('L1_ALFA_SHOWSYST1', ctpid=-1, group='1', prescale=1).setLogic( \
-                        thr_nimdir_B7L1U.condition(1)&thr_nimdir_B7L1L.condition(1)&physcond \
-                        ).setTriggerType(TT_rpcout)
-
-
-        # L1_SHOWSYST2 = Big_showers_Systematics2       A7L1U and A7L1L
-        item_alfa_Big_showers_Systematics2 = LVL1MenuItem('L1_ALFA_SHOWSYST2', ctpid=-1, group='1', prescale=1).setLogic( \
-                        thr_nimdir_A7L1U.condition(1)&thr_nimdir_A7L1L.condition(1)&physcond \
-                        ).setTriggerType(TT_rpcout)
-
-
-        # L1_SHOWSYST3 = Big_showers_Systematics3       A7R1U and A7R1L
-        item_alfa_Big_showers_Systematics3 = LVL1MenuItem('L1_ALFA_SHOWSYST3', ctpid=-1, group='1', prescale=1).setLogic( \
-                        thr_nimdir_A7R1U.condition(1)&thr_nimdir_A7R1L.condition(1)&physcond \
-                        ).setTriggerType(TT_rpcout)
-
-
-        # L1_SHOWSYST4 = Big_showers_Systematics4       B7R1U and B7R1L
-        item_alfa_Big_showers_Systematics4 = LVL1MenuItem('L1_ALFA_SHOWSYST4', ctpid=-1, group='1', prescale=1).setLogic( \
-                        thr_nimdir_B7R1U.condition(1)&thr_nimdir_B7R1L.condition(1)&physcond \
-                        ).setTriggerType(TT_rpcout)
-
-
-        # L1_SHOWSYST5 = Big_showers_Systematics5       (B7L1U or B7L1L or A7L1U or A7L1L) and (A7R1U or A7R1L or B7R1U or B7R1L)
-        item_alfa_Big_showers_Systematics5 = LVL1MenuItem('L1_ALFA_SHOWSYST5', ctpid=-1, group='1', prescale=1).setLogic( \
-                        (thr_nimdir_B7L1U.condition(1)|thr_nimdir_B7L1L.condition(1)|thr_nimdir_A7L1U.condition(1)|thr_nimdir_A7L1L.condition(1))&(thr_nimdir_A7R1U.condition(1)|thr_nimdir_A7R1L.condition(1)|thr_nimdir_B7R1U.condition(1)|thr_nimdir_B7R1L.condition(1))&physcond \
-                        ).setTriggerType(TT_rpcout)
-
-
-        # L1_SYST5 = Systematics5       B7L1U and B7L1L and B7R1U and B7R1L     not (A7L1U or A7L1L or A7R1U or A7R1L)
-        item_alfa_Systematics5 = LVL1MenuItem('L1_ALFA_SYST5', ctpid=-1, group='1', prescale=1).setLogic( \
-                        thr_nimdir_B7L1U.condition(1)&thr_nimdir_B7L1L.condition(1)&thr_nimdir_B7R1U.condition(1)&thr_nimdir_B7R1L.condition(1)\
-                        &Not(thr_nimdir_A7L1U.condition(1)|thr_nimdir_A7L1L.condition(1)|thr_nimdir_A7R1U.condition(1)|thr_nimdir_A7R1L.condition(1))&physcond \
-                        ).setTriggerType(TT_rpcout)
-
-
-        # L1_SYST6 = Systematics6       (B7L1U or B7L1L) and (B7R1U or B7R1L)   not (A7L1U or A7L1L or A7R1U or A7R1L)
-        item_alfa_Systematics6 = LVL1MenuItem('L1_ALFA_SYST6', ctpid=-1, group='1', prescale=1).setLogic( \
-                        (thr_nimdir_B7L1U.condition(1)|thr_nimdir_B7L1L.condition(1))&(thr_nimdir_B7R1U.condition(1)|thr_nimdir_B7R1L.condition(1))\
-                        &Not(thr_nimdir_A7L1U.condition(1)|thr_nimdir_A7L1L.condition(1)|thr_nimdir_A7R1U.condition(1)|thr_nimdir_A7R1L.condition(1))&physcond \
-                        ).setTriggerType(TT_rpcout)
-
-        
-        # L1_SYST7 = Systematics7       A7L1U and A7L1L and A7R1U and A7R1L     not (B7L1U or B7L1L or B7R1U or B7R1L)
-        item_alfa_Systematics7 = LVL1MenuItem('L1_ALFA_SYST7', ctpid=-1, group='1', prescale=1).setLogic( \
-                        thr_nimdir_A7L1U.condition(1)&thr_nimdir_A7L1L.condition(1)&thr_nimdir_A7R1U.condition(1)&thr_nimdir_A7R1L.condition(1)\
-                        &Not(thr_nimdir_B7L1U.condition(1)|thr_nimdir_B7L1L.condition(1)|thr_nimdir_B7R1U.condition(1)|thr_nimdir_B7R1L.condition(1))&physcond \
-                        ).setTriggerType(TT_rpcout)
-
-
-        # L1_SYST8 = Systematics8       (A7L1U or A7L1L) and (A7R1U or A7R1L)   not (B7L1U or B7L1L or B7R1U or B7R1L)
-        item_alfa_Systematics8 = LVL1MenuItem('L1_ALFA_SYST8', ctpid=-1, group='1', prescale=1).setLogic( \
-                        (thr_nimdir_A7L1U.condition(1)|thr_nimdir_A7L1L.condition(1))&(thr_nimdir_A7R1U.condition(1)|thr_nimdir_A7R1L.condition(1))\
-                        &Not(thr_nimdir_B7L1U.condition(1)|thr_nimdir_B7L1L.condition(1)|thr_nimdir_B7R1U.condition(1)|thr_nimdir_B7R1L.condition(1))&physcond \
-                        ).setTriggerType(TT_rpcout)
-
-
-        # L1_SYST9 = Systematics9       B7L1U and A7L1U and A7R1U and B7R1U     not (B7L1L or A7L1L or A7R1L or B7R1L)
-        item_alfa_Systematics9 = LVL1MenuItem('L1_ALFA_SYST9', ctpid=-1, group='1', prescale=1).setLogic( \
-                        thr_nimdir_B7L1U.condition(1)&thr_nimdir_A7L1U.condition(1)&thr_nimdir_A7R1U.condition(1)&thr_nimdir_B7R1U.condition(1)\
-                        &Not(thr_nimdir_B7L1L.condition(1)|thr_nimdir_A7L1L.condition(1)|thr_nimdir_A7R1L.condition(1)|thr_nimdir_B7R1L.condition(1))&physcond \
-                        ).setTriggerType(TT_rpcout)
-
-
-        # L1_SYST10 = Systematics10     B7L1L and A7L1L and A7R1L and B7R1L     not (B7L1U or A7L1U or A7R1U UU B7R1U)
-        item_alfa_Systematics10 = LVL1MenuItem('L1_ALFA_SYST10', ctpid=-1, group='1', prescale=1).setLogic( \
-                        thr_nimdir_B7L1L.condition(1)&thr_nimdir_A7L1L.condition(1)&thr_nimdir_A7R1L.condition(1)&thr_nimdir_B7R1L.condition(1)\
-                        &Not(thr_nimdir_B7L1U.condition(1)|thr_nimdir_A7L1U.condition(1)|thr_nimdir_A7R1U.condition(1)|thr_nimdir_B7R1U.condition(1))&physcond \
-                        ).setTriggerType(TT_rpcout)
-
-
-        # L1_SYST11 = Systematics11     B7L1U and A7L1U and A7R1U and B7R1U
-        item_alfa_Systematics11 = LVL1MenuItem('L1_ALFA_SYST11', ctpid=-1, group='1', prescale=1).setLogic( \
-                        thr_nimdir_B7L1U.condition(1)&thr_nimdir_A7L1U.condition(1)&thr_nimdir_A7R1U.condition(1)&thr_nimdir_B7R1U.condition(1)&physcond \
-                        ).setTriggerType(TT_rpcout)
-
-
-        # L1_SYST12 = Systematics12     B7L1L and A7L1L and A7R1L and B7R1L
-        item_alfa_Systematics12 = LVL1MenuItem('L1_ALFA_SYST12', ctpid=-1, group='1', prescale=1).setLogic( \
-                        thr_nimdir_B7L1L.condition(1)&thr_nimdir_A7L1L.condition(1)&thr_nimdir_A7R1L.condition(1)&thr_nimdir_B7R1L.condition(1)&physcond \
-                        ).setTriggerType(TT_rpcout)
-
-
-        # L1_SYST13 = Systematics13     (B7L1U or A7L1U) and A7R1U and B7R1U
-        item_alfa_Systematics13 = LVL1MenuItem('L1_ALFA_SYST13', ctpid=-1, group='1', prescale=1).setLogic( \
-                        (thr_nimdir_B7L1U.condition(1)|thr_nimdir_A7L1U.condition(1))&thr_nimdir_A7R1U.condition(1)&thr_nimdir_B7R1U.condition(1)&physcond \
-                        ).setTriggerType(TT_rpcout)
-
-
-        # L1_SYST14 = Systematics14     B7L1U and A7L1U and (A7R1U or B7R1U)
-        item_alfa_Systematics14 = LVL1MenuItem('L1_ALFA_SYST14', ctpid=-1, group='1', prescale=1).setLogic( \
-                        thr_nimdir_B7L1U.condition(1)&thr_nimdir_A7L1U.condition(1)&(thr_nimdir_A7R1U.condition(1)|thr_nimdir_B7R1U.condition(1))&physcond \
-                        ).setTriggerType(TT_rpcout)
-
-
-        # L1_SYST15 = Systematics15     (B7L1L or A7L1L) and A7R1L and B7R1L
-        item_alfa_Systematics15 = LVL1MenuItem('L1_ALFA_SYST15', ctpid=-1, group='1', prescale=1).setLogic( \
-                        (thr_nimdir_B7L1L.condition(1)|thr_nimdir_A7L1L.condition(1))&thr_nimdir_A7R1L.condition(1)&thr_nimdir_B7R1L.condition(1)&physcond \
-                        ).setTriggerType(TT_rpcout)
-
-
-        # L1_SYST16 = Systematics16     B7L1L and A7L1L and (A7R1L or B7R1L)
-        item_alfa_Systematics16 = LVL1MenuItem('L1_ALFA_SYST16', ctpid=-1, group='1', prescale=1).setLogic( \
-                        thr_nimdir_B7L1L.condition(1)&thr_nimdir_A7L1L.condition(1)&(thr_nimdir_A7R1L.condition(1)|thr_nimdir_B7R1L.condition(1))&physcond \
-                        ).setTriggerType(TT_rpcout)
-
-
-        # L1_SYST17 = Systematics17     (B7L1U or A7L1U) and (A7R1U or B7R1U)
-        item_alfa_Systematics17 = LVL1MenuItem('L1_ALFA_SYST17', ctpid=-1, group='1', prescale=1).setLogic( \
-                        (thr_nimdir_B7L1U.condition(1)|thr_nimdir_A7L1U.condition(1))&(thr_nimdir_A7R1U.condition(1)|thr_nimdir_B7R1U.condition(1))&physcond \
-                        ).setTriggerType(TT_rpcout)
-
-
-        # L1_SYST18 = Systematics18     (B7L1L or A7L1L) and (A7R1L or B7R1L)
-        item_alfa_Systematics18 = LVL1MenuItem('L1_ALFA_SYST18', ctpid=-1, group='1', prescale=1).setLogic( \
-                        (thr_nimdir_B7L1L.condition(1)|thr_nimdir_A7L1L.condition(1))&(thr_nimdir_A7R1L.condition(1)|thr_nimdir_B7R1L.condition(1))&physcond \
-                        ).setTriggerType(TT_rpcout)
-
-
-        # L1_SYST19 = Systematics19     B7L1U or A7L1U or A7R1U or B7R1U        not (B7L1L or A7L1L or A7R1L or B7R1L)
-        item_alfa_Systematics19 = LVL1MenuItem('L1_ALFA_SYST19', ctpid=-1, group='1', prescale=1).setLogic( \
-                        (thr_nimdir_B7L1U.condition(1)|thr_nimdir_A7L1U.condition(1)|thr_nimdir_A7R1U.condition(1)|thr_nimdir_B7R1U.condition(1))\
-                        &Not(thr_nimdir_B7L1L.condition(1)|thr_nimdir_A7L1L.condition(1)|thr_nimdir_A7R1L.condition(1)|thr_nimdir_B7R1L.condition(1))&physcond \
-                        ).setTriggerType(TT_rpcout)
-
-
-        # L1_SYST20 = Systematics20     B7L1L or A7L1L or A7R1L or B7R1L        not (B7L1U or A7L1U or A7R1U or B7R1U)
-        item_alfa_Systematics20 = LVL1MenuItem('L1_ALFA_SYST20', ctpid=-1, group='1', prescale=1).setLogic( \
-                        (thr_nimdir_B7L1L.condition(1)|thr_nimdir_A7L1L.condition(1)|thr_nimdir_A7R1L.condition(1)|thr_nimdir_B7R1L.condition(1))\
-                        &Not(thr_nimdir_B7L1U.condition(1)|thr_nimdir_A7L1U.condition(1)|thr_nimdir_A7R1U.condition(1)|thr_nimdir_B7R1U.condition(1))&physcond \
-                        ).setTriggerType(TT_rpcout)
-
-
-        # L1_ANY = Minimum_Bias (B7L1U or B7L1L or A7L1U or A7L1L or A7R1U or A7R1L or B7R1U or B7R1L)
-        item_alfa_Minimum_Bias = LVL1MenuItem('L1_ALFA_ANY', ctpid=-1, group='1', prescale=1).setLogic( \
-                        (thr_nimdir_B7L1U.condition(1)|thr_nimdir_B7L1L.condition(1)|thr_nimdir_A7L1U.condition(1)|thr_nimdir_A7L1L.condition(1)|thr_nimdir_A7R1U.condition(1)|thr_nimdir_A7R1L.condition(1)|thr_nimdir_B7R1U.condition(1)|thr_nimdir_B7R1L.condition(1))&physcond \
-                        ).setTriggerType(TT_rpcout)
-
-        # L1_ANY = Minimum_Bias (B7L1U or B7L1L or A7L1U or A7L1L or A7R1U or A7R1L or B7R1U or B7R1L)
-        item_alfa_Minimum_Bias_empty = LVL1MenuItem('L1_ALFA_ANY_EMPTY', ctpid=-1, group='1', prescale=1).setLogic( \
-                        (thr_nimdir_B7L1U.condition(1)|thr_nimdir_B7L1L.condition(1)|thr_nimdir_A7L1U.condition(1)|thr_nimdir_A7L1L.condition(1)|thr_nimdir_A7R1U.condition(1)|thr_nimdir_A7R1L.condition(1)|thr_nimdir_B7R1U.condition(1)|thr_nimdir_B7R1L.condition(1))&cosmiccond \
-                        ).setTriggerType(TT_rpcout)
-
-        # L1_ANY = Minimum_Bias (B7L1U or B7L1L or A7L1U or A7L1L or A7R1U or A7R1L or B7R1U or B7R1L)
-        item_alfa_Minimum_Bias_firstempty = LVL1MenuItem('L1_ALFA_ANY_FIRSTEMPTY', ctpid=-1, group='1', prescale=1).setLogic( \
-                        (thr_nimdir_B7L1U.condition(1)|thr_nimdir_B7L1L.condition(1)|thr_nimdir_A7L1U.condition(1)|thr_nimdir_A7L1L.condition(1)|thr_nimdir_A7R1U.condition(1)|thr_nimdir_A7R1L.condition(1)|thr_nimdir_B7R1U.condition(1)|thr_nimdir_B7R1L.condition(1))&empty1stcond \
-                        ).setTriggerType(TT_rpcout)
-
-        # L1_ANY = Minimum_Bias (B7L1U or B7L1L or A7L1U or A7L1L or A7R1U or A7R1L or B7R1U or B7R1L)
-        item_alfa_Minimum_Bias_unpaired_iso = LVL1MenuItem('L1_ALFA_ANY_UNPAIRED_ISO', ctpid=-1, group='1', prescale=1).setLogic( \
-                        (thr_nimdir_B7L1U.condition(1)|thr_nimdir_B7L1L.condition(1)|thr_nimdir_A7L1U.condition(1)|thr_nimdir_A7L1L.condition(1)|thr_nimdir_A7R1U.condition(1)|thr_nimdir_A7R1L.condition(1)|thr_nimdir_B7R1U.condition(1)|thr_nimdir_B7R1L.condition(1))&unpaired_isocond \
-                        ).setTriggerType(TT_rpcout)
-
-        # L1_ANY = Minimum_Bias (B7L1U or B7L1L or A7L1U or A7L1L or A7R1U or A7R1L or B7R1U or B7R1L)
-        item_alfa_Minimum_Bias_unpaired_noniso = LVL1MenuItem('L1_ALFA_ANY_UNPAIRED_NONISO', ctpid=-1, group='1', prescale=1).setLogic( \
-                        (thr_nimdir_B7L1U.condition(1)|thr_nimdir_B7L1L.condition(1)|thr_nimdir_A7L1U.condition(1)|thr_nimdir_A7L1L.condition(1)|thr_nimdir_A7R1U.condition(1)|thr_nimdir_A7R1L.condition(1)|thr_nimdir_B7R1U.condition(1)|thr_nimdir_B7R1L.condition(1))&unpaired_nonisocond \
-                        ).setTriggerType(TT_rpcout)
-
-        #---------------------------------
-        # new ALFA items for 2012 running:
-        #---------------------------------
-        #L1_A7L1U_OD = (NIM_A7L1U_OD_x1 and (BGRP0 and (BGRP1 or BGRP2 or BGRP3 or BGRP4 or BGRP5 or BGRP6)))
-        item_alfa_A7L1U_OD = LVL1MenuItem('L1_ALFA_A7L1U_OD', ctpid=-1, group='1', prescale=1).setLogic(\
-                        (thr_nimdir_A7L1U_OD.condition(1)&Logic(bgrp0))\
-                        ).setTriggerType(TT_rpcout)
-        
-        #L1_A7L1L_OD = (NIM_A7L1L_OD_x1 and (BGRP0 and (BGRP1 or BGRP2 or BGRP3 or BGRP4 or BGRP5 or BGRP6)))
-        item_alfa_A7L1L_OD = LVL1MenuItem('L1_ALFA_A7L1L_OD', ctpid=-1, group='1', prescale=1).setLogic(\
-                        (thr_nimdir_A7L1L_OD.condition(1)&Logic(bgrp0))\
-                        ).setTriggerType(TT_rpcout)
-
-        # L1_B7L1U_OD = (NIM_B7L1U_OD_x1 and (BGRP0 and (BGRP1 or BGRP2 or BGRP3 or BGRP4 or BGRP5 or BGRP6)))
-        item_alfa_B7L1U_OD = LVL1MenuItem('L1_ALFA_B7L1U_OD', ctpid=-1, group='1', prescale=1).setLogic(\
-                        (thr_nimdir_B7L1U_OD.condition(1)&Logic(bgrp0))\
-                        ).setTriggerType(TT_rpcout)
-
-        
-        #L1_B7L1L_OD = (NIM_B7R1L_OD_x1 and (BGRP0 and (BGRP1 or BGRP2 or BGRP3 or BGRP4 or BGRP5 or BGRP6)))
-        item_alfa_B7L1L_OD = LVL1MenuItem('L1_ALFA_B7L1L_OD', ctpid=-1, group='1', prescale=1).setLogic(\
-                        (thr_nimdir_B7L1L_OD.condition(1)&Logic(bgrp0))\
-                        ).setTriggerType(TT_rpcout)
-
-        
-        #L1_A7R1U_OD = (NIM_A7R1U_OD_x1 and (BGRP0 and (BGRP1 or BGRP2 or BGRP3 or BGRP4 or BGRP5 or BGRP6)))
-        item_alfa_A7R1U_OD = LVL1MenuItem('L1_ALFA_A7R1U_OD', ctpid=-1, group='1', prescale=1).setLogic(\
-                        (thr_nimdir_A7R1U_OD.condition(1)&Logic(bgrp0))\
-                        ).setTriggerType(TT_rpcout)
-
-        #L1_A7R1L_OD = (NIM_A7R1L_OD_x1 and (BGRP0 and (BGRP1 or BGRP2 or BGRP3 or BGRP4 or BGRP5 or BGRP6)))
-        item_alfa_A7R1L_OD = LVL1MenuItem('L1_ALFA_A7R1L_OD', ctpid=-1, group='1', prescale=1).setLogic(\
-                        (thr_nimdir_A7R1L_OD.condition(1)&Logic(bgrp0))\
-                        ).setTriggerType(TT_rpcout)
-
-        # L1_B7R1U_OD = (NIM_B7R1U_OD_x1 and (BGRP0 and (BGRP1 or BGRP2 or BGRP3 or BGRP4 or BGRP5 or BGRP6)))
-        item_alfa_B7R1U_OD = LVL1MenuItem('L1_ALFA_B7R1U_OD', ctpid=-1, group='1', prescale=1).setLogic(\
-                        (thr_nimdir_B7R1U_OD.condition(1)&Logic(bgrp0))\
-                        ).setTriggerType(TT_rpcout)
-        
-        #L1_B7R1L_OD = (NIM_B7R1L_OD_x1 and (BGRP0 and (BGRP1 or BGRP2 or BGRP3 or BGRP4 or BGRP5 or BGRP6)))
-        item_alfa_B7R1L_OD = LVL1MenuItem('L1_ALFA_B7R1L_OD', ctpid=-1, group='1', prescale=1).setLogic(\
-                        (thr_nimdir_B7R1L_OD.condition(1)&Logic(bgrp0))\
-                        ).setTriggerType(TT_rpcout)
-
-
-        #L1_B7L1_OD = ((NIM_B7L1U_OD_x1 and NIM_B7L1L_OD_x1) and (BGRP0 and (BGRP1 or BGRP2 or BGRP3 or BGRP4 or BGRP5 or BGRP6)))
-        item_alfa_B7L1_OD = LVL1MenuItem('L1_ALFA_B7L1_OD', ctpid=-1, group='1', prescale=1).setLogic(\
-                        ((thr_nimdir_B7L1U_OD.condition(1)&thr_nimdir_B7L1L_OD.condition(1))&Logic(bgrp0))\
-                        ).setTriggerType(TT_rpcout)
-
-        #L1_A7L1_OD = ((NIM_A7L1U_OD_x1 and NIM_A7L1L_OD_x1) and (BGRP0 and (BGRP1 or BGRP2 or BGRP3 or BGRP4 or BGRP5 or BGRP6)))
-        item_alfa_A7L1_OD = LVL1MenuItem('L1_ALFA_A7L1_OD', ctpid=-1, group='1', prescale=1).setLogic(\
-                        ((thr_nimdir_A7L1U_OD.condition(1)&thr_nimdir_A7L1L_OD.condition(1))&Logic(bgrp0))\
-                        ).setTriggerType(TT_rpcout)
-
-        #L1_A7R1_OD = ((NIM_A7R1U_OD_x1 and NIM_A7R1L_OD_x1) and (BGRP0 and (BGRP1 or BGRP2 or BGRP3 or BGRP4 or BGRP5 or BGRP6)))
-        item_alfa_A7R1_OD = LVL1MenuItem('L1_ALFA_A7R1_OD', ctpid=-1, group='1', prescale=1).setLogic(\
-                        ((thr_nimdir_A7R1U_OD.condition(1)&thr_nimdir_A7R1L_OD.condition(1))&Logic(bgrp0))\
-                        ).setTriggerType(TT_rpcout)
-
-        #L1_B7R1_OD = ((NIM_B7R1U_OD_x1 and NIM_B7R1L_OD_x1) and (BGRP0 and (BGRP1 or BGRP2 or BGRP3 or BGRP4 or BGRP5 or BGRP6)))
-        item_alfa_B7R1_OD = LVL1MenuItem('L1_ALFA_B7R1_OD', ctpid=-1, group='1', prescale=1).setLogic(\
-                        ((thr_nimdir_B7R1U_OD.condition(1)&thr_nimdir_B7R1L_OD.condition(1))&Logic(bgrp0))\
-                        ).setTriggerType(TT_rpcout)
-
-        #L1_B7L1U = ((NIM_B7L1U_x1) and (BGRP0))
-        item_alfa_B7L1U = LVL1MenuItem('L1_ALFA_B7L1U', ctpid=-1, group='1', prescale=1).setLogic(\
-                        (thr_nimdir_B7L1U.condition(1)&Logic(bgrp0))\
-                        ).setTriggerType(TT_rpcout)
-        
-        #L1_B7L1L = ((NIM_B7R1L_x1) and (BGRP0))
-        item_alfa_B7L1L = LVL1MenuItem('L1_ALFA_B7L1L', ctpid=-1, group='1', prescale=1).setLogic(\
-                        (thr_nimdir_B7L1L.condition(1)&Logic(bgrp0))\
-                        ).setTriggerType(TT_rpcout)
-        
-        #L1_A7L1U = ((NIM_A7L1U_x1) and (BGRP0))
-        item_alfa_A7L1U = LVL1MenuItem('L1_ALFA_A7L1U', ctpid=-1, group='1', prescale=1).setLogic(\
-                        (thr_nimdir_A7L1U.condition(1)&Logic(bgrp0))\
-                        ).setTriggerType(TT_rpcout)
-        
-        #L1_A7L1L = ((NIM_A7L1L_x1) and (BGRP0))
-        item_alfa_A7L1L = LVL1MenuItem('L1_ALFA_A7L1L', ctpid=-1, group='1', prescale=1).setLogic(\
-                        (thr_nimdir_A7L1L.condition(1)&Logic(bgrp0))\
-                        ).setTriggerType(TT_rpcout)
-        
-        #L1_A7R1U = ((NIM_A7R1U_x1) and (BGRP0))
-        item_alfa_A7R1U = LVL1MenuItem('L1_ALFA_A7R1U', ctpid=-1, group='1', prescale=1).setLogic(\
-                        (thr_nimdir_A7R1U.condition(1)&Logic(bgrp0))\
-                        ).setTriggerType(TT_rpcout)
-
-        #L1_A7R1L = ((NIM_A7R1L_x1) and (BGRP0))
-        item_alfa_A7R1L = LVL1MenuItem('L1_ALFA_A7R1L', ctpid=-1, group='1', prescale=1).setLogic(\
-                        (thr_nimdir_A7R1L.condition(1)&Logic(bgrp0))\
-                        ).setTriggerType(TT_rpcout)
-
-        #L1_B7R1U = ((NIM_B7R1U_x1) and (BGRP0))
-        item_alfa_B7R1U = LVL1MenuItem('L1_ALFA_B7R1U', ctpid=-1, group='1', prescale=1).setLogic(\
-                        (thr_nimdir_B7R1U.condition(1)&Logic(bgrp0))\
-                        ).setTriggerType(TT_rpcout)
-        
-        #L1_B7R1L = ((NIM_B7R1L_x1) and (BGRP0))
-        item_alfa_B7R1L = LVL1MenuItem('L1_ALFA_B7R1L', ctpid=-1, group='1', prescale=1).setLogic(\
-                        (thr_nimdir_B7R1L.condition(1)&Logic(bgrp0))\
-                        ).setTriggerType(TT_rpcout)
-
-        #L1_ALFA_B1_Empty = ((NIM_B7L1U_x1 or NIM_B7L1L_x1 or NIM_A7L1U_x1 or NIM_A7L1L_x1) and (BGRP0 and BGRP3))
-        item_alfa_B1_Empty = LVL1MenuItem('L1_ALFA_B1_EMPTY', ctpid=-1, group='1', prescale=1).setLogic(\
-            ((thr_nimdir_B7L1U.condition(1)|thr_nimdir_B7L1L.condition(1)|thr_nimdir_A7L1U.condition(1)|thr_nimdir_A7L1L.condition(1))&cosmiccond)\
-            ).setTriggerType(TT_rpcout)
-
-        #L1_ALFA_B2_Empty = ((NIM_A7R1U_x1 or NIM_A7R1L_x1 or NIM_B7R1U_x1 or NIM_B7R1L_x1) and (BGRP0 and BGRP3))
-        item_alfa_B2_Empty = LVL1MenuItem('L1_ALFA_B2_EMPTY', ctpid=-1, group='1', prescale=1).setLogic(\
-            ((thr_nimdir_A7R1U.condition(1)|thr_nimdir_A7R1L.condition(1)|thr_nimdir_B7R1U.condition(1)|thr_nimdir_B7R1L.condition(1))&cosmiccond)\
-            ).setTriggerType(TT_rpcout)
-
-
-        
-        #L1_MBTS_2_A_ALFA_C = ((MBTS_A_x2 and ((NIM_A7R1U_x1 and NIM_B7R1U_x1) or (NIM_A7R1L_x1 and NIM_B7R1L_x1))) and (BGRP0 and BGRP1))
-        item_alfa_MBTS_2_A_ALFA_C = LVL1MenuItem('L1_MBTS_2_A_ALFA_C', ctpid=-1, group='1', prescale=1).setLogic(\
-            (((thr_mbtsA.condition(2)&((thr_nimdir_A7R1U.condition(1)&thr_nimdir_B7R1U.condition(1))|(thr_nimdir_A7R1L.condition(1)&thr_nimdir_B7R1L.condition(1))))&bgrpcond))\
-            ).setTriggerType(TT_rpcout)
-
-        #L1_MBTS_2_C_ALFA_A = ((MBTS_C_x2 and ((NIM_A7L1U_x1 and NIM_B7L1U_x1) or (NIM_A7L1L_x1 and NIM_B7L1L_x1))) and (BGRP0 and BGRP1))
-        item_alfa_MBTS_2_C_ALFA_A = LVL1MenuItem('L1_MBTS_2_C_ALFA_A', ctpid=-1, group='1', prescale=1).setLogic(\
-            (((thr_mbtsC.condition(2)& ((thr_nimdir_A7L1U.condition(1)&thr_nimdir_B7L1U.condition(1))|(thr_nimdir_A7L1L.condition(1)&thr_nimdir_B7L1L.condition(1))))&bgrpcond))\
-            ).setTriggerType(TT_rpcout)
-                    
-        #L1_MBTS_2_ALFA	= (((MBTS_A_x2 or MBTS_C_x2 or MBTS_A_x1) and (MBTS_A_x2 or MBTS_C_x2 or MBTS_C_x1)) and (NIM_A7L1U_x1 or NIM_A7L1L_x1 or NIM_B7L1U_x1 or NIM_B7L1L_x1 or NIM_A7R1U_x1 or NIM_A7R1L_x1 or NIM_B7R1U_x1 or NIM_B7R1L_x1)) and (BGRP0 and BGRP1))
-        item_alfa_MBTS_2_ALFA = LVL1MenuItem('L1_MBTS_2_ALFA', ctpid=-1, group='1', prescale=1).setLogic(\
-            ((((thr_mbtsA.condition(2)|thr_mbtsC.condition(2)|thr_mbtsA.condition(1))&(thr_mbtsA.condition(2)|thr_mbtsC.condition(2)|thr_mbtsC.condition(1)))&(thr_nimdir_A7L1U.condition(1)|thr_nimdir_A7L1L.condition(1)|thr_nimdir_B7L1U.condition(1)|thr_nimdir_B7L1L.condition(1)|thr_nimdir_A7R1U.condition(1)|thr_nimdir_A7R1L.condition(1)|thr_nimdir_B7R1U.condition(1)|thr_nimdir_B7R1L.condition(1)))&bgrpcond)\
-            ).setTriggerType(TT_rpcout)
-
-
-        #L1_MBTS_2_A_ALFA_C_UNPAIRED_ISO = ((MBTS_A_x2 and ((NIM_A7R1U_x1 and NIM_B7R1U_x1) or (NIM_A7R1L_x1 and NIM_B7R1L_x1))) and unpaired_isocond)
-        item_alfa_MBTS_2_A_ALFA_C_UNPAIRED_ISO = LVL1MenuItem('L1_MBTS_2_A_ALFA_C_UNPAIRED_ISO', ctpid=-1, group='1', prescale=1).setLogic(\
-            (((thr_mbtsA.condition(2)&((thr_nimdir_A7R1U.condition(1)&thr_nimdir_B7R1U.condition(1))|(thr_nimdir_A7R1L.condition(1)&thr_nimdir_B7R1L.condition(1))))&unpaired_isocond))\
-            ).setTriggerType(TT_rpcout)
-
-        #L1_MBTS_2_C_ALFA_A_UNPAIRED_ISO = ((MBTS_C_x2 and ((NIM_A7L1U_x1 and NIM_B7L1U_x1) or (NIM_A7L1L_x1 and NIM_B7L1L_x1))) and unpaired_isocond)
-        item_alfa_MBTS_2_C_ALFA_A_UNPAIRED_ISO = LVL1MenuItem('L1_MBTS_2_C_ALFA_A_UNPAIRED_ISO', ctpid=-1, group='1', prescale=1).setLogic(\
-            (((thr_mbtsC.condition(2)& ((thr_nimdir_A7L1U.condition(1)&thr_nimdir_B7L1U.condition(1))|(thr_nimdir_A7L1L.condition(1)&thr_nimdir_B7L1L.condition(1))))&unpaired_isocond))\
-            ).setTriggerType(TT_rpcout)
-            
-        #L1_MBTS_2_ALFA_UNPAIRED_ISO = (((MBTS_A_x2 or MBTS_C_x2 or MBTS_A_x1) and (MBTS_A_x2 or MBTS_C_x2 or MBTS_C_x1)) and (NIM_A7L1U_x1 or NIM_A7L1L_x1 or NIM_B7L1U_x1 or NIM_B7L1L_x1 or NIM_A7R1U_x1 or NIM_A7R1L_x1 or NIM_B7R1U_x1 or NIM_B7R1L_x1)) and unpaired_isocond)
-        item_alfa_MBTS_2_ALFA_UNPAIRED_ISO = LVL1MenuItem('L1_MBTS_2_ALFA_UNPAIRED_ISO', ctpid=-1, group='1', prescale=1).setLogic(\
-            ((((thr_mbtsA.condition(2)|thr_mbtsC.condition(2)|thr_mbtsA.condition(1))&(thr_mbtsA.condition(2)|thr_mbtsC.condition(2)|thr_mbtsC.condition(1)))&(thr_nimdir_A7L1U.condition(1)|thr_nimdir_A7L1L.condition(1)|thr_nimdir_B7L1U.condition(1)|thr_nimdir_B7L1L.condition(1)|thr_nimdir_A7R1U.condition(1)|thr_nimdir_A7R1L.condition(1)|thr_nimdir_B7R1U.condition(1)|thr_nimdir_B7R1L.condition(1)))&unpaired_isocond)\
-            ).setTriggerType(TT_rpcout)
-
-
-        #L1_MBTS_1_A_ALFA_C = ((MBTS_A_x1 and ((NIM_A7R1U_x1 and NIM_B7R1U_x1) or (NIM_A7R1L_x1 and NIM_B7R1L_x1))) and (BGRP0 and BGRP1))
-        item_alfa_MBTS_1_A_ALFA_C = LVL1MenuItem('L1_MBTS_1_A_ALFA_C', ctpid=-1, group='1', prescale=1).setLogic(\
-            (((thr_mbtsA.condition(1)&((thr_nimdir_A7R1U.condition(1)&thr_nimdir_B7R1U.condition(1))|(thr_nimdir_A7R1L.condition(1)&thr_nimdir_B7R1L.condition(1))))&bgrpcond))\
-            ).setTriggerType(TT_rpcout)
-
-        #L1_MBTS_1_C_ALFA_A = ((MBTS_C_x1 and ((NIM_A7L1U_x1 and NIM_B7L1U_x1) or (NIM_A7L1L_x1 and NIM_B7L1L_x1))) and (BGRP0 and BGRP1))
-        item_alfa_MBTS_1_C_ALFA_A = LVL1MenuItem('L1_MBTS_1_C_ALFA_A', ctpid=-1, group='1', prescale=1).setLogic(\
-            (((thr_mbtsC.condition(1)& ((thr_nimdir_A7L1U.condition(1)&thr_nimdir_B7L1U.condition(1))|(thr_nimdir_A7L1L.condition(1)&thr_nimdir_B7L1L.condition(1))))&bgrpcond))\
-            ).setTriggerType(TT_rpcout)
-            
-
-        #L1_MBTS_1_A_ALFA_C_UNPAIRED_ISO = ((MBTS_A_x1 and ((NIM_A7R1U_x1 and NIM_B7R1U_x1) or (NIM_A7R1L_x1 and NIM_B7R1L_x1))) and &unpaired_isocond)
-        item_alfa_MBTS_1_A_ALFA_C_UNPAIRED_ISO = LVL1MenuItem('L1_MBTS_1_A_ALFA_C_UNPAIRED_ISO', ctpid=-1, group='1', prescale=1).setLogic(\
-            (((thr_mbtsA.condition(1)&((thr_nimdir_A7R1U.condition(1)&thr_nimdir_B7R1U.condition(1))|(thr_nimdir_A7R1L.condition(1)&thr_nimdir_B7R1L.condition(1))))&unpaired_isocond))\
-            ).setTriggerType(TT_rpcout)
-
-        #L1_MBTS_1_C_ALFA_A_UNPAIRED_ISO = ((MBTS_C_x1 and ((NIM_A7L1U_x1 and NIM_B7L1U_x1) or (NIM_A7L1L_x1 and NIM_B7L1L_x1))) and &unpaired_isocond)
-        item_alfa_MBTS_1_C_ALFA_A_UNPAIRED_ISO = LVL1MenuItem('L1_MBTS_1_C_ALFA_A_UNPAIRED_ISO', ctpid=-1, group='1', prescale=1).setLogic(\
-            (((thr_mbtsC.condition(1)& ((thr_nimdir_A7L1U.condition(1)&thr_nimdir_B7L1U.condition(1))|(thr_nimdir_A7L1L.condition(1)&thr_nimdir_B7L1L.condition(1))))&unpaired_isocond))\
-            ).setTriggerType(TT_rpcout)
-            
-
-
-        #L1_LUCID_A_ALFA_C = ((LUCID_A_x1 and ((NIM_A7R1U_x1 and NIM_B7R1U_x1) or (NIM_A7R1L_x1 and NIM_B7R1L_x1))) and (BGRP0 and BGRP1))
-        item_alfa_LUCID_A_ALFA_C = LVL1MenuItem('L1_LUCID_A_ALFA_C', ctpid=-1, group='1', prescale=1).setLogic(\
-                                   ((thr_lucidA.condition(1)&((thr_nimdir_A7R1U.condition(1)&thr_nimdir_B7R1U.condition(1))|(thr_nimdir_A7R1L.condition(1)&thr_nimdir_B7R1L.condition(1))))&bgrpcond)\
-                                   ).setTriggerType(TT_rpcout)
-        
-        #L1_LUCID_C_ALFA_A = ((LUCID_C_x1 and ((NIM_A7L1U_x1 and NIM_B7L1U_x1) or (NIM_A7L1L_x1 and NIM_B7L1L_x1))) and (BGRP0 and BGRP1))
-        item_alfa_LUCID_C_ALFA_A = LVL1MenuItem('L1_LUCID_C_ALFA_A', ctpid=-1, group='1', prescale=1).setLogic(\
-                                   ((thr_lucidC.condition(1)&((thr_nimdir_A7L1U.condition(1)&thr_nimdir_B7L1U.condition(1))|(thr_nimdir_A7L1L.condition(1)&thr_nimdir_B7L1L.condition(1))))&bgrpcond)\
-                                   ).setTriggerType(TT_rpcout)
-
-
-        #L1_LUCID_A_ALFA_C_UNPAIRED_ISO = ((LUCID_A_x1 and ((NIM_A7R1U_x1 and NIM_B7R1U_x1) or (NIM_A7R1L_x1 and NIM_B7R1L_x1))) and &unpaired_isocond)
-        item_alfa_LUCID_A_ALFA_C_UNPAIRED_ISO = LVL1MenuItem('L1_LUCID_A_ALFA_C_UNPAIRED_ISO', ctpid=-1, group='1', prescale=1).setLogic(\
-                                   ((thr_lucidA.condition(1)&((thr_nimdir_A7R1U.condition(1)&thr_nimdir_B7R1U.condition(1))|(thr_nimdir_A7R1L.condition(1)&thr_nimdir_B7R1L.condition(1))))&unpaired_isocond)\
-                                   ).setTriggerType(TT_rpcout)
-        
-        #L1_LUCID_C_ALFA_A_UNPAIRED_ISO = ((LUCID_C_x1 and ((NIM_A7L1U_x1 and NIM_B7L1U_x1) or (NIM_A7L1L_x1 and NIM_B7L1L_x1))) and &unpaired_isocond)
-        item_alfa_LUCID_C_ALFA_A_UNPAIRED_ISO = LVL1MenuItem('L1_LUCID_C_ALFA_A_UNPAIRED_ISO', ctpid=-1, group='1', prescale=1).setLogic(\
-                                   ((thr_lucidC.condition(1)&((thr_nimdir_A7L1U.condition(1)&thr_nimdir_B7L1U.condition(1))|(thr_nimdir_A7L1L.condition(1)&thr_nimdir_B7L1L.condition(1))))&unpaired_isocond)\
-                                   ).setTriggerType(TT_rpcout)
-
-
-        
-        #L1_LUCID_ALFA	= (((LUCID_A_x1 or LUCID_C_x1) and (NIM_A7L1U_x1 or NIM_A7L1L_x1 or NIM_B7L1U_x1 or NIM_B7L1L_x1 or NIM_A7R1U_x1 or NIM_A7R1L_x1 or NIM_B7R1U_x1 or NIM_B7R1L_x1)) and (BGRP0 and BGRP1))
-        item_alfa_LUCID_ALFA_= LVL1MenuItem('L1_LUCID_ALFA', ctpid=-1, group='1', prescale=1).setLogic(\
-                               (((thr_lucidA.condition(1)|thr_lucidC.condition(1))&(thr_nimdir_A7L1U.condition(1)|thr_nimdir_A7L1L.condition(1)|thr_nimdir_B7L1U.condition(1)|thr_nimdir_B7L1L.condition(1)|thr_nimdir_A7R1U.condition(1)|thr_nimdir_A7R1L.condition(1)|thr_nimdir_B7R1U.condition(1)|thr_nimdir_B7R1L.condition(1)))&bgrpcond)\
-                               ).setTriggerType(TT_rpcout)
-
-        #L1_ZDC_A_ALFA_C = ((ZDC_A_x1 and ((NIM_A7R1U_x1 and NIM_B7R1U_x1) or (NIM_A7R1L_x1 and NIM_B7R1L_x1))) and (NIM_BGRP0_x1 and NIM_BGRP1_x1))
-        item_alfa_ZDC_A_ALFA_C= LVL1MenuItem('L1_ZDC_A_ALFA_C', ctpid=-1, group='1', prescale=1).setLogic(\
-                                ((thr_zdcA.condition(1)&((thr_nimdir_A7R1U.condition(1)&thr_nimdir_B7R1U.condition(1))|(thr_nimdir_A7R1L.condition(1)&thr_nimdir_B7R1L.condition(1))))&bgrpcond)\
-                                ).setTriggerType(TT_rpcout)
-        
-        #L1_ZDC_C_ALFA_A = ((ZDC_C_x1 and ((NIM_A7L1U_x1 and NIM_B7L1U_x1) or (NIM_A7L1L_x1 and NIM_B7L1L_x1))) and (NIM_BGRP0_x1 and NIM_BGRP1_x1))
-        item_alfa_ZDC_C_ALFA_A= LVL1MenuItem('L1_ZDC_C_ALFA_A', ctpid=-1, group='1', prescale=1).setLogic(\
-                                ((thr_zdcC.condition(1)&((thr_nimdir_A7L1U.condition(1)&thr_nimdir_B7L1U.condition(1))|(thr_nimdir_A7L1L.condition(1)&thr_nimdir_B7L1L.condition(1))))&bgrpcond)\
-                                ).setTriggerType(TT_rpcout)
-
-        #L1_ZDC_ALFA = (((ZDC_A_x1 or ZDC_C_x1) and (NIM_A7L1U_x1 or NIM_A7L1L_x1 or NIM_B7L1U_x1 or NIM_B7L1L_x1 or NIM_A7R1U_x1 or NIM_A7R1L_x1 or NIM_B7R1U_x1 or NIM_B7R1L_x1)) and (BGRP0 and BGRP1))
-        item_alfa_ZDC_ALFA= LVL1MenuItem('L1_ZDC_ALFA', ctpid=-1, group='1', prescale=1).setLogic(\
-                            (((thr_zdcA.condition(1)|thr_zdcC.condition(1))&(thr_nimdir_A7L1U.condition(1)|thr_nimdir_A7L1L.condition(1)|thr_nimdir_B7L1U.condition(1)|thr_nimdir_B7L1L.condition(1)|thr_nimdir_A7R1U.condition(1)|thr_nimdir_A7R1L.condition(1)|thr_nimdir_B7R1U.condition(1)|thr_nimdir_B7R1L.condition(1)))&bgrpcond)\
-                               ).setTriggerType(TT_rpcout)
-
-
-        #new combined ALFA items for 2012 running
-
-        #L1_EM3_ALFA_ANY
-        item_em3_alfa_any = LVL1MenuItem('L1_EM3_ALFA_ANY',   ctpid=-1, group='1', prescale=1)\
-                            .setLogic(thr_em3.condition(1)\
-                                      &(thr_nimdir_B7L1U.condition(1)|thr_nimdir_B7L1L.condition(1)\
-                                      |thr_nimdir_A7L1U.condition(1)|thr_nimdir_A7L1L.condition(1)\
-                                      |thr_nimdir_A7R1U.condition(1)|thr_nimdir_A7R1L.condition(1)\
-                                      |thr_nimdir_B7R1U.condition(1)|thr_nimdir_B7R1L.condition(1))\
-                                      &physcond).setTriggerType(TT_calo|TT_caloem|TT_rpcout)
-
-        #L1_EM3_ALFA_MBTS_C
-        item_em3_alfa_mbts_c = LVL1MenuItem('L1_EM3_ALFA_MBTS_C',   ctpid=-1, group='1', prescale=1)\
-                               .setLogic(thr_em3.condition(1)\
-                               &thr_mbtsC.condition(1)\
-                               &((thr_nimdir_B7L1U.condition(1)&thr_nimdir_A7L1U.condition(1))\
-                                 |(thr_nimdir_B7L1L.condition(1)&thr_nimdir_A7L1L.condition(1)))\
-                                 &physcond).setTriggerType(TT_calo|TT_caloem|TT_minb|TT_rpcout)
-
-        #L1_EM3_ALFA_MBTS_A
-        item_em3_alfa_mbts_a = LVL1MenuItem('L1_EM3_ALFA_MBTS_A',   ctpid=-1, group='1', prescale=1)\
-                               .setLogic(thr_em3.condition(1)\
-                               &thr_mbtsA.condition(1)\
-                               &((thr_nimdir_B7R1U.condition(1)&thr_nimdir_A7R1U.condition(1))\
-                                 |(thr_nimdir_B7R1L.condition(1)&thr_nimdir_A7R1L.condition(1)))\
-                                 &physcond).setTriggerType(TT_calo|TT_caloem|TT_minb|TT_rpcout)
-        
-        #L1_EM3_ALFA_ANY_UNPAIRED_ISO
-        item_em3_alfa_any_unpiso = LVL1MenuItem('L1_EM3_ALFA_ANY_UNPAIRED_ISO',   ctpid=-1, group='1', prescale=1)\
-                                   .setLogic(thr_em3.condition(1)\
-                                             &(thr_nimdir_B7L1U.condition(1)|thr_nimdir_B7L1L.condition(1)\
-                                               |thr_nimdir_A7L1U.condition(1)|thr_nimdir_A7L1L.condition(1)\
-                                               |thr_nimdir_A7R1U.condition(1)|thr_nimdir_A7R1L.condition(1)\
-                                               |thr_nimdir_B7R1U.condition(1)|thr_nimdir_B7R1L.condition(1))\
-                                             &unpaired_isocond).setTriggerType(TT_calo|TT_caloem|TT_rpcout)
-
-        #L1_EM3_ALFA_MBTS_C_UNPAIRED_ISO
-        item_em3_alfa_mbts_c_unpiso = LVL1MenuItem('L1_EM3_ALFA_MBTS_C_UNPAIRED_ISO', ctpid=-1, group='1', prescale=1)\
-                                      .setLogic(thr_em3.condition(1)\
-                                                &thr_mbtsC.condition(1)\
-                                                &((thr_nimdir_B7L1U.condition(1)&thr_nimdir_A7L1U.condition(1))\
-                                                  |(thr_nimdir_B7L1L.condition(1)&thr_nimdir_A7L1L.condition(1)))\
-                                                &unpaired_isocond).setTriggerType(TT_calo|TT_caloem|TT_minb|TT_rpcout)
-        
-        #L1_EM3_ALFA_MBTS_A_UNPAIRED_ISO
-        item_em3_alfa_mbts_a_unpiso = LVL1MenuItem('L1_EM3_ALFA_MBTS_A_UNPAIRED_ISO', ctpid=-1, group='1', prescale=1)\
-                                      .setLogic(thr_em3.condition(1)\
-                                                &thr_mbtsA.condition(1)\
-                                                &((thr_nimdir_B7R1U.condition(1)&thr_nimdir_A7R1U.condition(1))\
-                                                  |(thr_nimdir_B7R1L.condition(1)&thr_nimdir_A7R1L.condition(1)))\
-                                                &unpaired_isocond).setTriggerType(TT_calo|TT_caloem|TT_minb|TT_rpcout)
-
-        
-
-        # HI items (vetoed with the TE)
-        item_j10_veto_te500  = LVL1MenuItem('L1_J10_VTE500',   ctpid=-1, group='1').setLogic(thr_j10.condition(1)&Not(thr_te500.condition(1))&physcond).setTriggerType(TT_calo)
-        item_j10_veto_te1000 = LVL1MenuItem('L1_J10_VTE1000',  ctpid=-1, group='1').setLogic(thr_j10.condition(1)&Not(thr_te1000.condition(1))&physcond).setTriggerType(TT_calo)
-        item_j10_veto_te2000 = LVL1MenuItem('L1_J10_VTE2000',  ctpid=-1, group='1').setLogic(thr_j10.condition(1)&Not(thr_te2000.condition(1))&physcond).setTriggerType(TT_calo)
-
-        item_j15_veto_te500  = LVL1MenuItem('L1_J15_VTE500',   ctpid=-1, group='1').setLogic(thr_j15.condition(1)&Not(thr_te500.condition(1))&physcond).setTriggerType(TT_calo)
-        item_j15_veto_te1000 = LVL1MenuItem('L1_J15_VTE1000',  ctpid=-1, group='1').setLogic(thr_j15.condition(1)&Not(thr_te1000.condition(1))&physcond).setTriggerType(TT_calo)
-        item_j15_veto_te2000 = LVL1MenuItem('L1_J15_VTE2000',  ctpid=-1, group='1').setLogic(thr_j15.condition(1)&Not(thr_te2000.condition(1))&physcond).setTriggerType(TT_calo)
-
-
-        item_j30_veto_te1000 = LVL1MenuItem('L1_J30_VTE1000',  ctpid=-1, group='1').setLogic(thr_j30.condition(1)&Not(thr_te1000.condition(1))&physcond).setTriggerType(TT_calo)
-        item_j30_veto_te2000 = LVL1MenuItem('L1_J30_VTE2000',  ctpid=-1, group='1').setLogic(thr_j30.condition(1)&Not(thr_te2000.condition(1))&physcond).setTriggerType(TT_calo)
-        item_j30_veto_te4000 = LVL1MenuItem('L1_J30_VTE4000',  ctpid=-1, group='1').setLogic(thr_j30.condition(1)&Not(thr_te4000.condition(1))&physcond).setTriggerType(TT_calo)
-
-        item_j55_veto_te1000 = LVL1MenuItem('L1_J55_VTE1000',  ctpid=-1, group='1').setLogic(thr_j55.condition(1)&Not(thr_te1000.condition(1))&physcond).setTriggerType(TT_calo)
-        item_j55_veto_te2000 = LVL1MenuItem('L1_J55_VTE2000',  ctpid=-1, group='1').setLogic(thr_j55.condition(1)&Not(thr_te2000.condition(1))&physcond).setTriggerType(TT_calo)
-        item_j55_veto_te4000 = LVL1MenuItem('L1_J55_VTE4000',  ctpid=-1, group='1').setLogic(thr_j55.condition(1)&Not(thr_te4000.condition(1))&physcond).setTriggerType(TT_calo)        
-        item_j55_veto_te6000 = LVL1MenuItem('L1_J55_VTE6000',  ctpid=-1, group='1').setLogic(thr_j55.condition(1)&Not(thr_te6000.condition(1))&physcond).setTriggerType(TT_calo)        
-
-        
-
-
-
-#        # Spare items for very initial running
-#        item_em3_spare   = LVL1MenuItem('L1_EM3_SPARE',   ctpid=0xd5, group='1', prescale=1)\
-#                           .setLogic(thr_em3.condition(1)&Logic(bgrp0)&Logic(bgrp1)).setTriggerType(TT_calo)
-#        item_j5_spare    = LVL1MenuItem('L1_J5_SPARE',   ctpid=0xd6, group='1', prescale=1).setLogic(thr_j5.condition(1)&Logic(bgrp0)&Logic(bgrp1)).setTriggerType(TT_calo)
-#        item_tau5_spare  = LVL1MenuItem('L1_TAU5_SPARE',  ctpid=0xd7, group='1', prescale=1)\
-#                           .setLogic(thr_tau5.condition(1)&Logic(bgrp0)&Logic(bgrp1)).setTriggerType(TT_calo)
-#        item_mu0_tgc_halo_spare = LVL1MenuItem('L1_MU0_TGC_HALO_SPARE',  ctpid=0xd8, group='1', prescale=1)\
-#                                  .setLogic(thr_mu0_tgc_halo.condition(1)&Logic(bgrp0)&Logic(bgrp1))\
-#                                  .setTriggerType(TT_tgc)
-#        item_mu0_low_rpc_spare  = LVL1MenuItem('L1_MU0_LOW_RPC_SPARE',  ctpid=0xd9, group='1', prescale=1)\
-#                                  .setLogic(thr_mu0_low_rpc.condition(1)&Logic(bgrp0)&Logic(bgrp1))\
-#                                  .setTriggerType(TT_rpcin)
-#        item_xe20_spare = LVL1MenuItem('L1_XE20_SPARE', ctpid=0xda, group='1', prescale=1).setLogic(thr_xe20.condition(1)&Logic(bgrp0)&Logic(bgrp1)).setTriggerType(TT_calo)
-
-        
-        for a in dir():
-            if a.startswith('item_'):
-                eval("tm.registerLvl1Item(%s.name, %s)" % (a, a))
-
-        tm.CTPInfo().random.rate1 = 0
-        tm.CTPInfo().random.rate2 = 0
-
-        #set defaults for deadtime that are reasonable (from recent menus)
-        tm.CTPInfo().deadtime.name = "Default"
-        tm.CTPInfo().deadtime.complex1_rate = 415
-        tm.CTPInfo().deadtime.complex1_level = 7
-        tm.CTPInfo().deadtime.complex2_rate = 415
-        tm.CTPInfo().deadtime.complex2_level = 7
-        tm.CTPInfo().deadtime.simple = 5
-            
-    registerItems = staticmethod(registerItems)
-
-    class ThrGetter:
-        def __init__(self, tm):
-            self.tm = tm
-        def obj(self, name):
-            thr = tm.thresholdOfName(name)
-            return thr
-        
-    def generateMenu(triggerPythonConfig, \
-                     lvl1_items, lvl1_thresholds):
-        # First update the mapping of thresholds
-        #... empty for now
-        #
-        #        print "Important printout..."
-
-
-        names = []
-        ids = []
-        ctpid0 = 0
-
-        # Populating list of used ctpids
-        for item in lvl1_items:
-            item2 = triggerPythonConfig.getLvl1Item(item)
-            if item2!=None:
-                if(item2.ctpid!=-1):
-                    ids.append(item2.ctpid)
-                    names.append(item2.name)
-                    ctpid0 += 1
-
-        # Setting the physics bit
-        for item in lvl1_items:
-            if not item.startswith('L1_CALREQ') and not item=='L1_MU0_LOW':
-                item2 = triggerPythonConfig.getLvl1Item(item)
-                if item2 == None:
-                    raise Exception("Function getLvl1Item failed for item: "+item)
-                else:
-                    log.debug( "Setting physics bit for "+item+". Changing from "+str(item2.trigger_type)+" to "+str(item2.trigger_type|TT_phys))
-                    item2.setTriggerType(item2.trigger_type|TT_phys)
-
-        # Debugging trigger types
-        for item in lvl1_items:
-            TT=''
-            x=triggerPythonConfig.getLvl1Item(item).trigger_type
-            for i in range(0,8):
-                if(x%2==1):
-                    TT='1'+TT
-                else:
-                    TT='0'+TT
-                x=x/2
-            log.debug("Trigger type for "+item+" is: "+TT)
-                
-        # Populating list of available ones
-        ctpids = []
-        for i in range(0, 255):
-            if str(i) not in ids:
-#                print "Unused CTPID: "+str(i)
-                ctpids.append(i)
-
-        i=0        
-        for item in lvl1_items:
-            # Add item
-            item2 = triggerPythonConfig.getLvl1Item(item)
-            if item2 == None:
-                sss = 'Item %s was not registered' % item
-                log.warning(sss)
-            if item2.ctpid==str(-1):
-                sss = 'Reassigning ctpid for '+item2.name+' from -1 to '+str(ctpids[i])
-                log.debug(sss)
-                item2.setCtpid(ctpids[i])
-                i+=1
-            triggerPythonConfig.addLvl1Item(item2)
-
-        for thr in lvl1_thresholds:
-            if triggerPythonConfig.thresholdOfName(thr)==None:
-                thr2 = triggerPythonConfig.getLvl1Threshold(thr)
-                if thr2==None:
-                    log.debug('Threshold %s not defined' % thr )
-                else:
-                    log.debug('Setting secondary threshold %s' % thr )
-                    triggerPythonConfig.addLVL1Threshold(thr2)
-
-        if TriggerFlags.Lvl1.RemapThresholdsAsListed():
-            # Set the correct mapping of thresholds according
-            # to the order it was given in Lvl1Flags.thresholds list.
-            thr_mapping = { # NIM and CALREQ types left out intentionally.
-                'MUON': 0,
-                'EM': 0, 
-                'TAU': 0, 
-                'JET': 0, 
-                'JF': 0, 
-                'JB': 0, 
-                'XE': 0, 
-                'TE': 0, 
-                'XS': 0, 
-                'JE': 0, 
-                'MBTS': 0,
-                'MBTSSI': 0,
-                'TRT': 0,
-                'ZDC': 0,
-                'BCM': 0,
-                'BCMCMB': 0,
-                'LUCID': 0,
-                'ZB': 0,
-                }
-            
-            for thr in lvl1_thresholds:
-                thr2 = triggerPythonConfig.thresholdOfName(thr)
-                if thr2==None:
-                    log.debug('Threshold %s not added' % thr )
-                else:
-                    if thr2.ttype=='NIM' or thr2.ttype=='CALREQ':
-                        log.debug('Skipping remapping of '+thr2.ttype+' threshold')
-                        continue
-                    log.debug('Setting mapping of threshold %s as %s' %
-                             (thr, int(thr_mapping[thr2.ttype])))
-                    thr2.mapping = thr_mapping[thr2.ttype]
-                    thr_mapping[thr2.ttype] += 1
-                    # Refreshing cabling
-                    # ZB threshold needs seed as mapping
-                    if thr2.ttype == 'ZB':
-                        (slot, connector, bitnum, range_begin, range_end) = triggerPythonConfig.cableInput(thr2.seed_ttype, thr2.mapping)
-                        thr2.range_begin = 30
-                        thr2.range_end = 30
-                        thr2.bitnum = 1
-                    else:
-                        (slot, connector, bitnum, range_begin, range_end) = triggerPythonConfig.cableInput(thr2.ttype, thr2.mapping)
-                        thr2.range_begin = range_begin
-                        thr2.range_end = range_end
-                    thr2.slot = slot
-                    thr2.connector = connector
-                    #thr2.cable = Lvl1Thresholds.cableName(thr2.ttype, thr2.mapping)
-                    if thr2.ttype=='EM' and thr2.mapping>=8: thr2.cable = 'CP2'
-    generateMenu = staticmethod(generateMenu)
-
-
-    def setThresholdTypesFromXML(triggerPythonConfig,l1menufilename):
-        """When called, sets the types of all trigger thresholds
-        as given in the l1menu (which is generated from xml)
-        
-        * l1menufilename is the L1.xml filename
-        """
-        # check if it needs to be reloaded
-        if not triggerPythonConfig.l1menuFromXML or triggerPythonConfig.l1menuFromXML.filename != l1menufilename:
-            from TriggerMenu.menu.XMLReader import L1MenuXMLReader
-            triggerPythonConfig.l1menuFromXML = L1MenuXMLReader(l1menufilename)
-        # only checking physics bit for now
-        #bit=7 # physics
-
-        for t in triggerPythonConfig.l1menuFromXML.getL1Items():
-            tt = t['trigger_type']
-            item = triggerPythonConfig.getLvl1Item(t['name'])
-            if not item:
-                log.warning("Item %s is defined in xml [%s], but not in Lvl1.py:registerItems()" % (t['name'],l1menufilename))
-                continue
-            # clear item trigger_type
-            item.setTriggerType(0)
-            # set for each bit the trigger_type
-            for bit in xrange(8):
-                setbit = 1<<bit
-                if len(tt)>bit and tt[-bit-1]=='1':
-                    item.setTriggerType(item.trigger_type|setbit)
-    setThresholdTypesFromXML = staticmethod(setThresholdTypesFromXML)
-
-
-
-
-    def setThresholdSetForType(triggerPythonConfig, thr_names, type):
-        j = 0
-        for thr_name in thr_names:
-            thr = triggerPythonConfig.getLvl1Threshold(thr_name)
-            if thr!=None:
-                j += 1
-                thr.mapping = j
-        
-    def updateItemPrescale(triggerPythonConfig, it_name, ps):
-        item = triggerPythonConfig.getLvl1Item(it_name)
-        if item != None:
-            item.prescale = ps
-        else:
-            log.warning('Cannot find item %s to set the prescale' % \
-                        (it_name) )
-    updateItemPrescale = staticmethod(updateItemPrescale)
-    
-    def updateItemPrescales(triggerPythonConfig, item_and_ps):
-        for (it_name, ps) in item_and_ps.iteritems():
-            Lvl1.updateItemPrescale(triggerPythonConfig, it_name, ps)
-    updateItemPrescales = staticmethod(updateItemPrescales)
-
-    def readPrescales(fname):
-        f = open(fname, 'r')
-        re_ctpid_name_prescale = re.compile('\s+(\d+)\s+(L1_[\w_]+)\s+(\d+)')
-        ret_map={}
-        for line in f.readlines():
-            if len(line)>0: line = line[0:-1]
-            if line[0]=='#': continue
-            mg = re_ctpid_name_prescale.match(line)
-            if mg:
-                (ctpid, name, ps) = mg.groups()
-                if name not in ret_map.keys():
-                    ret_map[name] = int(ps)
-                else:
-                    log.warning('Duplicate Lvl1 item "%s" found in prescale file: ' % \
-                                (name, fname))
-        f.close()
-        return ret_map
-    readPrescales = staticmethod(readPrescales)
-    
-            
-            
-#   Item name            | Prescale
-#----------------------------------------------------------
-L1Prescales_lumi_1E31 = {
-    }
-
-L1Prescales_lumi_1E32 = {
-    }
-
-
diff --git a/Trigger/TriggerCommon/TriggerMenu/python/menu/Lvl1Flags.py b/Trigger/TriggerCommon/TriggerMenu/python/menu/Lvl1Flags.py
deleted file mode 100755
index 966abe198bb..00000000000
--- a/Trigger/TriggerCommon/TriggerMenu/python/menu/Lvl1Flags.py
+++ /dev/null
@@ -1,5 +0,0 @@
-# Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
-
-
-
-from TriggerMenu.l1.Lvl1Flags import *
diff --git a/Trigger/TriggerCommon/TriggerMenu/python/menu/MC_pp_v5.py b/Trigger/TriggerCommon/TriggerMenu/python/menu/MC_pp_v5.py
index 78395d548d3..67691335971 100755
--- a/Trigger/TriggerCommon/TriggerMenu/python/menu/MC_pp_v5.py
+++ b/Trigger/TriggerCommon/TriggerMenu/python/menu/MC_pp_v5.py
@@ -23,552 +23,578 @@ def setupMenu():
     # ------------------------------------------------
     # INPUT FORMAT FOR CHAINS:
     # ------------------------------------------------
-    # ['chainName', chainCounter, 'L1itemforchain', [L1 items for chainParts], [stream], [groups], EBstep]
+    # ['chainName',  'L1itemforchain', [L1 items for chainParts], [stream], [groups], EBstep]
 
     TriggerFlags.TestSlice.signatures = TriggerFlags.TestSlice.signatures() + [
-        #['TestChain400',                640,    'L1_J100', [], [PhysicsStream], ['RATE:SingleJet', 'BW:Jets'], -1],
+        #['TestChain400',    'L1_J100', [], [PhysicsStream], ['RATE:SingleJet', 'BW:Jets'], -1],
         ]
 
 
 
     TriggerFlags.MuonSlice.signatures = TriggerFlags.MuonSlice.signatures() + [
-        ['mu0_perf',           4500, 'L1_MU4',           [], [PhysicsStream], ['RATE:SingleMuon', 'BW:Muon'], -1],
-        ['mu20_2mu0noL1_JpsimumuFS', 4729, 'L1_MU20', ['L1_MU20',''], [PhysicsStream], ['RATE:MultiMuon','BW:Muon'], -1,['serial',-1,['mu20','2mu0noL1_JpsimumuFS']]], 
-        ['mu18_2mu0noL1_JpsimumuFS', 4730, 'L1_MU15', ['L1_MU15',''], [PhysicsStream], ['RATE:MultiMuon','BW:Muon'], -1,['serial',-1,['mu18','2mu0noL1_JpsimumuFS']]],
+        ['mu0_perf',           'L1_MU4',           [], [PhysicsStream], ['RATE:SingleMuon', 'BW:Muon'], -1],
+        ['mu20_2mu0noL1_JpsimumuFS', 'L1_MU20', ['L1_MU20',''], [PhysicsStream], ['RATE:MultiMuon','BW:Muon'], -1,['serial',-1,['mu20','2mu0noL1_JpsimumuFS']]], 
+        ['mu18_2mu0noL1_JpsimumuFS', 'L1_MU15', ['L1_MU15',''], [PhysicsStream], ['RATE:MultiMuon','BW:Muon'], -1,['serial',-1,['mu18','2mu0noL1_JpsimumuFS']]],
 
+        ['mu20_2mu4_JpsimumuL2', 'L1_MU20', ['L1_MU20','L1_2MU4'], [PhysicsStream], ['RATE:MultiMuon','BW:Muon'], -1,['serial',-1,['2mu4_JpsimumuL2','mu20']]], 
+        ['mu18_2mu4_JpsimumuL2', 'L1_MU15', ['L1_MU15','L1_2MU4'], [PhysicsStream], ['RATE:MultiMuon','BW:Muon'], -1,['serial',-1,['2mu4_JpsimumuL2','mu18']]],
         
         # Primary (single muon chains)
-        ['mu26_imedium',           450, 'L1_MU20',           [], [PhysicsStream], ['RATE:SingleMuon', 'BW:Muon'], -1],
-        ['mu50',                   451, 'L1_MU20',           [], [PhysicsStream], ['RATE:SingleMuon', 'BW:Muon'], -1],
-        ['mu60_0eta105_msonly',    452, 'L1_MU20',           [], [PhysicsStream], ['RATE:SingleMuon', 'BW:Muon'], -1],
+        ['mu26_imedium',          'L1_MU20',           [], [PhysicsStream], ['RATE:SingleMuon', 'BW:Muon'], -1],
+        ['mu50',                  'L1_MU20',           [], [PhysicsStream], ['RATE:SingleMuon', 'BW:Muon'], -1],
+        ['mu60_0eta105_msonly',   'L1_MU20',           [], [PhysicsStream], ['RATE:SingleMuon', 'BW:Muon'], -1],
 
         # Primary at low lumi (single muon chains)
-        ['mu24_imedium',           453, 'L1_MU20',           [], [PhysicsStream], ['RATE:SingleMuon', 'BW:Muon'], -1],
-        ['mu24_iloose_L1MU15',     454, 'L1_MU15',           [], [PhysicsStream], ['RATE:SingleMuon', 'BW:Muon'], -1],
-        ['mu20_iloose_L1MU15',     455, 'L1_MU15',           [], [PhysicsStream], ['RATE:SingleMuon', 'BW:Muon'], -1],
+        ['mu24_imedium',           'L1_MU20',           [], [PhysicsStream], ['RATE:SingleMuon', 'BW:Muon'], -1],
+        ['mu24_iloose_L1MU15',     'L1_MU15',           [], [PhysicsStream], ['RATE:SingleMuon', 'BW:Muon'], -1],
+        ['mu20_iloose_L1MU15',     'L1_MU15',           [], [PhysicsStream], ['RATE:SingleMuon', 'BW:Muon'], -1],
 
         # Primary (multi muon chains)
-        ['2mu14',                  456, 'L1_2MU10',          [], [PhysicsStream], ['RATE:MultiMuon', 'BW:Muon'], -1],
-        ['3mu6',                   457, 'L1_3MU6',           [], [PhysicsStream], ['RATE:MultiMuon', 'BW:Muon'], -1],
-        ['3mu6_msonly',            458, 'L1_3MU6',           [], [PhysicsStream], ['RATE:MultiMuon', 'BW:Muon'], -1],
+        ['2mu14',                  'L1_2MU10',          [], [PhysicsStream], ['RATE:MultiMuon', 'BW:Muon'], -1],
+        ['3mu6',                   'L1_3MU6',           [], [PhysicsStream], ['RATE:MultiMuon', 'BW:Muon'], -1],
+        ['3mu6_msonly',            'L1_3MU6',           [], [PhysicsStream], ['RATE:MultiMuon', 'BW:Muon'], -1],
 
         # Primary at low lumi (multi muon chains)
-        ['2mu10',                  459, 'L1_2MU10',          [], [PhysicsStream], ['RATE:MultiMuon', 'BW:Muon'], -1],
+        ['2mu10',                  'L1_2MU10',          [], [PhysicsStream], ['RATE:MultiMuon', 'BW:Muon'], -1],
 
         # Primary (full scan chains)
-        ['mu24_mu8noL1',           460, 'L1_MU20', ['L1_MU20',''], [PhysicsStream], ['RATE:MultiMuon','BW:Muon'], -1,['serial',-1,['mu24','mu8noL1']]],
-        ['mu24_2mu4noL1',          461, 'L1_MU20', ['L1_MU20',''], [PhysicsStream], ['RATE:MultiMuon','BW:Muon'], -1,['serial',-1,['mu24','2mu4noL1']]],
+        ['mu24_mu8noL1',           'L1_MU20', ['L1_MU20',''], [PhysicsStream], ['RATE:MultiMuon','BW:Muon'], -1,['serial',-1,['mu24','mu8noL1']]],
+        ['mu24_2mu4noL1',          'L1_MU20', ['L1_MU20',''], [PhysicsStream], ['RATE:MultiMuon','BW:Muon'], -1,['serial',-1,['mu24','2mu4noL1']]],
 
         # Primary at low lumi (full scan chains)
-        ['mu22_mu8noL1',           462, 'L1_MU20', ['L1_MU20',''], [PhysicsStream], ['RATE:MultiMuon','BW:Muon'], -1,['serial',-1,['mu22','mu8noL1']]],
-        ['mu22_2mu4noL1',          463, 'L1_MU20', ['L1_MU20',''], [PhysicsStream], ['RATE:MultiMuon','BW:Muon'], -1,['serial',-1,['mu22','2mu4noL1']]],
-        ['mu20_mu8noL1',           464, 'L1_MU20', ['L1_MU20',''], [PhysicsStream], ['RATE:MultiMuon','BW:Muon'], -1,['serial',-1,['mu20','mu8noL1']]],
-        ['mu20_2mu4noL1',          465, 'L1_MU20', ['L1_MU20',''], [PhysicsStream], ['RATE:MultiMuon','BW:Muon'], -1,['serial',-1,['mu20','2mu4noL1']]],
-        ['mu18_mu8noL1',           466, 'L1_MU15', ['L1_MU15',''], [PhysicsStream], ['RATE:MultiMuon','BW:Muon'], -1,['serial',-1,['mu18','mu8noL1']]],
-        ['mu18_2mu4noL1',          467, 'L1_MU15', ['L1_MU15',''], [PhysicsStream], ['RATE:MultiMuon','BW:Muon'], -1,['serial',-1,['mu18','2mu4noL1']]],
+        ['mu22_mu8noL1',           'L1_MU20', ['L1_MU20',''], [PhysicsStream], ['RATE:MultiMuon','BW:Muon'], -1,['serial',-1,['mu22','mu8noL1']]],
+        ['mu22_2mu4noL1',          'L1_MU20', ['L1_MU20',''], [PhysicsStream], ['RATE:MultiMuon','BW:Muon'], -1,['serial',-1,['mu22','2mu4noL1']]],
+        ['mu20_mu8noL1',           'L1_MU20', ['L1_MU20',''], [PhysicsStream], ['RATE:MultiMuon','BW:Muon'], -1,['serial',-1,['mu20','mu8noL1']]],
+        ['mu20_2mu4noL1',          'L1_MU20', ['L1_MU20',''], [PhysicsStream], ['RATE:MultiMuon','BW:Muon'], -1,['serial',-1,['mu20','2mu4noL1']]],
+        ['mu18_mu8noL1',           'L1_MU15', ['L1_MU15',''], [PhysicsStream], ['RATE:MultiMuon','BW:Muon'], -1,['serial',-1,['mu18','mu8noL1']]],
+        ['mu18_2mu4noL1',          'L1_MU15', ['L1_MU15',''], [PhysicsStream], ['RATE:MultiMuon','BW:Muon'], -1,['serial',-1,['mu18','2mu4noL1']]],
 
         # Supporting chains
-        ['mu26',                   468, 'L1_MU20',           [], [PhysicsStream], ['RATE:SingleMuon', 'BW:Muon'], -1],
-        ['mu24_L1MU15',            469, 'L1_MU15',           [], [PhysicsStream], ['RATE:SingleMuon', 'BW:Muon'], -1],
-        ['mu22',                   470, 'L1_MU20',           [], [PhysicsStream], ['RATE:SingleMuon', 'BW:Muon'], -1],
-        ['mu20',                   471, 'L1_MU20',           [], [PhysicsStream], ['RATE:SingleMuon', 'BW:Muon'], -1],
-        ['mu20_L1MU15',            472, 'L1_MU15',           [], [PhysicsStream], ['RATE:SingleMuon', 'BW:Muon'], -1],
-        ['mu20_r1extr',            479, 'L1_MU20',           [], [PhysicsStream], ['RATE:SingleMuon', 'BW:Muon'], -1],
-        ['mu10_r1extr',            480, 'L1_MU10',           [], [PhysicsStream], ['RATE:SingleMuon', 'BW:Muon'], -1],
-        ['mu4_r1extr',             481, 'L1_MU4',            [], [PhysicsStream], ['RATE:SingleMuon', 'BW:Muon'], -1],
+        ['mu26',                   'L1_MU20',           [], [PhysicsStream], ['RATE:SingleMuon', 'BW:Muon'], -1],
+        ['mu24_L1MU15',            'L1_MU15',           [], [PhysicsStream], ['RATE:SingleMuon', 'BW:Muon'], -1],
+        ['mu22',                   'L1_MU20',           [], [PhysicsStream], ['RATE:SingleMuon', 'BW:Muon'], -1],
+        ['mu20',                   'L1_MU20',           [], [PhysicsStream], ['RATE:SingleMuon', 'BW:Muon'], -1],
+        ['mu20_L1MU15',            'L1_MU15',           [], [PhysicsStream], ['RATE:SingleMuon', 'BW:Muon'], -1],
+        ['mu20_r1extr',            'L1_MU20',           [], [PhysicsStream], ['RATE:SingleMuon', 'BW:Muon'], -1],
+        ['mu10_r1extr',            'L1_MU10',           [], [PhysicsStream], ['RATE:SingleMuon', 'BW:Muon'], -1],
+        ['mu4_r1extr',             'L1_MU4',            [], [PhysicsStream], ['RATE:SingleMuon', 'BW:Muon'], -1],
 
         # Rerun chains
-        ['mu24',                   482, 'L1_MU20',           [], [PhysicsStream], ['RATE:SingleMuon', 'BW:Muon'], -1],
-        ['mu24_idperf',            483, 'L1_MU20',           [], [PhysicsStream], ['RATE:IDMonitoring', 'BW:Muon'], -1],
-        ['mu20_idperf',            484, 'L1_MU20',           [], [PhysicsStream], ['RATE:IDMonitoring', 'BW:Muon'], -1],
-        ['mu20_msonly',            485, 'L1_MU20',           [], [PhysicsStream], ['RATE:SingleMuon', 'BW:Muon'], -1],
-        ['mu18',                   486, 'L1_MU15',           [], [PhysicsStream], ['RATE:SingleMuon', 'BW:Muon'], -1],
-        ['mu14',                   487, 'L1_MU10',           [], [PhysicsStream], ['RATE:SingleMuon', 'BW:Muon'], -1],
-        ['mu10',                   488, 'L1_MU10',           [], [PhysicsStream], ['RATE:SingleMuon', 'BW:Muon'], -1],
-        ['mu10_idperf',            489, 'L1_MU10',           [], [PhysicsStream], ['RATE:IDMonitoring', 'BW:Muon'], -1],
-        ['mu10_msonly',            490, 'L1_MU10',           [], [PhysicsStream], ['RATE:SingleMuon', 'BW:Muon'], -1],
-        ['mu6',                    491, 'L1_MU6',            [], [PhysicsStream], ['RATE:SingleMuon', 'BW:Muon'], -1],
-        ['mu6_idperf',             492, 'L1_MU6',            [], [PhysicsStream], ['RATE:IDMonitoring', 'BW:Muon'], -1],
-        ['mu6_msonly',             493, 'L1_MU6',            [], [PhysicsStream], ['RATE:SingleMuon', 'BW:Muon'], -1],
-        ['mu4',                    494, 'L1_MU4',            [], [PhysicsStream], ['RATE:SingleMuon', 'BW:Muon'], -1],
-        ['mu4_idperf',             495, 'L1_MU4',            [], [PhysicsStream], ['RATE:IDMonitoring', 'BW:Muon'], -1],
-        ['mu4_msonly',             496, 'L1_MU4',            [], [PhysicsStream], ['RATE:SingleMuon', 'BW:Muon'], -1],
+        ['mu24',                   'L1_MU20',           [], [PhysicsStream], ['RATE:SingleMuon', 'BW:Muon'], -1],
+        ['mu24_idperf',            'L1_MU20',           [], [PhysicsStream], ['RATE:IDMonitoring', 'BW:Muon'], -1],
+        ['mu20_idperf',            'L1_MU20',           [], [PhysicsStream], ['RATE:IDMonitoring', 'BW:Muon'], -1],
+        ['mu20_msonly',            'L1_MU20',           [], [PhysicsStream], ['RATE:SingleMuon', 'BW:Muon'], -1],
+        ['mu18',                   'L1_MU15',           [], [PhysicsStream], ['RATE:SingleMuon', 'BW:Muon'], -1],
+        ['mu14',                   'L1_MU10',           [], [PhysicsStream], ['RATE:SingleMuon', 'BW:Muon'], -1],
+        ['mu10',                   'L1_MU10',           [], [PhysicsStream], ['RATE:SingleMuon', 'BW:Muon'], -1],
+        ['mu10_idperf',            'L1_MU10',           [], [PhysicsStream], ['RATE:IDMonitoring', 'BW:Muon'], -1],
+        ['mu10_msonly',            'L1_MU10',           [], [PhysicsStream], ['RATE:SingleMuon', 'BW:Muon'], -1],
+        ['mu6',                    'L1_MU6',            [], [PhysicsStream], ['RATE:SingleMuon', 'BW:Muon'], -1],
+        ['mu6_idperf',             'L1_MU6',            [], [PhysicsStream], ['RATE:IDMonitoring', 'BW:Muon'], -1],
+        ['mu6_msonly',             'L1_MU6',            [], [PhysicsStream], ['RATE:SingleMuon', 'BW:Muon'], -1],
+        ['mu4',                    'L1_MU4',            [], [PhysicsStream], ['RATE:SingleMuon', 'BW:Muon'], -1],
+        ['mu4_idperf',             'L1_MU4',            [], [PhysicsStream], ['RATE:IDMonitoring', 'BW:Muon'], -1],
+        ['mu4_msonly',             'L1_MU4',            [], [PhysicsStream], ['RATE:SingleMuon', 'BW:Muon'], -1],
 
         # Additional chains
-        ['mu24_L2Star_idperf',     497, 'L1_MU20',  [], [PhysicsStream], ['RATE:IDMonitoring', 'BW:IDMonitoring'], -1],
-        ['mu6_L2Star_idperf',      498, 'L1_MU6',   [], [PhysicsStream], ['RATE:IDMonitoring', 'BW:IDMonitoring'], -1],
-        ['mu0noL1_fsperf',         499, '',         [], [PhysicsStream], ['RATE:SingleMuon', 'BW:Muon'], 1],
-        ['mu14_iloose_mu14',       500, 'L1_2MU10', [], [PhysicsStream], ['RATE:MultiMuon', 'BW:Muon'], -1],
-        ['2mu6',                   501, 'L1_2MU6',  [], [PhysicsStream], ['RATE:MultiMuon', 'BW:Muon'], -1],
-        ['2mu4',                   502, 'L1_2MU4',  [], [PhysicsStream], ['RATE:MultiMuon', 'BW:Muon'], -1],
-        ['mu20_imedium_mu8noL1',   503, 'L1_MU20',  ['L1_MU20',''], [PhysicsStream], ['RATE:MultiMuon','BW:Muon'], -1,['serial',-1,['mu20_imedium','mu8noL1']]],
-        ['mu20_iloose_mu8noL1',    504, 'L1_MU20',  ['L1_MU20',''], [PhysicsStream], ['RATE:MultiMuon','BW:Muon'], -1,['serial',-1,['mu20_iloose','mu8noL1']]],
-        ['mu20_iloose_2mu4noL1',   505, 'L1_MU20',  ['L1_MU20',''], [PhysicsStream], ['RATE:MultiMuon','BW:Muon'], -1,['serial',-1,['mu20_iloose','2mu4noL1']]],
+        ['mu24_L2Star_idperf',      'L1_MU20',  [], [PhysicsStream], ['RATE:IDMonitoring', 'BW:IDMonitoring'], -1],
+        ['mu6_L2Star_idperf',       'L1_MU6',   [], [PhysicsStream], ['RATE:IDMonitoring', 'BW:IDMonitoring'], -1],
+        ['mu0noL1_fsperf',          '',         [], [PhysicsStream], ['RATE:SingleMuon', 'BW:Muon'], 1],
+        ['mu14_iloose_mu14',        'L1_2MU10', [], [PhysicsStream], ['RATE:MultiMuon', 'BW:Muon'], -1],
+        ['2mu6',                    'L1_2MU6',  [], [PhysicsStream], ['RATE:MultiMuon', 'BW:Muon'], -1],
+        ['2mu4',                    'L1_2MU4',  [], [PhysicsStream], ['RATE:MultiMuon', 'BW:Muon'], -1],
+        ['mu20_imedium_mu8noL1',    'L1_MU20',  ['L1_MU20',''], [PhysicsStream], ['RATE:MultiMuon','BW:Muon'], -1,['serial',-1,['mu20_imedium','mu8noL1']]],
+        ['mu20_iloose_mu8noL1',     'L1_MU20',  ['L1_MU20',''], [PhysicsStream], ['RATE:MultiMuon','BW:Muon'], -1,['serial',-1,['mu20_iloose','mu8noL1']]],
+        ['mu20_iloose_2mu4noL1',    'L1_MU20',  ['L1_MU20',''], [PhysicsStream], ['RATE:MultiMuon','BW:Muon'], -1,['serial',-1,['mu20_iloose','2mu4noL1']]],
 
         # T&P chains
-        #['mu24_imedium_mu20noL1_msonly', 729, 'L1_MU20', [], [PhysicsStream], ['RATE:MultiMuon','BW:Muon'], 1],        
-        #['mu24_imedium_mu20noL1_msonly', 730, 'L1_MU20', [], [PhysicsStream], ['RATE:MultiMuon','BW:Muon'], 1],       
+        #['mu24_imedium_mu20noL1_msonly',  'L1_MU20', [], [PhysicsStream], ['RATE:MultiMuon','BW:Muon'], 1],        
+        #['mu24_imedium_mu20noL1_msonly',  'L1_MU20', [], [PhysicsStream], ['RATE:MultiMuon','BW:Muon'], 1],       
 
         # Primary (narrow scan chains)
-        ['mu11_2mu4noL1_nscan03_L1MU11_2MU6',   7146, 'L1_MU11_2MU6', ['L1_MU11_2MU6',''], [PhysicsStream], ['RATE:MultiMuon','BW:Muon'], -1,['serial',-1,['mu11','2mu4noL1_nscan03']]],        
-        ['mu11_2mu4noL1_nscan03_L1MU10_2MU6',   7147, 'L1_MU10_2MU6', ['L1_MU10_2MU6',''], [PhysicsStream], ['RATE:MultiMuon','BW:Muon'], -1,['serial',-1,['mu11','2mu4noL1_nscan03']]],        
-        ['mu20_msonly_mu6noL1_msonly_nscan05',  7148, 'L1_MU20',     ['L1_MU20',''],
-[PhysicsStream], ['RATE:MultiMuon','BW:Muon'], -1,['serial',-1,['mu20_msonly','mu6noL1_msonly_nscan05']]],
-
+        ['mu11_2mu4noL1_nscan03_L1MU11_2MU6', 'L1_MU11_2MU6', ['L1_MU11_2MU6',''], [PhysicsStream], ['RATE:MultiMuon','BW:Muon'], -1,['serial',-1,['mu11','2mu4noL1_nscan03']]],        
+        ['mu11_2mu4noL1_nscan03_L1MU10_2MU6', 'L1_MU10_2MU6', ['L1_MU10_2MU6',''], [PhysicsStream], ['RATE:MultiMuon','BW:Muon'], -1,['serial',-1,['mu11','2mu4noL1_nscan03']]],        
+        ['mu20_msonly_mu6noL1_msonly_nscan05','L1_MU20',     ['L1_MU20',''], [PhysicsStream], ['RATE:MultiMuon','BW:Muon'], -1,['serial',-1,['mu20_msonly','mu6noL1_msonly_nscan05']]],
         ]
 
     TriggerFlags.JetSlice.signatures = TriggerFlags.JetSlice.signatures() + [
-        ['j460_a10_sub_L1J100',     101,    'L1_J100', [], [PhysicsStream], ['RATE:SingleJet', 'BW:Jets'], -1],
-
-        ['j400_a4_sub', 328, 'L1_J100', [], [PhysicsStream], ['RATE:SingleJet', 'BW:Jets'], -1],
-        ['j400_a4_jes', 329, 'L1_J100', [], [PhysicsStream], ['RATE:SingleJet', 'BW:Jets'], -1],
-        
-        ['3j175',               110,    'L1_J100', [], [PhysicsStream], ['RATE:MultiJet',  'BW:Jets'], -1],
-        ['ht1000_L1J100',        99,    'L1_J100', [], [PhysicsStream], ['RATE:MultiJet', 'BW:Jets'], -1],
-        ['j30_muvtx',             1,    'L1_2MU10',[], [PhysicsStream], ['RATE:MuonJet','BW:Muon'], -1],
+        ['j460_a10_sub_L1J100', 'L1_J100', [], [PhysicsStream], ['RATE:SingleJet', 'BW:Jets'], -1],
+        ['j400_a4_sub', 'L1_J100', [], [PhysicsStream], ['RATE:SingleJet', 'BW:Jets'], -1],
+        ['j400_a4_jes', 'L1_J100', [], [PhysicsStream], ['RATE:SingleJet', 'BW:Jets'], -1],        
+        ['3j175',            'L1_J100', [], [PhysicsStream], ['RATE:MultiJet',  'BW:Jets'], -1],
+        ['ht1000_L1J100',    'L1_J100', [], [PhysicsStream], ['RATE:MultiJet', 'BW:Jets'], -1],
+        ['j30_muvtx',        'L1_2MU10',[], [PhysicsStream], ['RATE:MuonJet','BW:Muon'], -1],
 
         #TEST chains for HLT VBF alg (ATR-9609)
-        ['2j55_deta2',                 1980,    'L1_J15',  [], [PhysicsStream], ['RATE:MultiJet', 'BW:Jets'], -1],
-        ['2j55_invm400',                 1981,    'L1_J15',  [], [PhysicsStream], ['RATE:MultiJet', 'BW:Jets'], -1],
-        ['2j55_deta2_invm400',                 1982,    'L1_J15',  [], [PhysicsStream], ['RATE:MultiJet', 'BW:Jets'], -1],
+        ['2j55_deta2',        'L1_J15',  [], [PhysicsStream], ['RATE:MultiJet', 'BW:Jets'], -1],
+        ['2j55_invm400',      'L1_J15',  [], [PhysicsStream], ['RATE:MultiJet', 'BW:Jets'], -1],
+        ['2j55_deta2_invm400',     'L1_J15',  [], [PhysicsStream], ['RATE:MultiJet', 'BW:Jets'], -1],
 
         # LLP trigger (ATR-9673)
-        #['j30_llp_L1TAU30',                 7100,    'L1_TAU30',  [], [PhysicsStream], ['RATE:SingleJet', 'BW:Jets'], -1],
-        #['j30_llp_L1210RATIO-0MATCH-TAU30si2-EMall',                 7101,    'L1_210RATIO-0MATCH-TAU30si2-EMall',  [], [PhysicsStream], ['RATE:SingleJet', 'BW:Jets'], -1],
-        #['j30_llp_L1NOT-0MATCH-TAU30si2-EMall',                 7102,    'L1_NOT-0MATCH-TAU30si2-EMall',  [], [PhysicsStream], ['RATE:SingleJet', 'BW:Jets'], -1],
+        ['j30_llp_L1TAU30',                'L1_TAU30',  [], [PhysicsStream], ['RATE:SingleJet', 'BW:Jets'], -1],
+        ['j30_llp_L1210RATIO-0MATCH-TAU30si2-EMall',                 'L1_210RATIO-0MATCH-TAU30si2-EMall',  [], [PhysicsStream], ['RATE:SingleJet', 'BW:Jets'], -1],
+        ['j30_llp_L1NOT-0MATCH-TAU30si2-EMall',              'L1_NOT-0MATCH-TAU30si2-EMall',  [], [PhysicsStream], ['RATE:SingleJet', 'BW:Jets'], -1],
 
         #Partial scan
-        ['j200_PS', 114, 'L1_J100', [], [PhysicsStream], ['RATE:SingleJet', 'BW:Jets'], -1],         
-        ['3j175_PS', 115, 'L1_J100', [], [PhysicsStream], ['RATE:MultiJet', 'BW:Jets'], -1],
+        ['j200_jes_PS', 'L1_J100', [], [PhysicsStream], ['RATE:SingleJet', 'BW:Jets'], -1],         
+        ['3j175_jes_PS','L1_J100', [], [PhysicsStream], ['RATE:MultiJet', 'BW:Jets'], -1],
 
 
         # new chains
-        ['j55',                 980,    'L1_J15',  [], [PhysicsStream], ['RATE:SingleJet', 'BW:Jets'], -1],
-        ['j60',                 103,    'L1_J15',  [], [PhysicsStream], ['RATE:SingleJet', 'BW:Jets'], -1],
-        ['j85',                 971,    'L1_J20',  [], [PhysicsStream], ['RATE:SingleJet', 'BW:Jets'], -1],
-        ['j85_jes',             972,    'L1_J20',  [], [PhysicsStream], ['RATE:SingleJet', 'BW:Jets'], -1],
-        ['j85_lcw',             973,    'L1_J20',  [], [PhysicsStream], ['RATE:SingleJet', 'BW:Jets'], -1],
-        ['j85_lcw_jes',         974,    'L1_J20',  [], [PhysicsStream], ['RATE:SingleJet', 'BW:Jets'], -1],
-        ['j100',                975,    'L1_J25',  [], [PhysicsStream], ['RATE:SingleJet', 'BW:Jets'], -1],
-        ['j110',                105,    'L1_J30',  [], [PhysicsStream], ['RATE:SingleJet', 'BW:Jets'], -1],
-        ['j150',                106,    'L1_J40',  [], [PhysicsStream], ['RATE:SingleJet', 'BW:Jets'], -1],
-        ['j175',                976,    'L1_J50',  [], [PhysicsStream], ['RATE:SingleJet', 'BW:Jets'], -1],
-        ['j175_jes',            977,    'L1_J50',  [], [PhysicsStream], ['RATE:SingleJet', 'BW:Jets'], -1],
-        ['j175_lcw',            978,    'L1_J50',  [], [PhysicsStream], ['RATE:SingleJet', 'BW:Jets'], -1],
-        ['j175_lcw_jes',        979,    'L1_J50',  [], [PhysicsStream], ['RATE:SingleJet', 'BW:Jets'], -1],
-        ['j200',                107,    'L1_J50', [], [PhysicsStream], ['RATE:SingleJet', 'BW:Jets'], -1],
-        ['j260',                108,    'L1_J75', [], [PhysicsStream], ['RATE:SingleJet', 'BW:Jets'], -1],
-        ['j300',                981,    'L1_J85', [], [PhysicsStream], ['RATE:SingleJet', 'BW:Jets'], -1],
-        ['j320',                982,    'L1_J85', [], [PhysicsStream], ['RATE:SingleJet', 'BW:Jets'], -1],
-        ['j360',                983,    'L1_J100', [], [PhysicsStream], ['RATE:SingleJet', 'BW:Jets'], -1],
-        ['j380',                984,    'L1_J100', [], [PhysicsStream], ['RATE:SingleJet', 'BW:Jets'], -1],
-        ['j380_jes',            985,    'L1_J100', [], [PhysicsStream], ['RATE:SingleJet', 'BW:Jets'], -1],
-        ['j380_lcw',            986,    'L1_J100', [], [PhysicsStream], ['RATE:SingleJet', 'BW:Jets'], -1],
-        ['j380_lcw_jes',        987,    'L1_J100', [], [PhysicsStream], ['RATE:SingleJet', 'BW:Jets'], -1],
-        ['j400',                100,    'L1_J100', [], [PhysicsStream], ['RATE:SingleJet', 'BW:Jets'], -1],
-        ['j400_sub',            988,    'L1_J100', [], [PhysicsStream], ['RATE:SingleJet', 'BW:Jets'], -1],
-        ['j400_jes',            989,    'L1_J100', [], [PhysicsStream], ['RATE:SingleJet', 'BW:Jets'], -1],
-        ['j400_lcw',            990,    'L1_J100', [], [PhysicsStream], ['RATE:SingleJet', 'BW:Jets'], -1],
-        ['j400_lcw_jes',        991,    'L1_J100', [], [PhysicsStream], ['RATE:SingleJet', 'BW:Jets'], -1],
-        ['j420',                992,    'L1_J100', [], [PhysicsStream], ['RATE:SingleJet', 'BW:Jets'], -1],
-        ['j420_jes',            993,    'L1_J100', [], [PhysicsStream], ['RATE:SingleJet', 'BW:Jets'], -1],
-        ['j420_lcw',            994,    'L1_J100', [], [PhysicsStream], ['RATE:SingleJet', 'BW:Jets'], -1],
-        ['j420_lcw_jes',        995,    'L1_J100', [], [PhysicsStream], ['RATE:SingleJet', 'BW:Jets'], -1],
-        ['j440',                996,    'L1_J120', [], [PhysicsStream], ['RATE:SingleJet', 'BW:Jets'], -1],
-        ['j460',                997,    'L1_J120', [], [PhysicsStream], ['RATE:SingleJet', 'BW:Jets'], -1],
+        ['j55',                    'L1_J15',  [], [PhysicsStream], ['RATE:SingleJet', 'BW:Jets'], -1],
+        ['j60',                    'L1_J15',  [], [PhysicsStream], ['RATE:SingleJet', 'BW:Jets'], -1],
+        ['j85',                    'L1_J20',  [], [PhysicsStream], ['RATE:SingleJet', 'BW:Jets'], -1],
+        ['j85_jes',                'L1_J20',  [], [PhysicsStream], ['RATE:SingleJet', 'BW:Jets'], -1],
+        ['j85_lcw',                'L1_J20',  [], [PhysicsStream], ['RATE:SingleJet', 'BW:Jets'], -1],
+        ['j85_lcw_jes',            'L1_J20',  [], [PhysicsStream], ['RATE:SingleJet', 'BW:Jets'], -1],
+        ['j100',                   'L1_J25',  [], [PhysicsStream], ['RATE:SingleJet', 'BW:Jets'], -1],
+        ['j110',                   'L1_J30',  [], [PhysicsStream], ['RATE:SingleJet', 'BW:Jets'], -1],
+        ['j150',                   'L1_J40',  [], [PhysicsStream], ['RATE:SingleJet', 'BW:Jets'], -1],
+        ['j175',                   'L1_J50',  [], [PhysicsStream], ['RATE:SingleJet', 'BW:Jets'], -1],
+        ['j175_jes',               'L1_J50',  [], [PhysicsStream], ['RATE:SingleJet', 'BW:Jets'], -1],
+        ['j175_lcw',               'L1_J50',  [], [PhysicsStream], ['RATE:SingleJet', 'BW:Jets'], -1],
+        ['j175_lcw_jes',           'L1_J50',  [], [PhysicsStream], ['RATE:SingleJet', 'BW:Jets'], -1],
+        ['j200',                   'L1_J50', [], [PhysicsStream], ['RATE:SingleJet', 'BW:Jets'], -1],
+        ['j260',                   'L1_J75', [], [PhysicsStream], ['RATE:SingleJet', 'BW:Jets'], -1],
+        ['j300',                   'L1_J85', [], [PhysicsStream], ['RATE:SingleJet', 'BW:Jets'], -1],
+        ['j320',                   'L1_J85', [], [PhysicsStream], ['RATE:SingleJet', 'BW:Jets'], -1],
+        ['j360',                   'L1_J100', [], [PhysicsStream], ['RATE:SingleJet', 'BW:Jets'], -1],
+        ['j380',                   'L1_J100', [], [PhysicsStream], ['RATE:SingleJet', 'BW:Jets'], -1],
+        ['j380_jes',               'L1_J100', [], [PhysicsStream], ['RATE:SingleJet', 'BW:Jets'], -1],
+        ['j380_lcw',               'L1_J100', [], [PhysicsStream], ['RATE:SingleJet', 'BW:Jets'], -1],
+        ['j380_lcw_jes',           'L1_J100', [], [PhysicsStream], ['RATE:SingleJet', 'BW:Jets'], -1],
+        ['j400',                   'L1_J100', [], [PhysicsStream], ['RATE:SingleJet', 'BW:Jets'], -1],
+        ['j400_sub',               'L1_J100', [], [PhysicsStream], ['RATE:SingleJet', 'BW:Jets'], -1],
+        ['j400_jes',               'L1_J100', [], [PhysicsStream], ['RATE:SingleJet', 'BW:Jets'], -1],
+        ['j400_lcw',               'L1_J100', [], [PhysicsStream], ['RATE:SingleJet', 'BW:Jets'], -1],
+        ['j400_lcw_jes',           'L1_J100', [], [PhysicsStream], ['RATE:SingleJet', 'BW:Jets'], -1],
+        ['j420',                   'L1_J100', [], [PhysicsStream], ['RATE:SingleJet', 'BW:Jets'], -1],
+        ['j420_jes',               'L1_J100', [], [PhysicsStream], ['RATE:SingleJet', 'BW:Jets'], -1],
+        ['j420_lcw',               'L1_J100', [], [PhysicsStream], ['RATE:SingleJet', 'BW:Jets'], -1],
+        ['j420_lcw_jes',           'L1_J100', [], [PhysicsStream], ['RATE:SingleJet', 'BW:Jets'], -1],
+        ['j440',                   'L1_J120', [], [PhysicsStream], ['RATE:SingleJet', 'BW:Jets'], -1],
+        ['j460',               
+    'L1_J120', [], [PhysicsStream], ['RATE:SingleJet', 'BW:Jets'], -1],
 
         #multi-jet
-        ['4j45',                998,    'L1_3J15', [], [PhysicsStream], ['RATE:MultiJet',  'BW:Jets'], -1],
-        ['4j85',                999,    'L1_3J40', [], [PhysicsStream], ['RATE:MultiJet',  'BW:Jets'], -1],
-        ['4j85_jes',            350,    'L1_3J40', [], [PhysicsStream], ['RATE:MultiJet',  'BW:Jets'], -1],
-        ['4j85_lcw',            351,    'L1_3J40', [], [PhysicsStream], ['RATE:MultiJet',  'BW:Jets'], -1],
-        ['4j85_lcw_jes',        352,    'L1_3J40', [], [PhysicsStream], ['RATE:MultiJet',  'BW:Jets'], -1],
-        ['4j100',               111,    'L1_3J50', [], [PhysicsStream], ['RATE:MultiJet',  'BW:Jets'], -1],
-        ['5j45',                353,    'L1_4J15', [], [PhysicsStream], ['RATE:MultiJet',  'BW:Jets'], -1],
-        ['5j55',                354,    'L1_4J15', [], [PhysicsStream], ['RATE:MultiJet',  'BW:Jets'], -1],
-        ['5j60',                356,    'L1_4J20', [], [PhysicsStream], ['RATE:MultiJet',  'BW:Jets'], -1],
-        ['5j70',                357,    'L1_4J20', [], [PhysicsStream], ['RATE:MultiJet',  'BW:Jets'], -1],
-        ['5j85',                112,    'L1_4J20', [], [PhysicsStream], ['RATE:MultiJet',  'BW:Jets'], -1],
-        ['5j85_jes',            358,    'L1_4J20', [], [PhysicsStream], ['RATE:MultiJet',  'BW:Jets'], -1],
-        ['5j85_lcw',            359,    'L1_4J20', [], [PhysicsStream], ['RATE:MultiJet',  'BW:Jets'], -1],
-        ['5j85_lcw_jes',        360,    'L1_4J20', [], [PhysicsStream], ['RATE:MultiJet',  'BW:Jets'], -1],
-
-        ['6j45_0eta240',              361,    'L1_4J15', [], [PhysicsStream], ['RATE:MultiJet',  'BW:Jets'], -1],
-        ['6j45_0eta240_L14J20',       362,    'L1_4J20', [], [PhysicsStream], ['RATE:MultiJet',  'BW:Jets'], -1],
-        ['6j45_0eta240_L15J150ETA24', 363,    'L1_5J15.0ETA24', [], [PhysicsStream], ['RATE:MultiJet',  'BW:Jets'], -1],
-
-        ['6j50_0eta240_L14J20',       364,    'L1_4J20', [], [PhysicsStream], ['RATE:MultiJet',  'BW:Jets'], -1],
-        ['6j50_0eta240_L15J150ETA24', 365,    'L1_5J15.0ETA24', [], [PhysicsStream], ['RATE:MultiJet',  'BW:Jets'], -1],
-
-        ['6j55_0eta240_L14J20',       366,    'L1_4J20', [], [PhysicsStream], ['RATE:MultiJet',  'BW:Jets'], -1],
-        ['6j55_0eta240_L15J150ETA24', 367,    'L1_5J15.0ETA24', [], [PhysicsStream], ['RATE:MultiJet',  'BW:Jets'], -1],
-
-        ['7j45',                      368,    'L1_6J15', [], [PhysicsStream], ['RATE:MultiJet',  'BW:Jets'], -1],
-        ['7j45_L14J20',               369,    'L1_4J20', [], [PhysicsStream], ['RATE:MultiJet',  'BW:Jets'], -1],
-        ['7j45_0eta240_L14J20',       370,    'L1_4J20', [], [PhysicsStream], ['RATE:MultiJet',  'BW:Jets'], -1],
-        ['7j45_0eta240_L15J150ETA24', 371,    'L1_5J15.0ETA24', [], [PhysicsStream], ['RATE:MultiJet',  'BW:Jets'], -1],
+        ['4j45',                    'L1_3J15', [], [PhysicsStream], ['RATE:MultiJet',  'BW:Jets'], -1],
+        ['4j85',                    'L1_3J40', [], [PhysicsStream], ['RATE:MultiJet',  'BW:Jets'], -1],
+        ['4j85_jes',                'L1_3J40', [], [PhysicsStream], ['RATE:MultiJet',  'BW:Jets'], -1],
+        ['4j85_lcw',                'L1_3J40', [], [PhysicsStream], ['RATE:MultiJet',  'BW:Jets'], -1],
+        ['4j85_lcw_jes',            'L1_3J40', [], [PhysicsStream], ['RATE:MultiJet',  'BW:Jets'], -1],
+        ['4j100',                   'L1_3J50', [], [PhysicsStream], ['RATE:MultiJet',  'BW:Jets'], -1],
+        ['5j45',                    'L1_4J15', [], [PhysicsStream], ['RATE:MultiJet',  'BW:Jets'], -1],
+        ['5j55',                    'L1_4J15', [], [PhysicsStream], ['RATE:MultiJet',  'BW:Jets'], -1],
+        ['5j60',                    'L1_4J20', [], [PhysicsStream], ['RATE:MultiJet',  'BW:Jets'], -1],
+        ['5j70',                    'L1_4J20', [], [PhysicsStream], ['RATE:MultiJet',  'BW:Jets'], -1],
+        ['5j85',                    'L1_4J20', [], [PhysicsStream], ['RATE:MultiJet',  'BW:Jets'], -1],
+        ['5j85_jes',                'L1_4J20', [], [PhysicsStream], ['RATE:MultiJet',  'BW:Jets'], -1],
+        ['5j85_lcw',                'L1_4J20', [], [PhysicsStream], ['RATE:MultiJet',  'BW:Jets'], -1],
+        ['5j85_lcw_jes',            'L1_4J20', [], [PhysicsStream], ['RATE:MultiJet',  'BW:Jets'], -1],
+
+        ['6j45_0eta240',                  'L1_4J15', [], [PhysicsStream], ['RATE:MultiJet',  'BW:Jets'], -1],
+        ['6j45_0eta240_L14J20',           'L1_4J20', [], [PhysicsStream], ['RATE:MultiJet',  'BW:Jets'], -1],
+        ['6j45_0eta240_L15J150ETA24',     'L1_5J15.0ETA24', [], [PhysicsStream], ['RATE:MultiJet',  'BW:Jets'], -1],
+
+        ['6j50_0eta240_L14J20',           'L1_4J20', [], [PhysicsStream], ['RATE:MultiJet',  'BW:Jets'], -1],
+        ['6j50_0eta240_L15J150ETA24',     'L1_5J15.0ETA24', [], [PhysicsStream], ['RATE:MultiJet',  'BW:Jets'], -1],
+
+        ['6j55_0eta240_L14J20',           'L1_4J20', [], [PhysicsStream], ['RATE:MultiJet',  'BW:Jets'], -1],
+        ['6j55_0eta240_L15J150ETA24',     'L1_5J15.0ETA24', [], [PhysicsStream], ['RATE:MultiJet',  'BW:Jets'], -1],
+
+        ['7j45',                          'L1_6J15', [], [PhysicsStream], ['RATE:MultiJet',  'BW:Jets'], -1],
+        ['7j45_L14J20',                   'L1_4J20', [], [PhysicsStream], ['RATE:MultiJet',  'BW:Jets'], -1],
+        ['7j45_0eta240_L14J20',           'L1_4J20', [], [PhysicsStream], ['RATE:MultiJet',  'BW:Jets'], -1],
+        ['7j45_0eta240_L15J150ETA24',     'L1_5J15.0ETA24', [], [PhysicsStream], ['RATE:MultiJet',  'BW:Jets'], -1],
 
         #Forward jets
-        ['j60_240eta490',       372,    'L1_J15.23ETA49', [], [PhysicsStream], ['RATE:SingleJet',  'BW:Jets'], -1],
-        ['j60_280eta320',       373,    'L1_J15.28ETA32', [], [PhysicsStream], ['RATE:SingleJet',  'BW:Jets'], -1],
-        ['j60_320eta490',       374,    'L1_J15.32ETA49', [], [PhysicsStream], ['RATE:SingleJet',  'BW:Jets'], -1],
-
-        ['j85_280eta320',        375,    'L1_J20.28ETA32', [], [PhysicsStream], ['RATE:SingleJet',  'BW:Jets'], -1],
-        ['j85_280eta320_jes',    376,    'L1_J20.28ETA32', [], [PhysicsStream], ['RATE:SingleJet',  'BW:Jets'], -1],
-        ['j85_280eta320_lcw',    377,    'L1_J20.28ETA32', [], [PhysicsStream], ['RATE:SingleJet',  'BW:Jets'], -1],
-        ['j85_280eta320_lcw_jes',378,    'L1_J20.28ETA32', [], [PhysicsStream], ['RATE:SingleJet',  'BW:Jets'], -1],
-        ['j85_320eta490',        380,    'L1_J20.32ETA49', [], [PhysicsStream], ['RATE:SingleJet',  'BW:Jets'], -1],
-
-        ['j110_320eta490',       381,    'L1_J30.32ETA49', [], [PhysicsStream], ['RATE:SingleJet',  'BW:Jets'], -1],
-
-        ['j175_320eta490',        382,    'L1_J50.32ETA49', [], [PhysicsStream], ['RATE:SingleJet',  'BW:Jets'], -1],
-        ['j175_320eta490_jes',    383,    'L1_J50.32ETA49', [], [PhysicsStream], ['RATE:SingleJet',  'BW:Jets'], -1],
-        ['j175_320eta490_lcw',    384,    'L1_J50.32ETA49', [], [PhysicsStream], ['RATE:SingleJet',  'BW:Jets'], -1],
-        ['j175_320eta490_lcw_jes',385,    'L1_J50.32ETA49', [], [PhysicsStream], ['RATE:SingleJet',  'BW:Jets'], -1],
-                                                                                        
-        ['j260_320eta490',        386,    'L1_J75.32ETA49', [], [PhysicsStream], ['RATE:SingleJet',  'BW:Jets'], -1],
-        ['j260_320eta490_jes',    387,    'L1_J75.32ETA49', [], [PhysicsStream], ['RATE:SingleJet',  'BW:Jets'], -1],
-        ['j260_320eta490_lcw',    388,    'L1_J75.32ETA49', [], [PhysicsStream], ['RATE:SingleJet',  'BW:Jets'], -1],
-        ['j260_320eta490_lcw_jes',389,    'L1_J75.32ETA49', [], [PhysicsStream], ['RATE:SingleJet',  'BW:Jets'], -1],
-
-        ['j360_320eta490',        650,    'L1_J100.32ETA49', [], [PhysicsStream], ['RATE:SingleJet',  'BW:Jets'], -1],
-        ['j360_320eta490_jes',    651,    'L1_J100.32ETA49', [], [PhysicsStream], ['RATE:SingleJet',  'BW:Jets'], -1],
-        ['j360_320eta490_lcw',    652,    'L1_J100.32ETA49', [], [PhysicsStream], ['RATE:SingleJet',  'BW:Jets'], -1],
-        ['j360_320eta490_lcw_jes',653,    'L1_J100.32ETA49', [], [PhysicsStream], ['RATE:SingleJet',  'BW:Jets'], -1],
-
-        ['j85_nojcalib',       3001,    'L1_J20',  [], [PhysicsStream], ['RATE:SingleJet', 'BW:Jets'], -1],
-        ['j85_lcw_nojcalib',        3002,    'L1_J20',  [], [PhysicsStream], ['RATE:SingleJet', 'BW:Jets'], -1],
-        ['j175_nojcalib',           3003,    'L1_J50',  [], [PhysicsStream], ['RATE:SingleJet', 'BW:Jets'], -1],
-        ['j175_lcw_nojcalib',        3004,    'L1_J50',  [], [PhysicsStream], ['RATE:SingleJet', 'BW:Jets'], -1],
-        ['j380_nojcalib',           3005,    'L1_J100', [], [PhysicsStream], ['RATE:SingleJet', 'BW:Jets'], -1],
-        ['j380_lcw_nojcalib',        3006,    'L1_J100', [], [PhysicsStream], ['RATE:SingleJet', 'BW:Jets'], -1],
-        ['j400_nojcalib',           3007,    'L1_J100', [], [PhysicsStream], ['RATE:SingleJet', 'BW:Jets'], -1],
-        ['j300_lcw_nojcalib',       3008,    'L1_J100', [], [PhysicsStream], ['RATE:SingleJet', 'BW:Jets'], -1],
-        ['j420_nojcalib',           3009,    'L1_J100', [], [PhysicsStream], ['RATE:SingleJet', 'BW:Jets'], -1],
-        ['j420_lcw_nojcalib',       3010,    'L1_J100', [], [PhysicsStream], ['RATE:SingleJet', 'BW:Jets'], -1],
+        #['j60_240eta490',          'L1_J15.23ETA49', [], [PhysicsStream], ['RATE:SingleJet',  'BW:Jets'], -1],
+        ['j60_280eta320',          'L1_J15.29ETA32', [], [PhysicsStream], ['RATE:SingleJet',  'BW:Jets'], -1],
+        ['j60_320eta490',          'L1_J15.32ETA49', [], [PhysicsStream], ['RATE:SingleJet',  'BW:Jets'], -1],
+
+        ['j85_280eta320',           'L1_J20.29ETA32', [], [PhysicsStream], ['RATE:SingleJet',  'BW:Jets'], -1],
+        ['j85_280eta320_jes',       'L1_J20.29ETA32', [], [PhysicsStream], ['RATE:SingleJet',  'BW:Jets'], -1],
+        ['j85_280eta320_lcw',       'L1_J20.29ETA32', [], [PhysicsStream], ['RATE:SingleJet',  'BW:Jets'], -1],
+        ['j85_280eta320_lcw_jes',    'L1_J20.29ETA32', [], [PhysicsStream], ['RATE:SingleJet',  'BW:Jets'], -1],
+        ['j85_320eta490',           'L1_J20.32ETA49', [], [PhysicsStream], ['RATE:SingleJet',  'BW:Jets'], -1],
+
+        ['j110_320eta490',          'L1_J30.32ETA49', [], [PhysicsStream], ['RATE:SingleJet',  'BW:Jets'], -1],
+
+        ['j175_320eta490',           'L1_J50.32ETA49', [], [PhysicsStream], ['RATE:SingleJet',  'BW:Jets'], -1],
+        ['j175_320eta490_jes',       'L1_J50.32ETA49', [], [PhysicsStream], ['RATE:SingleJet',  'BW:Jets'], -1],
+        ['j175_320eta490_lcw',       'L1_J50.32ETA49', [], [PhysicsStream], ['RATE:SingleJet',  'BW:Jets'], -1],
+        ['j175_320eta490_lcw_jes',    'L1_J50.32ETA49', [], [PhysicsStream], ['RATE:SingleJet',  'BW:Jets'], -1],
+                                                                                   
+        ['j260_320eta490',           'L1_J75.32ETA49', [], [PhysicsStream], ['RATE:SingleJet',  'BW:Jets'], -1],
+        ['j260_320eta490_jes',       'L1_J75.32ETA49', [], [PhysicsStream], ['RATE:SingleJet',  'BW:Jets'], -1],
+        ['j260_320eta490_lcw',       'L1_J75.32ETA49', [], [PhysicsStream], ['RATE:SingleJet',  'BW:Jets'], -1],
+        ['j260_320eta490_lcw_jes',    'L1_J75.32ETA49', [], [PhysicsStream], ['RATE:SingleJet',  'BW:Jets'], -1],
+
+        ['j360_320eta490',           'L1_J100.32ETA49', [], [PhysicsStream], ['RATE:SingleJet',  'BW:Jets'], -1],
+        ['j360_320eta490_jes',       'L1_J100.32ETA49', [], [PhysicsStream], ['RATE:SingleJet',  'BW:Jets'], -1],
+        ['j360_320eta490_lcw',       'L1_J100.32ETA49', [], [PhysicsStream], ['RATE:SingleJet',  'BW:Jets'], -1],
+        ['j360_320eta490_lcw_jes',    'L1_J100.32ETA49', [], [PhysicsStream], ['RATE:SingleJet',  'BW:Jets'], -1],
+
+        ['j85_nojcalib',       'L1_J20',  [], [PhysicsStream], ['RATE:SingleJet', 'BW:Jets'], -1],
+        ['j85_lcw_nojcalib',        'L1_J20',  [], [PhysicsStream], ['RATE:SingleJet', 'BW:Jets'], -1],
+        ['j175_nojcalib',           'L1_J50',  [], [PhysicsStream], ['RATE:SingleJet', 'BW:Jets'], -1],
+        ['j175_lcw_nojcalib',        'L1_J50',  [], [PhysicsStream], ['RATE:SingleJet', 'BW:Jets'], -1],
+        ['j380_nojcalib',           'L1_J100', [], [PhysicsStream], ['RATE:SingleJet', 'BW:Jets'], -1],
+        ['j380_lcw_nojcalib',        'L1_J100', [], [PhysicsStream], ['RATE:SingleJet', 'BW:Jets'], -1],
+        ['j400_nojcalib',           'L1_J100', [], [PhysicsStream], ['RATE:SingleJet', 'BW:Jets'], -1],
+        ['j300_lcw_nojcalib',       'L1_J100', [], [PhysicsStream], ['RATE:SingleJet', 'BW:Jets'], -1],
+        ['j420_nojcalib',           'L1_J100', [], [PhysicsStream], ['RATE:SingleJet', 'BW:Jets'], -1],
+        ['j420_lcw_nojcalib',       'L1_J100', [], [PhysicsStream], ['RATE:SingleJet', 'BW:Jets'], -1],
         #multi-jet
-        ['4j85_nojcalib',           3011,    'L1_3J40', [], [PhysicsStream], ['RATE:MultiJet',  'BW:Jets'], -1],
-        ['4j85_lcw_nojcalib',        3012,    'L1_3J40', [], [PhysicsStream], ['RATE:MultiJet',  'BW:Jets'], -1],
-        ['5j85_nojcalib',            3013,    'L1_4J20', [], [PhysicsStream], ['RATE:MultiJet',  'BW:Jets'], -1],
-        ['5j85_lcw_nojcalib',        3014,    'L1_4J20', [], [PhysicsStream], ['RATE:MultiJet',  'BW:Jets'], -1],
+        ['4j85_nojcalib',           'L1_3J40', [], [PhysicsStream], ['RATE:MultiJet',  'BW:Jets'], -1],
+        ['4j85_lcw_nojcalib',        'L1_3J40', [], [PhysicsStream], ['RATE:MultiJet',  'BW:Jets'], -1],
+        ['5j85_nojcalib',            'L1_4J20', [], [PhysicsStream], ['RATE:MultiJet',  'BW:Jets'], -1],
+        ['5j85_lcw_nojcalib',        'L1_4J20', [], [PhysicsStream], ['RATE:MultiJet',  'BW:Jets'], -1],
         #Forward jets
-        ['j85_280eta320_nojcalib',     3015,    'L1_J20.28ETA32', [], [PhysicsStream], ['RATE:SingleJet',  'BW:Jets'], -1],
-        ['j85_280eta320_lcw_nojcalib', 3016,    'L1_J20.28ETA32', [], [PhysicsStream], ['RATE:SingleJet',  'BW:Jets'], -1],
-        ['j175_320eta490_nojcalib',    3017,    'L1_J50.32ETA49', [], [PhysicsStream], ['RATE:SingleJet',  'BW:Jets'], -1],
-        ['j175_320eta490_lcw_nojcalib',3018,    'L1_J50.32ETA49', [], [PhysicsStream], ['RATE:SingleJet',  'BW:Jets'], -1],
-        ['j260_320eta490_nojcalib',    3019,    'L1_J75.32ETA49', [], [PhysicsStream], ['RATE:SingleJet',  'BW:Jets'], -1],
-        ['j260_320eta490_lcw_nojcalib',3020,    'L1_J75.32ETA49', [], [PhysicsStream], ['RATE:SingleJet',  'BW:Jets'], -1],
-        ['j360_320eta490_nojcalib',    3021,    'L1_J100.32ETA49', [], [PhysicsStream], ['RATE:SingleJet',  'BW:Jets'], -1],
-        ['j360_320eta490_lcw_nojcalib',3022,    'L1_J100.32ETA49', [], [PhysicsStream], ['RATE:SingleJet',  'BW:Jets'], -1],
+        ['j85_280eta320_nojcalib',         'L1_J20.29ETA32', [], [PhysicsStream], ['RATE:SingleJet',  'BW:Jets'], -1],
+        ['j85_280eta320_lcw_nojcalib',     'L1_J20.29ETA32', [], [PhysicsStream], ['RATE:SingleJet',  'BW:Jets'], -1],
+        ['j175_320eta490_nojcalib',        'L1_J50.32ETA49', [], [PhysicsStream], ['RATE:SingleJet',  'BW:Jets'], -1],
+        ['j175_320eta490_lcw_nojcalib',    'L1_J50.32ETA49', [], [PhysicsStream], ['RATE:SingleJet',  'BW:Jets'], -1],
+        ['j260_320eta490_nojcalib',        'L1_J75.32ETA49', [], [PhysicsStream], ['RATE:SingleJet',  'BW:Jets'], -1],
+        ['j260_320eta490_lcw_nojcalib',    'L1_J75.32ETA49', [], [PhysicsStream], ['RATE:SingleJet',  'BW:Jets'], -1],
+        ['j360_320eta490_nojcalib',        'L1_J100.32ETA49', [], [PhysicsStream], ['RATE:SingleJet',  'BW:Jets'], -1],
+        ['j360_320eta490_lcw_nojcalib',    'L1_J100.32ETA49', [], [PhysicsStream], ['RATE:SingleJet',  'BW:Jets'], -1],
 
 
         
         ## Single jets seeded from RD0        
-        ['j15',          660,    'L1_RD0_FILLED', [], [PhysicsStream], ['RATE:SingleJet',  'BW:Jets'], -1],
-        ['j25',          661,    'L1_RD0_FILLED', [], [PhysicsStream], ['RATE:SingleJet',  'BW:Jets'], -1],
-        ['j35',          662,    'L1_RD0_FILLED', [], [PhysicsStream], ['RATE:SingleJet',  'BW:Jets'], -1],
-        ['j35_jes',      663,    'L1_RD0_FILLED', [], [PhysicsStream], ['RATE:SingleJet',  'BW:Jets'], -1],
-        ['j35_lcw',      664,    'L1_RD0_FILLED', [], [PhysicsStream], ['RATE:SingleJet',  'BW:Jets'], -1],
-        ['j35_lcw_jes',  665,    'L1_RD0_FILLED', [], [PhysicsStream], ['RATE:SingleJet',  'BW:Jets'], -1],
-        ['j45_L1RD0',    666,    'L1_RD0_FILLED', [], [PhysicsStream], ['RATE:SingleJet',  'BW:Jets'], -1],
-        ['j55_L1RD0',    667,    'L1_RD0_FILLED', [], [PhysicsStream], ['RATE:SingleJet',  'BW:Jets'], -1],
-        ['j60_L1RD0',    668,    'L1_RD0_FILLED', [], [PhysicsStream], ['RATE:SingleJet',  'BW:Jets'], -1],
-        ['j85_L1RD0',    669,    'L1_RD0_FILLED', [], [PhysicsStream], ['RATE:SingleJet',  'BW:Jets'], -1],
-
-        ['4j25',    670,    'L1_RD0_FILLED', [], [PhysicsStream], ['RATE:MultiJet',  'BW:Jets'], -1],
-        ['5j25',    671,    'L1_RD0_FILLED', [], [PhysicsStream], ['RATE:MultiJet',  'BW:Jets'], -1],
-        ['6j25',    672,    'L1_RD0_FILLED', [], [PhysicsStream], ['RATE:MultiJet',  'BW:Jets'], -1],        
-        ['7j25',    673,    'L1_RD0_FILLED', [], [PhysicsStream], ['RATE:MultiJet',  'BW:Jets'], -1],      
-
-        ['j35_nojcalib',      3023,    'L1_RD0_FILLED', [], [PhysicsStream], ['RATE:SingleJet',  'BW:Jets'], -1],
-        ['j35_lcw_nojcalib',  3024,    'L1_RD0_FILLED', [], [PhysicsStream], ['RATE:SingleJet',  'BW:Jets'], -1],
+        ['j15',            'L1_RD0_FILLED', [], [PhysicsStream], ['RATE:SingleJet',  'BW:Jets'], -1],
+        ['j25',            'L1_RD0_FILLED', [], [PhysicsStream], ['RATE:SingleJet',  'BW:Jets'], -1],
+        ['j35',            'L1_RD0_FILLED', [], [PhysicsStream], ['RATE:SingleJet',  'BW:Jets'], -1],
+        ['j35_jes',        'L1_RD0_FILLED', [], [PhysicsStream], ['RATE:SingleJet',  'BW:Jets'], -1],
+        ['j35_lcw',        'L1_RD0_FILLED', [], [PhysicsStream], ['RATE:SingleJet',  'BW:Jets'], -1],
+        ['j35_lcw_jes',    'L1_RD0_FILLED', [], [PhysicsStream], ['RATE:SingleJet',  'BW:Jets'], -1],
+        ['j45_L1RD0',      'L1_RD0_FILLED', [], [PhysicsStream], ['RATE:SingleJet',  'BW:Jets'], -1],
+        ['j55_L1RD0',      'L1_RD0_FILLED', [], [PhysicsStream], ['RATE:SingleJet',  'BW:Jets'], -1],
+        ['j60_L1RD0',      'L1_RD0_FILLED', [], [PhysicsStream], ['RATE:SingleJet',  'BW:Jets'], -1],
+        ['j85_L1RD0',      'L1_RD0_FILLED', [], [PhysicsStream], ['RATE:SingleJet',  'BW:Jets'], -1],
+
+        ['4j25',      'L1_RD0_FILLED', [], [PhysicsStream], ['RATE:MultiJet',  'BW:Jets'], -1],
+        ['5j25',      'L1_RD0_FILLED', [], [PhysicsStream], ['RATE:MultiJet',  'BW:Jets'], -1],
+        ['6j25',      'L1_RD0_FILLED', [], [PhysicsStream], ['RATE:MultiJet',  'BW:Jets'], -1],        
+        ['7j25',      'L1_RD0_FILLED', [], [PhysicsStream], ['RATE:MultiJet',  'BW:Jets'], -1],      
+
+        ['j35_nojcalib',         'L1_RD0_FILLED', [], [PhysicsStream], ['RATE:SingleJet',  'BW:Jets'], -1],
+        ['j35_lcw_nojcalib',     'L1_RD0_FILLED', [], [PhysicsStream], ['RATE:SingleJet',  'BW:Jets'], -1],
         ##HT seeded chains
-        ['j360_a10_nojcalib'                      ,   3025, 'L1_HT150-J20s5.ETA30',    [], [PhysicsStream], ['RATE:SingleJet',  'BW:Jets'], -1],
-        ['j360_a10_nojcalib_L1HT150-AJ20all.ETA30',  3026, 'L1_HT150-AJ20all.ETA30', [], [PhysicsStream], ['RATE:SingleJet',  'BW:Jets'], -1],
-        ['j360_a10_lcw_nojcalib'                      ,  3027, 'L1_HT150-J20s5.ETA30',    [], [PhysicsStream], ['RATE:SingleJet',  'BW:Jets'], -1],
-        ['j360_a10_lcw_nojcalib_L1HT150-AJ20all.ETA30',  3028, 'L1_HT150-AJ20all.ETA30', [], [PhysicsStream], ['RATE:SingleJet',  'BW:Jets'], -1],
-        ['j460_a10_nojcalib'                          ,  3029, 'L1_HT190-J15s5.ETA20',    [], [PhysicsStream], ['RATE:SingleJet',  'BW:Jets'], -1],
-        ['j460_a10_nojcalib_L1HT190-AJ15all.ETA20'    ,  3030, 'L1_HT190-AJ15all.ETA20',    [], [PhysicsStream], ['RATE:SingleJet',  'BW:Jets'], -1],
-        ['j460_a10_lcw_nojcalib'                          ,  3031, 'L1_HT190-J15s5.ETA20',    [], [PhysicsStream], ['RATE:SingleJet',  'BW:Jets'], -1],
-        ['j460_a10_lcw_nojcalib_L1HT190-AJ15all.ETA20'    ,  3032, 'L1_HT190-AJ15all.ETA20',    [], [PhysicsStream], ['RATE:SingleJet',  'BW:Jets'], -1],
+        ['j360_a10_nojcalib'                      ,      'L1_HT150-J20s5.ETA30',    [], [PhysicsStream], ['RATE:SingleJet',  'BW:Jets'], -1],
+        ['j360_a10_nojcalib_L1HT150-AJ20all.ETA30',      'L1_HT150-AJ20all.ETA30', [], [PhysicsStream], ['RATE:SingleJet',  'BW:Jets'], -1],
+        ['j360_a10_lcw_nojcalib'                      ,  'L1_HT150-J20s5.ETA30',    [], [PhysicsStream], ['RATE:SingleJet',  'BW:Jets'], -1],
+        ['j360_a10_lcw_nojcalib_L1HT150-AJ20all.ETA30',  'L1_HT150-AJ20all.ETA30', [], [PhysicsStream], ['RATE:SingleJet',  'BW:Jets'], -1],
+        ['j460_a10_nojcalib'                          ,  'L1_HT190-J15s5.ETA20',    [], [PhysicsStream], ['RATE:SingleJet',  'BW:Jets'], -1],
+        ['j460_a10_nojcalib_L1HT190-AJ15all.ETA20'    ,  'L1_HT190-AJ15all.ETA20',    [], [PhysicsStream], ['RATE:SingleJet',  'BW:Jets'], -1],
+        ['j460_a10_lcw_nojcalib'                      ,  'L1_HT190-J15s5.ETA20',    [], [PhysicsStream], ['RATE:SingleJet',  'BW:Jets'], -1],
+        ['j460_a10_lcw_nojcalib_L1HT190-AJ15all.ETA20',  'L1_HT190-AJ15all.ETA20',    [], [PhysicsStream], ['RATE:SingleJet',  'BW:Jets'], -1],
   
 
 
         ##HT seeded chains
-        ['j360_a10_sub'                      ,  674, 'L1_HT150-J20s5.ETA30',    [], [PhysicsStream], ['RATE:SingleJet',  'BW:Jets'], -1],
-        ['j360_a10_sub_L1HT150-AJ20all.ETA30',  675, 'L1_HT150-AJ20all.ETA30', [], [PhysicsStream], ['RATE:SingleJet',  'BW:Jets'], -1],
+        ['j360_a10_sub'                      ,  'L1_HT150-J20s5.ETA30',    [], [PhysicsStream], ['RATE:SingleJet',  'BW:Jets'], -1],
+        ['j360_a10_sub_L1HT150-AJ20all.ETA30',  'L1_HT150-AJ20all.ETA30', [], [PhysicsStream], ['RATE:SingleJet',  'BW:Jets'], -1],
 
-        ['j360_a10_lcw_sub'                      ,  676, 'L1_HT150-J20s5.ETA30',    [], [PhysicsStream], ['RATE:SingleJet',  'BW:Jets'], -1],
-        ['j360_a10_lcw_sub_L1HT150-AJ20all.ETA30',  677, 'L1_HT150-AJ20all.ETA30', [], [PhysicsStream], ['RATE:SingleJet',  'BW:Jets'], -1],
+        ['j360_a10_lcw_sub'                      , 'L1_HT150-J20s5.ETA30',    [], [PhysicsStream], ['RATE:SingleJet',  'BW:Jets'], -1],
+        ['j360_a10_lcw_sub_L1HT150-AJ20all.ETA30', 'L1_HT150-AJ20all.ETA30', [], [PhysicsStream], ['RATE:SingleJet',  'BW:Jets'], -1],
 
-        ['j460_a10_sub'                          ,  678, 'L1_HT190-J15s5.ETA20',    [], [PhysicsStream], ['RATE:SingleJet',  'BW:Jets'], -1],
-        ['j460_a10_sub_L1HT190-AJ15all.ETA20'    ,  679, 'L1_HT190-AJ15all.ETA20',    [], [PhysicsStream], ['RATE:SingleJet',  'BW:Jets'], -1],
+        ['j460_a10_sub'                          , 'L1_HT190-J15s5.ETA20',    [], [PhysicsStream], ['RATE:SingleJet',  'BW:Jets'], -1],
+        ['j460_a10_sub_L1HT190-AJ15all.ETA20'    , 'L1_HT190-AJ15all.ETA20',    [], [PhysicsStream], ['RATE:SingleJet',  'BW:Jets'], -1],
 
-        ['j460_a10_lcw_sub'                          ,  680, 'L1_HT190-J15s5.ETA20',    [], [PhysicsStream], ['RATE:SingleJet',  'BW:Jets'], -1],
-        ['j460_a10_lcw_sub_L1HT190-AJ15all.ETA20'    ,  681, 'L1_HT190-AJ15all.ETA20',    [], [PhysicsStream], ['RATE:SingleJet',  'BW:Jets'], -1],
+        ['j460_a10_lcw_sub'                      , 'L1_HT190-J15s5.ETA20',    [], [PhysicsStream], ['RATE:SingleJet',  'BW:Jets'], -1],
+        ['j460_a10_lcw_sub_L1HT190-AJ15all.ETA20', 'L1_HT190-AJ15all.ETA20',    [], [PhysicsStream], ['RATE:SingleJet',  'BW:Jets'], -1],
         
-        ['ht400'                       ,  691, 'L1_HT150-J20s5.ETA30',    [], [PhysicsStream], ['RATE:MultiJet',  'BW:Jets'], -1],
-        ['ht400_L1HT150-AJ20all.ETA30' ,  692, 'L1_HT150-AJ20all.ETA30', [], [PhysicsStream], ['RATE:MultiJet',  'BW:Jets'], -1],
+        ['ht400'                       ,    'L1_HT150-J20s5.ETA30',    [], [PhysicsStream], ['RATE:MultiJet',  'BW:Jets'], -1],
+        ['ht400_L1HT150-AJ20all.ETA30' ,    'L1_HT150-AJ20all.ETA30', [], [PhysicsStream], ['RATE:MultiJet',  'BW:Jets'], -1],
 
-        ['ht550'                       ,  693, 'L1_HT150-J20s5.ETA30',    [], [PhysicsStream], ['RATE:MultiJet',  'BW:Jets'], -1],
-        ['ht550_L1HT150-AJ20all.ETA30' ,  694, 'L1_HT150-AJ20all.ETA30', [], [PhysicsStream], ['RATE:MultiJet',  'BW:Jets'], -1],
+        ['ht550'                       ,    'L1_HT150-J20s5.ETA30',    [], [PhysicsStream], ['RATE:MultiJet',  'BW:Jets'], -1],
+        ['ht550_L1HT150-AJ20all.ETA30' ,    'L1_HT150-AJ20all.ETA30', [], [PhysicsStream], ['RATE:MultiJet',  'BW:Jets'], -1],
 
-        ['ht700'                          ,  695, 'L1_HT190-J15s5.ETA20',    [], [PhysicsStream], ['RATE:MultiJet',  'BW:Jets'], -1],
-        ['ht700_L1HT190-AJ15all.ETA20'    ,  696, 'L1_HT190-AJ15all.ETA20',    [], [PhysicsStream], ['RATE:MultiJet',  'BW:Jets'], -1],
+        ['ht700'                          , 'L1_HT190-J15s5.ETA20',    [], [PhysicsStream], ['RATE:MultiJet',  'BW:Jets'], -1],
+        ['ht700_L1HT190-AJ15all.ETA20'    , 'L1_HT190-AJ15all.ETA20',    [], [PhysicsStream], ['RATE:MultiJet',  'BW:Jets'], -1],
 
-        ['ht850'                          ,  697, 'L1_HT190-J15s5.ETA20',    [], [PhysicsStream], ['RATE:MultiJet',  'BW:Jets'], -1],
-        ['ht850_L1HT190-AJ15all.ETA20'    ,  698, 'L1_HT190-AJ15all.ETA20',    [], [PhysicsStream], ['RATE:MultiJet',  'BW:Jets'], -1],
+        ['ht850'                          , 'L1_HT190-J15s5.ETA20',    [], [PhysicsStream], ['RATE:MultiJet',  'BW:Jets'], -1],
+        ['ht850_L1HT190-AJ15all.ETA20'    , 'L1_HT190-AJ15all.ETA20',    [], [PhysicsStream], ['RATE:MultiJet',  'BW:Jets'], -1],
 
-        ['ht1000'                          ,  699, 'L1_HT190-J15s5.ETA20',    [], [PhysicsStream], ['RATE:MultiJet',  'BW:Jets'], -1],
-        ['ht1000_L1HT190-AJ15all.ETA20'    ,  700, 'L1_HT190-AJ15all.ETA20',    [], [PhysicsStream], ['RATE:MultiJet',  'BW:Jets'], -1],
+        ['ht1000'                          , 'L1_HT190-J15s5.ETA20',    [], [PhysicsStream], ['RATE:MultiJet',  'BW:Jets'], -1],
+        ['ht1000_L1HT190-AJ15all.ETA20'    , 'L1_HT190-AJ15all.ETA20',    [], [PhysicsStream], ['RATE:MultiJet',  'BW:Jets'], -1],
         ]
 
     TriggerFlags.BjetSlice.signatures = TriggerFlags.BjetSlice.signatures() + [
 
         ### Run1 configuration
         # main menu
-        ['2j75_bmedium_j75',	85, 'L1_3J25.0ETA22',	[], [PhysicsStream], ['RATE:MultiJet', 'BW:Jets'], -1], 
-        ['2j70_btight_j70',	86, 'L1_3J25.0ETA22',	[], [PhysicsStream], ['RATE:MultiJet', 'BW:Jets'], -1], 
-        ['j100_2j55_bmedium',	87, 'L1_J75_3J20',	[], [PhysicsStream], ['RATE:MultiJet', 'BW:Jets'], -1], # not working
-        ['2j55_bmedium_2j55',	88, 'L1_4J20',	[], [PhysicsStream], ['RATE:MultiJet', 'BW:Jets'], -1], 
-        ['2j45_btight_2j45',	89, 'L1_4J20',	[], [PhysicsStream], ['RATE:MultiJet', 'BW:Jets'], -1], 
-        ['j75_bmedium_3j75',	90, 'L1_4J20',	[], [PhysicsStream], ['RATE:MultiJet', 'BW:Jets'], -1], 
-        ['j70_btight_3j70',	91, 'L1_4J20',	[], [PhysicsStream], ['RATE:MultiJet', 'BW:Jets'], -1], 
-        ['j175_bmedium_j60_bmedium',	92, 'L1_J100',	[], [PhysicsStream], ['RATE:MultiJet', 'BW:Jets'], -1], 
-        ['j300_bloose',	        93, 'L1_J100',	[], [PhysicsStream], ['RATE:SingleJet', 'BW:Jets'], -1],
+        ['2j75_bmedium_j75', 'L1_3J25.0ETA23',	[], [PhysicsStream], ['RATE:MultiBJet', 'BW:Jets'], -1], 
+        ['2j70_btight_j70',  'L1_3J25.0ETA23',	[], [PhysicsStream], ['RATE:MultiBJet', 'BW:Jets'], -1], 
+        ['j100_2j55_bmedium', 'L1_J75_3J20',	[], [PhysicsStream], ['RATE:MultiBJet', 'BW:Jets'], -1], # not working
+        ['2j55_bmedium_2j55', 'L1_4J20',	[], [PhysicsStream], ['RATE:MultiBJet', 'BW:Jets'], -1], 
+        ['2j45_btight_2j45', 'L1_4J20',	[], [PhysicsStream], ['RATE:MultiBJet', 'BW:Jets'], -1], 
+        ['j75_bmedium_3j75', 'L1_4J20',	[], [PhysicsStream], ['RATE:SingleBJet', 'BW:Jets'], -1], 
+        ['j70_btight_3j70',  'L1_4J20',	[], [PhysicsStream], ['RATE:SingleBJet', 'BW:Jets'], -1], 
+        ['2j55_bmedium_2j55_L13J25.ETA23', 'L1_3J25.0ETA23',	[], [PhysicsStream], ['RATE:MultiBJet', 'BW:Jets'], -1], 
+        ['2j45_btight_2j45_L13J25.ETA23',  'L1_3J25.0ETA23',	[], [PhysicsStream], ['RATE:MultiBJet', 'BW:Jets'], -1], 
+        ['j75_bmedium_3j75_L13J25.ETA23',  'L1_3J25.0ETA23',	[], [PhysicsStream], ['RATE:SingleBJet', 'BW:Jets'], -1], 
+        ['j70_btight_3j70_L13J25.ETA23',   'L1_3J25.0ETA23',	[], [PhysicsStream], ['RATE:SingleBJet', 'BW:Jets'], -1], 
+        ['j175_bmedium_j60_bmedium',  'L1_J100',	[], [PhysicsStream], ['RATE:MultiBJet', 'BW:Jets'], -1], 
+        ['j300_bloose',	        'L1_J100',	[], [PhysicsStream], ['RATE:SingleBJet', 'BW:Jets'], -1],
 
         # low lumi menu
-        ['2j70_bmedium_j70',	94, 'L1_3J25.0ETA22',	[], [PhysicsStream], ['RATE:MultiJet', 'BW:Jets'], -1], 
-        ['2j65_btight_j65',	95, 'L1_3J25.0ETA22',	[], [PhysicsStream], ['RATE:MultiJet', 'BW:Jets'], -1], 
-        ['2j45_bmedium_2j45_L14J15.0ETA24',  96, 'L1_4J15.0ETA24',	[], [PhysicsStream], ['RATE:MultiJet', 'BW:Jets'], -1], 
-        ['2j35_btight_2j35_L14J15.0ETA24',   97, 'L1_4J15.0ETA24',	[], [PhysicsStream], ['RATE:MultiJet', 'BW:Jets'], -1], 
-        ['j70_bmedium_3j70_L14J15.0ETA24',   98, 'L1_4J15.0ETA24',	[], [PhysicsStream], ['RATE:MultiJet', 'BW:Jets'], -1], 
-        ['j65_btight_3j65_L14J15.0ETA24',    20, 'L1_4J15.0ETA24',	[], [PhysicsStream], ['RATE:MultiJet', 'BW:Jets'], -1], 
-        ['2j45_bmedium_2j45_L13J25.0ETA22',  21, 'L1_3J25.0ETA22',	[], [PhysicsStream], ['RATE:MultiJet', 'BW:Jets'], -1], 
-        ['2j35_btight_2j35_L13J25.0ETA22',   22, 'L1_3J25.0ETA22',	[], [PhysicsStream], ['RATE:MultiJet', 'BW:Jets'], -1], 
-        ['j70_bmedium_3j70_L13J25.0ETA22',   23, 'L1_3J25.0ETA22',	[], [PhysicsStream], ['RATE:MultiJet', 'BW:Jets'], -1], 
-        ['j65_btight_3j65_L13J25.0ETA22',    24	, 'L1_3J25.0ETA22',	[], [PhysicsStream], ['RATE:MultiJet', 'BW:Jets'], -1], 
-        ['j225_bloose',	                     25, 'L1_J100',	[], [PhysicsStream], ['RATE:SingleJet', 'BW:Jets'], -1], 
-        ['j150_bmedium_j50_bmedium',	     26, 'L1_J100',	[], [PhysicsStream], ['RATE:SingleJet', 'BW:Jets'], -1], 
-        ['j175_bmedium',	             27, 'L1_J100',	[], [PhysicsStream], ['RATE:SingleJet', 'BW:Jets'], -1], 
+        ['2j70_bmedium_j70',	 'L1_3J25.0ETA23',	[], [PhysicsStream], ['RATE:MultiBJet', 'BW:Jets'], -1], 
+        ['2j65_btight_j65',      'L1_3J25.0ETA23',	[], [PhysicsStream], ['RATE:MultiBJet', 'BW:Jets'], -1], 
+        ['2j45_bmedium_2j45_L14J15.0ETA24', 'L1_4J15.0ETA24',	[], [PhysicsStream], ['RATE:MultiBJet', 'BW:Jets'], -1], 
+        ['2j35_btight_2j35_L14J15.0ETA24',  'L1_4J15.0ETA24',	[], [PhysicsStream], ['RATE:MultiBJet', 'BW:Jets'], -1], 
+        ['j70_bmedium_3j70_L14J15.0ETA24',  'L1_4J15.0ETA24',	[], [PhysicsStream], ['RATE:SingleBJet', 'BW:Jets'], -1], 
+        ['j65_btight_3j65_L14J15.0ETA24',   'L1_4J15.0ETA24',	[], [PhysicsStream], ['RATE:SingleBJet', 'BW:Jets'], -1], 
+        ['2j45_bmedium_2j45_L13J25.0ETA23', 'L1_3J25.0ETA23',	[], [PhysicsStream], ['RATE:MultiBJet', 'BW:Jets'], -1], 
+        ['2j35_btight_2j35_L13J25.0ETA23',  'L1_3J25.0ETA23',	[], [PhysicsStream], ['RATE:MultiBJet', 'BW:Jets'], -1], 
+        ['j70_bmedium_3j70_L13J25.0ETA23',  'L1_3J25.0ETA23',	[], [PhysicsStream], ['RATE:SingleBJet', 'BW:Jets'], -1], 
+        ['j65_btight_3j65_L13J25.0ETA23',   'L1_3J25.0ETA23',	[], [PhysicsStream], ['RATE:SingleBJet', 'BW:Jets'], -1], 
+        ['j225_bloose',	                    'L1_J100',	[], [PhysicsStream], ['RATE:SingleBJet', 'BW:Jets'], -1], 
+        ['j150_bmedium_j50_bmedium',	    'L1_J100',	[], [PhysicsStream], ['RATE:SingleBJet', 'BW:Jets'], -1], 
+        ['j175_bmedium',	            'L1_J100',	[], [PhysicsStream], ['RATE:SingleJet', 'BW:Jets'], -1], 
 
         # bperf chains
-        ['j55_bperf',                        28,    'L1_J20',[],  [PhysicsStream], ['RATE:SingleJet', 'BW:Jets'], -1],
-        ['j45_bperf_3j45',                   29,    'L1_3J15',[], [PhysicsStream], ['RATE:MultiJet', 'BW:Jets'], -1],
-        ['j45_bperf_3j45_L13J15.0ETA24',      30,    'L1_3J15.0ETA24',[], [PhysicsStream], ['RATE:MultiJet', 'BW:Jets'], -1],
-        ['j45_bperf_3j45_L13J20',            31,    'L1_3J20',[], [PhysicsStream], ['RATE:MultiJet', 'BW:Jets'], -1],
+        ['j55_bperf',                          'L1_J20',[],  [PhysicsStream], ['RATE:SingleBJet', 'BW:Jets'], -1],
+        ['j45_bperf_3j45',                     'L1_3J15',[], [PhysicsStream], ['RATE:SingleBJet', 'BW:Jets'], -1],
+        ['j45_bperf_3j45_L13J15.0ETA24',        'L1_3J15.0ETA24',[], [PhysicsStream], ['RATE:SingleBJet', 'BW:Jets'], -1],
+        ['j45_bperf_3j45_L13J20',              'L1_3J20',[], [PhysicsStream], ['RATE:SingleBJet', 'BW:Jets'], -1],
 
         # boffperf chains
-        ['j55_boffperf',                     32,    'L1_J20',[],  [PhysicsStream], ['RATE:SingleJet', 'BW:Jets'], -1],
-        ['j45_boffperf_3j45',                33,    'L1_3J15',[], [PhysicsStream], ['RATE:MultiJet', 'BW:Jets'], -1],
-        ['j45_boffperf_3j45_L13J15.0ETA24',   34,    'L1_3J15.0ETA24',[], [PhysicsStream], ['RATE:MultiJet', 'BW:Jets'], -1],
-        ['j45_boffperf_3j45_L13J20',         35,    'L1_3J20',[], [PhysicsStream], ['RATE:MultiJet', 'BW:Jets'], -1],
+        ['j55_boffperf',                        'L1_J20',[],  [PhysicsStream], ['RATE:SingleBJet', 'BW:Jets'], -1],
+        ['j45_boffperf_3j45',                   'L1_3J15',[], [PhysicsStream], ['RATE:SingleBJet', 'BW:Jets'], -1],
+        ['j45_boffperf_3j45_L13J15.0ETA24',     'L1_3J15.0ETA24',[], [PhysicsStream], ['RATE:SingleBJet', 'BW:Jets'], -1],
+        ['j45_boffperf_3j45_L13J20',            'L1_3J20',[], [PhysicsStream], ['RATE:SingleBJet', 'BW:Jets'], -1],
 
         ### split configuration
         # main menu
-        ['2j75_bmedium_split_j75',             	   50, 'L1_3J25.0ETA22',	[], [PhysicsStream], ['RATE:MultiJet', 'BW:Jets'], -1], 
-        ['2j70_btight_split_j70',                  51, 'L1_3J25.0ETA22',	[], [PhysicsStream], ['RATE:MultiJet', 'BW:Jets'], -1], 
-        ['j100_2j55_bmedium_split',	           52, 'L1_J75_3J20',	[], [PhysicsStream], ['RATE:MultiJet', 'BW:Jets'], -1], # not working
-        ['2j55_bmedium_split_2j55',	           53, 'L1_4J20',	[], [PhysicsStream], ['RATE:MultiJet', 'BW:Jets'], -1], 
-        ['2j45_btight_split_2j45',            	   54, 'L1_4J20',	[], [PhysicsStream], ['RATE:MultiJet', 'BW:Jets'], -1], 
-        ['j75_bmedium_split_3j75',	           55, 'L1_4J20',	[], [PhysicsStream], ['RATE:MultiJet', 'BW:Jets'], -1], 
-        ['j70_btight_split_3j70',	           56, 'L1_4J20',	[], [PhysicsStream], ['RATE:MultiJet', 'BW:Jets'], -1], 
-        ['j175_bmedium_split_j60_bmedium_split',   61, 'L1_J100',	[], [PhysicsStream], ['RATE:MultiJet', 'BW:Jets'], -1], 
-        ['j300_bloose_split',	                   62, 'L1_J100',	[], [PhysicsStream], ['RATE:SingleJet', 'BW:Jets'], -1],
+        ['2j75_bmedium_split_j75',             	  'L1_3J25.0ETA23',	[], [PhysicsStream], ['RATE:MultiBJet', 'BW:Jets'], -1], 
+        ['2j70_btight_split_j70',                 'L1_3J25.0ETA23',	[], [PhysicsStream], ['RATE:MultiBJet', 'BW:Jets'], -1], 
+        ['j100_2j55_bmedium_split',	          'L1_J75_3J20',	[], [PhysicsStream], ['RATE:MultiBJet', 'BW:Jets'], -1], # not working
+        ['2j55_bmedium_split_2j55',	          'L1_4J20',	[], [PhysicsStream], ['RATE:MultiBJet', 'BW:Jets'], -1], 
+        ['2j45_btight_split_2j45',            	  'L1_4J20',	[], [PhysicsStream], ['RATE:MultiBJet', 'BW:Jets'], -1], 
+        ['j75_bmedium_split_3j75',	          'L1_4J20',	[], [PhysicsStream], ['RATE:SingleBJet', 'BW:Jets'], -1], 
+        ['j70_btight_split_3j70',	          'L1_4J20',	[], [PhysicsStream], ['RATE:SingleBJet', 'BW:Jets'], -1], 
+        ['2j55_bmedium_split_2j55_L13J25.ETA23',	          'L1_3J25.0ETA23',	[], [PhysicsStream], ['RATE:MultiBJet', 'BW:Jets'], -1], 
+        ['2j45_btight_split_2j45_L13J25.ETA23',            	  'L1_3J25.0ETA23',	[], [PhysicsStream], ['RATE:MultiBJet', 'BW:Jets'], -1], 
+        ['j75_bmedium_split_3j75_L13J25.ETA23',	          'L1_3J25.0ETA23',	[], [PhysicsStream], ['RATE:SingleBJet', 'BW:Jets'], -1], 
+        ['j70_btight_split_3j70_L13J25.ETA23',	          'L1_3J25.0ETA23',	[], [PhysicsStream], ['RATE:SingleBJet', 'BW:Jets'], -1], 
+        ['j175_bmedium_split_j60_bmedium_split',  'L1_J100',	[], [PhysicsStream], ['RATE:MultiBJet', 'BW:Jets'], -1], 
+        ['j300_bloose_split',	                  'L1_J100',	[], [PhysicsStream], ['RATE:SingleBJet', 'BW:Jets'], -1],
 
         # low lumi menu
-        ['2j70_bmedium_split_j70',	           63, 'L1_3J25.0ETA22',	[], [PhysicsStream], ['RATE:MultiJet', 'BW:Jets'], -1], 
-        ['2j65_btight_split_j65',	           64, 'L1_3J25.0ETA22',	[], [PhysicsStream], ['RATE:MultiJet', 'BW:Jets'], -1], 
-        ['2j45_bmedium_split_2j45_L14J15.0ETA24',  65, 'L1_4J15.0ETA24',	[], [PhysicsStream], ['RATE:MultiJet', 'BW:Jets'], -1], 
-        ['2j35_btight_split_2j35_L14J15.0ETA24',   66, 'L1_4J15.0ETA24',	[], [PhysicsStream], ['RATE:MultiJet', 'BW:Jets'], -1], 
-        ['j70_bmedium_split_3j70_L14J15.0ETA24',   67, 'L1_4J15.0ETA24',	[], [PhysicsStream], ['RATE:MultiJet', 'BW:Jets'], -1], 
-        ['j65_btight_split_3j65_L14J15.0ETA24',	   68, 'L1_4J15.0ETA24',	[], [PhysicsStream], ['RATE:MultiJet', 'BW:Jets'], -1], 
-        ['2j45_bmedium_split_2j45_L13J25.0ETA22',  69, 'L1_3J25.0ETA22',	[], [PhysicsStream], ['RATE:MultiJet', 'BW:Jets'], -1], 
-        ['2j35_btight_split_2j35_L13J25.0ETA22',   70, 'L1_3J25.0ETA22',	[], [PhysicsStream], ['RATE:MultiJet', 'BW:Jets'], -1], 
-        ['j70_bmedium_split_3j70_L13J25.0ETA22',   71, 'L1_3J25.0ETA22',	[], [PhysicsStream], ['RATE:MultiJet', 'BW:Jets'], -1], 
-        ['j65_btight_split_3j65_L13J25.0ETA22',    72, 'L1_3J25.0ETA22',	[], [PhysicsStream], ['RATE:MultiJet', 'BW:Jets'], -1], 
-        ['j225_bloose_split',	                   73, 'L1_J100',  	[], [PhysicsStream], ['RATE:SingleJet', 'BW:Jets'], -1], 
-        ['j150_bmedium_split_j50_bmedium_split',   74, 'L1_J100',  	[], [PhysicsStream], ['RATE:MultiJet', 'BW:Jets'], -1], 
-        ['j175_bmedium_split',  	           75, 'L1_J100',  	[], [PhysicsStream], ['RATE:MultiJet', 'BW:Jets'], -1], 
+        ['2j70_bmedium_split_j70',	          'L1_3J25.0ETA23',	[], [PhysicsStream], ['RATE:MultiBJet', 'BW:Jets'], -1], 
+        ['2j65_btight_split_j65',	          'L1_3J25.0ETA23',	[], [PhysicsStream], ['RATE:MultiBJet', 'BW:Jets'], -1], 
+        ['2j45_bmedium_split_2j45_L14J15.0ETA24', 'L1_4J15.0ETA24',	[], [PhysicsStream], ['RATE:MultiBJet', 'BW:Jets'], -1], 
+        ['2j35_btight_split_2j35_L14J15.0ETA24',  'L1_4J15.0ETA24',	[], [PhysicsStream], ['RATE:MultiBJet', 'BW:Jets'], -1], 
+        ['j70_bmedium_split_3j70_L14J15.0ETA24',  'L1_4J15.0ETA24',	[], [PhysicsStream], ['RATE:SingleBJet', 'BW:Jets'], -1], 
+        ['j65_btight_split_3j65_L14J15.0ETA24',	  'L1_4J15.0ETA24',	[], [PhysicsStream], ['RATE:SingleBJet', 'BW:Jets'], -1], 
+        ['2j45_bmedium_split_2j45_L13J25.0ETA23', 'L1_3J25.0ETA23',	[], [PhysicsStream], ['RATE:MultiBJet', 'BW:Jets'], -1], 
+        ['2j35_btight_split_2j35_L13J25.0ETA23',  'L1_3J25.0ETA23',	[], [PhysicsStream], ['RATE:MultiBJet', 'BW:Jets'], -1], 
+        ['j70_bmedium_split_3j70_L13J25.0ETA23',  'L1_3J25.0ETA23',	[], [PhysicsStream], ['RATE:SingleBJet', 'BW:Jets'], -1], 
+        ['j65_btight_split_3j65_L13J25.0ETA23',   'L1_3J25.0ETA23',	[], [PhysicsStream], ['RATE:SingleBJet', 'BW:Jets'], -1], 
+        ['j225_bloose_split',	                  'L1_J100',  	[], [PhysicsStream], ['RATE:SingleBJet', 'BW:Jets'], -1], 
+        ['j150_bmedium_split_j50_bmedium_split',  'L1_J100',  	[], [PhysicsStream], ['RATE:MultiBJet', 'BW:Jets'], -1], 
+        ['j175_bmedium_split',  	          'L1_J100',  	[], [PhysicsStream], ['RATE:SingleBJet', 'BW:Jets'], -1], 
 
         # bperf chains
-        ['j55_bperf_split',                        76,    'L1_J20',[],  [PhysicsStream], ['RATE:SingleJet', 'BW:Jets'], -1],
-        ['j45_bperf_split_3j45',                   77,    'L1_3J15',[], [PhysicsStream], ['RATE:MultiJet', 'BW:Jets'], -1],
-        ['j45_bperf_split_3j45_L13J150ETA24',      78,    'L1_3J15.0ETA24',[], [PhysicsStream], ['RATE:MultiJet', 'BW:Jets'], -1],
-        ['j45_bperf_split_3j45_L13J20',            79,    'L1_3J20',[], [PhysicsStream], ['RATE:MultiJet', 'BW:Jets'], -1],
+        ['j55_bperf_split',                           'L1_J20',[],  [PhysicsStream], ['RATE:SingleBJet', 'BW:Jets'], -1],
+        ['j45_bperf_split_3j45',                      'L1_3J15',[], [PhysicsStream], ['RATE:SingleBJet', 'BW:Jets'], -1],
+        ['j45_bperf_split_3j45_L13J150ETA24',         'L1_3J15.0ETA24',[], [PhysicsStream], ['RATE:SingleBJet', 'BW:Jets'], -1],
+        ['j45_bperf_split_3j45_L13J20',               'L1_3J20',[], [PhysicsStream], ['RATE:SingleBJet', 'BW:Jets'], -1],
+
+        # VBF triggers
+
+        ['2j55_bloose',                                                  'L1_J30_2J20_4J20.0ETA49_400INVM9999-AJ30s6-AJ20s6', [], [PhysicsStream], ['RATE:MultiBJet', 'BW:Jets'], -1],
+        ['2j55_bloose_L1J30_2J20_4J20.0ETA49_700INVM9999-AJ30s6-AJ20s6', 'L1_J30_2J20_4J20.0ETA49_700INVM9999-AJ30s6-AJ20s6', [], [PhysicsStream], ['RATE:MultiBJet', 'BW:Jets'], -1],
+        ['2j55_bloose_L1J30_2J20_4J20.0ETA49_800INVM9999-AJ30s6-AJ20s6', 'L1_J30_2J20_4J20.0ETA49_800INVM9999-AJ30s6-AJ20s6', [], [PhysicsStream], ['RATE:MultiBJet', 'BW:Jets'], -1],
+        ['2j55_bloose_L1J30_2J20_4J20.0ETA49_900INVM9999-AJ30s6-AJ20s6', 'L1_J30_2J20_4J20.0ETA49_900INVM9999-AJ30s6-AJ20s6', [], [PhysicsStream], ['RATE:MultiBJet', 'BW:Jets'], -1],
+
+        ['2j55_bloose_L13J20_4J20.0ETA49_400INVM9999-AJ30s6-AJ20s6', 'L1_3J20_4J20.0ETA49_400INVM9999-AJ30s6-AJ20s6', [''], [PhysicsStream], ['RATE:MultiBJet', 'BW:Jets'], -1],
+        ['2j55_bloose_L13J20_4J20.0ETA49_700INVM9999-AJ30s6-AJ20s6', 'L1_3J20_4J20.0ETA49_700INVM9999-AJ30s6-AJ20s6', [''], [PhysicsStream], ['RATE:MultiBJet', 'BW:Jets'], -1],
+        ['2j55_bloose_L13J20_4J20.0ETA49_800INVM9999-AJ30s6-AJ20s6', 'L1_3J20_4J20.0ETA49_800INVM9999-AJ30s6-AJ20s6', [''], [PhysicsStream], ['RATE:MultiBJet', 'BW:Jets'], -1],
+        ['2j55_bloose_L13J20_4J20.0ETA49_900INVM9999-AJ30s6-AJ20s6', 'L1_3J20_4J20.0ETA49_900INVM9999-AJ30s6-AJ20s6', [''], [PhysicsStream], ['RATE:MultiBJet', 'BW:Jets'], -1],
+
+        ['2j55_bmedium',                                              'L1_3J20_4J20.0ETA49_400INVM9999-AJ30s6-AJ20s6', [], [PhysicsStream], ['RATE:MultiBJet', 'BW:Jets'], -1],
+        ['2j55_bmedium_L13J20_4J20.0ETA49_700INVM9999-AJ30s6-AJ20s6', 'L1_3J20_4J20.0ETA49_700INVM9999-AJ30s6-AJ20s6', [], [PhysicsStream], ['RATE:MultiBJet', 'BW:Jets'], -1],
+        ['2j55_bmedium_L13J20_4J20.0ETA49_800INVM9999-AJ30s6-AJ20s6', 'L1_3J20_4J20.0ETA49_800INVM9999-AJ30s6-AJ20s6', [], [PhysicsStream], ['RATE:MultiBJet', 'BW:Jets'], -1],
+        ['2j55_bmedium_L13J20_4J20.0ETA49_900INVM9999-AJ30s6-AJ20s6', 'L1_3J20_4J20.0ETA49_900INVM9999-AJ30s6-AJ20s6', [], [PhysicsStream], ['RATE:MultiBJet', 'BW:Jets'], -1],
+
+        ['2j55_bmedium_L1J30_2J20_4J20.0ETA49_400INVM9999-AJ30s6-AJ20s6', 'L1_J30_2J20_4J20.0ETA49_400INVM9999-AJ30s6-AJ20s6', [], [PhysicsStream], ['RATE:MultiBJet', 'BW:Jets'], -1],
+        ['2j55_bmedium_L1J30_2J20_4J20.0ETA49_700INVM9999-AJ30s6-AJ20s6', 'L1_J30_2J20_4J20.0ETA49_700INVM9999-AJ30s6-AJ20s6', [], [PhysicsStream], ['RATE:MultiBJet', 'BW:Jets'], -1],
+        ['2j55_bmedium_L1J30_2J20_4J20.0ETA49_800INVM9999-AJ30s6-AJ20s6', 'L1_J30_2J20_4J20.0ETA49_800INVM9999-AJ30s6-AJ20s6', [], [PhysicsStream], ['RATE:MultiBJet', 'BW:Jets'], -1],
+        ['2j55_bmedium_L1J30_2J20_4J20.0ETA49_900INVM9999-AJ30s6-AJ20s6', 'L1_J30_2J20_4J20.0ETA49_900INVM9999-AJ30s6-AJ20s6', [], [PhysicsStream], ['RATE:MultiBJet', 'BW:Jets'], -1],
 
         # boffperf chains
-        ### ['j55_boffperf_split',                     80,    'L1_J20',[],  [PhysicsStream], ['RATE:MultiJet', 'BW:Jets'], -1],
-        ### ['j45_boffperf_split_3j45',                81,    'L1_3J15',[], [PhysicsStream], ['RATE:MultiJet', 'BW:Jets'], -1],
-        ### ['j45_boffperf_split_3j45_L13J150ETA24',   82,    'L1_3J15.0ETA24',[], [PhysicsStream], ['RATE:MultiJet', 'BW:Jets'], -1],
-        ### ['j45_boffperf_split_3j45_L13J20',         83,    'L1_3J20',[], [PhysicsStream], ['RATE:MultiJet', 'BW:Jets'], -1],
+        ### ['j55_boffperf_split',                       'L1_J20',[],  [PhysicsStream], ['RATE:SingleBJet', 'BW:Jets'], -1],
+        ### ['j45_boffperf_split_3j45',                  'L1_3J15',[], [PhysicsStream], ['RATE:SingleBJet', 'BW:Jets'], -1],
+        ### ['j45_boffperf_split_3j45_L13J150ETA24',     'L1_3J15.0ETA24',[], [PhysicsStream], ['RATE:SingleBJet', 'BW:Jets'], -1],
+        ### ['j45_boffperf_split_3j45_L13J20',           'L1_3J20',[], [PhysicsStream], ['RATE:SingleBJet', 'BW:Jets'], -1],
        
         ### the existing chains        
-        ### ['j175_bmedium',                 15,    'L1_J100',[], [PhysicsStream], ['RATE:MultiJet', 'BW:Jets'], -1],
-        ### ['j75_bmedium_3j75',             16,    'L1_4J20',[], [PhysicsStream], ['RATE:MultiJet', 'BW:Jets'], -1],
-        ### ['2j55_bmedium_2j55',            17,    'L1_4J20',[], [PhysicsStream], ['RATE:MultiJet', 'BW:Jets'], -1],
-        ### ['2j45_bmedium_3j45',            18,    'L1_5J15.0ETA24',[], [PhysicsStream], ['RATE:MultiJet', 'BW:Jets'], -1],
-        ### ['j175_bmedium_j60_bmedium',     19,    'L1_J100',[], [PhysicsStream], ['RATE:MultiJet', 'BW:Jets'], -1],        
-        ### ['j300_bloose',                   9,    'L1_J100',[], [PhysicsStream], ['RATE:MultiJet', 'BW:Jets'], -1],
+        ### ['j175_bmedium',                 'L1_J100',[], [PhysicsStream], ['RATE:SingleBJet', 'BW:Jets'], -1],
+        ### ['j75_bmedium_3j75',             'L1_4J20',[], [PhysicsStream], ['RATE:SingleBJet', 'BW:Jets'], -1],
+        ### ['2j55_bmedium_2j55',            'L1_4J20',[], [PhysicsStream], ['RATE:MultiBJet', 'BW:Jets'], -1],
+        ### ['2j45_bmedium_3j45',            'L1_5J15.0ETA24',[], [PhysicsStream], ['RATE:MultiBJet', 'BW:Jets'], -1],
+        ### ['j175_bmedium_j60_bmedium',     'L1_J100',[], [PhysicsStream], ['RATE:SingleBJet', 'BW:Jets'], -1],        
+        ### ['j300_bloose',                  'L1_J100',[], [PhysicsStream], ['RATE:MultiBJet', 'BW:Jets'], -1],
         ###
-        ### ['j175_bmedium_split',                 36,    'L1_J100',[], [PhysicsStream], ['RATE:MultiJet', 'BW:Jets'], -1],
-        ### ['j75_bmedium_split_3j75',             37,    'L1_4J20',[], [PhysicsStream], ['RATE:MultiJet', 'BW:Jets'], -1],
-        ### ['2j55_bmedium_split_2j55',            38,    'L1_4J20',[], [PhysicsStream], ['RATE:MultiJet', 'BW:Jets'], -1],
-        ### ['2j45_bmedium_split_3j45',            39,    'L1_5J15.0ETA24',[], [PhysicsStream], ['RATE:MultiJet', 'BW:Jets'], -1],
-        ###['j175_bmedium_split_j60_bmedium_split',40,   'L1_J100',[], [PhysicsStream], ['RATE:MultiJet', 'BW:Jets'], -1],
-        ### ['j300_bloose_split',                   41,   'L1_J100',[], [PhysicsStream], ['RATE:MultiJet', 'BW:Jets'], -1],
+        ### ['j175_bmedium_split',                    'L1_J100',[], [PhysicsStream], ['RATE:SingleBJet', 'BW:Jets'], -1],
+        ### ['j75_bmedium_split_3j75',                'L1_4J20',[], [PhysicsStream], ['RATE:SingleBJet', 'BW:Jets'], -1],
+        ### ['2j55_bmedium_split_2j55',               'L1_4J20',[], [PhysicsStream], ['RATE:MultiBJet', 'BW:Jets'], -1],
+        ### ['2j45_bmedium_split_3j45',               'L1_5J15.0ETA24',[], [PhysicsStream], ['RATE:MultiBJet', 'BW:Jets'], -1],
+        ###['j175_bmedium_split_j60_bmedium_split',  'L1_J100',[], [PhysicsStream], ['RATE:SingleBJet', 'BW:Jets'], -1],
+        ### ['j300_bloose_split',                     'L1_J100',[], [PhysicsStream], ['RATE:SingleBJet', 'BW:Jets'], -1],
         # split configuration:
-        ### ['j55_bperf_split',                    32,    'L1_J20',[], [PhysicsStream], ['RATE:MultiJet', 'BW:Jets'], -1],
-        ### ['j45_bperf_split_3j45',               33,    'L1_3J15',[], [PhysicsStream], ['RATE:MultiJet', 'BW:Jets'], -1],
-        ### ['j45_bperf_split_3j45_L13J150ETA24',  34,    'L1_3J15.0ETA24',[], [PhysicsStream], ['RATE:MultiJet', 'BW:Jets'], -1],
-        ### ['j45_bperf_split_3j45_L13J20',        35,    'L1_3J20',[], [PhysicsStream], ['RATE:MultiJet', 'BW:Jets'], -1],
+        ### ['j55_bperf_split',                       'L1_J20',[], [PhysicsStream], ['RATE:SingleBJet', 'BW:Jets'], -1],
+        ### ['j45_bperf_split_3j45',                  'L1_3J15',[], [PhysicsStream], ['RATE:SingleBJet', 'BW:Jets'], -1],
+        ### ['j45_bperf_split_3j45_L13J150ETA24',     'L1_3J15.0ETA24',[], [PhysicsStream], ['RATE:SingleBJet', 'BW:Jets'], -1],
+        ### ['j45_bperf_split_3j45_L13J20',           'L1_3J20',[], [PhysicsStream], ['RATE:SingleBJet', 'BW:Jets'], -1],
         ]
 
     TriggerFlags.METSlice.signatures = TriggerFlags.METSlice.signatures() + [ 
 
         ##add muon corrections
 
-        ['xe35_wEFMu',                     8050, 'L1_XE35', [], [PhysicsStream], ['RATE:MET', 'BW:MET'], -1],
-        ['xe35_tc_lcw_wEFMu',              8051, 'L1_XE35', [], [PhysicsStream], ['RATE:MET', 'BW:MET'], -1],
-        ['xe35_tc_em_wEFMu',               8052, 'L1_XE35', [], [PhysicsStream], ['RATE:MET', 'BW:MET'], -1],
-        ['xe35_mht_wEFMu',                 8053, 'L1_XE35', [], [PhysicsStream], ['RATE:MET', 'BW:MET'], -1],
-        ['xe35_pueta_wEFMu',               8054, 'L1_XE35', [], [PhysicsStream], ['RATE:MET', 'BW:MET'], -1],
-        ['xe35_pufit_wEFMu',               8055, 'L1_XE35', [], [PhysicsStream], ['RATE:MET', 'BW:MET'], -1],
-
-        ['xe60_wEFMu',                     8056, 'L1_XE40', [], [PhysicsStream], ['RATE:MET', 'BW:MET'], -1],
-        ['xe60_tc_lcw_wEFMu',              8057, 'L1_XE40', [], [PhysicsStream], ['RATE:MET', 'BW:MET'], -1],
-        ['xe60_tc_em_wEFMu',               8058, 'L1_XE40', [], [PhysicsStream], ['RATE:MET', 'BW:MET'], -1],
-        ['xe60_mht_wEFMu',                 8059, 'L1_XE40', [], [PhysicsStream], ['RATE:MET', 'BW:MET'], -1],
-        ['xe60_pueta_wEFMu',               8060, 'L1_XE40', [], [PhysicsStream], ['RATE:MET', 'BW:MET'], -1],
-        ['xe60_pufit_wEFMu',               8061, 'L1_XE40', [], [PhysicsStream], ['RATE:MET', 'BW:MET'], -1],
-
-        ['xe70_wEFMu',                     8062, 'L1_XE50', [], [PhysicsStream], ['RATE:MET', 'BW:MET'], -1],
-        ['xe70_tc_lcw_wEFMu',              8063, 'L1_XE50', [], [PhysicsStream], ['RATE:MET', 'BW:MET'], -1],
-        ['xe70_tc_em_wEFMu',               8064, 'L1_XE50', [], [PhysicsStream], ['RATE:MET', 'BW:MET'], -1],
-        ['xe70_mht_wEFMu',                 8065, 'L1_XE50', [], [PhysicsStream], ['RATE:MET', 'BW:MET'], -1],
-        ['xe70_pueta_wEFMu',               8066, 'L1_XE50', [], [PhysicsStream], ['RATE:MET', 'BW:MET'], -1],
-        ['xe70_pufit_wEFMu',               8067, 'L1_XE50', [], [PhysicsStream], ['RATE:MET', 'BW:MET'], -1],
+        ['xe35_wEFMu',                    'L1_XE35', [], [PhysicsStream], ['RATE:MET', 'BW:MET'], -1],
+        ['xe35_tc_lcw_wEFMu',             'L1_XE35', [], [PhysicsStream], ['RATE:MET', 'BW:MET'], -1],
+        ['xe35_tc_em_wEFMu',              'L1_XE35', [], [PhysicsStream], ['RATE:MET', 'BW:MET'], -1],
+        ['xe35_mht_wEFMu',                'L1_XE35', [], [PhysicsStream], ['RATE:MET', 'BW:MET'], -1],
+        ['xe35_pueta_wEFMu',              'L1_XE35', [], [PhysicsStream], ['RATE:MET', 'BW:MET'], -1],
+        ['xe35_pufit_wEFMu',              'L1_XE35', [], [PhysicsStream], ['RATE:MET', 'BW:MET'], -1],
+
+        ['xe60_wEFMu',                    'L1_XE40', [], [PhysicsStream], ['RATE:MET', 'BW:MET'], -1],
+        ['xe60_tc_lcw_wEFMu',             'L1_XE40', [], [PhysicsStream], ['RATE:MET', 'BW:MET'], -1],
+        ['xe60_tc_em_wEFMu',              'L1_XE40', [], [PhysicsStream], ['RATE:MET', 'BW:MET'], -1],
+        ['xe60_mht_wEFMu',                'L1_XE40', [], [PhysicsStream], ['RATE:MET', 'BW:MET'], -1],
+        ['xe60_pueta_wEFMu',              'L1_XE40', [], [PhysicsStream], ['RATE:MET', 'BW:MET'], -1],
+        ['xe60_pufit_wEFMu',              'L1_XE40', [], [PhysicsStream], ['RATE:MET', 'BW:MET'], -1],
+
+        ['xe70_wEFMu',                    'L1_XE50', [], [PhysicsStream], ['RATE:MET', 'BW:MET'], -1],
+        ['xe70_tc_lcw_wEFMu',             'L1_XE50', [], [PhysicsStream], ['RATE:MET', 'BW:MET'], -1],
+        ['xe70_tc_em_wEFMu',              'L1_XE50', [], [PhysicsStream], ['RATE:MET', 'BW:MET'], -1],
+        ['xe70_mht_wEFMu',                'L1_XE50', [], [PhysicsStream], ['RATE:MET', 'BW:MET'], -1],
+        ['xe70_pueta_wEFMu',              'L1_XE50', [], [PhysicsStream], ['RATE:MET', 'BW:MET'], -1],
+        ['xe70_pufit_wEFMu',              'L1_XE50', [], [PhysicsStream], ['RATE:MET', 'BW:MET'], -1],
 
         ####defaul chains
 
-        ['xe35',                     520, 'L1_XE35', [], [PhysicsStream], ['RATE:MET', 'BW:MET'], -1],
-        ['xe35_tc_lcw',              521, 'L1_XE35', [], [PhysicsStream], ['RATE:MET', 'BW:MET'], -1],
-        ['xe35_tc_em',               522, 'L1_XE35', [], [PhysicsStream], ['RATE:MET', 'BW:MET'], -1],
-        ['xe35_mht',                 523, 'L1_XE35', [], [PhysicsStream], ['RATE:MET', 'BW:MET'], -1],
-        ['xe35_pueta',               524, 'L1_XE35', [], [PhysicsStream], ['RATE:MET', 'BW:MET'], -1],
-        ['xe35_pufit',               525, 'L1_XE35', [], [PhysicsStream], ['RATE:MET', 'BW:MET'], -1],
-
-        ['xe60',                     526, 'L1_XE40', [], [PhysicsStream], ['RATE:MET', 'BW:MET'], -1],
-        ['xe60_tc_lcw',              527, 'L1_XE40', [], [PhysicsStream], ['RATE:MET', 'BW:MET'], -1],
-        ['xe60_tc_em',               528, 'L1_XE40', [], [PhysicsStream], ['RATE:MET', 'BW:MET'], -1],
-        ['xe60_mht',                 529, 'L1_XE40', [], [PhysicsStream], ['RATE:MET', 'BW:MET'], -1],
-        ['xe60_pueta',               530, 'L1_XE40', [], [PhysicsStream], ['RATE:MET', 'BW:MET'], -1],
-        ['xe60_pufit',               531, 'L1_XE40', [], [PhysicsStream], ['RATE:MET', 'BW:MET'], -1],
-
-        ['xe70',                     532, 'L1_XE50', [], [PhysicsStream], ['RATE:MET', 'BW:MET'], -1],
-        ['xe70_tc_lcw',              533, 'L1_XE50', [], [PhysicsStream], ['RATE:MET', 'BW:MET'], -1],
-        ['xe70_tc_em',               534, 'L1_XE50', [], [PhysicsStream], ['RATE:MET', 'BW:MET'], -1],
-        ['xe70_mht',                 535, 'L1_XE50', [], [PhysicsStream], ['RATE:MET', 'BW:MET'], -1],
-        ['xe70_pueta',               536, 'L1_XE50', [], [PhysicsStream], ['RATE:MET', 'BW:MET'], -1],
-        ['xe70_pufit',               537, 'L1_XE50', [], [PhysicsStream], ['RATE:MET', 'BW:MET'], -1],
-
-        ['xe80_L1XE50',              538, 'L1_XE50', [], [PhysicsStream], ['RATE:MET', 'BW:MET'], -1],
-        ['xe80_tc_lcw_L1XE50',       539, 'L1_XE50', [], [PhysicsStream], ['RATE:MET', 'BW:MET'], -1],
-        ['xe80_tc_em_L1XE50',        540, 'L1_XE50', [], [PhysicsStream], ['RATE:MET', 'BW:MET'], -1],
-        ['xe80_mht_L1XE50',          541, 'L1_XE50', [], [PhysicsStream], ['RATE:MET', 'BW:MET'], -1],
-        ['xe80_pueta_L1XE50',        542, 'L1_XE50', [], [PhysicsStream], ['RATE:MET', 'BW:MET'], -1],
-        ['xe80_pufit_L1XE50',        543, 'L1_XE50', [], [PhysicsStream], ['RATE:MET', 'BW:MET'], -1],
-
-        ['xe80_L1XE50_wEFMu',        544, 'L1_XE50', [], [PhysicsStream], ['RATE:MET', 'BW:MET'], -1],
-        ['xe80_tc_lcw_L1XE50_wEFMu', 545, 'L1_XE50', [], [PhysicsStream], ['RATE:MET', 'BW:MET'], -1],
-        ['xe80_tc_em_L1XE50_wEFMu',  546, 'L1_XE50', [], [PhysicsStream], ['RATE:MET', 'BW:MET'], -1],
-        ['xe80_mht_L1XE50_wEFMu',    547, 'L1_XE50', [], [PhysicsStream], ['RATE:MET', 'BW:MET'], -1],
-        ['xe80_pueta_L1XE50_wEFMu',  548, 'L1_XE50', [], [PhysicsStream], ['RATE:MET', 'BW:MET'], -1],
-        ['xe80_pufit_L1XE50_wEFMu',  549, 'L1_XE50', [], [PhysicsStream], ['RATE:MET', 'BW:MET'], -1],
-
-        ['xe80',                     550, 'L1_XE60', [], [PhysicsStream], ['RATE:MET', 'BW:MET'], -1],
-        ['xe80_tc_lcw',              551, 'L1_XE60', [], [PhysicsStream], ['RATE:MET', 'BW:MET'], -1],
-        ['xe80_tc_em',               552, 'L1_XE60', [], [PhysicsStream], ['RATE:MET', 'BW:MET'], -1],
-        ['xe80_mht',                 553, 'L1_XE60', [], [PhysicsStream], ['RATE:MET', 'BW:MET'], -1],
-        ['xe80_pueta',               554, 'L1_XE60', [], [PhysicsStream], ['RATE:MET', 'BW:MET'], -1],
-        ['xe80_pufit',               555, 'L1_XE60', [], [PhysicsStream], ['RATE:MET', 'BW:MET'], -1],
-
-        ['xe80_wEFMu',               556, 'L1_XE60', [], [PhysicsStream], ['RATE:MET', 'BW:MET'], -1],
-        ['xe80_tc_lcw_wEFMu',        557, 'L1_XE60', [], [PhysicsStream], ['RATE:MET', 'BW:MET'], -1],
-        ['xe80_tc_em_wEFMu',         558, 'L1_XE60', [], [PhysicsStream], ['RATE:MET', 'BW:MET'], -1],
-        ['xe80_mht_wEFMu',           559, 'L1_XE60', [], [PhysicsStream], ['RATE:MET', 'BW:MET'], -1],
-        ['xe80_pueta_wEFMu',         560, 'L1_XE60', [], [PhysicsStream], ['RATE:MET', 'BW:MET'], -1],
-        ['xe80_pufit_wEFMu',         561, 'L1_XE60', [], [PhysicsStream], ['RATE:MET', 'BW:MET'], -1],
-
-        ['xe80_L1XE70',              562, 'L1_XE70', [], [PhysicsStream], ['RATE:MET', 'BW:MET'], -1],
-        ['xe80_tc_lcw_L1XE70',       563, 'L1_XE70', [], [PhysicsStream], ['RATE:MET', 'BW:MET'], -1],
-        ['xe80_tc_em_L1XE70',        564, 'L1_XE70', [], [PhysicsStream], ['RATE:MET', 'BW:MET'], -1],
-        ['xe80_mht_L1XE70',          565, 'L1_XE70', [], [PhysicsStream], ['RATE:MET', 'BW:MET'], -1],
-        ['xe80_pueta_L1XE70',        566, 'L1_XE70', [], [PhysicsStream], ['RATE:MET', 'BW:MET'], -1],
-        ['xe80_pufit_L1XE70',        567, 'L1_XE70', [], [PhysicsStream], ['RATE:MET', 'BW:MET'], -1],
-
-        ['xe80_L1XE70_wEFMu',        568, 'L1_XE70', [], [PhysicsStream], ['RATE:MET', 'BW:MET'], -1],
-        ['xe80_tc_lcw_L1XE70_wEFMu', 569, 'L1_XE70', [], [PhysicsStream], ['RATE:MET', 'BW:MET'], -1],
-        ['xe80_tc_em_L1XE70_wEFMu',  570, 'L1_XE70', [], [PhysicsStream], ['RATE:MET', 'BW:MET'], -1],
-        ['xe80_mht_L1XE70_wEFMu',    571, 'L1_XE70', [], [PhysicsStream], ['RATE:MET', 'BW:MET'], -1],
-        ['xe80_pueta_L1XE70_wEFMu',  572, 'L1_XE70', [], [PhysicsStream], ['RATE:MET', 'BW:MET'], -1],
-        ['xe80_pufit_L1XE70_wEFMu',  573, 'L1_XE70', [], [PhysicsStream], ['RATE:MET', 'BW:MET'], -1],
-
-        ['xe100',                    574, 'L1_XE70', [], [PhysicsStream], ['RATE:MET', 'BW:MET'], -1],
-        ['xe100_tc_lcw',             575, 'L1_XE70', [], [PhysicsStream], ['RATE:MET', 'BW:MET'], -1],
-        ['xe100_tc_em',              576, 'L1_XE70', [], [PhysicsStream], ['RATE:MET', 'BW:MET'], -1],
-        ['xe100_mht',                577, 'L1_XE70', [], [PhysicsStream], ['RATE:MET', 'BW:MET'], -1],
-        ['xe100_pueta',              578, 'L1_XE70', [], [PhysicsStream], ['RATE:MET', 'BW:MET'], -1],
-        ['xe100_pufit',              579, 'L1_XE70', [], [PhysicsStream], ['RATE:MET', 'BW:MET'], -1],
-
-        ['xe100_wEFMu',              580, 'L1_XE70', [], [PhysicsStream], ['RATE:MET', 'BW:MET'], -1],
-        ['xe100_tc_lcw_wEFMu',       581, 'L1_XE70', [], [PhysicsStream], ['RATE:MET', 'BW:MET'], -1],
-        ['xe100_tc_em_wEFMu',        582, 'L1_XE70', [], [PhysicsStream], ['RATE:MET', 'BW:MET'], -1],
-        ['xe100_mht_wEFMu',          583, 'L1_XE70', [], [PhysicsStream], ['RATE:MET', 'BW:MET'], -1],
-        ['xe100_pueta_wEFMu',        584, 'L1_XE70', [], [PhysicsStream], ['RATE:MET', 'BW:MET'], -1],
-        ['xe100_pufit_wEFMu',        585, 'L1_XE70', [], [PhysicsStream], ['RATE:MET', 'BW:MET'], -1],
+        ['xe60',                     'L1_XE40', [], [PhysicsStream], ['RATE:MET', 'BW:MET'], -1],
+        ['xe60_tc_lcw',              'L1_XE40', [], [PhysicsStream], ['RATE:MET', 'BW:MET'], -1],
+        ['xe60_tc_em',               'L1_XE40', [], [PhysicsStream], ['RATE:MET', 'BW:MET'], -1],
+        ['xe60_mht',                 'L1_XE40', [], [PhysicsStream], ['RATE:MET', 'BW:MET'], -1],
+        ['xe60_pueta',               'L1_XE40', [], [PhysicsStream], ['RATE:MET', 'BW:MET'], -1],
+        ['xe60_pufit',               'L1_XE40', [], [PhysicsStream], ['RATE:MET', 'BW:MET'], -1],
+
+        ['xe70',                     'L1_XE50', [], [PhysicsStream], ['RATE:MET', 'BW:MET'], -1],
+        ['xe70_tc_lcw',              'L1_XE50', [], [PhysicsStream], ['RATE:MET', 'BW:MET'], -1],
+        ['xe70_tc_em',               'L1_XE50', [], [PhysicsStream], ['RATE:MET', 'BW:MET'], -1],
+        ['xe70_mht',                 'L1_XE50', [], [PhysicsStream], ['RATE:MET', 'BW:MET'], -1],
+        ['xe70_pueta',               'L1_XE50', [], [PhysicsStream], ['RATE:MET', 'BW:MET'], -1],
+        ['xe70_pufit',               'L1_XE50', [], [PhysicsStream], ['RATE:MET', 'BW:MET'], -1],
+
+        ['xe80_L1XE50',              'L1_XE50', [], [PhysicsStream], ['RATE:MET', 'BW:MET'], -1],
+        ['xe80_tc_lcw_L1XE50',       'L1_XE50', [], [PhysicsStream], ['RATE:MET', 'BW:MET'], -1],
+        ['xe80_tc_em_L1XE50',        'L1_XE50', [], [PhysicsStream], ['RATE:MET', 'BW:MET'], -1],
+        ['xe80_mht_L1XE50',          'L1_XE50', [], [PhysicsStream], ['RATE:MET', 'BW:MET'], -1],
+        ['xe80_pueta_L1XE50',        'L1_XE50', [], [PhysicsStream], ['RATE:MET', 'BW:MET'], -1],
+        ['xe80_pufit_L1XE50',        'L1_XE50', [], [PhysicsStream], ['RATE:MET', 'BW:MET'], -1],
+
+        ['xe80_L1XE50_wEFMu',        'L1_XE50', [], [PhysicsStream], ['RATE:MET', 'BW:MET'], -1],
+        ['xe80_tc_lcw_L1XE50_wEFMu', 'L1_XE50', [], [PhysicsStream], ['RATE:MET', 'BW:MET'], -1],
+        ['xe80_tc_em_L1XE50_wEFMu',  'L1_XE50', [], [PhysicsStream], ['RATE:MET', 'BW:MET'], -1],
+        ['xe80_mht_L1XE50_wEFMu',    'L1_XE50', [], [PhysicsStream], ['RATE:MET', 'BW:MET'], -1],
+        ['xe80_pueta_L1XE50_wEFMu',  'L1_XE50', [], [PhysicsStream], ['RATE:MET', 'BW:MET'], -1],
+        ['xe80_pufit_L1XE50_wEFMu',  'L1_XE50', [], [PhysicsStream], ['RATE:MET', 'BW:MET'], -1],
+
+        ['xe80',                     'L1_XE60', [], [PhysicsStream], ['RATE:MET', 'BW:MET'], -1],
+        ['xe80_tc_lcw',              'L1_XE60', [], [PhysicsStream], ['RATE:MET', 'BW:MET'], -1],
+        ['xe80_tc_em',               'L1_XE60', [], [PhysicsStream], ['RATE:MET', 'BW:MET'], -1],
+        ['xe80_mht',                 'L1_XE60', [], [PhysicsStream], ['RATE:MET', 'BW:MET'], -1],
+        ['xe80_pueta',               'L1_XE60', [], [PhysicsStream], ['RATE:MET', 'BW:MET'], -1],
+        ['xe80_pufit',               'L1_XE60', [], [PhysicsStream], ['RATE:MET', 'BW:MET'], -1],
+
+        ['xe80_wEFMu',               'L1_XE60', [], [PhysicsStream], ['RATE:MET', 'BW:MET'], -1],
+        ['xe80_tc_lcw_wEFMu',        'L1_XE60', [], [PhysicsStream], ['RATE:MET', 'BW:MET'], -1],
+        ['xe80_tc_em_wEFMu',         'L1_XE60', [], [PhysicsStream], ['RATE:MET', 'BW:MET'], -1],
+        ['xe80_mht_wEFMu',           'L1_XE60', [], [PhysicsStream], ['RATE:MET', 'BW:MET'], -1],
+        ['xe80_pueta_wEFMu',         'L1_XE60', [], [PhysicsStream], ['RATE:MET', 'BW:MET'], -1],
+        ['xe80_pufit_wEFMu',         'L1_XE60', [], [PhysicsStream], ['RATE:MET', 'BW:MET'], -1],
+
+        ['xe80_L1XE70',              'L1_XE70', [], [PhysicsStream], ['RATE:MET', 'BW:MET'], -1],
+        ['xe80_tc_lcw_L1XE70',       'L1_XE70', [], [PhysicsStream], ['RATE:MET', 'BW:MET'], -1],
+        ['xe80_tc_em_L1XE70',        'L1_XE70', [], [PhysicsStream], ['RATE:MET', 'BW:MET'], -1],
+        ['xe80_mht_L1XE70',          'L1_XE70', [], [PhysicsStream], ['RATE:MET', 'BW:MET'], -1],
+        ['xe80_pueta_L1XE70',        'L1_XE70', [], [PhysicsStream], ['RATE:MET', 'BW:MET'], -1],
+        ['xe80_pufit_L1XE70',        'L1_XE70', [], [PhysicsStream], ['RATE:MET', 'BW:MET'], -1],
+
+        ['xe80_L1XE70_wEFMu',        'L1_XE70', [], [PhysicsStream], ['RATE:MET', 'BW:MET'], -1],
+        ['xe80_tc_lcw_L1XE70_wEFMu', 'L1_XE70', [], [PhysicsStream], ['RATE:MET', 'BW:MET'], -1],
+        ['xe80_tc_em_L1XE70_wEFMu',  'L1_XE70', [], [PhysicsStream], ['RATE:MET', 'BW:MET'], -1],
+        ['xe80_mht_L1XE70_wEFMu',    'L1_XE70', [], [PhysicsStream], ['RATE:MET', 'BW:MET'], -1],
+        ['xe80_pueta_L1XE70_wEFMu',  'L1_XE70', [], [PhysicsStream], ['RATE:MET', 'BW:MET'], -1],
+        ['xe80_pufit_L1XE70_wEFMu',  'L1_XE70', [], [PhysicsStream], ['RATE:MET', 'BW:MET'], -1],
+
+        ['xe100',                    'L1_XE70', [], [PhysicsStream], ['RATE:MET', 'BW:MET'], -1],
+        ['xe100_tc_lcw',             'L1_XE70', [], [PhysicsStream], ['RATE:MET', 'BW:MET'], -1],
+        ['xe100_tc_em',              'L1_XE70', [], [PhysicsStream], ['RATE:MET', 'BW:MET'], -1],
+        ['xe100_mht',                'L1_XE70', [], [PhysicsStream], ['RATE:MET', 'BW:MET'], -1],
+        ['xe100_pueta',              'L1_XE70', [], [PhysicsStream], ['RATE:MET', 'BW:MET'], -1],
+        ['xe100_pufit',              'L1_XE70', [], [PhysicsStream], ['RATE:MET', 'BW:MET'], -1],
+
+        ['xe100_wEFMu',              'L1_XE70', [], [PhysicsStream], ['RATE:MET', 'BW:MET'], -1],
+        ['xe100_tc_lcw_wEFMu',       'L1_XE70', [], [PhysicsStream], ['RATE:MET', 'BW:MET'], -1],
+        ['xe100_tc_em_wEFMu',        'L1_XE70', [], [PhysicsStream], ['RATE:MET', 'BW:MET'], -1],
+        ['xe100_mht_wEFMu',          'L1_XE70', [], [PhysicsStream], ['RATE:MET', 'BW:MET'], -1],
+        ['xe100_pueta_wEFMu',        'L1_XE70', [], [PhysicsStream], ['RATE:MET', 'BW:MET'], -1],
+        ['xe100_pufit_wEFMu',        'L1_XE70', [], [PhysicsStream], ['RATE:MET', 'BW:MET'], -1],
 
         # Rerun chains
-        ['xe0noL1_l2fsperf',         586, '',        [], [PhysicsStream], ['RATE:MET', 'BW:MET'], -1],
-        ['xe0noL1_l2fsperf_tc_lcw',  587, '',        [], [PhysicsStream], ['RATE:MET', 'BW:MET'], -1],
-        ['xe0noL1_l2fsperf_tc_em',   588, '',        [], [PhysicsStream], ['RATE:MET', 'BW:MET'], -1],
-        ['xe0noL1_l2fsperf_mht',     589, '',        [], [PhysicsStream], ['RATE:MET', 'BW:MET'], -1],
-        ['xe0noL1_l2fsperf_pueta',   590, '',        [], [PhysicsStream], ['RATE:MET', 'BW:MET'], -1],
-        ['xe0noL1_l2fsperf_pufit',   591, '',        [], [PhysicsStream], ['RATE:MET', 'BW:MET'], -1],
+        ['xe0noL1_l2fsperf',         '',        [], [PhysicsStream], ['RATE:MET', 'BW:MET'], -1],
+        ['xe0noL1_l2fsperf_tc_lcw',  '',        [], [PhysicsStream], ['RATE:MET', 'BW:MET'], -1],
+        ['xe0noL1_l2fsperf_tc_em',   '',        [], [PhysicsStream], ['RATE:MET', 'BW:MET'], -1],
+        ['xe0noL1_l2fsperf_mht',     '',        [], [PhysicsStream], ['RATE:MET', 'BW:MET'], -1],
+        ['xe0noL1_l2fsperf_pueta',   '',        [], [PhysicsStream], ['RATE:MET', 'BW:MET'], -1],
+        ['xe0noL1_l2fsperf_pufit',   '',        [], [PhysicsStream], ['RATE:MET', 'BW:MET'], -1],
 
         ]
 
     TriggerFlags.TauSlice.signatures = TriggerFlags.TauSlice.signatures() + [
-        ['tau20_r1medium1',              5123,          'L1_TAU12', [], [PhysicsStream], ['RATE:SingleTau', 'BW:Tau'], -1],
-        ['tau20_r1perf',                 5124,          'L1_TAU12', [], [PhysicsStream], ['RATE:SingleTau', 'BW:Tau'], -1],
-        ['tau20_r1_idperf',              5125,          'L1_TAU12', [], [PhysicsStream], ['RATE:IDMonitoring', 'BW:Tau'], -1],
-        ['tau25_medium1_calo',           5126,          'L1_TAU12', [], [PhysicsStream], ['RATE:SingleTau', 'BW:Tau'], -1],
-        ['tau25_medium1_track',          5127,          'L1_TAU12', [], [PhysicsStream], ['RATE:SingleTau', 'BW:Tau'], -1],
-        ['tau25_medium1_tracktwo',       5151,          'L1_TAU12', [], [PhysicsStream], ['RATE:SingleTau', 'BW:Tau'], -1],
-        ['tau25_medium1_ptonly',         5128,          'L1_TAU12', [], [PhysicsStream], ['RATE:SingleTau', 'BW:Tau'], -1],
-        ['tau25_medium1_caloonly',       5129,          'L1_TAU12', [], [PhysicsStream], ['RATE:SingleTau', 'BW:Tau'], -1],
-        ['tau25_medium1_trackonly',      5130,          'L1_TAU12', [], [PhysicsStream], ['RATE:SingleTau', 'BW:Tau'], -1],
-        ['tau25_medium1_mvonly',         5131,          'L1_TAU12', [], [PhysicsStream], ['RATE:SingleTau', 'BW:Tau'], -1],
-        ['tau25_r1perf',                 5132,          'L1_TAU12', [], [PhysicsStream], ['RATE:SingleTau', 'BW:Tau'], -1],
-        ['tau25_r1perf_L1TAU6',          5133,          'L1_TAU6',  [], [PhysicsStream], ['RATE:SingleTau', 'BW:Tau'], -1],
-        ['tau25_medium1_mvonly_L1TAU6',  5134,          'L1_TAU6',  [], [PhysicsStream], ['RATE:SingleTau', 'BW:Tau'], -1],
-        ['tau25_perf',                   5135,          'L1_TAU12', [], [PhysicsStream], ['RATE:SingleTau', 'BW:Tau'], -1],
-        ['tau25_perf_L1TAU6',            5136,          'L1_TAU6',  [], [PhysicsStream], ['RATE:SingleTau', 'BW:Tau'], -1],
-        ['tau25_ptonly_idperf',          5137,          'L1_TAU12', [], [PhysicsStream], ['RATE:IDMonitoring', 'BW:Tau'], -1],
-        ['tau29_r1medium1',              5138,          'L1_TAU20', [], [PhysicsStream], ['RATE:SingleTau', 'BW:Tau'], -1],
-        ['tau29_r1perf',                 5139,          'L1_TAU20', [], [PhysicsStream], ['RATE:SingleTau', 'BW:Tau'], -1],
-        ['tau35_medium1_calo',           5140,          'L1_TAU20', [], [PhysicsStream], ['RATE:SingleTau', 'BW:Tau'], -1],
-        ['tau35_medium1_track',          5141,          'L1_TAU20', [], [PhysicsStream], ['RATE:SingleTau', 'BW:Tau'], -1],
-        ['tau35_medium1_ptonly',         5142,          'L1_TAU20', [], [PhysicsStream], ['RATE:SingleTau', 'BW:Tau'], -1],
-        ['tau35_perf',                   5143,          'L1_TAU20', [], [PhysicsStream], ['RATE:SingleTau', 'BW:Tau'], -1],
-        ['tau80_medium1_calo',           5144,          'L1_TAU40', [], [PhysicsStream], ['RATE:SingleTau', 'BW:Tau'], -1],
-        ['tau80_medium1_track',          5145,          'L1_TAU40', [], [PhysicsStream], ['RATE:SingleTau', 'BW:Tau'], -1],
-        ['tau125_r1medium1',             5146,          'L1_TAU60', [], [PhysicsStream], ['RATE:SingleTau', 'BW:Tau'], -1],
-        ['tau125_medium1_calo',          5147,          'L1_TAU60', [], [PhysicsStream], ['RATE:SingleTau', 'BW:Tau'], -1],
-        ['tau125_medium1_track',         5148,          'L1_TAU60', [], [PhysicsStream], ['RATE:SingleTau', 'BW:Tau'], -1],
-        ['tau125_r1perf',                5149,          'L1_TAU60', [], [PhysicsStream], ['RATE:SingleTau', 'BW:Tau'], -1],
-        ['tau125_perf',                  5150,          'L1_TAU60', [], [PhysicsStream], ['RATE:SingleTau', 'BW:Tau'], -1],
-        #['tau160_medium', 123, 'L1_TAU60',[], [PhysicsStream], [], -1]
+        ['tau20_r1medium1',                        'L1_TAU12', [], [PhysicsStream], ['RATE:SingleTau', 'BW:Tau'], -1],
+        ['tau20_r1perf',                           'L1_TAU12', [], [PhysicsStream], ['RATE:SingleTau', 'BW:Tau'], -1],
+        ['tau20_r1_idperf',                        'L1_TAU12', [], [PhysicsStream], ['RATE:IDMonitoring', 'BW:Tau'], -1],
+        ['tau25_medium1_calo',                     'L1_TAU12IM', [], [PhysicsStream], ['RATE:SingleTau', 'BW:Tau'], -1],
+        ['tau25_medium1_calo_L1TAU12',             'L1_TAU12', [], [PhysicsStream], ['RATE:SingleTau', 'BW:Tau'], -1],
+        ['tau25_medium1_track',                    'L1_TAU12', [], [PhysicsStream], ['RATE:SingleTau', 'BW:Tau'], -1],
+        ['tau25_medium1_tracktwo',                 'L1_TAU12', [], [PhysicsStream], ['RATE:SingleTau', 'BW:Tau'], -1],
+        ['tau25_medium1_ptonly',                   'L1_TAU12IM', [], [PhysicsStream], ['RATE:SingleTau', 'BW:Tau'], -1],
+        ['tau25_medium1_ptonly_L1TAU12',           'L1_TAU12', [], [PhysicsStream], ['RATE:SingleTau', 'BW:Tau'], -1],
+        ['tau25_medium1_caloonly',                 'L1_TAU12', [], [PhysicsStream], ['RATE:SingleTau', 'BW:Tau'], -1],
+        ['tau25_medium1_trackonly',                'L1_TAU12', [], [PhysicsStream], ['RATE:SingleTau', 'BW:Tau'], -1],
+        ['tau25_medium1_mvonly',                   'L1_TAU12', [], [PhysicsStream], ['RATE:SingleTau', 'BW:Tau'], -1],
+        ['tau25_r1perf',                           'L1_TAU12', [], [PhysicsStream], ['RATE:SingleTau', 'BW:Tau'], -1],
+        ['tau25_r1perf_L1TAU8',                    'L1_TAU8',  [], [PhysicsStream], ['RATE:SingleTau', 'BW:Tau'], -1],
+        ['tau25_medium1_mvonly_L1TAU8',            'L1_TAU8',  [], [PhysicsStream], ['RATE:SingleTau', 'BW:Tau'], -1],        
+        ['tau25_perf',                             'L1_TAU12', [], [PhysicsStream], ['RATE:SingleTau', 'BW:Tau'], -1],
+        ['tau25_perf_L1TAU8',                      'L1_TAU8',  [], [PhysicsStream], ['RATE:SingleTau', 'BW:Tau'], -1],
+        ['tau25_ptonly_idperf',                    'L1_TAU12', [], [PhysicsStream], ['RATE:IDMonitoring', 'BW:Tau'], -1],
+        ['tau29_r1medium1',                        'L1_TAU20', [], [PhysicsStream], ['RATE:SingleTau', 'BW:Tau'], -1],
+        ['tau29_r1perf',                           'L1_TAU20', [], [PhysicsStream], ['RATE:SingleTau', 'BW:Tau'], -1],
+        ['tau35_medium1_calo',                     'L1_TAU20IM', [], [PhysicsStream], ['RATE:SingleTau', 'BW:Tau'], -1],
+        ['tau35_medium1_calo_L1TAU20',             'L1_TAU20', [], [PhysicsStream], ['RATE:SingleTau', 'BW:Tau'], -1],
+        ['tau35_medium1_track',                    'L1_TAU20', [], [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_perf',                             'L1_TAU20', [], [PhysicsStream], ['RATE:SingleTau', 'BW:Tau'], -1],
+        ['tau80_medium1_calo',                     'L1_TAU40', [], [PhysicsStream], ['RATE:SingleTau', 'BW:Tau'], -1],
+        ['tau80_medium1_track',                    'L1_TAU40', [], [PhysicsStream], ['RATE:SingleTau', 'BW:Tau'], -1],
+        ['tau125_r1medium1',                       'L1_TAU60', [], [PhysicsStream], ['RATE:SingleTau', 'BW:Tau'], -1],
+        ['tau125_medium1_calo',                    'L1_TAU60', [], [PhysicsStream], ['RATE:SingleTau', 'BW:Tau'], -1],
+        ['tau125_medium1_track',                   'L1_TAU60', [], [PhysicsStream], ['RATE:SingleTau', 'BW:Tau'], -1],
+        ['tau125_r1perf',                          'L1_TAU60', [], [PhysicsStream], ['RATE:SingleTau', 'BW:Tau'], -1],
+        ['tau125_perf',                            'L1_TAU60', [], [PhysicsStream], ['RATE:SingleTau', 'BW:Tau'], -1],
+        #['tau160_medium', 'L1_TAU60',[], [PhysicsStream], [], -1]
         ]
 
 
@@ -577,461 +603,462 @@ def setupMenu():
         ##########        
         # Single electron triggers
         # Run2 cut-based:
-        ['e24_medium_iloose_L1EM18VH',          180, 'L1_EM18VH',    [], [PhysicsStream], ['RATE:SingleElectron', 'BW:Egamma'], 1],
-        ['e24_medium_iloose_L1EM20VH',          181, 'L1_EM20VH',    [], [PhysicsStream], ['RATE:SingleElectron', 'BW:Egamma'], 1],
-        ['e24_tight_iloose_L1EM20VH',           182, 'L1_EM20VH',    [], [PhysicsStream], ['RATE:SingleElectron', 'BW:Egamma'], 1],
-        ['e24_tight_iloose',                    183, 'L1_EM20VHI',   [], [PhysicsStream], ['RATE:SingleElectron', 'BW:Egamma'], 1], 
-        ['e26_tight_iloose',                    184, 'L1_EM22VHLIL', [], [PhysicsStream], ['RATE:SingleElectron', 'BW:Egamma'], 1], 
-        ['e60_medium',                          185, 'L1_EM50V',     [], [PhysicsStream], ['RATE:SingleElectron', 'BW:Egamma'], 1],
-        ['e120_loose',                          186, 'L1_EM50V',     [], [PhysicsStream], ['RATE:SingleElectron', 'BW:Egamma'], 1],
-        ['e140_loose',                          187, 'L1_EM50V',     [], [PhysicsStream], ['RATE:SingleElectron', 'BW:Egamma'], 1],
+        ['e24_medium_iloose_L1EM18VH',           'L1_EM18VH',    [], [PhysicsStream], ['RATE:SingleElectron', 'BW:Egamma'], 1],
+        ['e24_medium_iloose_L1EM20VH',           'L1_EM20VH',    [], [PhysicsStream], ['RATE:SingleElectron', 'BW:Egamma'], 1],
+        ['e24_tight_iloose_L1EM20VH',            'L1_EM20VH',    [], [PhysicsStream], ['RATE:SingleElectron', 'BW:Egamma'], 1],
+        ['e24_tight_iloose',                     'L1_EM20VHI',   [], [PhysicsStream], ['RATE:SingleElectron', 'BW:Egamma'], 1], 
+        ['e26_tight_iloose',                     'L1_EM22VHLIL', [], [PhysicsStream], ['RATE:SingleElectron', 'BW:Egamma'], 1], 
+        ['e60_medium',                           'L1_EM22VHLIL',     [], [PhysicsStream], ['RATE:SingleElectron', 'BW:Egamma'], 1],
+        ['e120_loose',                           'L1_EM22VHLIL',     [], [PhysicsStream], ['RATE:SingleElectron', 'BW:Egamma'], 1],
+        ['e140_loose',                           'L1_EM22VHLIL',     [], [PhysicsStream], ['RATE:SingleElectron', 'BW:Egamma'], 1],
         
         # likelihood-based:
-        ['e24_lhmedium_iloose_L1EM18VH',        188, 'L1_EM18VH',    [], [PhysicsStream], ['RATE:SingleElectron', 'BW:Egamma'], 1], 
-        ['e24_lhmedium_iloose_L1EM20VH',        189, 'L1_EM20VH',    [], [PhysicsStream], ['RATE:SingleElectron', 'BW:Egamma'], 1], 
-        ['e24_lhtight_iloose_L1EM20VH',         190, 'L1_EM20VH',    [], [PhysicsStream], ['RATE:SingleElectron', 'BW:Egamma'], 1], 
-        ['e24_lhtight_iloose',                  191, 'L1_EM20VHI',   [], [PhysicsStream], ['RATE:SingleElectron', 'BW:Egamma'], 1],
-        ['e26_lhtight_iloose',                  192, 'L1_EM22VHLIL', [], [PhysicsStream], ['RATE:SingleElectron', 'BW:Egamma'], 1], 
-        ['e60_lhmedium',                        193, 'L1_EM50V',     [], [PhysicsStream], ['RATE:SingleElectron', 'BW:Egamma'], 1], 
-        ['e120_lhloose',                        194, 'L1_EM50V',     [], [PhysicsStream], ['RATE:SingleElectron', 'BW:Egamma'], 1], 
-        ['e140_lhloose',                        195, 'L1_EM50V',     [], [PhysicsStream], ['RATE:SingleElectron', 'BW:Egamma'], 1], 
+        ['e24_lhmedium_iloose_L1EM18VH',         'L1_EM18VH',    [], [PhysicsStream], ['RATE:SingleElectron', 'BW:Egamma'], 1], 
+        ['e24_lhmedium_iloose_L1EM20VH',         'L1_EM20VH',    [], [PhysicsStream], ['RATE:SingleElectron', 'BW:Egamma'], 1], 
+        ['e24_lhtight_iloose_L1EM20VH',          'L1_EM20VH',    [], [PhysicsStream], ['RATE:SingleElectron', 'BW:Egamma'], 1], 
+        ['e24_lhtight_iloose',                   'L1_EM20VHI',   [], [PhysicsStream], ['RATE:SingleElectron', 'BW:Egamma'], 1],
+        ['e26_lhtight_iloose',                   'L1_EM22VHLIL', [], [PhysicsStream], ['RATE:SingleElectron', 'BW:Egamma'], 1], 
+        ['e60_lhmedium',                         'L1_EM22VHLIL',     [], [PhysicsStream], ['RATE:SingleElectron', 'BW:Egamma'], 1], 
+        ['e120_lhloose',                         'L1_EM22VHLIL',     [], [PhysicsStream], ['RATE:SingleElectron', 'BW:Egamma'], 1], 
+        ['e140_lhloose',                         'L1_EM22VHLIL',     [], [PhysicsStream], ['RATE:SingleElectron', 'BW:Egamma'], 1], 
 
         # Supporting triggers
         # pairs of triggers (cut-based -- likelihood) should be in coherent PS
-        ['e24_vloose_L1EM18VH',                 196, 'L1_EM18VH',    [], [PhysicsStream], ['RATE:SingleElectron', 'BW:Egamma'], 1], 
-        ['e24_vloose_L1EM20VH',                 197, 'L1_EM20VH',    [], [PhysicsStream], ['RATE:SingleElectron', 'BW:Egamma'], 1], 
-        ['e26_vloose_L1EM20VH',                 198, 'L1_EM20VH',    [], [PhysicsStream], ['RATE:SingleElectron', 'BW:Egamma'], 1], 
-        ['e24_medium_L1EM18VH',                 199, 'L1_EM18VH',    [], [PhysicsStream], ['RATE:SingleElectron', 'BW:Egamma'], 1], 
-        ['e24_tight_L1EM20VH',                  200, 'L1_EM20VH',    [], [PhysicsStream], ['RATE:SingleElectron', 'BW:Egamma'], 1], 
-
-        ['e24_lhvloose_L1EM18VH',               201, 'L1_EM18VH',    [], [PhysicsStream], ['RATE:SingleElectron', 'BW:Egamma'], 1],  
-        ['e24_lhvloose_L1EM20VH',               202, 'L1_EM20VH',    [], [PhysicsStream], ['RATE:SingleElectron', 'BW:Egamma'], 1],  
-        ['e26_lhvloose_L1EM20VH',               203, 'L1_EM20VH',    [], [PhysicsStream], ['RATE:SingleElectron', 'BW:Egamma'], 1],        
-        ['e24_lhmedium_L1EM18VH',               204, 'L1_EM18VH',    [], [PhysicsStream], ['RATE:SingleElectron', 'BW:Egamma'], 1],  
-        ['e24_lhtight_L1EM20VH',                205, 'L1_EM20VH',    [], [PhysicsStream], ['RATE:SingleElectron', 'BW:Egamma'], 1], 
+        ['e24_vloose_L1EM18VH',                  'L1_EM18VH',    [], [PhysicsStream], ['RATE:SingleElectron', 'BW:Egamma'], 1], 
+        ['e24_vloose_L1EM20VH',                  'L1_EM20VH',    [], [PhysicsStream], ['RATE:SingleElectron', 'BW:Egamma'], 1], 
+        ['e26_vloose_L1EM20VH',                  'L1_EM20VH',    [], [PhysicsStream], ['RATE:SingleElectron', 'BW:Egamma'], 1], 
+        ['e24_medium_L1EM18VH',                  'L1_EM18VH',    [], [PhysicsStream], ['RATE:SingleElectron', 'BW:Egamma'], 1], 
+        ['e24_tight_L1EM20VH',                   'L1_EM20VH',    [], [PhysicsStream], ['RATE:SingleElectron', 'BW:Egamma'], 1], 
+
+        ['e24_lhvloose_L1EM18VH',                'L1_EM18VH',    [], [PhysicsStream], ['RATE:SingleElectron', 'BW:Egamma'], 1],  
+        ['e24_lhvloose_L1EM20VH',                'L1_EM20VH',    [], [PhysicsStream], ['RATE:SingleElectron', 'BW:Egamma'], 1],  
+        ['e26_lhvloose_L1EM20VH',                'L1_EM20VH',    [], [PhysicsStream], ['RATE:SingleElectron', 'BW:Egamma'], 1],        
+        ['e24_lhmedium_L1EM18VH',                'L1_EM18VH',    [], [PhysicsStream], ['RATE:SingleElectron', 'BW:Egamma'], 1],  
+        ['e24_lhtight_L1EM20VH',                 'L1_EM20VH',    [], [PhysicsStream], ['RATE:SingleElectron', 'BW:Egamma'], 1], 
         #
-        ['e24_medium_iloose_L2StarA_L1EM20VH',  206, 'L1_EM20VH',    [], [PhysicsStream], ['RATE:SingleElectron', 'BW:Egamma'], 1], 
-        ['e24_medium_L2Star_idperf_L1EM20VH',   207, 'L1_EM20VH',    [], [PhysicsStream], ['RATE:IDMonitoring', 'BW:Egamma'], 1], 
+        ['e24_medium_iloose_L2StarA_L1EM20VH',   'L1_EM20VH',    [], [PhysicsStream], ['RATE:SingleElectron', 'BW:Egamma'], 1], 
+        ['e24_medium_L2Star_idperf_L1EM20VH',    'L1_EM20VH',    [], [PhysicsStream], ['RATE:IDMonitoring', 'BW:Egamma'], 1], 
         
-        ['e24_lhmedium_iloose_L2StarA_L1EM20VH',208, 'L1_EM20VH',    [], [PhysicsStream], ['RATE:SingleElectron', 'BW:Egamma'], 1], 
-        ['e24_lhmedium_L2Star_idperf_L1EM20VH', 209, 'L1_EM20VH',    [], [PhysicsStream], ['RATE:IDMonitoring', 'BW:Egamma'], 1], 
+        ['e24_lhmedium_iloose_L2StarA_L1EM20VH', 'L1_EM20VH',    [], [PhysicsStream], ['RATE:SingleElectron', 'BW:Egamma'], 1], 
+        ['e24_lhmedium_L2Star_idperf_L1EM20VH',  'L1_EM20VH',    [], [PhysicsStream], ['RATE:IDMonitoring', 'BW:Egamma'], 1], 
         #
-        ['e5_loose',                            210, 'L1_EM3',       [], [PhysicsStream], ['RATE:SingleElectron', 'BW:Egamma'], 1], 
-        ['e5_loose_L2StarA',                    211, 'L1_EM3',       [], [PhysicsStream], ['RATE:SingleElectron', 'BW:Egamma'], 1], 
-        ['e5_loose_L2Star_idperf',              212, 'L1_EM3',       [], [PhysicsStream], ['RATE:IDMonitoring', 'BW:Egamma'], 1],
-        ['e5_loose_idperf',                    1016, 'L1_EM3',       [], [PhysicsStream], ['RATE:IDMonitoring', 'BW:Egamma'], 1],
-        ['e24_medium_idperf_L1EM20VH',         1017, 'L1_EM20VH',    [], [PhysicsStream], ['RATE:IDMonitoring', 'BW:Egamma'], 1], 
+        ['e5_loose',                             'L1_EM3',       [], [PhysicsStream], ['RATE:SingleElectron', 'BW:Egamma'], 1], 
+        ['e5_loose_L2StarA',                     'L1_EM3',       [], [PhysicsStream], ['RATE:SingleElectron', 'BW:Egamma'], 1], 
+        ['e5_loose_L2Star_idperf',               'L1_EM3',       [], [PhysicsStream], ['RATE:IDMonitoring', 'BW:Egamma'], 1],
+        ['e5_loose_idperf',                     'L1_EM3',       [], [PhysicsStream], ['RATE:IDMonitoring', 'BW:Egamma'], 1],
+        ['e24_medium_idperf_L1EM20VH',          'L1_EM20VH',    [], [PhysicsStream], ['RATE:IDMonitoring', 'BW:Egamma'], 1], 
         
-        ['e5_lhloose',                          213, 'L1_EM3',       [], [PhysicsStream], ['RATE:SingleElectron', 'BW:Egamma'], 1], 
-        ['e5_lhloose_L2StarA',                  214, 'L1_EM3',       [], [PhysicsStream], ['RATE:SingleElectron', 'BW:Egamma'], 1], 
-        ['e5_lhloose_L2Star_idperf',            215, 'L1_EM3',       [], [PhysicsStream], ['RATE:IDMonitoring', 'BW:Egamma'], 1],
-        ['e5_lhloose_idperf',                  1018, 'L1_EM3',       [], [PhysicsStream], ['RATE:IDMonitoring', 'BW:Egamma'], 1],
-        ['e24_lhmedium_idperf_L1EM20VH',       1019, 'L1_EM20VH',    [], [PhysicsStream], ['RATE:IDMonitoring', 'BW:Egamma'], 1], 
+        ['e5_lhloose',                          'L1_EM3',       [], [PhysicsStream], ['RATE:SingleElectron', 'BW:Egamma'], 1], 
+        ['e5_lhloose_L2StarA',                  'L1_EM3',       [], [PhysicsStream], ['RATE:SingleElectron', 'BW:Egamma'], 1], 
+        ['e5_lhloose_L2Star_idperf',            'L1_EM3',       [], [PhysicsStream], ['RATE:IDMonitoring', 'BW:Egamma'], 1],
+        ['e5_lhloose_idperf',                   'L1_EM3',       [], [PhysicsStream], ['RATE:IDMonitoring', 'BW:Egamma'], 1],
+        ['e24_lhmedium_idperf_L1EM20VH',        'L1_EM20VH',    [], [PhysicsStream], ['RATE:IDMonitoring', 'BW:Egamma'], 1], 
         #        
-        ['e5_vloose',                           216, 'L1_EM3',       [], [PhysicsStream], ['RATE:SingleElectron', 'BW:Egamma'], 1], 
-        ['e10_vloose_L1EM7',                    217, 'L1_EM7',       [], [PhysicsStream], ['RATE:SingleElectron', 'BW:Egamma'], 1], 
-        ['e15_vloose_L1EM7',                    218, 'L1_EM7',       [], [PhysicsStream], ['RATE:SingleElectron', 'BW:Egamma'], 1], 
-        ['e20_vloose_L1EM12',                   219, 'L1_EM12',      [], [PhysicsStream], ['RATE:SingleElectron', 'BW:Egamma'], 1], 
-        ['e25_vloose_L1EM15',                   220, 'L1_EM15',      [], [PhysicsStream], ['RATE:SingleElectron', 'BW:Egamma'], 1], 
-        ['e30_vloose_L1EM15',                   221, 'L1_EM15',      [], [PhysicsStream], ['RATE:SingleElectron', 'BW:Egamma'], 1], 
-        ['e40_vloose_L1EM15',                   222, 'L1_EM15',      [], [PhysicsStream], ['RATE:SingleElectron', 'BW:Egamma'], 1], 
-        ['e50_vloose_L1EM15',                   223, 'L1_EM15',      [], [PhysicsStream], ['RATE:SingleElectron', 'BW:Egamma'], 1], 
-        ['e60_vloose',                          224, 'L1_EM50V',     [], [PhysicsStream], ['RATE:SingleElectron', 'BW:Egamma'], 1], 
-        ['e70_vloose',                          225, 'L1_EM50V',     [], [PhysicsStream], ['RATE:SingleElectron', 'BW:Egamma'], 1], 
-        ['e80_vloose',                          226, 'L1_EM50V',     [], [PhysicsStream], ['RATE:SingleElectron', 'BW:Egamma'], 1], 
-        ['e100_vloose',                         227, 'L1_EM50V',     [], [PhysicsStream], ['RATE:SingleElectron', 'BW:Egamma'], 1], 
-        ['e120_vloose',                         228, 'L1_EM50V',     [], [PhysicsStream], ['RATE:SingleElectron', 'BW:Egamma'], 1], 
+        ['e5_vloose',                           'L1_EM3',       [], [PhysicsStream], ['RATE:SingleElectron', 'BW:Egamma'], 1], 
+        ['e10_vloose_L1EM7',                    'L1_EM7',       [], [PhysicsStream], ['RATE:SingleElectron', 'BW:Egamma'], 1], 
+        ['e15_vloose_L1EM7',                    'L1_EM7',       [], [PhysicsStream], ['RATE:SingleElectron', 'BW:Egamma'], 1], 
+        ['e20_vloose_L1EM12',                   'L1_EM12',      [], [PhysicsStream], ['RATE:SingleElectron', 'BW:Egamma'], 1], 
+        ['e25_vloose_L1EM15',                   'L1_EM15',      [], [PhysicsStream], ['RATE:SingleElectron', 'BW:Egamma'], 1], 
+        ['e30_vloose_L1EM15',                   'L1_EM15',      [], [PhysicsStream], ['RATE:SingleElectron', 'BW:Egamma'], 1], 
+        ['e40_vloose_L1EM15',                   'L1_EM15',      [], [PhysicsStream], ['RATE:SingleElectron', 'BW:Egamma'], 1], 
+        ['e50_vloose_L1EM15',                   'L1_EM15',      [], [PhysicsStream], ['RATE:SingleElectron', 'BW:Egamma'], 1], 
+        ['e60_vloose',                          'L1_EM22VHLIL',     [], [PhysicsStream], ['RATE:SingleElectron', 'BW:Egamma'], 1], 
+        ['e70_vloose',                          'L1_EM22VHLIL',     [], [PhysicsStream], ['RATE:SingleElectron', 'BW:Egamma'], 1], 
+        ['e80_vloose',                          'L1_EM22VHLIL',     [], [PhysicsStream], ['RATE:SingleElectron', 'BW:Egamma'], 1], 
+        ['e100_vloose',                         'L1_EM22VHLIL',     [], [PhysicsStream], ['RATE:SingleElectron', 'BW:Egamma'], 1], 
+        ['e120_vloose',                         'L1_EM22VHLIL',     [], [PhysicsStream], ['RATE:SingleElectron', 'BW:Egamma'], 1], 
         
-        ['e12_vloose_L1EM10VH',                 229, 'L1_EM10VH',    [], [PhysicsStream], ['RATE:SingleElectron', 'BW:Egamma'], 1], 
-        ['e15_vloose_L1EM13VH',                 230, 'L1_EM13VH',    [], [PhysicsStream], ['RATE:SingleElectron', 'BW:Egamma'], 1], 
-        ['e17_vloose',                          231, 'L1_EM15VH',    [], [PhysicsStream], ['RATE:SingleElectron', 'BW:Egamma'], 1], 
-        ['e20_vloose',                          232, 'L1_EM15VH',    [], [PhysicsStream], ['RATE:SingleElectron', 'BW:Egamma'], 1], 
+        ['e12_vloose_L1EM10VH',                 'L1_EM10VH',    [], [PhysicsStream], ['RATE:SingleElectron', 'BW:Egamma'], 1], 
+        ['e15_vloose_L1EM13VH',                 'L1_EM13VH',    [], [PhysicsStream], ['RATE:SingleElectron', 'BW:Egamma'], 1], 
+        ['e17_vloose',                          'L1_EM15VH',    [], [PhysicsStream], ['RATE:SingleElectron', 'BW:Egamma'], 1], 
+        ['e20_vloose',                          'L1_EM15VH',    [], [PhysicsStream], ['RATE:SingleElectron', 'BW:Egamma'], 1], 
         #        
-        ['e5_lhvloose',                         233, 'L1_EM3',       [], [PhysicsStream], ['RATE:SingleElectron', 'BW:Egamma'], 1], 
-        ['e10_lhvloose_L1EM7',                  234, 'L1_EM7',       [], [PhysicsStream], ['RATE:SingleElectron', 'BW:Egamma'], 1], 
-        ['e15_lhvloose_L1EM7',                  235, 'L1_EM7',       [], [PhysicsStream], ['RATE:SingleElectron', 'BW:Egamma'], 1], 
-        ['e20_lhvloose_L1EM12',                 236, 'L1_EM12',      [], [PhysicsStream], ['RATE:SingleElectron', 'BW:Egamma'], 1], 
-        ['e25_lhvloose_L1EM15',                 237, 'L1_EM15',      [], [PhysicsStream], ['RATE:SingleElectron', 'BW:Egamma'], 1], 
-        ['e30_lhvloose_L1EM15',                 238, 'L1_EM15',      [], [PhysicsStream], ['RATE:SingleElectron', 'BW:Egamma'], 1], 
-        ['e40_lhvloose_L1EM15',                 239, 'L1_EM15',      [], [PhysicsStream], ['RATE:SingleElectron', 'BW:Egamma'], 1], 
-        ['e50_lhvloose_L1EM15',                 240, 'L1_EM15',      [], [PhysicsStream], ['RATE:SingleElectron', 'BW:Egamma'], 1], 
-        ['e60_lhvloose',                        241, 'L1_EM50V',     [], [PhysicsStream], ['RATE:SingleElectron', 'BW:Egamma'], 1], 
-        ['e70_lhvloose',                        242, 'L1_EM50V',     [], [PhysicsStream], ['RATE:SingleElectron', 'BW:Egamma'], 1], 
-        ['e80_lhvloose',                        243, 'L1_EM50V',     [], [PhysicsStream], ['RATE:SingleElectron', 'BW:Egamma'], 1], 
-        ['e100_lhvloose',                       244, 'L1_EM50V',     [], [PhysicsStream], ['RATE:SingleElectron', 'BW:Egamma'], 1], 
-        ['e120_lhvloose',                       245, 'L1_EM50V',     [], [PhysicsStream], ['RATE:SingleElectron', 'BW:Egamma'], 1], 
-
-        ['e12_lhvloose_L1EM10VH',               246, 'L1_EM10VH',    [], [PhysicsStream], ['RATE:SingleElectron', 'BW:Egamma'], 1], 
-        ['e15_lhvloose_L1EM13VH',               247, 'L1_EM13VH',    [], [PhysicsStream], ['RATE:SingleElectron', 'BW:Egamma'], 1], 
-        ['e17_lhvloose',                        248, 'L1_EM15VH',    [], [PhysicsStream], ['RATE:SingleElectron', 'BW:Egamma'], 1], 
-        ['e20_lhvloose',                        249, 'L1_EM15VH',    [], [PhysicsStream], ['RATE:SingleElectron', 'BW:Egamma'], 1], 
+        ['e5_lhvloose',                         'L1_EM3',       [], [PhysicsStream], ['RATE:SingleElectron', 'BW:Egamma'], 1], 
+        ['e10_lhvloose_L1EM7',                  'L1_EM7',       [], [PhysicsStream], ['RATE:SingleElectron', 'BW:Egamma'], 1], 
+        ['e15_lhvloose_L1EM7',                  'L1_EM7',       [], [PhysicsStream], ['RATE:SingleElectron', 'BW:Egamma'], 1], 
+        ['e20_lhvloose_L1EM12',                 'L1_EM12',      [], [PhysicsStream], ['RATE:SingleElectron', 'BW:Egamma'], 1], 
+        ['e25_lhvloose_L1EM15',                 'L1_EM15',      [], [PhysicsStream], ['RATE:SingleElectron', 'BW:Egamma'], 1], 
+        ['e30_lhvloose_L1EM15',                 'L1_EM15',      [], [PhysicsStream], ['RATE:SingleElectron', 'BW:Egamma'], 1], 
+        ['e40_lhvloose_L1EM15',                 'L1_EM15',      [], [PhysicsStream], ['RATE:SingleElectron', 'BW:Egamma'], 1], 
+        ['e50_lhvloose_L1EM15',                 'L1_EM15',      [], [PhysicsStream], ['RATE:SingleElectron', 'BW:Egamma'], 1], 
+        ['e60_lhvloose',                        'L1_EM22VHLIL',     [], [PhysicsStream], ['RATE:SingleElectron', 'BW:Egamma'], 1], 
+        ['e70_lhvloose',                        'L1_EM22VHLIL',     [], [PhysicsStream], ['RATE:SingleElectron', 'BW:Egamma'], 1], 
+        ['e80_lhvloose',                        'L1_EM22VHLIL',     [], [PhysicsStream], ['RATE:SingleElectron', 'BW:Egamma'], 1], 
+        ['e100_lhvloose',                       'L1_EM22VHLIL',     [], [PhysicsStream], ['RATE:SingleElectron', 'BW:Egamma'], 1], 
+        ['e120_lhvloose',                       'L1_EM22VHLIL',     [], [PhysicsStream], ['RATE:SingleElectron', 'BW:Egamma'], 1], 
+
+        ['e12_lhvloose_L1EM10VH',               'L1_EM10VH',    [], [PhysicsStream], ['RATE:SingleElectron', 'BW:Egamma'], 1], 
+        ['e15_lhvloose_L1EM13VH',               'L1_EM13VH',    [], [PhysicsStream], ['RATE:SingleElectron', 'BW:Egamma'], 1], 
+        ['e17_lhvloose',                        'L1_EM15VH',    [], [PhysicsStream], ['RATE:SingleElectron', 'BW:Egamma'], 1], 
+        ['e20_lhvloose',                        'L1_EM15VH',    [], [PhysicsStream], ['RATE:SingleElectron', 'BW:Egamma'], 1], 
         # technical chains for forward electrons
-        #['e17_loose_L1EM15VHJ1523ETA49',        250, 'L1_EM15VH_J15.23ETA49', ['L1_EM15VH','L1_J15.23ETA49'], [PhysicsStream], ['RATE:Combined', 'BW:Egamma'], 1], 
-        #['e17_lhloose_L1EM15VHJ1523ETA49',      251, 'L1_EM15VH_J15.23ETA49', ['L1_EM15VH','L1_J15.23ETA49'], [PhysicsStream], ['RATE:Combined', 'BW:Egamma'], 1], 
-        ['e17_loose_L1EM15VHJJ1523ETA49',        250, 'L1_EM15VH_JJ15.23ETA49', ['L1_EM15VH','L1_JJ15.23ETA49'], [PhysicsStream], ['RATE:MultiElectron', 'BW:Egamma'], 1], 
-        ['e17_lhloose_L1EM15VHJJ1523ETA49',      251, 'L1_EM15VH_JJ15.23ETA49', ['L1_EM15VH','L1_JJ15.23ETA49'], [PhysicsStream], ['RATE:MultiElectron', 'BW:Egamma'], 1], 
+        #['e17_loose_L1EM15VHJ1523ETA49',       'L1_EM15VH_J15.23ETA49', ['L1_EM15VH','L1_J15.23ETA49'], [PhysicsStream], ['RATE:Combined', 'BW:Egamma'], 1], 
+        #['e17_lhloose_L1EM15VHJ1523ETA49',     'L1_EM15VH_J15.23ETA49', ['L1_EM15VH','L1_J15.23ETA49'], [PhysicsStream], ['RATE:Combined', 'BW:Egamma'], 1], 
+        ['e17_loose_L1EM15VHJJ1523ETA49',       'L1_EM15VH_JJ15.23ETA49', ['L1_EM15VH','L1_JJ15.23ETA49'], [PhysicsStream], ['RATE:MultiElectron', 'BW:Egamma'], 1], 
+        ['e17_lhloose_L1EM15VHJJ1523ETA49',     'L1_EM15VH_JJ15.23ETA49', ['L1_EM15VH','L1_JJ15.23ETA49'], [PhysicsStream], ['RATE:MultiElectron', 'BW:Egamma'], 1], 
         
         # Supporting trigger with PS
-        # Perf chains to study L2/EF options
-        ['e0_perf_L1EM3',                  952, 'L1_EM3', [], [PhysicsStream], ['RATE:SingleElectron', 'BW:Egamma'], 1], 
-        ['e0_L2Star_perf_L1EM3',           953, 'L1_EM3', [], [PhysicsStream], ['RATE:SingleElectron', 'BW:Egamma'], 1], 
-        
-        ['e0_perf_L1EM15',                 138, 'L1_EM15',[], [PhysicsStream], ['RATE:SingleElectron', 'BW:Egamma'], 1], 
-        ['e0_L2Star_perf_L1EM15',          959, 'L1_EM15',[], [PhysicsStream], ['RATE:SingleElectron', 'BW:Egamma'], 1],         
+                        
+        ['e0_perf_L1EM15',              'L1_EM15',[], [PhysicsStream], ['RATE:SingleElectron', 'BW:Egamma'], 1], 
+        ['e0_L2Star_perf_L1EM15',       'L1_EM15',[], [PhysicsStream], ['RATE:SingleElectron', 'BW:Egamma'], 1],         
         
         # Et cut only chains
-        ['e5_etcut',                       948,          'L1_EM3',    [], [PhysicsStream], ['RATE:SingleElectron', 'BW:Egamma'], 1], 
-        ['e10_etcut_L1EM7',                130,          'L1_EM7',    [], [PhysicsStream], ['RATE:SingleElectron', 'BW:Egamma'], 1], 
-        ['e15_etcut_L1EM7',                131,          'L1_EM7',    [], [PhysicsStream], ['RATE:SingleElectron', 'BW:Egamma'], 1], 
-        ['e20_etcut_L1EM12',               132,          'L1_EM12',   [], [PhysicsStream], ['RATE:SingleElectron', 'BW:Egamma'], 1],         
-        ['e25_etcut_L1EM15',               122,          'L1_EM15',   [], [PhysicsStream], ['RATE:SingleElectron', 'BW:Egamma'], 1], 
-        ['e30_etcut_L1EM15',               123,          'L1_EM15',   [], [PhysicsStream], ['RATE:SingleElectron', 'BW:Egamma'], 1], 
-        ['e40_etcut_L1EM15',               124,          'L1_EM15',   [], [PhysicsStream], ['RATE:SingleElectron', 'BW:Egamma'], 1], 
-        ['e50_etcut_L1EM15',               125,          'L1_EM15',   [], [PhysicsStream], ['RATE:SingleElectron', 'BW:Egamma'], 1], 
-        ['e60_etcut',                      126,          'L1_EM50V',  [], [PhysicsStream], ['RATE:SingleElectron', 'BW:Egamma'], 1], 
-        ['e80_etcut',                      127,          'L1_EM50V',  [], [PhysicsStream], ['RATE:SingleElectron', 'BW:Egamma'], 1], 
-        ['e100_etcut',                     128,          'L1_EM50V',  [], [PhysicsStream], ['RATE:SingleElectron', 'BW:Egamma'], 1], 
-        ['e120_etcut',                     129,          'L1_EM50V',  [], [PhysicsStream], ['RATE:SingleElectron', 'BW:Egamma'], 1], 
+        ['e5_etcut',                             'L1_EM3',    [], [PhysicsStream], ['RATE:SingleElectron', 'BW:Egamma'], 1], 
+        ['e10_etcut_L1EM7',                      'L1_EM7',    [], [PhysicsStream], ['RATE:SingleElectron', 'BW:Egamma'], 1], 
+        ['e15_etcut_L1EM7',                      'L1_EM7',    [], [PhysicsStream], ['RATE:SingleElectron', 'BW:Egamma'], 1], 
+        ['e20_etcut_L1EM12',                     'L1_EM12',   [], [PhysicsStream], ['RATE:SingleElectron', 'BW:Egamma'], 1],         
+        ['e25_etcut_L1EM15',                     'L1_EM15',   [], [PhysicsStream], ['RATE:SingleElectron', 'BW:Egamma'], 1], 
+        ['e30_etcut_L1EM15',                     'L1_EM15',   [], [PhysicsStream], ['RATE:SingleElectron', 'BW:Egamma'], 1], 
+        ['e40_etcut_L1EM15',                     'L1_EM15',   [], [PhysicsStream], ['RATE:SingleElectron', 'BW:Egamma'], 1], 
+        ['e50_etcut_L1EM15',                     'L1_EM15',   [], [PhysicsStream], ['RATE:SingleElectron', 'BW:Egamma'], 1], 
+        ['e60_etcut',                            'L1_EM22VHLIL',  [], [PhysicsStream], ['RATE:SingleElectron', 'BW:Egamma'], 1], 
+        ['e80_etcut',                            'L1_EM22VHLIL',  [], [PhysicsStream], ['RATE:SingleElectron', 'BW:Egamma'], 1], 
+        ['e100_etcut',                           'L1_EM22VHLIL',  [], [PhysicsStream], ['RATE:SingleElectron', 'BW:Egamma'], 1], 
+        ['e120_etcut',                           'L1_EM22VHLIL',  [], [PhysicsStream], ['RATE:SingleElectron', 'BW:Egamma'], 1], 
         
         # Rerun mode
-        ['e4_etcut',                       167,          'L1_EM3',    [], [PhysicsStream], ['RATE:SingleElectron', 'BW:Egamma'], 1], 
-        ['e9_etcut',                       168,          'L1_EM7',    [], [PhysicsStream], ['RATE:SingleElectron', 'BW:Egamma'], 1], 
-        ['e14_etcut',                      169,          'L1_EM12',   [], [PhysicsStream], ['RATE:SingleElectron', 'BW:Egamma'], 1], 
+        ['e4_etcut',                             'L1_EM3',    [], [PhysicsStream], ['RATE:SingleElectron', 'BW:Egamma'], 1], 
+        ['e9_etcut',                             'L1_EM7',    [], [PhysicsStream], ['RATE:SingleElectron', 'BW:Egamma'], 1], 
+        ['e14_etcut',                            'L1_EM12',   [], [PhysicsStream], ['RATE:SingleElectron', 'BW:Egamma'], 1], 
 
         # Rerun mode, cut-based
-        ['e9_medium',                      133,          'L1_EM7',      [], [PhysicsStream], ['RATE:SingleElectron', 'BW:Egamma'], 1],
-        ['e12_loose',                      134,          'L1_EM8VH',    [], [PhysicsStream], ['RATE:SingleElectron', 'BW:Egamma'], 1],
-        ['e12_loose_L1EM10VH',             135,          'L1_EM8VH',    [], [PhysicsStream], ['RATE:SingleElectron', 'BW:Egamma'], 1],
-        ['e15_loose_L1EM13VH',             136,          'L1_EM13VH',   [], [PhysicsStream], ['RATE:SingleElectron', 'BW:Egamma'], 1],
-        ['e17_loose_L1EM15',               137,          'L1_EM15',     [], [PhysicsStream], ['RATE:SingleElectron', 'BW:Egamma'], 1],
-        ['e17_loose',                      160,          'L1_EM15VH',   [], [PhysicsStream], ['RATE:SingleElectron', 'BW:Egamma'], 1],
-        ['e17_medium',                     161,          'L1_EM15VH',   [], [PhysicsStream], ['RATE:SingleElectron', 'BW:Egamma'], 1],
-        ['e17_medium_iloose',              162,          'L1_EM15VH',   [], [PhysicsStream], ['RATE:SingleElectron', 'BW:Egamma'], 1],
-        ['e20_medium',                     163,          'L1_EM15VH',   [], [PhysicsStream], ['RATE:SingleElectron', 'BW:Egamma'], 1],
-        ['e24_medium_L1EM15VH',            164,          'L1_EM15VH',   [], [PhysicsStream], ['RATE:SingleElectron', 'BW:Egamma'], 1],
-        ['e60_loose',                      165,          'L1_EM50V',    [], [PhysicsStream], ['RATE:SingleElectron', 'BW:Egamma'], 1],
-        ['e70_loose',                      166,          'L1_EM50V',    [], [PhysicsStream], ['RATE:SingleElectron', 'BW:Egamma'], 1],
-        ['e5_tight',                       140,          'L1_EM3',      [], [PhysicsStream], ['RATE:SingleElectron', 'BW:Egamma'], 1],
-        ['e9_tight',                       141,          'L1_EM7',      [], [PhysicsStream], ['RATE:SingleElectron', 'BW:Egamma'], 1],
-        ['e14_tight',                      142,          'L1_EM12',     [], [PhysicsStream], ['RATE:SingleElectron', 'BW:Egamma'], 1],
+        ['e9_medium',                            'L1_EM7',      [], [PhysicsStream], ['RATE:SingleElectron', 'BW:Egamma'], 1],
+        ['e12_loose',                            'L1_EM8VH',    [], [PhysicsStream], ['RATE:SingleElectron', 'BW:Egamma'], 1],
+        ['e12_loose_L1EM10VH',                   'L1_EM8VH',    [], [PhysicsStream], ['RATE:SingleElectron', 'BW:Egamma'], 1],
+        ['e15_loose_L1EM13VH',                   'L1_EM13VH',   [], [PhysicsStream], ['RATE:SingleElectron', 'BW:Egamma'], 1],
+        ['e17_loose_L1EM15',                     'L1_EM15',     [], [PhysicsStream], ['RATE:SingleElectron', 'BW:Egamma'], 1],
+        ['e17_loose',                            'L1_EM15VH',   [], [PhysicsStream], ['RATE:SingleElectron', 'BW:Egamma'], 1],
+        ['e17_medium',                           'L1_EM15VH',   [], [PhysicsStream], ['RATE:SingleElectron', 'BW:Egamma'], 1],
+        ['e17_medium_iloose',                    'L1_EM15VH',   [], [PhysicsStream], ['RATE:SingleElectron', 'BW:Egamma'], 1],
+        ['e20_medium',                           'L1_EM15VH',   [], [PhysicsStream], ['RATE:SingleElectron', 'BW:Egamma'], 1],
+        ['e24_medium_L1EM15VH',                  'L1_EM15VH',   [], [PhysicsStream], ['RATE:SingleElectron', 'BW:Egamma'], 1],
+        ['e60_loose',                            'L1_EM22VHLIL',    [], [PhysicsStream], ['RATE:SingleElectron', 'BW:Egamma'], 1],
+        ['e70_loose',                            'L1_EM22VHLIL',    [], [PhysicsStream], ['RATE:SingleElectron', 'BW:Egamma'], 1],
+        ['e5_tight',                             'L1_EM3',      [], [PhysicsStream], ['RATE:SingleElectron', 'BW:Egamma'], 1],
+        ['e9_tight',                             'L1_EM7',      [], [PhysicsStream], ['RATE:SingleElectron', 'BW:Egamma'], 1],
+        ['e14_tight',                            'L1_EM12',     [], [PhysicsStream], ['RATE:SingleElectron', 'BW:Egamma'], 1],
 
         # Rerun mode, likelihood
-        ['e9_lhmedium',                    143,          'L1_EM7',     [], [PhysicsStream], ['RATE:SingleElectron', 'BW:Egamma'], 1],
-        ['e12_lhloose',                    144,          'L1_EM8VH',   [], [PhysicsStream], ['RATE:SingleElectron', 'BW:Egamma'], 1],
-        ['e12_lhloose_L1EM10VH',           145,          'L1_EM10VH',  [], [PhysicsStream], ['RATE:SingleElectron', 'BW:Egamma'], 1],
-        ['e15_lhloose_L1EM13VH',           146,          'L1_EM13VH',  [], [PhysicsStream], ['RATE:SingleElectron', 'BW:Egamma'], 1],
-        ['e17_lhloose_L1EM15',             147,          'L1_EM15',    [], [PhysicsStream], ['RATE:SingleElectron', 'BW:Egamma'], 1],
-        ['e17_lhloose',                    148,          'L1_EM15VH',  [], [PhysicsStream], ['RATE:SingleElectron', 'BW:Egamma'], 1],
-        ['e17_lhmedium',                   149,          'L1_EM15VH',  [], [PhysicsStream], ['RATE:SingleElectron', 'BW:Egamma'], 1],
-        ['e17_lhmedium_iloose',            150,          'L1_EM15VH',  [], [PhysicsStream], ['RATE:SingleElectron', 'BW:Egamma'], 1],
-        ['e20_lhmedium',                   151,          'L1_EM15VH',  [], [PhysicsStream], ['RATE:SingleElectron', 'BW:Egamma'], 1],
-        ['e24_lhmedium_L1EM15VH',          152,          'L1_EM15VH',  [], [PhysicsStream], ['RATE:SingleElectron', 'BW:Egamma'], 1],
-        ['e60_lhloose',                    153,          'L1_EM50V',   [], [PhysicsStream], ['RATE:SingleElectron', 'BW:Egamma'], 1],
-        ['e70_lhloose',                    154,          'L1_EM50V',   [], [PhysicsStream], ['RATE:SingleElectron', 'BW:Egamma'], 1],
-        ['e5_lhtight',                     155,          'L1_EM3',     [], [PhysicsStream], ['RATE:SingleElectron', 'BW:Egamma'], 1],
-        ['e9_lhtight',                     156,          'L1_EM7',     [], [PhysicsStream], ['RATE:SingleElectron', 'BW:Egamma'], 1],
-        ['e14_lhtight',                    157,          'L1_EM12',    [], [PhysicsStream], ['RATE:SingleElectron', 'BW:Egamma'], 1],
+        ['e9_lhmedium',                          'L1_EM7',     [], [PhysicsStream], ['RATE:SingleElectron', 'BW:Egamma'], 1],
+        ['e12_lhloose',                          'L1_EM8VH',   [], [PhysicsStream], ['RATE:SingleElectron', 'BW:Egamma'], 1],
+        ['e12_lhloose_L1EM10VH',                 'L1_EM10VH',  [], [PhysicsStream], ['RATE:SingleElectron', 'BW:Egamma'], 1],
+        ['e15_lhloose_L1EM13VH',                 'L1_EM13VH',  [], [PhysicsStream], ['RATE:SingleElectron', 'BW:Egamma'], 1],
+        ['e17_lhloose_L1EM15',                   'L1_EM15',    [], [PhysicsStream], ['RATE:SingleElectron', 'BW:Egamma'], 1],
+        ['e17_lhloose',                          'L1_EM15VH',  [], [PhysicsStream], ['RATE:SingleElectron', 'BW:Egamma'], 1],
+        ['e17_lhmedium',                         'L1_EM15VH',  [], [PhysicsStream], ['RATE:SingleElectron', 'BW:Egamma'], 1],
+        ['e17_lhmedium_iloose',                  'L1_EM15VH',  [], [PhysicsStream], ['RATE:SingleElectron', 'BW:Egamma'], 1],
+        ['e20_lhmedium',                         'L1_EM15VH',  [], [PhysicsStream], ['RATE:SingleElectron', 'BW:Egamma'], 1],
+        ['e24_lhmedium_L1EM15VH',                'L1_EM15VH',  [], [PhysicsStream], ['RATE:SingleElectron', 'BW:Egamma'], 1],
+        ['e60_lhloose',                          'L1_EM22VHLIL',   [], [PhysicsStream], ['RATE:SingleElectron', 'BW:Egamma'], 1],
+        ['e70_lhloose',                          'L1_EM22VHLIL',   [], [PhysicsStream], ['RATE:SingleElectron', 'BW:Egamma'], 1],
+        ['e5_lhtight',                           'L1_EM3',     [], [PhysicsStream], ['RATE:SingleElectron', 'BW:Egamma'], 1],
+        ['e9_lhtight',                           'L1_EM7',     [], [PhysicsStream], ['RATE:SingleElectron', 'BW:Egamma'], 1],
+        ['e14_lhtight',                          'L1_EM12',    [], [PhysicsStream], ['RATE:SingleElectron', 'BW:Egamma'], 1],
 
         # Single electron/photon chains for Calo sequence optimization (kept as before)
-        ['e24_tight_iloose_L2EFCalo_L1EM20VH',     390, 'L1_EM20VH',   [], [PhysicsStream], ['RATE:SingleElectron', 'BW:Egamma'], 1],
-        ['e24_lhtight_iloose_L2EFCalo_L1EM20VH',   391, 'L1_EM20VH',   [], [PhysicsStream], ['RATE:SingleElectron', 'BW:Egamma'], 1],
-        ['e24_tight_iloose_HLTCalo_L1EM20VH',      392, 'L1_EM20VH',   [], [PhysicsStream], ['RATE:SingleElectron', 'BW:Egamma'], 1],
-        ['e24_lhtight_iloose_HLTCalo_L1EM20VH',    393, 'L1_EM20VH',   [], [PhysicsStream], ['RATE:SingleElectron', 'BW:Egamma'], 1],
-        ['e24_tight_iloose_etisem_L1EM20VH',       394, 'L1_EM20VH',   [], [PhysicsStream], ['RATE:SingleElectron', 'BW:Egamma'], 1],
-        ['g120_loose_HLTCalo',                     395, 'L1_EM50V',    [], [PhysicsStream], ['RATE:SinglePhoton','BW:Egamma'], 1],
-        ['g35_medium_HLTCalo_g25_medium_HLTCalo',  396, 'L1_2EM15VH',  [], [PhysicsStream], ['RATE:MultiPhoton','BW:Egamma'], 1],
+        ['e24_tight_iloose_L2EFCalo_L1EM20VH',    'L1_EM20VH',   [], [PhysicsStream], ['RATE:SingleElectron', 'BW:Egamma'], 1],
+        ['e24_lhtight_iloose_L2EFCalo_L1EM20VH',  'L1_EM20VH',   [], [PhysicsStream], ['RATE:SingleElectron', 'BW:Egamma'], 1],
+        ['e24_tight_iloose_HLTCalo_L1EM20VH',     'L1_EM20VH',   [], [PhysicsStream], ['RATE:SingleElectron', 'BW:Egamma'], 1],
+        ['e24_lhtight_iloose_HLTCalo_L1EM20VH',   'L1_EM20VH',   [], [PhysicsStream], ['RATE:SingleElectron', 'BW:Egamma'], 1],
+        ['e24_tight_iloose_etisem_L1EM20VH',      'L1_EM20VH',   [], [PhysicsStream], ['RATE:SingleElectron', 'BW:Egamma'], 1],
+        ['g120_loose_HLTCalo',                    'L1_EM22VHLIL',    [], [PhysicsStream], ['RATE:SinglePhoton','BW:Egamma'], 1],
+        ['g35_medium_HLTCalo_g25_medium_HLTCalo', 'L1_2EM15VH',  [], [PhysicsStream], ['RATE:MultiPhoton','BW:Egamma'], 1],
         
-        #Single electron/chaing for testing mis-alignment robust LH ID
-        ['e24_lhmedium_nod0_L1EM18VH',             866, 'L1_EM18VH',    [], [PhysicsStream], ['RATE:SingleElectron', 'BW:Egamma'], 1],
-        ['e24_lhmedium_nodphi_L1EM18VH',           867, 'L1_EM18VH',    [], [PhysicsStream], ['RATE:SingleElectron', 'BW:Egamma'], 1],
-        ['e24_lhmedium_nodphires_L1EM18VH',        868, 'L1_EM18VH',    [], [PhysicsStream], ['RATE:SingleElectron', 'BW:Egamma'], 1],
-        ['e24_lhmedium_cutd0dphi_L1EM18VH',        869, 'L1_EM18VH',    [], [PhysicsStream], ['RATE:SingleElectron', 'BW:Egamma'], 1],
-        ['e24_lhmedium_nod0_iloose_L1EM18VH',             870, 'L1_EM18VH',    [], [PhysicsStream], ['RATE:SingleElectron', 'BW:Egamma'], 1],
-        ['e24_lhmedium_nodphi_iloose_L1EM18VH',           871, 'L1_EM18VH',    [], [PhysicsStream], ['RATE:SingleElectron', 'BW:Egamma'], 1],
-        ['e24_lhmedium_nodphires_iloose_L1EM18VH',        872, 'L1_EM18VH',    [], [PhysicsStream], ['RATE:SingleElectron', 'BW:Egamma'], 1],
-        ['e24_lhmedium_cutd0dphi_iloose_L1EM18VH',        873, 'L1_EM18VH',    [], [PhysicsStream], ['RATE:SingleElectron', 'BW:Egamma'], 1],
+        #Single electron/chaing for testing mis-ant robust LH ID
+        ['e24_lhmedium_nod0_L1EM18VH',            'L1_EM18VH',    [], [PhysicsStream], ['RATE:SingleElectron', 'BW:Egamma'], 1],
+        ['e24_lhmedium_nodphi_L1EM18VH',          'L1_EM18VH',    [], [PhysicsStream], ['RATE:SingleElectron', 'BW:Egamma'], 1],
+        ['e24_lhmedium_nodphires_L1EM18VH',       'L1_EM18VH',    [], [PhysicsStream], ['RATE:SingleElectron', 'BW:Egamma'], 1],
+        ['e24_lhmedium_cutd0dphi_L1EM18VH',       'L1_EM18VH',    [], [PhysicsStream], ['RATE:SingleElectron', 'BW:Egamma'], 1],
+        ['e24_lhmedium_nod0_iloose_L1EM18VH',            'L1_EM18VH',    [], [PhysicsStream], ['RATE:SingleElectron', 'BW:Egamma'], 1],
+        ['e24_lhmedium_nodphi_iloose_L1EM18VH',          'L1_EM18VH',    [], [PhysicsStream], ['RATE:SingleElectron', 'BW:Egamma'], 1],
+        ['e24_lhmedium_nodphires_iloose_L1EM18VH',       'L1_EM18VH',    [], [PhysicsStream], ['RATE:SingleElectron', 'BW:Egamma'], 1],
+        ['e24_lhmedium_cutd0dphi_iloose_L1EM18VH',       'L1_EM18VH',    [], [PhysicsStream], ['RATE:SingleElectron', 'BW:Egamma'], 1],
         
 
         # low-ET single electron triggers in rerun mode
-        ### NOT IN THE LIST ['e5_lhtight_idperf',           151, 'L1_EM3',   [], [PhysicsStream], ['RATE:SingleElectron', 'BW:Egamma'], -1],
-        ### NOT IN THE LIST ['e5_lhtight_L2Star_idperf',    152, 'L1_EM3',   [], [PhysicsStream], ['RATE:SingleElectron', 'BW:Egamma'], -1],
-        ### NOT IN THE LIST ['e5_tight1_idperf',            153, 'L1_EM3',   [], [PhysicsStream], ['RATE:SingleElectron', 'BW:Egamma'], -1],
-        ### NOT IN THE LIST ['e5_tight1_L2Star_idperf',     154, 'L1_EM3',   [], [PhysicsStream], ['RATE:SingleElectron', 'BW:Egamma'], -1],
+        ### NOT IN THE LIST ['e5_lhtight_idperf',           'L1_EM3',   [], [PhysicsStream], ['RATE:SingleElectron', 'BW:Egamma'], -1],
+        ### NOT IN THE LIST ['e5_lhtight_L2Star_idperf',    'L1_EM3',   [], [PhysicsStream], ['RATE:SingleElectron', 'BW:Egamma'], -1],
+        ### NOT IN THE LIST ['e5_tight1_idperf',            'L1_EM3',   [], [PhysicsStream], ['RATE:SingleElectron', 'BW:Egamma'], -1],
+        ### NOT IN THE LIST ['e5_tight1_L2Star_idperf',     'L1_EM3',   [], [PhysicsStream], ['RATE:SingleElectron', 'BW:Egamma'], -1],
         
         # Tracking tune chains for Run1 PID
-        ### NOT IN THE LIST ['e24_tight1_iloose_L2StarA_L1EM18VH',        171, 'L1_EM18VH', [], [PhysicsStream], ['RATE:SingleElectron', 'BW:Egamma'], 1],
-        ### NOT IN THE LIST ['e24_tight1_iloose_L2StarB_L1EM18VH',        172, 'L1_EM18VH', [], [PhysicsStream], ['RATE:SingleElectron', 'BW:Egamma'], 1],
-        ### NOT IN THE LIST ['e24_tight1_iloose_L2StarC_L1EM18VH',        173, 'L1_EM18VH', [], [PhysicsStream], ['RATE:SingleElectron', 'BW:Egamma'], 1],
-        ### NOT IN THE LIST ['e24_tight1_L2Star_idperf_L1EM18VH',         174, 'L1_EM18VH', [], [PhysicsStream], ['RATE:SingleElectron', 'BW:Egamma'], 1],
-        ### NOT IN THE LIST ['e24_tight1_idperf_L1EM18VH',                175, 'L1_EM18VH', [], [PhysicsStream], ['RATE:SingleElectron', 'BW:Egamma'], 1],
+        ### NOT IN THE LIST ['e24_tight1_iloose_L2StarA_L1EM18VH',        'L1_EM18VH', [], [PhysicsStream], ['RATE:SingleElectron', 'BW:Egamma'], 1],
+        ### NOT IN THE LIST ['e24_tight1_iloose_L2StarB_L1EM18VH',        'L1_EM18VH', [], [PhysicsStream], ['RATE:SingleElectron', 'BW:Egamma'], 1],
+        ### NOT IN THE LIST ['e24_tight1_iloose_L2StarC_L1EM18VH',        'L1_EM18VH', [], [PhysicsStream], ['RATE:SingleElectron', 'BW:Egamma'], 1],
+        ### NOT IN THE LIST ['e24_tight1_L2Star_idperf_L1EM18VH',         'L1_EM18VH', [], [PhysicsStream], ['RATE:SingleElectron', 'BW:Egamma'], 1],
+        ### NOT IN THE LIST ['e24_tight1_idperf_L1EM18VH',                'L1_EM18VH', [], [PhysicsStream], ['RATE:SingleElectron', 'BW:Egamma'], 1],
 
         # Rerun mode triggers to support LH PID chains
-        ### NOT IN THE LIST ['e18_lhloose',           176,          'L1_EM15VH', [], [PhysicsStream], ['RATE:SingleElectron', 'BW:Egamma'], 1],
-        ### NOT IN THE LIST ['e12_lhloose_L1EM3',     178,          'L1_EM3', [], [PhysicsStream], ['RATE:SingleElectron', 'BW:Egamma'], 1],
-        ### NOT IN THE LIST ['e9_lhloose',            179,          'L1_EM7', [], [PhysicsStream], ['RATE:SingleElectron', 'BW:Egamma'], 1],
-        ### NOT IN THE LIST ['e24_lhloose_iloose',    180,          'L1_EM20VHI', [], [PhysicsStream], ['RATE:SingleElectron', 'BW:Egamma'], 1],        
+        ### NOT IN THE LIST ['e18_lhloose',                   'L1_EM15VH', [], [PhysicsStream], ['RATE:SingleElectron', 'BW:Egamma'], 1],
+        ### NOT IN THE LIST ['e12_lhloose_L1EM3',             'L1_EM3', [], [PhysicsStream], ['RATE:SingleElectron', 'BW:Egamma'], 1],
+        ### NOT IN THE LIST ['e9_lhloose',                    'L1_EM7', [], [PhysicsStream], ['RATE:SingleElectron', 'BW:Egamma'], 1],
+        ### NOT IN THE LIST ['e24_lhloose_iloose',            'L1_EM20VHI', [], [PhysicsStream], ['RATE:SingleElectron', 'BW:Egamma'], 1],        
 
         # Cut-based Run1 PID chains
         # Loose chains with etcut variations
-        ### NOT IN THE LIST ###### ['e5_loose1',               130,          'L1_EM3', [], [PhysicsStream], ['RATE:SingleElectron', 'BW:Egamma'], 1], # commented because it's in physics
-        ### NOT IN THE LIST ['e15_loose1',              131,          'L1_EM7', [], [PhysicsStream], ['RATE:SingleElectron', 'BW:Egamma'], 1],
-        ### NOT IN THE LIST ['e25_loose1',              132,          'L1_EM15', [], [PhysicsStream], ['RATE:SingleElectron', 'BW:Egamma'], 1],
-        ### NOT IN THE LIST ['e35_loose1',              133,          'L1_EM15', [], [PhysicsStream], ['RATE:SingleElectron', 'BW:Egamma'], 1],
-        ### NOT IN THE LIST ['e45_loose1',              134,          'L1_EM15', [], [PhysicsStream], ['RATE:SingleElectron', 'BW:Egamma'], 1],
-        ### NOT IN THE LIST ['e55_loose1',              135,          'L1_EM15', [], [PhysicsStream], ['RATE:SingleElectron', 'BW:Egamma'], 1],
-        ### NOT IN THE LIST ['e65_loose1',              136,          'L1_EM50V', [], [PhysicsStream], ['RATE:SingleElectron', 'BW:Egamma'], 1],
-        ### NOT IN THE LIST ['e80_loose1',              137,          'L1_EM50V', [], [PhysicsStream], ['RATE:SingleElectron', 'BW:Egamma'], 1],
-        ### NOT IN THE LIST ['e100_loose1',             138,          'L1_EM50V', [], [PhysicsStream], ['RATE:SingleElectron', 'BW:Egamma'], 1],
-        ['e120_loose1',                     139, 'L1_EM50V', [], [PhysicsStream], ['RATE:SingleElectron', 'BW:Egamma'], 1],
+        ### NOT IN THE LIST ###### ['e5_loose1',                 'L1_EM3', [], [PhysicsStream], ['RATE:SingleElectron', 'BW:Egamma'], 1], # commented because it's in physics
+        ### NOT IN THE LIST ['e15_loose1',                       'L1_EM7', [], [PhysicsStream], ['RATE:SingleElectron', 'BW:Egamma'], 1],
+        ### NOT IN THE LIST ['e25_loose1',                       'L1_EM15', [], [PhysicsStream], ['RATE:SingleElectron', 'BW:Egamma'], 1],
+        ### NOT IN THE LIST ['e35_loose1',                       'L1_EM15', [], [PhysicsStream], ['RATE:SingleElectron', 'BW:Egamma'], 1],
+        ### NOT IN THE LIST ['e45_loose1',                       'L1_EM15', [], [PhysicsStream], ['RATE:SingleElectron', 'BW:Egamma'], 1],
+        ### NOT IN THE LIST ['e55_loose1',                       'L1_EM15', [], [PhysicsStream], ['RATE:SingleElectron', 'BW:Egamma'], 1],
+        ### NOT IN THE LIST ['e65_loose1',                       'L1_EM22VHLIL', [], [PhysicsStream], ['RATE:SingleElectron', 'BW:Egamma'], 1],
+        ### NOT IN THE LIST ['e80_loose1',                       'L1_EM22VHLIL', [], [PhysicsStream], ['RATE:SingleElectron', 'BW:Egamma'], 1],
+        ### NOT IN THE LIST ['e100_loose1',                      'L1_EM22VHLIL', [], [PhysicsStream], ['RATE:SingleElectron', 'BW:Egamma'], 1],
+        ['e120_loose1',  'L1_EM22VHLIL', [], [PhysicsStream], ['RATE:SingleElectron', 'BW:Egamma'], 1],
         
         # Single electron Run1 PID
-        ['e24_medium1_iloose_L1EM18VH',     770, 'L1_EM18VH', [], [PhysicsStream], ['RATE:SingleElectron', 'BW:Egamma'], 1],
-        ### NOT IN THE LIST ['e24_loose1_L1EM18VH',              141, 'L1_EM18VH', [], [PhysicsStream], ['RATE:SingleElectron', 'BW:Egamma'], 1],
-        ['e24_medium1_L1EM18VH',            771, 'L1_EM18VH', [], [PhysicsStream], ['RATE:SingleElectron', 'BW:Egamma'], 1],
-        ### NOT IN THE LIST ['e24_tight1_L1EM18VH',              143, 'L1_EM18VH', [], [PhysicsStream], ['RATE:SingleElectron', 'BW:Egamma'], 1],
-        ### NOT IN THE LIST ['e24_tight1_iloose_L1EM18VH',       144, 'L1_EM18VH', [], [PhysicsStream], ['RATE:SingleElectron', 'BW:Egamma'], 1],
-        ['e24_tight1_iloose_L1EM20VH',      772, 'L1_EM20VH', [], [PhysicsStream], ['RATE:SingleElectron', 'BW:Egamma'], 1],
-        ['e24_tight1_iloose',               773, 'L1_EM20VHI', [], [PhysicsStream], ['RATE:SingleElectron', 'BW:Egamma'], 1],
-        ['e26_tight1_iloose',               774, 'L1_EM22VHLIL', [], [PhysicsStream], ['RATE:SingleElectron', 'BW:Egamma'], 1],
-        ['e60_medium1',                     775, 'L1_EM50V', [], [PhysicsStream], ['RATE:SingleElectron', 'BW:Egamma'], 1],
-        ### NOT IN THE LIST ['e60_loose1',                       149, 'L1_EM50V', [], [PhysicsStream], ['RATE:SingleElectron', 'BW:Egamma'], 1],
+        ['e24_medium1_iloose_L1EM18VH',  'L1_EM18VH', [], [PhysicsStream], ['RATE:SingleElectron', 'BW:Egamma'], 1],
+        ### NOT IN THE LIST ['e24_loose1_L1EM18VH',              'L1_EM18VH', [], [PhysicsStream], ['RATE:SingleElectron', 'BW:Egamma'], 1],
+        ['e24_medium1_L1EM18VH',            'L1_EM18VH', [], [PhysicsStream], ['RATE:SingleElectron', 'BW:Egamma'], 1],
+        ### NOT IN THE LIST ['e24_tight1_L1EM18VH',               'L1_EM18VH', [], [PhysicsStream], ['RATE:SingleElectron', 'BW:Egamma'], 1],
+        ### NOT IN THE LIST ['e24_tight1_iloose_L1EM18VH',        'L1_EM18VH', [], [PhysicsStream], ['RATE:SingleElectron', 'BW:Egamma'], 1],
+        ['e24_tight1_iloose_L1EM20VH',      'L1_EM20VH', [], [PhysicsStream], ['RATE:SingleElectron', 'BW:Egamma'], 1],
+        ['e24_tight1_iloose',               'L1_EM20VHI', [], [PhysicsStream], ['RATE:SingleElectron', 'BW:Egamma'], 1],
+        ['e26_tight1_iloose',               'L1_EM22VHLIL', [], [PhysicsStream], ['RATE:SingleElectron', 'BW:Egamma'], 1],
+        ['e60_medium1',                     'L1_EM22VHLIL', [], [PhysicsStream], ['RATE:SingleElectron', 'BW:Egamma'], 1],
+        ### NOT IN THE LIST ['e60_loose1',                       'L1_EM22VHLIL', [], [PhysicsStream], ['RATE:SingleElectron', 'BW:Egamma'], 1],
 
         # Rerun mode triggers to support Run1 PID chains
-        ### NOT IN THE LIST ['e18_loose1',           155,          'L1_EM15VH', [], [PhysicsStream], ['RATE:SingleElectron', 'BW:Egamma'], 1],
-        ### NOT IN THE LIST ['e17_loose1',           156,          'L1_EM15VH', [], [PhysicsStream], ['RATE:SingleElectron', 'BW:Egamma'], 1],
-        ### NOT IN THE LIST ['e12_loose1_L1EM3',     157,          'L1_EM3', [], [PhysicsStream], ['RATE:SingleElectron', 'BW:Egamma'], 1],
-        ### NOT IN THE LIST ['e9_loose1',            158,          'L1_EM7', [], [PhysicsStream], ['RATE:SingleElectron', 'BW:Egamma'], 1],
-        ### NOT IN THE LIST ['e7_medium1',           159,          'L1_EM3', [], [PhysicsStream], ['RATE:SingleElectron', 'BW:Egamma'], 1],
-        ### NOT IN THE LIST ['e12_medium1_L1EM3',    160,          'L1_EM3', [], [PhysicsStream], ['RATE:SingleElectron', 'BW:Egamma'], 1],
-        ### NOT IN THE LIST ['e17_medium1',          161,          'L1_EM15VH', [], [PhysicsStream], ['RATE:SingleElectron', 'BW:Egamma'], 1],
-        ### NOT IN THE LIST ['e5_tight1',            162,          'L1_EM3', [], [PhysicsStream], ['RATE:SingleElectron', 'BW:Egamma'], 1],
-        ### NOT IN THE LIST ['e9_tight1',            163,          'L1_EM7', [], [PhysicsStream], ['RATE:SingleElectron', 'BW:Egamma'], 1],
-        ### NOT IN THE LIST ['e14_tight1',           164,          'L1_EM12', [], [PhysicsStream], ['RATE:SingleElectron', 'BW:Egamma'], 1],
-        ### NOT IN THE LIST ['e24_loose1_iloose',    168,          'L1_EM20VHI', [], [PhysicsStream], ['RATE:SingleElectron', 'BW:Egamma'], 1],
-        ### NOT IN THE LIST ['e24_medium1_L1EM15VH', 169,          'L1_EM15VH', [], [PhysicsStream], ['RATE:SingleElectron', 'BW:Egamma'], 1],
+        ### NOT IN THE LIST ['e18_loose1',                    'L1_EM15VH', [], [PhysicsStream], ['RATE:SingleElectron', 'BW:Egamma'], 1],
+        ### NOT IN THE LIST ['e17_loose1',                    'L1_EM15VH', [], [PhysicsStream], ['RATE:SingleElectron', 'BW:Egamma'], 1],
+        ### NOT IN THE LIST ['e12_loose1_L1EM3',              'L1_EM3', [], [PhysicsStream], ['RATE:SingleElectron', 'BW:Egamma'], 1],
+        ### NOT IN THE LIST ['e9_loose1',                     'L1_EM7', [], [PhysicsStream], ['RATE:SingleElectron', 'BW:Egamma'], 1],
+        ### NOT IN THE LIST ['e7_medium1',                    'L1_EM3', [], [PhysicsStream], ['RATE:SingleElectron', 'BW:Egamma'], 1],
+        ### NOT IN THE LIST ['e12_medium1_L1EM3',             'L1_EM3', [], [PhysicsStream], ['RATE:SingleElectron', 'BW:Egamma'], 1],
+        ### NOT IN THE LIST ['e17_medium1',                   'L1_EM15VH', [], [PhysicsStream], ['RATE:SingleElectron', 'BW:Egamma'], 1],
+        ### NOT IN THE LIST ['e5_tight1',                     'L1_EM3', [], [PhysicsStream], ['RATE:SingleElectron', 'BW:Egamma'], 1],
+        ### NOT IN THE LIST ['e9_tight1',                     'L1_EM7', [], [PhysicsStream], ['RATE:SingleElectron', 'BW:Egamma'], 1],
+        ### NOT IN THE LIST ['e14_tight1',                    'L1_EM12', [], [PhysicsStream], ['RATE:SingleElectron', 'BW:Egamma'], 1],
+        ### NOT IN THE LIST ['e24_loose1_iloose',             'L1_EM20VHI', [], [PhysicsStream], ['RATE:SingleElectron', 'BW:Egamma'], 1],
+        ### NOT IN THE LIST ['e24_medium1_L1EM15VH',          'L1_EM15VH', [], [PhysicsStream], ['RATE:SingleElectron', 'BW:Egamma'], 1],
         
         ##########
         # Di-electron triggers
         # cut-based
-        ['2e12_loose_L12EM10VH',             170, 'L1_2EM10VH', [], [PhysicsStream], ['RATE:MultiElectron', 'BW:Egamma'], 1], 
-        ['2e15_loose_L12EM13VH',             171, 'L1_2EM13VH', [], [PhysicsStream], ['RATE:MultiElectron', 'BW:Egamma'], 1], 
-        ['2e17_loose_L12EM15',               172, 'L1_2EM15',   [], [PhysicsStream], ['RATE:MultiElectron', 'BW:Egamma'], 1], 
-        ['2e17_loose',                       776, 'L1_2EM15VH', [], [PhysicsStream], ['RATE:MultiElectron', 'BW:Egamma'], 1],
+        ['2e12_loose_L12EM10VH',            'L1_2EM10VH', [], [PhysicsStream], ['RATE:MultiElectron', 'BW:Egamma'], 1], 
+        ['2e15_loose_L12EM13VH',            'L1_2EM13VH', [], [PhysicsStream], ['RATE:MultiElectron', 'BW:Egamma'], 1], 
+        ['2e17_loose_L12EM15',              'L1_2EM15',   [], [PhysicsStream], ['RATE:MultiElectron', 'BW:Egamma'], 1], 
+        ['2e17_loose',                      'L1_2EM15VH', [], [PhysicsStream], ['RATE:MultiElectron', 'BW:Egamma'], 1],
         
         # likelihood
-        ['2e12_lhloose_L12EM10VH',           173, 'L1_2EM10VH', [], [PhysicsStream], ['RATE:MultiElectron', 'BW:Egamma'], 1], 
-        ['2e15_lhloose_L12EM13VH',           174, 'L1_2EM13VH', [], [PhysicsStream], ['RATE:MultiElectron', 'BW:Egamma'], 1], 
-        ['2e17_lhloose',                     175, 'L1_2EM15VH', [], [PhysicsStream], ['RATE:MultiElectron', 'BW:Egamma'], 1], 
-        ['2e17_lhloose_L12EM15',             176, 'L1_2EM15',   [], [PhysicsStream], ['RATE:MultiElectron', 'BW:Egamma'], 1], 
+        ['2e12_lhloose_L12EM10VH',          'L1_2EM10VH', [], [PhysicsStream], ['RATE:MultiElectron', 'BW:Egamma'], 1], 
+        ['2e15_lhloose_L12EM13VH',          'L1_2EM13VH', [], [PhysicsStream], ['RATE:MultiElectron', 'BW:Egamma'], 1], 
+        ['2e17_lhloose',                    'L1_2EM15VH', [], [PhysicsStream], ['RATE:MultiElectron', 'BW:Egamma'], 1], 
+        ['2e17_lhloose_L12EM15',            'L1_2EM15',   [], [PhysicsStream], ['RATE:MultiElectron', 'BW:Egamma'], 1], 
 
         # Tri-electron triggers
-        ['e17_medium_2e9_medium',            800, 'L1_EM15VH_3EM7', ['L1_EM15VH','L1_3EM7'], [PhysicsStream], ['RATE:MultiElectron', 'BW:Egamma'], 1],  
-        ['e17_loose_2e9_loose',              801, 'L1_EM15VH_3EM7', ['L1_EM15VH','L1_3EM7'], [PhysicsStream], ['RATE:MultiElectron', 'BW:Egamma'], 1],  
-        ['e17_lhloose_2e9_lhloose',          802, 'L1_EM15VH_3EM7', ['L1_EM15VH','L1_3EM7'], [PhysicsStream], ['RATE:MultiElectron', 'BW:Egamma'], 1],  
-        ['e17_medium_iloose_2e9_medium',     803, 'L1_EM15VH_3EM7', ['L1_EM15VH','L1_3EM7'], [PhysicsStream], ['RATE:MultiElectron', 'BW:Egamma'], 1],  
-        ['e17_lhmedium_2e9_lhmedium',        804, 'L1_EM15VH_3EM7', ['L1_EM15VH','L1_3EM7'], [PhysicsStream], ['RATE:MultiElectron', 'BW:Egamma'], 1],  
-        ['e17_lhmedium_iloose_2e9_lhmedium', 805, 'L1_EM15VH_3EM7', ['L1_EM15VH','L1_3EM7'], [PhysicsStream], ['RATE:MultiElectron', 'BW:Egamma'], 1],  
+        ['e17_medium_2e9_medium',           'L1_EM15VH_3EM7', ['L1_EM15VH','L1_3EM7'], [PhysicsStream], ['RATE:MultiElectron', 'BW:Egamma'], 1],  
+        ['e17_loose_2e9_loose',             'L1_EM15VH_3EM7', ['L1_EM15VH','L1_3EM7'], [PhysicsStream], ['RATE:MultiElectron', 'BW:Egamma'], 1],  
+        ['e17_lhloose_2e9_lhloose',         'L1_EM15VH_3EM7', ['L1_EM15VH','L1_3EM7'], [PhysicsStream], ['RATE:MultiElectron', 'BW:Egamma'], 1],  
+        ['e17_medium_iloose_2e9_medium',    'L1_EM15VH_3EM7', ['L1_EM15VH','L1_3EM7'], [PhysicsStream], ['RATE:MultiElectron', 'BW:Egamma'], 1],  
+        ['e17_lhmedium_2e9_lhmedium',       'L1_EM15VH_3EM7', ['L1_EM15VH','L1_3EM7'], [PhysicsStream], ['RATE:MultiElectron', 'BW:Egamma'], 1],  
+        ['e17_lhmedium_iloose_2e9_lhmedium','L1_EM15VH_3EM7', ['L1_EM15VH','L1_3EM7'], [PhysicsStream], ['RATE:MultiElectron', 'BW:Egamma'], 1],  
         
         # Multi-electron chains for Run1 PID
-        ['2e12_loose1_L12EM10VH',             777, 'L1_2EM10VH', [], [PhysicsStream], ['RATE:MultiElectron', 'BW:Egamma'], 1],
-        ['2e17_loose1',                       778, 'L1_2EM15VH', [], [PhysicsStream], ['RATE:MultiElectron', 'BW:Egamma'], 1],
-        ### NOT IN THE LIST ['2e17_loose1_L12EM15',               206, 'L1_2EM15', [], [PhysicsStream], ['RATE:MultiElectron', 'BW:Egamma'], 1],
-        ### NOT IN THE LIST ['e24_loose1_iloose_e12_loose1_L1EM3',207, 'L1_EM20VHI', ['L1_EM20VHI','L1_2EM3'], [PhysicsStream], ['RATE:MultiElectron', 'BW:Egamma'], 1],
-        ### NOT IN THE LIST ['e18_loose1_2e9_loose1',             208, 'L1_EM15VH_3EM7', ['L1_EM15VH','L1_3EM7'], [PhysicsStream], ['RATE:MultiElectron', 'BW:Egamma'], 1],
+        ['2e12_loose1_L12EM10VH',            'L1_2EM10VH', [], [PhysicsStream], ['RATE:MultiElectron', 'BW:Egamma'], 1],
+        ['2e17_loose1',                      'L1_2EM15VH', [], [PhysicsStream], ['RATE:MultiElectron', 'BW:Egamma'], 1],
+        ### NOT IN THE LIST ['2e17_loose1_L12EM15',               'L1_2EM15', [], [PhysicsStream], ['RATE:MultiElectron', 'BW:Egamma'], 1],
+        ### NOT IN THE LIST ['e24_loose1_iloose_e12_loose1_L1EM3', 'L1_EM20VHI', ['L1_EM20VHI','L1_2EM3'], [PhysicsStream], ['RATE:MultiElectron', 'BW:Egamma'], 1],
+        ### NOT IN THE LIST ['e18_loose1_2e9_loose1',              'L1_EM15VH_3EM7', ['L1_EM15VH','L1_3EM7'], [PhysicsStream], ['RATE:MultiElectron', 'BW:Egamma'], 1],
         # likelihood
-        ### NOT IN THE LIST ['e24_lhloose_iloose_e12_lhloose_L1EM3',202, 'L1_EM20VHI', ['L1_EM20VHI','L1_2EM3'], [PhysicsStream], ['RATE:MultiElectron', 'BW:Egamma'], 1],
-        ### NOT IN THE LIST ['e18_lhloose_2e9_lhloose',             203, 'L1_EM15VH_3EM7', ['L1_EM15VH','L1_3EM7'], [PhysicsStream], ['RATE:MultiElectron', 'BW:Egamma'], 1],
+        ### NOT IN THE LIST ['e24_lhloose_iloose_e12_lhloose_L1EM3', 'L1_EM20VHI', ['L1_EM20VHI','L1_2EM3'], [PhysicsStream], ['RATE:MultiElectron', 'BW:Egamma'], 1],
+        ### NOT IN THE LIST ['e18_lhloose_2e9_lhloose',              'L1_EM15VH_3EM7', ['L1_EM15VH','L1_3EM7'], [PhysicsStream], ['RATE:MultiElectron', 'BW:Egamma'], 1],
         
         ##########
         # Multielectron chains with m_ee cut for Run2 PID (supporting L1Topo J/psi)
         # cut-based
-        ['e5_tight_e4_etcut',                           825,      'L1_2EM3', [], [PhysicsStream], ['RATE:MultiElectron', 'BW:Egamma'], 1],
-        ['e5_tight_e4_etcut_Jpsiee',                    826,      'L1_2EM3', [], [PhysicsStream], ['RATE:MultiElectron', 'BW:Egamma'], 1],
-        ['e9_tight_e4_etcut_Jpsiee',                    827,      'L1_EM7_2EM3',  ['L1_EM7','L1_2EM3'], [PhysicsStream], ['RATE:MultiElectron', 'BW:Egamma'], 1], 
-        ['e9_etcut_e5_tight_Jpsiee',                    828,      'L1_EM7_2EM3',  ['L1_EM7','L1_2EM3'], [PhysicsStream], ['RATE:MultiElectron', 'BW:Egamma'], 1],         
-        ['e14_tight_e4_etcut_Jpsiee',                   829,      'L1_EM12_2EM3', ['L1_EM12','L1_2EM3'], [PhysicsStream], ['RATE:MultiElectron', 'BW:Egamma'], 1],
-        ['e14_etcut_e5_tight_Jpsiee',                   830,      'L1_EM12_2EM3', ['L1_EM12','L1_2EM3'], [PhysicsStream], ['RATE:MultiElectron', 'BW:Egamma'], 1],
+        ['e5_tight_e4_etcut',                                'L1_2EM3', [], [PhysicsStream], ['RATE:MultiElectron', 'BW:Egamma'], 1],
+        ['e5_tight_e4_etcut_Jpsiee',                         'L1_2EM3', [], [PhysicsStream], ['RATE:MultiElectron', 'BW:Egamma'], 1],
+        ['e9_tight_e4_etcut_Jpsiee',                         'L1_EM7_2EM3',  ['L1_EM7','L1_2EM3'], [PhysicsStream], ['RATE:MultiElectron', 'BW:Egamma'], 1], 
+        ['e9_etcut_e5_tight_Jpsiee',                         'L1_EM7_2EM3',  ['L1_EM7','L1_2EM3'], [PhysicsStream], ['RATE:MultiElectron', 'BW:Egamma'], 1],         
+        ['e14_tight_e4_etcut_Jpsiee',                        'L1_EM12_2EM3', ['L1_EM12','L1_2EM3'], [PhysicsStream], ['RATE:MultiElectron', 'BW:Egamma'], 1],
+        ['e14_etcut_e5_tight_Jpsiee',                        'L1_EM12_2EM3', ['L1_EM12','L1_2EM3'], [PhysicsStream], ['RATE:MultiElectron', 'BW:Egamma'], 1],
         
         # likelihood
-        ['e5_lhtight_e4_etcut',                         831,      'L1_2EM3', [], [PhysicsStream], ['RATE:MultiElectron', 'BW:Egamma'], 1],
-        ['e5_lhtight_e4_etcut_Jpsiee',                  832,      'L1_2EM3', [], [PhysicsStream], ['RATE:MultiElectron', 'BW:Egamma'], 1],
-        ['e9_lhtight_e4_etcut_Jpsiee',                  833,      'L1_EM7_2EM3',  ['L1_EM7','L1_2EM3'], [PhysicsStream], ['RATE:MultiElectron', 'BW:Egamma'], 1],
-        ['e9_etcut_e5_lhtight_Jpsiee',                  834,      'L1_EM7_2EM3',  ['L1_EM7','L1_2EM3'], [PhysicsStream], ['RATE:MultiElectron', 'BW:Egamma'], 1], 
-        ['e14_lhtight_e4_etcut_Jpsiee',                 835,      'L1_EM12_2EM3', ['L1_EM12','L1_2EM3'], [PhysicsStream], ['RATE:MultiElectron', 'BW:Egamma'], 1],
-        ['e14_etcut_e5_lhtight_Jpsiee',                 818,      'L1_EM12_2EM3', ['L1_EM12','L1_2EM3'], [PhysicsStream], ['RATE:MultiElectron', 'BW:Egamma'], 1],                
-        ### NOT IN THE LIST ['e5_lhtight_L2StarA_e4_etcut_L2StarA_Jpsiee',  830,      'L1_2EM3', [], [PhysicsStream], ['RATE:MultiElectron', 'BW:Egamma'], 1],
-        ### NOT IN THE LIST ['e5_lhtight_L2StarB_e4_etcut_L2StarB_Jpsiee',  831,      'L1_2EM3', [], [PhysicsStream], ['RATE:MultiElectron', 'BW:Egamma'], 1],
-        ### NOT IN THE LIST ['e5_lhtight_L2StarC_e4_etcut_L2StarC_Jpsiee',  832,      'L1_2EM3', [], [PhysicsStream], ['RATE:MultiElectron', 'BW:Egamma'], 1],
-        ### NOT IN THE LIST ['e5_lhtight_L2Star_idperf_e4_etcut_L2Star_idperf_Jpsiee', 833,      'L1_2EM3', [], [PhysicsStream], ['RATE:MultiElectron', 'BW:Egamma'], 1],
-        ### NOT IN THE LIST ['e5_lhtight_idperf_e4_etcut_idperf_Jpsiee',    834,      'L1_2EM3', [], [PhysicsStream], ['RATE:MultiElectron', 'BW:Egamma'], 1],
+        ['e5_lhtight_e4_etcut',                              'L1_2EM3', [], [PhysicsStream], ['RATE:MultiElectron', 'BW:Egamma'], 1],
+        ['e5_lhtight_e4_etcut_Jpsiee',                       'L1_2EM3', [], [PhysicsStream], ['RATE:MultiElectron', 'BW:Egamma'], 1],
+        ['e9_lhtight_e4_etcut_Jpsiee',                       'L1_EM7_2EM3',  ['L1_EM7','L1_2EM3'], [PhysicsStream], ['RATE:MultiElectron', 'BW:Egamma'], 1],
+        ['e9_etcut_e5_lhtight_Jpsiee',                       'L1_EM7_2EM3',  ['L1_EM7','L1_2EM3'], [PhysicsStream], ['RATE:MultiElectron', 'BW:Egamma'], 1], 
+        ['e14_lhtight_e4_etcut_Jpsiee',                      'L1_EM12_2EM3', ['L1_EM12','L1_2EM3'], [PhysicsStream], ['RATE:MultiElectron', 'BW:Egamma'], 1],
+        ['e14_etcut_e5_lhtight_Jpsiee',                      'L1_EM12_2EM3', ['L1_EM12','L1_2EM3'], [PhysicsStream], ['RATE:MultiElectron', 'BW:Egamma'], 1],                
+        ### NOT IN THE LIST ['e5_lhtight_L2StarA_e4_etcut_L2StarA_Jpsiee',       'L1_2EM3', [], [PhysicsStream], ['RATE:MultiElectron', 'BW:Egamma'], 1],
+        ### NOT IN THE LIST ['e5_lhtight_L2StarB_e4_etcut_L2StarB_Jpsiee',       'L1_2EM3', [], [PhysicsStream], ['RATE:MultiElectron', 'BW:Egamma'], 1],
+        ### NOT IN THE LIST ['e5_lhtight_L2StarC_e4_etcut_L2StarC_Jpsiee',       'L1_2EM3', [], [PhysicsStream], ['RATE:MultiElectron', 'BW:Egamma'], 1],
+        ### NOT IN THE LIST ['e5_lhtight_L2Star_idperf_e4_etcut_L2Star_idperf_Jpsiee',      'L1_2EM3', [], [PhysicsStream], ['RATE:MultiElectron', 'BW:Egamma'], 1],
+        ### NOT IN THE LIST ['e5_lhtight_idperf_e4_etcut_idperf_Jpsiee',        'L1_2EM3', [], [PhysicsStream], ['RATE:MultiElectron', 'BW:Egamma'], 1],
         
         # Multielectron chains with m_ee cut for Run1 PID
-        ['e5_tight1_e4_etcut',                          816,      'L1_2EM3', [], [PhysicsStream], ['RATE:MultiElectron', 'BW:Egamma'], 1],
-        ['e5_tight1_e4_etcut_Jpsiee',                   817,      'L1_2EM3', [], [PhysicsStream], ['RATE:MultiElectron', 'BW:Egamma'], 1],
-        ### NOT IN THE LIST ['e5_tight1_L2StarA_e4_etcut_L2StarA_Jpsiee',   818,      'L1_2EM3', [], [PhysicsStream], ['RATE:MultiElectron', 'BW:Egamma'], 1],
-        ### NOT IN THE LIST ['e5_tight1_L2StarB_e4_etcut_L2StarB_Jpsiee',   819,      'L1_2EM3', [], [PhysicsStream], ['RATE:MultiElectron', 'BW:Egamma'], 1],
-        ### NOT IN THE LIST ['e5_tight1_L2StarC_e4_etcut_L2StarC_Jpsiee',   820,      'L1_2EM3', [], [PhysicsStream], ['RATE:MultiElectron', 'BW:Egamma'], 1],
-        ### NOT IN THE LIST ['e5_tight1_L2Star_idperf_e4_etcut_L2Star_idperf_Jpsiee', 821,      'L1_2EM3', [], [PhysicsStream], ['RATE:MultiElectron', 'BW:Egamma'], 1],
-        ### NOT IN THE LIST ['e5_tight1_idperf_e4_etcut_idperf_Jpsiee',     823,      'L1_2EM3', [], [PhysicsStream], ['RATE:MultiElectron', 'BW:Egamma'], 1],
-        ### NOT IN THE LIST ['e9_tight1_e4_etcut_Jpsiee',                   825,      'L1_EM7_2EM3',  ['L1_EM7','L1_2EM3'], [PhysicsStream], ['RATE:MultiElectron', 'BW:Egamma'], 1],
-        ### NOT IN THE LIST ['e9_etcut_e5_tight1_Jpsiee',                   826,      'L1_EM7_2EM3',  ['L1_EM7','L1_2EM3'], [PhysicsStream], ['RATE:MultiElectron', 'BW:Egamma'], 1],
-        ### NOT IN THE LIST ['e14_tight1_e4_etcut_Jpsiee',                  827,      'L1_EM12_2EM3', ['L1_EM12','L1_2EM3'], [PhysicsStream], ['RATE:MultiElectron', 'BW:Egamma'], 1],
-        ### NOT IN THE LIST ['e14_etcut_e5_tight1_Jpsiee',                  828,      'L1_EM12_2EM3', ['L1_EM12','L1_2EM3'], [PhysicsStream], ['RATE:MultiElectron', 'BW:Egamma'], 1],
+        ['e5_tight1_e4_etcut',         'L1_2EM3', [], [PhysicsStream], ['RATE:MultiElectron', 'BW:Egamma'], 1],
+        ['e5_tight1_e4_etcut_Jpsiee',  'L1_2EM3', [], [PhysicsStream], ['RATE:MultiElectron', 'BW:Egamma'], 1],
+        ### NOT IN THE LIST ['e5_tight1_L2StarA_e4_etcut_L2StarA_Jpsiee',        'L1_2EM3', [], [PhysicsStream], ['RATE:MultiElectron', 'BW:Egamma'], 1],
+        ### NOT IN THE LIST ['e5_tight1_L2StarB_e4_etcut_L2StarB_Jpsiee',        'L1_2EM3', [], [PhysicsStream], ['RATE:MultiElectron', 'BW:Egamma'], 1],
+        ### NOT IN THE LIST ['e5_tight1_L2StarC_e4_etcut_L2StarC_Jpsiee',        'L1_2EM3', [], [PhysicsStream], ['RATE:MultiElectron', 'BW:Egamma'], 1],
+        ### NOT IN THE LIST ['e5_tight1_L2Star_idperf_e4_etcut_L2Star_idperf_Jpsiee',    'L1_2EM3', [], [PhysicsStream], ['RATE:MultiElectron', 'BW:Egamma'], 1],
+        ### NOT IN THE LIST ['e5_tight1_idperf_e4_etcut_idperf_Jpsiee',          'L1_2EM3', [], [PhysicsStream], ['RATE:MultiElectron', 'BW:Egamma'], 1],
+        ### NOT IN THE LIST ['e9_tight1_e4_etcut_Jpsiee',                        'L1_EM7_2EM3',  ['L1_EM7','L1_2EM3'], [PhysicsStream], ['RATE:MultiElectron', 'BW:Egamma'], 1],
+        ### NOT IN THE LIST ['e9_etcut_e5_tight1_Jpsiee',                        'L1_EM7_2EM3',  ['L1_EM7','L1_2EM3'], [PhysicsStream], ['RATE:MultiElectron', 'BW:Egamma'], 1],
+        ### NOT IN THE LIST ['e14_tight1_e4_etcut_Jpsiee',                       'L1_EM12_2EM3', ['L1_EM12','L1_2EM3'], [PhysicsStream], ['RATE:MultiElectron', 'BW:Egamma'], 1],
+        ### NOT IN THE LIST ['e14_etcut_e5_tight1_Jpsiee',                       'L1_EM12_2EM3', ['L1_EM12','L1_2EM3'], [PhysicsStream], ['RATE:MultiElectron', 'BW:Egamma'], 1],
 
         ##########
         # L1Topo chains (kept as before)
-        ### TOPO ['e5_tight1_e4_etcut_L11INVM5-EMs2-EMall',           590, 'L1_1INVM5-EMs2-EMall', [], [PhysicsStream], ['RATE:MultiElectron', 'BW:Egamma'], 1],
-        ### TOPO ['e5_tight1_e4_etcut_Jpsiee_L11INVM5-EMs2-EMall',    591, 'L1_1INVM5-EMs2-EMall', [], [PhysicsStream], ['RATE:MultiElectron', 'BW:Egamma'], 1],
-        ### TOPO ['e9_tight1_e4_etcut_Jpsiee_L11INVM5-EM7s2-EMall',   592, 'L1_1INVM5-EM7s2-EMall', [], [PhysicsStream], ['RATE:MultiElectron', 'BW:Egamma'], 1],
-        ### TOPO ['e9_etcut_e5_tight1_Jpsiee_L11INVM5-EM7s2-EMall',   593, 'L1_1INVM5-EM7s2-EMall', [], [PhysicsStream], ['RATE:MultiElectron', 'BW:Egamma'], 1],
-        ### TOPO ['e14_tight1_e4_etcut_Jpsiee_L11INVM5-EM12s2-EMall', 594, 'L1_1INVM5-EM12s2-EMall', [], [PhysicsStream], ['RATE:MultiElectron', 'BW:Egamma'], 1],
-        ### TOPO ['e14_etcut_e5_tight1_Jpsiee_L11INVM5-EM12s2-EMall', 595, 'L1_1INVM5-EM12s2-EMall', [], [PhysicsStream], ['RATE:MultiElectron', 'BW:Egamma'], 1],
+        ### TOPO ['e5_tight1_e4_etcut_L11INVM5-EMs2-EMall',            'L1_1INVM5-EMs2-EMall', [], [PhysicsStream], ['RATE:MultiElectron', 'BW:Egamma'], 1],
+        ### TOPO ['e5_tight1_e4_etcut_Jpsiee_L11INVM5-EMs2-EMall',     'L1_1INVM5-EMs2-EMall', [], [PhysicsStream], ['RATE:MultiElectron', 'BW:Egamma'], 1],
+        ### TOPO ['e9_tight1_e4_etcut_Jpsiee_L11INVM5-EM7s2-EMall',    'L1_1INVM5-EM7s2-EMall', [], [PhysicsStream], ['RATE:MultiElectron', 'BW:Egamma'], 1],
+        ### TOPO ['e9_etcut_e5_tight1_Jpsiee_L11INVM5-EM7s2-EMall',    'L1_1INVM5-EM7s2-EMall', [], [PhysicsStream], ['RATE:MultiElectron', 'BW:Egamma'], 1],
+        ### TOPO ['e14_tight1_e4_etcut_Jpsiee_L11INVM5-EM12s2-EMall',  'L1_1INVM5-EM12s2-EMall', [], [PhysicsStream], ['RATE:MultiElectron', 'BW:Egamma'], 1],
+        ### TOPO ['e14_etcut_e5_tight1_Jpsiee_L11INVM5-EM12s2-EMall',  'L1_1INVM5-EM12s2-EMall', [], [PhysicsStream], ['RATE:MultiElectron', 'BW:Egamma'], 1],
 
         # W T&P triggers
-        ['e5_etcut_L110MINDPHI-AJj15s2-XE0', 600, 'L1_10MINDPHI-AJj15s2-XE0', ['L1_EM3'], [PhysicsStream], ['RATE:SingleElectron', 'BW:Egamma'], 1],
-        ['e5_etcut_L120MINDPHI-AJjs6-XE0',   601, 'L1_20MINDPHI-AJjs6-XE0', ['L1_EM3'], [PhysicsStream], ['RATE:SingleElectron', 'BW:Egamma'], 1],
-        ['e5_etcut_L120MINDPHI-AJj15s2-XE0', 602, 'L1_20MINDPHI-AJj15s2-XE0', ['L1_EM3'], [PhysicsStream], ['RATE:SingleElectron', 'BW:Egamma'], 1],
-        ### TOPO ['e5_etcut_L110MINDPHI-EM6s1-XE0',   603, 'L1_10MINDPHI-EM6s1-XE0', [], [PhysicsStream], ['RATE:SingleElectron', 'BW:Egamma'], 1],
-        ### TOPO ['e5_etcut_L120MINDPHI-EM9s6-XE0',   604, 'L1_20MINDPHI-EM9s6-XE0', [], [PhysicsStream], ['RATE:SingleElectron', 'BW:Egamma'], 1],
-        ### TOPO ['e5_etcut_L120MINDPHI-EM6s1-XE0',   605, 'L1_20MINDPHI-EM6s1-XE0', [], [PhysicsStream], ['RATE:SingleElectron', 'BW:Egamma'], 1],
-        ['e5_etcut_L105RATIO-XE0-HT0-AJj15all.ETA49',   606, 'L1_05RATIO-XE0-HT0-AJj15all.ETA49', ['L1_EM3'], [PhysicsStream], ['RATE:SingleElectron', 'BW:Egamma'], 1],
-        ['e5_etcut_L108RATIO-XE0-HT0-AJj0all.ETA49',    607, 'L1_08RATIO-XE0-HT0-AJj0all.ETA49', ['L1_EM3'], [PhysicsStream], ['RATE:SingleElectron', 'BW:Egamma'], 1],
-        ['e5_etcut_L140RATIO2-XE0-HT0-AJj15all.ETA49',  608, 'L1_40RATIO2-XE0-HT0-AJj15all.ETA49', ['L1_EM3'], [PhysicsStream], ['RATE:SingleElectron', 'BW:Egamma'], 1],
-        ['e5_etcut_L190RATIO2-XE0-HT0-AJj0all.ETA49',   609, 'L1_90RATIO2-XE0-HT0-AJj0all.ETA49', ['L1_EM3'], [PhysicsStream], ['RATE:SingleElectron', 'BW:Egamma'], 1],
-        ['e5_etcut_L1HT20-AJj0all.ETA49',               610, 'L1_HT20-AJj0all.ETA49', ['L1_EM3'], [PhysicsStream], ['RATE:SingleElectron', 'BW:Egamma'], 1],
-        ['e5_etcut_L1NOT-02MATCH-EM9s1-AJj15all.ETA49', 611, 'L1_NOT-02MATCH-EM9s1-AJj15all.ETA49', ['L1_EM3'], [PhysicsStream], ['RATE:SingleElectron', 'BW:Egamma'], 1],
-        ['e5_etcut_L1NOT-02MATCH-EM9s1-AJj15all.ETA49_05RATIO-XE0-SUM0-EM9s1-HT0-AJj15all.ETA49', 612, 'L1_NOT-02MATCH-EM9s1-AJj15all.ETA49_05RATIO-XE0-SUM0-EM9s1-HT0-AJj15all.ETA49', ['L1_EM3'], [PhysicsStream], ['RATE:SingleElectron', 'BW:Egamma'], 1],
+        ['e5_etcut_L110MINDPHI-AJj15s2-XE0',  'L1_10MINDPHI-AJj15s2-XE0', ['L1_EM3'], [PhysicsStream], ['RATE:SingleElectron', 'BW:Egamma'], 1],
+        ['e5_etcut_L120MINDPHI-AJjs6-XE0',    'L1_20MINDPHI-AJjs6-XE0', ['L1_EM3'], [PhysicsStream], ['RATE:SingleElectron', 'BW:Egamma'], 1],
+        ['e5_etcut_L120MINDPHI-AJj15s2-XE0',  'L1_20MINDPHI-AJj15s2-XE0', ['L1_EM3'], [PhysicsStream], ['RATE:SingleElectron', 'BW:Egamma'], 1],
+        ### TOPO ['e5_etcut_L110MINDPHI-EM6s1-XE0',      'L1_10MINDPHI-EM6s1-XE0', [], [PhysicsStream], ['RATE:SingleElectron', 'BW:Egamma'], 1],
+        ### TOPO ['e5_etcut_L120MINDPHI-EM9s6-XE0',      'L1_20MINDPHI-EM9s6-XE0', [], [PhysicsStream], ['RATE:SingleElectron', 'BW:Egamma'], 1],
+        ### TOPO ['e5_etcut_L120MINDPHI-EM6s1-XE0',      'L1_20MINDPHI-EM6s1-XE0', [], [PhysicsStream], ['RATE:SingleElectron', 'BW:Egamma'], 1],
+        ['e5_etcut_L105RATIO-XE0-HT0-AJj15all.ETA49',    'L1_05RATIO-XE0-HT0-AJj15all.ETA49', ['L1_EM3'], [PhysicsStream], ['RATE:SingleElectron', 'BW:Egamma'], 1],
+        ['e5_etcut_L108RATIO-XE0-HT0-AJj0all.ETA49',     'L1_08RATIO-XE0-HT0-AJj0all.ETA49', ['L1_EM3'], [PhysicsStream], ['RATE:SingleElectron', 'BW:Egamma'], 1],
+        ['e5_etcut_L140RATIO2-XE0-HT0-AJj15all.ETA49',   'L1_40RATIO2-XE0-HT0-AJj15all.ETA49', ['L1_EM3'], [PhysicsStream], ['RATE:SingleElectron', 'BW:Egamma'], 1],
+        ['e5_etcut_L190RATIO2-XE0-HT0-AJj0all.ETA49',    'L1_90RATIO2-XE0-HT0-AJj0all.ETA49', ['L1_EM3'], [PhysicsStream], ['RATE:SingleElectron', 'BW:Egamma'], 1],
+        ['e5_etcut_L1HT20-AJj0all.ETA49',                'L1_HT20-AJj0all.ETA49', ['L1_EM3'], [PhysicsStream], ['RATE:SingleElectron', 'BW:Egamma'], 1],
+        ['e5_etcut_L1NOT-02MATCH-EM9s1-AJj15all.ETA49',  'L1_NOT-02MATCH-EM9s1-AJj15all.ETA49', ['L1_EM3'], [PhysicsStream], ['RATE:SingleElectron', 'BW:Egamma'], 1],
+        ['e5_etcut_L1NOT-02MATCH-EM9s1-AJj15all.ETA49_05RATIO-XE0-SUM0-EM9s1-HT0-AJj15all.ETA49',  'L1_NOT-02MATCH-EM9s1-AJj15all.ETA49_05RATIO-XE0-SUM0-EM9s1-HT0-AJj15all.ETA49', ['L1_EM3'], [PhysicsStream], ['RATE:SingleElectron', 'BW:Egamma'], 1],
+
+        # Z T&P triggers for monitoring
+        ['e24_lhtight_L1EM20VH_e15_etcut_Zee', 'L1_EM20VH',    [], [PhysicsStream], ['RATE:SinglePhoton','BW:Egamma'], 1], 
+        ['e24_tight_L1EM20VH_e15_etcut_Zee',   'L1_EM20VH',    [], [PhysicsStream], ['RATE:SinglePhoton','BW:Egamma'], 1], 
+        ['e26_lhtight_e15_etcut_Zee',          'L1_EM22VHLIL', [], [PhysicsStream], ['RATE:SinglePhoton','BW:Egamma'], 1], 
+        ['e26_tight_e15_etcut_Zee',            'L1_EM22VHLIL', [], [PhysicsStream], ['RATE:SinglePhoton','BW:Egamma'], 1], 
 
         ##########
         # Single photon triggers        
-        ['g120_loose',             296,          'L1_EM50V', [], [PhysicsStream], ['RATE:SinglePhoton','BW:Egamma'], 1], 
-        ['g140_loose',             297,          'L1_EM50V', [], [PhysicsStream], ['RATE:SinglePhoton','BW:Egamma'], 1],         
-
-        # Supporting triggers with PS
-        ['g0_perf_L1EM3',          954,          'L1_EM3',   [], [PhysicsStream], ['RATE:SinglePhoton', 'BW:Egamma'], 1],     
-        ['g0_perf_L1EM15',         298,          'L1_EM15',  [], [PhysicsStream], ['RATE:SinglePhoton', 'BW:Egamma'], 1], 
-
-        # Rerun mode trigger to support combined chains
-        ['g20_etcut_L1EM12',       299,          'L1_EM12',  [], [PhysicsStream], ['RATE:SinglePhoton', 'BW:Egamma'], 1], 
-        ['g15_loose_L1EM7',        260,          'L1_EM7',   [], [PhysicsStream], ['RATE:SinglePhoton', 'BW:Egamma'], -1], 
-        ['g20_loose_L1EM12',       261,          'L1_EM12',  [], [PhysicsStream], ['RATE:SinglePhoton', 'BW:Egamma'], -1], # pass through
-        ['g40_loose_L1EM15',       262,          'L1_EM15',  [], [PhysicsStream], ['RATE:SinglePhoton', 'BW:Egamma'], -1], 
-        ['g45_loose_L1EM15',       263,          'L1_EM15',  [], [PhysicsStream], ['RATE:SinglePhoton', 'BW:Egamma'], -1], 
-        ['g50_loose_L1EM15',       264,          'L1_EM15',  [], [PhysicsStream], ['RATE:SinglePhoton', 'BW:Egamma'], -1], 
-        ['g80_loose',              265,          'L1_EM50V', [], [PhysicsStream], ['RATE:SinglePhoton', 'BW:Egamma'], -1], 
-        ['g100_loose',             266,          'L1_EM50V', [], [PhysicsStream], ['RATE:SinglePhoton', 'BW:Egamma'], -1], 
+        ['g120_loose',                    'L1_EM22VHLIL', [], [PhysicsStream], ['RATE:SinglePhoton','BW:Egamma'], 1], 
+        ['g140_loose',                    'L1_EM22VHLIL', [], [PhysicsStream], ['RATE:SinglePhoton','BW:Egamma'], 1],         
+
+        # Supporting triggers with 
+        ['g0_perf_L1EM15',                'L1_EM15',  [], [PhysicsStream], ['RATE:SinglePhoton', 'BW:Egamma'], 1], 
+
+        # Rerun mode trigger to supmbined chains
+        ['g20_etcut_L1EM12',              'L1_EM12',  [], [PhysicsStream], ['RATE:SinglePhoton', 'BW:Egamma'], 1], 
+        ['g15_loose_L1EM7',               'L1_EM7',   [], [PhysicsStream], ['RATE:SinglePhoton', 'BW:Egamma'], -1], 
+        ['g20_loose_L1EM12',              'L1_EM12',  [], [PhysicsStream], ['RATE:SinglePhoton', 'BW:Egamma'], -1], # pass through
+        ['g40_loose_L1EM15',              'L1_EM15',  [], [PhysicsStream], ['RATE:SinglePhoton', 'BW:Egamma'], -1], 
+        ['g45_loose_L1EM15',              'L1_EM15',  [], [PhysicsStream], ['RATE:SinglePhoton', 'BW:Egamma'], -1], 
+        ['g50_loose_L1EM15',              'L1_EM15',  [], [PhysicsStream], ['RATE:SinglePhoton', 'BW:Egamma'], -1], 
+        ['g80_loose',                     'L1_EM22VHLIL', [], [PhysicsStream], ['RATE:SinglePhoton', 'BW:Egamma'], -1], 
+        ['g100_loose',                    'L1_EM22VHLIL', [], [PhysicsStream], ['RATE:SinglePhoton', 'BW:Egamma'], -1], 
 
         # Rerun mode and PS
-        ['g10_loose_L1EM7',        267,          'L1_EM7',   [], [PhysicsStream], ['RATE:SinglePhoton', 'BW:Egamma'], 1],
-        ['g25_loose_L1EM15',       268,          'L1_EM15',  [], [PhysicsStream], ['RATE:SinglePhoton', 'BW:Egamma'], 1],
-        ['g35_loose_L1EM15',       269,          'L1_EM15',  [], [PhysicsStream], ['RATE:SinglePhoton', 'BW:Egamma'], 1],
-        ['g60_loose',              270,          'L1_EM50V', [], [PhysicsStream], ['RATE:SinglePhoton', 'BW:Egamma'], 1],
-        ['g70_loose',              271,          'L1_EM50V', [], [PhysicsStream], ['RATE:SinglePhoton', 'BW:Egamma'], 1],
+        ['g10_loose_L1EM7',               'L1_EM7',   [], [PhysicsStream], ['RATE:SinglePhoton', 'BW:Egamma'], 1],
+        ['g25_loose_L1EM15',              'L1_EM15',  [], [PhysicsStream], ['RATE:SinglePhoton', 'BW:Egamma'], 1],
+        ['g35_loose_L1EM15',              'L1_EM15',  [], [PhysicsStream], ['RATE:SinglePhoton', 'BW:Egamma'], 1],
+        ['g60_loose',                     'L1_EM22VHLIL', [], [PhysicsStream], ['RATE:SinglePhoton', 'BW:Egamma'], 1],
+        ['g70_loose',                     'L1_EM22VHLIL', [], [PhysicsStream], ['RATE:SinglePhoton', 'BW:Egamma'], 1],
 
         # Rerun mode
-        ['g10_medium_L1EM7',       252,          'L1_EM7',   [], [PhysicsStream], ['RATE:SinglePhoton', 'BW:Egamma'], 1],
-        ['g10_loose',              253,          'L1_EM8VH', [], [PhysicsStream], ['RATE:SinglePhoton', 'BW:Egamma'], 1],
-        ['g10_medium',             254,          'L1_EM8VH', [], [PhysicsStream], ['RATE:SinglePhoton', 'BW:Egamma'], 1],
-        ['g15_loose_L1EM3',        256,          'L1_EM3',   [], [PhysicsStream], ['RATE:SinglePhoton', 'BW:Egamma'], 1],
-        ['g15_loose',              257,          'L1_EM13VH',[], [PhysicsStream], ['RATE:SinglePhoton', 'BW:Egamma'], 1],
-        ['g20_loose_L1EM15',       258,          'L1_EM15',  [], [PhysicsStream], ['RATE:SinglePhoton', 'BW:Egamma'], 1],
-        ['g20_loose',              259,          'L1_EM15VH',[], [PhysicsStream], ['RATE:SinglePhoton', 'BW:Egamma'], 1],
-        ['g20_tight',              273,          'L1_EM15VH',[], [PhysicsStream], ['RATE:SinglePhoton', 'BW:Egamma'], 1],
-        ['g25_loose',              274,          'L1_EM15VH',[], [PhysicsStream], ['RATE:SinglePhoton', 'BW:Egamma'], 1],
-        ['g25_medium',             275,          'L1_EM15VH',[], [PhysicsStream], ['RATE:SinglePhoton', 'BW:Egamma'], 1],
-        ['g35_loose',              276,          'L1_EM15VH', [], [PhysicsStream], ['RATE:SinglePhoton', 'BW:Egamma'], 1],
-        ['g35_medium',             277,          'L1_EM15VH', [], [PhysicsStream], ['RATE:SinglePhoton', 'BW:Egamma'], 1],
-        ['g40_tight',              278,          'L1_EM20VH', [], [PhysicsStream], ['RATE:SinglePhoton', 'BW:Egamma'], 1],
-        ['g45_tight',              279,          'L1_EM22VHLIL', [], [PhysicsStream], ['RATE:SinglePhoton', 'BW:Egamma'], 1],
-        ['g50_loose',              280,          'L1_EM15VH', [], [PhysicsStream], ['RATE:SinglePhoton', 'BW:Egamma'], 1],
-        ['g60_loose_L1EM15VH',     281,          'L1_EM15VH', [], [PhysicsStream], ['RATE:SinglePhoton', 'BW:Egamma'], 1],
+        ['g10_medium_L1EM7',              'L1_EM7',   [], [PhysicsStream], ['RATE:SinglePhoton', 'BW:Egamma'], 1],
+        ['g10_loose',                     'L1_EM8VH', [], [PhysicsStream], ['RATE:SinglePhoton', 'BW:Egamma'], 1],
+        ['g10_medium',                    'L1_EM8VH', [], [PhysicsStream], ['RATE:SinglePhoton', 'BW:Egamma'], 1],
+        ['g15_loose_L1EM3',               'L1_EM3',   [], [PhysicsStream], ['RATE:SinglePhoton', 'BW:Egamma'], 1],
+        ['g15_loose',                     'L1_EM13VH',[], [PhysicsStream], ['RATE:SinglePhoton', 'BW:Egamma'], 1],
+        ['g20_loose_L1EM15',              'L1_EM15',  [], [PhysicsStream], ['RATE:SinglePhoton', 'BW:Egamma'], 1],
+        ['g20_loose',                     'L1_EM15VH',[], [PhysicsStream], ['RATE:SinglePhoton', 'BW:Egamma'], 1],
+        ['g20_tight',                     'L1_EM15VH',[], [PhysicsStream], ['RATE:SinglePhoton', 'BW:Egamma'], 1],
+        ['g25_loose',                     'L1_EM15VH',[], [PhysicsStream], ['RATE:SinglePhoton', 'BW:Egamma'], 1],
+        ['g25_medium',                    'L1_EM15VH',[], [PhysicsStream], ['RATE:SinglePhoton', 'BW:Egamma'], 1],
+        ['g35_loose',                     'L1_EM15VH', [], [PhysicsStream], ['RATE:SinglePhoton', 'BW:Egamma'], 1],
+        ['g35_medium',                    'L1_EM15VH', [], [PhysicsStream], ['RATE:SinglePhoton', 'BW:Egamma'], 1],
+        ['g40_tight',                     'L1_EM20VH', [], [PhysicsStream], ['RATE:SinglePhoton', 'BW:Egamma'], 1],
+        ['g45_tight',                     'L1_EM22VHLIL', [], [PhysicsStream], ['RATE:SinglePhoton', 'BW:Egamma'], 1],
+        ['g50_loose',                     'L1_EM15VH', [], [PhysicsStream], ['RATE:SinglePhoton', 'BW:Egamma'], 1],
+        ['g60_loose_L1EM15VH',            'L1_EM15VH', [], [PhysicsStream], ['RATE:SinglePhoton', 'BW:Egamma'], 1],
         
-        # Et cut only photon chains (kept as before)
-        #['g12_etcut_L1EM7',         230,          'L1_EM7', [], [PhysicsStream], ['RATE:SingleElectron', 'BW:Egamma'], 1],
-        #['g25_etcut_L1EM15',        232,          'L1_EM15', [], [PhysicsStream], ['RATE:SingleElectron', 'BW:Egamma'], 1],
-        #['g35_etcut_L1EM15',        233,          'L1_EM15', [], [PhysicsStream], ['RATE:SingleElectron', 'BW:Egamma'], 1],
-        #['g40_etcut',               234,          'L1_EM15', [], [PhysicsStream], ['RATE:SingleElectron', 'BW:Egamma'], 1],
-        #['g50_etcut',               235,          'L1_EM15', [], [PhysicsStream], ['RATE:SingleElectron', 'BW:Egamma'], 1],
-        #['g60_etcut',               236,          'L1_EM50V', [], [PhysicsStream], ['RATE:SingleElectron', 'BW:Egamma'], 1],
-        #['g80_etcut',               237,          'L1_EM50V', [], [PhysicsStream], ['RATE:SingleElectron', 'BW:Egamma'], 1],
-        #['g100_etcut',              238,          'L1_EM50V', [], [PhysicsStream], ['RATE:SingleElectron', 'BW:Egamma'], 1],
-        #['g120_etcut',              239,          'L1_EM50V', [], [PhysicsStream], ['RATE:SingleElectron', 'BW:Egamma'], 1],
+        # Et cut only photon chainsas before)
+        #['g12_etcut_L1EM7',                'L1_EM7', [], [PhysicsStream], ['RATE:SingleElectron', 'BW:Egamma'], 1],
+        #['g25_etcut_L1EM15',               'L1_EM15', [], [PhysicsStream], ['RATE:SingleElectron', 'BW:Egamma'], 1],
+        #['g35_etcut_L1EM15',               'L1_EM15', [], [PhysicsStream], ['RATE:SingleElectron', 'BW:Egamma'], 1],
+        #['g40_etcut',                      'L1_EM15', [], [PhysicsStream], ['RATE:SingleElectron', 'BW:Egamma'], 1],
+        #['g50_etcut',                      'L1_EM15', [], [PhysicsStream], ['RATE:SingleElectron', 'BW:Egamma'], 1],
+        #['g60_etcut',                      'L1_EM22VHLIL', [], [PhysicsStream], ['RATE:SingleElectron', 'BW:Egamma'], 1],
+        #['g80_etcut',                      'L1_EM22VHLIL', [], [PhysicsStream], ['RATE:SingleElectron', 'BW:Egamma'], 1],
+        #['g100_etcut',                     'L1_EM22VHLIL', [], [PhysicsStream], ['RATE:SingleElectron', 'BW:Egamma'], 1],
+        #['g120_etcut',                     'L1_EM22VHLIL', [], [PhysicsStream], ['RATE:SingleElectron', 'BW:Egamma'], 1],
         
         # Photon cut-based Run1 PID chains
         # Loose chains for low ET physics and background estimation
-        ### NOT IN THE LIST ['g12_loose1_L1EM7',         240,          'L1_EM7', [], [PhysicsStream], ['RATE:SinglePhoton', 'BW:Egamma'], 1],
-        ### NOT IN THE LIST ['g20_loose1_L1EM12',        241,          'L1_EM12', [], [PhysicsStream], ['RATE:SinglePhoton', 'BW:Egamma'], 1],
-        ### NOT IN THE LIST ##['g25_loose1_L1EM15',        242,          'L1_EM15', [], ['globalStream'], ['RATE:SinglePhoton', 'BW:Egamma'], 1], #duplicate, need to make sure prescales / rerun set properly
-        ### NOT IN THE LIST ## ['g35_loose1_L1EM15',        243,          'L1_EM15', [], ['globalStream'], ['RATE:SinglePhoton', 'BW:Egamma'], 1], #duplicate, need to make sure prescales / rerun set properly
-        ### NOT IN THE LIST ['g40_loose1',               244,          'L1_EM15', [], [PhysicsStream], ['RATE:SinglePhoton', 'BW:Egamma'], 1],
-        ### NOT IN THE LIST ['g50_loose1',               245,          'L1_EM15', [], [PhysicsStream], ['RATE:SinglePhoton', 'BW:Egamma'], 1],
-        ### NOT IN THE LIST ['g60_loose1',               246,          'L1_EM50V', [], [PhysicsStream], ['RATE:SinglePhoton', 'BW:Egamma'], 1],
-        ### NOT IN THE LIST ['g80_loose1',               247,          'L1_EM50V', [], [PhysicsStream], ['RATE:SinglePhoton', 'BW:Egamma'], 1],
-        ### NOT IN THE LIST ['g100_loose1',              248,          'L1_EM50V', [], [PhysicsStream], ['RATE:SinglePhoton', 'BW:Egamma'], 1],
+        ### NOT IN THE LIST ['g12_loose1_L1EM7',                'L1_EM7', [], [PhysicsStream], ['RATE:SinglePhoton', 'BW:Egamma'], 1],
+        ### NOT IN THE LIST ['g20_loose1_L1EM12',               'L1_EM12', [], [PhysicsStream], ['RATE:SinglePhoton', 'BW:Egamma'], 1],
+        ### NOT IN THE LIST ##['g25_loose1_L1EM15',             'L1_EM15', [], ['globalStream'], ['RATE:SinglePhoton', 'BW:Egamma'], 1], #duplicate, need to make sure prescales / rerun set properly
+        ### NOT IN THE LIST ## ['g35_loose1_L1EM15',         'L1_EM15', [], ['globalStream'], ['RATE:SinglePhoton', 'BW:Egamma'], 1], #duplicate, need to make sure prescales / rerun set properly
+        ### NOT IN THE LIST ['g40_loose1',                      'L1_EM15', [], [PhysicsStream], ['RATE:SinglePhoton', 'BW:Egamma'], 1],
+        ### NOT IN THE LIST ['g50_loose1',                      'L1_EM15', [], [PhysicsStream], ['RATE:SinglePhoton', 'BW:Egamma'], 1],
+        ### NOT IN THE LIST ['g60_loose1',                      'L1_EM22VHLIL', [], [PhysicsStream], ['RATE:SinglePhoton', 'BW:Egamma'], 1],
+        ### NOT IN THE LIST ['g80_loose1',                      'L1_EM22VHLIL', [], [PhysicsStream], ['RATE:SinglePhoton', 'BW:Egamma'], 1],
+        ### NOT IN THE LIST ['g100_loose1',                     'L1_EM22VHLIL', [], [PhysicsStream], ['RATE:SinglePhoton', 'BW:Egamma'], 1],
         
         # Run 2 Baseline chains
-        ### NOT IN THE LIST ['g120_loose1',              250,          'L1_EM50V', [], [PhysicsStream], ['RATE:SinglePhoton','BW:Egamma'], 1],
-        ### NOT IN THE LIST ['g140_loose1',              251,          'L1_EM50V', [], [PhysicsStream], ['RATE:SinglePhoton','BW:Egamma'], 1],
-
-        ### NOT IN THE LIST ['g4_etcut',                 260,          'L1_EM3', [], [PhysicsStream], ['RATE:SinglePhoton', 'BW:Egamma'], 1],
-        ### NOT IN THE LIST ['g8_etcut',                 261,          'L1_EM3', [], [PhysicsStream], ['RATE:SinglePhoton', 'BW:Egamma'], 1],
-        ### NOT IN THE LIST #['g9_etcut',                 263,          'L1_EM7', [], [PhysicsStream], ['RATE:SinglePhoton', 'BW:Egamma'], 1],
-        ### NOT IN THE LIST #['g14_etcut',                264,          'L1_EM12', [], [PhysicsStream], ['RATE:SinglePhoton', 'BW:Egamma'], 1],
-        ### NOT IN THE LIST #['g9_etcut_L1EM3',           265,          'L1_EM3', [], [PhysicsStream], ['RATE:SinglePhoton', 'BW:Egamma'], 1],
-        ### NOT IN THE LIST #['g14_etcut_L1EM7',          266,          'L1_EM7', [], [PhysicsStream], ['RATE:SinglePhoton', 'BW:Egamma'], 1],
-        ### NOT IN THE LIST ['g25_loose1_L1EM15',        265,          'L1_EM15', [], [PhysicsStream], ['RATE:SinglePhoton', 'BW:Egamma'], 1],
-        ### NOT IN THE LIST ['g25_medium1_L1EM3',        266,          'L1_EM3', [], [PhysicsStream], ['RATE:SinglePhoton', 'BW:Egamma'], 1],
-        ### NOT IN THE LIST ['g35_loose1_L1EM15',        267,          'L1_EM15', [], [PhysicsStream], ['RATE:SinglePhoton', 'BW:Egamma'], 1],
-        ### NOT IN THE LIST ['g35_medium1',              268,          'L1_EM15VH', [], [PhysicsStream], ['RATE:SinglePhoton', 'BW:Egamma'], 1],
-        ### NOT IN THE LIST ['g12_loose1',               269,          'L1_EM8VH', [], [PhysicsStream], ['RATE:SinglePhoton', 'BW:Egamma'], 1],
-        ### NOT IN THE LIST ['g20_loose1',               270,          'L1_EM15VH', [], [PhysicsStream], ['RATE:SinglePhoton', 'BW:Egamma'], 1],
-        ### NOT IN THE LIST ['g20_tight1',               271,          'L1_EM15VH', [], [PhysicsStream], ['RATE:SinglePhoton', 'BW:Egamma'], 1],
+        ### NOT IN THE LIST ['g120_loose1',                     'L1_EM22VHLIL', [], [PhysicsStream], ['RATE:SinglePhoton','BW:Egamma'], 1],
+        ### NOT IN THE LIST ['g140_loose1',                     'L1_EM22VHLIL', [], [PhysicsStream], ['RATE:SinglePhoton','BW:Egamma'], 1],
+
+        ### NOT IN THE LIST ['g4_etcut',                        'L1_EM3', [], [PhysicsStream], ['RATE:SinglePhoton', 'BW:Egamma'], 1],
+        ### NOT IN THE LIST ['g8_etcut',                        'L1_EM3', [], [PhysicsStream], ['RATE:SinglePhoton', 'BW:Egamma'], 1],
+        ### NOT IN THE LIST #['g9_etcut',                        'L1_EM7', [], [PhysicsStream], ['RATE:SinglePhoton', 'BW:Egamma'], 1],
+        ### NOT IN THE LIST #['g14_etcut',                       'L1_EM12', [], [PhysicsStream], ['RATE:SinglePhoton', 'BW:Egamma'], 1],
+        ### NOT IN THE LIST #['g9_etcut_L1EM3',                  'L1_EM3', [], [PhysicsStream], ['RATE:SinglePhoton', 'BW:Egamma'], 1],
+        ### NOT IN THE LIST #['g14_etcut_L1EM7',                 'L1_EM7', [], [PhysicsStream], ['RATE:SinglePhoton', 'BW:Egamma'], 1],
+        ### NOT IN THE LIST ['g25_loose1_L1EM15',               'L1_EM15', [], [PhysicsStream], ['RATE:SinglePhoton', 'BW:Egamma'], 1],
+        ### NOT IN THE LIST ['g25_medium1_L1EM3',               'L1_EM3', [], [PhysicsStream], ['RATE:SinglePhoton', 'BW:Egamma'], 1],
+        ### NOT IN THE LIST ['g35_loose1_L1EM15',               'L1_EM15', [], [PhysicsStream], ['RATE:SinglePhoton', 'BW:Egamma'], 1],
+        ### NOT IN THE LIST ['g35_medium1',                     'L1_EM15VH', [], [PhysicsStream], ['RATE:SinglePhoton', 'BW:Egamma'], 1],
+        ### NOT IN THE LIST ['g12_loose1',                      'L1_EM8VH', [], [PhysicsStream], ['RATE:SinglePhoton', 'BW:Egamma'], 1],
+        ### NOT IN THE LIST ['g20_loose1',                      'L1_EM15VH', [], [PhysicsStream], ['RATE:SinglePhoton', 'BW:Egamma'], 1],
+        ### NOT IN THE LIST ['g20_tight1',                      'L1_EM15VH', [], [PhysicsStream], ['RATE:SinglePhoton', 'BW:Egamma'], 1],
                 
         ##########        
         # Di-photon triggers
-        ['g35_loose_L1EM15_g25_loose_L1EM15',      310,    'L1_2EM15', [], [PhysicsStream], ['RATE:MultiPhoton', 'BW:Egamma'], 1], 
-        ['g35_loose_g25_loose',                    311,    'L1_2EM15VH', [], [PhysicsStream], ['RATE:MultiPhoton', 'BW:Egamma'], 1], 
-        ['g35_medium_g25_medium',                  312,    'L1_2EM15VH', [], [PhysicsStream], ['RATE:MultiPhoton', 'BW:Egamma'], 1], 
-        ['2g20_loose_L12EM15',                     313,    'L1_2EM15', [], [PhysicsStream], ['RATE:MultiPhoton', 'BW:Egamma'], 1], 
-        ['2g20_tight',                             314,    'L1_2EM15VH', [], [PhysicsStream], ['RATE:MultiPhoton', 'BW:Egamma'], 1], 
-        ['2g50_loose',                             315,    'L1_2EM15VH', [], [PhysicsStream], ['RATE:MultiPhoton', 'BW:Egamma'], 1], 
-        ['2g60_loose_L12EM15VH',                   316,    'L1_2EM15VH', [], [PhysicsStream], ['RATE:MultiPhoton', 'BW:Egamma'], 1],  
+        ['g35_loose_L1EM15_g25_loose_L1EM15',       'L1_2EM15', [], [PhysicsStream], ['RATE:MultiPhoton', 'BW:Egamma'], 1], 
+        ['g35_loose_g25_loose',                     'L1_2EM15VH', [], [PhysicsStream], ['RATE:MultiPhoton', 'BW:Egamma'], 1], 
+        ['g35_medium_g25_medium',                   'L1_2EM15VH', [], [PhysicsStream], ['RATE:MultiPhoton', 'BW:Egamma'], 1], 
+        ['2g20_loose_L12EM15',                      'L1_2EM15', [], [PhysicsStream], ['RATE:MultiPhoton', 'BW:Egamma'], 1], 
+        ['2g20_tight',                              'L1_2EM15VH', [], [PhysicsStream], ['RATE:MultiPhoton', 'BW:Egamma'], 1], 
+        ['2g50_loose',                              'L1_2EM15VH', [], [PhysicsStream], ['RATE:MultiPhoton', 'BW:Egamma'], 1], 
+        ['2g60_loose_L12EM15VH',                    'L1_2EM15VH', [], [PhysicsStream], ['RATE:MultiPhoton', 'BW:Egamma'], 1],  
 
         # Tri-photon triggers
-        ['3g15_loose',                             317,    'L1_2EM13VH', [], [PhysicsStream], ['RATE:MultiPhoton', 'BW:Egamma'], 1], 
-        ['g20_loose_2g15_loose_L12EM13VH',         318,    'L1_2EM13VH', [], [PhysicsStream], ['RATE:MultiPhoton', 'BW:Egamma'], 1], 
-        ['2g20_loose_g15_loose',                   319,    'L1_2EM15VH', [], [PhysicsStream], ['RATE:MultiPhoton', 'BW:Egamma'], 1], 
-        ['3g20_loose',                             320,    'L1_2EM15VH', [], [PhysicsStream], ['RATE:MultiPhoton', 'BW:Egamma'], 1], 
+        ['3g15_loose',                              'L1_2EM13VH', [], [PhysicsStream], ['RATE:MultiPhoton', 'BW:Egamma'], 1], 
+        ['g20_loose_2g15_loose_L12EM13VH',          'L1_2EM13VH', [], [PhysicsStream], ['RATE:MultiPhoton', 'BW:Egamma'], 1], 
+        ['2g20_loose_g15_loose',                    'L1_2EM15VH', [], [PhysicsStream], ['RATE:MultiPhoton', 'BW:Egamma'], 1], 
+        ['3g20_loose',                              'L1_2EM15VH', [], [PhysicsStream], ['RATE:MultiPhoton', 'BW:Egamma'], 1], 
 
         # multi-photon chains
-        ### NOT IN THE LIST ['g35_loose1_g25_loose1',    252, 'L1_2EM15VH', [], [PhysicsStream], ['RATE:MultiPhoton','BW:Egamma'], 1],
-        ### NOT IN THE LIST ['g35_medium1_g25_medium1',  253, 'L1_2EM15VH', [], [PhysicsStream], ['RATE:MultiPhoton','BW:Egamma'], 1],
-        ### NOT IN THE LIST ['2g20_tight1',              254, 'L1_2EM15VH', [], [PhysicsStream], ['RATE:MultiPhoton','BW:Egamma'], 1],
-        ### NOT IN THE LIST ['3g20_loose1',              255, 'L1_2EM15VH', [], [PhysicsStream], ['RATE:MultiPhoton','BW:Egamma'], 1],
-        ### NOT IN THE LIST ['g35_loose1_g25_loose1_L12EM15',    256, 'L1_2EM15', [], [PhysicsStream], ['RATE:MultiPhoton','BW:Egamma'], 1],
+        ### NOT IN THE LIST ['g35_loose1_g25_loose1',    'L1_2EM15VH', [], [PhysicsStream], ['RATE:MultiPhoton','BW:Egamma'], 1],
+        ### NOT IN THE LIST ['g35_medium1_g25_medium1',  'L1_2EM15VH', [], [PhysicsStream], ['RATE:MultiPhoton','BW:Egamma'], 1],
+        ### NOT IN THE LIST ['2g20_tight1',              'L1_2EM15VH', [], [PhysicsStream], ['RATE:MultiPhoton','BW:Egamma'], 1],
+        ### NOT IN THE LIST ['3g20_loose1',              'L1_2EM15VH', [], [PhysicsStream], ['RATE:MultiPhoton','BW:Egamma'], 1],
+        ### NOT IN THE LIST ['g35_loose1_g25_loose1_L12EM15',   'L1_2EM15', [], [PhysicsStream], ['RATE:MultiPhoton','BW:Egamma'], 1],
 
         ##########        
         # Monopole triggers
-        ['g0_hiptrt_L1EM18VH',                    1004, 'L1_EM18VH', [], [PhysicsStream], ['RATE:SinglePhoton', 'BW:Egamma'], -1], 
-        ['g0_hiptrt_L1EM20VH',                    1005, 'L1_EM20VH', [], [PhysicsStream], ['RATE:SinglePhoton', 'BW:Egamma'], -1], 
-        ['g0_hiptrt_L1EM20VHI',                   1006, 'L1_EM20VHI', [], [PhysicsStream], ['RATE:SinglePhoton', 'BW:Egamma'], -1], 
-        ['g0_hiptrt_L1EM22VHLIL',                 1007, 'L1_EM22VHLIL', [], [PhysicsStream], ['RATE:SinglePhoton', 'BW:Egamma'], -1], 
-        ['g0_hiptrt_L1EM50V',                     1008, 'L1_EM50V', [], [PhysicsStream], ['RATE:SinglePhoton', 'BW:Egamma'], -1], 
-
-        # Fall-back if problem with new tracking  (kept as before)
-        ['e17_etcut_L1EM15',                       290, 'L1_EM15', [], [PhysicsStream], ['RATE:SingleElectron', 'BW:Egamma'], 1],
-        ['e17_etcut_L2StarA_L1EM15',               291, 'L1_EM15', [], [PhysicsStream], ['RATE:SingleElectron', 'BW:Egamma'], 1],
-        ['e17_etcut_L2StarB_L1EM15',               292, 'L1_EM15', [], [PhysicsStream], ['RATE:SingleElectron', 'BW:Egamma'], 1],
-        ['e17_etcut_L2StarC_L1EM15',               293, 'L1_EM15', [], [PhysicsStream], ['RATE:SingleElectron', 'BW:Egamma'], 1],
-        ['e17_etcut_L2Star_idperf_L1EM15',         294, 'L1_EM15', [], [PhysicsStream], ['RATE:IDMonitoring', 'BW:Egamma'], 1],
-        ['e17_etcut_idperf_L1EM15',                295, 'L1_EM15', [], [PhysicsStream], ['RATE:IDMonitoring', 'BW:Egamma'], 1],
+        ['g0_hiptrt_L1EM18VH',                    'L1_EM18VH', [], [PhysicsStream], ['RATE:SinglePhoton', 'BW:Egamma'], -1], 
+        ['g0_hiptrt_L1EM20VH',                    'L1_EM20VH', [], [PhysicsStream], ['RATE:SinglePhoton', 'BW:Egamma'], -1], 
+        ['g0_hiptrt_L1EM20VHI',                   'L1_EM20VHI', [], [PhysicsStream], ['RATE:SinglePhoton', 'BW:Egamma'], -1], 
+        ['g0_hiptrt_L1EM22VHLIL',                 'L1_EM22VHLIL', [], [PhysicsStream], ['RATE:SinglePhoton', 'BW:Egamma'], -1], 
+
+        # Fall-back if problem with new tracking kept as before)
+        ['e17_etcut_L1EM15',                      'L1_EM15', [], [PhysicsStream], ['RATE:SingleElectron', 'BW:Egamma'], 1],
+        ['e17_etcut_L2StarA_L1EM15',              'L1_EM15', [], [PhysicsStream], ['RATE:SingleElectron', 'BW:Egamma'], 1],
+        ['e17_etcut_L2StarB_L1EM15',              'L1_EM15', [], [PhysicsStream], ['RATE:SingleElectron', 'BW:Egamma'], 1],
+        ['e17_etcut_L2StarC_L1EM15',              'L1_EM15', [], [PhysicsStream], ['RATE:SingleElectron', 'BW:Egamma'], 1],
+        ['e17_etcut_L2Star_idperf_L1EM15',        'L1_EM15', [], [PhysicsStream], ['RATE:IDMonitoring', 'BW:Egamma'], 1],
+        ['e17_etcut_idperf_L1EM15',               'L1_EM15', [], [PhysicsStream], ['RATE:IDMonitoring', 'BW:Egamma'], 1],
         
         # extra id perf chains for HLT ID group (kept as before)
-        ['e24_medium1_L2Star_idperf_L1EM18VH',     285, 'L1_EM18VH', [], [PhysicsStream], ['RATE:IDMonitoring', 'BW:Egamma'],1],
-        ['e5_loose1_L2Star_idperf',                286, 'L1_EM3',    [], [PhysicsStream], ['RATE:IDMonitoring', 'BW:Egamma'],1],
-        ['e24_medium1_idperf_L1EM18VH',            287, 'L1_EM18VH', [], [PhysicsStream], ['RATE:IDMonitoring', 'BW:Egamma'],1],
-        ['e5_loose1_idperf',                       288, 'L1_EM3',    [], [PhysicsStream], ['RATE:IDMonitoring', 'BW:Egamma'],1],
-        ['e24_medium1_iloose_L2StarA_L1EM18VH',    289, 'L1_EM18VH', [], [PhysicsStream], ['RATE:SingleElectron', 'BW:Egamma'],1],
+        ['e24_medium1_L2Star_idperf_L1EM18VH',    'L1_EM18VH', [], [PhysicsStream], ['RATE:IDMonitoring', 'BW:Egamma'],1],
+        ['e5_loose1_L2Star_idperf',               'L1_EM3',    [], [PhysicsStream], ['RATE:IDMonitoring', 'BW:Egamma'],1],
+        ['e24_medium1_idperf_L1EM18VH',           'L1_EM18VH', [], [PhysicsStream], ['RATE:IDMonitoring', 'BW:Egamma'],1],
+        ['e5_loose1_idperf',                      'L1_EM3',    [], [PhysicsStream], ['RATE:IDMonitoring', 'BW:Egamma'],1],
+        ['e24_medium1_iloose_L2StarA_L1EM18VH',   'L1_EM18VH', [], [PhysicsStream], ['RATE:SingleElectron', 'BW:Egamma'],1],
         
         ]
 
@@ -1041,134 +1068,142 @@ def setupMenu():
     ###########################################################################################################
     TriggerFlags.BphysicsSlice.signatures = TriggerFlags.BphysicsSlice.signatures() + [
 
-        #['2mu6_bMuMu_L12MU6', 299, 'L1_2MU6', [], [PhysicsStream], [], -1], 
+        #['2mu6_bMuMu_L12MU6', 'L1_2MU6', [], [PhysicsStream], [], -1], 
 
         ###########  2MU4  ################
-        ['2mu4_bJpsimumu',                                            400, 'L1_2MU4',                         [], [PhysicsStream], ['RATE:Bphysics','BW:Bphys'], -1],
-        ['2mu4_bBmumu',                                               401, 'L1_2MU4',                         [], [PhysicsStream], ['RATE:Bphysics','BW:Bphys'], -1],
-        ['2mu4_bUpsimumu',                                            402, 'L1_2MU4',                         [], [PhysicsStream], ['RATE:Bphysics','BW:Bphys'], -1],
-        ['2mu4_bBmumuxv2',                                            403, 'L1_2MU4',                         [], [PhysicsStream], ['RATE:Bphysics','BW:Bphys'], -1],
-        ['2mu4_bBmumux_BcmumuDsloose',                                404, 'L1_2MU4',                         [], [PhysicsStream], ['RATE:Bphysics','BW:Bphys'], -1],
-        # in Physics menu ['2mu4_bDimu',                                                405, 'L1_2MU4',                         [], [PhysicsStream], ['RATE:Bphysics','BW:Bphys'], -1],
-        # in Physics menu ['2mu4_bDimu_novtx_noos',                                     406, 'L1_2MU4',                         [], [PhysicsStream], ['RATE:Bphysics','BW:Bphys'], -1],
-        ### TOPO ['2mu4_bJpsimumu_L12DR15-2MU4ab',                             407, 'L1_2DR15-2MU4ab',                 [], [PhysicsStream], ['RATE:Bphysics','BW:Bphys'], -1],
-        ### TOPO ['2mu4_bBmumu_L12DR15-2MU4ab',                                408, 'L1_2DR15-2MU4ab',                 [], [PhysicsStream], ['RATE:Bphysics','BW:Bphys'], -1],
-        ### TOPO ['2mu4_bBmumuxv2_L12DR15-2MU4ab',                             409, 'L1_2DR15-2MU4ab',                 [], [PhysicsStream], ['RATE:Bphysics','BW:Bphys'], -1],
-        ### TOPO ['2mu4_bBmumux_BcmumuDsloose_L12DR15-2MU4ab',                 410, 'L1_2DR15-2MU4ab',                 [], [PhysicsStream], ['RATE:Bphysics','BW:Bphys'], -1],
-        ### TOPO ['2mu4_bDimu_L12DR15-2MU4ab',                                 411, 'L1_2DR15-2MU4ab',                 [], [PhysicsStream], ['RATE:Bphysics','BW:Bphys'], -1],
-        ### TOPO ['2mu4_bDimu_novtx_noos_L12DR15-2MU4ab',                      412, 'L1_2DR15-2MU4ab',                 [], [PhysicsStream], ['RATE:Bphysics','BW:Bphys'], -1],
-        ### TOPO ['2mu4_bJpsimumu_L12INVM999-2MU4ab',                          413, 'L1_2INVM999-2MU4ab',              [], [PhysicsStream], ['RATE:Bphysics','BW:Bphys'], -1],
-        ### TOPO ['2mu4_bBmumu_L12INVM999-2MU4ab',                             414, 'L1_2INVM999-2MU4ab',              [], [PhysicsStream], ['RATE:Bphysics','BW:Bphys'], -1],
-        ### TOPO ['2mu4_bUpsimumu_L12INVM999-2MU4ab',                          415, 'L1_2INVM999-2MU4ab',              [], [PhysicsStream], ['RATE:Bphysics','BW:Bphys'], -1],
-        ### TOPO ['2mu4_bBmumuxv2_L12INVM999-2MU4ab',                          416, 'L1_2INVM999-2MU4ab',              [], [PhysicsStream], ['RATE:Bphysics','BW:Bphys'], -1],
-        ### TOPO ['2mu4_bBmumux_BcmumuDsloose_L12INVM999-2MU4ab',              417, 'L1_2INVM999-2MU4ab',              [], [PhysicsStream], ['RATE:Bphysics','BW:Bphys'], -1],
-        ### TOPO ['2mu4_bDimu_L12INVM999-2MU4ab',                              418, 'L1_2INVM999-2MU4ab',              [], [PhysicsStream], ['RATE:Bphysics','BW:Bphys'], -1],
-        ### TOPO ['2mu4_bDimu_novtx_noos_L12INVM999-2MU4ab',                   419, 'L1_2INVM999-2MU4ab',              [], [PhysicsStream], ['RATE:Bphysics','BW:Bphys'], -1],
-        ### TOPO ['2mu4_bBmumu_L14INVM8-2MU4ab',                               420, 'L1_4INVM8-2MU4ab',                [], [PhysicsStream], ['RATE:Bphysics','BW:Bphys'], -1],
-        ### TOPO ['2mu4_bBmumuxv2_L14INVM8-2MU4ab',                            421, 'L1_4INVM8-2MU4ab',                [], [PhysicsStream], ['RATE:Bphysics','BW:Bphys'], -1],
-        ### TOPO ['2mu4_bBmumux_BcmumuDsloose_L14INVM8-2MU4ab',                422, 'L1_4INVM8-2MU4ab',                [], [PhysicsStream], ['RATE:Bphysics','BW:Bphys'], -1],
-        ### TOPO ['2mu4_bDimu_L14INVM8-2MU4ab',                                423, 'L1_4INVM8-2MU4ab',                [], [PhysicsStream], ['RATE:Bphysics','BW:Bphys'], -1],
-        ### TOPO ['2mu4_bDimu_novtx_noos_L14INVM8-2MU4ab',                     424, 'L1_4INVM8-2MU4ab',                [], [PhysicsStream], ['RATE:Bphysics','BW:Bphys'], -1],
+        ['2mu4_bJpsimumu',                                            'L1_2MU4',                         [], [PhysicsStream], ['RATE:Bphysics','BW:Bphys'], -1],
+        ['2mu4_bBmumu',                                               'L1_2MU4',                         [], [PhysicsStream], ['RATE:Bphysics','BW:Bphys'], -1],
+        ['2mu4_bUpsimumu',                                            'L1_2MU4',                         [], [PhysicsStream], ['RATE:Bphysics','BW:Bphys'], -1],
+        ['2mu4_bBmumuxv2',                                            'L1_2MU4',                         [], [PhysicsStream], ['RATE:Bphysics','BW:Bphys'], -1],
+        ['2mu4_bBmumux_BcmumuDsloose',                                'L1_2MU4',                         [], [PhysicsStream], ['RATE:Bphysics','BW:Bphys'], -1],
+        # in Physics menu ['2mu4_bDimu',                              'L1_2MU4',                         [], [PhysicsStream], ['RATE:Bphysics','BW:Bphys'], -1],
+        # in Physics menu ['2mu4_bDimu_novtx_noos',                   'L1_2MU4',                         [], [PhysicsStream], ['RATE:Bphysics','BW:Bphys'], -1],
+        ### TOPO ['2mu4_bJpsimumu_L12DR15-2MU4ab',                             'L1_2DR15-2MU4ab',                 [], [PhysicsStream], ['RATE:Bphysics','BW:Bphys'], -1],
+        ### TOPO ['2mu4_bBmumu_L12DR15-2MU4ab',                                'L1_2DR15-2MU4ab',                 [], [PhysicsStream], ['RATE:Bphysics','BW:Bphys'], -1],
+        ### TOPO ['2mu4_bBmumuxv2_L12DR15-2MU4ab',                             'L1_2DR15-2MU4ab',                 [], [PhysicsStream], ['RATE:Bphysics','BW:Bphys'], -1],
+        ### TOPO ['2mu4_bBmumux_BcmumuDsloose_L12DR15-2MU4ab',                 'L1_2DR15-2MU4ab',                 [], [PhysicsStream], ['RATE:Bphysics','BW:Bphys'], -1],
+        ### TOPO ['2mu4_bDimu_L12DR15-2MU4ab',                                 'L1_2DR15-2MU4ab',                 [], [PhysicsStream], ['RATE:Bphysics','BW:Bphys'], -1],
+        ### TOPO ['2mu4_bDimu_novtx_noos_L12DR15-2MU4ab',                      'L1_2DR15-2MU4ab',                 [], [PhysicsStream], ['RATE:Bphysics','BW:Bphys'], -1],
+        ### TOPO ['2mu4_bJpsimumu_L12INVM999-2MU4ab',                          'L1_2INVM999-2MU4ab',              [], [PhysicsStream], ['RATE:Bphysics','BW:Bphys'], -1],
+        ### TOPO ['2mu4_bBmumu_L12INVM999-2MU4ab',                             'L1_2INVM999-2MU4ab',              [], [PhysicsStream], ['RATE:Bphysics','BW:Bphys'], -1],
+        ### TOPO ['2mu4_bUpsimumu_L12INVM999-2MU4ab',                          'L1_2INVM999-2MU4ab',              [], [PhysicsStream], ['RATE:Bphysics','BW:Bphys'], -1],
+        ### TOPO ['2mu4_bBmumuxv2_L12INVM999-2MU4ab',                          'L1_2INVM999-2MU4ab',              [], [PhysicsStream], ['RATE:Bphysics','BW:Bphys'], -1],
+        ### TOPO ['2mu4_bBmumux_BcmumuDsloose_L12INVM999-2MU4ab',              'L1_2INVM999-2MU4ab',              [], [PhysicsStream], ['RATE:Bphysics','BW:Bphys'], -1],
+        ### TOPO ['2mu4_bDimu_L12INVM999-2MU4ab',                              'L1_2INVM999-2MU4ab',              [], [PhysicsStream], ['RATE:Bphysics','BW:Bphys'], -1],
+        ### TOPO ['2mu4_bDimu_novtx_noos_L12INVM999-2MU4ab',                   'L1_2INVM999-2MU4ab',              [], [PhysicsStream], ['RATE:Bphysics','BW:Bphys'], -1],
+        ### TOPO ['2mu4_bBmumu_L14INVM8-2MU4ab',                               'L1_4INVM8-2MU4ab',                [], [PhysicsStream], ['RATE:Bphysics','BW:Bphys'], -1],
+        ### TOPO ['2mu4_bBmumuxv2_L14INVM8-2MU4ab',                            'L1_4INVM8-2MU4ab',                [], [PhysicsStream], ['RATE:Bphysics','BW:Bphys'], -1],
+        ### TOPO ['2mu4_bBmumux_BcmumuDsloose_L14INVM8-2MU4ab',                'L1_4INVM8-2MU4ab',                [], [PhysicsStream], ['RATE:Bphysics','BW:Bphys'], -1],
+        ### TOPO ['2mu4_bDimu_L14INVM8-2MU4ab',                                'L1_4INVM8-2MU4ab',                [], [PhysicsStream], ['RATE:Bphysics','BW:Bphys'], -1],
+        ### TOPO ['2mu4_bDimu_novtx_noos_L14INVM8-2MU4ab',                     'L1_4INVM8-2MU4ab',                [], [PhysicsStream], ['RATE:Bphysics','BW:Bphys'], -1],
        
-        ### TOPO ['2mu4_bJpsimumu_L12DR15-2MU4ab-2INVM999-2MU4ab',             425, 'L1_2DR15-2MU4ab_2INVM999-2MU4ab', [], [PhysicsStream], ['RATE:Bphysics','BW:Bphys'], -1],
-        ### TOPO ['2mu4_bBmumu_L12DR15-2MU4ab-2INVM999-2MU4ab',                426, 'L1_2DR15-2MU4ab_2INVM999-2MU4ab', [], [PhysicsStream], ['RATE:Bphysics','BW:Bphys'], -1],
-        ### TOPO ['2mu4_bBmumuxv2_L12DR15-2MU4ab-2INVM999-2MU4ab',             427, 'L1_2DR15-2MU4ab_2INVM999-2MU4ab', [], [PhysicsStream], ['RATE:Bphysics','BW:Bphys'], -1],
-        ### TOPO ['2mu4_bBmumux_BcmumuDsloose_L12DR15-2MU4ab-2INVM999-2MU4ab', 428, 'L1_2DR15-2MU4ab_2INVM999-2MU4ab', [], [PhysicsStream], ['RATE:Bphysics','BW:Bphys'], -1],
-        ### TOPO ['2mu4_bDimu_L12DR15-2MU4ab-2INVM999-2MU4ab',                 429, 'L1_2DR15-2MU4ab_2INVM999-2MU4ab', [], [PhysicsStream], ['RATE:Bphysics','BW:Bphys'], -1],
-        ### TOPO ['2mu4_bDimu_novtx_noos_L12DR15-2MU4ab-2INVM999-2MU4ab',      430, 'L1_2DR15-2MU4ab_2INVM999-2MU4ab', [], [PhysicsStream], ['RATE:Bphysics','BW:Bphys'], -1],
-        ### TOPO ['2mu4_bBmumu_L12DR15-2MU4ab-4INVM8-2MU4ab',                  431, 'L1_2DR15-2MU4ab_4INVM8-2MU4ab',   [], [PhysicsStream], ['RATE:Bphysics','BW:Bphys'], -1],
-        ### TOPO ['2mu4_bBmumuxv2_L12DR15-2MU4ab-4INVM8-2MU4ab',               432, 'L1_2DR15-2MU4ab_4INVM8-2MU4ab',   [], [PhysicsStream], ['RATE:Bphysics','BW:Bphys'], -1],
-        ### TOPO ['2mu4_bBmumux_BcmumuDsloose_L12DR15-2MU4ab-4INVM8-2MU4ab',   433, 'L1_2DR15-2MU4ab_4INVM8-2MU4ab',   [], [PhysicsStream], ['RATE:Bphysics','BW:Bphys'], -1],
-        ### TOPO ['2mu4_bDimu_L12DR15-2MU4ab-4INVM8-2MU4ab',                   434, 'L1_2DR15-2MU4ab_4INVM8-2MU4ab',   [], [PhysicsStream], ['RATE:Bphysics','BW:Bphys'], -1],
-        ### TOPO ['2mu4_bDimu_novtx_noos_L12DR15-2MU4ab-4INVM8-2MU4ab',        435, 'L1_2DR15-2MU4ab_4INVM8-2MU4ab',   [], [PhysicsStream], ['RATE:Bphysics','BW:Bphys'], -1],
+        ### TOPO ['2mu4_bJpsimumu_L12DR15-2MU4ab-2INVM999-2MU4ab',             'L1_2DR15-2MU4ab_2INVM999-2MU4ab', [], [PhysicsStream], ['RATE:Bphysics','BW:Bphys'], -1],
+        ### TOPO ['2mu4_bBmumu_L12DR15-2MU4ab-2INVM999-2MU4ab',                'L1_2DR15-2MU4ab_2INVM999-2MU4ab', [], [PhysicsStream], ['RATE:Bphysics','BW:Bphys'], -1],
+        ### TOPO ['2mu4_bBmumuxv2_L12DR15-2MU4ab-2INVM999-2MU4ab',             'L1_2DR15-2MU4ab_2INVM999-2MU4ab', [], [PhysicsStream], ['RATE:Bphysics','BW:Bphys'], -1],
+        ### TOPO ['2mu4_bBmumux_BcmumuDsloose_L12DR15-2MU4ab-2INVM999-2MU4ab', 'L1_2DR15-2MU4ab_2INVM999-2MU4ab', [], [PhysicsStream], ['RATE:Bphysics','BW:Bphys'], -1],
+        ### TOPO ['2mu4_bDimu_L12DR15-2MU4ab-2INVM999-2MU4ab',                 'L1_2DR15-2MU4ab_2INVM999-2MU4ab', [], [PhysicsStream], ['RATE:Bphysics','BW:Bphys'], -1],
+        ### TOPO ['2mu4_bDimu_novtx_noos_L12DR15-2MU4ab-2INVM999-2MU4ab',      'L1_2DR15-2MU4ab_2INVM999-2MU4ab', [], [PhysicsStream], ['RATE:Bphysics','BW:Bphys'], -1],
+        ### TOPO ['2mu4_bBmumu_L12DR15-2MU4ab-4INVM8-2MU4ab',                  'L1_2DR15-2MU4ab_4INVM8-2MU4ab',   [], [PhysicsStream], ['RATE:Bphysics','BW:Bphys'], -1],
+        ### TOPO ['2mu4_bBmumuxv2_L12DR15-2MU4ab-4INVM8-2MU4ab',               'L1_2DR15-2MU4ab_4INVM8-2MU4ab',   [], [PhysicsStream], ['RATE:Bphysics','BW:Bphys'], -1],
+        ### TOPO ['2mu4_bBmumux_BcmumuDsloose_L12DR15-2MU4ab-4INVM8-2MU4ab',   'L1_2DR15-2MU4ab_4INVM8-2MU4ab',   [], [PhysicsStream], ['RATE:Bphysics','BW:Bphys'], -1],
+        ### TOPO ['2mu4_bDimu_L12DR15-2MU4ab-4INVM8-2MU4ab',                   'L1_2DR15-2MU4ab_4INVM8-2MU4ab',   [], [PhysicsStream], ['RATE:Bphysics','BW:Bphys'], -1],
+        ### TOPO ['2mu4_bDimu_novtx_noos_L12DR15-2MU4ab-4INVM8-2MU4ab',        'L1_2DR15-2MU4ab_4INVM8-2MU4ab',   [], [PhysicsStream], ['RATE:Bphysics','BW:Bphys'], -1],
 
         #L1_2MU4 seeded
-        ['mu4_iloose_mu4_7invm9_noos', 335, 'L1_2MU4', [], [PhysicsStream], ['RATE:Bphysics','BW:Bphys'], -1],
-        ['mu4_mu4_idperf_bJpsimumu_noid',          340, 'L1_2MU4', [], [PhysicsStream], ['RATE:IDMonitoring','BW:Bphys'], -1],
-        ['mu4_iloose_mu4_11invm60_noos', 436, 'L1_2MU4', [], [PhysicsStream], ['RATE:Bphysics','BW:Bphys'], -1],
-
-
-        ##########
-
+        ['mu4_iloose_mu4_7invm9_noos',     'L1_2MU4', [], [PhysicsStream], ['RATE:Bphysics','BW:Bphys'], -1],
+        ['mu4_mu4_idperf_bJpsimumu_noid',  'L1_2MU4', [], [PhysicsStream], ['RATE:IDMonitoring','BW:Bphys'], -1],
+        ['mu4_iloose_mu4_11invm60_noos',   'L1_2MU4', [], [PhysicsStream], ['RATE:Bphysics','BW:Bphys'], -1],
+
+        ########## SS dimuon selection ###
+        ['2mu4_bDimu_noinvm_novtx_ss',    'L1_2MU4',     [], [PhysicsStream], ['RATE:Bphysics','BW:Bphys'], -1],
+        ['2mu6_bDimu_noinvm_novtx_ss',    'L1_2MU6',     [], [PhysicsStream], ['RATE:Bphysics','BW:Bphys'], -1],
+        ['mu6_mu4_bDimu_noinvm_novtx_ss', 'L1_MU6_2MU4', [], [PhysicsStream], ['RATE:Bphysics','BW:Bphys'], -1],
+        ['2mu10_bDimu_noinvm_novtx_ss',   'L1_2MU10',    [], [PhysicsStream], ['RATE:Bphysics','BW:Bphys'], -1],
+
+        ########## B+->J/psi K+ exclusive selection ###
+        ['2mu4_bBmumux_BpmumuKp',    'L1_2MU4',     [], [PhysicsStream], ['RATE:Bphysics','BW:Bphys'], -1],
+        ['2mu6_bBmumux_BpmumuKp',    'L1_2MU6',     [], [PhysicsStream], ['RATE:Bphysics','BW:Bphys'], -1],
+        ['mu6_mu4_bBmumux_BpmumuKp', 'L1_MU6_2MU4', [], [PhysicsStream], ['RATE:Bphysics','BW:Bphys'], -1],
+        ['2mu10_bBmumux_BpmumuKp',   'L1_2MU10',    [], [PhysicsStream], ['RATE:Bphysics','BW:Bphys'], -1],
 
         ###########  3MU4  ################
-        ['3mu4_bDimu', 341, 'L1_3MU4', [], [PhysicsStream], ['RATE:Bphysics','BW:Bphys'], -1],
-        ['3mu4_bTau',  516, 'L1_3MU4', [], [PhysicsStream], ['RATE:Bphysics','BW:Bphys'], -1],
-        ['3mu4_bJpsi', 517, 'L1_3MU4', [], [PhysicsStream], ['RATE:Bphysics','BW:Bphys'], -1],
-        ['3mu4_bUpsi', 518, 'L1_3MU4', [], [PhysicsStream], ['RATE:Bphysics','BW:Bphys'], -1],
+        ['3mu4_bDimu',  'L1_3MU4', [], [PhysicsStream], ['RATE:Bphysics','BW:Bphys'], -1],
+        ['3mu4_bTau',   'L1_3MU4', [], [PhysicsStream], ['RATE:Bphysics','BW:Bphys'], -1],
+        ['3mu4_bJpsi',  'L1_3MU4', [], [PhysicsStream], ['RATE:Bphysics','BW:Bphys'], -1],
+        ['3mu4_bUpsi',  'L1_3MU4', [], [PhysicsStream], ['RATE:Bphysics','BW:Bphys'], -1],
 
 
         ######## L1_MU6 seeded#####
-        ['mu6_bJpsi_Trkloose',         519, 'L1_MU6', [], [PhysicsStream], ['RATE:Bphysics','BW:Bphys'], -1],
+        ['mu6_bJpsi_Trkloose',     'L1_MU6', [], [PhysicsStream], ['RATE:Bphysics','BW:Bphys'], -1],
 
 
         #######  L1_2MU6 #######
-        #in Physics menu ['2mu6_bDimu', 440,             'L1_2MU6', [], [PhysicsStream], ['RATE:Bphysics','BW:Bphys'], -1], 
-        #n Physics menu  ['2mu6_bDimu_novtx_noos', 441, 'L1_2MU6', [], [PhysicsStream], ['RATE:Bphysics','BW:Bphys'], -1],  
-        # not set up yet? ['mu6_iloose_mu6_18invm60_noos', 332, 'L1_2MU6', [], [PhysicsStream], ['RATE:Bphysics','BW:Bphys'], -1],
-        ['2mu6_bBmumu',                 303, 'L1_2MU6', [], [PhysicsStream], ['RATE:Bphysics','BW:Bphys'], -1],
-        ['2mu6_bBmumuxv2',              304, 'L1_2MU6', [], [PhysicsStream], ['RATE:Bphysics','BW:Bphys'], -1],
-        ['2mu6_bBmumux_BcmumuDsloose',  336, 'L1_2MU6', [], [PhysicsStream], ['RATE:Bphysics','BW:Bphys'], -1],
-        ['2mu6_bJpsimumu',             305, 'L1_2MU6', [], [PhysicsStream], ['RATE:Bphysics','BW:Bphys'], -1],
-        ['2mu6_bUpsimumu',             306, 'L1_2MU6', [], [PhysicsStream], ['RATE:Bphysics','BW:Bphys'], -1],
-
-        ### TOPO ['2mu6_bJpsimumu_L12DR15-2MU6ab',                             472, 'L1_2DR15-2MU6ab',                 [], [PhysicsStream], ['RATE:Bphysics','BW:Bphys'], -1],
-        ### TOPO ['2mu6_bBmumu_L12DR15-2MU6ab',                                473, 'L1_2DR15-2MU6ab',                 [], [PhysicsStream], ['RATE:Bphysics','BW:Bphys'], -1],
-        ### TOPO ['2mu6_bBmumuxv2_L12DR15-2MU6ab',                             474, 'L1_2DR15-2MU6ab',                 [], [PhysicsStream], ['RATE:Bphysics','BW:Bphys'], -1],
-        ### TOPO ['2mu6_bBmumux_BcmumuDsloose_L12DR15-2MU6ab',                 475, 'L1_2DR15-2MU6ab',                 [], [PhysicsStream], ['RATE:Bphysics','BW:Bphys'], -1],
-        ### TOPO ['2mu6_bDimu_L12DR15-2MU6ab',                                 476, 'L1_2DR15-2MU6ab',                 [], [PhysicsStream], ['RATE:Bphysics','BW:Bphys'], -1],
-        ### TOPO ['2mu6_bDimu_novtx_noos_L12DR15-2MU6ab',                      477, 'L1_2DR15-2MU6ab',                 [], [PhysicsStream], ['RATE:Bphysics','BW:Bphys'], -1],
-        ### TOPO ['2mu6_bJpsimumu_L12INVM999-2MU6ab',                          478, 'L1_2INVM999-2MU6ab',              [], [PhysicsStream], ['RATE:Bphysics','BW:Bphys'], -1],
-        ### TOPO ['2mu6_bBmumu_L12INVM999-2MU6ab',                             479, 'L1_2INVM999-2MU6ab',              [], [PhysicsStream], ['RATE:Bphysics','BW:Bphys'], -1],
-        ### TOPO ['2mu6_bUpsimumu_L12INVM999-2MU6ab',                          480, 'L1_2INVM999-2MU6ab',              [], [PhysicsStream], ['RATE:Bphysics','BW:Bphys'], -1],
-        ### TOPO ['2mu6_bBmumuxv2_L12INVM999-2MU6ab',                          481, 'L1_2INVM999-2MU6ab',              [], [PhysicsStream], ['RATE:Bphysics','BW:Bphys'], -1],
-        ### TOPO ['2mu6_bBmumux_BcmumuDsloose_L12INVM999-2MU6ab',              482, 'L1_2INVM999-2MU6ab',              [], [PhysicsStream], ['RATE:Bphysics','BW:Bphys'], -1],
-        ### TOPO ['2mu6_bDimu_L12INVM999-2MU6ab',                              483, 'L1_2INVM999-2MU6ab',              [], [PhysicsStream], ['RATE:Bphysics','BW:Bphys'], -1],
-        ### TOPO ['2mu6_bDimu_novtx_noos_L12INVM999-2MU6ab',                   484, 'L1_2INVM999-2MU6ab',              [], [PhysicsStream], ['RATE:Bphysics','BW:Bphys'], -1],
-        ### TOPO ['2mu6_bBmumu_L14INVM8-2MU6ab',                               485, 'L1_4INVM8-2MU6ab',                [], [PhysicsStream], ['RATE:Bphysics','BW:Bphys'], -1],
-        ### TOPO ['2mu6_bBmumuxv2_L14INVM8-2MU6ab',                            486, 'L1_4INVM8-2MU6ab',                [], [PhysicsStream], ['RATE:Bphysics','BW:Bphys'], -1],
-        ### TOPO ['2mu6_bBmumux_BcmumuDsloose_L14INVM8-2MU6ab',                487, 'L1_4INVM8-2MU6ab',                [], [PhysicsStream], ['RATE:Bphysics','BW:Bphys'], -1],
-        ### TOPO ['2mu6_bDimu_L14INVM8-2MU6ab',                                488, 'L1_4INVM8-2MU6ab',                [], [PhysicsStream], ['RATE:Bphysics','BW:Bphys'], -1],
-        ### TOPO ['2mu6_bDimu_novtx_noos_L14INVM8-2MU6ab',                     489, 'L1_4INVM8-2MU6ab',                [], [PhysicsStream], ['RATE:Bphysics','BW:Bphys'], -1],
+        #in Physics menu ['2mu6_bDimu',            'L1_2MU6', [], [PhysicsStream], ['RATE:Bphysics','BW:Bphys'], -1], 
+        #n Physics menu  ['2mu6_bDimu_novtx_noos',  'L1_2MU6', [], [PhysicsStream], ['RATE:Bphysics','BW:Bphys'], -1],  
+        # not set up yet? ['mu6_iloose_mu6_18invm60_noos',  'L1_2MU6', [], [PhysicsStream], ['RATE:Bphysics','BW:Bphys'], -1],
+        ['2mu6_bBmumu',                 'L1_2MU6', [], [PhysicsStream], ['RATE:Bphysics','BW:Bphys'], -1],
+        ['2mu6_bBmumuxv2',              'L1_2MU6', [], [PhysicsStream], ['RATE:Bphysics','BW:Bphys'], -1],
+        ['2mu6_bBmumux_BcmumuDsloose',  'L1_2MU6', [], [PhysicsStream], ['RATE:Bphysics','BW:Bphys'], -1],
+        ['2mu6_bJpsimumu',              'L1_2MU6', [], [PhysicsStream], ['RATE:Bphysics','BW:Bphys'], -1],
+        ['2mu6_bUpsimumu',              'L1_2MU6', [], [PhysicsStream], ['RATE:Bphysics','BW:Bphys'], -1],
+
+        ### TOPO ['2mu6_bJpsimumu_L12DR15-2MU6ab',                             'L1_2DR15-2MU6ab',                 [], [PhysicsStream], ['RATE:Bphysics','BW:Bphys'], -1],
+        ### TOPO ['2mu6_bBmumu_L12DR15-2MU6ab',                                'L1_2DR15-2MU6ab',                 [], [PhysicsStream], ['RATE:Bphysics','BW:Bphys'], -1],
+        ### TOPO ['2mu6_bBmumuxv2_L12DR15-2MU6ab',                             'L1_2DR15-2MU6ab',                 [], [PhysicsStream], ['RATE:Bphysics','BW:Bphys'], -1],
+        ### TOPO ['2mu6_bBmumux_BcmumuDsloose_L12DR15-2MU6ab',                 'L1_2DR15-2MU6ab',                 [], [PhysicsStream], ['RATE:Bphysics','BW:Bphys'], -1],
+        ### TOPO ['2mu6_bDimu_L12DR15-2MU6ab',                                 'L1_2DR15-2MU6ab',                 [], [PhysicsStream], ['RATE:Bphysics','BW:Bphys'], -1],
+        ### TOPO ['2mu6_bDimu_novtx_noos_L12DR15-2MU6ab',                      'L1_2DR15-2MU6ab',                 [], [PhysicsStream], ['RATE:Bphysics','BW:Bphys'], -1],
+        ### TOPO ['2mu6_bJpsimumu_L12INVM999-2MU6ab',                          'L1_2INVM999-2MU6ab',              [], [PhysicsStream], ['RATE:Bphysics','BW:Bphys'], -1],
+        ### TOPO ['2mu6_bBmumu_L12INVM999-2MU6ab',                             'L1_2INVM999-2MU6ab',              [], [PhysicsStream], ['RATE:Bphysics','BW:Bphys'], -1],
+        ### TOPO ['2mu6_bUpsimumu_L12INVM999-2MU6ab',                          'L1_2INVM999-2MU6ab',              [], [PhysicsStream], ['RATE:Bphysics','BW:Bphys'], -1],
+        ### TOPO ['2mu6_bBmumuxv2_L12INVM999-2MU6ab',                          'L1_2INVM999-2MU6ab',              [], [PhysicsStream], ['RATE:Bphysics','BW:Bphys'], -1],
+        ### TOPO ['2mu6_bBmumux_BcmumuDsloose_L12INVM999-2MU6ab',              'L1_2INVM999-2MU6ab',              [], [PhysicsStream], ['RATE:Bphysics','BW:Bphys'], -1],
+        ### TOPO ['2mu6_bDimu_L12INVM999-2MU6ab',                              'L1_2INVM999-2MU6ab',              [], [PhysicsStream], ['RATE:Bphysics','BW:Bphys'], -1],
+        ### TOPO ['2mu6_bDimu_novtx_noos_L12INVM999-2MU6ab',                   'L1_2INVM999-2MU6ab',              [], [PhysicsStream], ['RATE:Bphysics','BW:Bphys'], -1],
+        ### TOPO ['2mu6_bBmumu_L14INVM8-2MU6ab',                               'L1_4INVM8-2MU6ab',                [], [PhysicsStream], ['RATE:Bphysics','BW:Bphys'], -1],
+        ### TOPO ['2mu6_bBmumuxv2_L14INVM8-2MU6ab',                            'L1_4INVM8-2MU6ab',                [], [PhysicsStream], ['RATE:Bphysics','BW:Bphys'], -1],
+        ### TOPO ['2mu6_bBmumux_BcmumuDsloose_L14INVM8-2MU6ab',                'L1_4INVM8-2MU6ab',                [], [PhysicsStream], ['RATE:Bphysics','BW:Bphys'], -1],
+        ### TOPO ['2mu6_bDimu_L14INVM8-2MU6ab',                                'L1_4INVM8-2MU6ab',                [], [PhysicsStream], ['RATE:Bphysics','BW:Bphys'], -1],
+        ### TOPO ['2mu6_bDimu_novtx_noos_L14INVM8-2MU6ab',                     'L1_4INVM8-2MU6ab',                [], [PhysicsStream], ['RATE:Bphysics','BW:Bphys'], -1],
         
-        ### TOPO ['2mu6_bJpsimumu_L12DR15-2MU6ab-2INVM999-2MU6ab',             490, 'L1_2DR15-2MU6ab_2INVM999-2MU6ab', [], [PhysicsStream], ['RATE:Bphysics','BW:Bphys'], -1],
-        ### TOPO ['2mu6_bBmumu_L12DR15-2MU6ab-2INVM999-2MU6ab',                491, 'L1_2DR15-2MU6ab_2INVM999-2MU6ab', [], [PhysicsStream], ['RATE:Bphysics','BW:Bphys'], -1],
-        ### TOPO ['2mu6_bBmumuxv2_L12DR15-2MU6ab-2INVM999-2MU6ab',             492, 'L1_2DR15-2MU6ab_2INVM999-2MU6ab', [], [PhysicsStream], ['RATE:Bphysics','BW:Bphys'], -1],
-        ### TOPO ['2mu6_bBmumux_BcmumuDsloose_L12DR15-2MU6ab-2INVM999-2MU6ab', 493, 'L1_2DR15-2MU6ab_2INVM999-2MU6ab', [], [PhysicsStream], ['RATE:Bphysics','BW:Bphys'], -1],
-        ### TOPO ['2mu6_bDimu_L12DR15-2MU6ab-2INVM999-2MU6ab',                 494, 'L1_2DR15-2MU6ab_2INVM999-2MU6ab', [], [PhysicsStream], ['RATE:Bphysics','BW:Bphys'], -1],
-        ### TOPO ['2mu6_bDimu_novtx_noos_L12DR15-2MU6ab-2INVM999-2MU6ab',      495, 'L1_2DR15-2MU6ab_2INVM999-2MU6ab', [], [PhysicsStream], ['RATE:Bphysics','BW:Bphys'], -1],
-        ### TOPO ['2mu6_bBmumu_L12DR15-2MU6ab-4INVM8-2MU6ab',                  496, 'L1_2DR15-2MU6ab_4INVM8-2MU6ab',   [], [PhysicsStream], ['RATE:Bphysics','BW:Bphys'], -1],
-        ### TOPO ['2mu6_bBmumuxv2_L12DR15-2MU6ab-4INVM8-2MU6ab',               497, 'L1_2DR15-2MU6ab_4INVM8-2MU6ab',   [], [PhysicsStream], ['RATE:Bphysics','BW:Bphys'], -1],
-        ### TOPO ['2mu6_bBmumux_BcmumuDsloose_L12DR15-2MU6ab-4INVM8-2MU6ab',   498, 'L1_2DR15-2MU6ab_4INVM8-2MU6ab',   [], [PhysicsStream], ['RATE:Bphysics','BW:Bphys'], -1],
-        ### TOPO ['2mu6_bDimu_L12DR15-2MU6ab-4INVM8-2MU6ab',                   499, 'L1_2DR15-2MU6ab_4INVM8-2MU6ab',   [], [PhysicsStream], ['RATE:Bphysics','BW:Bphys'], -1],
-        ### TOPO ['2mu6_bDimu_novtx_noos_L12DR15-2MU6ab-4INVM8-2MU6ab',        471, 'L1_2DR15-2MU6ab_4INVM8-2MU6ab',   [], [PhysicsStream], ['RATE:Bphysics','BW:Bphys'], -1],       
+        ### TOPO ['2mu6_bJpsimumu_L12DR15-2MU6ab-2INVM999-2MU6ab',             'L1_2DR15-2MU6ab_2INVM999-2MU6ab', [], [PhysicsStream], ['RATE:Bphysics','BW:Bphys'], -1],
+        ### TOPO ['2mu6_bBmumu_L12DR15-2MU6ab-2INVM999-2MU6ab',                'L1_2DR15-2MU6ab_2INVM999-2MU6ab', [], [PhysicsStream], ['RATE:Bphysics','BW:Bphys'], -1],
+        ### TOPO ['2mu6_bBmumuxv2_L12DR15-2MU6ab-2INVM999-2MU6ab',             'L1_2DR15-2MU6ab_2INVM999-2MU6ab', [], [PhysicsStream], ['RATE:Bphysics','BW:Bphys'], -1],
+        ### TOPO ['2mu6_bBmumux_BcmumuDsloose_L12DR15-2MU6ab-2INVM999-2MU6ab', 'L1_2DR15-2MU6ab_2INVM999-2MU6ab', [], [PhysicsStream], ['RATE:Bphysics','BW:Bphys'], -1],
+        ### TOPO ['2mu6_bDimu_L12DR15-2MU6ab-2INVM999-2MU6ab',                 'L1_2DR15-2MU6ab_2INVM999-2MU6ab', [], [PhysicsStream], ['RATE:Bphysics','BW:Bphys'], -1],
+        ### TOPO ['2mu6_bDimu_novtx_noos_L12DR15-2MU6ab-2INVM999-2MU6ab',      'L1_2DR15-2MU6ab_2INVM999-2MU6ab', [], [PhysicsStream], ['RATE:Bphysics','BW:Bphys'], -1],
+        ### TOPO ['2mu6_bBmumu_L12DR15-2MU6ab-4INVM8-2MU6ab',                  'L1_2DR15-2MU6ab_4INVM8-2MU6ab',   [], [PhysicsStream], ['RATE:Bphysics','BW:Bphys'], -1],
+        ### TOPO ['2mu6_bBmumuxv2_L12DR15-2MU6ab-4INVM8-2MU6ab',               'L1_2DR15-2MU6ab_4INVM8-2MU6ab',   [], [PhysicsStream], ['RATE:Bphysics','BW:Bphys'], -1],
+        ### TOPO ['2mu6_bBmumux_BcmumuDsloose_L12DR15-2MU6ab-4INVM8-2MU6ab',   'L1_2DR15-2MU6ab_4INVM8-2MU6ab',   [], [PhysicsStream], ['RATE:Bphysics','BW:Bphys'], -1],
+        ### TOPO ['2mu6_bDimu_L12DR15-2MU6ab-4INVM8-2MU6ab',                   'L1_2DR15-2MU6ab_4INVM8-2MU6ab',   [], [PhysicsStream], ['RATE:Bphysics','BW:Bphys'], -1],
+        ### TOPO ['2mu6_bDimu_novtx_noos_L12DR15-2MU6ab-4INVM8-2MU6ab',        'L1_2DR15-2MU6ab_4INVM8-2MU6ab',   [], [PhysicsStream], ['RATE:Bphysics','BW:Bphys'], -1],       
 
         #########   3MU6 seeded##########
-        ['3mu6_bJpsi',                 300,  'L1_3MU6', [], [PhysicsStream], ['RATE:Bphysics','BW:Bphys'], -1],
-        ['3mu6_bTau',                  301,  'L1_3MU6', [], [PhysicsStream], ['RATE:Bphysics','BW:Bphys'], -1],
-        ['3mu6_bDimu',                 302,  'L1_3MU6', [], [PhysicsStream], ['RATE:Bphysics','BW:Bphys'], -1],
-        ['3mu6_bUpsi',                 307, 'L1_3MU6', [], [PhysicsStream], ['RATE:Bphysics','BW:Bphys'], -1],
-        ['mu6_iloose_mu6_11invm60_noos', 437, 'L1_2MU6', [], [PhysicsStream], ['RATE:Bphysics','BW:Bphys'], -1],
-        #not set up yet?? ['mu6_iloose_mu6_18invm60_noos', 438, 'L1_2MU6', [], [PhysicsStream], ['RATE:Bphysics','BW:Bphys'], -1],
+        ['3mu6_bJpsi',                   'L1_3MU6', [], [PhysicsStream], ['RATE:Bphysics','BW:Bphys'], -1],
+        ['3mu6_bTau',                    'L1_3MU6', [], [PhysicsStream], ['RATE:Bphysics','BW:Bphys'], -1],
+        ['3mu6_bDimu',                   'L1_3MU6', [], [PhysicsStream], ['RATE:Bphysics','BW:Bphys'], -1],
+        ['3mu6_bUpsi',                  'L1_3MU6', [], [PhysicsStream], ['RATE:Bphysics','BW:Bphys'], -1],
+        ['mu6_iloose_mu6_11invm60_noos', 'L1_2MU6', [], [PhysicsStream], ['RATE:Bphysics','BW:Bphys'], -1],
+        #not set up yet?? ['mu6_iloose_mu6_18invm60_noos', 'L1_2MU6', [], [PhysicsStream], ['RATE:Bphysics','BW:Bphys'], -1],
 
         ########### MU6_2MU4 seeded ###########
-        ['mu6_mu4_bJpsimumu',             342, 'L1_MU6_2MU4', [], [PhysicsStream], ['RATE:Bphysics','BW:Bphys'], -1],
-        ['mu6_mu4_bBmumu',                343, 'L1_MU6_2MU4', [], [PhysicsStream], ['RATE:Bphysics','BW:Bphys'], -1],
-        ['mu6_mu4_bUpsimumu',             344, 'L1_MU6_2MU4', [], [PhysicsStream], ['RATE:Bphysics','BW:Bphys'], -1],
-        ['mu6_mu4_bBmumuxv2',             345, 'L1_MU6_2MU4', [], [PhysicsStream], ['RATE:Bphysics','BW:Bphys'], -1],
-        ['mu6_mu4_bBmumux_BcmumuDsloose', 346, 'L1_MU6_2MU4', [], [PhysicsStream], ['RATE:Bphysics','BW:Bphys'], -1],
-        ['mu6_mu4_bDimu',                 347, 'L1_MU6_2MU4', [], [PhysicsStream], ['RATE:Bphysics','BW:Bphys'], -1],
-        ['mu6_mu4_bDimu_novtx_noos',      348, 'L1_MU6_2MU4', [], [PhysicsStream], ['RATE:Bphysics','BW:Bphys'], -1],
+        ['mu6_mu4_bJpsimumu',            'L1_MU6_2MU4', [], [PhysicsStream], ['RATE:Bphysics','BW:Bphys'], -1],
+        ['mu6_mu4_bBmumu',               'L1_MU6_2MU4', [], [PhysicsStream], ['RATE:Bphysics','BW:Bphys'], -1],
+        ['mu6_mu4_bUpsimumu',            'L1_MU6_2MU4', [], [PhysicsStream], ['RATE:Bphysics','BW:Bphys'], -1],
+        ['mu6_mu4_bBmumuxv2',            'L1_MU6_2MU4', [], [PhysicsStream], ['RATE:Bphysics','BW:Bphys'], -1],
+        ['mu6_mu4_bBmumux_BcmumuDsloose', 'L1_MU6_2MU4', [], [PhysicsStream], ['RATE:Bphysics','BW:Bphys'], -1],
+        ['mu6_mu4_bDimu',                'L1_MU6_2MU4', [], [PhysicsStream], ['RATE:Bphysics','BW:Bphys'], -1],
+        ['mu6_mu4_bDimu_novtx_noos',     'L1_MU6_2MU4', [], [PhysicsStream], ['RATE:Bphysics','BW:Bphys'], -1],
 
         ###########  2MU10 seeded ###########
-        ['2mu10_bBmumu',                337, 'L1_2MU10', [], [PhysicsStream], ['RATE:Bphysics','BW:Bphys'], -1],
-        ['2mu10_bBmumuxv2',             338, 'L1_2MU10', [], [PhysicsStream], ['RATE:Bphysics','BW:Bphys'], -1],
-        ['2mu10_bBmumux_BcmumuDsloose', 339, 'L1_2MU10', [], [PhysicsStream], ['RATE:Bphysics','BW:Bphys'], -1],
-        ['2mu10_bJpsimumu',            330, 'L1_2MU10', [], [PhysicsStream], ['RATE:Bphysics','BW:Bphys'], -1],
-        ['2mu10_bUpsimumu',            331, 'L1_2MU10', [], [PhysicsStream], ['RATE:Bphysics','BW:Bphys'], -1],
-        ['2mu10_bDimu',                 332, 'L1_2MU10', [], [PhysicsStream], ['RATE:Bphysics','BW:Bphys'], -1],
-        ['2mu10_bDimu_novtx_noos',      333, 'L1_2MU10', [], [PhysicsStream], ['RATE:Bphysics','BW:Bphys'], -1],
-        ['mu13_mu13_idperf_Zmumu',     334, 'L1_2MU10', [], [PhysicsStream], ['RATE:IDMonitoring','BW:Bphys'], -1],  
+        ['2mu10_bBmumu',                'L1_2MU10', [], [PhysicsStream], ['RATE:Bphysics','BW:Bphys'], -1],
+        ['2mu10_bBmumuxv2',             'L1_2MU10', [], [PhysicsStream], ['RATE:Bphysics','BW:Bphys'], -1],
+        ['2mu10_bBmumux_BcmumuDsloose', 'L1_2MU10', [], [PhysicsStream], ['RATE:Bphysics','BW:Bphys'], -1],
+        ['2mu10_bJpsimumu',            'L1_2MU10', [], [PhysicsStream], ['RATE:Bphysics','BW:Bphys'], -1],
+        ['2mu10_bUpsimumu',            'L1_2MU10', [], [PhysicsStream], ['RATE:Bphysics','BW:Bphys'], -1],
+        ['2mu10_bDimu',                 'L1_2MU10', [], [PhysicsStream], ['RATE:Bphysics','BW:Bphys'], -1],
+        ['2mu10_bDimu_novtx_noos',      'L1_2MU10', [], [PhysicsStream], ['RATE:Bphysics','BW:Bphys'], -1],
+        ['mu13_mu13_idperf_Zmumu',     'L1_2MU10', [], [PhysicsStream], ['RATE:IDMonitoring','BW:Bphys'], -1],  
         ]
 
 
@@ -1177,288 +1212,306 @@ def setupMenu():
 
         # all e/g + X triggers are taken from DC14 and L1 thresholds adjusted
 
-        ['e17_loose_mu14',          705, 'L1_EM15VH_MU10', ['L1_EM15VH', 'L1_MU10'], [PhysicsStream], ['RATE:EgammaMuon', 'BW:Egamma', 'BW:Muon'], -1,['parallel',-1,[] ]],
-        ['e17_lhloose_mu14',        706, 'L1_EM15VH_MU10', ['L1_EM15VH', 'L1_MU10'], [PhysicsStream], ['RATE:EgammaMuon', 'BW:Egamma', 'BW:Muon'], -1,['parallel',-1,[] ]],
+        ['e17_loose_mu14',           'L1_EM15VH_MU10', ['L1_EM15VH', 'L1_MU10'], [PhysicsStream], ['RATE:EgammaMuon', 'BW:Egamma', 'BW:Muon'], -1,['parallel',-1,[] ]],
+        ['e17_lhloose_mu14',         'L1_EM15VH_MU10', ['L1_EM15VH', 'L1_MU10'], [PhysicsStream], ['RATE:EgammaMuon', 'BW:Egamma', 'BW:Muon'], -1,['parallel',-1,[] ]],
 
-        ['2e12_loose_mu10',         707, 'L1_2EM8VH_MU10', ['L1_2EM8VH', 'L1_MU10'], [PhysicsStream], ['RATE:EgammaMuon', 'BW:Egamma', 'BW:Muon'], -1,['parallel',-1,[] ]],
-        ['2e12_medium_mu10',        708, 'L1_2EM8VH_MU10', ['L1_2EM8VH', 'L1_MU10'], [PhysicsStream], ['RATE:EgammaMuon', 'BW:Egamma', 'BW:Muon'], -1,['parallel',-1,[] ]],
-        ['2e12_lhloose_mu10',       709, 'L1_2EM8VH_MU10', ['L1_2EM8VH', 'L1_MU10'], [PhysicsStream], ['RATE:EgammaMuon', 'BW:Egamma', 'BW:Muon'], -1,['parallel',-1,[] ]],
-        ['2e12_lhmedium_mu10',      710, 'L1_2EM8VH_MU10', ['L1_2EM8VH', 'L1_MU10'], [PhysicsStream], ['RATE:EgammaMuon', 'BW:Egamma', 'BW:Muon'], -1,['parallel',-1,[] ]],
+        ['2e12_loose_mu10',          'L1_2EM8VH_MU10', ['L1_2EM8VH', 'L1_MU10'], [PhysicsStream], ['RATE:EgammaMuon', 'BW:Egamma', 'BW:Muon'], -1,['parallel',-1,[] ]],
+        ['2e12_medium_mu10',         'L1_2EM8VH_MU10', ['L1_2EM8VH', 'L1_MU10'], [PhysicsStream], ['RATE:EgammaMuon', 'BW:Egamma', 'BW:Muon'], -1,['parallel',-1,[] ]],
+        ['2e12_lhloose_mu10',        'L1_2EM8VH_MU10', ['L1_2EM8VH', 'L1_MU10'], [PhysicsStream], ['RATE:EgammaMuon', 'BW:Egamma', 'BW:Muon'], -1,['parallel',-1,[] ]],
+        ['2e12_lhmedium_mu10',       'L1_2EM8VH_MU10', ['L1_2EM8VH', 'L1_MU10'], [PhysicsStream], ['RATE:EgammaMuon', 'BW:Egamma', 'BW:Muon'], -1,['parallel',-1,[] ]],
 
-        ['e12_loose_2mu10',         711, 'L1_2MU10', ['L1_EM8VH', 'L1_2MU10'], [PhysicsStream], ['RATE:EgammaMuon', 'BW:Egamma', 'BW:Muon'], -1,['parallel',-1,[] ]],
-        ['e12_medium_2mu10',        712, 'L1_2MU10', ['L1_EM8VH', 'L1_2MU10'], [PhysicsStream], ['RATE:EgammaMuon', 'BW:Egamma', 'BW:Muon'], -1,['parallel',-1,[] ]],
-        ['e12_lhloose_2mu10',       713, 'L1_2MU10', ['L1_EM8VH', 'L1_2MU10'], [PhysicsStream], ['RATE:EgammaMuon', 'BW:Egamma', 'BW:Muon'], -1,['parallel',-1,[] ]],
-        ['e12_lhmedium_2mu10',      714, 'L1_2MU10', ['L1_EM8VH', 'L1_2MU10'], [PhysicsStream], ['RATE:EgammaMuon', 'BW:Egamma', 'BW:Muon'], -1,['parallel',-1,[] ]],
+        ['e12_loose_2mu10',          'L1_2MU10', ['L1_EM8VH', 'L1_2MU10'], [PhysicsStream], ['RATE:EgammaMuon', 'BW:Egamma', 'BW:Muon'], -1,['parallel',-1,[] ]],
+        ['e12_medium_2mu10',         'L1_2MU10', ['L1_EM8VH', 'L1_2MU10'], [PhysicsStream], ['RATE:EgammaMuon', 'BW:Egamma', 'BW:Muon'], -1,['parallel',-1,[] ]],
+        ['e12_lhloose_2mu10',        'L1_2MU10', ['L1_EM8VH', 'L1_2MU10'], [PhysicsStream], ['RATE:EgammaMuon', 'BW:Egamma', 'BW:Muon'], -1,['parallel',-1,[] ]],
+        ['e12_lhmedium_2mu10',       'L1_2MU10', ['L1_EM8VH', 'L1_2MU10'], [PhysicsStream], ['RATE:EgammaMuon', 'BW:Egamma', 'BW:Muon'], -1,['parallel',-1,[] ]],
 
-        #['e7_medium1_mu24',         814, 'L1_MU20', ['L1_EM3', 'L1_MU20'], [PhysicsStream], ['RATE:EgammaMuon', 'BW:Egamma', 'BW:Muon'], -1,['parallel',-1,[] ]],
+        #['e7_medium1_mu24',         'L1_MU20', ['L1_EM3', 'L1_MU20'], [PhysicsStream], ['RATE:EgammaMuon', 'BW:Egamma', 'BW:Muon'], -1,['parallel',-1,[] ]],
 
-        ['g25_medium_mu24',         715, 'L1_MU20', ['L1_EM15VH','L1_MU20'], [PhysicsStream], ['RATE:EgammaMuon', 'BW:Egamma', 'BW:Muon'], -1, ['parallel',-1,[] ]],
+        ['g25_medium_mu24',          'L1_MU20', ['L1_EM15VH','L1_MU20'], [PhysicsStream], ['RATE:EgammaMuon', 'BW:Egamma', 'BW:Muon'], -1, ['parallel',-1,[] ]],
         
-        ['g10_loose_mu10_taumass',  716, 'L1_EM7_MU10', ['L1_EM7', 'L1_MU10'], [PhysicsStream], ['RATE:EgammaMuon', 'BW:Egamma', 'BW:Muon'], -1, ['parallel',-1,["g10_loose","mu10"]] ],
-        ['g20_loose_mu4_taumass',   717, 'L1_EM15_MU4', ['L1_EM15', 'L1_MU4'], [PhysicsStream], ['RATE:EgammaMuon', 'BW:Egamma', 'BW:Muon'], -1, ['parallel',-1,["g20_loose","mu4"]] ],
-        ['g10_loose_mu10',          718, 'L1_EM7_MU10', ['L1_EM7', 'L1_MU10'], [PhysicsStream], ['RATE:EgammaMuon', 'BW:Egamma', 'BW:Muon'], -1, ['parallel',-1,[] ]],
-        ['g20_loose_mu4',           719, 'L1_EM15_MU4', ['L1_EM15', 'L1_MU4'], [PhysicsStream], ['RATE:EgammaMuon', 'BW:Egamma', 'BW:Muon'], -1, ['parallel',-1,[] ]],
+        ['g10_loose_mu10_taumass',   'L1_EM7_MU10', ['L1_EM7', 'L1_MU10'], [PhysicsStream], ['RATE:EgammaMuon', 'BW:Egamma', 'BW:Muon'], -1, ['parallel',-1,["g10_loose","mu10"]] ],
+        ['g20_loose_mu4_taumass',    'L1_EM15_MU4', ['L1_EM15', 'L1_MU4'], [PhysicsStream], ['RATE:EgammaMuon', 'BW:Egamma', 'BW:Muon'], -1, ['parallel',-1,["g20_loose","mu4"]] ],
+        ['g10_loose_mu10',           'L1_EM7_MU10', ['L1_EM7', 'L1_MU10'], [PhysicsStream], ['RATE:EgammaMuon', 'BW:Egamma', 'BW:Muon'], -1, ['parallel',-1,[] ]],
+        ['g20_loose_mu4',            'L1_EM15_MU4', ['L1_EM15', 'L1_MU4'], [PhysicsStream], ['RATE:EgammaMuon', 'BW:Egamma', 'BW:Muon'], -1, ['parallel',-1,[] ]],
         
-        ['g15_loose_2mu10_msonly',  720, 'L1_2MU10', ['L1_EM8VH', 'L1_2MU10'], [PhysicsStream], ['RATE:EgammaMuon', 'BW:Egamma', 'BW:Muon'], -1, ['parallel',-1,[] ]],
+        ['g15_loose_2mu10_msonly',   'L1_2MU10', ['L1_EM8VH', 'L1_2MU10'], [PhysicsStream], ['RATE:EgammaMuon', 'BW:Egamma', 'BW:Muon'], -1, ['parallel',-1,[] ]],
 
-        ['2g10_loose_mu20',         721, 'L1_MU20', ['L1_2EM7', 'L1_MU20'], [PhysicsStream], ['RATE:EgammaMuon', 'BW:Egamma', 'BW:Muon'], -1, ['serial',-1,['2g10_loose','mu20'] ]],
-        ['2g10_medium_mu20',        722, 'L1_MU20', ['L1_2EM7', 'L1_MU20'], [PhysicsStream], ['RATE:EgammaMuon', 'BW:Egamma', 'BW:Muon'], -1, ['serial',-1,['2g10_medium','mu20'] ]],
-        #['e24_medium1_L1EM20VHI_mu8noL1',       808,  'L1_EM20VHI', ['L1_EM20VHI', ''], [PhysicsStream], ['RATE:EgammaMuon', 'BW:Egamma'], -1, ['serial',-1,['e24_medium1_L1EM20VHI','mu8noL1'] ]],
+        ['2g10_loose_mu20',          'L1_MU20', ['L1_2EM7', 'L1_MU20'], [PhysicsStream], ['RATE:EgammaMuon', 'BW:Egamma', 'BW:Muon'], -1, ['serial',-1,['2g10_loose','mu20'] ]],
+        ['2g10_medium_mu20',         'L1_MU20', ['L1_2EM7', 'L1_MU20'], [PhysicsStream], ['RATE:EgammaMuon', 'BW:Egamma', 'BW:Muon'], -1, ['serial',-1,['2g10_medium','mu20'] ]],
+        #['e24_medium1_L1EM20VHI_mu8noL1',    'L1_EM20VHI', ['L1_EM20VHI', ''], [PhysicsStream], ['RATE:EgammaMuon', 'BW:Egamma'], -1, ['serial',-1,['e24_medium1_L1EM20VHI','mu8noL1'] ]],
 
         # Di-EM triggers
         # cut-based
-        ['e24_medium_L1EM15VH_g25_medium',   723, 'L1_2EM15VH', [], [PhysicsStream], ['RATE:ElectronPhoton', 'BW:Egamma'], -1,['parallel',-1,[] ]], 
-        ['e20_medium_g35_loose',             724, 'L1_2EM15VH', [], [PhysicsStream], ['RATE:ElectronPhoton', 'BW:Egamma'], -1,['parallel',-1,[] ]], 
+        ['e24_medium_L1EM15VH_g25_medium',    'L1_2EM15VH', [], [PhysicsStream], ['RATE:ElectronPhoton', 'BW:Egamma'], -1,['parallel',-1,[] ]], 
+        ['e20_medium_g35_loose',              'L1_2EM15VH', [], [PhysicsStream], ['RATE:ElectronPhoton', 'BW:Egamma'], -1,['parallel',-1,[] ]], 
         # likelihood
-        ['e24_lhmedium_L1EM15VH_g25_medium', 725, 'L1_2EM15VH', [], [PhysicsStream], ['RATE:ElectronPhoton', 'BW:Egamma'], -1,['parallel',-1,[] ]], 
-        ['e20_lhmedium_g35_loose',           726, 'L1_2EM15VH', [], [PhysicsStream], ['RATE:ElectronPhoton', 'BW:Egamma'], -1,['parallel',-1,[] ]], 
+        ['e24_lhmedium_L1EM15VH_g25_medium',  'L1_2EM15VH', [], [PhysicsStream], ['RATE:ElectronPhoton', 'BW:Egamma'], -1,['parallel',-1,[] ]], 
+        ['e20_lhmedium_g35_loose',            'L1_2EM15VH', [], [PhysicsStream], ['RATE:ElectronPhoton', 'BW:Egamma'], -1,['parallel',-1,[] ]], 
 
         # Tri-EM triggers
-        ['e20_medium_2g10_loose',            727, 'L1_EM15VH_3EM7', ['L1_EM15VH','L1_2EM7'], [PhysicsStream], ['RATE:ElectronPhoton', 'BW:Egamma'], -1,['parallel',-1,[] ]], 
-        ['e20_medium_2g10_medium',           728, 'L1_EM15VH_3EM7', ['L1_EM15VH','L1_2EM7'], [PhysicsStream], ['RATE:ElectronPhoton', 'BW:Egamma'], -1,['parallel',-1,[] ]], 
-        ['e20_lhmedium_2g10_loose',          729, 'L1_EM15VH_3EM7', ['L1_EM15VH','L1_2EM7'], [PhysicsStream], ['RATE:ElectronPhoton', 'BW:Egamma'], -1,['parallel',-1,[] ]], 
-        ['e20_lhmedium_2g10_medium',         730, 'L1_EM15VH_3EM7', ['L1_EM15VH','L1_2EM7'], [PhysicsStream], ['RATE:ElectronPhoton', 'BW:Egamma'], -1,['parallel',-1,[] ]], 
+        ['e20_medium_2g10_loose',             'L1_EM15VH_3EM7', ['L1_EM15VH','L1_2EM7'], [PhysicsStream], ['RATE:ElectronPhoton', 'BW:Egamma'], -1,['parallel',-1,[] ]], 
+        ['e20_medium_2g10_medium',            'L1_EM15VH_3EM7', ['L1_EM15VH','L1_2EM7'], [PhysicsStream], ['RATE:ElectronPhoton', 'BW:Egamma'], -1,['parallel',-1,[] ]], 
+        ['e20_lhmedium_2g10_loose',           'L1_EM15VH_3EM7', ['L1_EM15VH','L1_2EM7'], [PhysicsStream], ['RATE:ElectronPhoton', 'BW:Egamma'], -1,['parallel',-1,[] ]], 
+        ['e20_lhmedium_2g10_medium',          'L1_EM15VH_3EM7', ['L1_EM15VH','L1_2EM7'], [PhysicsStream], ['RATE:ElectronPhoton', 'BW:Egamma'], -1,['parallel',-1,[] ]], 
         
-        ### NOT IN THE LIST ['e5_tight1_g4_etcut',                  811,      'L1_2EM3', [], [PhysicsStream], ['RATE:ElectronPhoton', 'BW:Egamma'], -1, ['parallel',-1,[] ]],
-        ### NOT IN THE LIST ['e24_medium1_L1EM20VHI_g8_etcut',      805, 'L1_EM20VHI', ['L1_EM20VHI','L1_EM3'], [PhysicsStream], ['RATE:ElectronPhoton', 'BW:Egamma'], -1, ['parallel',-1,[] ]],
-        ### NOT IN THE LIST ['e17_loose1_2g8_etcut_L12EM7',         804, 'L1_EM15VH_3EM7',['L1_EM15VH','L1_2EM7'], [PhysicsStream], ['RATE:ElectronPhoton', 'BW:Egamma'], -1,['parallel',-1,[] ]],
-        ### NOT IN THE LIST ['e24_medium1_L1EM15VH_g25_medium1',    890, 'L1_2EM15VH',[], [PhysicsStream], ['RATE:ElectronPhoton', 'BW:Egamma'], -1,['parallel',-1,[] ]],
-        ### NOT IN THE LIST ['e20_medium1_g35_loose1',              891, 'L1_2EM15VH',[], [PhysicsStream], ['RATE:ElectronPhoton', 'BW:Egamma'], -1,['parallel',-1,[] ]],
-        ### NOT IN THE LIST ['e20_medium1_2g20_loose1',             892, 'L1_2EM15VH',[], [PhysicsStream], ['RATE:ElectronPhoton', 'BW:Egamma'], -1,['parallel',-1,[] ]],
+        ### NOT IN THE LIST ['e5_tight1_g4_etcut',                       'L1_2EM3', [], [PhysicsStream], ['RATE:ElectronPhoton', 'BW:Egamma'], -1, ['parallel',-1,[] ]],
+        ### NOT IN THE LIST ['e24_medium1_L1EM20VHI_g8_etcut',      'L1_EM20VHI', ['L1_EM20VHI','L1_EM3'], [PhysicsStream], ['RATE:ElectronPhoton', 'BW:Egamma'], -1, ['parallel',-1,[] ]],
+        ### NOT IN THE LIST ['e17_loose1_2g8_etcut_L12EM7',         'L1_EM15VH_3EM7',['L1_EM15VH','L1_2EM7'], [PhysicsStream], ['RATE:ElectronPhoton', 'BW:Egamma'], -1,['parallel',-1,[] ]],
+        ### NOT IN THE LIST ['e24_medium1_L1EM15VH_g25_medium1',    'L1_2EM15VH',[], [PhysicsStream], ['RATE:ElectronPhoton', 'BW:Egamma'], -1,['parallel',-1,[] ]],
+        ### NOT IN THE LIST ['e20_medium1_g35_loose1',              'L1_2EM15VH',[], [PhysicsStream], ['RATE:ElectronPhoton', 'BW:Egamma'], -1,['parallel',-1,[] ]],
+        ### NOT IN THE LIST ['e20_medium1_2g20_loose1',             'L1_2EM15VH',[], [PhysicsStream], ['RATE:ElectronPhoton', 'BW:Egamma'], -1,['parallel',-1,[] ]],
         
         #MET+X -- with e/g only
-        #['e24_medium1_L1EM20VHI_xe100noL1', 902, 'L1_EM20VHI',['L1_EM20VHI',''], [PhysicsStream], ['RATE:EgammaMET', 'BW:Egamma'], -1,['serial',-1,["e24_medium1_L1EM20VHI","xe100noL1"]]],
-        ['g70_loose_xe70noL1',             731, 'L1_EM50V',    ['L1_EM50V',''],    [PhysicsStream], ['RATE:EgammaMET', 'BW:Egamma'], -1,['serial',-1,["g70_loose","xe70noL1"]]],
-        ['g60_loose_xe60noL1',             732, 'L1_EM50V',    ['L1_EM50V',''],    [PhysicsStream], ['RATE:EgammaMET', 'BW:Egamma'], -1,['serial',-1,["g60_loose","xe60noL1"]]],
-        ['g45_tight_xe45noL1',             733, 'L1_EM20VH',   ['L1_EM20VH',''],   [PhysicsStream], ['RATE:EgammaMET', 'BW:Egamma'], -1,['serial',-1,["g45_tight","xe45noL1"]]],
-        ['g45_tight_L1EM22VHLIL_xe45noL1', 734, 'L1_EM22VHLIL',['L1_EM22VHLIL',''],[PhysicsStream], ['RATE:EgammaMET', 'BW:Egamma'], -1,['serial',-1,["g45_tight_L1EM22VHLIL","xe45noL1"]]],
-        ['g40_tight_xe40noL1',             735, 'L1_EM20VH',['L1_EM20VH',''], [PhysicsStream], ['RATE:EgammaMET', 'BW:Egamma'], -1,['serial',-1,["g40_tight","xe40noL1"]]],
-
-        ['e70_loose_xe70noL1',             736, 'L1_EM50V',['L1_EM50V',''], [PhysicsStream], ['RATE:EgammaMET', 'BW:Egamma'], -1,['serial',-1,["e70_loose","xe70noL1"]]],
-        ['e60_loose_xe60noL1',             737, 'L1_EM50V',['L1_EM50V',''], [PhysicsStream], ['RATE:EgammaMET', 'BW:Egamma'], -1,['serial',-1,["e60_loose","xe60noL1"]]],
-        ['e70_lhloose_xe70noL1',           738, 'L1_EM50V',['L1_EM50V',''], [PhysicsStream], ['RATE:EgammaMET', 'BW:Egamma'], -1,['serial',-1,["e70_lhloose","xe70noL1"]]],
-        ['e60_lhloose_xe60noL1',           739, 'L1_EM50V',['L1_EM50V',''], [PhysicsStream], ['RATE:EgammaMET', 'BW:Egamma'], -1,['serial',-1,["e60_lhloose","xe60noL1"]]],
-
-        #['mu24_xe100noL1_wEFMu',       901, 'L1_MU20',['L1_MU20',''], [PhysicsStream], ['RATE:METMuon', 'BW:Muon'], -1,['serial',-1,["mu24","xe100noL1_wEFMu"]]],
-        ['j100_xe80',             904, 'L1_J40_XE50',['',''], [PhysicsStream], ['RATE:JetMET', 'BW:Jets'], -1,['serial',-1,["j100","xe80"]]],
-        ['j80_xe80',              905, 'L1_J40_XE50',['',''], [PhysicsStream], ['RATE:JetMET', 'BW:Jets'], -1,['serial',-1,["j80","xe80"]]],
-        #['j80_xe80_dphi1',        924, 'L1_J40_XE50',['',''], [PhysicsStream], ['RATE:JetMET', 'BW:Jets'], -1,['serial',-1,["j80","xe80"]]],
-        ['j80_xe80_dphi1_L1J40_10MINDPHI-Js2-XE50', 925, 'L1_J40_10MINDPHI-Js2-XE50',['',''], [PhysicsStream], ['RATE:JetMET', 'BW:Jets'], -1,['serial',-1,["j80","xe80_L1J40_10MINDPHI-Js2-XE50"]]],
-        ['j80_xe80_dphi1_L1J40_10MINDPHI-J20s2-XE50', 926, 'L1_J40_10MINDPHI-J20s2-XE50',['',''], [PhysicsStream], ['RATE:JetMET', 'BW:Jets'], -1,['serial',-1,["j80","xe80_L1J40_10MINDPHI-J20s2-XE50"]]],
-        ['j80_xe80_dphi1_L1J40_10MINDPHI-J20ab-XE50', 927, 'L1_J40_10MINDPHI-J20ab-XE50',['',''], [PhysicsStream], ['RATE:JetMET', 'BW:Jets'], -1,['serial',-1,["j80","xe80_L1J40_10MINDPHI-J20ab-XE50"]]],
-        ['j80_xe80_dphi1_L1J40_10MINDPHI-CJ20ab-XE50', 928, 'L1_J40_10MINDPHI-CJ20ab-XE50',['',''], [PhysicsStream], ['RATE:JetMET', 'BW:Jets'], -1,['serial',-1,["j80","xe80_L1J40_10MINDPHI-CJ20ab-XE50"]]],
-        ['j100_xe80_L1J40_10MINDPHI-Js2-XE50', 683, 'L1_J40_10MINDPHI-Js2-XE50',['',''], [PhysicsStream], ['RATE:JetMET', 'BW:Jets'], -1,['serial',-1,["j100","xe80_L1J40_10MINDPHI-Js2-XE50"]]],
-        ['j100_xe80_L1J40_10MINDPHI-J20s2-XE50', 684, 'L1_J40_10MINDPHI-J20s2-XE50',['',''], [PhysicsStream], ['RATE:JetMET', 'BW:Jets'], -1,['serial',-1,["j100","xe80_L1J40_10MINDPHI-J20s2-XE50"]]],
-        ['j100_xe80_L1J40_10MINDPHI-J20ab-XE50', 685, 'L1_J40_10MINDPHI-J20ab-XE50',['',''], [PhysicsStream], ['RATE:JetMET', 'BW:Jets'], -1,['serial',-1,["j100","xe80_L1J40_10MINDPHI-J20ab-XE50"]]],
-        ['j100_xe80_L1J40_10MINDPHI-CJ20ab-XE50', 686, 'L1_J40_10MINDPHI-CJ20ab-XE50',['',''], [PhysicsStream], ['RATE:JetMET', 'BW:Jets'], -1,['serial',-1,["j100","xe80_L1J40_10MINDPHI-CJ20ab-XE50"]]],
-        ['j30_xe10_razor170', 1015, 'L1_2J15_XE55', ['',''], [PhysicsStream], ['RATE:JetMET', 'BW:Jets'], -1, ['serial',-1,['j30','xe10']]],  
+        #['e24_medium1_L1EM20VHI_xe100noL1',  'L1_EM20VHI',['L1_EM20VHI',''], [PhysicsStream], ['RATE:EgammaMET', 'BW:Egamma'], -1,['serial',-1,["e24_medium1_L1EM20VHI","xe100noL1"]]],
+        ['g70_loose_xe70noL1',              'L1_EM22VHLIL',    ['L1_EM22VHLIL',''],    [PhysicsStream], ['RATE:EgammaMET', 'BW:Egamma'], -1,['serial',-1,["g70_loose","xe70noL1"]]],
+        ['g60_loose_xe60noL1',              'L1_EM22VHLIL',    ['L1_EM22VHLIL',''],    [PhysicsStream], ['RATE:EgammaMET', 'BW:Egamma'], -1,['serial',-1,["g60_loose","xe60noL1"]]],
+        ['g45_tight_xe45noL1',              'L1_EM20VH',   ['L1_EM20VH',''],   [PhysicsStream], ['RATE:EgammaMET', 'BW:Egamma'], -1,['serial',-1,["g45_tight","xe45noL1"]]],
+        ['g45_tight_L1EM22VHLIL_xe45noL1',  'L1_EM22VHLIL',['L1_EM22VHLIL',''],[PhysicsStream], ['RATE:EgammaMET', 'BW:Egamma'], -1,['serial',-1,["g45_tight_L1EM22VHLIL","xe45noL1"]]],
+        ['g40_tight_xe40noL1',              'L1_EM20VH',['L1_EM20VH',''], [PhysicsStream], ['RATE:EgammaMET', 'BW:Egamma'], -1,['serial',-1,["g40_tight","xe40noL1"]]],
+
+        ['e70_loose_xe70noL1',              'L1_EM22VHLIL',['L1_EM22VHLIL',''], [PhysicsStream], ['RATE:EgammaMET', 'BW:Egamma'], -1,['serial',-1,["e70_loose","xe70noL1"]]],
+        ['e60_loose_xe60noL1',              'L1_EM22VHLIL',['L1_EM22VHLIL',''], [PhysicsStream], ['RATE:EgammaMET', 'BW:Egamma'], -1,['serial',-1,["e60_loose","xe60noL1"]]],
+        ['e70_lhloose_xe70noL1',            'L1_EM22VHLIL',['L1_EM22VHLIL',''], [PhysicsStream], ['RATE:EgammaMET', 'BW:Egamma'], -1,['serial',-1,["e70_lhloose","xe70noL1"]]],
+        ['e60_lhloose_xe60noL1',            'L1_EM22VHLIL',['L1_EM22VHLIL',''], [PhysicsStream], ['RATE:EgammaMET', 'BW:Egamma'], -1,['serial',-1,["e60_lhloose","xe60noL1"]]],
+
+        #['mu24_xe100noL1_wEFMu',     'L1_MU20',['L1_MU20',''], [PhysicsStream], ['RATE:METMuon', 'BW:Muon'], -1,['serial',-1,["mu24","xe100noL1_wEFMu"]]],
+        ['j100_xe80',              'L1_J40_XE50',['',''], [PhysicsStream], ['RATE:JetMET', 'BW:Jets'], -1,['serial',-1,["j100","xe80"]]],
+        ['j80_xe80',               'L1_J40_XE50',['',''], [PhysicsStream], ['RATE:JetMET', 'BW:Jets'], -1,['serial',-1,["j80","xe80"]]],
+        #['j80_xe80_dphi1',         'L1_J40_XE50',['',''], [PhysicsStream], ['RATE:JetMET', 'BW:Jets'], -1,['serial',-1,["j80","xe80"]]],
+        ['j80_xe80_dphi1_L1J40_10MINDPHI-Js2-XE50',  'L1_J40_10MINDPHI-Js2-XE50',['',''], [PhysicsStream], ['RATE:JetMET', 'BW:Jets'], -1,['serial',-1,["j80","xe80_L1J40_10MINDPHI-Js2-XE50"]]],
+        ['j80_xe80_dphi1_L1J40_10MINDPHI-J20s2-XE50', 'L1_J40_10MINDPHI-J20s2-XE50',['',''], [PhysicsStream], ['RATE:JetMET', 'BW:Jets'], -1,['serial',-1,["j80","xe80_L1J40_10MINDPHI-J20s2-XE50"]]],
+        ['j80_xe80_dphi1_L1J40_10MINDPHI-J20ab-XE50',  'L1_J40_10MINDPHI-J20ab-XE50',['',''], [PhysicsStream], ['RATE:JetMET', 'BW:Jets'], -1,['serial',-1,["j80","xe80_L1J40_10MINDPHI-J20ab-XE50"]]],
+        ['j80_xe80_dphi1_L1J40_10MINDPHI-CJ20ab-XE50', 'L1_J40_10MINDPHI-CJ20ab-XE50',['',''], [PhysicsStream], ['RATE:JetMET', 'BW:Jets'], -1,['serial',-1,["j80","xe80_L1J40_10MINDPHI-CJ20ab-XE50"]]],
+        ['j100_xe80_L1J40_10MINDPHI-Js2-XE50',  'L1_J40_10MINDPHI-Js2-XE50',['',''], [PhysicsStream], ['RATE:JetMET', 'BW:Jets'], -1,['serial',-1,["j100","xe80_L1J40_10MINDPHI-Js2-XE50"]]],
+        ['j100_xe80_L1J40_10MINDPHI-J20s2-XE50',  'L1_J40_10MINDPHI-J20s2-XE50',['',''], [PhysicsStream], ['RATE:JetMET', 'BW:Jets'], -1,['serial',-1,["j100","xe80_L1J40_10MINDPHI-J20s2-XE50"]]],
+        ['j100_xe80_L1J40_10MINDPHI-J20ab-XE50',  'L1_J40_10MINDPHI-J20ab-XE50',['',''], [PhysicsStream], ['RATE:JetMET', 'BW:Jets'], -1,['serial',-1,["j100","xe80_L1J40_10MINDPHI-J20ab-XE50"]]],
+        ['j100_xe80_L1J40_10MINDPHI-CJ20ab-XE50', 'L1_J40_10MINDPHI-CJ20ab-XE50',['',''], [PhysicsStream], ['RATE:JetMET', 'BW:Jets'], -1,['serial',-1,["j100","xe80_L1J40_10MINDPHI-CJ20ab-XE50"]]],
+        ['j30_xe10_razor170', 'L1_2J15_XE55', ['',''], [PhysicsStream], ['RATE:JetMET', 'BW:Jets'], -1, ['serial',-1,['j30','xe10']]],  
         
         # TAU+X
-        ['tau35_medium1_calo_tau25_medium1_calo',          906, 'L1_TAU20_2TAU12_J25_2J20_3J12',['L1_TAU20','L1_TAU12'], [PhysicsStream], ['RATE:MultiTau', 'BW:Tau'], -1,['serial',-1,["tau35_medium1_calo","tau25_medium1_calo"]]],
-        ['e18_loose1_tau25_medium1_calo',                  907, 'L1_EM15_2TAU12_J25_2J15_3J12',['L1_EM15','L1_TAU12'], [PhysicsStream], ['RATE:ElectronTau', 'BW:Tau'], -1,['serial',-1,["e18_loose1","tau25_medium1_calo"]]],
-        ['e18_lhloose_tau25_medium1_calo',                 908, 'L1_EM15_2TAU12_J25_2J15_3J12',['L1_EM15','L1_TAU12'], [PhysicsStream], ['RATE:ElectronTau', 'BW:Tau'], -1,['serial',-1,["e18_lhloose","tau25_medium1_calo"]]],
-        ['e18_loose1_tau80_medium1_calo',                  909, 'L1_EM15_TAU40_2TAU15',['L1_EM15','L1_TAU40'], [PhysicsStream], ['RATE:ElectronTau', 'BW:Tau'], -1,['serial',-1,["e18_loose1","tau80_medium1_calo"]]],
-        ['e18_lhloose_tau80_medium1_calo',                 910, 'L1_EM15_TAU40_2TAU15',['L1_EM15','L1_TAU40'], [PhysicsStream], ['RATE:ElectronTau', 'BW:Tau'], -1,['serial',-1,["e18_lhloose","tau80_medium1_calo"]]],
-        ['mu14_tau35_medium1_calo',                        911, 'L1_MU10_TAU20',['L1_MU10','L1_TAU20'], [PhysicsStream], ['RATE:MuonTau', 'BW:Tau'], -1,['serial',-1,["mu14","tau35_medium1_calo"]]],
-        ['mu14_tau25_medium1_calo',                        912, 'L1_MU10_TAU12_J25_2J12',['L1_MU10','L1_TAU12'], [PhysicsStream], ['RATE:MuonTau', 'BW:Tau'], -1,['serial',-1,["mu14","tau25_medium1_calo"]]],
-        ['tau35_medium1_calo_tau25_medium1_calo_xe50',     913, 'L1_TAU20_2TAU12_XE35',['L1_TAU20','L1_TAU12','L1_XE35'], [PhysicsStream], ['RATE:TauMET', 'BW:Tau'], -1,['serial',-1,["tau35_medium1_calo","tau25_medium1_calo","xe50"]]],
-        ['tau35_medium1_calo_xe70_L1XE45',                 914, 'L1_TAU20_2J20_XE45',['L1_TAU20','L1_XE45'], [PhysicsStream], ['RATE:TauMET', 'BW:Tau'], -1,['serial',-1,["tau35_medium1_calo","xe70_L1XE45"]]],
-        ['tau35_medium1_ptonly_tau25_medium1_ptonly',      915, 'L1_TAU20_2TAU12_J25_2J20_3J12',['L1_TAU20','L1_TAU12'], [PhysicsStream], ['RATE:MultiTau', 'BW:Tau'], -1,['serial',-1,["tau35_medium1_ptonly","tau25_medium1_ptonly"]]],
-        ['e18_loose1_tau25_medium1_ptonly',                916, 'L1_EM15_2TAU12_J25_2J15_3J12',['L1_EM15','L1_TAU12'], [PhysicsStream], ['RATE:ElectronTau', 'BW:Tau'], -1,['serial',-1,["e18_loose1","tau25_medium1_ptonly"]]],
-        ['e18_lhloose_tau25_medium1_ptonly',               917, 'L1_EM15_2TAU12_J25_2J15_3J12',['L1_EM15','L1_TAU12'], [PhysicsStream], ['RATE:ElectronTau', 'BW:Tau'], -1,['serial',-1,["e18_lhloose","tau25_medium1_ptonly"]]],
-        ['e18_loose1_tau80_medium1_ptonly',                918, 'L1_EM15_TAU40_2TAU15',['L1_EM15','L1_TAU40'], [PhysicsStream], ['RATE:ElectronTau', 'BW:Tau'], -1,['serial',-1,["e18_loose1","tau80_medium1_ptonly"]]],
-        ['e18_lhloose_tau80_medium1_ptonly',               919, 'L1_EM15_TAU40_2TAU15',['L1_EM15','L1_TAU40'], [PhysicsStream], ['RATE:ElectronTau', 'BW:Tau'], -1,['serial',-1,["e18_lhloose","tau80_medium1_ptonly"]]],
-        ['mu14_tau35_medium1_ptonly',                      920, 'L1_MU10_TAU20',['L1_MU10','L1_TAU20'], [PhysicsStream], ['RATE:MuonTau', 'BW:Tau'], -1,['serial',-1,["mu14","tau35_medium1_ptonly"]]],
-        ['mu14_tau25_medium1_ptonly',                      921, 'L1_MU10_TAU12_J25_2J12',['L1_MU10','L1_TAU12'], [PhysicsStream], ['RATE:MuonTau', 'BW:Tau'], -1,['serial',-1,["mu14","tau25_medium1_ptonly"]]],
-        ['tau35_medium1_ptonly_tau25_medium1_ptonly_xe50', 922, 'L1_TAU20_2TAU12_XE35',['L1_TAU20','L1_TAU12','L1_XE35'], [PhysicsStream], ['RATE:TauMET', 'BW:Tau'], -1,['serial',-1,["tau35_medium1_ptonly","tau25_medium1_ptonly","xe50"]]],
-        ['tau35_medium1_ptonly_xe70_L1XE45',               923, 'L1_TAU20_2J20_XE45',['L1_TAU20','L1_XE45'], [PhysicsStream], ['RATE:TauMET', 'BW:Tau'], -1,['serial',-1,["tau35_medium1_ptonly","xe70_L1XE45"]]],
+        ['tau35_medium1_calo_tau25_medium1_calo',          'L1_TAU20IM_2TAU12IM_J25_2J20_3J12',['L1_TAU20IM','L1_TAU12IM'], [PhysicsStream], ['RATE:MultiTau', 'BW:Tau'], -1,['serial',-1,["tau35_medium1_calo","tau25_medium1_calo"]]], ##BM
+        ['e18_loose1_tau25_medium1_calo',                  'L1_EM15HI_2TAU12IM_J25_3J12',['L1_EM15HI','L1_TAU12IM'], [PhysicsStream], ['RATE:ElectronTau', 'BW:Tau'], -1,['serial',-1,["e18_loose1","tau25_medium1_calo"]]],
+        ['e18_lhloose_tau25_medium1_calo',                 'L1_EM15HI_2TAU12IM_J25_3J12',['L1_EM15HI','L1_TAU12IM'], [PhysicsStream], ['RATE:ElectronTau', 'BW:Tau'], -1,['serial',-1,["e18_lhloose","tau25_medium1_calo"]]],
+        #['e18_loose1_tau80_medium1_calo',                  'L1_DISAMB-EM15abhi-TAU40a',[], [PhysicsStream], ['RATE:ElectronTau', 'BW:Tau'], -1,['serial',-1,["e18_loose1","tau80_medium1_calo"]]],
+        #['e18_lhloose_tau80_medium1_calo',                 'L1_DISAMB-EM15abhi-TAU40a',[], [PhysicsStream], ['RATE:ElectronTau', 'BW:Tau'], -1,['serial',-1,["e18_lhloose","tau80_medium1_calo"]]],
+        ['mu14_tau35_medium1_calo_L1TAU20',                'L1_MU10_TAU20',['L1_MU10','L1_TAU20'], [PhysicsStream], ['RATE:MuonTau', 'BW:Tau'], -1,['serial',-1,["mu14","tau35_medium1_calo_L1TAU20"]]],
+        ['mu14_tau25_medium1_calo',                        'L1_MU10_TAU12IM_J25_2J12',['L1_MU10','L1_TAU12IM'], [PhysicsStream], ['RATE:MuonTau', 'BW:Tau'], -1,['serial',-1,["mu14","tau25_medium1_calo"]]],
+        ['tau35_medium1_calo_L1TAU20_tau25_medium1_calo_L1TAU12_xe50', 
+         'L1_TAU20_2TAU12_XE35',['L1_TAU20','L1_TAU12','L1_XE35'], [PhysicsStream], ['RATE:TauMET', 'BW:Tau'], -1,['serial',-1,["tau35_medium1_calo_L1TAU20","tau25_medium1_calo_L1TAU12","xe50"]]],
+
+        ['tau35_medium1_calo_xe70_L1XE45',                 'L1_TAU20IM_2J20_XE45',['L1_TAU20IM','L1_XE45'], [PhysicsStream], ['RATE:TauMET', 'BW:Tau'], -1,['serial',-1,["tau35_medium1_calo","xe70_L1XE45"]]],
+        ['tau35_medium1_ptonly_tau25_medium1_ptonly',      'L1_TAU20IM_2TAU12IM_J25_2J20_3J12',['L1_TAU20IM','L1_TAU12IM'], [PhysicsStream], ['RATE:MultiTau', 'BW:Tau'], -1,['serial',-1,["tau35_medium1_ptonly","tau25_medium1_ptonly"]]],
+        ['e18_loose1_tau25_medium1_ptonly',                'L1_EM15HI_2TAU12IM_J25_3J12',['L1_EM15HI','L1_TAU12IM'], [PhysicsStream], ['RATE:ElectronTau', 'BW:Tau'], -1,['serial',-1,["e18_loose1","tau25_medium1_ptonly"]]],
+        ['e18_lhloose_tau25_medium1_ptonly',               'L1_EM15HI_2TAU12IM_J25_3J12',['L1_EM15HI','L1_TAU12IM'], [PhysicsStream], ['RATE:ElectronTau', 'BW:Tau'], -1,['serial',-1,["e18_lhloose","tau25_medium1_ptonly"]]],
+        #['e18_loose1_tau80_medium1_ptonly',               'DISAMB-EM15abhi-TAU40a',['L1_EM15HI','L1_TAU40'], [PhysicsStream], ['RATE:ElectronTau', 'BW:Tau'], -1,['serial',-1,["e18_loose1","tau80_medium1_ptonly"]]],
+        #['e18_lhloose_tau80_medium1_ptonly',               'DISAMB-EM15abhi-TAU40a',['L1_EM15HI','L1_TAU40'], [PhysicsStream], ['RATE:ElectronTau', 'BW:Tau'], -1,['serial',-1,["e18_lhloose","tau80_medium1_ptonly"]]],
+        ['mu14_tau35_medium1_ptonly_L1TAU20',              'L1_MU10_TAU20',['L1_MU10','L1_TAU20'], [PhysicsStream], ['RATE:MuonTau', 'BW:Tau'], -1,['serial',-1,["mu14","tau35_medium1_ptonly_L1TAU20"]]],
+        ['mu14_tau25_medium1_ptonly',                      'L1_MU10_TAU12IM_J25_2J12',['L1_MU10','L1_TAU12IM'], [PhysicsStream], ['RATE:MuonTau', 'BW:Tau'], -1,['serial',-1,["mu14","tau25_medium1_ptonly"]]],
+        ['tau35_medium1_ptonly_L1TAU20_tau25_medium1_ptonly_L1TAU12_xe50', 'L1_TAU20_2TAU12_XE35',['L1_TAU20','L1_TAU12','L1_XE35'], [PhysicsStream], ['RATE:TauMET', 'BW:Tau'], -1,['serial',-1,["tau35_medium1_ptonly_L1TAU20","tau25_medium1_ptonly_L1TAU12","xe50"]]],
+        ['tau35_medium1_ptonly_L1TAU25_xe70_L1XE45',               'L1_TAU25_2J20_XE45',['L1_TAU25','L1_XE45'], [PhysicsStream], ['RATE:TauMET', 'BW:Tau'], -1,['serial',-1,["tau35_medium1_ptonly_L1TAU25","xe70_L1XE45"]]],
+
+        # VBF triggers
+        ['g15_loose_2j40_0eta490_5j25_0eta490', 'L1_400INVM9999-AJ30s6-AJ20s6', ['L1_EM13VH','',''], [PhysicsStream], ['RATE:EgammaJet', 'BW:Egamma'], -1,['serial',-1,["g15_loose","2j40_0eta490","5j25_0eta490"]]],
+        ['g20_loose_2j40_0eta490_5j25_0eta490_L1700INVM-AJ30s6-AJ20s6', 'L1_700INVM9999-AJ30s6-AJ20s6', ['L1_EM15VH','',''], [PhysicsStream], ['RATE:EgammaJet', 'BW:Egamma'], -1,['serial',-1,["g20_loose","2j40_0eta490","5j25_0eta490"]]],
+        ['g20_loose_2j40_0eta490_5j25_0eta490', 'L1_800INVM9999-AJ30s6-AJ20s6', ['L1_EM13VH','',''], [PhysicsStream], ['RATE:EgammaJet', 'BW:Egamma'], -1,['serial',-1,["g20_loose","2j40_0eta490","5j25_0eta490"]]],
+        ['g20_loose_2j40_0eta490_5j25_0eta490_L1900INVM-AJ30s6-AJ20s6', 'L1_900INVM9999-AJ30s6-AJ20s6', ['L1_EM13VH','',''], [PhysicsStream], ['RATE:EgammaJet', 'BW:Egamma'], -1,['serial',-1,["g20_loose","2j40_0eta490","5j25_0eta490"]]],
 
         # lepton + jets
 
-        ['e26_vloose_L1EM20VH_3j20noL1', 750, 'L1_EM20VH', ['L1_EM20VH',''], [PhysicsStream], ['RATE:EgammaJet', 'BW:Egamma'], -1, ['serial',-1,["e26_vloose_L1EM20VH","3j20noL1"]]],
-        ['e26_vloose_L1EM20VH_4j20noL1', 751, 'L1_EM20VH', ['L1_EM20VH',''], [PhysicsStream], ['RATE:EgammaJet', 'BW:Egamma'], -1, ['serial',-1,["e26_vloose_L1EM20VH","4j20noL1"] ]],
-        ['e26_vloose_L1EM20VH_5j15noL1', 752, 'L1_EM20VH', ['L1_EM20VH',''], [PhysicsStream], ['RATE:EgammaJet', 'BW:Egamma'], -1, ['serial',-1,["e26_vloose_L1EM20VH","5j15noL1"] ]],
-        ['e26_vloose_L1EM20VH_6j15noL1', 753, 'L1_EM20VH', ['L1_EM20VH',''], [PhysicsStream], ['RATE:EgammaJet', 'BW:Egamma'], -1, ['serial',-1,["e26_vloose_L1EM20VH","6j15noL1"] ]],
-
-        ['e26_lhvloose_L1EM20VH_3j20noL1', 754, 'L1_EM20VH', ['L1_EM20VH',''], [PhysicsStream], ['RATE:EgammaJet', 'BW:Egamma'], -1, ['serial',-1,["e26_lhvloose_L1EM20VH","3j20noL1"] ]],
-        ['e26_lhvloose_L1EM20VH_4j20noL1', 755, 'L1_EM20VH', ['L1_EM20VH',''], [PhysicsStream], ['RATE:EgammaJet', 'BW:Egamma'], -1, ['serial',-1,["e26_lhvloose_L1EM20VH","4j20noL1"] ]],
-        ['e26_lhvloose_L1EM20VH_5j15noL1', 756, 'L1_EM20VH', ['L1_EM20VH',''], [PhysicsStream], ['RATE:EgammaJet', 'BW:Egamma'], -1, ['serial',-1,["e26_lhvloose_L1EM20VH","5j15noL1"] ]],
-        ['e26_lhvloose_L1EM20VH_6j15noL1', 757, 'L1_EM20VH', ['L1_EM20VH',''], [PhysicsStream], ['RATE:EgammaJet', 'BW:Egamma'], -1, ['serial',-1,["e26_lhvloose_L1EM20VH","6j15noL1"] ]],
-
-        ['e24_vloose_L1EM20VH_3j20noL1', 758, 'L1_EM20VH', ['L1_EM20VH',''], [PhysicsStream], ['RATE:EgammaJet', 'BW:Egamma'], -1, ['serial',-1,["e24_vloose_L1EM20VH","3j20noL1"] ]],
-        ['e24_vloose_L1EM20VH_4j20noL1', 759, 'L1_EM20VH', ['L1_EM20VH',''], [PhysicsStream], ['RATE:EgammaJet', 'BW:Egamma'], -1, ['serial',-1,["e24_vloose_L1EM20VH","4j20noL1"] ]],
-        ['e24_vloose_L1EM20VH_5j15noL1', 760, 'L1_EM20VH', ['L1_EM20VH',''], [PhysicsStream], ['RATE:EgammaJet', 'BW:Egamma'], -1, ['serial',-1,["e24_vloose_L1EM20VH","5j15noL1"] ]],
-        ['e24_vloose_L1EM20VH_6j15noL1', 761, 'L1_EM20VH', ['L1_EM20VH',''], [PhysicsStream], ['RATE:EgammaJet', 'BW:Egamma'], -1, ['serial',-1,["e24_vloose_L1EM20VH","6j15noL1"] ]],
-
-        ['e24_lhvloose_L1EM20VH_3j20noL1', 762, 'L1_EM20VH', ['L1_EM20VH',''], [PhysicsStream], ['RATE:EgammaJet', 'BW:Egamma'], -1, ['serial',-1,["e24_lhvloose_L1EM20VH","3j20noL1"] ]],
-        ['e24_lhvloose_L1EM20VH_4j20noL1', 763, 'L1_EM20VH', ['L1_EM20VH',''], [PhysicsStream], ['RATE:EgammaJet', 'BW:Egamma'], -1, ['serial',-1,["e24_lhvloose_L1EM20VH","4j20noL1"] ]],
-        ['e24_lhvloose_L1EM20VH_5j15noL1', 764, 'L1_EM20VH', ['L1_EM20VH',''], [PhysicsStream], ['RATE:EgammaJet', 'BW:Egamma'], -1, ['serial',-1,["e24_lhvloose_L1EM20VH","5j15noL1"] ]],
-        ['e24_lhvloose_L1EM20VH_6j15noL1', 765, 'L1_EM20VH', ['L1_EM20VH',''], [PhysicsStream], ['RATE:EgammaJet', 'BW:Egamma'], -1, ['serial',-1,["e24_lhvloose_L1EM20VH","6j15noL1"] ]],
-
-        ['e24_vloose_L1EM18VH_3j20noL1', 766, 'L1_EM18VH', ['L1_EM18VH',''], [PhysicsStream], ['RATE:EgammaJet', 'BW:Egamma'], -1, ['serial',-1,["e24_vloose_L1EM18VH","3j20noL1"] ]],
-        ['e24_vloose_L1EM18VH_4j20noL1', 767, 'L1_EM18VH', ['L1_EM18VH',''], [PhysicsStream], ['RATE:EgammaJet', 'BW:Egamma'], -1, ['serial',-1,["e24_vloose_L1EM18VH","4j20noL1"] ]],
-        ['e24_vloose_L1EM18VH_5j15noL1', 768, 'L1_EM18VH', ['L1_EM18VH',''], [PhysicsStream], ['RATE:EgammaJet', 'BW:Egamma'], -1, ['serial',-1,["e24_vloose_L1EM18VH","5j15noL1"] ]],
-        ['e24_vloose_L1EM18VH_6j15noL1', 769, 'L1_EM18VH', ['L1_EM18VH',''], [PhysicsStream], ['RATE:EgammaJet', 'BW:Egamma'], -1, ['serial',-1,["e24_vloose_L1EM18VH","6j15noL1"] ]],
-
-        ['e24_lhvloose_L1EM18VH_3j20noL1', 780, 'L1_EM18VH', ['L1_EM18VH',''], [PhysicsStream], ['RATE:EgammaJet', 'BW:Egamma'], -1, ['serial',-1,["e24_lhvloose_L1EM18VH","3j20noL1"] ]],
-        ['e24_lhvloose_L1EM18VH_4j20noL1', 781, 'L1_EM18VH', ['L1_EM18VH',''], [PhysicsStream], ['RATE:EgammaJet', 'BW:Egamma'], -1, ['serial',-1,["e24_lhvloose_L1EM18VH","4j20noL1"] ]],
-        ['e24_lhvloose_L1EM18VH_5j15noL1', 782, 'L1_EM18VH', ['L1_EM18VH',''], [PhysicsStream], ['RATE:EgammaJet', 'BW:Egamma'], -1, ['serial',-1,["e24_lhvloose_L1EM18VH","5j15noL1"] ]],
-        ['e24_lhvloose_L1EM18VH_6j15noL1', 783, 'L1_EM18VH', ['L1_EM18VH',''], [PhysicsStream], ['RATE:EgammaJet', 'BW:Egamma'], -1, ['serial',-1,["e24_lhvloose_L1EM18VH","6j15noL1"] ]],
-
-        ['mu26_2j20noL1', 784, 'L1_MU20', ['L1_MU20',''], [PhysicsStream], ['RATE:MuonJet', 'BW:Muon'], -1, ['serial',-1,["mu26","2j20noL1"] ]],
-        ['mu26_3j20noL1', 785, 'L1_MU20', ['L1_MU20',''], [PhysicsStream], ['RATE:MuonJet', 'BW:Muon'], -1, ['serial',-1,["mu26","3j20noL1"] ]],
-        ['mu26_4j15noL1', 786, 'L1_MU20', ['L1_MU20',''], [PhysicsStream], ['RATE:MuonJet', 'BW:Muon'], -1, ['serial',-1,["mu26","4j15noL1"] ]],
-        ['mu26_5j15noL1', 787, 'L1_MU20', ['L1_MU20',''], [PhysicsStream], ['RATE:MuonJet', 'BW:Muon'], -1, ['serial',-1,["mu26","5j15noL1"] ]],
-
-        ['mu24_2j20noL1', 788, 'L1_MU20', ['L1_MU20',''], [PhysicsStream], ['RATE:MuonJet', 'BW:Muon'], -1, ['serial',-1,["mu24","2j20noL1"] ]],
-        ['mu24_3j20noL1', 789, 'L1_MU20', ['L1_MU20',''], [PhysicsStream], ['RATE:MuonJet', 'BW:Muon'], -1, ['serial',-1,["mu24","3j20noL1"] ]],
-        ['mu24_4j15noL1', 790, 'L1_MU20', ['L1_MU20',''], [PhysicsStream], ['RATE:MuonJet', 'BW:Muon'], -1, ['serial',-1,["mu24","4j15noL1"] ]],
-        ['mu24_5j15noL1', 791, 'L1_MU20', ['L1_MU20',''], [PhysicsStream], ['RATE:MuonJet', 'BW:Muon'], -1, ['serial',-1,["mu24","5j15noL1"] ]],
-
-        ['mu20_L1MU15_2j20noL1', 792, 'L1_MU15', ['L1_MU15',''], [PhysicsStream], ['RATE:MuonJet', 'BW:Muon'], -1, ['serial',-1,["mu20_L1MU15","2j20noL1"] ]],
-        ['mu20_L1MU15_3j20noL1', 793, 'L1_MU15', ['L1_MU15',''], [PhysicsStream], ['RATE:MuonJet', 'BW:Muon'], -1, ['serial',-1,["mu20_L1MU15","3j20noL1"] ]],
-        ['mu20_L1MU15_4j15noL1', 794, 'L1_MU15', ['L1_MU15',''], [PhysicsStream], ['RATE:MuonJet', 'BW:Muon'], -1, ['serial',-1,["mu20_L1MU15","4j15noL1"] ]],
-        ['mu20_L1MU15_5j15noL1', 795, 'L1_MU15', ['L1_MU15',''], [PhysicsStream], ['RATE:MuonJet', 'BW:Muon'], -1, ['serial',-1,["mu20_L1MU15","5j15noL1"] ]],
-
-        #['mu4_3j55_dr05',        1815, 'L1_MU4_3J20', ['L1_MU4', 'L1_3J20'], [PhysicsStream], ['RATE:MuonBjet', 'BW:Bjet', 'BW:Muon'], -1,['serial',-1,[] ]],
+        ['e26_vloose_L1EM20VH_3j20noL1',  'L1_EM20VH', ['L1_EM20VH',''], [PhysicsStream], ['RATE:EgammaJet', 'BW:Egamma'], -1, ['serial',-1,["e26_vloose_L1EM20VH","3j20noL1"]]],
+        ['e26_vloose_L1EM20VH_4j20noL1',  'L1_EM20VH', ['L1_EM20VH',''], [PhysicsStream], ['RATE:EgammaJet', 'BW:Egamma'], -1, ['serial',-1,["e26_vloose_L1EM20VH","4j20noL1"] ]],
+        ['e26_vloose_L1EM20VH_5j15noL1',  'L1_EM20VH', ['L1_EM20VH',''], [PhysicsStream], ['RATE:EgammaJet', 'BW:Egamma'], -1, ['serial',-1,["e26_vloose_L1EM20VH","5j15noL1"] ]],
+        ['e26_vloose_L1EM20VH_6j15noL1',  'L1_EM20VH', ['L1_EM20VH',''], [PhysicsStream], ['RATE:EgammaJet', 'BW:Egamma'], -1, ['serial',-1,["e26_vloose_L1EM20VH","6j15noL1"] ]],
+
+        ['e26_lhvloose_L1EM20VH_3j20noL1',  'L1_EM20VH', ['L1_EM20VH',''], [PhysicsStream], ['RATE:EgammaJet', 'BW:Egamma'], -1, ['serial',-1,["e26_lhvloose_L1EM20VH","3j20noL1"] ]],
+        ['e26_lhvloose_L1EM20VH_4j20noL1',  'L1_EM20VH', ['L1_EM20VH',''], [PhysicsStream], ['RATE:EgammaJet', 'BW:Egamma'], -1, ['serial',-1,["e26_lhvloose_L1EM20VH","4j20noL1"] ]],
+        ['e26_lhvloose_L1EM20VH_5j15noL1',  'L1_EM20VH', ['L1_EM20VH',''], [PhysicsStream], ['RATE:EgammaJet', 'BW:Egamma'], -1, ['serial',-1,["e26_lhvloose_L1EM20VH","5j15noL1"] ]],
+        ['e26_lhvloose_L1EM20VH_6j15noL1',  'L1_EM20VH', ['L1_EM20VH',''], [PhysicsStream], ['RATE:EgammaJet', 'BW:Egamma'], -1, ['serial',-1,["e26_lhvloose_L1EM20VH","6j15noL1"] ]],
+
+        ['e24_vloose_L1EM20VH_3j20noL1',  'L1_EM20VH', ['L1_EM20VH',''], [PhysicsStream], ['RATE:EgammaJet', 'BW:Egamma'], -1, ['serial',-1,["e24_vloose_L1EM20VH","3j20noL1"] ]],
+        ['e24_vloose_L1EM20VH_4j20noL1',  'L1_EM20VH', ['L1_EM20VH',''], [PhysicsStream], ['RATE:EgammaJet', 'BW:Egamma'], -1, ['serial',-1,["e24_vloose_L1EM20VH","4j20noL1"] ]],
+        ['e24_vloose_L1EM20VH_5j15noL1',  'L1_EM20VH', ['L1_EM20VH',''], [PhysicsStream], ['RATE:EgammaJet', 'BW:Egamma'], -1, ['serial',-1,["e24_vloose_L1EM20VH","5j15noL1"] ]],
+        ['e24_vloose_L1EM20VH_6j15noL1',  'L1_EM20VH', ['L1_EM20VH',''], [PhysicsStream], ['RATE:EgammaJet', 'BW:Egamma'], -1, ['serial',-1,["e24_vloose_L1EM20VH","6j15noL1"] ]],
+
+        ['e24_lhvloose_L1EM20VH_3j20noL1',  'L1_EM20VH', ['L1_EM20VH',''], [PhysicsStream], ['RATE:EgammaJet', 'BW:Egamma'], -1, ['serial',-1,["e24_lhvloose_L1EM20VH","3j20noL1"] ]],
+        ['e24_lhvloose_L1EM20VH_4j20noL1',  'L1_EM20VH', ['L1_EM20VH',''], [PhysicsStream], ['RATE:EgammaJet', 'BW:Egamma'], -1, ['serial',-1,["e24_lhvloose_L1EM20VH","4j20noL1"] ]],
+        ['e24_lhvloose_L1EM20VH_5j15noL1',  'L1_EM20VH', ['L1_EM20VH',''], [PhysicsStream], ['RATE:EgammaJet', 'BW:Egamma'], -1, ['serial',-1,["e24_lhvloose_L1EM20VH","5j15noL1"] ]],
+        ['e24_lhvloose_L1EM20VH_6j15noL1',  'L1_EM20VH', ['L1_EM20VH',''], [PhysicsStream], ['RATE:EgammaJet', 'BW:Egamma'], -1, ['serial',-1,["e24_lhvloose_L1EM20VH","6j15noL1"] ]],
+
+        ['e24_vloose_L1EM18VH_3j20noL1',  'L1_EM18VH', ['L1_EM18VH',''], [PhysicsStream], ['RATE:EgammaJet', 'BW:Egamma'], -1, ['serial',-1,["e24_vloose_L1EM18VH","3j20noL1"] ]],
+        ['e24_vloose_L1EM18VH_4j20noL1',  'L1_EM18VH', ['L1_EM18VH',''], [PhysicsStream], ['RATE:EgammaJet', 'BW:Egamma'], -1, ['serial',-1,["e24_vloose_L1EM18VH","4j20noL1"] ]],
+        ['e24_vloose_L1EM18VH_5j15noL1',  'L1_EM18VH', ['L1_EM18VH',''], [PhysicsStream], ['RATE:EgammaJet', 'BW:Egamma'], -1, ['serial',-1,["e24_vloose_L1EM18VH","5j15noL1"] ]],
+        ['e24_vloose_L1EM18VH_6j15noL1',  'L1_EM18VH', ['L1_EM18VH',''], [PhysicsStream], ['RATE:EgammaJet', 'BW:Egamma'], -1, ['serial',-1,["e24_vloose_L1EM18VH","6j15noL1"] ]],
+
+        ['e24_lhvloose_L1EM18VH_3j20noL1',  'L1_EM18VH', ['L1_EM18VH',''], [PhysicsStream], ['RATE:EgammaJet', 'BW:Egamma'], -1, ['serial',-1,["e24_lhvloose_L1EM18VH","3j20noL1"] ]],
+        ['e24_lhvloose_L1EM18VH_4j20noL1',  'L1_EM18VH', ['L1_EM18VH',''], [PhysicsStream], ['RATE:EgammaJet', 'BW:Egamma'], -1, ['serial',-1,["e24_lhvloose_L1EM18VH","4j20noL1"] ]],
+        ['e24_lhvloose_L1EM18VH_5j15noL1',  'L1_EM18VH', ['L1_EM18VH',''], [PhysicsStream], ['RATE:EgammaJet', 'BW:Egamma'], -1, ['serial',-1,["e24_lhvloose_L1EM18VH","5j15noL1"] ]],
+        ['e24_lhvloose_L1EM18VH_6j15noL1',  'L1_EM18VH', ['L1_EM18VH',''], [PhysicsStream], ['RATE:EgammaJet', 'BW:Egamma'], -1, ['serial',-1,["e24_lhvloose_L1EM18VH","6j15noL1"] ]],
+
+        ['mu26_2j20noL1',  'L1_MU20', ['L1_MU20',''], [PhysicsStream], ['RATE:MuonJet', 'BW:Muon'], -1, ['serial',-1,["mu26","2j20noL1"] ]],
+        ['mu26_3j20noL1',  'L1_MU20', ['L1_MU20',''], [PhysicsStream], ['RATE:MuonJet', 'BW:Muon'], -1, ['serial',-1,["mu26","3j20noL1"] ]],
+        ['mu26_4j15noL1',  'L1_MU20', ['L1_MU20',''], [PhysicsStream], ['RATE:MuonJet', 'BW:Muon'], -1, ['serial',-1,["mu26","4j15noL1"] ]],
+        ['mu26_5j15noL1',  'L1_MU20', ['L1_MU20',''], [PhysicsStream], ['RATE:MuonJet', 'BW:Muon'], -1, ['serial',-1,["mu26","5j15noL1"] ]],
+
+        ['mu24_2j20noL1',  'L1_MU20', ['L1_MU20',''], [PhysicsStream], ['RATE:MuonJet', 'BW:Muon'], -1, ['serial',-1,["mu24","2j20noL1"] ]],
+        ['mu24_3j20noL1',  'L1_MU20', ['L1_MU20',''], [PhysicsStream], ['RATE:MuonJet', 'BW:Muon'], -1, ['serial',-1,["mu24","3j20noL1"] ]],
+        ['mu24_4j15noL1',  'L1_MU20', ['L1_MU20',''], [PhysicsStream], ['RATE:MuonJet', 'BW:Muon'], -1, ['serial',-1,["mu24","4j15noL1"] ]],
+        ['mu24_5j15noL1',  'L1_MU20', ['L1_MU20',''], [PhysicsStream], ['RATE:MuonJet', 'BW:Muon'], -1, ['serial',-1,["mu24","5j15noL1"] ]],
+
+        ['mu20_L1MU15_2j20noL1',  'L1_MU15', ['L1_MU15',''], [PhysicsStream], ['RATE:MuonJet', 'BW:Muon'], -1, ['serial',-1,["mu20_L1MU15","2j20noL1"] ]],
+        ['mu20_L1MU15_3j20noL1',  'L1_MU15', ['L1_MU15',''], [PhysicsStream], ['RATE:MuonJet', 'BW:Muon'], -1, ['serial',-1,["mu20_L1MU15","3j20noL1"] ]],
+        ['mu20_L1MU15_4j15noL1',  'L1_MU15', ['L1_MU15',''], [PhysicsStream], ['RATE:MuonJet', 'BW:Muon'], -1, ['serial',-1,["mu20_L1MU15","4j15noL1"] ]],
+        ['mu20_L1MU15_5j15noL1',  'L1_MU15', ['L1_MU15',''], [PhysicsStream], ['RATE:MuonJet', 'BW:Muon'], -1, ['serial',-1,["mu20_L1MU15","5j15noL1"] ]],
+
+        #['mu4_3j55_dr05',  'L1_MU4_3J20', ['L1_MU4', 'L1_3J20'], [PhysicsStream], ['RATE:MuonBjet', 'BW:Bjet', 'BW:Muon'], -1,['serial',-1,[] ]],
 
         ]
 
     TriggerFlags.MinBiasSlice.signatures = TriggerFlags.MinBiasSlice.signatures() + [
-        #['mb_perf_L1LUCID', 823, 'L1_LUCID', [], ['MinBias'], [], 1],
-        #['mb_sptrk', 806, 'L1_RD0_FILLED', [], ['MinBias'], ["BW:MinBias", "RATE:MinBias"], -1],
-        ['mb_perf_L1MBTS_1', 822, 'L1_MBTS_1', [], ['MinBias'], ["BW:MinBias", "RATE:MinBias"], -1],
-        ['mb_sp2000_trk70_hmt', 824, 'L1_TE20', [], ['MinBias'], ["BW:MinBias", "RATE:MinBias"], -1],        
+        #['mb_perf_L1LUCID', 'L1_LUCID', [], ['MinBias'], [], 1],
+        #['mb_sptrk', 'L1_RD0_FILLED', [], ['MinBias'], ["BW:MinBias", "RATE:MinBias"], -1],
+        ['mb_perf_L1MBTS_1',  'L1_MBTS_1', [], ['MinBias'], ["BW:MinBias", "RATE:MinBias"], -1],
+        ['mb_sp2000_trk70_hmt', 'L1_TE20', [], ['MinBias'], ["BW:MinBias", "RATE:MinBias"], -1],        
 
-        ['mb_sp2000_pusup600_trk70_hmt', 836, 'L1_TE20', [], ['MinBias'], ["BW:MinBias", "RATE:MinBias"], -1], 
-        ['mb_sp2000_pusup600_trk70_hmt_L1TE30', 837, 'L1_TE30', [], ['MinBias'], ["BW:MinBias", "RATE:MinBias"], -1], 
-        ['mb_sp2000_pusup600_trk70_hmt_L1TE40', 838, 'L1_TE40', [], ['MinBias'], ["BW:MinBias", "RATE:MinBias"], -1], 
-        ['mb_sp2000_pusup700_trk70_hmt_L1TE30', 839, 'L1_TE30', [], ['MinBias'], ["BW:MinBias", "RATE:MinBias"], -1], 
-        ['mb_sp2000_pusup700_trk70_hmt_L1TE40', 840, 'L1_TE40', [], ['MinBias'], ["BW:MinBias", "RATE:MinBias"], -1], 
+        ['mb_sp2000_pusup600_trk70_hmt', 'L1_TE20', [], ['MinBias'], ["BW:MinBias", "RATE:MinBias"], -1], 
+        ['mb_sp2000_pusup600_trk70_hmt_L1TE30',  'L1_TE30', [], ['MinBias'], ["BW:MinBias", "RATE:MinBias"], -1], 
+        ['mb_sp2000_pusup600_trk70_hmt_L1TE40',  'L1_TE40', [], ['MinBias'], ["BW:MinBias", "RATE:MinBias"], -1], 
+        ['mb_sp2000_pusup700_trk70_hmt_L1TE30',  'L1_TE30', [], ['MinBias'], ["BW:MinBias", "RATE:MinBias"], -1], 
+        ['mb_sp2000_pusup700_trk70_hmt_L1TE40',  'L1_TE40', [], ['MinBias'], ["BW:MinBias", "RATE:MinBias"], -1], 
 
 	#ATR-9419
-        ['mb_sp2000_pusup700_trk60_hmt_L1TE30', 841, 'L1_TE30', [], ['MinBias'], ["BW:MinBias", "RATE:MinBias"], -1],
-        ['mb_sp2500_pusup750_trk90_hmt_L1TE40', 842, 'L1_TE40', [], ['MinBias'], ["BW:MinBias", "RATE:MinBias"], -1],
-        ['mb_sp3000_pusup800_trk120_hmt_L1TE50', 852, 'L1_TE50', [], ['MinBias'], ["BW:MinBias", "RATE:MinBias"], -1],
-        ['mb_sp2000_pusup700_trk50_sumet70_hmt_L1TE30', 853, 'L1_TE30', [], ['MinBias'], ["BW:MinBias", "RATE:MinBias"], -1],
-	['mb_sp2000_pusup700_trk50_sumet110_hmt_L1TE40', 854, 'L1_TE40', [], ['MinBias'], ["BW:MinBias", "RATE:MinBias"], -1],
-        ['mb_sp2000_pusup700_trk50_sumet150_hmt_L1TE50', 855, 'L1_TE50', [], ['MinBias'], ["BW:MinBias", "RATE:MinBias"], -1],
+        ['mb_sp2000_pusup700_trk60_hmt_L1TE30', 'L1_TE30', [], ['MinBias'], ["BW:MinBias", "RATE:MinBias"], -1],
+        ['mb_sp2500_pusup750_trk90_hmt_L1TE40', 'L1_TE40', [], ['MinBias'], ["BW:MinBias", "RATE:MinBias"], -1],
+        ['mb_sp3000_pusup800_trk120_hmt_L1TE50', 'L1_TE50', [], ['MinBias'], ["BW:MinBias", "RATE:MinBias"], -1],
+        ['mb_sp2000_pusup700_trk50_sumet70_hmt_L1TE30',   'L1_TE30', [], ['MinBias'], ["BW:MinBias", "RATE:MinBias"], -1],
+	['mb_sp2000_pusup700_trk50_sumet110_hmt_L1TE40',  'L1_TE40', [], ['MinBias'], ["BW:MinBias", "RATE:MinBias"], -1],
+        ['mb_sp2000_pusup700_trk50_sumet150_hmt_L1TE50',  'L1_TE50', [], ['MinBias'], ["BW:MinBias", "RATE:MinBias"], -1],
+
+	#ATR-9822
+        ['mb_sp2000_pusup700_trk60_hmt_L1TE30.0ETA24', 'L1_TE30.0ETA24', [], ['MinBias'], ["BW:MinBias", "RATE:MinBias"], -1],
+        ['mb_sp2000_pusup700_trk50_sumet70_hmt_L1TE30.0ETA24',   'L1_TE30.0ETA24', [], ['MinBias'], ["BW:MinBias", "RATE:MinBias"], -1],
+
 	#supporting HMT triggers
-	['mb_sp1800_hmtperf_L1TE20', 856, 'L1_TE20', [], ['MinBias'], ["BW:MinBias", "RATE:MinBias"], -1],
+	['mb_sp1800_hmtperf_L1TE20', 'L1_TE20', [], ['MinBias'], ["BW:MinBias", "RATE:MinBias"], -1],
+        ['mb_sp1800_hmtperf_L1TE30.0ETA24', 'L1_TE30.0ETA24', [], ['MinBias'], ["BW:MinBias", "RATE:MinBias"], -1],
         ]
 
-
+    #Beamspot chanis first try ATR-9847                                                                                                                
+    TriggerFlags.BeamspotSlice.signatures = TriggerFlags.BeamspotSlice.signatures() + [                                                                 
+        ['beamspot',           'L1_4J15', [], [PhysicsStream], ['RATE:BeamSpot',  'BW:BeamSpot'], -1],
+        ]
     ## The following slices are only needed for Physics runnings and LS1 menus
     ## To be commented out for DC14
     TriggerFlags.CalibSlice.signatures   = TriggerFlags.CalibSlice.signatures() + []
     TriggerFlags.CosmicSlice.signatures  = TriggerFlags.CosmicSlice.signatures() + []
     TriggerFlags.StreamingSlice.signatures = TriggerFlags.StreamingSlice.signatures() + [
 
-        ['noalg_L1J400',       690   , 'L1_J400', [], [PhysicsStream], ['RATE:SeededStreamers', "BW:Jets"], -1],
+        #['noalg_L1J400', 'L1_J400', [], [PhysicsStream], ['RATE:SeededStreamers', "BW:Jets"], -1],
 
-        ['noalg_mb_L1TE20', 843, 'L1_TE20', [], ['MinBias'], ["BW:MinBias", "RATE:MinBias"], -1], 
-        ['noalg_mb_L1TE30', 844, 'L1_TE30', [], ['MinBias'], ["BW:MinBias", "RATE:MinBias"], -1], 
-        ['noalg_mb_L1TE40', 845, 'L1_TE40', [], ['MinBias'], ["BW:MinBias", "RATE:MinBias"], -1],
+        ['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],
 
         #Muon streamers
-        ['noalg_L1MU20',           473, 'L1_MU20',           [], [PhysicsStream], ['RATE:SeededStreamers', 'BW:Muon'], -1],
-        ['noalg_L1MU15',           474, 'L1_MU15',           [], [PhysicsStream], ['RATE:SeededStreamers', 'BW:Muon'], -1],
-        ['noalg_L1MU10',           475, 'L1_MU10',           [], [PhysicsStream], ['RATE:SeededStreamers', 'BW:Muon'], -1],
-        ['noalg_L1MU4_EMPTY',      476, 'L1_MU4_EMPTY',      [], [PhysicsStream], ['RATE:SeededStreamers', 'BW:Muon'], -1],
-        ['noalg_L1MU4_FIRSTEMPTY', 477, 'L1_MU4_FIRSTEMPTY', [], [PhysicsStream], ['RATE:SeededStreamers', 'BW:Muon'], -1],
-        #['noalg_L1MU10_MU6',       478, 'L1_MU10_MU6',       [], [PhysicsStream], ['RATE:SingleMuon', 'BW:Muon'], -1],
+        ['noalg_L1MU20',           'L1_MU20',           [], [PhysicsStream], ['RATE:SeededStreamers', 'BW:Muon'], -1],
+        ['noalg_L1MU15',           'L1_MU15',           [], [PhysicsStream], ['RATE:SeededStreamers', 'BW:Muon'], -1],
+        ['noalg_L1MU10',           'L1_MU10',           [], [PhysicsStream], ['RATE:SeededStreamers', 'BW:Muon'], -1],
+        ['noalg_L1MU4_EMPTY',      'L1_MU4_EMPTY',      [], [PhysicsStream], ['RATE:SeededStreamers', 'BW:Muon'], -1],
+        ['noalg_L1MU4_FIRSTEMPTY', 'L1_MU4_FIRSTEMPTY', [], [PhysicsStream], ['RATE:SeededStreamers', 'BW:Muon'], -1],
+        #['noalg_L1MU10_MU6',      'L1_MU10_MU6',       [], [PhysicsStream], ['RATE:SingleMuon', 'BW:Muon'], -1],
         
         # Streamers for TOPO b-jet
-        ['noalg_L10DR04-MU4ab-CJ15ab', 846, 'L1_0DR04-MU4ab-CJ15ab', [], [PhysicsStream], ["RATE:L1TopoStreamers", "BW:Other"], -1],
-        ['noalg_L10DR04-MU4ab-CJ30ab', 847, 'L1_0DR04-MU4ab-CJ30ab', [], [PhysicsStream], ["RATE:L1TopoStreamers", "BW:Other"], -1],
-        ['noalg_L10DR04-MU6ab-CJ25ab', 848, 'L1_0DR04-MU6ab-CJ25ab', [], [PhysicsStream], ["RATE:L1TopoStreamers", "BW:Other"], -1],
-        ['noalg_L10DR04-MU4ab-CJ17ab', 849, 'L1_0DR04-MU4ab-CJ17ab', [], [PhysicsStream], ["RATE:L1TopoStreamers", "BW:Other"], -1],
-        ['noalg_L10DR04-MU4ab-CJ20ab', 860, 'L1_0DR04-MU4ab-CJ20ab', [], [PhysicsStream], ["RATE:L1TopoStreamers", "BW:Other"], -1],
+        ['noalg_L10DR04-MU4ab-CJ15ab',  'L1_0DR04-MU4ab-CJ15ab', [], [PhysicsStream], ["RATE:L1TopoStreamers", "BW:Other"], -1],
+        ['noalg_L10DR04-MU4ab-CJ30ab',  'L1_0DR04-MU4ab-CJ30ab', [], [PhysicsStream], ["RATE:L1TopoStreamers", "BW:Other"], -1],
+        ['noalg_L10DR04-MU6ab-CJ25ab',  'L1_0DR04-MU6ab-CJ25ab', [], [PhysicsStream], ["RATE:L1TopoStreamers", "BW:Other"], -1],
+        ['noalg_L10DR04-MU4ab-CJ17ab',  'L1_0DR04-MU4ab-CJ17ab', [], [PhysicsStream], ["RATE:L1TopoStreamers", "BW:Other"], -1],
+        ['noalg_L10DR04-MU4ab-CJ20ab',  'L1_0DR04-MU4ab-CJ20ab', [], [PhysicsStream], ["RATE:L1TopoStreamers", "BW:Other"], -1],
 
         # Streamers for TOPO HT
-        ['noalg_L1HT0-AJ0all.ETA49',   861, 'L1_HT0-AJ0all.ETA49',   [], [PhysicsStream], ["RATE:L1TopoStreamers", "BW:Other"], -1],
-        ['noalg_L1HT190-AJ15all.ETA20',   862, 'L1_HT190-AJ15all.ETA20',   [], [PhysicsStream], ["RATE:L1TopoStreamers", "BW:Other"], -1],
-        ['noalg_L1HT190-J15s5.ETA20',   863, 'L1_HT190-J15s5.ETA20',   [], [PhysicsStream], ["RATE:L1TopoStreamers", "BW:Other"], -1],
-        ['noalg_L1HT150-AJ20all.ETA30',  864, 'L1_HT150-AJ20all.ETA30',   [], [PhysicsStream], ["RATE:L1TopoStreamers", "BW:Other"], -1],
-        ['noalg_L1HT150-J20s5.ETA30',   865, 'L1_HT150-J20s5.ETA30',    [], [PhysicsStream], ["RATE:L1TopoStreamers", "BW:Other"], -1],
-
-        ['noalg_L1DPhi_AJsAJs',   3100, 'L1_DPhi_AJsAJs',   [], [PhysicsStream], ["RATE:L1TopoStreamers", "BW:Other"], -1 ], 
-        ['noalg_L1DPhi_EMsTAUs',   3101, 'L1_DPhi_EMsTAUs',   [], [PhysicsStream], ["RATE:L1TopoStreamers", "BW:Other"], -1 ], 
-        ['noalg_L1DEta_AJabAJab',   3102, 'L1_DEta_AJabAJab',   [], [PhysicsStream], ["RATE:L1TopoStreamers", "BW:Other"], -1 ], 
-        ['noalg_L1DEta_EMabTAUab',   3103, 'L1_DEta_EMabTAUab',   [], [PhysicsStream], ["RATE:L1TopoStreamers", "BW:Other"], -1 ], 
-        ['noalg_L12INVM999-2MU4ab',   3104, 'L1_2INVM999-2MU4ab',   [], [PhysicsStream], ["RATE:L1TopoStreamers", "BW:Other"], -1 ], 
-        ['noalg_L12INVM999-CMU4ab-MU4ab',   3105, 'L1_2INVM999-CMU4ab-MU4ab',   [], [PhysicsStream], ["RATE:L1TopoStreamers", "BW:Other"], -1 ], 
-        ['noalg_L12INVM999-2CMU4ab',   3106, 'L1_2INVM999-2CMU4ab',   [], [PhysicsStream], ["RATE:L1TopoStreamers", "BW:Other"], -1 ], 
-        ['noalg_L12INVM999-MU6ab-MU4ab',   3107, 'L1_2INVM999-MU6ab-MU4ab',   [], [PhysicsStream], ["RATE:L1TopoStreamers", "BW:Other"], -1 ], 
-        ['noalg_L12INVM999-CMU6ab-CMU4ab',   3108, 'L1_2INVM999-CMU6ab-CMU4ab',   [], [PhysicsStream], ["RATE:L1TopoStreamers", "BW:Other"], -1 ], 
-        ['noalg_L12INVM999-2MU6ab',   3109, 'L1_2INVM999-2MU6ab',   [], [PhysicsStream], ["RATE:L1TopoStreamers", "BW:Other"], -1 ], 
-        ['noalg_L14INVM8-2MU4ab',   3110, 'L1_4INVM8-2MU4ab',   [], [PhysicsStream], ["RATE:L1TopoStreamers", "BW:Other"], -1 ], 
-        ['noalg_L14INVM8-CMU4ab-MU4ab',   3111, 'L1_4INVM8-CMU4ab-MU4ab',   [], [PhysicsStream], ["RATE:L1TopoStreamers", "BW:Other"], -1 ], 
-        ['noalg_L14INVM8-2CMU4ab',   3112, 'L1_4INVM8-2CMU4ab',   [], [PhysicsStream], ["RATE:L1TopoStreamers", "BW:Other"], -1 ], 
-        ['noalg_L14INVM8-MU6ab-MU4ab',   3113, 'L1_4INVM8-MU6ab-MU4ab',   [], [PhysicsStream], ["RATE:L1TopoStreamers", "BW:Other"], -1 ], 
-        ['noalg_L14INVM8-CMU6ab-CMU4ab',   3114, 'L1_4INVM8-CMU6ab-CMU4ab',   [], [PhysicsStream], ["RATE:L1TopoStreamers", "BW:Other"], -1 ], 
-        ['noalg_L14INVM8-2MU6ab',   3115, 'L1_4INVM8-2MU6ab',   [], [PhysicsStream], ["RATE:L1TopoStreamers", "BW:Other"], -1 ], 
-        ['noalg_L12DR99-2MU4ab',   3116, 'L1_2DR99-2MU4ab',   [], [PhysicsStream], ["RATE:L1TopoStreamers", "BW:Other"], -1 ], 
-        ['noalg_L15DETA99-5DPHI99-2MU4ab',   3117, 'L1_5DETA99-5DPHI99-2MU4ab',   [], [PhysicsStream], ["RATE:L1TopoStreamers", "BW:Other"], -1 ], 
-        ['noalg_L15DETA99-5DPHI99-MU6ab-MU4ab',   3118, 'L1_5DETA99-5DPHI99-MU6ab-MU4ab',   [], [PhysicsStream], ["RATE:L1TopoStreamers", "BW:Other"], -1 ], 
-        ['noalg_L15DETA99-5DPHI99-2MU6ab',   3119, 'L1_5DETA99-5DPHI99-2MU6ab',   [], [PhysicsStream], ["RATE:L1TopoStreamers", "BW:Other"], -1 ], 
-        ['noalg_L10DR10-MU10ab-MU6ab',   3120, 'L1_0DR10-MU10ab-MU6ab',   [], [PhysicsStream], ["RATE:L1TopoStreamers", "BW:Other"], -1 ], 
-        ['noalg_L10DETA35-0DPHI25-EM8abi-MU10ab',   3121, 'L1_0DETA35-0DPHI25-EM8abi-MU10ab',   [], [PhysicsStream], ["RATE:L1TopoStreamers", "BW:Other"], -1 ], 
-        ['noalg_L10DETA35-0DPHI25-EM15abi-MUab',   3122, 'L1_0DETA35-0DPHI25-EM15abi-MUab',   [], [PhysicsStream], ["RATE:L1TopoStreamers", "BW:Other"], -1 ], 
-        ['noalg_L110MINDPHI-Js2-XE50',   3123, 'L1_10MINDPHI-Js2-XE50',   [], [PhysicsStream], ["RATE:L1TopoStreamers", "BW:Other"], -1 ], 
-        ['noalg_L110MINDPHI-J20s2-XE50',   3124, 'L1_10MINDPHI-J20s2-XE50',   [], [PhysicsStream], ["RATE:L1TopoStreamers", "BW:Other"], -1 ], 
-        ['noalg_L110MINDPHI-J20ab-XE50',   3125, 'L1_10MINDPHI-J20ab-XE50',   [], [PhysicsStream], ["RATE:L1TopoStreamers", "BW:Other"], -1 ], 
-        ['noalg_L110MINDPHI-CJ20ab-XE50',   3126, 'L1_10MINDPHI-CJ20ab-XE50',   [], [PhysicsStream], ["RATE:L1TopoStreamers", "BW:Other"], -1 ], 
-        ['noalg_L1400INVM9999-AJ30s6-AJ20s6',   3127, 'L1_400INVM9999-AJ30s6-AJ20s6',   [], [PhysicsStream], ["RATE:L1TopoStreamers", "BW:Other"], -1 ], 
-        ['noalg_L1350INVM9999-AJ30s6-AJ20s6',   3128, 'L1_350INVM9999-AJ30s6-AJ20s6',   [], [PhysicsStream], ["RATE:L1TopoStreamers", "BW:Other"], -1 ], 
-        ['noalg_L1300INVM9999-AJ30s6-AJ20s6',   3129, 'L1_300INVM9999-AJ30s6-AJ20s6',   [], [PhysicsStream], ["RATE:L1TopoStreamers", "BW:Other"], -1 ], 
-        ['noalg_L1200INVM9999-AJ30s6-AJ20s6',   3130, 'L1_200INVM9999-AJ30s6-AJ20s6',   [], [PhysicsStream], ["RATE:L1TopoStreamers", "BW:Other"], -1 ], 
-        ['noalg_L1350INVM9999-J30s6-J20s6',   3131, 'L1_350INVM9999-J30s6-J20s6',   [], [PhysicsStream], ["RATE:L1TopoStreamers", "BW:Other"], -1 ], 
-        ['noalg_L1300INVM9999-J30s6-J20s6',   3132, 'L1_300INVM9999-J30s6-J20s6',   [], [PhysicsStream], ["RATE:L1TopoStreamers", "BW:Other"], -1 ], 
-        ['noalg_L1250INVM9999-J30s6-J20s6',   3133, 'L1_250INVM9999-J30s6-J20s6',   [], [PhysicsStream], ["RATE:L1TopoStreamers", "BW:Other"], -1 ], 
-        ['noalg_L1200INVM9999-J30s6-J20s6',   3134, 'L1_200INVM9999-J30s6-J20s6',   [], [PhysicsStream], ["RATE:L1TopoStreamers", "BW:Other"], -1 ], 
-        ['noalg_L140DETA99-AJ30s6-AJ20s6',   3135, 'L1_40DETA99-AJ30s6-AJ20s6',   [], [PhysicsStream], ["RATE:L1TopoStreamers", "BW:Other"], -1 ], 
-        ['noalg_L140DETA99-J30s6-J20s6',   3136, 'L1_40DETA99-J30s6-J20s6',   [], [PhysicsStream], ["RATE:L1TopoStreamers", "BW:Other"], -1 ], 
-        ['noalg_L1HT150-AJj15all.ETA49',   3137, 'L1_HT150-AJj15all.ETA49',   [], [PhysicsStream], ["RATE:L1TopoStreamers", "BW:Other"], -1 ], 
-        ['noalg_L1HT20-AJj0all.ETA49',   3138, 'L1_HT20-AJj0all.ETA49',   [], [PhysicsStream], ["RATE:L1TopoStreamers", "BW:Other"], -1 ], 
-        ['noalg_L10DETA10-Js1-Js2',   3139, 'L1_0DETA10-Js1-Js2',   [], [PhysicsStream], ["RATE:L1TopoStreamers", "BW:Other"], -1 ], 
-        ['noalg_L10MATCH-4AJ20.ETA32-4AJj15',   3140, 'L1_0MATCH-4AJ20.ETA32-4AJj15',   [], [PhysicsStream], ["RATE:L1TopoStreamers", "BW:Other"], -1 ], 
-        ['noalg_L11INVM5-EMs2-EMall',   3141, 'L1_1INVM5-EMs2-EMall',   [], [PhysicsStream], ["RATE:L1TopoStreamers", "BW:Other"], -1 ], 
-        ['noalg_L11INVM5-EM7s2-EMall',   3142, 'L1_1INVM5-EM7s2-EMall',   [], [PhysicsStream], ["RATE:L1TopoStreamers", "BW:Other"], -1 ], 
-        ['noalg_L11INVM5-EM12s2-EMall',   3143, 'L1_1INVM5-EM12s2-EMall',   [], [PhysicsStream], ["RATE:L1TopoStreamers", "BW:Other"], -1 ], 
-        ['noalg_L110MINDPHI-AJj15s2-XE0',   3144, 'L1_10MINDPHI-AJj15s2-XE0',   [], [PhysicsStream], ["RATE:L1TopoStreamers", "BW:Other"], -1 ], 
-        ['noalg_L120MINDPHI-AJjs6-XE0',   3145, 'L1_20MINDPHI-AJjs6-XE0',   [], [PhysicsStream], ["RATE:L1TopoStreamers", "BW:Other"], -1 ], 
-        ['noalg_L120MINDPHI-AJj15s2-XE0',   3146, 'L1_20MINDPHI-AJj15s2-XE0',   [], [PhysicsStream], ["RATE:L1TopoStreamers", "BW:Other"], -1 ], 
-        ['noalg_L1NOT-02MATCH-EM9s1-AJj15all.ETA49',   3147, 'L1_NOT-02MATCH-EM9s1-AJj15all.ETA49',   [], [PhysicsStream], ["RATE:L1TopoStreamers", "BW:Other"], -1 ], 
-        ['noalg_L105RATIO-XE0-SUM0-EM9s1-HT0-AJj15all.ETA49',   3148, 'L1_05RATIO-XE0-SUM0-EM9s1-HT0-AJj15all.ETA49',   [], [PhysicsStream], ["RATE:L1TopoStreamers", "BW:Other"], -1 ], 
-        ['noalg_L110MINDPHI-EM6s1-XE0',   3149, 'L1_10MINDPHI-EM6s1-XE0',   [], [PhysicsStream], ["RATE:L1TopoStreamers", "BW:Other"], -1 ], 
-        ['noalg_L120MINDPHI-EM9s6-XE0',   3150, 'L1_20MINDPHI-EM9s6-XE0',   [], [PhysicsStream], ["RATE:L1TopoStreamers", "BW:Other"], -1 ], 
-        ['noalg_L120MINDPHI-EM6s1-XE0',   3151, 'L1_20MINDPHI-EM6s1-XE0',   [], [PhysicsStream], ["RATE:L1TopoStreamers", "BW:Other"], -1 ], 
-        ['noalg_L105RATIO-XE0-HT0-AJj15all.ETA49',   3152, 'L1_05RATIO-XE0-HT0-AJj15all.ETA49',   [], [PhysicsStream], ["RATE:L1TopoStreamers", "BW:Other"], -1 ], 
-        ['noalg_L108RATIO-XE0-HT0-AJj0all.ETA49',   3153, 'L1_08RATIO-XE0-HT0-AJj0all.ETA49',   [], [PhysicsStream], ["RATE:L1TopoStreamers", "BW:Other"], -1 ], 
-        ['noalg_L140RATIO2-XE0-HT0-AJj15all.ETA49',   3154, 'L1_40RATIO2-XE0-HT0-AJj15all.ETA49',   [], [PhysicsStream], ["RATE:L1TopoStreamers", "BW:Other"], -1 ], 
-        ['noalg_L190RATIO2-XE0-HT0-AJj0all.ETA49',   3155, 'L1_90RATIO2-XE0-HT0-AJj0all.ETA49',   [], [PhysicsStream], ["RATE:L1TopoStreamers", "BW:Other"], -1 ], 
-        ['noalg_L1210RATIO-0MATCH-TAU30si2-EMall',   3156, 'L1_210RATIO-0MATCH-TAU30si2-EMall',   [], [PhysicsStream], ["RATE:L1TopoStreamers", "BW:Other"], -1 ], 
-        ['noalg_L1NOT-0MATCH-TAU30si2-EMall',   3157, 'L1_NOT-0MATCH-TAU30si2-EMall',   [], [PhysicsStream], ["RATE:L1TopoStreamers", "BW:Other"], -1 ], 
-        ['noalg_L10DR28-MU10ab-TAU12abi',   3158, 'L1_0DR28-MU10ab-TAU12abi',   [], [PhysicsStream], ["RATE:L1TopoStreamers", "BW:Other"], -1 ], 
-        ['noalg_L11DISAMB-TAU12abi-J25ab',   3159, 'L1_1DISAMB-TAU12abi-J25ab',   [], [PhysicsStream], ["RATE:L1TopoStreamers", "BW:Other"], -1 ], 
-        ['noalg_L1DISAMB-EM15abhi-TAU40ab',   3160, 'L1_DISAMB-EM15abhi-TAU40ab',   [], [PhysicsStream], ["RATE:L1TopoStreamers", "BW:Other"], -1 ], 
-        ['noalg_L11DISAMB-TAU20ab-J20ab',   3161, 'L1_1DISAMB-TAU20ab-J20ab',   [], [PhysicsStream], ["RATE:L1TopoStreamers", "BW:Other"], -1 ], 
-        ['noalg_L1DISAMB-EM15abhi-TAU12abi',   3162, 'L1_DISAMB-EM15abhi-TAU12abi',   [], [PhysicsStream], ["RATE:L1TopoStreamers", "BW:Other"], -1 ], 
-        ['noalg_L11DISAMB-EM15his2-TAU12abi-J25ab',   3163, 'L1_1DISAMB-EM15his2-TAU12abi-J25ab',   [], [PhysicsStream], ["RATE:L1TopoStreamers", "BW:Other"], -1 ], 
-        ['noalg_L11DISAMB-J25ab-0DR28-EM15his2-TAU12abi',   3164, 'L1_1DISAMB-J25ab-0DR28-EM15his2-TAU12abi',   [], [PhysicsStream], ["RATE:L1TopoStreamers", "BW:Other"], -1 ], 
-        ['noalg_L11DISAMB-TAU20abi-TAU12abi-J25ab',   3165, 'L1_1DISAMB-TAU20abi-TAU12abi-J25ab',   [], [PhysicsStream], ["RATE:L1TopoStreamers", "BW:Other"], -1 ], 
-        ['noalg_L10DR28-TAU20abi-TAU12abi',   3166, 'L1_0DR28-TAU20abi-TAU12abi',   [], [PhysicsStream], ["RATE:L1TopoStreamers", "BW:Other"], -1 ], 
-        ['noalg_L10DETA20-0DPHI20-TAU20abi-TAU12abi',   3167, 'L1_0DETA20-0DPHI20-TAU20abi-TAU12abi',   [], [PhysicsStream], ["RATE:L1TopoStreamers", "BW:Other"], -1 ], 
-        ['noalg_L11DISAMB-J25ab-0DR28-TAU20abi-TAU12abi',   3168, 'L1_1DISAMB-J25ab-0DR28-TAU20abi-TAU12abi',   [], [PhysicsStream], ["RATE:L1TopoStreamers", "BW:Other"], -1 ], 
-        ['noalg_L1LAR-EM50s1',   3169, 'L1_LAR-EM50s1',   [], [PhysicsStream], ["RATE:L1TopoStreamers", "BW:Other"], -1 ], 
-        ['noalg_L1LAR-J100s1',   3170, 'L1_LAR-J100s1',   [], [PhysicsStream], ["RATE:L1TopoStreamers", "BW:Other"], -1 ], 
-        ['noalg_L12DR15-2MU4ab',   3171, 'L1_2DR15-2MU4ab',   [], [PhysicsStream], ["RATE:L1TopoStreamers", "BW:Other"], -1 ], 
-        ['noalg_L12DR15-CMU4ab-MU4ab',   3172, 'L1_2DR15-CMU4ab-MU4ab',   [], [PhysicsStream], ["RATE:L1TopoStreamers", "BW:Other"], -1 ], 
-        ['noalg_L12DR15-2CMU4ab',   3173, 'L1_2DR15-2CMU4ab',   [], [PhysicsStream], ["RATE:L1TopoStreamers", "BW:Other"], -1 ], 
-        ['noalg_L12DR15-MU6ab-MU4ab',   3174, 'L1_2DR15-MU6ab-MU4ab',   [], [PhysicsStream], ["RATE:L1TopoStreamers", "BW:Other"], -1 ], 
-        ['noalg_L12DR15-CMU6ab-CMU4ab',   3175, 'L1_2DR15-CMU6ab-CMU4ab',   [], [PhysicsStream], ["RATE:L1TopoStreamers", "BW:Other"], -1 ], 
-        ['noalg_L12DR15-2MU6ab',   3176, 'L1_2DR15-2MU6ab',   [], [PhysicsStream], ["RATE:L1TopoStreamers", "BW:Other"], -1 ], 
+        ['noalg_L1HT0-AJ0all.ETA49',     'L1_HT0-AJ0all.ETA49',   [], [PhysicsStream], ["RATE:L1TopoStreamers", "BW:Other"], -1],
+        ['noalg_L1HT190-AJ15all.ETA20',  'L1_HT190-AJ15all.ETA20',   [], [PhysicsStream], ["RATE:L1TopoStreamers", "BW:Other"], -1],
+        ['noalg_L1HT190-J15s5.ETA20',    'L1_HT190-J15s5.ETA20',   [], [PhysicsStream], ["RATE:L1TopoStreamers", "BW:Other"], -1],
+        ['noalg_L1HT150-AJ20all.ETA30',  'L1_HT150-AJ20all.ETA30',   [], [PhysicsStream], ["RATE:L1TopoStreamers", "BW:Other"], -1],
+        ['noalg_L1HT150-J20s5.ETA30',    'L1_HT150-J20s5.ETA30',    [], [PhysicsStream], ["RATE:L1TopoStreamers", "BW:Other"], -1],
+
+        ['noalg_L1DPhi_AJsAJs',        'L1_DPhi_AJsAJs',   [], [PhysicsStream], ["RATE:L1TopoStreamers", "BW:Other"], -1 ], 
+        ['noalg_L1DPhi_EMsTAUs',       'L1_DPhi_EMsTAUs',   [], [PhysicsStream], ["RATE:L1TopoStreamers", "BW:Other"], -1 ], 
+        ['noalg_L1DEta_AJabAJab',      'L1_DEta_AJabAJab',   [], [PhysicsStream], ["RATE:L1TopoStreamers", "BW:Other"], -1 ], 
+        ['noalg_L1DEta_EMabTAUab',     'L1_DEta_EMabTAUab',   [], [PhysicsStream], ["RATE:L1TopoStreamers", "BW:Other"], -1 ], 
+        ['noalg_L12INVM999-2MU4ab',    'L1_2INVM999-2MU4ab',   [], [PhysicsStream], ["RATE:L1TopoStreamers", "BW:Other"], -1 ], 
+        ['noalg_L12INVM999-CMU4ab-MU4ab',    'L1_2INVM999-CMU4ab-MU4ab',   [], [PhysicsStream], ["RATE:L1TopoStreamers", "BW:Other"], -1 ], 
+        ['noalg_L12INVM999-2CMU4ab',         'L1_2INVM999-2CMU4ab',   [], [PhysicsStream], ["RATE:L1TopoStreamers", "BW:Other"], -1 ], 
+        ['noalg_L12INVM999-MU6ab-MU4ab',     'L1_2INVM999-MU6ab-MU4ab',   [], [PhysicsStream], ["RATE:L1TopoStreamers", "BW:Other"], -1 ], 
+        ['noalg_L12INVM999-CMU6ab-CMU4ab',   'L1_2INVM999-CMU6ab-CMU4ab',   [], [PhysicsStream], ["RATE:L1TopoStreamers", "BW:Other"], -1 ], 
+        ['noalg_L12INVM999-2MU6ab',          'L1_2INVM999-2MU6ab',   [], [PhysicsStream], ["RATE:L1TopoStreamers", "BW:Other"], -1 ], 
+        ['noalg_L14INVM8-2MU4ab',            'L1_4INVM8-2MU4ab',   [], [PhysicsStream], ["RATE:L1TopoStreamers", "BW:Other"], -1 ], 
+        ['noalg_L14INVM8-CMU4ab-MU4ab',      'L1_4INVM8-CMU4ab-MU4ab',   [], [PhysicsStream], ["RATE:L1TopoStreamers", "BW:Other"], -1 ], 
+        ['noalg_L14INVM8-2CMU4ab',           'L1_4INVM8-2CMU4ab',   [], [PhysicsStream], ["RATE:L1TopoStreamers", "BW:Other"], -1 ], 
+        ['noalg_L14INVM8-MU6ab-MU4ab',       'L1_4INVM8-MU6ab-MU4ab',   [], [PhysicsStream], ["RATE:L1TopoStreamers", "BW:Other"], -1 ], 
+        ['noalg_L14INVM8-CMU6ab-CMU4ab',     'L1_4INVM8-CMU6ab-CMU4ab',   [], [PhysicsStream], ["RATE:L1TopoStreamers", "BW:Other"], -1 ], 
+        ['noalg_L14INVM8-2MU6ab',            'L1_4INVM8-2MU6ab',   [], [PhysicsStream], ["RATE:L1TopoStreamers", "BW:Other"], -1 ], 
+        ['noalg_L12DR99-2MU4ab',             'L1_2DR99-2MU4ab',   [], [PhysicsStream], ["RATE:L1TopoStreamers", "BW:Other"], -1 ], 
+        ['noalg_L15DETA99-5DPHI99-2MU4ab',   'L1_5DETA99-5DPHI99-2MU4ab',   [], [PhysicsStream], ["RATE:L1TopoStreamers", "BW:Other"], -1 ], 
+        ['noalg_L15DETA99-5DPHI99-MU6ab-MU4ab',  'L1_5DETA99-5DPHI99-MU6ab-MU4ab',   [], [PhysicsStream], ["RATE:L1TopoStreamers", "BW:Other"], -1 ], 
+        ['noalg_L15DETA99-5DPHI99-2MU6ab',    'L1_5DETA99-5DPHI99-2MU6ab',   [], [PhysicsStream], ["RATE:L1TopoStreamers", "BW:Other"], -1 ], 
+        ['noalg_L10DR10-MU10ab-MU6ab',    'L1_0DR10-MU10ab-MU6ab',   [], [PhysicsStream], ["RATE:L1TopoStreamers", "BW:Other"], -1 ], 
+        ['noalg_L10DETA04-0DPHI03-EM8abi-MU10ab',  'L1_0DETA04-0DPHI03-EM8abi-MU10ab',   [], [PhysicsStream], ["RATE:L1TopoStreamers", "BW:Other"], -1 ], 
+        ['noalg_L10DETA04-0DPHI03-EM15abi-MUab',    'L1_0DETA04-0DPHI03-EM15abi-MUab',   [], [PhysicsStream], ["RATE:L1TopoStreamers", "BW:Other"], -1 ], 
+        ['noalg_L110MINDPHI-Js2-XE50',   'L1_10MINDPHI-Js2-XE50',   [], [PhysicsStream], ["RATE:L1TopoStreamers", "BW:Other"], -1 ], 
+        ['noalg_L110MINDPHI-J20s2-XE50',   'L1_10MINDPHI-J20s2-XE50',   [], [PhysicsStream], ["RATE:L1TopoStreamers", "BW:Other"], -1 ], 
+        ['noalg_L110MINDPHI-J20ab-XE50',   'L1_10MINDPHI-J20ab-XE50',   [], [PhysicsStream], ["RATE:L1TopoStreamers", "BW:Other"], -1 ], 
+        ['noalg_L110MINDPHI-CJ20ab-XE50',   'L1_10MINDPHI-CJ20ab-XE50',   [], [PhysicsStream], ["RATE:L1TopoStreamers", "BW:Other"], -1 ], 
+        ['noalg_L1400INVM9999-AJ30s6-AJ20s6',   'L1_400INVM9999-AJ30s6-AJ20s6',   [], [PhysicsStream], ["RATE:L1TopoStreamers", "BW:Other"], -1 ], 
+        ['noalg_L1350INVM9999-AJ30s6-AJ20s6',   'L1_350INVM9999-AJ30s6-AJ20s6',   [], [PhysicsStream], ["RATE:L1TopoStreamers", "BW:Other"], -1 ], 
+        ['noalg_L1300INVM9999-AJ30s6-AJ20s6',   'L1_300INVM9999-AJ30s6-AJ20s6',   [], [PhysicsStream], ["RATE:L1TopoStreamers", "BW:Other"], -1 ], 
+        ['noalg_L1200INVM9999-AJ30s6-AJ20s6',   'L1_200INVM9999-AJ30s6-AJ20s6',   [], [PhysicsStream], ["RATE:L1TopoStreamers", "BW:Other"], -1 ], 
+        #['noalg_L1350INVM9999-J30s6-J20s6',   'L1_350INVM9999-J30s6-J20s6',   [], [PhysicsStream], ["RATE:L1TopoStreamers", "BW:Other"], -1 ], 
+        #['noalg_L1300INVM9999-J30s6-J20s6',   'L1_300INVM9999-J30s6-J20s6',   [], [PhysicsStream], ["RATE:L1TopoStreamers", "BW:Other"], -1 ], 
+        #['noalg_L1250INVM9999-J30s6-J20s6',   'L1_250INVM9999-J30s6-J20s6',   [], [PhysicsStream], ["RATE:L1TopoStreamers", "BW:Other"], -1 ], 
+        #['noalg_L1200INVM9999-J30s6-J20s6',   'L1_200INVM9999-J30s6-J20s6',   [], [PhysicsStream], ["RATE:L1TopoStreamers", "BW:Other"], -1 ], 
+        ['noalg_L140DETA99-AJ30s6-AJ20s6',   'L1_40DETA99-AJ30s6-AJ20s6',   [], [PhysicsStream], ["RATE:L1TopoStreamers", "BW:Other"], -1 ], 
+        ['noalg_L140DETA99-J30s6-J20s6',    'L1_40DETA99-J30s6-J20s6',   [], [PhysicsStream], ["RATE:L1TopoStreamers", "BW:Other"], -1 ], 
+        ['noalg_L1HT150-AJj15all.ETA49',    'L1_HT150-AJj15all.ETA49',   [], [PhysicsStream], ["RATE:L1TopoStreamers", "BW:Other"], -1 ], 
+        ['noalg_L1HT20-AJj0all.ETA49',      'L1_HT20-AJj0all.ETA49',   [], [PhysicsStream], ["RATE:L1TopoStreamers", "BW:Other"], -1 ], 
+        #['noalg_L10DETA10-Js1-Js2',         'L1_0DETA10-Js1-Js2',   [], [PhysicsStream], ["RATE:L1TopoStreamers", "BW:Other"], -1 ], # moved to physics
+        ['noalg_L10MATCH-4AJ20.ETA32-4AJj15',   'L1_0MATCH-4AJ20.ETA32-4AJj15',   [], [PhysicsStream], ["RATE:L1TopoStreamers", "BW:Other"], -1 ], 
+        ['noalg_L11INVM5-EMs2-EMall',     'L1_1INVM5-EMs2-EMall',   [], [PhysicsStream], ["RATE:L1TopoStreamers", "BW:Other"], -1 ], #moved to physics
+        ['noalg_L11INVM5-EM6s2-EMall',    'L1_1INVM5-EM6s2-EMall',   [], [PhysicsStream], ["RATE:L1TopoStreamers", "BW:Other"], -1 ],
+        ['noalg_L11INVM5-EM7s2-EMall',    'L1_1INVM5-EM7s2-EMall',   [], [PhysicsStream], ["RATE:L1TopoStreamers", "BW:Other"], -1 ], 
+        ['noalg_L11INVM5-EM12s2-EMall',   'L1_1INVM5-EM12s2-EMall',   [], [PhysicsStream], ["RATE:L1TopoStreamers", "BW:Other"], -1 ], #moved to physics
+        ['noalg_L110MINDPHI-AJj15s2-XE0',    'L1_10MINDPHI-AJj15s2-XE0',   [], [PhysicsStream], ["RATE:L1TopoStreamers", "BW:Other"], -1 ], 
+        ['noalg_L120MINDPHI-AJjs6-XE0',      'L1_20MINDPHI-AJjs6-XE0',   [], [PhysicsStream], ["RATE:L1TopoStreamers", "BW:Other"], -1 ], 
+        ['noalg_L120MINDPHI-AJj15s2-XE0',    'L1_20MINDPHI-AJj15s2-XE0',   [], [PhysicsStream], ["RATE:L1TopoStreamers", "BW:Other"], -1 ], 
+        ['noalg_L1NOT-02MATCH-EM9s1-AJj15all.ETA49',  'L1_NOT-02MATCH-EM9s1-AJj15all.ETA49',   [], [PhysicsStream], ["RATE:L1TopoStreamers", "BW:Other"], -1 ], 
+        ['noalg_L105RATIO-XE0-SUM0-EM9s1-HT0-AJj15all.ETA49',  'L1_05RATIO-XE0-SUM0-EM9s1-HT0-AJj15all.ETA49',   [], [PhysicsStream], ["RATE:L1TopoStreamers", "BW:Other"], -1 ], 
+        ['noalg_L110MINDPHI-EM6s1-XE0',   'L1_10MINDPHI-EM6s1-XE0',   [], [PhysicsStream], ["RATE:L1TopoStreamers", "BW:Other"], -1 ], 
+        ['noalg_L120MINDPHI-EM9s6-XE0',   'L1_20MINDPHI-EM9s6-XE0',   [], [PhysicsStream], ["RATE:L1TopoStreamers", "BW:Other"], -1 ], 
+        ['noalg_L120MINDPHI-EM6s1-XE0',   'L1_20MINDPHI-EM6s1-XE0',   [], [PhysicsStream], ["RATE:L1TopoStreamers", "BW:Other"], -1 ], 
+        ['noalg_L105RATIO-XE0-HT0-AJj15all.ETA49',    'L1_05RATIO-XE0-HT0-AJj15all.ETA49',   [], [PhysicsStream], ["RATE:L1TopoStreamers", "BW:Other"], -1 ], 
+        ['noalg_L108RATIO-XE0-HT0-AJj0all.ETA49',     'L1_08RATIO-XE0-HT0-AJj0all.ETA49',   [], [PhysicsStream], ["RATE:L1TopoStreamers", "BW:Other"], -1 ], 
+        ['noalg_L140RATIO2-XE0-HT0-AJj15all.ETA49',   'L1_40RATIO2-XE0-HT0-AJj15all.ETA49',   [], [PhysicsStream], ["RATE:L1TopoStreamers", "BW:Other"], -1 ], 
+        ['noalg_L190RATIO2-XE0-HT0-AJj0all.ETA49',    'L1_90RATIO2-XE0-HT0-AJj0all.ETA49',   [], [PhysicsStream], ["RATE:L1TopoStreamers", "BW:Other"], -1 ], 
+        ['noalg_L1210RATIO-0MATCH-TAU30si2-EMall',    'L1_210RATIO-0MATCH-TAU30si2-EMall',   [], [PhysicsStream], ["RATE:L1TopoStreamers", "BW:Other"], -1 ], 
+        ['noalg_L1NOT-0MATCH-TAU30si2-EMall',    'L1_NOT-0MATCH-TAU30si2-EMall',   [], [PhysicsStream], ["RATE:L1TopoStreamers", "BW:Other"], -1 ], 
+        ['noalg_L10DR28-MU10ab-TAU12abi',        'L1_0DR28-MU10ab-TAU12abi',   [], [PhysicsStream], ["RATE:L1TopoStreamers", "BW:Other"], -1 ], 
+        ['noalg_L11DISAMB-TAU12abi-J25ab',       'L1_1DISAMB-TAU12abi-J25ab',   [], [PhysicsStream], ["RATE:L1TopoStreamers", "BW:Other"], -1 ], 
+        ['noalg_L1DISAMB-EM15abhi-TAU40ab',      'L1_DISAMB-EM15abhi-TAU40ab',   [], [PhysicsStream], ["RATE:L1TopoStreamers", "BW:Other"], -1 ], 
+        ['noalg_L11DISAMB-TAU20ab-J20ab',        'L1_1DISAMB-TAU20ab-J20ab',   [], [PhysicsStream], ["RATE:L1TopoStreamers", "BW:Other"], -1 ], 
+        ['noalg_L1DISAMB-EM15abhi-TAU12abi',     'L1_DISAMB-EM15abhi-TAU12abi',   [], [PhysicsStream], ["RATE:L1TopoStreamers", "BW:Other"], -1 ], 
+        ['noalg_L11DISAMB-EM15his2-TAU12abi-J25ab',   'L1_1DISAMB-EM15his2-TAU12abi-J25ab',   [], [PhysicsStream], ["RATE:L1TopoStreamers", "BW:Other"], -1 ], 
+        ['noalg_L11DISAMB-J25ab-0DR28-EM15his2-TAU12abi',   'L1_1DISAMB-J25ab-0DR28-EM15his2-TAU12abi',   [], [PhysicsStream], ["RATE:L1TopoStreamers", "BW:Other"], -1 ], 
+        ['noalg_L11DISAMB-TAU20abi-TAU12abi-J25ab',    'L1_1DISAMB-TAU20abi-TAU12abi-J25ab',   [], [PhysicsStream], ["RATE:L1TopoStreamers", "BW:Other"], -1 ], 
+        ['noalg_L10DR28-TAU20abi-TAU12abi',   'L1_0DR28-TAU20abi-TAU12abi',   [], [PhysicsStream], ["RATE:L1TopoStreamers", "BW:Other"], -1 ], 
+        ['noalg_L10DETA20-0DPHI20-TAU20abi-TAU12abi',   'L1_0DETA20-0DPHI20-TAU20abi-TAU12abi',   [], [PhysicsStream], ["RATE:L1TopoStreamers", "BW:Other"], -1 ], 
+        ['noalg_L11DISAMB-J25ab-0DR28-TAU20abi-TAU12abi', 'L1_1DISAMB-J25ab-0DR28-TAU20abi-TAU12abi',   [], [PhysicsStream], ["RATE:L1TopoStreamers", "BW:Other"], -1 ], 
+        ['noalg_L1LAR-EM50s1',      'L1_LAR-EM50s1',   [], [PhysicsStream], ["RATE:L1TopoStreamers", "BW:Other"], -1 ], 
+        ['noalg_L1LAR-J100s1',      'L1_LAR-J100s1',   [], [PhysicsStream], ["RATE:L1TopoStreamers", "BW:Other"], -1 ], 
+        ['noalg_L12DR15-2MU4ab',    'L1_2DR15-2MU4ab',   [], [PhysicsStream], ["RATE:L1TopoStreamers", "BW:Other"], -1 ], 
+        ['noalg_L12DR15-CMU4ab-MU4ab',    'L1_2DR15-CMU4ab-MU4ab',   [], [PhysicsStream], ["RATE:L1TopoStreamers", "BW:Other"], -1 ], 
+        ['noalg_L12DR15-2CMU4ab',         'L1_2DR15-2CMU4ab',   [], [PhysicsStream], ["RATE:L1TopoStreamers", "BW:Other"], -1 ], 
+        ['noalg_L12DR15-MU6ab-MU4ab',     'L1_2DR15-MU6ab-MU4ab',   [], [PhysicsStream], ["RATE:L1TopoStreamers", "BW:Other"], -1 ], 
+        ['noalg_L12DR15-CMU6ab-CMU4ab',   'L1_2DR15-CMU6ab-CMU4ab',   [], [PhysicsStream], ["RATE:L1TopoStreamers", "BW:Other"], -1 ], 
+        ['noalg_L12DR15-2MU6ab',          'L1_2DR15-2MU6ab',   [], [PhysicsStream], ["RATE:L1TopoStreamers", "BW:Other"], -1 ], 
         
         ]
 
@@ -1834,6 +1887,8 @@ Prescales.HLTPrescales_special_mc_prescale.update({
     'e24_vloose_L1EM20VH_4j20noL1'          : [    5,    0,   -1],
     'e24_vloose_L1EM20VH_5j15noL1'          : [    5,    0,   -1],
     'e24_vloose_L1EM20VH_6j15noL1'          : [    5,    0,   -1],
+    'e24_lhtight_L1EM20VH_e15_etcut_Zee'    : [    5,    0,   -1],
+    'e24_tight_L1EM20VH_e15_etcut_Zee'      : [    5,    0,   -1],
     'e25_etcut_L1EM15'                      : [    5,    0,   -1],
     'e25_lhvloose_L1EM15'                   : [    5,    0,   -1],
     'e25_vloose_L1EM15'                     : [    5,    0,   -1],
@@ -1850,6 +1905,8 @@ Prescales.HLTPrescales_special_mc_prescale.update({
     'e26_vloose_L1EM20VH_4j20noL1'          : [    5,    0,   -1],
     'e26_vloose_L1EM20VH_5j15noL1'          : [    5,    0,   -1],
     'e26_vloose_L1EM20VH_6j15noL1'          : [    5,    0,   -1],
+    'e26_lhtight_e15_etcut_Zee'             : [    5,    0,   -1],
+    'e26_tight_e15_etcut_Zee'               : [    5,    0,   -1],
     'e30_etcut_L1EM15'                      : [    5,    0,   -1],
     'e30_lhvloose_L1EM15'                   : [    5,    0,   -1],
     'e30_vloose_L1EM15'                     : [    5,    0,   -1],
@@ -1907,7 +1964,6 @@ Prescales.HLTPrescales_special_mc_prescale.update({
     'g0_hiptrt_L1EM20VH'                    : [    5,    0,   -1],
     'g0_hiptrt_L1EM20VHI'                   : [    5,    0,   -1],
     'g0_hiptrt_L1EM22VHLIL'                 : [    5,    0,   -1],
-    'g0_hiptrt_L1EM50V'                     : [    5,    0,   -1],
     'g0_perf_L1EM15'                        : [    5,    0,   -1],
     'g0_perf_L1EM3'                         : [    5,    0,   -1],
     'g10_loose'                             : [    5,    0,   -1],
@@ -1979,13 +2035,13 @@ Prescales.HLTPrescales_special_mc_prescale.update({
     'j55_boffperf'                          : [    5,    0,   -1],
     'j55_bperf'                             : [    5,    0,   -1],
     'j55_bperf_split'                       : [    5,    0,   -1],
-    'j65_btight_3j65_L13J25.0ETA22'         : [    5,    0,   -1],
+    'j65_btight_3j65_L13J25.0ETA23'         : [    5,    0,   -1],
     'j65_btight_3j65_L14J15.0ETA24'         : [    5,    0,   -1],
-    'j65_btight_split_3j65_L13J25.0ETA22'   : [    5,    0,   -1],
+    'j65_btight_split_3j65_L13J25.0ETA23'   : [    5,    0,   -1],
     'j65_btight_split_3j65_L14J15.0ETA24'   : [    5,    0,   -1],
-    'j70_bmedium_3j70_L13J25.0ETA22'        : [    5,    0,   -1],
+    'j70_bmedium_3j70_L13J25.0ETA23'        : [    5,    0,   -1],
     'j70_bmedium_3j70_L14J15.0ETA24'        : [    5,    0,   -1],
-    'j70_bmedium_split_3j70_L13J25.0ETA22'  : [    5,    0,   -1],
+    'j70_bmedium_split_3j70_L13J25.0ETA23'  : [    5,    0,   -1],
     'j70_bmedium_split_3j70_L14J15.0ETA24'  : [    5,    0,   -1],
     'j70_btight_3j70'                       : [    5,    0,   -1],
     'j70_btight_split_3j70'                 : [    5,    0,   -1],
@@ -2001,13 +2057,13 @@ Prescales.HLTPrescales_special_mc_prescale.update({
     'j225_bloose_split'                     : [    5,    0,   -1],
     'j300_bloose'                           : [    5,    0,   -1],
     'j300_bloose_split'                     : [    5,    0,   -1],
-    '2j35_btight_2j35_L13J25.0ETA22'        : [    5,    0,   -1],
+    '2j35_btight_2j35_L13J25.0ETA23'        : [    5,    0,   -1],
     '2j35_btight_2j35_L14J15.0ETA24'        : [    5,    0,   -1],
-    '2j35_btight_split_2j35_L13J25.0ETA22'  : [    5,    0,   -1],
+    '2j35_btight_split_2j35_L13J25.0ETA23'  : [    5,    0,   -1],
     '2j35_btight_split_2j35_L14J15.0ETA24'  : [    5,    0,   -1],
-    '2j45_bmedium_2j45_L13J25.0ETA22'       : [    5,    0,   -1],
+    '2j45_bmedium_2j45_L13J25.0ETA23'       : [    5,    0,   -1],
     '2j45_bmedium_2j45_L14J15.0ETA24'       : [    5,    0,   -1],
-    '2j45_bmedium_split_2j45_L13J25.0ETA22' : [    5,    0,   -1],
+    '2j45_bmedium_split_2j45_L13J25.0ETA23' : [    5,    0,   -1],
     '2j45_bmedium_split_2j45_L14J15.0ETA24' : [    5,    0,   -1],
     '2j45_btight_2j45'                      : [    5,    0,   -1],
     '2j45_btight_split_2j45'                : [    5,    0,   -1],
diff --git a/Trigger/TriggerCommon/TriggerMenu/python/menu/MenuUtil.py b/Trigger/TriggerCommon/TriggerMenu/python/menu/MenuUtil.py
index 56e3d7826f0..47464629505 100755
--- a/Trigger/TriggerCommon/TriggerMenu/python/menu/MenuUtil.py
+++ b/Trigger/TriggerCommon/TriggerMenu/python/menu/MenuUtil.py
@@ -1,15 +1,11 @@
 # Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
 
-from TriggerMenu.menu.Lvl1       import Lvl1
-from TriggerMenu.menu.Lvl1Flags  import Lvl1Flags
 from TriggerJobOpts.TriggerFlags import TriggerFlags
 from AthenaCommon.Logging        import logging
 
 log = logging.getLogger('TriggerMenu.menu.MenuUtil.py')
 
-def applyLVL1Prescale(triggerPythonConfig, L1Prescales):
-    Lvl1.updateItemPrescales(triggerPythonConfig, L1Prescales)
-    
+
 def applyHLTPrescale(triggerPythonConfig, HLTPrescale):
     for item, prescales in HLTPrescale.iteritems():
         # prescales is a list of 3 integers [HLT_prescale, HLT_pass_through, rerun_prescale]
@@ -73,148 +69,85 @@ def checkStreamConsistency(triggerPythonConfig):
     log.info( "Menu: " + menu_name)
     CheckGroups=False
 
-    allStreams=['UPC',
-                'TRTMonitoring',
-                'WarmStart',      
-                'ZeroBias',       
-                'CosmicCalo',     
-                'ZeroBiasOverlay',
-                'CosmicMuons',
-                'CosmicCalo',
-                'IDCosmic',
-                'IDMonitoring',
-                'IDTracks',
-                'Muon_Calibration',
-                'Standby',   
-                'Background',
-                'MinBias',
-                'MinBiasOverlay',
-                'ALFA',
-                'Bphysics',
-                'physics',
-                'express',
-                'Tile',
-                'L1Muon',
-                'L1MinBias',
-                'EnhancedBias',
-                'LArCells',
-                'LArCellsEmpty',
-                'DISCARD',
-                'EFCostMonitoring',
-                'HLTPassthrough',
-                'beamspot',
-                'PixelBeam',
-                'PixelNoise',
-                'VdM',
-                'L2CostMonitoring',
-                'SCTNoise',
-                'ALFACalib',
-                'L1Calo',     
-                'L1CaloCalib',     
-                ]
+    from TriggerMenu.menu.StreamInfo       import getAllStreams
+
+    allStreams = getAllStreams()
+#    allStreams=['UPC',
+#                'TRTMonitoring',
+#                'WarmStart',      
+#                'ZeroBias',       
+#                'CosmicCalo',     
+#                'ZeroBiasOverlay',
+#                'CosmicMuons',
+#                'CosmicCalo',
+#                'IDCosmic',
+#                'IDMonitoring',
+#                'IDTracks',
+#                'Muon_Calibration',
+#                'Standby',   
+#                'Background',
+#                'MinBias',
+#                'MinBiasOverlay',
+#                'ALFA',
+#                'Bphysics',
+#                'physics',
+#                'express',
+#                'Tile',
+#                'L1Muon',
+#                'L1MinBias',
+#                'EnhancedBias',
+#                'LArCells',
+#                'LArCellsEmpty',
+#                'DISCARD',
+#                'EFCostMonitoring',
+#                'HLTPassthrough',
+#                'beamspot',
+#                'PixelBeam',
+#                'PixelNoise',
+#                'VdM',
+#                'L2CostMonitoring',
+#                'SCTNoise',
+#                'ALFACalib',
+#                'L1Calo',     
+#                'L1CaloCalib',     
+#                ]
 
     #allStreams.extend(streamConfig)
 
-    for chain in triggerPythonConfig.theL2HLTChains + triggerPythonConfig.theEFHLTChains:
+    ##Check that all the streams associated to the chains exists
+    ##Chech that there is no duplication of ROB_ID for the ds streams used in a specific menu
+    already_used_robs={}
+    for chain in triggerPythonConfig.theHLTChains:
         if len(chain.stream_tag) == 0:
-            logger().error( "IN CHAIN: STREAMTAG undefined for chain: " + str(chain.chain_name) )
+            log.error( "IN CHAIN: STREAMTAG undefined for chain: " + str(chain.chain_name) )
         else:
             for stream in chain.stream_tag:
-                if stream[0] in allStreams:
-                    continue
-                else:
+                if stream[0] not in allStreams:
                     log.error(' Chain: ' + chain.chain_name + ' has the wrong streamer ' + stream[0])
-                
-
+                else:
+                    ##check data scouting streaming name
+                    if "DataScouting" in stream[0]:
+                        rob_id= stream[0].split("_")[1]                        
+                        if rob_id  in already_used_robs and stream[0] is not already_used_robs[rob_id]:
+                            log.error( "Duplicated ROB in stream " + stream[0] + 
+                                       "(ROB number " + str(stream[0].split("_")[1]) + " already used in stream " +  already_used_robs[stream[0].split("_")[1]] + ")")
+                            already_used_robs[rob_id]=stream[0]
+                        else:                 
+                            already_used_robs[rob_id]=stream[0] 
 
-def getJetWeights(triggerPythonConfig, use_fj=False):
-    jw = []
-    jthr, fjthr = [], []
-    def thr2weights(thrs, factor=1.25):
-        n = len(thrs)
-        # need to skip any turned-off thresholds
-        use = []
-        for i in range(n):
-            if thrs[i]<1023:
-               use.append(1)
+    
+    ##Chech that there is no duplication of ROB_ID for the ds streams defined in the all TM
+    already_used_robs={}
+    for stream in allStreams:
+        if "DataScouting" in stream:
+            rob_id= stream.split("_")[1]                        
+            if rob_id  in already_used_robs:
+                log.error( "Duplicated ROB in stream " + stream + 
+                           "(ROB number " + str(rob_id) + " already used in stream " +  already_used_robs[rob_id] + ")")
+                already_used_robs[rob_id]=stream
             else:
-               use.append(0)
-        # allow for thresholds being out of order
-        index = order(thrs)
-        # compute weights
-        sum = 0
-        weights = [0]*n
-        for j in range(n):
-            w = 0
-            if use[index[j]]>0:
-                jnext = j + 1
-                while (jnext < n and use[index[jnext]]==0):
-                    jnext = jnext + 1
-                if (jnext < n):
-                    w = int( (thrs[index[j]]+thrs[index[jnext]]+1)/2.0) - sum
-                else:  
-                    w = int(thrs[index[j]]*factor - sum)
-            weights[index[j]]=w
-            sum += w
-        return weights
-#
-    def order(thrs): 
-        n = len(thrs)
-        thr1 = list(thrs)
-        thr2 = sorted(thrs)
-        index = []
-        for i in range(n):
-            val = thr2[i]
-            pos = thr1.index(val)
-            index.append(pos)
-            if (thr1.count(val)>1):
-                thr1[pos] = -thr1[pos]
-        return index
-#
-    l1_thrs = triggerPythonConfig.Lvl1Thresholds()
-    jet_thresholds = l1_thrs.allThresholdsOf('JET')
-    fjet_thresholds = l1_thrs.allThresholdsOf('JF')
-    log.debug('N jet thresholds: %d (8 expected)' % len(jet_thresholds))
-    log.debug('N fjet thresholds: %d (4 expected)' % len(fjet_thresholds))
-    jthr = [1023]*8
-    fjthr = [1023]*4
-    jet_names, fjet_names = ['---']*8, ['---']*4
-    for j in jet_thresholds:
-        log.debug('jet threshold %s: %d' % (j.name, j.thresholdInGeV()))
-        # jthr.append(j.thresholdInGeV())
-        jthr[j.mapping] = j.thresholdInGeV()
-        jet_names[j.mapping] = j.name
-    for j in fjet_thresholds:
-        tvalues = j.thresholdValues
-        priority = 0
-        threshold_value = 0
-        for tv in tvalues:
-            if tv.priority > priority:
-                threshold_value = tv.value
-        log.debug('fjet threshold %s: %d' % (j.name, threshold_value))
-        fjthr.append(threshold_value)
-        fjthr[j.mapping] = threshold_value
-        fjet_names[j.mapping] = j.name
-    #
-    s = ''
-    for j in jet_names:
-        s += '%s ' % j
-    log.debug('Jet thresholds: %s' % s)
-    s = ''
-    for j in fjet_names:
-        s += '%s ' % j
-    log.debug('Fjet thresholds: %s' % s)
-    if len(jthr) <= 8:
-        w = thr2weights(jthr)
-        jw = w
-    else:
-        jw = [0]*8
-    w = [0]*4
-    if use_fj:
-        if len(fjthr) <= 4:
-            w = thr2weights(fjthr)
-    jw.extend(w)
-    return jw
+                already_used_robs[rob_id]=stream
+                
 
 def resetAllPrescales(triggerPythonConfig):
     for sig in triggerPythonConfig.allChains.values():
@@ -244,76 +177,6 @@ def allSignatures():
         if a.signatures.statusOn: sigs += a.signatures()
     return sigs
 
-# def overwriteStreamTags(triggerPythonConfig, streamConfig):
-#     log.info('MenuUtil: OverwriteStreamTags')
-#     if len(streamConfig) > 0:
-#         log.info('MenuUtil: OverwriteStreamTags: len(streamConfig) >0')
-#         for (name, chains) in triggerPythonConfig.allChains.iteritems():
-#             try:
-#                 for c in chains:
-#                     log.info('MenuUtil: OverwriteStreamTags: calling overwriteStreamTagsInChain function!')
-#                     overwriteStreamTagsInChain(c, streamConfig)
-#             except:
-#                 log.warning( 'Exception in len(chains) for logical name: ' \
-#                           +name+', stream, '+ c.stream_tag)
-#     log.info('MenuUtil: OverwriteStreamTags END')
-
-
-#def overwriteStreamTagsInChain(chain, streamConfig): # needed ? Might just add a check that the stream name is correct...
-def overwriteStreamTagsInChain(chain): # needed ? Might just add a check that the stream name is correct...
-    """streamConfig: map between final stream tag for this configuration
-    and all stream names belonging to this stream.
-    {
-      'jetEtmissTau': [ 'jets', 'etmissTau' ]
-      ...
-    }
-    """
-    log.info('MenuUtil: OverwriteStreamTagsInChain')
-    stream_express = []
-    stream_physics = []
-    stream_calib = []
-    for s in chain.stream_tag:
-        log.info('MenuUtil: OverwriteStreamTagsinChain: checking original stream for %s: %s' % (chain.chain_name,str(s)))
-        # stream is a tuple (stream, type, obeyLB, prescale)
-        if s[1] == 'express' or s[0]=='express' or s[1] == 'reserved':
-            stream_express.append(s)
-        elif s[1] == 'physics': stream_physics.append(s)
-        elif s[1] == 'calibration': stream_calib.append(s)
-        else:
-            log.warning('Unknown stream type %s : %s' % (s[1], str(s)))
-    chain.stream_tag = []
-    new_streams = []
-    # print 'stream_phys: ', stream_physics
-    for s in stream_physics:
-        # print 'check phys stream: ', s
-        tmp = []
-        #CAT#for (name, ss) in streamConfig.iteritems():
-        #CAT#    if s[0] in ss:
-        #CAT#        tmp.append(name)
-        # print 'New stream for ', s, ' is ', tmp
-
-        if s[0].lower().find('cosmic')>=0:
-            tmp.append(s[0])
-        if len(tmp)==0:
-            if s[0] not in ['combined']:
-                tmp.append(s[0])
-                log.debug('Warning! No new stream for %s, using its own' % s[0])
-        if len(tmp)!=0:
-            for t in tmp:
-                if t not in new_streams: new_streams.append(t)
-    for s in new_streams:
-        chain.addStreamTag(s)
-        # assume type='physics',obeyLB=True and prescale=1
-        # print 'Replaced to ', s
-    for s in stream_express:
-        chain.addStreamTag(s[0], s[1], s[2], s[3])
-    for s in stream_calib:
-        #Enforce obeyLB=no here
-        chain.addStreamTag(s[0], s[1], "no", s[3])
-
-    log.info('MenuUtil: OverwriteStreamTagsinChain END')
-
-
 
 def findL1TT(chain, triggerPythonConfig):
     l2_chain = chain
@@ -328,201 +191,3 @@ def findL1TT(chain, triggerPythonConfig):
         return -1
     return l1_item.trigger_type
 
-def setL1TTStream7Bit(chain, triggerPythonConfig):
-    l1tt = findL1TT(chain, triggerPythonConfig)
-    StreamName = []
-    unseeded_chains = {
-        # the order of things matter, the streaming can be overwritten 
-        #'xe20_EFonly' : 'L1Calo',
-        #'xe_debug_EFonly' : 'L1Calo',
-        #'SeededStreamerMBTS'           : 'MinBias',
-        }
-    
-    idcosmic_chains = (
-
-       )
-    
-    log.debug('CHECK: %s : ', chain.chain_name)
-    exactmatch = False
-    for c in unseeded_chains.keys():
-        if chain.chain_name.endswith(c) and not exactmatch:
-            if (chain.chain_name[3:]==c):
-                exactmatch = True
-            s = unseeded_chains[c]
-            log.debug('Setting new streamtag of %s to %s' % \
-                     (chain.chain_name, s))
-            StreamName.append(s)
-    log.debug('Streamname up to now: %s' % StreamName)
-    StreamBit2 = "L1Calo"
-    StreamBit3 = "MuonswBeam"
-    StreamBit4 = "L1CaloEM"
- 
-    if StreamName==[] and l1tt<0:
-        log.debug('Could not find L1TT for chain: %s (%d)' % \
-                  (chain.chain_name, l1tt))
-    elif StreamName==[]:
-        l1tt = l1tt & 0x7f
-        if l1tt == 0x00:
-            # 2010/01/28: special case: InitialBeam_v2 - no BPTX trigger type
-            # but still include MinBias chains seeded from BPTX
-            # Delete this case when these chains are removed
-            if chain.chain_name.count('BX0') == 1 or chain.chain_name.count('BX1') == 1:
-                StreamName.append('BPTX')
-            else:
-                StreamName.append('ERROR_TriggerType0_ERROR')
-                log.warning('Failed to determine stream from TriggerType for: '+chain.chain_name)
-                
-        if (l1tt & 0x01 !=0):
-            StreamName.append('RNDM')
-        if (l1tt & 0x02 !=0):
-            StreamName.append('BPTX')
-        if (l1tt & 0x04 !=0):
-            StreamName.append(StreamBit2)
-        if (l1tt & 0x08 !=0):
-            StreamName.append(StreamBit3)
-        if (l1tt & 0x10 !=0):
-            StreamName.append(StreamBit4)
-        if (l1tt & 0x20 !=0):
-            StreamName.append('MinBias')
-        if (l1tt & 0x40 !=0):
-            StreamName.append('CosmicMuons')
-
-    chain.stream_tag = filter(lambda x: x[1]!='physics', chain.stream_tag)
-    chain.stream_tag = filter(lambda x: x[1]!='calibration', chain.stream_tag)
-    if StreamName != []:
-        log.debug('Overwrite stream tag of %s to %s' % \
-                  (chain.chain_name, StreamName))
-        for stream in StreamName:
-            stype = 'physics'
-            obeyLB = 'yes'
-            if stream in [ 'IDTracks', 'LArCells', 'Tile' , 'Muon_Calibration', 'PixelNoise', 'SCTNoise', 'rateanalysis', 'L2CostMonitoring', 'EFCostMonitoring', 'beamspot' ]:
-                stype  = 'calibration'
-                obeyLB = 'no'
-                if stream=='LArCells' and chain.level == 'L2':
-                    stype  = 'physics'
-                    obeyLB = 'yes'
-            elif stream is 'DISCARD':
-                stype = 'debug'
-
-            conserved_chains =[
-                'L1CaloFilter_V2',    
-                'L1CaloEMFilter_V2',  
-                'L1CaloTauFilter_V2', 
-                'L1CaloJetFilter_V2',
-                ]
-
-            stream_prescale = '1'
-            #if (stype=='physics' and chain.chain_name[3:len(chain.chain_name)] not in TriggerFlags.StreamingSlice.signatures() and chain.chain_name[3:len(chain.chain_name)] not in conserved_chains):
-            #    stream_prescale = '0'
-
-            if (TriggerFlags.zero_stream_prescales):
-                chain.addStreamTag(stream,stype,obeyLB,prescale=stream_prescale)
-                stringToPrint = chain.chain_name+" gets stream prescale "+str(stream_prescale)+" in "+stream
-                log.info("Streaming: %s" % stringToPrint)
-            else:
-                chain.addStreamTag(stream,stype,obeyLB,prescale='1')
-
-            if (stream_prescale == '0' and TriggerFlags.physics_pass_through): chain.pass_through='1'
-
-
-    for c in idcosmic_chains:
-        if chain.chain_name.endswith(c):
-            log.debug('Add stream tag of %s to %s' % \
-                      (chain.chain_name, 'IDCosmic'))
-            tmp = map(lambda x: x[0], chain.stream_tag)
-            if 'IDCosmic' not in tmp:
-                chain.addStreamTag('IDCosmic',type='physics',obeyLB='yes',prescale='1')
-
-    if len(chain.stream_tag)==0:
-        s = 'No stream tag was set for chain %s after setL1TTStream7Bit, '
-        s += 'so setting %s'
-        n = 'undefined_by_setL1TTStream7Bit'
-        log.warning(s % (chain.chain_name, n))
-        log.warning('Usually because the chain was unseeded and there was no L1 TT')
-        chain.addStreamTag(n, type='physics', obeyLB='yes', prescale='1')
-
-##########################################################################################
-# OBSOLETE!!
-#
-def overwriteStreamTag(chain, triggerPythonConfig):
-    """ Deletes old stream tag and introduces a new one
-        for chains specified in a dictionary
-    """
-    streaming_chains={
-        }
-        
-    for c in streaming_chains.keys():
-        if chain.chain_name.endswith(c):
-            for i in range(len(chain.stream_tag)):
-                log.debug('Remove original stream tag %s for %s' % \
-                         (chain.stream_tag[i], chain.chain_name))
-                del chain.stream_tag[i]
-                
-            log.debug('Add new stream tag of %s to %s' % \
-                     (chain.chain_name, streaming_chains[c]))
-            #tmp = map(lambda x: x[0], chain.stream_tag)
-            #if streaming_chains[c] not in tmp:
-            chain.addStreamTag(streaming_chains[c],type='physics',obeyLB='yes',prescale='1')
-
-
-                
-
-##########################################################################################
-#
-# remap L1 thesholds
-#
-def remapL1Thresholds(tpc, thrMap):
-    """ Iterate over HLT sequences and replace old L1 thresholds
-        inputs to this function: 1) TriggerPythonConfig
-                                 2) dictionary old->new thresholds
-    """
-
-    log.debug('Running remapL1Thresholds...')
-    
-    # Iterate over all input TEs for all sequences
-    for seq in tpc.theSeqLists:
-        newInput = []
-        hasChanged = False
-        for inputTE in seq.input:
-            
-            # Check if inputTE name is on list of old thresholds
-            if inputTE in thrMap:
-                hasChanged = True
-                newInput.append(thrMap[inputTE])
-            else:
-                newInput.append(inputTE)
-
-        # Replace input TEs with new list
-        if hasChanged:
-            log.debug('Sequence '+seq.output+': replaced input '+str(seq.input)+' with '+str(newInput))
-            seq.input = newInput
-            
-##########################################################################################
-#
-# remap L1 items: inputs=(TriggerPythonConfig, dictionary old->new)
-#  - Iterate over HLT chains and replace old L1 items
-#
-def remapL1Items(tpc, itemMap):
-    """ Iterate over HLT sequences and replace old L1 items
-        inputs to this function: 1) TriggerPythonConfig
-                                 2) dictionary old->new items
-    """
-    log.debug('Running remapL1Items...')
-    
-    # Iterate over all L2 chains
-    for chain in tpc.theL2HLTChains:
-        lowname = chain.lower_chain_name
-        if lowname in itemMap:
-            chain.lower_chain_name = itemMap[lowname]
-            log.debug('"The" chain '+chain.chain_name+': replaced input '+lowname+' with '+itemMap[lowname])
-            
-    # Iterate over all HLT chains
-    for logic, chains in tpc.allChains.iteritems():
-        for chain in chains:
-            lowname = chain.lower_chain_name
-            if chain.isL2() and lowname in itemMap:
-                if 'L1ItemStreamer' in chain.chain_name:
-                    log.debug('Skipping input remap for '+chain.chain_name)
-                    continue
-                chain.lower_chain_name = itemMap[lowname]
-                log.debug('"All" chain '+chain.chain_name+': replaced input '+lowname+' with '+itemMap[lowname])
diff --git a/Trigger/TriggerCommon/TriggerMenu/python/menu/Physics_HI_v3.py b/Trigger/TriggerCommon/TriggerMenu/python/menu/Physics_HI_v3.py
index 91ceb7d9842..fd77279a904 100644
--- a/Trigger/TriggerCommon/TriggerMenu/python/menu/Physics_HI_v3.py
+++ b/Trigger/TriggerCommon/TriggerMenu/python/menu/Physics_HI_v3.py
@@ -18,31 +18,31 @@ def setupMenu():
 
 
     # INPUT FORMAT FOR CHAINS:
-    # ['chainName', chainCounter, 'L1itemforchain', [L1 items for chainParts], [stream], [groups], EBstep]
+    # ['chainName', 'L1itemforchain', [L1 items for chainParts], [stream], [groups], EBstep]
 
     TriggerFlags.Slices_all_setOff()
 
     TriggerFlags.MuonSlice.signatures = [
 	#ID tracking performance
-        ['mu4_idperf',          302, 'L1_MU4', [], ['Muon'], ['RATE:SingleMuon','BW:Muon'], -1],
-	['mu6_idperf',          303, 'L1_MU4', [], ['Muon'], ['RATE:SingleMuon','BW:Muon'], -1],
-	['mu10_idperf',         306, 'L1_MU6', [], ['Muon'], ['RATE:SingleMuon','BW:Muon'], -1],
+        ['mu4_idperf',          'L1_MU4', [], ['Muon'], ['RATE:SingleMuon','BW:Muon'], -1],
+	['mu6_idperf',          'L1_MU4', [], ['Muon'], ['RATE:SingleMuon','BW:Muon'], -1],
+	['mu10_idperf',         'L1_MU6', [], ['Muon'], ['RATE:SingleMuon','BW:Muon'], -1],
  	
 	#RoI muons
-	['mu6',          	304, 'L1_MU4', [], ['Muon'], ['RATE:SingleMuon','BW:Muon'], -1],
-	['mu10',                305, 'L1_MU6', [], ['Muon'], ['RATE:SingleMuon','BW:Muon'], -1],
+	['mu6',                 'L1_MU4', [], ['Muon'], ['RATE:SingleMuon','BW:Muon'], -1],
+	['mu10',                'L1_MU6', [], ['Muon'], ['RATE:SingleMuon','BW:Muon'], -1],
 	
 	#Full scan
-        ['mu4_mu4noL1',         300, 'L1_MU4', ['L1_MU4',''], ['Muon'], ['RATE:MultiMuon','BW:Muon'], -1,['serial',-1,["mu4","mu4noL1"]]],
-        ['mu6_mu4noL1',         301, 'L1_MU4', ['L1_MU4',''], ['Muon'], ['RATE:MultiMuon','BW:Muon'], -1,['serial',-1,["mu6","mu4noL1"]]],
+        ['mu4_mu4noL1',         'L1_MU4', ['L1_MU4',''], ['Muon'], ['RATE:MultiMuon','BW:Muon'], -1, ['serial',-1,["mu4","mu4noL1"]]],
+        ['mu6_mu4noL1',         'L1_MU4', ['L1_MU4',''], ['Muon'], ['RATE:MultiMuon','BW:Muon'], -1, ['serial',-1,["mu6","mu4noL1"]]],
         ]
 
     TriggerFlags.JetSlice.signatures = [
 	#performance
-	['j0_perf_L1ZDC_A_C', 500,     'L1_ZDC_A_C',[], ['Jet'], ['RATE:SingleJet', 'BW:Jets'], -1],
+	['j0_perf_L1ZDC_A_C',     'L1_ZDC_A_C',[], ['Jet'], ['RATE:SingleJet', 'BW:Jets'], -1],
 	#physics
-	['j15_L1ZDC_A_C',     501,     'L1_ZDC_A_C',[], ['Jet'], ['RATE:SingleJet', 'BW:Jets'], -1],   
-	['j20_L1ZDC_A_C',     502,     'L1_ZDC_A_C',[], ['Jet'], ['RATE:SingleJet', 'BW:Jets'], -1],
+	['j15_L1ZDC_A_C',         'L1_ZDC_A_C',[], ['Jet'], ['RATE:SingleJet', 'BW:Jets'], -1],   
+	['j20_L1ZDC_A_C',         'L1_ZDC_A_C',[], ['Jet'], ['RATE:SingleJet', 'BW:Jets'], -1],
         ]
 
     TriggerFlags.BjetSlice.signatures = [
@@ -55,14 +55,14 @@ def setupMenu():
         ]
 
     TriggerFlags.EgammaSlice.signatures = [
-	['e15_etcut',         400,          'L1_EM10', [], ['Egamma'], ['RATE:SingleElectron', 'BW:Egamma'], -1],
+	['e15_etcut',                  'L1_EM10', [], ['Egamma'], ['RATE:SingleElectron', 'BW:Egamma'], -1],
 	#Run 1 PID
-	['e15_loose1',        401,          'L1_EM10', [], ['Egamma'], ['RATE:SingleElectron', 'BW:Egamma'], -1],
-	['e15_medium1',       402,          'L1_EM10', [], ['Egamma'], ['RATE:SingleElectron', 'BW:Egamma'], -1],
-	['e15_loose',         403,          'L1_EM10', [], ['Egamma'], ['RATE:SingleElectron', 'BW:Egamma'], -1],
-        ['e15_medium',        404,          'L1_EM10', [], ['Egamma'], ['RATE:SingleElectron', 'BW:Egamma'], -1],
-	['e15_lhloose',       405,          'L1_EM10', [], ['Egamma'], ['RATE:SingleElectron', 'BW:Egamma'], -1],
-	['e15_lhmedium',      406,          'L1_EM10', [], ['Egamma'], ['RATE:SingleElectron', 'BW:Egamma'], -1],
+	['e15_loose1',                 'L1_EM10', [], ['Egamma'], ['RATE:SingleElectron', 'BW:Egamma'], -1],
+	['e15_medium1',                'L1_EM10', [], ['Egamma'], ['RATE:SingleElectron', 'BW:Egamma'], -1],
+	['e15_loose',                  'L1_EM10', [], ['Egamma'], ['RATE:SingleElectron', 'BW:Egamma'], -1],
+        ['e15_medium',                 'L1_EM10', [], ['Egamma'], ['RATE:SingleElectron', 'BW:Egamma'], -1],
+	['e15_lhloose',                'L1_EM10', [], ['Egamma'], ['RATE:SingleElectron', 'BW:Egamma'], -1],
+	['e15_lhmedium',               'L1_EM10', [], ['Egamma'], ['RATE:SingleElectron', 'BW:Egamma'], -1],
         ]
 
     TriggerFlags.BphysicsSlice.signatures = [
@@ -72,21 +72,21 @@ def setupMenu():
         ]
    
     TriggerFlags.MinBiasSlice.signatures = [
-        ['mb_mbts_L1MBTS_2', 100, 'L1_MBTS_2', [], ['MinBias'],["BW:MinBias", "RATE:MinBias"], 1],
-        #['mb_mbts_L1MBTS_1_1', 101, 'L1_MBTS_1_1', [], ['MinBias'],["BW:MinBias", "RATE:MinBias"], 1], #does not work, needs to be fixed
-        ['mb_mbts_L1MBTS_2_2', 102, 'L1_MBTS_2_2', [], ['MinBias'],["BW:MinBias", "RATE:MinBias"], 1],
-        ['mb_mbts_L1MBTS_3_3', 103, 'L1_MBTS_3_3', [], ['MinBias'],["BW:MinBias", "RATE:MinBias"], 1],
-        ['mb_mbts_L1MBTS_4_4', 104, 'L1_MBTS_4_4', [], ['MinBias'],["BW:MinBias", "RATE:MinBias"], 1],
+        ['mb_mbts_L1MBTS_2',    'L1_MBTS_2', [], ['MinBias'],["BW:MinBias", "RATE:MinBias"], 1],
+        #['mb_mbts_L1MBTS_1_1',, 'L1_MBTS_1_1', [], ['MinBias'],["BW:MinBias", "RATE:MinBias"], 1], #does not work, needs to be fixed
+        ['mb_mbts_L1MBTS_2_2',  'L1_MBTS_2_2', [], ['MinBias'],["BW:MinBias", "RATE:MinBias"], 1],
+        ['mb_mbts_L1MBTS_3_3',  'L1_MBTS_3_3', [], ['MinBias'],["BW:MinBias", "RATE:MinBias"], 1],
+        ['mb_mbts_L1MBTS_4_4',  'L1_MBTS_4_4', [], ['MinBias'],["BW:MinBias", "RATE:MinBias"], 1],
         ]
 
     TriggerFlags.CalibSlice.signatures   = []
     TriggerFlags.CosmicSlice.signatures  = [ ]
     TriggerFlags.StreamingSlice.signatures = [
-        ['noalg_mb_L1TE50', 200, 'L1_TE50', [], ['MinBias'], ["BW:MinBias", "RATE:MinBias"], 1],
-        ['noalg_mb_L1MBTS_2', 201, 'L1_MBTS_2', [], ['MinBias'], ["BW:MinBias", "RATE:MinBias"], 1],
-        ['noalg_mb_L1MBTS_1_1', 202, 'L1_MBTS_1_1', [], ['MinBias'], ["BW:MinBias", "RATE:MinBias"], 1],
-        ['noalg_mb_L1MBTS_2_2', 203, 'L1_MBTS_2_2', [], ['MinBias'], ["BW:MinBias", "RATE:MinBias"], 1],
-	['noalg_mb_L1ZDC_A_C', 204, 'L1_ZDC_A_C', [], ['MinBias'], ["BW:MinBias", "RATE:MinBias"], 1],
+        ['noalg_mb_L1TE50',      'L1_TE50', [], ['MinBias'], ["BW:MinBias", "RATE:MinBias"], 1],
+        ['noalg_mb_L1MBTS_2',    'L1_MBTS_2', [], ['MinBias'], ["BW:MinBias", "RATE:MinBias"], 1],
+        ['noalg_mb_L1MBTS_1_1',  'L1_MBTS_1_1', [], ['MinBias'], ["BW:MinBias", "RATE:MinBias"], 1],
+        ['noalg_mb_L1MBTS_2_2',  'L1_MBTS_2_2', [], ['MinBias'], ["BW:MinBias", "RATE:MinBias"], 1],
+	['noalg_mb_L1ZDC_A_C',   'L1_ZDC_A_C', [], ['MinBias'], ["BW:MinBias", "RATE:MinBias"], 1],
         ]
 
     TriggerFlags.MonitorSlice.signatures = []
diff --git a/Trigger/TriggerCommon/TriggerMenu/python/menu/Physics_pp_v5.py b/Trigger/TriggerCommon/TriggerMenu/python/menu/Physics_pp_v5.py
index 8a8446e0ed6..f665856b567 100644
--- a/Trigger/TriggerCommon/TriggerMenu/python/menu/Physics_pp_v5.py
+++ b/Trigger/TriggerCommon/TriggerMenu/python/menu/Physics_pp_v5.py
@@ -1,6 +1,6 @@
 # Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
 
-#------------------------------------------------------------------------#
+#----------phy--------------------------------------------------------------#
 #------------------------------------------------------------------------#
 def setupMenu():
 
@@ -28,230 +28,331 @@ def setupMenu():
 
     TriggerFlags.MuonSlice.signatures = [ 
         ## ADD MU*_EMPTY TO L1 MENU
-        ['mu4_cosmic_L1MU4_EMPTY',                930, 'L1_MU4_EMPTY', [],   ['CosmicMuons'], ["RATE:Cosmic_Muon", "BW:Muon"], -1],
-        ['mu4_cosmic_L1MU11_EMPTY',               931, 'L1_MU11_EMPTY', [],  ['CosmicMuons'], ["RATE:Cosmic_Muon", "BW:Muon"], -1],
-        ['mu4_msonly_cosmic_L1MU11_EMPTY',        932, 'L1_MU11_EMPTY', [],  ['CosmicMuons'], ["RATE:Cosmic_Muon", "BW:Muon"], -1],
+        ['mu4_cosmic_L1MU4_EMPTY',               'L1_MU4_EMPTY', [],   ['CosmicMuons'], ["RATE:Cosmic_Muon", "BW:Muon"], -1],
+        ['mu4_cosmic_L1MU11_EMPTY',              'L1_MU11_EMPTY', [],  ['CosmicMuons'], ["RATE:Cosmic_Muon", "BW:Muon"], -1],
+        ['mu4_msonly_cosmic_L1MU11_EMPTY',       'L1_MU11_EMPTY', [],  ['CosmicMuons'], ["RATE:Cosmic_Muon", "BW:Muon"], -1],
                             
-        ['mu4_cosmicEF_L1MU4_EMPTY',              933, 'L1_MU4_EMPTY', [], ['CosmicMuons'], ["RATE:Cosmic_Muon", "BW:Muon"], -1],
-        ['mu4_cosmicEF_L1MU11_EMPTY',             934, 'L1_MU11_EMPTY', [],['CosmicMuons'], ["RATE:Cosmic_Muon", "BW:Muon"], -1],
-        ['mu4_msonly_cosmicEF_L1MU11_EMPTY',      935, 'L1_MU11_EMPTY', [],['CosmicMuons'], ["RATE:Cosmic_Muon", "BW:Muon"], -1],
-        ['mu4_msonly_cosmicEF_L1MU4_EMPTY',       936, 'L1_MU4_EMPTY', [],  ['CosmicMuons'], ["RATE:Cosmic_Muon", "BW:Muon"], -1],
+        ['mu4_cosmicEF_L1MU4_EMPTY',             'L1_MU4_EMPTY', [], ['CosmicMuons'], ["RATE:Cosmic_Muon", "BW:Muon"], -1],
+        ['mu4_cosmicEF_L1MU11_EMPTY',            'L1_MU11_EMPTY', [],['CosmicMuons'], ["RATE:Cosmic_Muon", "BW:Muon"], -1],
+        ['mu4_msonly_cosmicEF_L1MU11_EMPTY',     'L1_MU11_EMPTY', [],['CosmicMuons'], ["RATE:Cosmic_Muon", "BW:Muon"], -1],
+        ['mu4_msonly_cosmicEF_L1MU4_EMPTY',      'L1_MU4_EMPTY', [],  ['CosmicMuons'], ["RATE:Cosmic_Muon", "BW:Muon"], -1],
         
         
         ##Streaming name?
-        #['mu4_cosmicEF_ds1_L1MU4', 937, 'L1_MU4', [], ['DataScouting_01_CosmicMuons'], ["RATE:Cosmic_Muon_DS", "BW:Muon"], -1],
-        #['mu4_cosmicEF_ds2_L1MU4', 938, 'L1_MU4', [], ['DataScouting_01_CosmicMuons','DataScouting_02_CosmicMuons'], ["RATE:Cosmic_Muon_DS", "BW:Muon"], -1],
+        #['mu4_cosmicEF_ds1_L1MU4', 'L1_MU4', [], ['DataScouting_01_CosmicMuons'], ["RATE:Cosmic_Muon_DS", "BW:Muon"], -1],
+        #['mu4_cosmicEF_ds2_L1MU4', 'L1_MU4', [], ['DataScouting_01_CosmicMuons','DataScouting_02_CosmicMuons'], ["RATE:Cosmic_Muon_DS", "BW:Muon"], -1],
         
-        ['mu0_muoncalib',939, 'L1_MU4',[],['Muon_Calibration'],["RATE:Calibration","BW:Muon"],-1],
-        #['mu0_muoncalib_ds3',728, 'L1_MU4',[],['DataScouting_03_CosmicMuons'],["RATE:SingleMuon","BW:Muon"],-1],        
+        ['mu0_muoncalib', 'L1_MU4',[],['Muon_Calibration'],["RATE:Calibration","BW:Muon"],-1],
+        #['mu0_muoncalib_ds3', 'L1_MU4',[],['DataScouting_03_CosmicMuons'],["RATE:SingleMuon","BW:Muon"],-1],        
 
         ]
     
     TriggerFlags.JetSlice.signatures = [   
         # Performance chains
-        ['j0_perf_L1RD0_EMPTY', 940,     'L1_RD0_EMPTY',[], [PhysicsStream], ['RATE:SingleJet', 'BW:Jets'], -1],
-        ['j0_perf_L1MU10',      941,     'L1_MU10',[], [PhysicsStream], ['RATE:SingleJet', 'BW:Jets'], -1],
-        ['j0_perf_L1J12',       942, 'L1_J12',[], [PhysicsStream], ['RATE:SingleJet', 'BW:Jets'], -1],
-        ['ht0_perf_L1J12',       929, 'L1_J12',[], [PhysicsStream], ['RATE:SingleJet', 'BW:Jets'], -1],
+        ['j0_perf_L1RD0_EMPTY',      'L1_RD0_EMPTY',[], [PhysicsStream], ['RATE:SingleJet', 'BW:Jets'], -1],
+        ['j0_perf_L1MU10',           'L1_MU10',[], [PhysicsStream], ['RATE:SingleJet', 'BW:Jets'], -1],
+        ['j0_perf_L1J12',        'L1_J12',[], [PhysicsStream], ['RATE:SingleJet', 'BW:Jets'], -1],
+        ['ht0_perf_L1J12',       'L1_J12',[], [PhysicsStream], ['RATE:SingleJet', 'BW:Jets'], -1],
+
+        ['j0_perf_ds1_L1MU4',  'L1_MU4', [], ['DataScouting_05_Jets'], ["RATE:Cosmic_Jets_DS", "BW:Jets"], -1],
+
+        ['j0_L1J12',               'L1_J12', [], [PhysicsStream], ['RATE:SingleJet', 'BW:Jets'], -1],
+        ['j0_jes_L1J12',           'L1_J12', [], [PhysicsStream], ['RATE:SingleJet', 'BW:Jets'], -1],
+        ['j0_lcw_jes_L1J12',       'L1_J12', [], [PhysicsStream], ['RATE:SingleJet', 'BW:Jets'], -1],
+        ['j0_sub_L1J12',           'L1_J12', [], [PhysicsStream], ['RATE:SingleJet', 'BW:Jets'], -1],
+        ['j0_nojcalib_L1J12',      'L1_J12', [], [PhysicsStream], ['RATE:SingleJet', 'BW:Jets'], -1],
+
+        ['j0_a10_nojcalib_L1J12',  'L1_J12', [], [PhysicsStream], ['RATE:SingleJet', 'BW:Jets'], -1],
+        ['j0_a10_lcw_sub_L1J12',   'L1_J12', [], [PhysicsStream], ['RATE:SingleJet', 'BW:Jets'], -1],
+        ['j0_a10r_lcw_sub_L1J12',  'L1_J12', [], [PhysicsStream], ['RATE:SingleJet', 'BW:Jets'], -1],
+
+        ['ht0_L1J12',              'L1_J12', [], [PhysicsStream], ['RATE:SingleJet', 'BW:Jets'], -1],
+
+        ['j0_a10_nojcalib_L1RD0_EMPTY', 'L1_RD0_EMPTY', [], [PhysicsStream], ['RATE:SingleJet', 'BW:Jets'], -1],
+        ['j0_a10r_lcw_sub_L1RD0_EMPTY', 'L1_RD0_EMPTY', [], [PhysicsStream], ['RATE:SingleJet', 'BW:Jets'], -1],
+
+        ['j15_L1J12',              'L1_J12', [], [PhysicsStream], ['RATE:SingleJet', 'BW:Jets'], -1],
+
         ]
 
     TriggerFlags.BjetSlice.signatures = [
-        ['j0_perf_bperf_L1RD0_EMPTY', 943, 'L1_RD0_EMPTY',[], [PhysicsStream], ['RATE:SingleJet', 'BW:Jets'], -1],
-        ['j0_perf_bperf_L1MU10',      944, 'L1_MU10',[], [PhysicsStream], ['RATE:SingleJet', 'BW:Jets'], -1],
-        ['j0_perf_bperf_L1J12',       945, 'L1_J12',[], [PhysicsStream], ['RATE:SingleJet', 'BW:Jets'], -1],
+        ['j0_perf_bperf_L1RD0_EMPTY',  'L1_RD0_EMPTY',[], [PhysicsStream], ['RATE:SingleJet', 'BW:Jets'], -1],
+        ['j0_perf_bperf_L1MU10',       'L1_MU10',[], [PhysicsStream], ['RATE:SingleJet', 'BW:Jets'], -1],
+        ['j0_perf_bperf_L1J12',        'L1_J12',[], [PhysicsStream], ['RATE:SingleJet', 'BW:Jets'], -1],
 
         ]
-
+    
     TriggerFlags.METSlice.signatures = [
-        ]
+        ['xe0_L1All',                              'L1_All' ,[], ['Main'], ['Rate:MET', 'BW:MET'], -1],
+        ['xe0_L1XE35',                             'L1_XE35',[], ['Main'], ['Rate:MET', 'BW:MET'], -1],
+        ['xe0_tc_lcw_L1All',                       'L1_All' ,[], ['Main'], ['Rate:MET', 'BW:MET'], -1],
+        ['xe0_tc_lcw_L1XE35',                      'L1_XE35',[], ['Main'], ['Rate:MET', 'BW:MET'], -1],
+        ['xe0_tc_em_L1All',                        'L1_All' ,[], ['Main'], ['Rate:MET', 'BW:MET'], -1],
+        ['xe0_tc_em_L1XE35',                       'L1_XE35',[], ['Main'], ['Rate:MET', 'BW:MET'], -1],
+        ['xe0_tc_pueta_L1All',                     'L1_All' ,[], ['Main'], ['Rate:MET', 'BW:MET'], -1],
+        ['xe0_tc_pueta_L1XE35',                    'L1_XE35',[], ['Main'], ['Rate:MET', 'BW:MET'], -1],
+        ['xe0_tc_pufit_L1All',                     'L1_All' ,[], ['Main'], ['Rate:MET', 'BW:MET'], -1],
+        ['xe0_tc_pufit_L1XE35',                    'L1_XE35',[], ['Main'], ['Rate:MET', 'BW:MET'], -1],
+        ['xe0_tc_mht_L1All',                       'L1_All' ,[], ['Main'], ['Rate:MET', 'BW:MET'], -1],
+        ['xe0_tc_mht_L1XE35',                      'L1_XE35',[], ['Main'], ['Rate:MET', 'BW:MET'], -1],
+        ['xe0_L2FS_L1All',                         'L1_All' ,[], ['Main'], ['Rate:MET', 'BW:MET'],  1],
+        ['xe0_L2FS_L1XE35',                        'L1_XE35',[], ['Main'], ['Rate:MET', 'BW:MET'],  1],
+        ['xe0_l2fsperf_wEFMuFEB_wEFMu_L1All',      'L1_All' ,[], ['Main'], ['Rate:MET', 'BW:MET'], -1],
+        ['xe0_l2fsperf_wEFMuFEB_wEFMu_L1XE35',     'L1_XE35',[], ['Main'], ['Rate:MET', 'BW:MET'], -1],
+
+        ['xe35',                                   'L1_XE35',[], ['Main'], ['Rate:MET', 'BW:MET'], -1],
+        ['xe35_tc_lcw',                            'L1_XE35',[], ['Main'], ['Rate:MET', 'BW:MET'], -1],
+        ['xe35_tc_em',                             'L1_XE35',[], ['Main'], ['Rate:MET', 'BW:MET'], -1],
+        ['xe35_pueta',                             'L1_XE35',[], ['Main'], ['Rate:MET', 'BW:MET'], -1],
+        ['xe35_pufit',                             'L1_XE35',[], ['Main'], ['Rate:MET', 'BW:MET'], -1],
+        ['xe35_mht',                               'L1_XE35',[], ['Main'], ['Rate:MET', 'BW:MET'], -1],
+        ['xe35_L2FS',                              'L1_XE35',[], ['Main'], ['Rate:MET', 'BW:MET'], -1],
+        ['xe35_l2fsperf_wEFMuFEB_wEFMu',           'L1_XE35',[], ['Main'], ['Rate:MET', 'BW:MET'], -1],
+
+        ['te20',                                   'L1_TE20',[], ['Main'], ['Rate:MET', 'BW:MET'], -1],
+        ['te20_tc_lcw',                            'L1_TE20',[], ['Main'], ['Rate:MET', 'BW:MET'], -1],
+        
+        ['xs30',                                   'L1_XS30',[], ['Main'], ['Rate:MET', 'BW:MET'], -1],
+        ['xs30_tc_lcw',                            'L1_XS30',[], ['Main'], ['Rate:MET', 'BW:MET'], -1],
 
+        ]
+    
     TriggerFlags.TauSlice.signatures = [
-        ['tau8_cosmic_track', 620, 'L1_TAU8_EMPTY', [], [PhysicsStream], ['RATE:SingleTau', 'BW:Tau'], -1],
-        ['tau8_cosmic_ptonly', 621, 'L1_TAU8_EMPTY', [], [PhysicsStream], ['RATE:SingleTau', 'BW:Tau'], -1],
-        ['tau1_cosmic_track_L1MU4_EMPTY', 622, 'L1_MU4_EMPTY', [], [PhysicsStream], ['RATE:SingleTau', 'BW:Tau'], -1],
-        ['tau1_cosmic_ptonly_L1MU4_EMPTY', 623, 'L1_MU4_EMPTY', [], [PhysicsStream], ['RATE:SingleTau', 'BW:Tau'], -1],
+        ['tau8_cosmic_track', 'L1_TAU8_EMPTY', [], [PhysicsStream], ['RATE:SingleTau', 'BW:Tau'], -1],
+        ['tau8_cosmic_ptonly', 'L1_TAU8_EMPTY', [], [PhysicsStream], ['RATE:SingleTau', 'BW:Tau'], -1],
+        ['tau1_cosmic_track_L1MU4_EMPTY',  'L1_MU4_EMPTY', [], [PhysicsStream], ['RATE:SingleTau', 'BW:Tau'], -1],
+        ['tau1_cosmic_ptonly_L1MU4_EMPTY', 'L1_MU4_EMPTY', [], [PhysicsStream], ['RATE:SingleTau', 'BW:Tau'], -1],
         ]
 
     TriggerFlags.EgammaSlice.signatures = [
-        ### NOT IN THE LIST ['e5_loose1',               946,          'L1_EM3', [], [PhysicsStream], ['RATE:SingleElectron', 'BW:Egamma'], -1],
-        ['e5_etcut_L1EM3_EMPTY',    949,          'L1_EM3_EMPTY', [], [PhysicsStream], ['RATE:SingleElectron', 'BW:Egamma'], -1], 
-        ['g5_etcut',                950,          'L1_EM3', [], [PhysicsStream], ['RATE:SingleElectron', 'BW:Egamma'], -1], 
-        ['g5_etcut_L1EM3_EMPTY',    951,          'L1_EM3_EMPTY', [], [PhysicsStream], ['RATE:SingleElectron', 'BW:Egamma'], -1], 
+        ### NOT IN THE LIST ['e5_loose1',                        'L1_EM3', [], [PhysicsStream], ['RATE:SingleElectron', 'BW:Egamma'], -1],
+        #['e5_etcut_L1EM3_EMPTY',              'L1_EM3_EMPTY', [], [PhysicsStream], ['RATE:SingleElectron', 'BW:Egamma'], -1], 
+        #['g5_etcut',                          'L1_EM3', [], [PhysicsStream], ['RATE:SinglePhoton', 'BW:Egamma'], -1], 
+        #['g5_etcut_L1EM3_EMPTY',              'L1_EM3_EMPTY', [], [PhysicsStream], ['RATE:SinglePhoton', 'BW:Egamma'], -1], 
+
+        ['g0_perf_L1EM3HLIL', 'L1_EM3HLIL', [], [PhysicsStream], ['RATE:SingleElectron', 'BW:Egamma'], -1],
+        ['e0_perf_L1EM3HLIL', 'L1_EM3HLIL', [], [PhysicsStream], ['RATE:SingleElectron', 'BW:Egamma'], -1],        
+        
+        ['e3_loose',             'L1_EM3',       [], [PhysicsStream], ['RATE:SingleElectron', 'BW:Egamma'], -1],
+        ['e3_lhloose',           'L1_EM3',       [], [PhysicsStream], ['RATE:SingleElectron', 'BW:Egamma'], -1],
+        ['e3_etcut',             'L1_EM3',       [], [PhysicsStream], ['RATE:SingleElectron', 'BW:Egamma'], -1], 
+        ['e3_etcut_L1EM3_EMPTY', 'L1_EM3_EMPTY', [], [PhysicsStream], ['RATE:SingleElectron', 'BW:Egamma'], -1], 
+        ['g3_etcut',             'L1_EM3',       [], [PhysicsStream], ['RATE:SinglePhoton',   'BW:Egamma'], -1], 
+        ['g3_etcut_L1EM3_EMPTY', 'L1_EM3_EMPTY', [], [PhysicsStream], ['RATE:SinglePhoton',   'BW:Egamma'], -1], 
+        ['e0_perf_L1EM3',        'L1_EM3',       [], [PhysicsStream], ['RATE:SingleElectron', 'BW:Egamma'], -1],
+        ['e0_L2Star_perf_L1EM3', 'L1_EM3',       [], [PhysicsStream], ['RATE:SingleElectron', 'BW:Egamma'], -1],
+        ['g0_perf_L1EM3',        'L1_EM3',       [], [PhysicsStream], ['RATE:SinglePhoton',   'BW:Egamma'], -1],
         ]
 
     TriggerFlags.BphysicsSlice.signatures = [
-        ['2mu4_bDimu',               955, 'L1_2MU4', [], [PhysicsStream], ['RATE:Bphysics','BW:Bphys'], -1], 
-        ['2mu4_bDimu_novtx_noos',    956, 'L1_2MU4', [], [PhysicsStream], ['RATE:Bphysics','BW:Bphys'], -1],  
-        ['2mu6_bDimu',               957, 'L1_2MU6', [], [PhysicsStream], ['RATE:Bphysics','BW:Bphys'], -1], 
-        ['2mu6_bDimu_novtx_noos',    958, 'L1_2MU6', [], [PhysicsStream], ['RATE:Bphysics','BW:Bphys'], -1],  
+        ['2mu4_bDimu',              'L1_2MU4', [], [PhysicsStream], ['RATE:Bphysics','BW:Bphys'], -1], 
+        ['2mu4_bDimu_novtx_noos',   'L1_2MU4', [], [PhysicsStream], ['RATE:Bphysics','BW:Bphys'], -1],  
+        ['2mu6_bDimu',              'L1_2MU6', [], [PhysicsStream], ['RATE:Bphysics','BW:Bphys'], -1], 
+        ['2mu6_bDimu_novtx_noos',   'L1_2MU6', [], [PhysicsStream], ['RATE:Bphysics','BW:Bphys'], -1],  
 
         ]
 
     TriggerFlags.CombinedSlice.signatures = [
         ]
-   
+ #Beamspot chanis first try ATR-9847                                                                                                               
+    TriggerFlags.BeamspotSlice.signatures = [
+        ]   
+
     TriggerFlags.MinBiasSlice.signatures = [
         # LS1 chains
-        ['mb_sptrk',                     960, 'L1_RD0_FILLED', [], ['MinBias'], ["BW:MinBias", "RATE:MinBias"], -1],
-        ['mb_sptrk_noisesup',            961, 'L1_RD0_FILLED', [], ['MinBias'], ["BW:MinBias", "RATE:MinBias"], -1],
-        ['mb_sptrk_L1RD0_UNPAIRED_ISO',  962, 'L1_RD0_UNPAIRED_ISO', [], ['MinBias'], ["BW:MinBias", "RATE:SeededStreamers"], -1],
-        ['mb_sptrk_L1RD0_EMPTY',         963, 'L1_RD0_EMPTY', [], ['MinBias'], ["BW:MinBias", "RATE:Cosmic_Minbias"], -1],
-        ##['mb_sp2000_trk70_hmt',          810, 'L1_TE20', [], ['MinBias'], ["BW:MinBias", "RATE:HMT"], -1], #disabled for M4 see https://savannah.cern.ch/bugs/?104744
+        ['mb_sptrk',                     'L1_RD0_FILLED', [], ['MinBias'], ["BW:MinBias", "RATE:MinBias"], -1],
+        ['mb_sptrk_noisesup',            'L1_RD0_FILLED', [], ['MinBias'], ["BW:MinBias", "RATE:MinBias"], -1],
+        ['mb_sptrk_L1RD0_UNPAIRED_ISO',  'L1_RD0_UNPAIRED_ISO', [], ['MinBias'], ["BW:MinBias", "RATE:MinBias"], -1],
+        ['mb_sptrk_L1RD0_EMPTY',         'L1_RD0_EMPTY', [], ['MinBias'], ["BW:MinBias", "RATE:Cosmic_Minbias"], -1],
+        ##['mb_sp2000_trk70_hmt',        'L1_TE20', [], ['MinBias'], ["BW:MinBias", "RATE:HMT"], -1], #disabled for M4 see https://savannah.cern.ch/bugs/?104744
 
-        ['mb_perf_L1LUCID_UNPAIRED_ISO', 964, 'L1_LUCID_UNPAIRED_ISO',        [], ['MinBias'], ["BW:MinBias", "RATE:SeededStreamers"], -1],
-        ['mb_perf_L1LUCID_EMPTY',        965, 'L1_LUCID_EMPTY',        [], ['MinBias'], ["BW:MinBias", "RATE:Cosmic_Minbias"], -1],
-        ['mb_perf_L1LUCID',              966, 'L1_LUCID',        [], ['MinBias'], ["BW:MinBias", "RATE:MinBias"], -1],
+        ['mb_perf_L1LUCID_UNPAIRED_ISO', 'L1_LUCID_UNPAIRED_ISO',        [], ['MinBias'], ["BW:MinBias", "RATE:MinBias"], -1],
+        ['mb_perf_L1LUCID_EMPTY',        'L1_LUCID_EMPTY',        [], ['MinBias'], ["BW:MinBias", "RATE:Cosmic_Minbias"], -1],
+        ['mb_perf_L1LUCID',              'L1_LUCID',        [], ['MinBias'], ["BW:MinBias", "RATE:MinBias"], -1],
 
-        ['mb_sptrk_costr',               967, 'L1_RD0_FILLED', [], ['MinBias'], ["BW:MinBias", "RATE:MinBias"], -1],
-        ['mb_sptrk_costr_L1RD0_EMPTY',   968, 'L1_RD0_EMPTY', [], ['MinBias'], ["BW:MinBias", "RATE:MinBias"], -1],
+        ['mb_sptrk_costr',               'L1_RD0_FILLED', [], ['MinBias'], ["BW:MinBias", "RATE:MinBias"], -1],
+        ['mb_sptrk_costr_L1RD0_EMPTY',   'L1_RD0_EMPTY', [], ['MinBias'], ["BW:MinBias", "RATE:MinBias"], -1],
 
-        ['mb_perf_L1MBTS_2',             969, 'L1_MBTS_2', [], ['MinBias'], ["BW:MinBias", "RATE:MinBias"], -1], 
-        ['mb_mbts_L1MBTS_2',             970, 'L1_MBTS_2', [], ['MinBias'], ["BW:MinBias", "RATE:MinBias"], -1], 
+        ['mb_perf_L1MBTS_2',             'L1_MBTS_2', [], ['MinBias'], ["BW:MinBias", "RATE:MinBias"], -1], 
+        ['mb_mbts_L1MBTS_2',             'L1_MBTS_2', [], ['MinBias'], ["BW:MinBias", "RATE:MinBias"], -1], 
         ]
 
     TriggerFlags.CalibSlice.signatures   = [
-        ['l1calocalib',             6416, 'L1_RD0_FILLED',     [], ['L1CaloCalib'], ["RATE:Calibration", "RATE:L1CaloCalib", "BW:Detector"], -1],
-        ['l1calocalib_L1BGRP7',     6417, 'L1_BGRP7',          [], ['L1CaloCalib'], ["RATE:Calibration", "RATE:L1CaloCalib", "BW:Detector"], -1], 
+        ['larnoiseburst_L1All',       'L1_All',       [], [PhysicsStream], ["BW:Jets", "RATE:SingleJet"], -1],
+        ['larnoiseburst_L1RD0_EMPTY', 'L1_RD0_EMPTY', [], [PhysicsStream], ["BW:Jets", "RATE:SingleJet"], -1],        
+
+        ['l1calocalib',             'L1_RD0_FILLED',     [], ['L1CaloCalib'], ["RATE:Calibration", "RATE:L1CaloCalib", "BW:Detector"], -1],
+        ['l1calocalib_L1BGRP7',     'L1_BGRP7',          [], ['L1CaloCalib'], ["RATE:Calibration", "RATE:L1CaloCalib", "BW:Detector"], -1], 
         
-        ['larcalib_L1EM3_EMPTY',    6418, 'L1_EM3_EMPTY',      [], ['LArCellsEmpty'], ["RATE:Calibration", "BW:Detector"], -1],
-        ['larcalib_L1TAU8_EMPTY',   6419, 'L1_TAU8_EMPTY',     [], ['LArCellsEmpty'], ["RATE:Calibration", "BW:Detector"], -1],
-        ['larcalib_L1J12_EMPTY',    6420, 'L1_J12_EMPTY',      [], ['LArCellsEmpty'], ["RATE:Calibration", "BW:Detector"], -1],
-        ['larcalib_L1J3032ETA49_EMPTY',   6421, 'L1_J30.32ETA49_EMPTY',     [], ['LArCellsEmpty'], ["RATE:Calibration", "BW:Detector"], -1],
+        ['larcalib_L1EM3_EMPTY',    'L1_EM3_EMPTY',      [], ['LArCellsEmpty'], ["RATE:Calibration", "BW:Detector"], -1],
+        ['larcalib_L1TAU8_EMPTY',   'L1_TAU8_EMPTY',     [], ['LArCellsEmpty'], ["RATE:Calibration", "BW:Detector"], -1],
+        ['larcalib_L1J12_EMPTY',    'L1_J12_EMPTY',      [], ['LArCellsEmpty'], ["RATE:Calibration", "BW:Detector"], -1],
+        ['larcalib_L1J3032ETA49_EMPTY',  'L1_J30.32ETA49_EMPTY',     [], ['LArCellsEmpty'], ["RATE:Calibration", "BW:Detector"], -1],
 
         # DCM level monitoring chain for CSC (#104895, ATR-8082)
-        ['larcalib_L1MU10',   6422, 'L1_MU10',     [], ['CSC'], ["RATE:Monitoring", "BW:Detector"], -1],
-        ['larcalib_L1EM3',   6423, 'L1_EM3',     [], ['CSC'], ["RATE:Monitoring", "BW:Detector"], -1],
-        ['larcalib_L1J12',   6424, 'L1_J12',     [], ['CSC'], ["RATE:Monitoring", "BW:Detector"], -1],
+        ['larcalib_L1MU10',   'L1_MU10',     [], ['CSC'], ["RATE:Monitoring", "BW:Detector"], -1],
+        ['larcalib_L1EM3',    'L1_EM3',     [], ['CSC'], ["RATE:Monitoring", "BW:Detector"], -1],
+        ['larcalib_L1J12',    'L1_J12',     [], ['CSC'], ["RATE:Monitoring", "BW:Detector"], -1],
         
-        ['tilelarcalib_L1EM3_EMPTY',    6430, 'L1_EM3_EMPTY',      [], ['LArCellsEmpty'], ["RATE:Calibration", "BW:Detector"], -1],
-        ['tilelarcalib_L1TAU8_EMPTY',   6431, 'L1_TAU8_EMPTY',     [], ['LArCellsEmpty'], ["RATE:Calibration", "BW:Detector"], -1],
-        ['tilelarcalib_L1J12_EMPTY',    6432, 'L1_J12_EMPTY',      [], ['LArCellsEmpty'], ["RATE:Calibration", "BW:Detector"], -1],
-        ['tilelarcalib_L1J3032ETA49_EMPTY',   6433, 'L1_J30.32ETA49_EMPTY',     [], ['LArCellsEmpty'], ["RATE:Calibration", "BW:Detector"], -1],
+        ['tilelarcalib_L1EM3_EMPTY',     'L1_EM3_EMPTY',      [], ['LArCellsEmpty'], ["RATE:Calibration", "BW:Detector"], -1],
+        ['tilelarcalib_L1TAU8_EMPTY',    'L1_TAU8_EMPTY',     [], ['LArCellsEmpty'], ["RATE:Calibration", "BW:Detector"], -1],
+        ['tilelarcalib_L1J12_EMPTY',     'L1_J12_EMPTY',      [], ['LArCellsEmpty'], ["RATE:Calibration", "BW:Detector"], -1],
+        ['tilelarcalib_L1J3032ETA49_EMPTY',   'L1_J30.32ETA49_EMPTY',     [], ['LArCellsEmpty'], ["RATE:Calibration", "BW:Detector"], -1],
 
         #ALFA
-        #['alfa_alfacalib',         6685, 'L1_ALFA_EMPTY', [], ['ALFACalib'], [ 'RATE:ALFACalibration','BW:Detector'], -1],        
+        #['alfa_alfacalib',   'L1_ALFA_EMPTY', [], ['ALFACalib'], [ 'RATE:ALFACalibration','BW:Detector'], -1],        
         ]
 
     TriggerFlags.CosmicSlice.signatures  = [ 
-        #['tilecalib_laser',  6500, 'L1_CALREQ2', [], ['Tile'], ["RATE:Calibration", "RATE:Cosmic_TileCalibration", "BW:Detector"], -1],
-        ['pixel_noise',      6501, 'L1_RD0_EMPTY', [], ['PixelNoise'], ["RATE:Calibration", "RATE:PixelCalibration", "BW:Detector"], -1],
-        ['pixel_beam',       6502, 'L1_RD0_FILLED', [], ['PixelBeam'], ["RATE:Calibration", "RATE:PixelBeamCalibration", "BW:Detector"], -1],
-        ['sct_noise',        6503, 'L1_RD0_EMPTY', [], ['SCTNoise'], ["RATE:Calibration", "RATE:SCTCalibration", "BW:Detector"], -1],
+        ['tilecalib_laser',   'L1_CALREQ2', [], ['Tile'], ["RATE:Calibration", "RATE:Cosmic_TileCalibration", "BW:Detector"], -1],
+        ['pixel_noise',        'L1_RD0_EMPTY', [], ['PixelNoise'], ["RATE:Calibration", "RATE:PixelCalibration", "BW:Detector"], -1],
+        ['pixel_beam',         'L1_RD0_FILLED', [], ['PixelBeam'], ["RATE:Calibration", "RATE:PixelBeamCalibration", "BW:Detector"], -1],
+        ['sct_noise',          'L1_RD0_EMPTY', [], ['SCTNoise'], ["RATE:Calibration", "RATE:SCTCalibration", "BW:Detector"], -1],
         
         # CosmicCalo
-        ['larps_L1EM3_EMPTY',  5060, 'L1_EM3_EMPTY', [], ['CosmicCalo'], ['RATE:CosmicSlice', 'RATE:Cosmic_LArCalibration', 'BW:Detector'], -1],
-        ['larps_L1EM7_EMPTY',  5061, 'L1_EM7_EMPTY', [], ['CosmicCalo'], ['RATE:CosmicSlice', 'RATE:Cosmic_LArCalibration', 'BW:Detector'], -1],
-        ['larps_L1J12_EMPTY',  5062, 'L1_J12_EMPTY', [], ['CosmicCalo'], ['RATE:CosmicSlice', 'RATE:Cosmic_LArCalibration', 'BW:Detector'], -1],
-        ['larps_L1J30_EMPTY',  5063, 'L1_J30_EMPTY', [], ['CosmicCalo'], ['RATE:CosmicSlice', 'RATE:Cosmic_LArCalibration', 'BW:Detector'], -1],
-        ['larps_L1TAU8_EMPTY', 5064, 'L1_TAU8_EMPTY', [], ['CosmicCalo'], ['RATE:CosmicSlice', 'RATE:Cosmic_LArCalibration', 'BW:Detector'], -1],
+        ['larps_L1EM3_EMPTY',  'L1_EM3_EMPTY', [], ['CosmicCalo'], ['RATE:CosmicSlice', 'RATE:Cosmic_LArCalibration', 'BW:Detector'], -1],
+        ['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_L1TAU8_EMPTY', 'L1_TAU8_EMPTY', [], ['CosmicCalo'], ['RATE:CosmicSlice', 'RATE:Cosmic_LArCalibration', 'BW:Detector'], -1],
 
         #JetTauEtmiss 
-        ['larps_L1J12_FIRSTEMPTY', 5065, 'L1_J12_FIRSTEMPTY', [], ['LArCellsEmpty'], ['RATE:CosmicSlice', 'RATE:Cosmic_LArCalibration', 'BW:Detector'], -1],
-        ['larps_L1J30_FIRSTEMPTY', 5066, 'L1_J30_FIRSTEMPTY', [], ['LArCellsEmpty'], ['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],
+
+        ['larhec_L1J12_FIRSTEMPTY', 'L1_J12_FIRSTEMPTY', [], ['LArCellsEmpty'], ['RATE:CosmicSlice', 'RATE:Cosmic_LArCalibration', 'BW:Detector'], -1],
 
         #CosmicID
-        ['id_cosmicid_L1MU4',         5041, 'L1_MU4', [], ['CosmicID', 'express'], ['RATE:CosmicSlice', 'RATE:Cosmic_Tracking', 'BW:Detector'], -1],
-        ['id_cosmicid_L1MU11',        5040, 'L1_MU11', [], ['CosmicID', 'express'], ['RATE:CosmicSlice', 'RATE:Cosmic_Tracking', 'BW:Detector'], -1],
+        ['id_cosmicid_L1MU4',         'L1_MU4', [], ['CosmicID', 'express'], ['RATE:CosmicSlice', 'RATE:CosmicSlice', 'BW:Detector'], -1],
+        ['id_cosmicid_L1MU11',        'L1_MU11', [], ['CosmicID', 'express'], ['RATE:CosmicSlice', 'RATE:Cosmic_Tracking', 'BW:Detector'], -1],
 
-        ['id_cosmicid',               5042, '', [], ['CosmicID', 'express'], ['RATE:CosmicSlice', 'RATE:Cosmic_Tracking', 'BW:Detector'], -1],
-        ['id_cosmicid_trtxk',         5043, '', [], ['CosmicID'], ['RATE:CosmicSlice', 'BW:Detector'], -1],
-        ['id_cosmicid_trtxk_central', 5044, '', [], ['CosmicID'], ['RATE:CosmicSlice', 'BW:Detector'], -1],
+        ['id_cosmicid',               '', [], ['CosmicID', 'express'], ['RATE:CosmicSlice', 'RATE:CosmicSlice', 'BW:Detector'], -1],
+        ['id_cosmicid_trtxk',         '', [], ['CosmicID'], ['RATE:CosmicSlice', 'BW:Detector'], -1],
+        ['id_cosmicid_trtxk_central', '', [], ['CosmicID'], ['RATE:CosmicSlice', 'BW:Detector'], -1],
         
-        ['id_cosmicid_ds',            5045, '', [], ['DataScouting_02_IDCosmic'], ['RATE:CosmicSlice_DS', 'RATE:Cosmic_Tracking_DS', 'BW:Detector'], -1],        
+        # ['id_cosmicid_ds',            '', [], ['DataScouting_04_IDCosmic'], ['RATE:CosmicSlice', 'BW:Detector'], -1],        
 
-      
         ]
     TriggerFlags.StreamingSlice.signatures = [
         #DCM level monitoring test chain
-        ['noalg_dcmmon_L1RD0_EMPTY',        6548, 'L1_RD0_EMPTY',        [], ['monitoring_random'], ["RATE:DISCARD","BW:DISCARD"], -1], 
+        ['noalg_dcmmon_L1RD0_EMPTY',   'L1_RD0_EMPTY',        [], ['monitoring_random'], ["RATE:DISCARD","BW:DISCARD"], -1], 
 
         #background streamers
-        ['noalg_bkg_L1Bkg',              6550, 'L1_Bkg',              [], ['Background'], ["RATE:SeededStreamers", "BW:Other"], -1], 
-        ['noalg_bkg_L1RD0_UNPAIRED_ISO', 6551, 'L1_RD0_UNPAIRED_ISO', [], ['Background'], ["RATE:SeededStreamers", "BW:Other"], -1],
-        ['noalg_bkg_L1RD0_EMPTY',        6552, 'L1_RD0_EMPTY',        [], ['Background'], ["RATE:SeededStreamers", "BW:Other"], -1], 
-        ['noalg_bkg_L1RD1_FILLED',       6549, 'L1_RD1_FILLED',       [], ['Background'], ["RATE:SeededStreamers", "BW:Other"], -1], 
-        
+        ['noalg_bkg_L1Bkg',              'L1_Bkg',              [], ['Background'], ["RATE:SeededStreamers", "BW:Other"], -1], 
+        ['noalg_bkg_L1RD0_UNPAIRED_ISO', 'L1_RD0_UNPAIRED_ISO', [], ['Background'], ["RATE:SeededStreamers", "BW:Other"], -1],
+        ['noalg_bkg_L1RD0_EMPTY',        'L1_RD0_EMPTY',        [], ['Background'], ["RATE:SeededStreamers", "BW:Other"], -1], 
+        ['noalg_bkg_L1RD1_FILLED',       'L1_RD1_FILLED',       [], ['Background'], ["RATE:SeededStreamers", "BW:Other"], -1], 
+
+        ['noalg_L1Standby',              'L1_Standby',          [], ['Standby'],    ["RATE:SeededStreamers", "BW:Other"], -1],         
+        ['noalg_idcosmic_L1TRT',        'L1_TRT',              [], ['IDCosmic'], ["BW:MinBias", "RATE:Minbias"], -1],        
+
         # standby streamer
-        # disabled (ATR-9101) ['noalg_L1Standby',              6553, 'L1_Standby',          [], ['Standby'],    ["RATE:SeededStreamers", "BW:Other"], -1], 
+        # disabled (ATR-9101) ['noalg_L1Standby',  'L1_Standby',          [], ['Standby'],    ["RATE:SeededStreamers", "BW:Other"], -1], 
         #
         # L1 streamers
-        #disabled see #104204   ['noalg_L1Muon',                 6554, 'L1_Muon',             [], ['L1Muon'],     ["RATE:SeededStreamers", "BW:Other"], -1], 
-        #disabled see #104204   ['noalg_L1Muon_EMPTY',           6557, 'L1_Muon_EMPTY',       [], ['L1Muon'],     ["RATE:SeededStreamers", "BW:Other"], -1], 
+        #disabled see #104204   ['noalg_L1Muon',                'L1_Muon',             [], ['L1Muon'],     ["RATE:SeededStreamers", "BW:Other"], -1], 
+        #disabled see #104204   ['noalg_L1Muon_EMPTY',          'L1_Muon_EMPTY',       [], ['L1Muon'],     ["RATE:SeededStreamers", "BW:Other"], -1], 
         
-        ['noalg_L1Calo',                 6555, 'L1_Calo',             [], ['L1Calo'],     ["RATE:L1TopoStreamers", "BW:Other"], -1], 
-        ['noalg_L1MinBias',              6556, 'L1_MinBias',          [], ['L1MinBias'],  ["RATE:L1TopoStreamers", "BW:Other"], -1], 
-        ['noalg_L1Calo_EMPTY',           6558, 'L1_Calo_EMPTY',       [], ['L1Calo'],     ["RATE:L1TopoStreamers", "BW:Other"], -1], 
-        # #['noalg_L1MinBias_EMPTY', 9559, 'L1_MinBias_EMPTY', [], ['L1MinBias'], [], -1], 
+        ['noalg_L1Calo',                  'L1_Calo',             [], ['L1Calo'],     ["RATE:L1TopoStreamers", "BW:Other"], -1], 
+        ['noalg_L1MinBias',               'L1_MinBias',          [], ['L1MinBias'],  ["RATE:L1TopoStreamers", "BW:Other"], -1], 
+        ['noalg_L1Calo_EMPTY',            'L1_Calo_EMPTY',       [], ['L1Calo'],     ["RATE:L1TopoStreamers", "BW:Other"], -1], 
+        # #['noalg_L1MinBias_EMPTY',      'L1_MinBias_EMPTY', [], ['L1MinBias'], [], -1], 
 
         # #minbias streamer
-        ['noalg_mb_L1MBTS_2',         6660, 'L1_MBTS_2',        [], ['MinBias'], ["BW:MinBias", "RATE:MinBias"], -1],
-        ['noalg_mb_L1MBTS_2_UNPAIRED_ISO',         6661, 'L1_MBTS_2_UNPAIRED_ISO',        [], ['MinBias'], ["BW:MinBias", "RATE:SeededStreamers"], -1],
-        ['noalg_mb_L1RD0_EMPTY',         6662, 'L1_RD0_EMPTY',        [], ['MinBias'], ["BW:MinBias", "RATE:Cosmic_Minbias"], -1],
-        ['noalg_mb_L1RD0_FILLED',        6663, 'L1_RD0_FILLED',        [], ['MinBias'], ["BW:MinBias", "RATE:Cosmic_Minbias"], -1],
-        ['noalg_mb_L1RD0_UNPAIRED_ISO',  6664, 'L1_RD0_UNPAIRED_ISO', [], ['MinBias'], ["BW:Unpaired_Minbias", "RATE:Cosmic_Minbias"], -1],
-        ['noalg_mb_L1RD1_EMPTY',         6665, 'L1_RD1_EMPTY',        [], ['MinBias'], ["BW:MinBias", "RATE:Cosmic_Minbias"], -1],
-        ['noalg_mb_L1RD1_FILLED',        6666, 'L1_RD1_FILLED',        [], ['MinBias'], ["BW:MinBias", "RATE:Cosmic_Minbias"], -1],
-        # L1 seed doesn't exits ['noalg_mb_L1RD1_UNPAIRED_ISO',  831, 'L1_RD1_UNPAIRED_ISO', [], ['MinBias'], ["BW:Unpaired_Minbias", "RATE:Cosmic_Minbias"], -1],
+        ['noalg_mb_L1MBTS_2',     'L1_MBTS_2',        [], ['MinBias'], ["BW:MinBias", "RATE:MinBias"], -1],
+        ['noalg_mb_L1MBTS_2_UNPAIRED_ISO',  'L1_MBTS_2_UNPAIRED_ISO',        [], ['MinBias'], ["BW:MinBias", "RATE:SeededStreamers"], -1],
+        ['noalg_mb_L1RD0_EMPTY',          'L1_RD0_EMPTY',        [], ['MinBias'], ["BW:MinBias", "RATE:Cosmic_Minbias"], -1],
+        ['noalg_mb_L1RD0_FILLED',         'L1_RD0_FILLED',        [], ['MinBias'], ["BW:MinBias", "RATE:Cosmic_Minbias"], -1],
+        ['noalg_mb_L1RD0_UNPAIRED_ISO',   'L1_RD0_UNPAIRED_ISO', [], ['MinBias'], ["BW:Unpaired_Minbias", "RATE:Cosmic_Minbias"], -1],
+        ['noalg_mb_L1RD1_EMPTY',          'L1_RD1_EMPTY',        [], ['MinBias'], ["BW:MinBias", "RATE:Cosmic_Minbias"], -1],
+        ['noalg_mb_L1RD1_FILLED',         'L1_RD1_FILLED',        [], ['MinBias'], ["BW:MinBias", "RATE:Cosmic_Minbias"], -1],
+        # L1 seed doesn't exits ['noalg_mb_L1RD1_UNPAIRED_ISO',  'L1_RD1_UNPAIRED_ISO', [], ['MinBias'], ["BW:Unpaired_Minbias", "RATE:Cosmic_Minbias"], -1],
         
         # id cosmic streamer
-        #['noalg_idcosmic_L1TRT',         6667, 'L1_TRT',              [], ['IDCosmic'], ["BW:MinBias", "RATE:Minbias"], -1],
+        #['noalg_idcosmic_L1TRT',    'L1_TRT',              [], ['IDCosmic'], ["BW:MinBias", "RATE:Minbias"], -1],
         
         # Cosmic calo streamer
-        ['noalg_cosmiccalo_L1EM3_EMPTY',         6668, 'L1_EM3_EMPTY',        [], ['CosmicCalo'], ["BW:MinBias", "RATE:Cosmic_Minbias"], -1],        
-        ['noalg_cosmiccalo_L1RD1_EMPTY',         6669, 'L1_RD1_EMPTY',        [], ['CosmicCalo'], ["BW:MinBias", "RATE:Cosmic_Minbias"], -1],        
-        ['noalg_cosmiccalo_L1J3032ETA49_EMPTY',  6670, 'L1_J30.32ETA49_EMPTY',[], ['CosmicCalo'], ["BW:Jets", "RATE:SingleJet"], -1],
-        ['noalg_cosmiccalo_L1J12_EMPTY',         6671, 'L1_J12_EMPTY',        [], ['CosmicCalo', 'express'], ["BW:Jets", "RATE:SingleJet"], -1],
-        ['noalg_cosmiccalo_L1J30_EMPTY',         6672, 'L1_J30_EMPTY',        [], ['CosmicCalo', 'express'], ["BW:Jets", "RATE:SingleJet"], -1],
-        ['noalg_cosmiccalo_L1J12_FIRSTEMPTY',    6673, 'L1_J12_FIRSTEMPTY',   [], ['CosmicCalo', 'express'], ["BW:Jets", "RATE:SingleJet"], -1],
-        ['noalg_cosmiccalo_L1J30_FIRSTEMPTY',    6674, 'L1_J30_FIRSTEMPTY',   [], ['CosmicCalo', 'express'], ["BW:Jets", "RATE:SingleJet"], -1],
+        ['noalg_cosmiccalo_L1EM3_EMPTY',         'L1_EM3_EMPTY',        [], ['CosmicCalo'], ["BW:MinBias", "RATE:Cosmic_Calo"], -1],        
+        ['noalg_cosmiccalo_L1RD1_EMPTY',         'L1_RD1_EMPTY',        [], ['CosmicCalo'], ["BW:MinBias", "RATE:Cosmic_Calo"], -1],        
+        ['noalg_cosmiccalo_L1J3032ETA49_EMPTY',  'L1_J30.32ETA49_EMPTY',[], ['CosmicCalo'], ["BW:Jets", "RATE:CosmicCalo"], -1],
+        ['noalg_cosmiccalo_L1J12_EMPTY',         'L1_J12_EMPTY',        [], ['CosmicCalo', 'express'], ["BW:Jets", "RATE:CosmicCalo"], -1],
+        ['noalg_cosmiccalo_L1J30_EMPTY',         'L1_J30_EMPTY',        [], ['CosmicCalo', 'express'], ["BW:Jets", "RATE:CosmicCalo"], -1],
+        ['noalg_cosmiccalo_L1J12_FIRSTEMPTY',    'L1_J12_FIRSTEMPTY',   [], ['CosmicCalo', 'express'], ["BW:Jets", "RATE:CosmicCalo"], -1],
+        ['noalg_cosmiccalo_L1J30_FIRSTEMPTY',    'L1_J30_FIRSTEMPTY',   [], ['CosmicCalo', 'express'], ["BW:Jets", "RATE:CosmicCalo"], -1],
         
         #HLT pass through
-        ['noalg_L1All',                  6675, 'L1_All',              [], ['HLTPassthrough'], ["RATE:Calibration", "BW:Detector"], -1],
-        ['noalg_L1J12',                  6676, 'L1_J12',              [], ['HLTPassthrough'], ["RATE:Calibration", "BW:Detector"], -1],
-        ['noalg_L1TAU8',                 6677, 'L1_TAU8',             [], ['HLTPassthrough'], ["RATE:Calibration", "BW:Detector"], -1],
-        ['noalg_L1EM3',                  6559, 'L1_EM3',             [],  ['HLTPassthrough'], ["RATE:Calibration", "BW:Detector"], -1],
+        ['noalg_L1All',                  'L1_All',              [], ['HLTPassthrough'], ["RATE:SeededStreamers", "BW:Detector"], -1],
+        ['noalg_L1J12',                  'L1_J12',              [], ['HLTPassthrough'], ["RATE:SeededStreamers", "BW:Detector"], -1],
+        ['noalg_L1TAU8',                 'L1_TAU8',             [], ['HLTPassthrough'], ["RATE:SeededStreamers", "BW:Detector"], -1],
+        ['noalg_L1EM3',                  'L1_EM3',             [],  ['HLTPassthrough'], ["RATE:SeededStreamers", "BW:Detector"], -1],
         
         # jettauetmiss streamer
-        ['noalg_jettauetmiss_L1RD0_FIRSTEMPTY',   6678, 'L1_RD0_FIRSTEMPTY',  [], ['JetTauEtmiss'], ["RATE:Calibration", "BW:Detector"], -1],
+        ['noalg_jettauetmiss_L1RD0_FIRSTEMPTY',  'L1_RD0_FIRSTEMPTY',  [], ['JetTauEtmiss'], ["RATE:SeededStreamers", "BW:Detector"], -1],
         
         # Enhanced bias item
-        ['noalg_eb_L1BGRP7',                  6679, 'L1_BGRP7',              [], ['EnhancedBias'], ["RATE:Calibration", "BW:Detector"], -1],
-        #['noalg_eb_L1RD1_FILLED',             7000, 'L1_RD1_FILLED',        [], ['EnhancedBias'], ["Supporting", "Calibration", "BW:Detector"], -1],
-        ['noalg_eb_L1RD0_EMPTY',             7001, 'L1_RD0_EMPTY',         [], ['EnhancedBias'], ["RATE:Calibration", "BW:Detector"], -1],
-        #['noalg_eb_L1RD0_FIRSTEMPTY',         7002, 'L1_RD0_FIRSTEMPTY',    [], ['EnhancedBias'], ["Supporting", "Calibration", "BW:Detector"], -1],
-        #['noalg_eb_L1RD0_UNPAIRED_ISO',        7003, 'L1_RD0_UNPAIRED_ISO',  [], ['EnhancedBias'], ["Supporting", "Calibration", "BW:Detector"], -1],
-        #['noalg_eb_L1Physics_noPS'   ,        7004, 'L1_Physics_noPS',      [], ['EnhancedBias'], ["Supporting", "Calibration", "BW:Detector"], -1],
+        ['noalg_eb_L1BGRP7',                  'L1_BGRP7',              [], ['EnhancedBias'], ["RATE:EnhancedBias", "BW:Detector"], -1],
+        #['noalg_eb_L1RD1_FILLED',            'L1_RD1_FILLED',        [], ['EnhancedBias'], ["RATE:EnhancedBias", "BW:Detector"], -1],
+        ['noalg_eb_L1RD0_EMPTY',             'L1_RD0_EMPTY',         [], ['EnhancedBias'], ["RATE:EnhancedBias", "BW:Detector"], -1],
+        #['noalg_eb_L1RD0_FIRSTEMPTY',         'L1_RD0_FIRSTEMPTY',    [], ['EnhancedBias'], ["RATE:EnhancedBias", "BW:Detector"], -1],
+        #['noalg_eb_L1RD0_UNPAIRED_ISO',        'L1_RD0_UNPAIRED_ISO',  [], ['EnhancedBias'], ["RATE:EnhancedBias", "BW:Detector"], -1],
+        #['noalg_eb_L1Physics_noPS'   ,        'L1_Physics_noPS',      [], ['EnhancedBias'], ["RATE:EnhancedBias", "BW:Detector"], -1],
         
         #idmon streamer
-        ['noalg_idmon_L1RD0_EMPTY',         6680, 'L1_RD0_EMPTY',        [], ['IDMonitoring'], ["RATE:DISCARD","BW:DISCARD"], -1],
-        ['noalg_idmon_L1RD0_FILLED',        6681, 'L1_RD0_FILLED',        [], ['IDMonitoring'], ["RATE:DISCARD","BW:DISCARD"], -1],
-        ['noalg_idmon_L1RD0_UNPAIRED_ISO',  6682, 'L1_RD0_UNPAIRED_ISO', [], ['IDMonitoring'], ["RATE:DISCARD","BW:DISCARD"], -1],
+        ['noalg_idmon_L1RD0_EMPTY',          'L1_RD0_EMPTY',        [], ['IDMonitoring'], ["RATE:DISCARD","BW:DISCARD"], -1],
+        ['noalg_idmon_L1RD0_FILLED',         'L1_RD0_FILLED',        [], ['IDMonitoring'], ["RATE:DISCARD","BW:DISCARD"], -1],
+        ['noalg_idmon_L1RD0_UNPAIRED_ISO',   'L1_RD0_UNPAIRED_ISO', [], ['IDMonitoring'], ["RATE:DISCARD","BW:DISCARD"], -1],
         
         #cosmicmuon streamer
-        ['noalg_cosmicmuons_L1MU4_EMPTY',  6683, 'L1_MU4_EMPTY',        [], ['CosmicMuons'], ["RATE:Cosmic_Muon", "BW:Muon"], -1],        
-        ['noalg_cosmicmuons_L1MU11_EMPTY', 6684, 'L1_MU11_EMPTY',        [], ['CosmicMuons'], ["RATE:Cosmic_Muon", "BW:Muon"], -1],        
+        ['noalg_cosmicmuons_L1MU4_EMPTY',   'L1_MU4_EMPTY',        [], ['CosmicMuons'], ["RATE:Cosmic_Muon", "BW:Muon"], -1],        
+        ['noalg_cosmicmuons_L1MU11_EMPTY',  'L1_MU11_EMPTY',        [], ['CosmicMuons'], ["RATE:Cosmic_Muon", "BW:Muon"], -1],        
+
+        # L1Topo streamers for M8
+        ['noalg_L14INVM9999-AJ0s6-AJ0s6',   'L1_4INVM9999-AJ0s6-AJ0s6',   [], [PhysicsStream], ["RATE:L1TopoStreamers", "BW:Other"], -1 ],
+        ['noalg_L13INVM9999-AJ0s6-AJ0s6',   'L1_3INVM9999-AJ0s6-AJ0s6',   [], [PhysicsStream], ["RATE:L1TopoStreamers", "BW:Other"], -1 ],
+        ['noalg_L12INVM9999-AJ0s6-AJ0s6',   'L1_2INVM9999-AJ0s6-AJ0s6',   [], [PhysicsStream], ["RATE:L1TopoStreamers", "BW:Other"], -1 ],
+        ['noalg_L11INVM9999-AJ0s6-AJ0s6',   'L1_1INVM9999-AJ0s6-AJ0s6',   [], [PhysicsStream], ["RATE:L1TopoStreamers", "BW:Other"], -1 ],
+        
+        ['noalg_L1350INVM9999-J30s6-J20s6',   'L1_350INVM9999-J30s6-J20s6',   [], [PhysicsStream], ["RATE:L1TopoStreamers", "BW:Other"], -1 ],
+        ['noalg_L1300INVM9999-J30s6-J20s6',   'L1_300INVM9999-J30s6-J20s6',   [], [PhysicsStream], ["RATE:L1TopoStreamers", "BW:Other"], -1 ],
+        ['noalg_L1250INVM9999-J30s6-J20s6',   'L1_250INVM9999-J30s6-J20s6',   [], [PhysicsStream], ["RATE:L1TopoStreamers", "BW:Other"], -1 ],
+        ['noalg_L1200INVM9999-J30s6-J20s6',   'L1_200INVM9999-J30s6-J20s6',   [], [PhysicsStream], ["RATE:L1TopoStreamers", "BW:Other"], -1 ], 
+        
+        ['noalg_L1HT200-AJ20s5.ETA49', 'L1_HT200-AJ20s5.ETA49', [], [PhysicsStream], ["RATE:L1TopoStreamers", "BW:Other"], -1 ],
+        ['noalg_L1HT190-AJ20s5.ETA49', 'L1_HT190-AJ20s5.ETA49', [], [PhysicsStream], ["RATE:L1TopoStreamers", "BW:Other"], -1 ],
+        ['noalg_L1HT1-AJ0all.ETA49',   'L1_HT1-AJ0all.ETA49',   [], [PhysicsStream], ["RATE:L1TopoStreamers", "BW:Other"], -1 ],
+        
+        ['noalg_L11INVM5-EMs2-EMs',  'L1_1INVM5-EMs2-EMs',  [], [PhysicsStream], ["RATE:L1TopoStreamers", "BW:Other"], -1 ],
+        ['noalg_L11INVM5-EM6s2-EMs', 'L1_1INVM5-EM6s2-EMs', [], [PhysicsStream], ["RATE:L1TopoStreamers", "BW:Other"], -1 ],
+        ['noalg_L11INVM5-EM12s2-EMs','L1_1INVM5-EM12s2-EMs',[], [PhysicsStream], ["RATE:L1TopoStreamers", "BW:Other"], -1 ],
 
+        ['noalg_L10DETA10-Js1-Js2',         'L1_0DETA10-Js1-Js2',   [], [PhysicsStream], ["RATE:L1TopoStreamers", "BW:Other"], -1 ],
+        
         ]
 
     TriggerFlags.MonitorSlice.signatures = [
         ## # enhancedbias
-        ['timeburner', 6010, '', [], ['DISCARD'], ["RATE:DISCARD","BW:DISCARD"], -1],
-        ['robrequest', 6011, '', [], ['DISCARD'], ["RATE:DISCARD","BW:DISCARD"], -1],
-        ['robrequest_L1RD0_EMPTY', 6012, 'L1_RD0_EMPTY', [], ['DISCARD'], ["RATE:DISCARD","BW:DISCARD"], -1],   
+        ['timeburner', '', [], ['DISCARD'], ["RATE:DISCARD","BW:DISCARD"], -1],
+        ['robrequest', '', [], ['DISCARD'], ["RATE:DISCARD","BW:DISCARD"], -1],
+        ['robrequest_L1RD0_EMPTY', 'L1_RD0_EMPTY', [], ['DISCARD'], ["RATE:DISCARD","BW:DISCARD"], -1],   
         
-        ['costmonitor', 6013, '', [], ['CostMonitoring'], ['RATE:Monitoring','BW:Other'],1],
+        ['costmonitor', '', [], ['CostMonitoring'], ['RATE:Monitoring','BW:Other'],1],
+
+        ['cscmon_L1MU10',   'L1_MU10',     [], ['CSC'], ["RATE:Monitoring", "BW:Detector"], -1],
+        ['cscmon_L1EM3',    'L1_EM3',     [], ['CSC'], ["RATE:Monitoring", "BW:Detector"], -1],
+        ['cscmon_L1J12',    'L1_J12',     [], ['CSC'], ["RATE:Monitoring", "BW:Detector"], -1],
+
         
-        ## check L1 ['idmon_trkFS_L14J15', 5514, 'L1_4J15', [], [PhysicsStream], ['RATE:InDetTracking', 'BW:Detector'], -1],
+        ## check L1 ['idmon_trkFS_L14J15', 'L1_4J15', [], [PhysicsStream], ['RATE:InDetTracking', 'BW:Detector'], -1],
 
         ]
 
     TriggerFlags.EnhancedBiasSlice.signatures = [
-        #['eb_physics_L1RD1_FILLED',             7002, 'L1_RD1_FILLED',         [], ['EnhancedBias'], ["Supporting", "Calibration", "BW:Detector"], -1],
-        #['eb_low_L1RD0_FILLED',                   7010, 'L1_RD0_FILLED',         [], ['EnhancedBias'], ["Supporting", "Calibration", "BW:Detector"], -1],
-        #['eb_high_L1RD0_FILLED',              7014, 'L1_RD0_FILLED',         [], ['EnhancedBias'], ["Supporting", "Calibration", "BW:Detector"], -1],
-        ['eb_empty_L1RD0_EMPTY',             7011, 'L1_RD0_EMPTY',         [], ['EnhancedBias'], ["RATE:EnhancedBias", "BW:Detector"], -1],
-        #['eb_firstempty_L1RD0_FIRSTEMPTY',    7012, 'L1_RD0_FIRSTEMPTY',         [], ['EnhancedBias'], ["Supporting", "Calibration", "BW:Detector"], -1],
-        # ['eb_unpairediso_L1RD0_UNPAIRED_ISO', 7013, 'L1_RD0_UNPAIRED_ISO',         [], ['EnhancedBias'], ["Supporting", "Calibration", "BW:Detector"], -1],
+        #['eb_physics_L1RD1_FILLED',              'L1_RD1_FILLED',         [], ['EnhancedBias'], ["RATE:EnhancedBias", "BW:Detector"], -1],
+        #['eb_low_L1RD0_FILLED',                  'L1_RD0_FILLED',         [], ['EnhancedBias'], ["RATE:EnhancedBias", "BW:Detector"], -1],
+        #['eb_high_L1RD0_FILLED',                 'L1_RD0_FILLED',         [], ['EnhancedBias'], ["RATE:EnhancedBias", "BW:Detector"], -1],
+        ['eb_empty_L1RD0_EMPTY',                  'L1_RD0_EMPTY',         [], ['EnhancedBias'], ["RATE:EnhancedBias", "BW:Detector"], -1],
+        #['eb_firstempty_L1RD0_FIRSTEMPTY',       'L1_RD0_FIRSTEMPTY',         [], ['EnhancedBias'], ["RATE:EnhancedBias", "BW:Detector"], -1],
+        # ['eb_unpairediso_L1RD0_UNPAIRED_ISO',   'L1_RD0_UNPAIRED_ISO',         [], ['EnhancedBias'], ["RATE:EnhancedBias", "BW:Detector"], -1],
         ]
 
     #TriggerFlags.GenericSlice.signatures = []
diff --git a/Trigger/TriggerCommon/TriggerMenu/python/menu/SignatureDicts.py b/Trigger/TriggerCommon/TriggerMenu/python/menu/SignatureDicts.py
index 742b5b061a9..a9edaaffb13 100644
--- a/Trigger/TriggerCommon/TriggerMenu/python/menu/SignatureDicts.py
+++ b/Trigger/TriggerCommon/TriggerMenu/python/menu/SignatureDicts.py
@@ -35,7 +35,6 @@ SliceIDDict = {
 #==========================================================
 ChainDictTemplate = {
     'chainName'    : '',
-    'chainCounter' : (int),
     'L1item'        : '',
     'topo'          : '',
     'signatures'    : '',
@@ -50,8 +49,8 @@ ChainDictTemplate = {
 #==========================================================
 # ----- Allowed HLT Topo Keywords (in addition to generic topos like DR, DETA, DPHI...)
 #==========================================================
-AllowedTopos_e = ["Jpsiee","Zeg"]
-AllowedTopos_mu = ['Jpsimumu', 'JpsimumuL2']
+AllowedTopos_e = ["Jpsiee","Zeg","Zee"]
+AllowedTopos_mu = ['Jpsimumu']
 AllowedTopos_xe = ['dphi1','razor140', 'razor170', 'razor200']
 # AllowedTopos_bphys = ['bJpsi', 'bTau', 'bDiMu', 
 #                       'bJpsiMuMu', 'bUpsiMuMu', 
@@ -69,7 +68,8 @@ AllowedTopos_bphys = ['bJpsi', 'bTau', 'bDimu',
                       'BcmumuDs' ,   'BcmumuDsloose' , 
                       '7invm9', 'noos', 'noid', 'novtx',
                       '11invm60','18invm60', 'bUpsi',
-                      'Trkloose', 'Zmumu']
+                      'Trkloose', 'Zmumu',
+                      'noinvm', 'ss', 'BpmumuKp']
 AllowedTopos_jet = ['muvtx',
                     'llp',
                     'deta2', 
@@ -89,7 +89,7 @@ JetChainParts = {
     'chainPartName': '',
     'threshold'    : '',
     'multiplicity' : '',
-    'etaRange'     : ['0eta320','0eta240', '240eta490','280eta320', '320eta490'],
+    'etaRange'     : ['0eta490','0eta320','0eta240', '240eta490','280eta320', '320eta490'],
     'trigType'     : ['j'],
     'extra'        : ['noL1',],
     'recoAlg'      : ["a4", "a10", "a10r"],
@@ -173,7 +173,7 @@ MuonChainParts = {
     'reccalibInfo'   : ['msonly', 'idperf','muoncalib'],
     'trkInfo'        : ['fasttr', 'hlttr', 'ftk', 'IDT'],
     'hypoInfo'       : [],
-    'FSinfo'         : ['ftkFS', 'nscan03', 'l2nscan03', 'nscan05', 'l2nscan05', 'JpsimumuFS'],
+    'FSinfo'         : ['ftkFS', 'nscan03', 'l2nscan03', 'nscan05', 'l2nscan05', 'JpsimumuFS', 'JpsimumuL2'],
     'L2IDAlg'        : ['L2Star','IdScan','FTK'],
     'L2SAAlg'        : ['muFast', 'l2muonSA',],
     'L2CBAlg'        : ['muComb',],
@@ -336,11 +336,8 @@ ElectronChainParts = {
     'caloInfo'       : ['L2EFCalo','HLTCalo'],
     'lhInfo'         : ['cutd0dphi','nod0','nodphi','nodphires'],
     'L2IDAlg'        : ['L2StarA','L2StarB','L2StarC','FTK','TRT','SiTrack','IdScan'],
-    'addInfo'        : ['etcut','etcutTrk','noCut','ringer','conv','etisem',
-                        'L2StarABrem',
-                        'L2Star', 
-                        'L2ET21', 'L2ET22', 'L2ET23', 'L2ET24','perf','IdTest'
-                        ],
+    'addInfo'        : ['etcut','ringer','conv','etisem','gsf',
+                        'L2Star','perf','IdTest'],
     }
 # ---- Egamma Dictinary of default Values ----
 ElectronChainParts_Default = {
@@ -498,6 +495,7 @@ MinBiasChainParts_Default = {
 # ---- CosmicDef chains -----
 #==========================================================
 AllowedCosmicChainIdentifiers = ['larps',
+                                 'larhec',
                                  'tilecalib', 
                                  'pixel', 'sct', 
                                  'id',]
@@ -570,7 +568,7 @@ StreamingChainParts_Default = {
 #==========================================================
 # ---- CalibDef chains -----
 #==========================================================
-AllowedCalibChainIdentifiers = ['csccalib','larcalib', 'idcalib', 'l1calocalib', 'tilelarcalib','alfacalib']
+AllowedCalibChainIdentifiers = ['csccalib','larcalib', 'idcalib', 'l1calocalib', 'tilelarcalib','alfacalib','larnoiseburst']
 
 # ---- Calib Chain Dictinary of all allowed Values ----
 CalibChainParts = {
@@ -705,15 +703,15 @@ BeamspotChainParts_Default = {
     'chainPartName'  : '',
     'L1item'       : '',
     'monType'        : [],
-    'addInfo'        : [],
+    'addInfo'        : ['activeTE'],
     'hypo'           : [],
-    'l2IDAlg'        : [],
+    'l2IDAlg'        : ['L2StarB'],
     'threshold'      : '',
     'multiplicity'   : '',
-    'location'   : '',
-    'trigType'       : '', 
+    'location'   : 'vtx',
+    'trigType'       : 'beamspot', 
     'extra'          : '',
-    'eventBuildType' : [],
+    'eventBuildType' : ['peb'],
     }
 
 #==========================================================
diff --git a/Trigger/TriggerCommon/TriggerMenu/python/menu/StreamInfo.py b/Trigger/TriggerCommon/TriggerMenu/python/menu/StreamInfo.py
index 1d6a158f490..ea77bf8a564 100644
--- a/Trigger/TriggerCommon/TriggerMenu/python/menu/StreamInfo.py
+++ b/Trigger/TriggerCommon/TriggerMenu/python/menu/StreamInfo.py
@@ -3,55 +3,64 @@
 from AthenaCommon.Logging import logging
 log = logging.getLogger( 'TriggerMenu.menu.StreamInfo' )
 
+monStreams = ['monitoring_random', 
+              'CSC',
+              ]
 
+physicsStreams = ['Main',
+                  'Physics',
+                  'DISCARD',
+                  'Egamma', 
+                  'Bphysics',
+                  'Combined',
+                  'Muon', 
+                  'Met', 'Jet', 'Tau', 
+                  'MinBias',
+                  'Standby', 
+                  'L1Muon', 'L1Calo', 'L1MinBias', 
+                  'IDCosmic','CosmicCalo',
+                  'HLTPassthrough',
+                  'JetTauEtmiss', # needed for LS1menu
+                  'EnhancedBias',
+                  'IDMonitoring',
+                  'CosmicMuons',
+                  'HLT_IDCosmic',
+                  'CosmicID',
+                  ]
 
-def getStreamTag(streams):
+calibStreams = ['Background', 
+                'Tile', 
+                'L1CaloCalib', 
+                'LArCellsEmpty',
+                'PixelNoise', 'PixelBeam', 
+                'SCTNoise',
+                'CostMonitoring',
+                'beamspot',
+                'Muon_Calibration',
+                'ALFACalib'
+                ]
 
-    monStreams = ['monitoring_random', 
-                  'CSC',
-                  ]
+##NOTE: DataScouting_xx_NAME: 
+##xx stands for the unique ROB_ID associated with the stream. If you add a new one,
+##make sure to use a unique number
+dataScoutingStreams = ['DataScouting_01_CosmicMuons',
+                       'DataScouting_02_CosmicMuons',
+                       'DataScouting_03_CosmicMuons',
+                       'DataScouting_04_IDCosmic',                    
+                       'DataScouting_05_Jets',
+                       'DataScouting_06_Jets',
+                       ]
+
+expressStreams = ['express']
+
+
+def getAllStreams():
+
+    return monStreams + physicsStreams + calibStreams + dataScoutingStreams + expressStreams
+
+
+def getStreamTag(streams):
 
-    physicsStreams = ['Main',
-                      'Physics',
-                      'DISCARD',
-                      'Egamma', 
-                      'Bphysics',
-                      'Combined',
-                      'Muon', 
-                      'Met', 'Jet', 'Tau', 
-                      'MinBias',
-                      'Standby', 
-                      'L1Muon', 'L1Calo', 'L1MinBias', 
-                      'IDCosmic','CosmicCalo',
-                      'HLTPassthrough',
-                      'JetTauEtmiss', # needed for LS1menu
-                      'EnhancedBias',
-                      'IDMonitoring',
-                      'CosmicMuons',
-                      'HLT_IDCosmic',
-                      'CosmicID',
-                      ]
-
-    calibStreams = ['Background', 
-                    'Tile', 
-                    'L1CaloCalib', 
-                    'LArCellsEmpty',
-                    'PixelNoise', 'PixelBeam', 
-                    'SCTNoise',
-                    'CostMonitoring',
-                    'beamspot',
-                    'Muon_Calibration',
-                    'ALFACalib'
-                    ]
-    dataScoutingStreams = ['DataScouting_01_CosmicMuons',
-                           'DataScouting_02_CosmicMuons',
-                           'DataScouting_03_CosmicMuons',
-                           'DataScouting_02_IDCosmic',                    
-                           'DataScouting_01_Jets',
-                           'DataScouting_02_Jets',
-                           ]
-
-    expressStreams = ['express']
 
     # stream is a tuple (stream, type, obeyLB, prescale)
     streamTags = []
diff --git a/Trigger/TriggerCommon/TriggerMenu/python/menu/TriggerPythonConfig.py b/Trigger/TriggerCommon/TriggerMenu/python/menu/TriggerPythonConfig.py
index 654574c5a57..e5f73d36195 100755
--- a/Trigger/TriggerCommon/TriggerMenu/python/menu/TriggerPythonConfig.py
+++ b/Trigger/TriggerCommon/TriggerMenu/python/menu/TriggerPythonConfig.py
@@ -472,6 +472,7 @@ items in BGRP1"""
         """ Adds HLT sequences to TPC """
         outTE = theHLTSequence.output
         inTE = theHLTSequence.input
+        topo_starts_from = theHLTSequence.topo_starts_from
         algolist = theHLTSequence.algs
         
         if outTE in self.theSeqDict.iterkeys():
diff --git a/Trigger/TriggerCommon/TriggerMenu/python/met/MissingETDef.py b/Trigger/TriggerCommon/TriggerMenu/python/met/MissingETDef.py
index 766bc2d8d1d..7ea7baa10f4 100644
--- a/Trigger/TriggerCommon/TriggerMenu/python/met/MissingETDef.py
+++ b/Trigger/TriggerCommon/TriggerMenu/python/met/MissingETDef.py
@@ -80,7 +80,7 @@ class L2EFChain_met(L2EFChainDef):
         #--------------------------------------
         logMETDef.info("Creating muon sequence")
         
-        chain = ['mu8', 9100, 'L1_MU6',  [], ["Main"], ['RATE:SingleMuon', 'BW:Muon'], -1]
+        chain = ['mu8', 'L1_MU6',  [], ["Main"], ['RATE:SingleMuon', 'BW:Muon'], -1]
 
         from TriggerMenu.menu import DictFromChainName
         theDictFromChainName = DictFromChainName.DictFromChainName()
@@ -89,7 +89,7 @@ class L2EFChain_met(L2EFChainDef):
         listOfChainDicts = splitChainDict(muonChainDict)
         muDict = listOfChainDicts[0]
         from TriggerMenu.muon.MuonDef import L2EFChain_mu
-
+        muDict['chainCounter'] = 9150
         muonthing = L2EFChain_mu(muDict, False, ['8GeV']) 
         muonSeed = muonthing.EFsignatureList[-1][0][0]
 
diff --git a/Trigger/TriggerCommon/TriggerMenu/python/minbias/MinBiasDef.py b/Trigger/TriggerCommon/TriggerMenu/python/minbias/MinBiasDef.py
index 856181269f9..0f3855aa1ec 100644
--- a/Trigger/TriggerCommon/TriggerMenu/python/minbias/MinBiasDef.py
+++ b/Trigger/TriggerCommon/TriggerMenu/python/minbias/MinBiasDef.py
@@ -16,7 +16,6 @@ from AthenaCommon.AthenaCommonFlags import athenaCommonFlags
 import re
 
 from TriggerJobOpts.TriggerFlags            import TriggerFlags
-from TriggerMenu.menu.Lvl1Flags             import Lvl1Flags
 
 from TriggerMenu.minbias.MinBiasSliceFlags  import MinBiasSliceFlags
 
diff --git a/Trigger/TriggerCommon/TriggerMenu/python/muon/MuonDef.py b/Trigger/TriggerCommon/TriggerMenu/python/muon/MuonDef.py
index 23536704044..0e8a2215f64 100755
--- a/Trigger/TriggerCommon/TriggerMenu/python/muon/MuonDef.py
+++ b/Trigger/TriggerCommon/TriggerMenu/python/muon/MuonDef.py
@@ -67,6 +67,8 @@ class L2EFChain_mu(L2EFChainDef):
           and not self.chainPart['reccalibInfo'] \
           and "cosmicEF" not in self.chainPart['addInfo']:
       self.setup_muXX_ID()
+    elif "JpsimumuL2" in self.chainPart['FSinfo']:
+      self.setup_muXX_JPsiL2()
     elif "nscan" in self.chainPart['FSinfo']:
       self.setup_muXX_NS()
     elif self.chainPart['extra'] or "JpsimumuFS" in self.chainPart['FSinfo']:
@@ -381,6 +383,79 @@ class L2EFChain_mu(L2EFChainDef):
 
 
                                       
+  #################################################################################################
+  #################################################################################################
+
+  def setup_muXX_JPsiL2(self):
+
+    L2AlgName = self.getL2AlgName()
+    muFastThresh = self.getMuFastThresh()
+		    
+    #--- L2 algos ---
+    if "l2muonSA" in self.chainPart['L2SAAlg']:
+      from TrigL2MuonSA.TrigL2MuonSAConfig import TrigL2MuonSAConfig
+      theL2StandAloneAlg  = TrigL2MuonSAConfig(L2AlgName)
+      from TrigMuonHypo.TrigMuonHypoConfig import MufastHypoConfig
+      theL2StandAloneHypo = MufastHypoConfig(L2AlgName, muFastThresh)
+    else:
+      logMuonDef.error("Chain built with %s but so far only l2muonSA is supported." % (self.chainPart['L2SAAlg']))
+      return False
+
+    from TrigFastTrackFinder.TrigFastTrackFinder_Config import TrigFastTrackFinder_Muon
+    theTrigFastTrackFinder_Muon = TrigFastTrackFinder_Muon()
+    from InDetTrigRecExample.EFInDetConfig import TrigEFIDSequence
+    theTrigEFIDDataPrep_Muon = TrigEFIDSequence("Muon","muon","DataPrep").getSequence()
+    
+    id_alg_output = "TrigFastTrackFinder_Muon" 
+    if "muComb" in self.chainPart['L2CBAlg']:
+      muCombThresh = self.getMuCombThresh()
+      from TrigmuComb.TrigmuCombConfig import TrigmuCombConfig
+      theL2CombinedAlg  = TrigmuCombConfig(L2AlgName, id_alg_output)
+      from TrigMuonHypo.TrigMuonHypoConfig import MucombHypoConfig
+      theL2CombinedHypo = MucombHypoConfig(L2AlgName, muCombThresh)
+    else:
+      logMuonDef.error("Chain built with %s but so far only muComb is supported." % (self.chainPart['L2CBAlg']))
+      return False
+                   
+    from TrigInDetConf.TrigInDetSequence import TrigInDetSequence
+    [theFastTrackFinderxAOD] = TrigInDetSequence("Muon","muon","FastxAOD").getSequence()
+    
+    from TrigBphysHypo.TrigL2BMuMuFexConfig import L2BMuMuFex_Jpsi
+    theL2JpsimumuAlgo = L2BMuMuFex_Jpsi()
+    from TrigBphysHypo.TrigL2BMuMuHypoConfig import L2BMuMuHypo_Jpsi
+    theL2JpsimumuHypo = L2BMuMuHypo_Jpsi()
+
+    #----Sequence list---
+    self.L2sequenceList += [[self.L2InputTE,
+                             [theL2StandAloneAlg , theL2StandAloneHypo],
+                             'L2_mu_step1']] 
+
+    EFinputTE = ''
+
+    self.L2sequenceList += [[['L2_mu_step1'],
+    			      theTrigEFIDDataPrep_Muon+
+    			     [theTrigFastTrackFinder_Muon]+theFastTrackFinderxAOD+
+    			     [theL2CombinedAlg,
+    			      theL2CombinedHypo],
+    			     'L2_mu_step2']]
+			     
+    self.L2sequenceList += [[['L2_mu_step2']*self.mult,
+                             [theL2JpsimumuAlgo,theL2JpsimumuHypo],
+                             'L2_mu_step3']]
+
+    #--- adding signatures ----
+    self.L2signatureList += [ [['L2_mu_step1']*self.mult] ]
+    self.L2signatureList += [ [['L2_mu_step2']*self.mult] ]
+    self.L2signatureList += [ [['L2_mu_step3']] ]
+      
+    #--- renaming TEs ---
+    self.TErenamingDict = {
+      'L2_mu_step1': mergeRemovingOverlap('L2_mu_SA_', L2AlgName+muFastThresh+'_'+self.L2InputTE),
+      'L2_mu_step2': mergeRemovingOverlap('L2_mucomb_',   self.chainPartNameNoMult.replace('_'+self.chainPart['isoInfo'], '')+'_'+self.L2InputTE),
+      'L2_mu_step3': mergeRemovingOverlap('L2_JPsimumu_',   self.chainPartNameNoMult.replace('_'+self.chainPart['isoInfo'], '')+'_'+self.L2InputTE),
+      }    
+
+                                      
   #################################################################################################
   #################################################################################################
 
diff --git a/Trigger/TriggerCommon/TriggerMenu/python/tau/TauDef.py b/Trigger/TriggerCommon/TriggerMenu/python/tau/TauDef.py
index 0ad6134fef4..d6e8c8eed16 100644
--- a/Trigger/TriggerCommon/TriggerMenu/python/tau/TauDef.py
+++ b/Trigger/TriggerCommon/TriggerMenu/python/tau/TauDef.py
@@ -184,12 +184,15 @@ class L2EFChain_tau(L2EFChainDef):
 
             # Get the necessary fexes
             from TrigInDetConf.TrigInDetSequence import TrigInDetSequence
-            [trkcore, trkprec] = TrigInDetSequence("Tau", "tau", "IDTrig").getSequence()
-            ftracks = trkcore
+            [trkfast, trkprec] = TrigInDetSequence("Tau", "tau", "IDTrig").getSequence()
             
+            # Use cosmic-specific tracking algorithm
+            if selection == 'cosmic':
+                [trkfast] = TrigInDetSequence("Cosmics", "cosmics", "IDTrig", "FTF").getSequence()
+
             # Run fast-tracking
             self.EFsequenceList += [[[ self.currentItem ],
-                                     ftracks,
+                                     trkfast,
                                      self.continueChain('EF', 'trfast')]]
             
             # Run the track-based pre-selection
@@ -267,6 +270,7 @@ class L2EFChain_tau(L2EFChainDef):
                 from TrigTauRec.TrigTauRecConfig import TrigTauRecMerged_Tau2012
                 recmerged_2012    = TrigTauRecMerged_Tau2012()
 
+
             [trkcore, trkprec] = TrigInDetSequence("Tau", "tau", "IDTrig").getSequence()
 
             efidinsideout = trkprec
@@ -411,22 +415,12 @@ class L2EFChain_tau(L2EFChainDef):
             theHLTTrackPre  = self.hypoProvider.GetHypo('L2', threshold, selection, 'id', preselection)
 
             # Get the necessary fexes
-            from InDetTrigRecExample.EFInDetConfig import  TrigEFIDSequence
             from TrigInDetConf.TrigInDetSequence import TrigInDetSequence
-            from TrigFastTrackFinder.TrigFastTrackFinder_Config import TrigFastTrackFinder_Tau
-    
-
-            theTrigFastTrackFinder_Tau = TrigFastTrackFinder_Tau()
-            theTrigEFIDDataPrep_Tau    = TrigEFIDSequence("Tau","tau","DataPrep").getSequence()
-            theFastTrackFinderxAOD     = TrigInDetSequence("Tau","tau","FastxAOD").getSequence()
-
-
-            ftracks = theTrigEFIDDataPrep_Tau+[theTrigFastTrackFinder_Tau]+theFastTrackFinderxAOD
-            
+            [trkfast, trkprec] = TrigInDetSequence("Tau", "tau", "IDTrig").getSequence()
             
             # Run fast-tracking
             self.EFsequenceList += [[[ self.currentItem ],
-                                     ftracks,
+                                     trkfast,
                                      self.continueChain('EF', 'trfast')]]
             
         # Here we're running the TrigTauRec based on all the stuff that ran before.  Uh-oh, this is dangerous...
@@ -452,9 +446,9 @@ class L2EFChain_tau(L2EFChainDef):
                 theEFHypo       = self.hypoProvider.GetHypo('EF', threshold, selection, '', 'r1')
 
             # Get the necessary fexes
-            from InDetTrigRecExample.EFInDetConfig import  TrigEFIDSequence
             from TrigInDetConf.TrigInDetSequence import TrigInDetSequence
-            from TrigFastTrackFinder.TrigFastTrackFinder_Config import TrigFastTrackFinder_Tau
+            [trkfast, trkprec] = TrigInDetSequence("Tau", "tau", "IDTrig").getSequence()
+
             from TrigTauDiscriminant.TrigTauDiscriGetter import TrigTauDiscriGetter2015
 
             # Change track selection if we're running on cosmics...
@@ -467,17 +461,9 @@ class L2EFChain_tau(L2EFChainDef):
 
             # Only run the fast-tracking if it wasn't run at pre-selection
             if preselection != 'track' and preselection != 'trackonly' and not idperf:
-                theTrigFastTrackFinder_Tau = TrigFastTrackFinder_Tau()
-                theTrigEFIDDataPrep_Tau            = TrigEFIDSequence("Tau","tau","DataPrep").getSequence()
-
-            theTrigEFIDInsideOutMerged_Tau     = TrigEFIDSequence("Tau","tau","InsideOutMerged").getSequence()
-            theFastTrackFinderxAOD             = TrigInDetSequence("Tau","tau","FastxAOD").getSequence()
-
-
-            if preselection != 'track' and preselection != 'trackonly' and not idperf:
-                efidinsideout     = theTrigEFIDDataPrep_Tau+[theTrigFastTrackFinder_Tau]+theFastTrackFinderxAOD+theTrigEFIDInsideOutMerged_Tau                
+                efidinsideout     = trkfast+trkprec
             else:
-                efidinsideout     = theTrigEFIDInsideOutMerged_Tau
+                efidinsideout     = trkprec
             
             efmv              = TrigTauDiscriGetter2015()
 
-- 
GitLab