diff --git a/Event/xAOD/xAODJet/Root/JetContainerInfo.cxx b/Event/xAOD/xAODJet/Root/JetContainerInfo.cxx
index 566a48ede05045c30aea4df85a32dc03ced6f345..34335440474c81d3580e3acc71e7c70cef698b4c 100644
--- a/Event/xAOD/xAODJet/Root/JetContainerInfo.cxx
+++ b/Event/xAOD/xAODJet/Root/JetContainerInfo.cxx
@@ -87,6 +87,7 @@ namespace xAOD {
       nameToTypemap["LCPFlow"] =       LCPFlow;             
       nameToTypemap["EMPFlow"] =       EMPFlow;             
       nameToTypemap["EMCPFlow"] =      EMCPFlow;             
+      nameToTypemap["HI"] =            HI;
       nameToTypemap[c_unCategorized] = Uncategorized;
 
 
diff --git a/Event/xAOD/xAODJet/xAODJet/JetContainerInfo.h b/Event/xAOD/xAODJet/xAODJet/JetContainerInfo.h
index 648b4ec6b88a667dfec5ca5fb41e3e908d0b98db..f4bfa9f9d721abdb2daf88ae9f2ed10408e972d6 100644
--- a/Event/xAOD/xAODJet/xAODJet/JetContainerInfo.h
+++ b/Event/xAOD/xAODJet/xAODJet/JetContainerInfo.h
@@ -65,6 +65,7 @@ namespace xAOD {
       Jet,
       LCTopoOrigin,
       EMTopoOrigin,
+      HI,
       Other = 100,
       Uncategorized= 1000
     };
diff --git a/PhysicsAnalysis/JetTagging/JetTagAlgs/BTagging/python/BTaggingFlags.py b/PhysicsAnalysis/JetTagging/JetTagAlgs/BTagging/python/BTaggingFlags.py
index ccde690067a2cef82465d312f954d0c3ce583be5..3218c909650e7d7f381e95ea24650a5430ce7a41 100755
--- a/PhysicsAnalysis/JetTagging/JetTagAlgs/BTagging/python/BTaggingFlags.py
+++ b/PhysicsAnalysis/JetTagging/JetTagAlgs/BTagging/python/BTaggingFlags.py
@@ -464,7 +464,8 @@ class _BTaggingFlags:
                                  "AntiKt4Track->AntiKt4Track,AntiKt4TopoEM,AntiKt4EMTopo,AntiKt4LCTopo",
                                  "AntiKt3Track->AntiKt3Track,AntiKt4Track,AntiKt4TopoEM,AntiKt4EMTopo,AntiKt4LCTopo",
                                  "AntiKt2Track->AntiKt2Track,AntiKt4Track,AntiKt4TopoEM,AntiKt4EMTopo,AntiKt4LCTopo",
-                                 "AntiKt4EMPFlow->AntiKt4EMPFlow,AntiKt4EMTopo,AntiKt4TopoEM,AntiKt4LCTopo"])
+                                 "AntiKt4EMPFlow->AntiKt4EMPFlow,AntiKt4EMTopo,AntiKt4TopoEM,AntiKt4LCTopo",
+                                 "AntiKt4HI->AntiKt4HI,AntiKt4EMTopo,AntiKt4TopoEM,AntiKt4LCTopo"])
 
         for attr in self._CalibrationSingleFolder:
             setattr(self, attr, True)
diff --git a/PhysicsAnalysis/JetTagging/JetTagAlgs/BTagging/share/BTaggingReconstructionOutputAODList_jobOptions.py b/PhysicsAnalysis/JetTagging/JetTagAlgs/BTagging/share/BTaggingReconstructionOutputAODList_jobOptions.py
index b96df1e98d864a68ef90df0fe3a4245be1405b5b..e2c46073635a565cab948b7445c5cfb3ff0f8c91 100644
--- a/PhysicsAnalysis/JetTagging/JetTagAlgs/BTagging/share/BTaggingReconstructionOutputAODList_jobOptions.py
+++ b/PhysicsAnalysis/JetTagging/JetTagAlgs/BTagging/share/BTaggingReconstructionOutputAODList_jobOptions.py
@@ -10,7 +10,7 @@ if len(BTaggingAODList) == 0:
     # Therefore, we duplicate here some code from BTagging/share/BTagging_jobOptions.py to specify the relevant Jet collections.
     # Clearly this duplication is undesirable and should be replaced with a single function.
     #JetCollectionList = ['AntiKt4LCTopoJets', 'AntiKt10LCTopoJets', 'AntiKt4EMTopoJets', 'AntiKt4TrackJets', 'AntiKt3TrackJets']
-    JetCollectionList = ['AntiKt4LCTopoJets', 'AntiKt4EMTopoJets', 'AntiKt4TrackJets', 'AntiKt4EMPFlowJets', 'AntiKt2TrackJets']
+    JetCollectionList = ['AntiKt4LCTopoJets', 'AntiKt4EMTopoJets', 'AntiKt4TrackJets', 'AntiKt4EMPFlowJets', 'AntiKt2TrackJets', 'AntiKt4HIJets']
     from JetRec.JetRecFlags import jetFlags
     # VD: disbling b-tagging on TruthJets
     #if jetFlags.useTruth():
diff --git a/PhysicsAnalysis/JetTagging/JetTagTools/src/JetTagUtils.cxx b/PhysicsAnalysis/JetTagging/JetTagTools/src/JetTagUtils.cxx
index 81cd1b3e92814f9c2b92445551efbf8be174ada3..af88eb1ad4954d6828647aaf794b1e37ceac6eb7 100644
--- a/PhysicsAnalysis/JetTagging/JetTagTools/src/JetTagUtils.cxx
+++ b/PhysicsAnalysis/JetTagging/JetTagTools/src/JetTagUtils.cxx
@@ -18,6 +18,13 @@ std::string JetTagUtils::getJetAuthor(xAOD::Jet& jetToTag) {
   xAOD::JetInput::Type jetAlgType = jetToTag.getInputType();
   std::string type =  xAOD::JetInput::typeName(jetAlgType);
   std::string size = std::to_string(int(jetToTag.getSizeParameter()*10));
+
+  // Special test for HI jet collections
+  // (the attribute JetUnsubtractedScaleMomentum is specific to them)
+  xAOD::JetFourMom_t v;
+  if ( jetToTag.getAttribute<xAOD::JetFourMom_t>("JetUnsubtractedScaleMomentum",v) ) {
+    type = "HI";
+  }
     
   std::string author = name;
   author.append(size);
diff --git a/Reconstruction/HeavyIonRec/HIJetRec/python/HIJetRecFlags.py b/Reconstruction/HeavyIonRec/HIJetRec/python/HIJetRecFlags.py
index ea678cea410cd5339ad3f870e92e4772ce395ff5..b210d9c17c87d1129bc151960060aace08110111 100644
--- a/Reconstruction/HeavyIonRec/HIJetRec/python/HIJetRecFlags.py
+++ b/Reconstruction/HeavyIonRec/HIJetRec/python/HIJetRecFlags.py
@@ -126,6 +126,13 @@ class ExtraFlowMoments(JobProperty):
     allowedTypes = ['bool']
     StoredValue  = True
 
+class DoHIBTagging(JobProperty):
+    """ Perform b-tagging over HI jet collections
+    """
+    statusOn     = True
+    allowedTypes = ['bool']
+    StoredValue  = False
+
 
 class HIClusterKey(JobProperty):
     """ Key of CaloClusterContainer containing HI clusters
@@ -251,6 +258,7 @@ list_jobproperties = [UnsubtractedSuffix,
                       ModulationScheme,
                       Remodulate,
                       ExtraFlowMoments,
+                      DoHIBTagging,
                       HIClusterKey,
                       IteratedEventShapeKey,
                       TruthJetPtMin,
diff --git a/Reconstruction/HeavyIonRec/HIJetRec/share/HIJetRec_jobOptions.py b/Reconstruction/HeavyIonRec/HIJetRec/share/HIJetRec_jobOptions.py
index d16a72817c16377e3fb07b2ab657cc6ebb65b7a3..37dad07c2dd66693a2d51782f757fd0ac7326cbb 100644
--- a/Reconstruction/HeavyIonRec/HIJetRec/share/HIJetRec_jobOptions.py
+++ b/Reconstruction/HeavyIonRec/HIJetRec/share/HIJetRec_jobOptions.py
@@ -108,6 +108,50 @@ for k in jtm.jetrecs :
 AppendOutputList(jetFlags.jetAODList)
 JetAlgFromTools(jtm.HIJetRecs,suffix="HI",persistify=True)
 
-
-
-
+# code cloned from BTagging_jobOptions.py
+# to allow b-tagging over HI jets
+
+if HIJetFlags.DoHIBTagging():
+
+  if not BTaggingFlags.DoNotSetupBTagging: # Temporary measure so the JetRec people can test setting this all up from their side.
+    #
+    # ========== Load and configure everything
+    #
+
+    from BTagging.BTaggingConfiguration import getConfiguration
+    ConfInstance = getConfiguration()
+
+    if ConfInstance.checkFlagsUsingBTaggingFlags():
+
+      #Jet collections
+      JetCollectionList = ['AntiKt4HIJets']
+      from JetRec.JetRecFlags import jetFlags
+
+      BTaggingFlags.Jets = [ name[:-4] for name in JetCollectionList]
+
+      #BTagging list
+      btag = ConfInstance.getOutputFilesPrefix() #BTaggingFlags.OutputFilesBTag #"BTagging_"
+
+      #TODO define name author (now BTagging_AntiKt4LCTopo)
+      AuthorSubString = [ btag+name[:-4] for name in JetCollectionList]
+
+      NotInJetToolManager = [] # For jet collections
+      from JetRec.JetRecStandard import jtm
+      for i, jet in enumerate(JetCollectionList):
+          try:
+            btagger = ConfInstance.setupJetBTaggerTool(ToolSvc, jet) #The [:-4] is not needed here; this function automatically removes trailing 'jets' or 'Jets'.
+            if btagger is None:
+              continue
+            jet = jet.replace("Track", "PV0Track")
+            jetname = getattr(jtm, jet)
+            jetname.unlock()
+            jetname.JetModifiers += [ btagger ]
+            jetname.lock()
+            if BTaggingFlags.OutputLevel < 3:
+              print ConfInstance.getJetCollectionTool(jet[:-4])
+          except AttributeError as error:
+            print '#BTAG# --> ' + str(error)
+            NotInJetToolManager.append(AuthorSubString[i])
+
+      if len(NotInJetToolManager) > 0:
+          AuthorSubString = list(set(AuthorSubString) - set(NotInJetToolManager))
diff --git a/Trigger/TrigAlgorithms/TrigDetCalib/src/TrigSubDetListWriter.cxx b/Trigger/TrigAlgorithms/TrigDetCalib/src/TrigSubDetListWriter.cxx
index 28320761eb5f9a217522bbd7c0583638e3aec33b..98c67cc53ca386b42b2c187f4a76a36e2651e793 100755
--- a/Trigger/TrigAlgorithms/TrigDetCalib/src/TrigSubDetListWriter.cxx
+++ b/Trigger/TrigAlgorithms/TrigDetCalib/src/TrigSubDetListWriter.cxx
@@ -176,6 +176,9 @@ HLT::ErrorCode TrigSubDetListWriter::hltInitialize()
         m_sourceid.push_back(eformat::LAR_FCAL_C_SIDE);
         m_sourceid.push_back(eformat::LAR_HAD_ENDCAP_A_SIDE);
         m_sourceid.push_back(eformat::LAR_HAD_ENDCAP_C_SIDE);
+     } else if (*detit=="FCal") {
+        m_sourceid.push_back(eformat::LAR_FCAL_A_SIDE);
+        m_sourceid.push_back(eformat::LAR_FCAL_C_SIDE);     
      } else if (*detit=="FORWARD_BCM") {     
          m_sourceid.push_back(eformat::FORWARD_BCM);
      } else if (*detit=="FORWARD_LUCID") {     
diff --git a/Trigger/TrigAlgorithms/TrigT2MinBias/python/TrigT2MinBiasConfig.py b/Trigger/TrigAlgorithms/TrigT2MinBias/python/TrigT2MinBiasConfig.py
index d50125313776ef032ad2efbe07f73eedc663687c..0cbf07783bb3cf82ebc6aaa395e0bc07ca12e917 100644
--- a/Trigger/TrigAlgorithms/TrigT2MinBias/python/TrigT2MinBiasConfig.py
+++ b/Trigger/TrigAlgorithms/TrigT2MinBias/python/TrigT2MinBiasConfig.py
@@ -534,6 +534,30 @@ L2MbSpHypo_veto.SctSpBarrel_max = -1. # Disable
 L2MbSpHypo_veto.SctSpEndcapA_max = -1. # Disable
 hypos["L2MbSpHypo_veto"] = L2MbSpHypo_veto
 
+class L2MbSpMhNoPixHypo_veto(MbSpHypo):
+    def __init__(self, name, threshold):
+        super(L2MbSpMhNoPixHypo_veto, self).__init__(name)
+        
+        self.AcceptAll = False
+        self.TriggerTypeAND = False # Must use OR because Pixel is disabled
+        self.Veto = True
+        self.TotalPixelClus = -1. # Disable
+        self.PixelClusRatioA = -1. # Disable
+        self.PixelClusRatioB = -1. # Disable
+        self.PixelClusEndcapC = -1. # Disable
+        self.PixelClusBarrel = -1. # Disable 
+        self.PixelClusEndcapA = -1. # Disable
+        self.PixelClusEndcapC_max = -1. # Disable
+        self.PixelClusBarrel_max = -1. # Disable 
+        self.PixelClusEndcapA_max = -1. # Disable
+        self.TotalSctSp = threshold  # here is the only one actively used setting
+        self.SctSpEndcapC = -1. # Disable
+        self.SctSpBarrel = -1. # Disable
+        self.SctSpEndcapA = -1. # Disable
+        self.SctSpEndcapC_max = -1. # Disable
+        self.SctSpBarrel_max = -1. # Disable
+        self.SctSpEndcapA_max = -1. # Disable
+
 
 
 #             Sp hypo configuratables veto large multiplicity
diff --git a/Trigger/TrigHypothesis/TrigHIHypo/python/GapHypos.py b/Trigger/TrigHypothesis/TrigHIHypo/python/GapHypos.py
index 4f47a885fe0f9bc37842407d5754d0528c27a51e..d0dad4bf9b48605623ab1f0be1d0303444da9593 100644
--- a/Trigger/TrigHypothesis/TrigHIHypo/python/GapHypos.py
+++ b/Trigger/TrigHypothesis/TrigHIHypo/python/GapHypos.py
@@ -35,5 +35,23 @@ cellFgapAPerf.AthenaMonTools += [ GapHypoMonitoring(name="GapHypoMonitoring")]
 cellFgapCPerf = UltraCentralHypo("CellsFgapCperf", EtaMin=-5, EtaMax=-3.2,  FcalEtUpperBound=3*GeV)
 cellFgapCPerf.AthenaMonTools += [ GapHypoMonitoring(name="GapHypoMonitoring")]
 
-
+ttFgapA5 = UltraCentralHypo("TTFgapA5", EtaMin=3.1, EtaMax=5., FcalEtUpperBound=5*GeV)
+ttFgapA5.AthenaMonTools += [ GapHypoMonitoring(name="GapHypoMonitoring")]
+ttFgapC5 = UltraCentralHypo("TTFgapC5", EtaMin=-5, EtaMax=-3.1,  FcalEtUpperBound=5*GeV)
+ttFgapC5.AthenaMonTools += [ GapHypoMonitoring(name="GapHypoMonitoring")]
+
+cellFgapA5 = UltraCentralHypo("CellsFgapA5", EtaMin=3.2, EtaMax=5., FcalEtUpperBound=5*GeV)
+cellFgapA5.AthenaMonTools += [ GapHypoMonitoring(name="GapHypoMonitoring")]
+cellFgapC5 = UltraCentralHypo("CellsFgapC5", EtaMin=-5, EtaMax=-3.2,  FcalEtUpperBound=5*GeV)
+cellFgapC5.AthenaMonTools += [ GapHypoMonitoring(name="GapHypoMonitoring")]
+
+ttFgapA10 = UltraCentralHypo("TTFgapA10", EtaMin=3.1, EtaMax=5., FcalEtUpperBound=10*GeV)
+ttFgapA10.AthenaMonTools += [ GapHypoMonitoring(name="GapHypoMonitoring")]
+ttFgapC10 = UltraCentralHypo("TTFgapC10", EtaMin=-5, EtaMax=-3.1,  FcalEtUpperBound=10*GeV)
+ttFgapC10.AthenaMonTools += [ GapHypoMonitoring(name="GapHypoMonitoring")]
+
+cellFgapA10 = UltraCentralHypo("CellsFgapA10", EtaMin=3.2, EtaMax=5., FcalEtUpperBound=10*GeV)
+cellFgapA10.AthenaMonTools += [ GapHypoMonitoring(name="GapHypoMonitoring")]
+cellFgapC10 = UltraCentralHypo("CellsFgapC10", EtaMin=-5, EtaMax=-3.2,  FcalEtUpperBound=10*GeV)
+cellFgapC10.AthenaMonTools += [ GapHypoMonitoring(name="GapHypoMonitoring")]
 
diff --git a/Trigger/TriggerCommon/TrigEDMConfig/python/TriggerEDM.py b/Trigger/TriggerCommon/TrigEDMConfig/python/TriggerEDM.py
index cbc43ed994845729dcb1943b0bbb7ec785ebd012..96a197befe1e3564183c98d917009a26bca049ed 100644
--- a/Trigger/TriggerCommon/TrigEDMConfig/python/TriggerEDM.py
+++ b/Trigger/TriggerCommon/TrigEDMConfig/python/TriggerEDM.py
@@ -582,9 +582,15 @@ TriggerHLTList = [
     ('xAOD::JetTrigAuxContainer#HLT_TrigCosmicJetRecAux.',               '',                       'Jet'),
 
     # R=0.4 HI jets
+    ('xAOD::JetContainer#HLT_a4ionemsubjesFS',                           'BS ESD AODFULL AODSLIM AODVERYSLIM', 'Jet'),
+    ('xAOD::JetTrigAuxContainer#HLT_a4ionemsubjesFSAux.',                'BS ESD AODFULL AODSLIM AODVERYSLIM', 'Jet'),
+    # R=0.3 HI jets
+    ('xAOD::JetContainer#HLT_a3ionemsubjesFS',                           'BS ESD AODFULL AODSLIM AODVERYSLIM', 'Jet'),
+    ('xAOD::JetTrigAuxContainer#HLT_a3ionemsubjesFSAux.',                'BS ESD AODFULL AODSLIM AODVERYSLIM', 'Jet'),
+    # R=0.4 HI jets with insitu calibration
     ('xAOD::JetContainer#HLT_a4ionemsubjesISFS',                           'BS ESD AODFULL AODSLIM AODVERYSLIM', 'Jet'),
     ('xAOD::JetTrigAuxContainer#HLT_a4ionemsubjesISFSAux.',                'BS ESD AODFULL AODSLIM AODVERYSLIM', 'Jet'),
-    # R=0.3 HI jets
+    # R=0.3 HI jets with insitu calibration
     ('xAOD::JetContainer#HLT_a3ionemsubjesISFS',                           'BS ESD AODFULL AODSLIM AODVERYSLIM', 'Jet'),
     ('xAOD::JetTrigAuxContainer#HLT_a3ionemsubjesISFSAux.',                'BS ESD AODFULL AODSLIM AODVERYSLIM', 'Jet'),
     
diff --git a/Trigger/TriggerCommon/TriggerJobOpts/python/TriggerFlags.py b/Trigger/TriggerCommon/TriggerJobOpts/python/TriggerFlags.py
index ec0cf3c1b6b3835580ee63ea5451b945bc89bf92..f2e662203ef688f3db7e4b0d34bcfcfbbb251af7 100644
--- a/Trigger/TriggerCommon/TriggerJobOpts/python/TriggerFlags.py
+++ b/Trigger/TriggerCommon/TriggerJobOpts/python/TriggerFlags.py
@@ -1041,7 +1041,7 @@ class triggerMenuSetup(JobProperty):
         'MC_HI_v3', 'MC_HI_v3_tight_mc_prescale',
         'Physics_HI_v4', 'Physics_HI_v4_no_prescale', # for 2016 proton-lead menu 
         'MC_HI_v4', 'MC_HI_v4_tight_mc_prescale',
-        'Physics_HI_v5', 'Physics_HI_v5_no_prescale', # for 2015 lead-lead menu 
+        'Physics_HI_v5', 'Physics_HI_v5_tight_physics_prescale', 'Physics_HI_v5_no_prescale', # for 2015 lead-lead menu 
         'MC_HI_v5', 'MC_HI_v5_tight_mc_prescale',
 
         'MC_pp_v6','Physics_pp_v6','MC_pp_v6_no_prescale', 'MC_pp_v6_tight_mc_prescale', 'MC_pp_v6_tightperf_mc_prescale', 'MC_pp_v6_loose_mc_prescale','Physics_pp_v6_tight_physics_prescale',
diff --git a/Trigger/TriggerCommon/TriggerMenu/python/heavyion/HeavyIonDef.py b/Trigger/TriggerCommon/TriggerMenu/python/heavyion/HeavyIonDef.py
index b89c2548b7ec0efd461d91c24d259068adeca923..2ad89b4a8fe3ef65d1c69b5058d74cf1366bb1e3 100644
--- a/Trigger/TriggerCommon/TriggerMenu/python/heavyion/HeavyIonDef.py
+++ b/Trigger/TriggerCommon/TriggerMenu/python/heavyion/HeavyIonDef.py
@@ -68,10 +68,9 @@ class L2EFChain_HI(L2EFChainDef):
         elif "ucc" in self.chainPart['recoAlg']:
             self.setup_hi_ultracentral()
         elif "upc" in self.chainPart['recoAlg']:
-            if '' == self.chainPart['gap']:
-                self.setup_hi_ultraperipheral()
-            else:
-                self.setup_hi_ultraperipheral_gap()
+            self.setup_hi_ultraperipheral()
+        elif "hipeb" in self.chainPart['addInfo']:
+            self.setup_hi_PEB()    
         
         L2EFChainDef.__init__(self, self.chainName, self.L2Name, self.chainCounter, self.chainL1Item, self.EFName, self.chainCounter, self.L2InputTE)
 
@@ -262,158 +261,197 @@ class L2EFChain_HI(L2EFChainDef):
 
 ###########################
     def setup_hi_ultraperipheral(self):
-
-        theL2MbtsFex=L2MbMbtsFex
-        theL2MbtsHypo=MbMbtsHypo("L2MbMbtsHypo_1_1_inn_veto")
-        theL2PixelFex  = L2MbSpFex
-
-        if 'loose' in self.chainPart['hypoL2Info']:
-            minPixel=6
-            maxPixel=40
-            chainSuffix = 'loose_upc'
-        if 'medium' in self.chainPart['hypoL2Info']:
-            minPixel=6
-            maxPixel=30
-            chainSuffix = 'medium_upc'
-        if 'tight' in self.chainPart['hypoL2Info']:
-            minPixel=6
-            maxPixel=25
-            chainSuffix = 'tight_upc'
-        if 'gg' in self.chainPart['hypoL2Info']:
-            minPixel=0
-            maxPixel=10
-            chainSuffix = 'gg_upc'
-
-        theL2PixelHypo  = L2MbSpUPC("MbPixelSpUPC_min"+str(minPixel)+'_max'+str(maxPixel), minPixel, maxPixel)
-        
-        ########### Sequence List ##############
-        self.L2sequenceList += [["",
-                                 [dummyRoI],
-                                 'L2_hi_step1']] 
-        self.L2sequenceList += [[['L2_hi_step1'], 
-                                     [theL2MbtsFex, theL2MbtsHypo], 'L2_hi_mbtsveto']]
-        self.L2sequenceList += [['L2_hi_mbtsveto',
-                                     efiddataprep,
-                                 'L2_hi_iddataprep']]
-        self.L2sequenceList += [[['L2_hi_iddataprep'],
-                                 [theL2PixelFex, theL2PixelHypo],
-                                 'L2_hi_pixel']]
-
-
-
-        ########### Signatures ###########
-        self.L2signatureList += [ [['L2_hi_step1']] ]
-        self.L2signatureList += [ [['L2_hi_mbtsveto']] ]
-        self.L2signatureList += [ [['L2_hi_iddataprep']] ]
-        self.L2signatureList += [ [['L2_hi_pixel']] ]
-    
-        self.TErenamingDict = {
-            'L2_hi_step1': mergeRemovingOverlap('L2_hi_step1_', chainSuffix),
-            'L2_hi_mbtsveto': mergeRemovingOverlap('EF_hi_mbtsveto_', chainSuffix),
-            'L2_hi_iddataprep': mergeRemovingOverlap('EF_hi_iddataprep_', chainSuffix),
-            'L2_hi_pixel': mergeRemovingOverlap('EF_hi_pixel_', chainSuffix),
-            }
-
-    def setup_hi_ultraperipheral_gap(self):
-        from TrigCaloRec.TrigCaloRecConf import TrigL1BSTowerMaker
-        from TrigCaloRec.TrigCaloRecConf import TrigL1FCALTTSumFex
-        theL1BS = TrigL1BSTowerMaker()
-        theL1BSFex = TrigL1FCALTTSumFex('TrigL1FCALTTSumFex')
-
-        from TrigHIHypo.UE import theUEMaker, theFSCellMaker
-        from TrigHIHypo.GapHypos import ttFgapA, ttFgapC, cellFgapA, cellFgapC,  cellFgapAPerf, cellFgapCPerf
-        
-        # L2 sel (TT) is used when The chain is sither L2Fgap* or Fgap*, and not used when EFGap, similarily for EF (cells) part
-        gap  = self.chainPart['gap']
-
-        #        theSptrkMaker = 
-        #        theSptrkHypo = 
-        self.L2sequenceList += [["",
-                                 [dummyRoI],
-                                 'L2_upc_step1']] 
-        #self.L2signatureList += [ [['L2_upc_step1']] ]
-
-        self.L2sequenceList += [["L2_upc_step1",
-                                 [theL1BS, theL1BSFex],
-                                 'L2_upc_step2']] 
-        #self.L2signatureList += [ [['L2_upc_step2']] ]
-
-        self.L2sequenceList += [["L2_upc_step2",
-                                 [ttFgapA],
-                                 'L2_upc_step3_A']] 
-        self.L2sequenceList += [["L2_upc_step2",
-                                 [ttFgapC],
-                                 'L2_upc_step3_C']] 
-        
-        if gap in [ 'FgapA', 'L2FgapA']:
-            self.L2signatureList += [ [['L2_upc_step3_A']] ]
-        if gap in [ 'FgapC', 'L2FgapC']:
-            self.L2signatureList += [ [['L2_upc_step3_C']] ]
-        if gap in [ 'FgapAC', 'L2FgapAC']:
-            self.L2signatureList += [ [['L2_upc_step3_A']] ]
-            self.L2signatureList += [ [['L2_upc_step3_C']] ]
-
-
-        # sequence starts back from RoI    
-        self.EFsequenceList += [[['L2_upc_step1'], 
-                                 [theFSCellMaker], 
-                                 'EF_upc_step1']]
-        #self.EFsignatureList += [ [['EF_upc_step1']] ]
-
-        self.EFsequenceList += [["EF_upc_step1",
-                                 [theUEMaker],
-                                 'EF_upc_step2']] 
-        #self.EFsignatureList += [ [['EF_upc_step2']] ]
-
-        if 'EF' in gap: # this are perfromance triggers
-            self.EFsequenceList += [["EF_upc_step2",
-                                     [cellFgapCPerf ],
-                                     'EF_upc_step3_CPerf']] 
+        gapthX=""
+        if "gap" in self.chainPart['gap']:    
+            from TrigCaloRec.TrigCaloRecConf import TrigL1BSTowerMaker
+            from TrigCaloRec.TrigCaloRecConf import TrigL1FCALTTSumFex
+            theL1BS = TrigL1BSTowerMaker()
+            theL1BSFex = TrigL1FCALTTSumFex('TrigL1FCALTTSumFex')
+
+            from TrigHIHypo.UE import theUEMaker, theFSCellMaker
+            from TrigHIHypo.GapHypos import ttFgapA, ttFgapC, cellFgapA, cellFgapC, ttFgapA5, ttFgapC5, cellFgapA5, cellFgapC5, ttFgapA10, ttFgapC10, cellFgapA10, cellFgapC10, cellFgapAPerf, cellFgapCPerf
             
-            self.EFsequenceList += [["EF_upc_step2",
-                                     [cellFgapAPerf ],
-                                     'EF_upc_step3_APerf']] 
-        else:
-            self.EFsequenceList += [["EF_upc_step2",
-                                     [cellFgapC ],
-                                     'EF_upc_step3_C']] 
+            # L2 sel (TT) is used when The chain is sither L2Fgap* or Fgap*, and not used when EFGap, similarily for EF (cells) part
+            gap  = self.chainPart['gap']
+            gapthX = gap[len(gap.rstrip('0123456789')):]
             
-            self.EFsequenceList += [["EF_upc_step2",
-                                     [cellFgapA ],
-                                     'EF_upc_step3_A']] 
+            #        theSptrkMaker = 
+            #        theSptrkHypo = 
+            self.L2sequenceList += [["",
+                                     [dummyRoI],
+                                     'L2_upc_step1']] 
+            #self.L2signatureList += [ [['L2_upc_step1']] ]
+
+            self.L2sequenceList += [["L2_upc_step1",
+                                     [theL1BS, theL1BSFex],
+                                     'L2_upc_step2']] 
+            #self.L2signatureList += [ [['L2_upc_step2']] ]
+
+            if not gapthX:     
+                self.L2sequenceList += [["L2_upc_step2",
+                                         [ttFgapA],
+                                         'L2_upc_step3_A']] 
+                self.L2sequenceList += [["L2_upc_step2",
+                                         [ttFgapC],
+                                         'L2_upc_step3_C']] 
+            elif int(gapthX)==5:                
+                print 'Adding ttFgapA5'
+                self.L2sequenceList += [["L2_upc_step2",
+                                         [ttFgapA5],
+                                         'L2_upc_step3_A']] 
+                self.L2sequenceList += [["L2_upc_step2",
+                                         [ttFgapC5],
+                                         'L2_upc_step3_C']]
+            elif int(gapthX)==10:                
+                self.L2sequenceList += [["L2_upc_step2",
+                                         [ttFgapA10],
+                                         'L2_upc_step3_A']] 
+                self.L2sequenceList += [["L2_upc_step2",
+                                         [ttFgapC10],
+                                         'L2_upc_step3_C']]
+            
+            if gap in [ 'FgapA', 'FgapA5', 'FgapA10', 'L2FgapA']:
+                self.L2signatureList += [ [['L2_upc_step3_A']] ]
+            if gap in [ 'FgapC', 'FgapC5', 'FgapC10', 'L2FgapC']:
+                self.L2signatureList += [ [['L2_upc_step3_C']] ]
+            if gap in [ 'FgapAC', 'L2FgapAC']:
+                self.L2signatureList += [ [['L2_upc_step3_A']] ]
+                self.L2signatureList += [ [['L2_upc_step3_C']] ]
+
+
+            # sequence starts back from RoI    
+            self.EFsequenceList += [[['L2_upc_step1'], 
+                                     [theFSCellMaker], 
+                                     'EF_upc_step1']]
+            #self.EFsignatureList += [ [['EF_upc_step1']] ]
+
+            self.EFsequenceList += [["EF_upc_step1",
+                                     [theUEMaker],
+                                     'EF_upc_step2']] 
+            #self.EFsignatureList += [ [['EF_upc_step2']] ]
+
+            if 'EF' in gap: # this are perfromance triggers
+                self.EFsequenceList += [["EF_upc_step2",
+                                         [cellFgapCPerf ],
+                                         'EF_upc_step3_CPerf']] 
+                
+                self.EFsequenceList += [["EF_upc_step2",
+                                         [cellFgapAPerf ],
+                                         'EF_upc_step3_APerf']] 
+            else:
+                if not gapthX:
+                    self.EFsequenceList += [["EF_upc_step2",
+                                             [cellFgapC ],
+                                             'EF_upc_step3_C']] 
+                    
+                    self.EFsequenceList += [["EF_upc_step2",
+                                             [cellFgapA ],
+                                             'EF_upc_step3_A']] 
+                elif int(gapthX)==5:
+                    self.EFsequenceList += [["EF_upc_step2",
+                                             [cellFgapC5 ],
+                                             'EF_upc_step3_C']] 
+                    
+                    self.EFsequenceList += [["EF_upc_step2",
+                                             [cellFgapA5 ],
+                                             'EF_upc_step3_A']]
+                elif int(gapthX)==10:
+                    self.EFsequenceList += [["EF_upc_step2",
+                                             [cellFgapC10 ],
+                                             'EF_upc_step3_C']] 
+                    
+                    self.EFsequenceList += [["EF_upc_step2",
+                                             [cellFgapA10 ],
+                                             'EF_upc_step3_A']]
+                    
+                
+            if gap in [ 'FgapA', 'FgapA5', 'FgapA10']:
+                self.EFsignatureList += [ [['EF_upc_step3_A']] ]
+            if gap == 'EFFgapA':
+                self.EFsignatureList += [ [['EF_upc_step3_APerf']] ]
+
+            if  gap in [ 'FgapC', 'FgapC5', 'FgapC10']:
+                self.EFsignatureList += [ [['EF_upc_step3_C']] ]
+            if gap =='EFFgapC':
+                self.EFsignatureList += [ [['EF_upc_step3_CPerf']] ]
+            if  gap ==  'FgapAC':
+                self.EFsignatureList += [ [['EF_upc_step3_A']] ]
+                self.EFsignatureList += [ [['EF_upc_step3_C']] ]
+            if  gap ==  'EFFgapAC':
+                self.EFsignatureList += [ [['EF_upc_step3_APerf']] ]
+                self.EFsignatureList += [ [['EF_upc_step3_CPerf']] ]
         
-        if gap == 'FgapA':
-            self.EFsignatureList += [ [['EF_upc_step3_A']] ]
-        if gap == 'EFFgapA':
-            self.EFsignatureList += [ [['EF_upc_step3_APerf']] ]
-
-        if  gap == 'FgapC':
-            self.EFsignatureList += [ [['EF_upc_step3_C']] ]
-        if gap =='EFFgapC':
-            self.EFsignatureList += [ [['EF_upc_step3_CPerf']] ]
-        if  gap ==  'FgapAC':
-            self.EFsignatureList += [ [['EF_upc_step3_A']] ]
-            self.EFsignatureList += [ [['EF_upc_step3_C']] ]
-        if  gap ==  'EFFgapAC':
-            self.EFsignatureList += [ [['EF_upc_step3_APerf']] ]
-            self.EFsignatureList += [ [['EF_upc_step3_CPerf']] ]
-
+        chainSuffix=""
+        if "gg" in self.chainPart['hypoL2Info'] or "loose" in self.chainPart['hypoL2Info'] or "medium" in self.chainPart['hypoL2Info'] or "tight" in self.chainPart['hypoL2Info']:
+        
+            theL2MbtsFex=L2MbMbtsFex
+            theL2MbtsHypo=MbMbtsHypo("L2MbMbtsHypo_1_1_inn_veto")
+            theL2PixelFex  = L2MbSpFex
+
+            if 'loose' in self.chainPart['hypoL2Info']:
+                minPixel=6
+                maxPixel=40
+                chainSuffix = 'loose_upc'
+            if 'medium' in self.chainPart['hypoL2Info']:
+                minPixel=6
+                maxPixel=30
+                chainSuffix = 'medium_upc'
+            if 'tight' in self.chainPart['hypoL2Info']:
+                minPixel=6
+                maxPixel=25
+                chainSuffix = 'tight_upc'
+            if 'gg' in self.chainPart['hypoL2Info']:
+                minPixel=0
+                maxPixel=10
+                chainSuffix = 'gg_upc'
+
+            theL2PixelHypo  = L2MbSpUPC("MbPixelSpUPC_min"+str(minPixel)+'_max'+str(maxPixel), minPixel, maxPixel)
+            
+            ########### Sequence List ##############
+            self.L2sequenceList += [["",
+                                     [dummyRoI],
+                                     'L2_hi_step1']] 
+            self.L2sequenceList += [[['L2_hi_step1'], 
+                                         [theL2MbtsFex, theL2MbtsHypo], 'L2_hi_mbtsveto']]
+            self.L2sequenceList += [['L2_hi_mbtsveto',
+                                         efiddataprep,
+                                     'L2_hi_iddataprep']]
+            self.L2sequenceList += [[['L2_hi_iddataprep'],
+                                     [theL2PixelFex, theL2PixelHypo],
+                                     'L2_hi_pixel']]
+
+            ########### Signatures ###########
+            self.L2signatureList += [ [['L2_hi_step1']] ]
+            self.L2signatureList += [ [['L2_hi_mbtsveto']] ]
+            self.L2signatureList += [ [['L2_hi_iddataprep']] ]
+            self.L2signatureList += [ [['L2_hi_pixel']] ]
+    
         self.TErenamingDict = {
             'L2_upc_step1': 'L2_TTSummation',
             'L2_upc_step2': 'L2_TTGapCalculation',
-            'L2_upc_step3_A': 'L2_TTGapA',
-            'L2_upc_step3_C': 'L2_TTGapC',
+            'L2_upc_step3_A': 'L2_TTGapA'+str(gapthX),
+            'L2_upc_step3_C': 'L2_TTGapC'+str(gapthX),
             'EF_upc_step1': 'EF_AllCells',
             'EF_upc_step2': 'EF_UE',
-            'EF_upc_step3_A': 'EF_CellGapA',
-            'EF_upc_step3_C': 'EF_CellGapC',
+            'EF_upc_step3_A': 'EF_CellGapA'+str(gapthX),
+            'EF_upc_step3_C': 'EF_CellGapC'+str(gapthX),
             'EF_upc_step3_APerf': 'EF_CellGapAPerf',
             'EF_upc_step3_CPerf': 'EF_CellGapCPerf',
-
             'EF_upc_step4': 'EF_twoTracks',
+            'L2_hi_step1': mergeRemovingOverlap('L2_hi_step1_', chainSuffix),
+            'L2_hi_mbtsveto': mergeRemovingOverlap('EF_hi_mbtsveto_', chainSuffix),
+            'L2_hi_iddataprep': mergeRemovingOverlap('EF_hi_iddataprep_', chainSuffix),
+            'L2_hi_pixel': mergeRemovingOverlap('EF_hi_pixel_', chainSuffix),
             }
-        
-        
+    def setup_hi_PEB(self):
+        from TrigDetCalib.TrigDetCalibConfig import TrigSubDetListWriter
+        HISubDetListWriter = TrigSubDetListWriter("HISubDetListWriter")
+        HISubDetListWriter.SubdetId = ['TDAQ_CTP','InnerDetector','FCal','FORWARD_ZDC'] 
+        HISubDetListWriter.MaxRoIsPerEvent=1
+ 
+        self.robWriter = [HISubDetListWriter]            
+        self.L2sequenceList += [['', self.robWriter, 'L2_hipeb']]     
+        self.L2signatureList += [[['L2_hipeb']]]                    
 #####################################################################
     
 #if __name__ == '__main__':
diff --git a/Trigger/TriggerCommon/TriggerMenu/python/l1menu/CaloDef.py b/Trigger/TriggerCommon/TriggerMenu/python/l1menu/CaloDef.py
index f1c7fe5a3de2548e4376cf8bf70eb6448a79103e..97d9f4ac15ca16aab79b4527cfa09b778fa19f86 100644
--- a/Trigger/TriggerCommon/TriggerMenu/python/l1menu/CaloDef.py
+++ b/Trigger/TriggerCommon/TriggerMenu/python/l1menu/CaloDef.py
@@ -71,9 +71,9 @@ class CaloDef:
         # min PT for TOBs
         if "HI_" in menuName:
             caloInfo.minTOBPt += [ MinimumTOBPt(thrtype="EM", ptmin=7) ]
-            caloInfo.minTOBPt += [ MinimumTOBPt(thrtype="TAU", ptmin=12) ]
-            caloInfo.minTOBPt += [ MinimumTOBPt(thrtype="JETS", ptmin=10, window=4) ]
-            caloInfo.minTOBPt += [ MinimumTOBPt(thrtype="JETL", ptmin=10, window=8) ]
+            caloInfo.minTOBPt += [ MinimumTOBPt(thrtype="TAU", ptmin=2) ]
+            caloInfo.minTOBPt += [ MinimumTOBPt(thrtype="JETS", ptmin=12, window=4) ]
+            caloInfo.minTOBPt += [ MinimumTOBPt(thrtype="JETL", ptmin=12, window=8) ]
         else:
             caloInfo.minTOBPt += [ MinimumTOBPt(thrtype="EM", ptmin=3) ]
             caloInfo.minTOBPt += [ MinimumTOBPt(thrtype="TAU", ptmin=8) ]
diff --git a/Trigger/TriggerCommon/TriggerMenu/python/l1menu/ItemDef.py b/Trigger/TriggerCommon/TriggerMenu/python/l1menu/ItemDef.py
index 9636dc0dff4e2792a392871f6e229dab80afe0e7..664be265045adf2bf56a86278cb32e1963dee825 100755
--- a/Trigger/TriggerCommon/TriggerMenu/python/l1menu/ItemDef.py
+++ b/Trigger/TriggerCommon/TriggerMenu/python/l1menu/ItemDef.py
@@ -126,6 +126,7 @@ class ItemDef:
            LVL1MenuItem('L1_2EM18VH'        ).setLogic( EM18VH.x(2)          & physcond).setTriggerType( TT.calo )  # noqa: F821
         LVL1MenuItem('L1_2EM12'          ).setLogic( EM12.x(2)            & physcond).setTriggerType( TT.calo )     # noqa: F821
         LVL1MenuItem('L1_2EM15'          ).setLogic( EM15.x(2)            & physcond).setTriggerType( TT.calo )     # noqa: F821
+        LVL1MenuItem('L1_2EM16'          ).setLogic( EM16.x(2)            & physcond).setTriggerType( TT.calo )     # noqa: F821
         LVL1MenuItem('L1_2EM15VH'        ).setLogic( EM15VH.x(2)          & physcond).setTriggerType( TT.calo )     # noqa: F821
         if not '_v6' in TriggerFlags.triggerMenuSetup() and not '_HI' in TriggerFlags.triggerMenuSetup():
            LVL1MenuItem('L1_2EM15VHI'    ).setLogic( EM15VHI.x(2)      & physcond).setTriggerType( TT.calo )        # noqa: F821
@@ -355,6 +356,9 @@ class ItemDef:
         LVL1MenuItem('L1_EM15VH_2EM8VH_MU6').setLogic( EM15VH & EM8VH.x(2) &  MU6 & physcond).setTriggerType(TT.muon)    # noqa: F821
 
         # TAU ctpid=[0x40:0x4f]
+        LVL1MenuItem('L1_TAU2'  ).setLogic( HA2   & physcond).setTriggerType( TT.calo )    # noqa: F821
+        LVL1MenuItem('L1_TAU3'  ).setLogic( HA3   & physcond).setTriggerType( TT.calo )    # noqa: F821
+        
         LVL1MenuItem('L1_TAU6'  ).setLogic( HA6   & physcond).setTriggerType( TT.calo )    # noqa: F821
         LVL1MenuItem('L1_TAU8'  ).setLogic( HA8   & physcond).setTriggerType( TT.calo )    # noqa: F821
 
@@ -399,7 +403,14 @@ class ItemDef:
         LVL1MenuItem('L1_TAU12_FIRSTEMPTY'     ).setLogic( HA12   & firstempty ).setTriggerType( TT.calo )       # noqa: F821
         LVL1MenuItem('L1_TAU30_EMPTY'          ).setLogic( HA30   & cosmiccond ).setTriggerType( TT.calo )       # noqa: F821
         LVL1MenuItem('L1_TAU30_UNPAIRED_ISO').setLogic( HA30  & unpaired_isocond ).setTriggerType( TT.calo )     # noqa: F821
-
+        
+        #UPC TAU
+        LVL1MenuItem('L1_2TAU2_VTE50').setLogic( HA2.x(2)      & Not(TE50) & physcond).setTriggerType(TT.calo)    # noqa: F821
+        LVL1MenuItem('L1_2TAU3_VTE50').setLogic( HA3.x(2)      & Not(TE50) & physcond).setTriggerType(TT.calo)    # noqa: F821
+        LVL1MenuItem('L1_2TAU2_VTE100').setLogic( HA2.x(2)      & Not(TE100) & physcond).setTriggerType(TT.calo)    # noqa: F821
+        LVL1MenuItem('L1_2TAU3_VTE100').setLogic( HA3.x(2)      & Not(TE100) & physcond).setTriggerType(TT.calo)    # noqa: F821
+        LVL1MenuItem('L1_2TAU2_VTE200').setLogic( HA2.x(2)      & Not(TE200) & physcond).setTriggerType(TT.calo)    # noqa: F821
+        LVL1MenuItem('L1_2TAU3_VTE200').setLogic( HA3.x(2)      & Not(TE200) & physcond).setTriggerType(TT.calo)    # noqa: F821
 
         # 3xTAU
         LVL1MenuItem('L1_TAU20_2TAU12'  ).setLogic( HA20 & HA12.x(2)  & physcond).setTriggerType( TT.calo )          # noqa: F821
@@ -804,7 +815,10 @@ class ItemDef:
             LVL1MenuItem('L1_TE9000.0ETA24').setLogic( TE20000ETA24 & physcond).setTriggerType(TT.calo)    # noqa: F821
             
   # HI items
+        LVL1MenuItem('L1_TE3.0ETA49').setLogic( TE30ETA49 & physcond).setTriggerType(TT.calo)    # noqa: F821
+        LVL1MenuItem('L1_TE7.0ETA49').setLogic( TE70ETA49 & physcond).setTriggerType(TT.calo)    # noqa: F821
         LVL1MenuItem('L1_TE500.0ETA49').setLogic( TE5000ETA49 & physcond).setTriggerType(TT.calo)    # noqa: F821
+        LVL1MenuItem('L1_TE600.0ETA49').setLogic( TE6000ETA49 & physcond).setTriggerType(TT.calo)    # noqa: F821
         LVL1MenuItem('L1_TE1500.0ETA49').setLogic( TE15000ETA49 & physcond).setTriggerType(TT.calo)    # noqa: F821
         LVL1MenuItem('L1_TE3000.0ETA49').setLogic( TE30000ETA49 & physcond).setTriggerType(TT.calo)    # noqa: F821
         LVL1MenuItem('L1_TE3500.0ETA49').setLogic( TE35000ETA49 & physcond).setTriggerType(TT.calo)    # noqa: F821
@@ -814,6 +828,7 @@ class ItemDef:
         LVL1MenuItem('L1_TE9000.0ETA49').setLogic( TE90000ETA49 & physcond).setTriggerType(TT.calo)    # noqa: F821
 
         LVL1MenuItem('L1_TE500.0ETA49_OVERLAY').setLogic( TE5000ETA49 & physcond).setTriggerType(TT.zerobs)   # noqa: F821
+        LVL1MenuItem('L1_TE600.0ETA49_OVERLAY').setLogic( TE6000ETA49 & physcond).setTriggerType(TT.zerobs)   # noqa: F821
         LVL1MenuItem('L1_TE1500.0ETA49_OVERLAY').setLogic( TE15000ETA49 & physcond).setTriggerType(TT.zerobs) # noqa: F821
         LVL1MenuItem('L1_TE3000.0ETA49_OVERLAY').setLogic( TE30000ETA49 & physcond).setTriggerType(TT.zerobs) # noqa: F821
         LVL1MenuItem('L1_TE3500.0ETA49_OVERLAY').setLogic( TE35000ETA49 & physcond).setTriggerType(TT.zerobs) # noqa: F821
@@ -822,6 +837,10 @@ class ItemDef:
         LVL1MenuItem('L1_TE8000.0ETA49_OVERLAY').setLogic( TE80000ETA49 & physcond).setTriggerType(TT.zerobs) # noqa: F821
         LVL1MenuItem('L1_TE9000.0ETA49_OVERLAY').setLogic( TE90000ETA49 & physcond).setTriggerType(TT.zerobs) # noqa: F821
         
+        LVL1MenuItem('L1_TE50_VTE600.0ETA49').setLogic( TE50 & Not(TE6000ETA49) & physcond).setTriggerType(TT.calo)    # noqa: F821
+        LVL1MenuItem('L1_TE50_VTE600.0ETA49_PEB').setLogic( TE50 & Not(TE6000ETA49) & physcond).setTriggerType(TT.calo)    # noqa: F821
+        LVL1MenuItem('L1_TE600.0ETA49_PEB').setLogic( TE6000ETA49 & physcond).setTriggerType(TT.calo)    # noqa: F821
+        
         LVL1MenuItem('L1_VTE2' ).setLogic( Not(TE2)  & physcond).setTriggerType(TT.calo)    # noqa: F821
         LVL1MenuItem('L1_VTE3' ).setLogic( Not(TE3)  & physcond).setTriggerType(TT.calo)    # noqa: F821
         LVL1MenuItem('L1_VTE4' ).setLogic( Not(TE4)  & physcond).setTriggerType(TT.calo)    # noqa: F821
@@ -961,12 +980,15 @@ class ItemDef:
         LVL1MenuItem('L1_ZDC_A_C_VTE50'     ).setLogic( ZDC_A_C & Not(TE50) & physcond).setTriggerType(TT.minb)    # noqa: F821
         LVL1MenuItem('L1_ZDC_A_C_TE50'      ).setLogic( ZDC_A_C & TE50 & physcond).setTriggerType(TT.minb)    # noqa: F821
         
+        LVL1MenuItem('L1_ZDC_A_C_VTE50_PEB'     ).setLogic( ZDC_A_C & Not(TE50) & physcond).setTriggerType(TT.minb)    # noqa: F821
+        
         LVL1MenuItem('L1_ZDC_A_VTE20'      ).setLogic( ZDC_A & Not(TE20) & physcond).setTriggerType(TT.minb)    # noqa: F821
         LVL1MenuItem('L1_ZDC_C_VTE20'      ).setLogic( ZDC_C & Not(TE20) & physcond).setTriggerType(TT.minb)    # noqa: F821
 
         LVL1MenuItem('L1_ZDC_A_C_VTE200'           ).setLogic( ZDC_A_C & Not(TE200) & physcond).setTriggerType(TT.minb)    # noqa: F821
         LVL1MenuItem('L1_ZDC_A_C_TE5_VTE200'       ).setLogic( ZDC_A_C & TE5 & Not(TE200) & physcond).setTriggerType(TT.minb)    # noqa: F821
         
+        LVL1MenuItem('L1_VZDC_A_C_VTE50'       ).setLogic( VZDC_A_C & Not(TE50) & physcond).setTriggerType(TT.minb)    # noqa: F821
         LVL1MenuItem('L1_VZDC_A_C_TE5_VTE200'       ).setLogic( VZDC_A_C & TE5 & Not(TE200) & physcond).setTriggerType(TT.minb)    # noqa: F821
         LVL1MenuItem('L1_VZDC_A_C_TE20_VTE200'       ).setLogic( VZDC_A_C & TE20 & Not(TE200) & physcond).setTriggerType(TT.minb)    # noqa: F821
         LVL1MenuItem('L1_VZDC_AORC_TE5_VTE200'      ).setLogic( VZDC_AORC & TE5 & Not(TE200) & physcond).setTriggerType(TT.minb)    # noqa: F821
@@ -1006,6 +1028,19 @@ class ItemDef:
         LVL1MenuItem('L1_ZDC_C_VZDC_A'      ).setLogic(ZDC_C & Not(ZDC_A) & physcond).setTriggerType(TT.minb)    # noqa: F821
         LVL1MenuItem('L1_ZDC_A_VZDC_C_VTE200'      ).setLogic(ZDC_A & Not(ZDC_C) & Not(TE200) & physcond).setTriggerType(TT.minb)    # noqa: F821
         LVL1MenuItem('L1_ZDC_C_VZDC_A_VTE200'      ).setLogic(ZDC_C & Not(ZDC_A) & Not(TE200) & physcond).setTriggerType(TT.minb)    # noqa: F821
+        LVL1MenuItem('L1_MBTS_1_ZDC_A_VZDC_C_VTE200'      ).setLogic(MBTS_1 & ZDC_A & Not(ZDC_C) & Not(TE200) & physcond).setTriggerType(TT.minb)    # noqa: F821
+        LVL1MenuItem('L1_MBTS_1_ZDC_C_VZDC_A_VTE200'      ).setLogic(MBTS_1 & ZDC_C & Not(ZDC_A) & Not(TE200) & physcond).setTriggerType(TT.minb)    # noqa: F821
+        LVL1MenuItem('L1_TE3.0ETA49_ZDC_A_VZDC_C_VTE200'      ).setLogic(TE30ETA49 & ZDC_A & Not(ZDC_C) & Not(TE200) & physcond).setTriggerType(TT.minb)    # noqa: F821
+        LVL1MenuItem('L1_TE3.0ETA49_ZDC_C_VZDC_A_VTE200'      ).setLogic(TE30ETA49 & ZDC_C & Not(ZDC_A) & Not(TE200) & physcond).setTriggerType(TT.minb)    # noqa: F821
+        LVL1MenuItem('L1_TE4_ZDC_A_VZDC_C_VTE200'      ).setLogic(TE4 & ZDC_A & Not(ZDC_C) & Not(TE200) & physcond).setTriggerType(TT.minb)    # noqa: F821
+        LVL1MenuItem('L1_TE4_ZDC_C_VZDC_A_VTE200'      ).setLogic(TE4 & ZDC_C & Not(ZDC_A) & Not(TE200) & physcond).setTriggerType(TT.minb)    # noqa: F821
+        LVL1MenuItem('L1_TE5_ZDC_A_VZDC_C_VTE200'      ).setLogic(TE5 & ZDC_A & Not(ZDC_C) & Not(TE200) & physcond).setTriggerType(TT.minb)    # noqa: F821
+        LVL1MenuItem('L1_TE5_ZDC_C_VZDC_A_VTE200'      ).setLogic(TE5 & ZDC_C & Not(ZDC_A) & Not(TE200) & physcond).setTriggerType(TT.minb)    # noqa: F821
+        LVL1MenuItem('L1_TE7.0ETA49_ZDC_A_VZDC_C_VTE200'      ).setLogic(TE70ETA49 & ZDC_A & Not(ZDC_C) & Not(TE200) & physcond).setTriggerType(TT.minb)    # noqa: F821
+        LVL1MenuItem('L1_TE7.0ETA49_ZDC_C_VZDC_A_VTE200'      ).setLogic(TE70ETA49 & ZDC_C & Not(ZDC_A) & Not(TE200) & physcond).setTriggerType(TT.minb)    # noqa: F821
+        
+        
+        
         LVL1MenuItem('L1_ZDC_XOR'           ).setLogic(ZDC_XOR  & physcond).setTriggerType(TT.minb)    # noqa: F821
         LVL1MenuItem('L1_ZDC_XOR_TE5_VTE200'           ).setLogic(ZDC_XOR  & TE5 & Not(TE200) & physcond).setTriggerType(TT.minb)    # noqa: F821
         LVL1MenuItem('L1_ZDC_XOR_TE20_VTE200'           ).setLogic(ZDC_XOR  & TE20 & Not(TE200) & physcond).setTriggerType(TT.minb)    # noqa: F821
diff --git a/Trigger/TriggerCommon/TriggerMenu/python/l1menu/Menu_Physics_HI_v5.py b/Trigger/TriggerCommon/TriggerMenu/python/l1menu/Menu_Physics_HI_v5.py
index 585b22b2f71c4ba549b726d011e577f82c8b69fd..f091f6854c96e3142e7efc32ed6dd0285dad2a9c 100644
--- a/Trigger/TriggerCommon/TriggerMenu/python/l1menu/Menu_Physics_HI_v5.py
+++ b/Trigger/TriggerCommon/TriggerMenu/python/l1menu/Menu_Physics_HI_v5.py
@@ -44,8 +44,9 @@ def defineMenu():
         #-------------------------
         
         # 16 x EM
-        'EM7', 'EM8', 'EM8I', 'EM10', 'EM10VH', 'EM12', 'EM13VH', 'EM14', 'EM15', 'EM15HI', 'EM16', 'EM18', 'EM20', 'EM20VH', 'EM20VHI', 'EM22',
-        
+        #'EM7', 'EM8', 'EM8I', 'EM10', 'EM10VH', 'EM12', 'EM13VH', 'EM14', 'EM15', 'EM15HI', 'EM16', 'EM18', 'EM20', 'EM20VH', 'EM20VHI', 'EM22',
+        'EM7', 'EM8', 'EM8I', 'EM10', 'EM10VH', 'EM12', 'EM14', 'EM15',  'EM15HI', 'EM16', 'EM18', 'EM18VH', 'EM20', 'EM20VH', 'EM20VHI', 'EM22',
+
         # 1 x ZB
         'ZB_J75', # TODO double check if 'ZB_EM15' should be used for Run-2 (need to be changed also in ItemDef).
 
@@ -53,16 +54,16 @@ def defineMenu():
         # SLOT 7 / CON 2,3 (TAU1,2)
         #--------------------------
 		
-		#TODO TAU trigger behaving like EM items, lowere thresholds
         # 16 x TAU
-        'HA8', 'HA12', 'HA12IL', 'HA12IM', 'HA12IT', 'HA15', 'HA20', 'HA20IL',  'HA20IM', 'HA20IT', 'HA25', 'HA25IT', 'HA30', 'HA40', 'HA60', 'HA100', 
+        #'HA2', 'HA3','HA8', 'HA12', 'HA12IL', 'HA12IM', 'HA12IT', 'HA15', 'HA20', 'HA20IL',  'HA20IM', 'HA20IT', 'HA25', 'HA25IT', 'HA30', 'HA40', 
+        #'HA2', 'HA3','HA8', 'HA12', 'HA12IL', 'HA12IM', 'HA12IT', 'HA15', 'HA20', 'HA20IL',  'HA20IM', 'HA20IT', 'HA25', 'HA25IT', 'HA30', 'HA40',  
+        'HA2', 'HA3','HA8', 'HA12', 'HA12IL', 'HA12IM', 'HA12IT', 'HA15', 'HA20', 'HA20IL',  'HA20IM', 'HA20IT', 'HA25IT', 'HA30', 'HA40', 'HA60', 
 
         #----------------------
         # SLOT 8 / CON 0 (JET1)
         #----------------------
         # 10 x 3-bit JET (can have multiplicity 4 or more)
 
-        #TODO shall we start at higher pT to reduce overflows?
         # 8 x JETs and central jets
         'J12', 'J12.0ETA23', 'J15', 'J15.0ETA25','J20', 'J25','J25.0ETA23','J30',
         
@@ -82,7 +83,7 @@ def defineMenu():
         'J40', 'J50', 'J75', 'J85', 'J100', 'J175',
 
         # 6 x FJ              
-        'J10.31ETA49', 'J15.31ETA49', 'J20.31ETA49', 'J30.31ETA49', 'J75.31ETA49', 'J100.31ETA49',
+        'J15.31ETA49', 'J20.31ETA49', 'J30.31ETA49', 'J50.31ETA49', 'J75.31ETA49', 'J100.31ETA49',
 
         #---------------------
         # SLOT 8 / CON 2 (EN1)
@@ -93,10 +94,15 @@ def defineMenu():
         'TE4', 'TE5', 'TE20', 'TE50', 'TE100', 'TE200', 'TE10000', 'TE12000',
         
         # 8 x XE
-        'XE35', 'XE40', 'XE45', 'XE50', 'XE55', 'XE60', 'XE70', 'XE80',
+        #'XE35', 'XE40', 'XE45', 'XE50', 'XE55', 'XE60', 'XE70', 'XE80',
+        #'XE30', 'XE35', 'XE40', 'XE45', 'XE50', 'XE55', 'XE60', 'XE70', 'XE80',
+        
+        #'XE35.0ETA24', 'XE40.0ETA24', 'XE45.0ETA24', 'XE50.0ETA24', 'XE55.0ETA24', 'XE60.0ETA24', 'XE70.0ETA24', 'XE80.0ETA24',
+        #'XE30.0ETA24', 'XE35.0ETA24', 'XE40.0ETA24', 'XE45.0ETA24', 'XE50.0ETA24', 'XE55.0ETA24', 'XE60.0ETA24', 'XE70.0ETA24',
+        
+        'XE10', 'XE20', 'XE25', 'XE30', 'XE35', 'XE40', 'XE45', 'XE50',
+        'XE55', 'XE60', 'XE65', 'XE70', 'XE75', 'XE80', 'XE150', 'XE300',
         
-        'XE35.0ETA24', 'XE40.0ETA24', 'XE45.0ETA24', 'XE50.0ETA24', 'XE55.0ETA24', 'XE60.0ETA24', 'XE70.0ETA24', 'XE80.0ETA24',
-
         # 8 x XS
         'XS20', 'XS30', 'XS40', 'XS45', 'XS50', 'XS55', 'XS60', 'XS65', 
 
@@ -110,8 +116,8 @@ def defineMenu():
         #'RXE35', 'RXE40', 'RXE45', 'RXE50', 'RXE55', 'RXE60', 'RXE70', 'RXE80', # FTHR
 
         # 8 x restricted eta range in |eta|<4.9
-        'TE500.0ETA49', 'TE1500.0ETA49', 'TE3000.0ETA49', 'TE3500.0ETA49',
-        'TE5000.0ETA49', 'TE6500.0ETA49', 'TE8000.0ETA49', 'TE9000.0ETA49',    
+        'TE3.0ETA49','TE7.0ETA49','TE600.0ETA49', 'TE1500.0ETA49',
+        'TE3000.0ETA49', 'TE3500.0ETA49', 'TE6500.0ETA49', 'TE8000.0ETA49',
         
         #------------------------       
         # SLOT 9 / CON 0 (MUCTPi)
@@ -155,8 +161,7 @@ def defineMenu():
 
         # 2 x MBTS
         'MBTS_A', 'MBTS_C', 
-
-        #TODO/NOTE: redefined according to pp_v7 menu  
+  
         # 32 x MBTSSI (all FTHR)
         # NOTE: THESE ARE OUT OF ORDER FOR A REASON! Do not change!
         # The order defines the mapping - see ATR-17870.
@@ -356,8 +361,51 @@ def defineMenu():
         ]
 
     Lvl1Flags.items = [
+          #ATR-18734
+          'L1_HT190-J15s5.ETA21',
+          #B->K*ee:',
+          'L1_BPH-0M9-EM7-EM5_2MU4',
+          'L1_BPH-0M9-EM7-EM5_MU6',
+          'L1_BPH-0DR3-EM7J15_2MU4',
+          'L1_BPH-0DR3-EM7J15_MU6',
+          #Jpsi->ee T&P:',
+          'L1_JPSI-1M5-EM7',
+          'L1_JPSI-1M5-EM12',
+          #VBF inclusive:',
+          'L1_MJJ-500-NFF',
+          'L1_MJJ-700',
+          #VBF H->bb + photon:',
+          'L1_EM18VH_MJJ-300',
+          #VBF H->bb:',
+          'L1_HT150-J20s5.ETA31_MJJ-400-CF',
+          #g + tau for excl Higgs decays:',
+          'L1_30M-EM20ITAU12',
+          #Exotics LLP cal-ratio:',
+          'L1_LLP-RO',
+          'L1_LLP-NOMATCH',
+          #SUSY Higgsino:',
+          'L1_2MU4_J20_XE30_DPHI-J20s2XE30',
+          'L1_MU4_J30_XE40_DPHI-J20s2XE30',
+          'L1_MU4_J50_XE50_DPHI-J20s2XE30',
+          'L1_J40_XE50_DPHI-J20s2XE50',
+          #Axion search:',
+          'L1_DPHI-2EM3',
+          #LAr:',
+          #'L1_LAR-J',
+          #'L1_LAR-EM',
+          'L1_LAR-ZEE',
+          'L1_LAR-ZEE_LAR-EM',
+          #Tau:',
+          'L1_DR-EM15TAU12I-J25',
+          'L1_DR-TAU20ITAU12I-J25',
+          'L1_TAU60_DR-TAU20ITAU12I',
+          #Jet:
+          'L1_SC111-CJ15',
+          #TLA:',
+          'L1_J50_DETA20-J50J',
+
                        'L1_EM7',
-		       'L1_EM8',
+                   'L1_EM8',
                        'L1_EM10',
                        'L1_EM12',
                        'L1_EM14',
@@ -366,7 +414,7 @@ def defineMenu():
 		       'L1_EM20',
 	               'L1_EM22',
                        'L1_2EM10',
-                       #'L1_2EM5',
+                       'L1_2EM16',
 		       'L1_2EM7',
                        # tau beam items
                        #'L1_TAU8',
@@ -399,7 +447,8 @@ def defineMenu():
                        #'L1_JE300',
                        #'L1_JE500',
                        # forward jets
-                       'L1_J10.31ETA49',
+                       'L1_J15.31ETA49',
+                       'L1_J20.31ETA49',
                        #'L1_FJ30',
                        #'L1_FJ55' ,
                        #'L1_FJ95',
@@ -457,23 +506,26 @@ def defineMenu():
 		       'L1_TE4_VTE100',
 		       'L1_TE4_VTE50',
 		       # restricted TE
-		       'L1_TE500.0ETA49',
+		       'L1_TE600.0ETA49_PEB',
+		       'L1_TE600.0ETA49',
                        'L1_TE1500.0ETA49',
                        'L1_TE3000.0ETA49',
                        'L1_TE3500.0ETA49',
-                       'L1_TE5000.0ETA49',
+                       'L1_TE3.0ETA49',
                        'L1_TE6500.0ETA49',
                        'L1_TE8000.0ETA49',
-                       'L1_TE9000.0ETA49',
+                       'L1_TE7.0ETA49',
+		       'L1_TE50_VTE600.0ETA49',
+		       'L1_TE50_VTE600.0ETA49_PEB',
 		       # restricted TE for overlay
-                       'L1_TE500.0ETA49_OVERLAY',
+                       'L1_TE600.0ETA49_OVERLAY',
                        'L1_TE1500.0ETA49_OVERLAY',
                        'L1_TE3000.0ETA49_OVERLAY',
                        'L1_TE3500.0ETA49_OVERLAY',
-                       'L1_TE5000.0ETA49_OVERLAY',
+                       #'L1_TE5000.0ETA49_OVERLAY',
                        'L1_TE6500.0ETA49_OVERLAY',
                        'L1_TE8000.0ETA49_OVERLAY',
-                       'L1_TE9000.0ETA49_OVERLAY',
+                       #'L1_TE9000.0ETA49_OVERLAY',
                        #Min Bias
                        'L1_ZDC',
                        'L1_ZDC_A',
@@ -486,6 +538,7 @@ def defineMenu():
 		       'L1_ZDC_A_C_VTE50_OVERLAY',
 		       'L1_TE50_OVERLAY',
                        'L1_ZDC_A_C_VTE50',
+                       'L1_ZDC_A_C_VTE50_PEB',
                        'L1_ZDC_A_C_TE50',
                        'L1_BCM_Wide',
                        'L1_BCM_HT_BGRP0','L1_BCM_Wide_BGRP0','L1_BCM_AC_CA_BGRP0',
@@ -504,9 +557,21 @@ def defineMenu():
 	           'L1_ZDC_XOR_TE20_VTE200',
                'L1_ZDC_XOR_TRT_VTE200',
                'L1_ZDC_XOR_VTE200_MBTS_1',
+		       'L1_VZDC_A_C_VTE50',
 		       'L1_VZDC_A_C_TE5_VTE200',
 	           'L1_VZDC_A_C_TE20_VTE200',
 	           'L1_VZDC_AORC_TE5_VTE200',
+	           
+	           'L1_MBTS_1_ZDC_A_VZDC_C_VTE200',
+	           'L1_MBTS_1_ZDC_C_VZDC_A_VTE200',
+	           'L1_TE4_ZDC_A_VZDC_C_VTE200',
+	           'L1_TE4_ZDC_C_VZDC_A_VTE200',
+	           'L1_TE3.0ETA49_ZDC_A_VZDC_C_VTE200',
+	           'L1_TE3.0ETA49_ZDC_C_VZDC_A_VTE200',
+	           'L1_TE5_ZDC_A_VZDC_C_VTE200',
+	           'L1_TE5_ZDC_C_VZDC_A_VTE200',
+	           'L1_TE7.0ETA49_ZDC_A_VZDC_C_VTE200',
+	           'L1_TE7.0ETA49_ZDC_C_VZDC_A_VTE200',
 		       #coincidence
 		       'L1_ZDC_A_C_VTE200',
 	               'L1_ZDC_A_C_TE5_VTE200',
@@ -569,7 +634,7 @@ def defineMenu():
                        'L1_J30_EMPTY', 'L1_J30_UNPAIRED', 'L1_J30_FIRSTEMPTY',
                        #FJ  UNPAIRED-EMPTY-ETC
                        #'L1_FJ10_UNPAIRED_ISO', 'L1_FJ10_FIRSTEMPTY',
-                       'L1_J10.31ETA49_EMPTY',
+                       #'L1_J10.31ETA49_EMPTY',
                        #ZDC
                        'L1_ZDC_EMPTY',
                        'L1_ZDC_UNPAIRED_ISO',
@@ -643,6 +708,8 @@ def defineMenu():
                        #### NO-MU10 'L1_MU10_TAU12_J25_2J12',
                        #### NO-MU10 'L1_MU10_TAU20',
                        #### NO-MU10 'L1_MU10_TAU20IM',
+                       'L1_TAU2',
+                       'L1_TAU3',
                        'L1_TAU12',
                        'L1_TAU12IL',
                        'L1_TAU12IM',
@@ -664,8 +731,14 @@ def defineMenu():
                        'L1_TAU25IT_2TAU12IT_2J25_3J12',
                        'L1_TAU30',
                        'L1_TAU40',
-                       'L1_TAU60',
+                       #'L1_TAU60',
                        #'L1_TAU8',
+                       'L1_2TAU2_VTE50',
+                       'L1_2TAU3_VTE50',
+                       'L1_2TAU2_VTE100',
+                       'L1_2TAU3_VTE100',
+                       'L1_2TAU2_VTE200',
+                       'L1_2TAU3_VTE200',
                        'L1_EM20VH_FIRSTEMPTY',
                        'L1_EM20VHI',
                        'L1_EM7_EMPTY',
@@ -676,13 +749,16 @@ def defineMenu():
                        'L1_J100_FIRSTEMPTY',
                        'L1_J30.31ETA49',
                        'L1_J30.31ETA49_EMPTY',
-                       'L1_J40_XE50',
+                       'L1_J40_XE60',
                        'L1_J75.31ETA49',
                        'L1_J75_XE40',
                        'L1_RD0_ABORTGAPNOTCALIB',
                        'L1_TGC_BURST',
                        'L1_XE35',
                        'L1_XE50',
+                       'L1_XE60',
+                       'L1_XE70',
+                       'L1_XE80',
                        #TOPO
                        'L1_LAR-EM',
                        'L1_LAR-J',
@@ -702,9 +778,8 @@ def defineMenu():
         'L1_2MU4_EMPTY' : 6,
         'L1_RD0_UNPAIRED_NONISO' : 7,
         'L1_BCM_AC_CA_UNPAIRED_NONISO': 8,
-        'L1_FJ10_UNPAIRED_NONISO' :  9,
+        'L1_2EM16' : 9,
         'L1_2EM10' : 10,
-        #'L1_2EM5' : 11,
         #'L1_MU0_VTE20' : 12,
         'L1_LAR-EM' : 11,
         'L1_LAR-J' : 12,
@@ -719,7 +794,8 @@ def defineMenu():
 
         'L1_ZDC_AND_VTE50' : 27,
         #'L1_EM3_VTE20': 28,
-                
+        
+        'L1_ZDC_A_C_VTE50_PEB' : 34,        
         'L1_2MU4_VTE50' : 35,
         'L1_ZDC_A_C_VTE50' : 36,
         'L1_ZDC_A_C_UNPAIRED_NONISO' : 37,
@@ -749,8 +825,9 @@ def defineMenu():
         'L1_MBTSC15' : 61,
         'L1_RD0_EMPTY' : 62,
         'L1_RD1_FILLED' : 63,            
-        #'L1_TAU3' : 64,
+        'L1_TAU2' : 64,
         'L1_MBTSC3' : 65,
+        'L1_TAU3' : 66,
         'L1_MU4_FIRSTEMPTY' : 67,
         'L1_MU6_FIRSTEMPTY' : 68,
         #'L1_2MU0_EMPTY' : 69,
@@ -801,7 +878,7 @@ def defineMenu():
 
         'L1_MBTSA0' : 120,
         'L1_MBTSA1' : 122,
-        'L1_FJ0' : 123,
+        #'L1_FJ0' : 123,
         'L1_2MU6_UNPAIRED_ISO' : 124,
         'L1_2MU6_UNPAIRED_NONISO' : 125,
         'L1_BCM_Wide_UNPAIRED_NONISO' : 126,
@@ -839,6 +916,9 @@ def defineMenu():
         'L1_MBTSA7' : 156,
         'L1_NIM_S8C2B23'            : 157,#DIRNIM
         
+        'L1_J15.31ETA49' : 158,
+        'L1_J20.31ETA49' : 159,
+        
         #'L1_MU0_UNPAIRED_NONISO' : 159,
         #'L1_MU0_UNPAIRED_ISO' : 160,
         'L1_MBTSA8' : 161,
@@ -853,12 +933,12 @@ def defineMenu():
         'L1_J30_EMPTY' : 172,
         'L1_MBTSA12' : 173,
         'L1_MBTSA13' : 174,
-        'L1_FJ0_EMPTY' : 175,
+        #'L1_FJ0_EMPTY' : 175,
         'L1_MBTSA14' : 176,
         #'L1_EM3_EMPTY' : 177,
         'L1_MBTSA15' : 178,
-        'L1_FJ0_UNPAIRED_ISO' : 180,
-        'L1_FJ5_UNPAIRED_ISO' : 181,
+        #'L1_FJ0_UNPAIRED_ISO' : 180,
+        #'L1_FJ5_UNPAIRED_ISO' : 181,
         'L1_ZDC_UNPAIRED_ISO' : 182,
         'L1_ZDC_UNPAIRED_NONISO' : 183,
         #'L1_J12_EMPTY' : 184,
@@ -875,12 +955,12 @@ def defineMenu():
         
         'L1_ZDC_A_C_EMPTY' : 196,
         'L1_ZDC_EMPTY' : 197,
-        'L1_FJ5' : 198,
-        'L1_FJ10' : 199,
+        #'L1_FJ5' : 198,
+        #'L1_FJ10' : 199,
         'L1_MBTS_1_UNPAIRED_ISO':    200,
         'L1_MBTS_1_UNPAIRED_NONISO':    201,        
         'L1_MBTS_1_1_UNPAIRED_ISO':  202,
-        'L1_FJ15':  203,        
+        #'L1_FJ15':  203,        
         'L1_MBTS_2_UNPAIRED_ISO':    204,
         'L1_MBTS_2_UNPAIRED_NONISO':    205,
         'L1_LUCID_A_C_UNPAIRED_NONISO':  206,
@@ -893,8 +973,8 @@ def defineMenu():
         'L1_LUCID_A_C' : 214,
         'L1_LUCID' : 215,
         
-        'L1_FJ5_EMPTY' : 218,
-        'L1_FJ0_C' : 219,
+        #'L1_FJ5_EMPTY' : 218,
+        #'L1_FJ0_C' : 219,
         
         'L1_MBTS_2' : 222,
         'L1_MBTS_2_2' : 223,
@@ -913,7 +993,7 @@ def defineMenu():
         'L1_LUCID_A_EMPTY' : 236,
         'L1_LUCID_C_EMPTY' : 237,
         'L1_LUCID_A_C_EMPTY' : 238,
-        'L1_FJ0_A' : 239,
+        #'L1_FJ0_A' : 239,
         'L1_MBTS_1_1_BGRP11' : 240,
         'L1_BPTX0_BGRP0' : 241,
         'L1_BPTX1_BGRP0' : 242,
@@ -976,7 +1056,7 @@ def defineMenu():
         'L1_TAU25IT_2TAU12IT_2J25_3J12': 296,
         'L1_TAU30': 297,
         'L1_TAU40': 298,
-        'L1_TAU60': 299,
+        #'L1_TAU60': 299,
         'L1_EM20VH_FIRSTEMPTY': 300,
         'L1_EM20VHI': 301,
         'L1_EM7_EMPTY': 302,
@@ -990,7 +1070,7 @@ def defineMenu():
         'L1_J12_FIRSTEMPTY': 310,
         'L1_J30.31ETA49': 311,
         'L1_J30.31ETA49_EMPTY': 312,   
-        'L1_J40_XE50': 313,
+        'L1_J40_XE60': 313,
         'L1_J75.31ETA49': 314,
         'L1_J75_XE40': 315,
         'L1_RD0_ABORTGAPNOTCALIB': 316,
@@ -1004,15 +1084,20 @@ def defineMenu():
         'L1_EM15HI_2TAU12IM_XE35': 324, 
         'L1_EM15HI_TAU40_2TAU15': 325,
         
+        'L1_XE60': 357,
+        'L1_XE70': 358,
+        'L1_XE80': 359,
+        
 	# restricted TE
-        'L1_TE500.0ETA49': 326,
+        'L1_TE600.0ETA49_PEB': 306,
+        'L1_TE600.0ETA49': 326,
         'L1_TE1500.0ETA49': 327,
         'L1_TE3000.0ETA49': 328,
         'L1_TE3500.0ETA49': 329,
         'L1_TE4500.0ETA49': 330,
         'L1_TE6500.0ETA49': 331,
         'L1_TE8000.0ETA49': 332,
-        'L1_TE9000.0ETA49': 333,
+        'L1_TE3.0ETA49': 333,
 
 	#'L1_J5': 334,
 	'L1_TE5_VTE200': 335,
@@ -1022,21 +1107,41 @@ def defineMenu():
 	'L1_TE4_VTE100': 349,
 	'L1_TE4_VTE50': 350,
 
+        'L1_TE50_VTE600.0ETA49_PEB': 305,
+        'L1_TE50_VTE600.0ETA49': 334,
         # restricted TE for overlay
-        'L1_TE500.0ETA49_OVERLAY': 336,
+        'L1_TE600.0ETA49_OVERLAY': 336,
         'L1_TE1500.0ETA49_OVERLAY': 337,
         'L1_TE3000.0ETA49_OVERLAY': 338,
         'L1_TE3500.0ETA49_OVERLAY': 339,
         'L1_TE4500.0ETA49_OVERLAY': 340,
         'L1_TE6500.0ETA4_OVERLAY9': 341,
         'L1_TE8000.0ETA49_OVERLAY': 342,
-        'L1_TE9000.0ETA49_OVERLAY': 343,
+        'L1_TE7.0ETA49': 343,
 
 	'L1_EM8':      344,
 	'L1_2EM7':      345,
         'L1_CALREQ2' : 511,
+      
+    'L1_2TAU2_VTE50' : 351,
+    'L1_2TAU3_VTE50' : 352,
+    'L1_2TAU2_VTE100' : 353,
+    'L1_2TAU3_VTE100' : 354,
+    'L1_2TAU2_VTE200' : 355,
+    'L1_2TAU3_VTE200' : 356,
+    
+    'L1_MBTS_1_ZDC_A_VZDC_C_VTE200' : 470,
+	'L1_MBTS_1_ZDC_C_VZDC_A_VTE200' : 471,
+	'L1_TE4_ZDC_A_VZDC_C_VTE200' : 472,
+	'L1_TE4_ZDC_C_VZDC_A_VTE200' : 473,
+	'L1_TE3.0ETA49_ZDC_A_VZDC_C_VTE200' : 474,
+	'L1_TE3.0ETA49_ZDC_C_VZDC_A_VTE200' : 475,
+	'L1_TE5_ZDC_A_VZDC_C_VTE200' : 476,
+	'L1_TE5_ZDC_C_VZDC_A_VTE200' : 477,
+	'L1_TE7.0ETA49_ZDC_A_VZDC_C_VTE200' : 478,
+	'L1_TE7.0ETA49_ZDC_C_VZDC_A_VTE200' : 479,
 	
-
+    'L1_VZDC_A_C_VTE50' : 480,
     'L1_ZDC_XOR_TE20_VTE200' : 481,
 	'L1_TRT_FILLED' : 482,
 	'L1_TRT_EMPTY'  : 483,
@@ -1054,6 +1159,9 @@ def defineMenu():
 	'L1_VZDC_A_C_TE20_VTE200' : 497,
 	'L1_VZDC_AORC_TE5_VTE200' : 498,
 	'L1_ZDC_XOR_VTE50' : 499,
+	
+	
+	
 	}
 
     Lvl1Flags.prescales = {}
diff --git a/Trigger/TriggerCommon/TriggerMenu/python/l1menu/ThresholdDef.py b/Trigger/TriggerCommon/TriggerMenu/python/l1menu/ThresholdDef.py
index 803a7f8ec3409f25ec6132560922c05bed24fafe..b844c4b55bd811871e8b9c33591aef48f90fa72f 100644
--- a/Trigger/TriggerCommon/TriggerMenu/python/l1menu/ThresholdDef.py
+++ b/Trigger/TriggerCommon/TriggerMenu/python/l1menu/ThresholdDef.py
@@ -232,7 +232,7 @@ class ThresholdDef:
 
         ThresholdValue.setDefaults('TAU',{'isobits' : '00000', 'use_relIso' : True })
 
-        for thrV in [6, 8, 12, 15, 20, 25, 30, 35, 40, 50, 60,100]:
+        for thrV in [2, 3, 6, 8, 12, 15, 20, 25, 30, 35, 40, 50, 60,100]:
             tc.registerThr('HA%i' % thrV, 'TAU').addThrValue(thrV)
 
         # beam splashes     
@@ -363,12 +363,12 @@ class ThresholdDef:
 
         # RXE (restriced range ET miss)
         etamax = 24
-        for thrV in [35, 40, 45, 50, 55, 60, 70, 80]:
+        for thrV in [30, 35, 40, 45, 50, 55, 60, 70, 80]:
             tc.registerThr('XE%i.0ETA%i'    % (thrV, etamax), 'XE').addThrValue(EtMissOff).addThrValue( thrV, etamin = -etamax, etamax = etamax, priority=1) 
 
 	 # Restricted range TE |eta|<4.9
         etamax = 49
-        for thrV in [500, 1500, 3000, 3500, 5000, 6500, 8000, 9000]:
+        for thrV in [3, 7, 500, 600, 1500, 3000, 3500, 5000, 6500, 8000, 9000]:
             tc.registerThr('TE%i.0ETA%i' % (thrV, etamax), 'TE').addThrValue(EtSumOff).addThrValue( thrV, etamin = -etamax, etamax = etamax, priority=1)
 
 
diff --git a/Trigger/TriggerCommon/TriggerMenu/python/menu/GroupInfo.py b/Trigger/TriggerCommon/TriggerMenu/python/menu/GroupInfo.py
index 69413e70943ee8551b607953acacc2bdaf1ed7c0..8cf317c78989b34a0ad36fe3b3fd7b303ee618cd 100644
--- a/Trigger/TriggerCommon/TriggerMenu/python/menu/GroupInfo.py
+++ b/Trigger/TriggerCommon/TriggerMenu/python/menu/GroupInfo.py
@@ -31,6 +31,10 @@ AllowedGroup_HI = ['UltraCentral',
                    'MinBiasOverlay',
                    'SingleMuon',
                    'SingleElectron',
+                   'PC',
+                   'PCpeb',
+                   'CC',
+                   'CCpeb',
                    ]
 
 def getAllAllowedGroups(menu):    
diff --git a/Trigger/TriggerCommon/TriggerMenu/python/menu/Lumi.py b/Trigger/TriggerCommon/TriggerMenu/python/menu/Lumi.py
index a6ffc33841de2353881cc505ee44e6b1471b4c65..9d76d39dc984515bdcd48e14e23f214ac6f14cc7 100755
--- a/Trigger/TriggerCommon/TriggerMenu/python/menu/Lumi.py
+++ b/Trigger/TriggerCommon/TriggerMenu/python/menu/Lumi.py
@@ -178,6 +178,9 @@ def lumi(triggerPythonConfig):
         if 'cosmics_prescale' in menu_name:
             L1Prescales = Prescales.L1Prescales_cosmics
             HLTPrescales = Prescales.HLTPrescales_cosmics
+        elif 'tight' in menu_name:
+            L1Prescales = Prescales.L1Prescales_tight_physics_prescale
+            HLTPrescales = Prescales.HLTPrescales_tight_physics_prescale
         else:
             L1Prescales = Prescales.L1Prescales
             HLTPrescales = Prescales.HLTPrescales
diff --git a/Trigger/TriggerCommon/TriggerMenu/python/menu/MC_HI_v5.py b/Trigger/TriggerCommon/TriggerMenu/python/menu/MC_HI_v5.py
index f3b7d2d49abdadca3910b6453caa89a4809b4a32..3e35d0c2277c5bbf73c7160705a1fac952a1f3fc 100755
--- a/Trigger/TriggerCommon/TriggerMenu/python/menu/MC_HI_v5.py
+++ b/Trigger/TriggerCommon/TriggerMenu/python/menu/MC_HI_v5.py
@@ -74,7 +74,17 @@ Prescales = physics_menu.Prescales
 # # DEFAULT MC prescales
 # ######################################################
 Prescales.L1Prescales = dict([(ctpid,1) for ctpid in Prescales.L1Prescales])  # setting all L1 prescales to 1
-Prescales.HLTPrescales.update({})
+ps_exclusion_list=[
+    'mb_sptrk_L1ZDC_XOR_TE5_VTE200',
+    'mb_sptrk_L1ZDC_XOR_VTE200',
+    'mb_sptrk_L1ZDC_XOR_VTE200_MBTS_1',
+    'mb_perf_L1RD1_FILLED',
+    'mb_sptrk_L1MBTS_1_1_VTE50',
+    'timeburner',
+    'mb_sp',
+]    
+chain_list=ps_exclusion_list
+Prescales.HLTPrescales.update(dict(map(None,chain_list,len(chain_list)*[ [-1, 0, -1] ])))
 # ######################################################
 
 # ######################################################
@@ -98,8 +108,7 @@ Prescales.HLTPrescales.update({})
 Prescales.L1Prescales_tight_mc_prescale  = deepcopy(Prescales.L1Prescales)
 Prescales.HLTPrescales_tight_mc_prescale = deepcopy(Prescales.HLTPrescales)
 Prescales.HLTPrescales_tight_mc_prescale.update({
-        'mb_idperf_ion_L1MBTS_1'          : [    -1,    0,   -1],     
-        'mb_idperf_ion_L1MBTS_1_1'        : [    -1,    0,   -1],
+        'mb_sp'                           : [    -1,    0,   -1],
         #'2e10_loose_ion'                  : [    -1,    0,   -1],
         #'e10_etcut_ion'                   : [    -1,    0,   -1],
         #'e10_etcut'                       : [    -1,    0,   -1],
diff --git a/Trigger/TriggerCommon/TriggerMenu/python/menu/Physics_HI_v5.py b/Trigger/TriggerCommon/TriggerMenu/python/menu/Physics_HI_v5.py
index 75562e07944cda521466641555618b0c54a028c5..d730a2005db96d6cea88d41ed46b8abe1f1184ef 100644
--- a/Trigger/TriggerCommon/TriggerMenu/python/menu/Physics_HI_v5.py
+++ b/Trigger/TriggerCommon/TriggerMenu/python/menu/Physics_HI_v5.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
 
 #------------------------------------------------------------------------#
 #------------------------------------------------------------------------#
@@ -19,7 +19,10 @@ def setupMenu():
     MinBiasStream="MinBias"
     UPCStream="UPC"
     UCCStream="UCC"
-    #PCStream="PC"
+    PCStream="PC"
+    CCStream="CC"
+    PCpebStream="PCPEB"
+    CCpebStream="CCPEB"
 
     # Disable Calo offset correction for HI menus (ATR-13323)
     from CaloTools.CaloNoiseFlags import jobproperties
@@ -54,6 +57,7 @@ def setupMenu():
 	['mu20_msonly',            'L1_MU15',           [], [HardProbesStream], ['RATE:SingleMuon', 'BW:Muon'], -1],
 
 	#di-muons RoI based
+	['2mu3',                 'L1_2MU4', [], [HardProbesStream], ['RATE:SingleMuon','BW:Muon'], -1],
 	['2mu4',                 'L1_2MU4', [], [HardProbesStream], ['RATE:SingleMuon','BW:Muon'], -1],
 	['2mu6',                 'L1_2MU4', [], [HardProbesStream], ['RATE:SingleMuon','BW:Muon'], -1],
 	['2mu4_msonly',          'L1_2MU4', [], [HardProbesStream], ['RATE:SingleMuon','BW:Muon'], -1],
@@ -76,9 +80,10 @@ def setupMenu():
     
     #UPC muons
     ['mu4_L1MU4_VZDC_AORC_VTE200',                 'L1_MU4_VZDC_AORC_VTE200',[], [UPCStream], ['RATE:UPC', 'BW:UPC'], -1],
+    ['mu4_L1MU4_VTE50',                 'L1_MU4_VTE50',[], [UPCStream], ['RATE:UPC', 'BW:UPC'], -1],
     ['2mu4_L12MU4_VTE50',                 'L1_2MU4_VTE50',[], [UPCStream], ['RATE:UPC', 'BW:UPC'], -1],
     ['mu4_mu4noL1_L1MU4_VTE50',                 'L1_MU4_VTE50',['L1_MU4',''], [UPCStream], ['RATE:UPC', 'BW:UPC'], -1, ['serial',-1,["mu4","mu4noL1"]]],
-    ['mu6_L1MU4_VTE50',                 'L1_MU4_VTE50',[], [UPCStream], ['RATE:UPC', 'BW:UPC'], -1],
+    ['mu6_L1MU4_VTE50',                 'L1_MU4_VTE50',[], [UPCStream, 'express'], ['RATE:UPC', 'BW:UPC'], -1],
     ['mu8_L1MU6_VTE50',                 'L1_MU6_VTE50',[], [UPCStream], ['RATE:UPC', 'BW:UPC'], -1],    
         
         ]
@@ -100,13 +105,18 @@ def setupMenu():
 	['j50_ion_L1TE50',         'L1_TE50',[], [HardProbesStream, 'express'], ['RATE:SingleJet', 'BW:Jet'], -1],
 	['j60_ion_L1TE50',         'L1_TE50',[], [HardProbesStream], ['RATE:SingleJet', 'BW:Jet'], -1],
 	['j75_ion_L1TE50',         'L1_TE50',[], [HardProbesStream], ['RATE:SingleJet', 'BW:Jet'], -1],
+	['j85_ion_L1TE50',         'L1_TE50',[], [HardProbesStream], ['RATE:SingleJet', 'BW:Jet'], -1],
 	['j100_ion_L1TE50',         'L1_TE50',[], [HardProbesStream, 'express'], ['RATE:SingleJet', 'BW:Jet'], -1],
 	['j150_ion_L1TE50',         'L1_TE50',[], [HardProbesStream, 'express'], ['RATE:SingleJet', 'BW:Jet'], -1],
 	['j50_ion_L1J12',         'L1_J12',[], [HardProbesStream, 'express'], ['RATE:SingleJet', 'BW:Jet'], -1],
 	['j60_ion_L1J15',         'L1_J15',[], [HardProbesStream], ['RATE:SingleJet', 'BW:Jet'], -1],
 	['j75_ion_L1J20',         'L1_J20',[], [HardProbesStream], ['RATE:SingleJet', 'BW:Jet'], -1],
+	['j85_ion_L1J20',         'L1_J20',[], [HardProbesStream], ['RATE:SingleJet', 'BW:Jet'], -1],
 	['j100_ion_L1J20',         'L1_J20',[], [HardProbesStream], ['RATE:SingleJet', 'BW:Jet'], -1],
-	['j150_ion_L1J20',         'L1_J20',[], [HardProbesStream], ['RATE:SingleJet', 'BW:Jet'], -1],	
+	['j110_ion_L1J30',         'L1_J30',[], [HardProbesStream], ['RATE:SingleJet', 'BW:Jet'], -1],
+	['j120_ion_L1J30',         'L1_J30',[], [HardProbesStream], ['RATE:SingleJet', 'BW:Jet'], -1],
+	['j130_ion_L1J30',         'L1_J30',[], [HardProbesStream], ['RATE:SingleJet', 'BW:Jet'], -1],
+	['j150_ion_L1J30',         'L1_J30',[], [HardProbesStream], ['RATE:SingleJet', 'BW:Jet'], -1],		
 	['j30_ion_L1ZDC_A_C',         'L1_ZDC_A_C',[], [HardProbesStream], ['RATE:SingleJet', 'BW:Jet'], -1],
 	['j40_ion_L1ZDC_A_C',         'L1_ZDC_A_C',[], [HardProbesStream], ['RATE:SingleJet', 'BW:Jet'], -1],
 	['j50_ion_L1ZDC_A_C',         'L1_ZDC_A_C',[], [HardProbesStream], ['RATE:SingleJet', 'BW:Jet'], -1],
@@ -123,6 +133,10 @@ def setupMenu():
     ['j40_320eta490_ion_L1TE50',         'L1_TE50',[], [HardProbesStream], ['RATE:SingleJet', 'BW:Jet'], -1],
 	['j50_320eta490_ion_L1TE20',         'L1_TE20',[], [HardProbesStream], ['RATE:SingleJet', 'BW:Jet'], -1],
     ['j50_320eta490_ion_L1TE50',         'L1_TE50',[], [HardProbesStream], ['RATE:SingleJet', 'BW:Jet'], -1],
+    
+    ['j50_320eta490_ion',         'L1_J15.31ETA49',[], [HardProbesStream], ['RATE:SingleJet', 'BW:Jet'], -1],
+    ['j60_320eta490_ion',         'L1_J20.31ETA49',[], [HardProbesStream], ['RATE:SingleJet', 'BW:Jet'], -1],
+    ['j70_320eta490_ion',         'L1_J20.31ETA49',[], [HardProbesStream], ['RATE:SingleJet', 'BW:Jet'], -1],
 
 
 	#multijets
@@ -147,13 +161,13 @@ def setupMenu():
 	['j20_L1TE5_VTE200',                 'L1_TE5_VTE200',[], [UPCStream], ['RATE:UPC', 'BW:UPC'], -1],
 		
     #['j5_L1ZDC_XOR_TE5_VTE200',                 'L1_ZDC_XOR_TE5_VTE200',[], [UPCStream], ['RATE:UPC', 'BW:UPC'], -1],
-    ['j10_L1ZDC_XOR_TE5_VTE200',                 'L1_ZDC_XOR_TE5_VTE200',[], [UPCStream], ['RATE:UPC', 'BW:UPC'], -1],
+    ['j10_L1ZDC_XOR_TE5_VTE200',                 'L1_ZDC_XOR_TE5_VTE200',[], [UPCStream, 'express'], ['RATE:UPC', 'BW:UPC'], -1],
 	['j15_L1ZDC_XOR_TE5_VTE200',                 'L1_ZDC_XOR_TE5_VTE200',[], [UPCStream], ['RATE:UPC', 'BW:UPC'], -1],
 	['j20_L1ZDC_XOR_TE5_VTE200',                 'L1_ZDC_XOR_TE5_VTE200',[], [UPCStream], ['RATE:UPC', 'BW:UPC'], -1],
 	['j30_L1ZDC_XOR_TE20_VTE200',                 'L1_ZDC_XOR_TE20_VTE200',[], [UPCStream], ['RATE:UPC', 'BW:UPC'], -1],
 	['j40_L1ZDC_XOR_TE20_VTE200',                 'L1_ZDC_XOR_TE20_VTE200',[], [UPCStream], ['RATE:UPC', 'BW:UPC'], -1],
 	
-	['j10_L1VZDC_A_C_TE5_VTE200',                 'L1_VZDC_A_C_TE5_VTE200',[], [UPCStream], ['RATE:UPC', 'BW:UPC'], -1],
+	['j10_L1VZDC_A_C_TE5_VTE200',                 'L1_VZDC_A_C_TE5_VTE200',[], [UPCStream,'express'], ['RATE:UPC', 'BW:UPC'], -1],
 	['j15_L1VZDC_A_C_TE5_VTE200',                 'L1_VZDC_A_C_TE5_VTE200',[], [UPCStream], ['RATE:UPC', 'BW:UPC'], -1],
 	['j20_L1VZDC_A_C_TE5_VTE200',                 'L1_VZDC_A_C_TE5_VTE200',[], [UPCStream], ['RATE:UPC', 'BW:UPC'], -1],
 	['j30_L1VZDC_A_C_TE20_VTE200',                 'L1_VZDC_A_C_TE20_VTE200',[], [UPCStream], ['RATE:UPC', 'BW:UPC'], -1],
@@ -208,77 +222,55 @@ def setupMenu():
         ]
 
     TriggerFlags.TauSlice.signatures = [
-        ]
+       ]
 
     TriggerFlags.EgammaSlice.signatures = [
     
-    ['g18_etcut',              'L1_EM12', [], [HardProbesStream, 'express'], ['RATE:SinglePhoton', 'BW:Egamma'], -1],
+    ['g18_etcut',              'L1_EM12', [], [HardProbesStream], ['RATE:SinglePhoton', 'BW:Egamma'], -1],
     
-	#Run 1 PID
-	#['e15_loose',                  'L1_EM10', [], [HardProbesStream], ['RATE:SingleElectron', 'BW:Egamma'], -1],
-    #['e15_medium',                 'L1_EM10', [], [HardProbesStream], ['RATE:SingleElectron', 'BW:Egamma'], -1],
-	#['e15_lhloose',                'L1_EM10', [], [HardProbesStream], ['RATE:SingleElectron', 'BW:Egamma'], -1],
-	#['e15_lhmedium',               'L1_EM10', [], [HardProbesStream], ['RATE:SingleElectron', 'BW:Egamma'], -1],
-
-	#['e15_loose_L1EM12',           'L1_EM12', [], [HardProbesStream], ['RATE:SingleElectron', 'BW:Egamma'], -1],
-    #['e15_medium_L1EM12',          'L1_EM12', [], [HardProbesStream], ['RATE:SingleElectron', 'BW:Egamma'], -1],
-	#['e15_lhloose_L1EM12',         'L1_EM12', [], [HardProbesStream], ['RATE:SingleElectron', 'BW:Egamma'], -1],
-	#['e15_lhmedium_L1EM12',        'L1_EM12', [], [HardProbesStream], ['RATE:SingleElectron', 'BW:Egamma'], -1],
-	
 	#heavy ion instances	
-	#['e10_etcut_ion',              'L1_EM7', [], [HardProbesStream, 'express'], ['RATE:SingleElectron', 'BW:Egamma'], -1],
-	#['e12_etcut_ion',              'L1_EM8', [], [HardProbesStream, 'express'], ['RATE:SingleElectron', 'BW:Egamma'], -1],
-    #['e12_etcut_ion_L1EM10',       'L1_EM10', [], [HardProbesStream, 'express'], ['RATE:SingleElectron', 'BW:Egamma'], -1],
-    #['e15_etcut_ion',              'L1_EM10', [], [HardProbesStream, 'express'], ['RATE:SingleElectron', 'BW:Egamma'], -1],
-    ['e15_etcut_ion',       'L1_EM12', [], [HardProbesStream, 'express'], ['RATE:SingleElectron', 'BW:Egamma'], -1],
+	['e13_etcut_ion',       'L1_EM10', [], [HardProbesStream], ['RATE:SingleElectron', 'BW:Egamma'], -1],
+    ['e15_etcut_ion',       'L1_EM12', [], [HardProbesStream], ['RATE:SingleElectron', 'BW:Egamma'], -1],
     ['e18_etcut_ion',              'L1_EM14', [], [HardProbesStream], ['RATE:SingleElectron', 'BW:Egamma'], -1], 
-    ['e20_etcut_ion',              'L1_EM16', [], [HardProbesStream], ['RATE:SingleElectron', 'BW:Egamma'], -1], 
+    ['e20_etcut_ion',              'L1_EM16', [], [HardProbesStream], ['RATE:SingleElectron', 'BW:Egamma'], -1],
+    ['e30_etcut_ion',              'L1_EM22', [], [HardProbesStream], ['RATE:SingleElectron', 'BW:Egamma'], -1], 
+	['e50_etcut_ion',              'L1_EM22', [], [HardProbesStream], ['RATE:SingleElectron', 'BW:Egamma'], -1],
 	
 	#['g12_etcut_ion',              'L1_EM10', [], [HardProbesStream, 'express'], ['RATE:SinglePhoton', 'BW:Egamma'], -1],
-    ['g13_etcut_ion',              'L1_EM10', [], [HardProbesStream, 'express'], ['RATE:SinglePhoton', 'BW:Egamma'], -1],
-	['g18_etcut_ion',              'L1_EM12', [], [HardProbesStream, 'express'], ['RATE:SinglePhoton', 'BW:Egamma'], -1],
-	['g20_etcut_ion',              'L1_EM12', [], [HardProbesStream, 'express'], ['RATE:SinglePhoton', 'BW:Egamma'], -1],
+    ['g13_etcut_ion',              'L1_EM10', [], [HardProbesStream], ['RATE:SinglePhoton', 'BW:Egamma'], -1],
+	['g18_etcut_ion',              'L1_EM12', [], [HardProbesStream], ['RATE:SinglePhoton', 'BW:Egamma'], -1],
 
-    #['e15_loose_ion',              'L1_EM10', [], [HardProbesStream, 'express'], ['RATE:SingleElectron', 'BW:Egamma'], -1],
-    #['e15_medium_ion',             'L1_EM10', [], [HardProbesStream, 'express'], ['RATE:SingleElectron', 'BW:Egamma'], -1],
-    #['e15_lhloose_ion',            'L1_EM10', [], [HardProbesStream], ['RATE:SingleElectron', 'BW:Egamma'], -1],
-    #['e15_lhmedium_ion',           'L1_EM10', [], [HardProbesStream], ['RATE:SingleElectron', 'BW:Egamma'], -1],
-
-    ['e15_loose_ion',       'L1_EM12', [], [HardProbesStream, 'express'], ['RATE:SingleElectron', 'BW:Egamma'], -1],
-    ['e15_medium_ion',      'L1_EM12', [], [HardProbesStream, 'express'], ['RATE:SingleElectron', 'BW:Egamma'], -1],
+    ['e15_loose_ion',       'L1_EM12', [], [HardProbesStream], ['RATE:SingleElectron', 'BW:Egamma'], -1],
+    ['e15_medium_ion',      'L1_EM12', [], [HardProbesStream], ['RATE:SingleElectron', 'BW:Egamma'], -1],
     ['e15_lhloose_ion_L1EM12',     'L1_EM12', [], [HardProbesStream], ['RATE:SingleElectron', 'BW:Egamma'], -1],
     ['e15_lhmedium_ion_L1EM12',    'L1_EM12', [], [HardProbesStream], ['RATE:SingleElectron', 'BW:Egamma'], -1],
  
 	#backup for e15
-    ['e18_loose_ion',              'L1_EM14', [], [HardProbesStream, 'express'], ['RATE:SingleElectron', 'BW:Egamma'], -1],
+    ['e18_loose_ion',              'L1_EM14', [], [HardProbesStream], ['RATE:SingleElectron', 'BW:Egamma'], -1],
     ['e18_medium_ion',             'L1_EM14', [], [HardProbesStream], ['RATE:SingleElectron', 'BW:Egamma'], -1],
     ['e18_lhloose_ion',            'L1_EM14', [], [HardProbesStream], ['RATE:SingleElectron', 'BW:Egamma'], -1],
     ['e18_lhmedium_ion',           'L1_EM14', [], [HardProbesStream], ['RATE:SingleElectron', 'BW:Egamma'], -1],
 
 	#backup for e15
 	
-	['e20_loose_ion',              'L1_EM16', [], [HardProbesStream, 'express'], ['RATE:SingleElectron', 'BW:Egamma'], -1],
-	['e20_medium_ion',              'L1_EM16', [], [HardProbesStream, 'express'], ['RATE:SingleElectron', 'BW:Egamma'], -1],
+	['e20_loose_ion',              'L1_EM16', [], [HardProbesStream], ['RATE:SingleElectron', 'BW:Egamma'], -1],
+	['e20_medium_ion',              'L1_EM16', [], [HardProbesStream], ['RATE:SingleElectron', 'BW:Egamma'], -1],
     ['e20_lhloose_ion',            'L1_EM16', [], [HardProbesStream], ['RATE:SingleElectron', 'BW:Egamma'], -1],
     ['e20_lhmedium_ion',            'L1_EM16', [], [HardProbesStream], ['RATE:SingleElectron', 'BW:Egamma'], -1],
 	
+	#monitoring
+	['2e20_loose_ion',            'L1_2EM16', [], [HardProbesStream], ['RATE:SingleElectron', 'BW:Egamma'], -1],
+	
 	#idperf
-	['e15_loose_ion_idperf',       'L1_EM12', [], [HardProbesStream, 'express'], ['RATE:IDMonitoring', 'BW:Egamma', 'BW:ID'],-1],
-	['e18_loose_ion_idperf',       'L1_EM14', [], [HardProbesStream, 'express'], ['RATE:IDMonitoring', 'BW:Egamma', 'BW:ID'],-1],
-	['e20_loose_ion_idperf',       'L1_EM16', [], [HardProbesStream, 'express'], ['RATE:IDMonitoring', 'BW:Egamma', 'BW:ID'],-1],
-	#['e15_medium_ion_idperf',       'L1_EM10', [], [HardProbesStream, 'express'], ['RATE:IDMonitoring', 'BW:Egamma', 'BW:ID'],-1],
-	#['e15_loose_ion_idperf_L1EM12', 'L1_EM12', [], [HardProbesStream, 'express'], ['RATE:IDMonitoring', 'BW:Egamma', 'BW:ID'],-1],
-	#['e15_medium_ion_idperf_L1EM12', 'L1_EM12', [], [HardProbesStream, 'express'], ['RATE:IDMonitoring', 'BW:Egamma', 'BW:ID'],-1],
-
-	#di-electrons , timeouts ATR-10226
-	#['2e10_loose_ion',               'L1_2EM7', [], [HardProbesStream, 'express'], ['RATE:MultiElectron', 'BW:Egamma'], -1],
-	#['2e10_lhloose_ion',            'L1_2EM5', [], [HardProbesStream], ['RATE:SingleElectron', 'BW:Egamma'], -1],
-
+	['e15_loose_ion_idperf',       'L1_EM12', [], [HardProbesStream], ['RATE:IDMonitoring', 'BW:Egamma', 'BW:ID'],-1],
+	['e18_loose_ion_idperf',       'L1_EM14', [], [HardProbesStream], ['RATE:IDMonitoring', 'BW:Egamma', 'BW:ID'],-1],
+	['e20_loose_ion_idperf',       'L1_EM16', [], [HardProbesStream], ['RATE:IDMonitoring', 'BW:Egamma', 'BW:ID'],-1],
 	
-	['g15_loose_ion',              'L1_EM10', [], [HardProbesStream, 'express'], ['RATE:SinglePhoton', 'BW:Egamma'], -1],
+	
+	['g15_loose_ion',              'L1_EM10', [], [HardProbesStream], ['RATE:SinglePhoton', 'BW:Egamma'], -1],
     #['g15_medium_ion',             'L1_EM10', [], [HardProbesStream], ['RATE:SinglePhoton', 'BW:Egamma'], -1],
-    ['g20_loose',              'L1_EM12', [], [HardProbesStream, 'express'], ['RATE:SinglePhoton', 'BW:Egamma'], -1],
-    ['g20_loose_ion',              'L1_EM12', [], [HardProbesStream, 'express'], ['RATE:SinglePhoton', 'BW:Egamma'], -1],
+    ['g20_loose',              'L1_EM12', [], [HardProbesStream], ['RATE:SinglePhoton', 'BW:Egamma'], -1],
+    ['g20_loose_ion',              'L1_EM12', [], [HardProbesStream], ['RATE:SinglePhoton', 'BW:Egamma'], -1],
     #['g20_medium_ion',             'L1_EM12', [], [HardProbesStream], ['RATE:SinglePhoton', 'BW:Egamma'], -1],
 
 	#di-photon triggers
@@ -300,7 +292,7 @@ def setupMenu():
     #UPC photons
     ['g12_loose_L1EM7_VTE200',     'L1_EM7_VTE200',   [], [UPCStream],["BW:UPC", "RATE:UPC"], 1],
     ['g12_medium_L1EM7_VTE200',     'L1_EM7_VTE200',   [], [UPCStream],["BW:UPC", "RATE:UPC"], 1],
-    
+
         ]
 
     TriggerFlags.BphysicsSlice.signatures = [
@@ -311,6 +303,8 @@ def setupMenu():
         ]
 
     TriggerFlags.CombinedSlice.signatures = [
+	['mu4_j30_a2_ion_dr05', 'L1_MU4',     ['L1_MU4', ''], [HardProbesStream], ['RATE:MuonBjet', 'BW:BJet'], -1,['serial',-1,['mu4', 'j30_a2_ion'] ]],
+	['mu4_j40_a2_ion_dr05', 'L1_MU4',     ['L1_MU4', ''], [HardProbesStream], ['RATE:MuonBjet', 'BW:BJet'], -1,['serial',-1,['mu4', 'j40_a2_ion'] ]],
 	['mu4_j30_a3_ion_dr05', 'L1_MU4',     ['L1_MU4', ''], [HardProbesStream], ['RATE:MuonBjet', 'BW:BJet'], -1,['serial',-1,['mu4', 'j30_a3_ion'] ]],
 	['mu4_j40_a3_ion_dr05', 'L1_MU4',     ['L1_MU4', ''], [HardProbesStream], ['RATE:MuonBjet', 'BW:BJet'], -1,['serial',-1,['mu4', 'j40_a3_ion'] ]],
 	['mu4_j30_ion_dr05', 'L1_MU4',     ['L1_MU4', ''], [HardProbesStream], ['RATE:MuonBjet', 'BW:BJet'], -1,['serial',-1,['mu4', 'j30_ion'] ]],
@@ -322,6 +316,8 @@ def setupMenu():
 	['mu6_j30_ion_dr05', 'L1_MU6',     ['L1_MU6', ''], [HardProbesStream, 'express'], ['RATE:MuonBjet', 'BW:BJet'], -1,['serial',-1,['mu6', 'j30_ion'] ]],
 
 	#supporting triggers
+	['mu4_j30_a2_ion', 'L1_MU4',     ['L1_MU4', ''], [HardProbesStream], ['RATE:MuonBjet', 'BW:BJet'], -1,['serial',-1,['mu4', 'j30_a2_ion'] ]],
+    ['mu4_j40_a2_ion', 'L1_MU4',     ['L1_MU4', ''], [HardProbesStream], ['RATE:MuonBjet', 'BW:BJet'], -1,['serial',-1,['mu4', 'j40_a2_ion'] ]],
 	['mu4_j30_a3_ion', 'L1_MU4',     ['L1_MU4', ''], [HardProbesStream], ['RATE:MuonBjet', 'BW:BJet'], -1,['serial',-1,['mu4', 'j30_a3_ion'] ]],
     ['mu4_j40_a3_ion', 'L1_MU4',     ['L1_MU4', ''], [HardProbesStream], ['RATE:MuonBjet', 'BW:BJet'], -1,['serial',-1,['mu4', 'j40_a3_ion'] ]],
 	['mu4_j30_ion', 'L1_MU4',     ['L1_MU4', ''], [HardProbesStream], ['RATE:MuonBjet', 'BW:BJet'], -1,['serial',-1,['mu4', 'j30_ion'] ]],
@@ -331,22 +327,46 @@ def setupMenu():
     ['mu6_j20_ion', 'L1_MU6',     ['L1_MU6', ''], [HardProbesStream], ['RATE:MuonBjet', 'BW:BJet'], -1,['serial',-1,['mu6', 'j20_ion'] ]],
     ['mu6_j25_ion', 'L1_MU6',     ['L1_MU6', ''], [HardProbesStream], ['RATE:MuonBjet', 'BW:BJet'], -1,['serial',-1,['mu6', 'j25_ion'] ]],
     ['mu6_j30_ion', 'L1_MU6',     ['L1_MU6', ''], [HardProbesStream], ['RATE:MuonBjet', 'BW:BJet'], -1,['serial',-1,['mu6', 'j30_ion'] ]],
-        
-    #UPC:LbL    
-        ['hi_gg_upc_mb_vetospmbts2in_L1TE5_VTE200',        'L1_TE5_VTE200',   ['', ''], [UPCStream],["BW:UPC", "RATE:UPC"], 1, ['serial', -1, ['hi_gg_upc', 'mb_vetospmbts2in'],False]],
- 	    ['hi_gg_upc_mb_vetospmbts2in_L1TE4_VTE200',        'L1_TE4_VTE200',   ['', ''], [UPCStream],["BW:UPC", "RATE:UPC"], 1, ['serial', -1, ['hi_gg_upc', 'mb_vetospmbts2in'],False]],
- 	    ['hi_gg_upc_mb_vetospmbts2in_L1TE5_VTE100',        'L1_TE5_VTE100',   ['', ''], [UPCStream],["BW:UPC", "RATE:UPC"], 1, ['serial', -1, ['hi_gg_upc', 'mb_vetospmbts2in'],False]],
- 	    ['hi_gg_upc_mb_vetospmbts2in_L1TE4_VTE100',        'L1_TE4_VTE100',   ['', ''], [UPCStream],["BW:UPC", "RATE:UPC"], 1, ['serial', -1, ['hi_gg_upc', 'mb_vetospmbts2in'],False]],
- 	    ['hi_gg_upc_mb_vetospmbts2in_L1TE5_VTE50',        'L1_TE5_VTE50',   ['', ''], [UPCStream],["BW:UPC", "RATE:UPC"], 1, ['serial', -1, ['hi_gg_upc', 'mb_vetospmbts2in'],False]],
- 	    ['hi_gg_upc_mb_vetospmbts2in_L1TE4_VTE50',        'L1_TE4_VTE50',   ['', ''], [UPCStream],["BW:UPC", "RATE:UPC"], 1, ['serial', -1, ['hi_gg_upc', 'mb_vetospmbts2in'],False]],    
+            
+     #UPC:Supporting
+    ['hi_upc_FgapAC_mb_sptrk_exclusiveloose1_L1ZDC_XOR_VTE50',        'L1_ZDC_XOR_VTE50',   ['', ''], [UPCStream],["BW:UPC", "RATE:UPC"], 1, ['serial', -1, ['hi_upc_FgapAC','mb_sptrk_exclusiveloose1'],False]],
+    ['hi_upc_FgapAC_mb_sptrk_exclusiveloose2_L1ZDC_XOR_VTE50',        'L1_ZDC_XOR_VTE50',   ['', ''], [UPCStream],["BW:UPC", "RATE:UPC"], 1, ['serial', -1, ['hi_upc_FgapAC','mb_sptrk_exclusiveloose2'],False]],
+    ['hi_upc_FgapAC_mb_sptrk_exclusiveloose1_L1MU4_VTE50',        'L1_MU4_VTE50',   ['', ''], [UPCStream],["BW:UPC", "RATE:UPC"], 1, ['serial', -1, ['hi_upc_FgapAC','mb_sptrk_exclusiveloose1'],False]],
+    ['hi_upc_FgapAC_mb_sptrk_exclusiveloose2_L1MU4_VTE50',        'L1_MU4_VTE50',   ['', ''], [UPCStream],["BW:UPC", "RATE:UPC"], 1, ['serial', -1, ['hi_upc_FgapAC','mb_sptrk_exclusiveloose2'],False]],
+    ['hi_upc_FgapAC_mb_sptrk_exclusiveloose2_L1ZDC_A_C_VTE50',        'L1_ZDC_A_C_VTE50',   ['', ''], [UPCStream],["BW:UPC", "RATE:UPC"], 1, ['serial', -1, ['hi_upc_FgapAC','mb_sptrk_exclusiveloose2'],False]],
+ 	['hi_upc_FgapAC_mb_sptrk_exclusiveloose2_L1VZDC_A_C_VTE50',        'L1_VZDC_A_C_VTE50',   ['', ''], [UPCStream],["BW:UPC", "RATE:UPC"], 1, ['serial', -1, ['hi_upc_FgapAC','mb_sptrk_exclusiveloose2'],False]],
+ 	['mu4_hi_upc_FgapAC_L1MU4_VTE50',        'L1_MU4_VTE50',   ['', ''], [UPCStream],["BW:UPC", "RATE:UPC"], 1, ['serial', -1, ['mu4','hi_upc_FgapAC'],False]],
+ 	
+ 	
+ 	#UPC HMT
+ 	['mb_sp50_trk15_hmt_hi_upc_FgapC5_L1MBTS_1_ZDC_A_VZDC_C_VTE200',        'L1_MBTS_1_ZDC_A_VZDC_C_VTE200',   ['', ''], [UPCStream],["BW:UPC", "RATE:UPC"], 1, ['serial', -1, ['hi_upc_FgapC5','mb_sp50_trk15_hmt'],False]],
+    ['mb_sp50_trk15_hmt_hi_upc_FgapA5_L1MBTS_1_ZDC_C_VZDC_A_VTE200',        'L1_MBTS_1_ZDC_C_VZDC_A_VTE200',   ['', ''], [UPCStream],["BW:UPC", "RATE:UPC"], 1, ['serial', -1, ['hi_upc_FgapA5','mb_sp50_trk15_hmt'],False]],
+    ['mb_sp50_trk15_hmt_hi_upc_FgapC5_L1ZDC_A_VZDC_C_VTE200',        'L1_ZDC_A_VZDC_C_VTE200',   ['', ''], [UPCStream],["BW:UPC", "RATE:UPC"], 1, ['serial', -1, ['hi_upc_FgapC5','mb_sp50_trk15_hmt'],False]],
+    ['mb_sp50_trk15_hmt_hi_upc_FgapA5_L1ZDC_C_VZDC_A_VTE200',        'L1_ZDC_C_VZDC_A_VTE200',   ['', ''], [UPCStream],["BW:UPC", "RATE:UPC"], 1, ['serial', -1, ['hi_upc_FgapA5','mb_sp50_trk15_hmt'],False]],
+    ['mb_sp400_trk25_hmt_hi_upc_FgapC5_L1TE4_ZDC_A_VZDC_C_VTE200',        'L1_TE4_ZDC_A_VZDC_C_VTE200',   ['', ''], [UPCStream],["BW:UPC", "RATE:UPC"], 1, ['serial', -1, ['hi_upc_FgapC5','mb_sp400_trk25_hmt'],False]],
+    ['mb_sp400_trk25_hmt_hi_upc_FgapA5_L1TE4_ZDC_C_VZDC_A_VTE200',        'L1_TE4_ZDC_C_VZDC_A_VTE200',   ['', ''], [UPCStream],["BW:UPC", "RATE:UPC"], 1, ['serial', -1, ['hi_upc_FgapA5','mb_sp400_trk25_hmt'],False]],
+    ['mb_sp400_trk25_hmt_hi_upc_FgapC5_L1TE3.0ETA49_ZDC_A_VZDC_C_VTE200',        'L1_TE3.0ETA49_ZDC_A_VZDC_C_VTE200',   ['', ''], [UPCStream],["BW:UPC", "RATE:UPC"], 1, ['serial', -1, ['hi_upc_FgapC5','mb_sp400_trk25_hmt'],False]],
+    ['mb_sp400_trk25_hmt_hi_upc_FgapA5_L1TE3.0ETA49_ZDC_C_VZDC_A_VTE200',        'L1_TE3.0ETA49_ZDC_C_VZDC_A_VTE200',   ['', ''], [UPCStream],["BW:UPC", "RATE:UPC"], 1, ['serial', -1, ['hi_upc_FgapA5','mb_sp400_trk25_hmt'],False]],
+    ['mb_sp700_trk35_hmt_hi_upc_FgapC5_L1TE5_ZDC_A_VZDC_C_VTE200',        'L1_TE5_ZDC_A_VZDC_C_VTE200',   ['', ''], [UPCStream],["BW:UPC", "RATE:UPC"], 1, ['serial', -1, ['hi_upc_FgapC5','mb_sp700_trk35_hmt'],False]],
+    ['mb_sp700_trk35_hmt_hi_upc_FgapA5_L1TE5_ZDC_C_VZDC_A_VTE200',        'L1_TE5_ZDC_C_VZDC_A_VTE200',   ['', ''], [UPCStream],["BW:UPC", "RATE:UPC"], 1, ['serial', -1, ['hi_upc_FgapA5','mb_sp700_trk35_hmt'],False]],
+    ['mb_sp700_trk35_hmt_hi_upc_FgapC5_L1TE7.0ETA49_ZDC_A_VZDC_C_VTE200',        'L1_TE7.0ETA49_ZDC_A_VZDC_C_VTE200',   ['', ''], [UPCStream],["BW:UPC", "RATE:UPC"], 1, ['serial', -1, ['hi_upc_FgapC5','mb_sp700_trk35_hmt'],False]],
+    ['mb_sp700_trk35_hmt_hi_upc_FgapA5_L1TE7.0ETA49_ZDC_C_VZDC_A_VTE200',        'L1_TE7.0ETA49_ZDC_C_VZDC_A_VTE200',   ['', ''], [UPCStream],["BW:UPC", "RATE:UPC"], 1, ['serial', -1, ['hi_upc_FgapA5','mb_sp700_trk35_hmt'],False]],
+
+    ['mb_sp50_trk15_hmt_hi_upc_FgapC10_L1MBTS_1_ZDC_A_VZDC_C_VTE200',        'L1_MBTS_1_ZDC_A_VZDC_C_VTE200',   ['', ''], [UPCStream],["BW:UPC", "RATE:UPC"], 1, ['serial', -1, ['hi_upc_FgapC10','mb_sp50_trk15_hmt'],False]],
+    ['mb_sp50_trk15_hmt_hi_upc_FgapA10_L1MBTS_1_ZDC_C_VZDC_A_VTE200',        'L1_MBTS_1_ZDC_C_VZDC_A_VTE200',   ['', ''], [UPCStream],["BW:UPC", "RATE:UPC"], 1, ['serial', -1, ['hi_upc_FgapA10','mb_sp50_trk15_hmt'],False]],
+    ['mb_sp50_trk15_hmt_hi_upc_FgapC10_L1ZDC_A_VZDC_C_VTE200',        'L1_ZDC_A_VZDC_C_VTE200',   ['', ''], [UPCStream],["BW:UPC", "RATE:UPC"], 1, ['serial', -1, ['hi_upc_FgapC10','mb_sp50_trk15_hmt'],False]],
+    ['mb_sp50_trk15_hmt_hi_upc_FgapA10_L1ZDC_C_VZDC_A_VTE200',        'L1_ZDC_C_VZDC_A_VTE200',   ['', ''], [UPCStream],["BW:UPC", "RATE:UPC"], 1, ['serial', -1, ['hi_upc_FgapA10','mb_sp50_trk15_hmt'],False]],
+    ['mb_sp400_trk25_hmt_hi_upc_FgapC10_L1TE4_ZDC_A_VZDC_C_VTE200',        'L1_TE4_ZDC_A_VZDC_C_VTE200',   ['', ''], [UPCStream],["BW:UPC", "RATE:UPC"], 1, ['serial', -1, ['hi_upc_FgapC10','mb_sp400_trk25_hmt'],False]],
+    ['mb_sp400_trk25_hmt_hi_upc_FgapA10_L1TE4_ZDC_C_VZDC_A_VTE200',        'L1_TE4_ZDC_C_VZDC_A_VTE200',   ['', ''], [UPCStream],["BW:UPC", "RATE:UPC"], 1, ['serial', -1, ['hi_upc_FgapA10','mb_sp400_trk25_hmt'],False]],
+    ['mb_sp400_trk25_hmt_hi_upc_FgapC10_L1TE3.0ETA49_ZDC_A_VZDC_C_VTE200',        'L1_TE3.0ETA49_ZDC_A_VZDC_C_VTE200',   ['', ''], [UPCStream],["BW:UPC", "RATE:UPC"], 1, ['serial', -1, ['hi_upc_FgapC10','mb_sp400_trk25_hmt'],False]],
+    ['mb_sp400_trk25_hmt_hi_upc_FgapA10_L1TE3.0ETA49_ZDC_C_VZDC_A_VTE200',        'L1_TE3.0ETA49_ZDC_C_VZDC_A_VTE200',   ['', ''], [UPCStream],["BW:UPC", "RATE:UPC"], 1, ['serial', -1, ['hi_upc_FgapA10','mb_sp400_trk25_hmt'],False]],
+    ['mb_sp700_trk35_hmt_hi_upc_FgapC10_L1TE5_ZDC_A_VZDC_C_VTE200',        'L1_TE5_ZDC_A_VZDC_C_VTE200',   ['', ''], [UPCStream],["BW:UPC", "RATE:UPC"], 1, ['serial', -1, ['hi_upc_FgapC10','mb_sp700_trk35_hmt'],False]],
+    ['mb_sp700_trk35_hmt_hi_upc_FgapA10_L1TE5_ZDC_C_VZDC_A_VTE200',        'L1_TE5_ZDC_C_VZDC_A_VTE200',   ['', ''], [UPCStream],["BW:UPC", "RATE:UPC"], 1, ['serial', -1, ['hi_upc_FgapA10','mb_sp700_trk35_hmt'],False]], 
+    ['mb_sp700_trk35_hmt_hi_upc_FgapC10_L1TE7.0ETA49_ZDC_A_VZDC_C_VTE200',        'L1_TE7.0ETA49_ZDC_A_VZDC_C_VTE200',   ['', ''], [UPCStream],["BW:UPC", "RATE:UPC"], 1, ['serial', -1, ['hi_upc_FgapC10','mb_sp700_trk35_hmt'],False]],
+    ['mb_sp700_trk35_hmt_hi_upc_FgapA10_L1TE7.0ETA49_ZDC_C_VZDC_A_VTE200',        'L1_TE7.0ETA49_ZDC_C_VZDC_A_VTE200',   ['', ''], [UPCStream],["BW:UPC", "RATE:UPC"], 1, ['serial', -1, ['hi_upc_FgapA10','mb_sp700_trk35_hmt'],False]],
+
         ]
-     
-    #UPC:Supporting
-    ['hi_upc_FgapAC_mb_sptrk_exclusive_loose1_L1ZDC_XOR_VTE50',        'L1_ZDC_XOR_VTE50',   ['', ''], [UPCStream],["BW:UPC", "RATE:UPC"], 1, ['serial', -1, ['hi_upc_FgapAC','mb_sptrk_exclusive_loose1'],False]],
-    ['hi_upc_FgapAC_mb_sptrk_exclusive_loose2_L1ZDC_XOR_VTE50',        'L1_ZDC_XOR_VTE50',   ['', ''], [UPCStream],["BW:UPC", "RATE:UPC"], 1, ['serial', -1, ['hi_upc_FgapAC','mb_sptrk_exclusive_loose2'],False]],
-    ['hi_upc_FgapAC_mb_sptrk_exclusive_loose1_L1MU4_VTE50',        'L1_MU4_VTE50',   ['', ''], [UPCStream],["BW:UPC", "RATE:UPC"], 1, ['serial', -1, ['hi_upc_FgapAC','mb_sptrk_exclusive_loose1'],False]],
-    ['hi_upc_FgapAC_mb_sptrk_exclusive_loose2_L1MU4_VTE50',        'L1_MU4_VTE50',   ['', ''], [UPCStream],["BW:UPC", "RATE:UPC"], 1, ['serial', -1, ['hi_upc_FgapAC','mb_sptrk_exclusive_loose2'],False]],
-     
+      
     TriggerFlags.HeavyIonSlice.signatures = [
 	#event shape triggers
         ['hi_v2_th5_L1TE50',    'L1_TE50',   [], [MinBiasStream],["BW:EventShape", "RATE:EventShape"], 1],
@@ -390,7 +410,7 @@ def setupMenu():
 	    ['hi_perf_ucc_L1TE10000',    'L1_TE10000',   [], [MinBiasStream],["BW:UltraCentral", "RATE:UltraCentral"], 1],
 	    ['hi_perf_ucc_L1ZDC_A_C',    'L1_ZDC_A_C',   [], [MinBiasStream],["BW:UltraCentral", "RATE:UltraCentral"], 1],
         ['hi_perf_ucc_L1All',    '',   [], [MinBiasStream],["BW:UltraCentral", "RATE:UltraCentral"], 1],
-        ['hi_perfzdc_ucc_L1ZDC_A_C',    'L1_ZDC_A_C',   [], [MinBiasStream],["BW:UltraCentral", "RATE:UltraCentral"], 1],
+        #['hi_perfzdc_ucc_L1ZDC_A_C',    'L1_ZDC_A_C',   [], [MinBiasStream],["BW:UltraCentral", "RATE:UltraCentral"], 1],
         #['hi_perfzdc_ucc_L1All',    '',   [], [MinBiasStream],["BW:UltraCentral", "RATE:UltraCentral"], 1],
         
 	#ultra-peripheral
@@ -405,6 +425,13 @@ def setupMenu():
  	    ['hi_gg_upc_FgapAC_L1TE4_VTE100',        'L1_TE4_VTE100',   [], [UPCStream],["BW:UPC", "RATE:UPC"], 1],
  	    ['hi_gg_upc_FgapAC_L1TE5_VTE50',        'L1_TE5_VTE50',   [], [UPCStream],["BW:UPC", "RATE:UPC"], 1],
  	    ['hi_gg_upc_FgapAC_L1TE4_VTE50',        'L1_TE4_VTE50',   [], [UPCStream],["BW:UPC", "RATE:UPC"], 1],
+ 	     	    
+ 	    ['hi_gg_upc_FgapAC_L12TAU2_VTE200',        'L1_2TAU2_VTE200',   [], [UPCStream],["BW:UPC", "RATE:UPC"], 1],
+ 	    ['hi_gg_upc_FgapAC_L12TAU3_VTE200',        'L1_2TAU3_VTE200',   [], [UPCStream],["BW:UPC", "RATE:UPC"], 1],
+ 	    ['hi_gg_upc_FgapAC_L12TAU2_VTE100',        'L1_2TAU2_VTE100',   [], [UPCStream],["BW:UPC", "RATE:UPC"], 1],
+ 	    ['hi_gg_upc_FgapAC_L12TAU3_VTE100',        'L1_2TAU3_VTE100',   [], [UPCStream],["BW:UPC", "RATE:UPC"], 1],
+ 	    ['hi_gg_upc_FgapAC_L12TAU2_VTE50',        'L1_2TAU2_VTE50',   [], [UPCStream],["BW:UPC", "RATE:UPC"], 1],
+ 	    ['hi_gg_upc_FgapAC_L12TAU3_VTE50',        'L1_2TAU3_VTE50',   [], [UPCStream],["BW:UPC", "RATE:UPC"], 1],
  	    
  	    ['hi_gg_upc_L1TE5_VTE200',        'L1_TE5_VTE200',   [], [UPCStream],["BW:UPC", "RATE:UPC"], 1],
  	    ['hi_gg_upc_L1TE4_VTE200',        'L1_TE4_VTE200',   [], [UPCStream],["BW:UPC", "RATE:UPC"], 1],
@@ -412,6 +439,11 @@ def setupMenu():
  	    ['hi_gg_upc_L1TE4_VTE100',        'L1_TE4_VTE100',   [], [UPCStream],["BW:UPC", "RATE:UPC"], 1],
  	    ['hi_gg_upc_L1TE5_VTE50',        'L1_TE5_VTE50',   [], [UPCStream],["BW:UPC", "RATE:UPC"], 1],
  	    ['hi_gg_upc_L1TE4_VTE50',        'L1_TE4_VTE50',   [], [UPCStream],["BW:UPC", "RATE:UPC"], 1],
+ 	    
+ 	    #PCpeb
+ 	    ['hi_hipeb_L1TE50_VTE600',      'L1_TE50_VTE600.0ETA49_PEB', [], [PCpebStream], ["BW:PCpeb", "RATE:PCpeb"], 1],
+		#CCpeb
+		['hi_hipeb_L1TE600',      'L1_TE600.0ETA49_PEB', [], [CCpebStream], ["BW:CCpeb", "RATE:CCpeb"], 1],
  	    	    
 	    #['hi_gg_upc_L1All',               '',   [], [UPCStream],["BW:UPC", "RATE:UPC"], 1],
 	# validation trigger
@@ -426,36 +458,49 @@ def setupMenu():
         ['mb_mbts_L1MBTS_4_4',  'L1_MBTS_4_4', [], [MinBiasStream],["BW:MinBias", "RATE:MinBias"], 1],
 
 	#sptrk
+        ['mb_vetospmbts2in_L1TE5_VTE200',  'L1_TE5_VTE200', [], [MinBiasStream, 'express'],["BW:MinBias", "RATE:MinBias"], 1],
         ['mb_sp',  'L1_RD0_FILLED', [], [MinBiasStream, 'express'],["BW:MinBias", "RATE:MinBias"], 1],
-        ['mb_sptrk_ion_L1ZDC_A_C_VTE50',  'L1_ZDC_A_C_VTE50', [], [MinBiasStream, 'express'],["BW:MinBias", "RATE:MinBias"], 1],
-        ['mb_sptrk_ion_L1MBTS_1_1_VTE50', 'L1_MBTS_1_1_VTE50', [], [MinBiasStream, 'express'],["BW:MinBias", "RATE:MinBias"], 1],
-        ['mb_idperf_ion_L1MBTS_1', 'L1_MBTS_1', [], [MinBiasStream],["BW:MinBias", "RATE:MinBias"], 1],
-        ['mb_idperf_ion_L1MBTS_1_1', 'L1_MBTS_1_1', [], [MinBiasStream, 'express'],["BW:MinBias", "RATE:MinBias"], 1],
+        ['mb_sptrk',  'L1_ZDC_A_C_VTE50', [], [MinBiasStream, 'express'],["BW:MinBias", "RATE:MinBias"], 1],
+        ['mb_sptrk_L1MBTS_1_1_VTE50', 'L1_MBTS_1_1_VTE50', [], [MinBiasStream, 'express'],["BW:MinBias", "RATE:MinBias"], 1],
+        #['mb_idperf_ion_L1MBTS_1', 'L1_MBTS_1', [], [MinBiasStream],["BW:MinBias", "RATE:MinBias"], 1],
+        #['mb_idperf_ion_L1MBTS_1_1', 'L1_MBTS_1_1', [], [MinBiasStream, 'express'],["BW:MinBias", "RATE:MinBias"], 1],
         
         ['mb_perf_L1RD1_FILLED',    'L1_RD1_FILLED',   [], [MinBiasStream],["BW:MinBias", "RATE:MinBias"], 1],
         ['mb_perf_L1RD1_EMPTY',    'L1_RD1_EMPTY',   [], [MinBiasStream],["BW:MinBias", "RATE:MinBias"], 1],
 
-	#UPC: MB TODO
-	#['mb_sptrk_L1ZDC_XOR_VTE200',  'L1_ZDC_XOR_VTE200', [], [UPCStream],["BW:UPC", "RATE:UPC"], 1],
-	#['mb_sptrk_L1ZDC_XOR_VTE200_MBTS_1',  'L1_ZDC_XOR_VTE200_MBTS_1', [], [UPCStream],["BW:UPC", "RATE:UPC"], 1],
+	#PCpeb
+	['mb_sptrk_hipeb_L1ZDC_A_C_VTE50',  'L1_ZDC_A_C_VTE50_PEB', [], [PCpebStream],["BW:PCpeb", "RATE:PCpeb"], 1],
+	#PC
+	['mb_sptrk_L1ZDC_A_C_VTE50',  'L1_ZDC_A_C_VTE50', [], [PCStream],["BW:PC", "RATE:PC"], 1],
+	
+	
+	#MB UPC:
+	['mb_sptrk_L1ZDC_XOR_VTE200',  'L1_ZDC_XOR_VTE200', [], [UPCStream],["BW:UPC", "RATE:UPC"], 1],
+	['mb_sptrk_L1ZDC_XOR_VTE200_MBTS_1',  'L1_ZDC_XOR_VTE200_MBTS_1', [], [UPCStream],["BW:UPC", "RATE:UPC"], 1],
+	
+	['mb_sptrk_exclusiveloose2_L12TAU2_VTE50',  'L1_2TAU2_VTE50', [], [UPCStream],["BW:UPC", "RATE:UPC"], 1],
+	['mb_sptrk_exclusiveloose2_L12TAU2_VTE100',  'L1_2TAU2_VTE100', [], [UPCStream],["BW:UPC", "RATE:UPC"], 1],
+	['mb_sptrk_exclusiveloose2_L12TAU2_VTE200',  'L1_2TAU2_VTE200', [], [UPCStream],["BW:UPC", "RATE:UPC"], 1],
+	['mb_sptrk_vetombts2in_exclusiveloose2_L12TAU2_VTE50',  'L1_2TAU2_VTE50', [], [UPCStream],["BW:UPC", "RATE:UPC"], 1],
+	['mb_sptrk_vetombts2in_exclusiveloose2_L12TAU2_VTE100',  'L1_2TAU2_VTE100', [], [UPCStream],["BW:UPC", "RATE:UPC"], 1],
+	['mb_sptrk_vetombts2in_exclusiveloose2_L12TAU2_VTE200',  'L1_2TAU2_VTE200', [], [UPCStream],["BW:UPC", "RATE:UPC"], 1],
 	#['mb_sptrk_ion_trk15_L1ZDC_XOR_VTE200_MBTS_1',  'L1_ZDC_XOR_VTE200_MBTS_1', [], [UPCStream],["BW:UPC", "RATE:UPC"], 1],
 	
 	#UPC: Other primary 
-	['mb_sptrk_exclusivetight_L1VTE20',        'L1_VTE20',   [], [UPCStream], ["BW:UPC", "RATE:UPC"], -1],
+	['mb_sptrk_exclusiveloose_vetosp1500_L1VTE20',        'L1_VTE20',   [], [UPCStream], ["BW:UPC", "RATE:UPC"], -1],
+	['mb_sptrk_exclusivetight_vetosp1500_L1VTE20',        'L1_VTE20',   [], [UPCStream, 'express'], ["BW:UPC", "RATE:UPC"], -1],
+		
+	#['mb_sptrk_exclusiveloose_L1VTE20',        'L1_VTE20',   [], [UPCStream], ["BW:UPC", "RATE:UPC"], -1],
+	#['mb_sptrk_exclusivetight_L1VTE20',        'L1_VTE20',   [], [UPCStream], ["BW:UPC", "RATE:UPC"], -1],
+	
 	#['mb_sptrk_ptX_L1TE5_VZDC_AORC_VTE200',        'L1_TE5_VZDC_AORC_VTE200',   [], [UPCStream], ["BW:UPC", "RATE:UPC"], -1],
        
 	#UPC:Supporting
 	['mb_sp_L1VTE50',  'L1_VTE50', [], [UPCStream], ["BW:UPC", "RATE:UPC"], -1],
-	#TODO['mb_sptrk_L1ZDC_XOR_TE5_VTE200',        'L1_ZDC_XOR_TE5_VTE200',   [], [UPCStream], ["BW:UPC", "RATE:UPC"], -1],
+	['mb_sptrk_L1ZDC_XOR_TE5_VTE200',        'L1_ZDC_XOR_TE5_VTE200',   [], [UPCStream], ["BW:UPC", "RATE:UPC"], -1],
 	
 	#overlay
-	['mb_sptrk_ion_L1ZDC_A_C_VTE50_OVERLAY',  'L1_ZDC_A_C_VTE50_OVERLAY', [], ['MinBiasOverlay'],["BW:MinBiasOverlay", "RATE:MinBiasOverlay"], 1],
-
-    #Zdc
-	#['mb_lg_zdcperf_L1All',  '', [], [MinBiasStream],["BW:MinBias", "RATE:MinBias"], 1],
-    ['mb_lg_zdcperf_L1ZDC_A_C',  'L1_ZDC_A_C', [], [MinBiasStream],["BW:MinBias", "RATE:MinBias"], 1],
-        #['mb_hg_zdcperf_L1All',  '', [], [MinBiasStream],["BW:MinBias", "RATE:MinBias"], 1],
-    ['mb_hg_zdcperf_L1ZDC_A_C',  'L1_ZDC_A_C', [], [MinBiasStream],["BW:MinBias", "RATE:MinBias"], 1],
+	['mb_sptrk_L1ZDC_A_C_VTE50_OVERLAY',  'L1_ZDC_A_C_VTE50_OVERLAY', [], ['MinBiasOverlay'],["BW:MinBiasOverlay", "RATE:MinBiasOverlay"], 1],
 
         ]
 
@@ -507,15 +552,14 @@ def setupMenu():
         ['satu20em_l1satmon_L1J100',  'L1_J100',     [], ['L1Calo'], ['RATE:Calibration', 'BW:Detector'],-1],
         #['satu20em_l1satmon_L1J100.31ETA49',  'L1_J100.31ETA49',     [], ['L1Calo'], ['RATE:Calibration', 'BW:Detector'],-1],                 
         # larnoiseburst
-        ['larnoiseburst_L1XE35',            'L1_XE35',       [], ['LArNoiseBurst'], ["RATE:Calibration", "BW:Detector"], -1],
-        ['larnoiseburst_L1XE50',            'L1_XE50',       [], ['LArNoiseBurst'], ["RATE:Calibration", "BW:Detector"], -1],
-        #['larnoiseburst_L1XE80', 'L1_XE80', [], ['LArNoiseBurst'], ["RATE:Calibration", "BW:Detector"], -1], # for HI, XE50 is OK?
-        ['larnoiseburst_L1J50',             'L1_J50',       [], ['LArNoiseBurst'], ["RATE:Calibration", "BW:Detector"], -1],
+        #['larnoiseburst_L1XE50',            'L1_XE50',       [], ['LArNoiseBurst'], ["RATE:Calibration", "BW:Detector"], -1],
+        ['larnoiseburst_L1XE60', 'L1_XE60', [], ['LArNoiseBurst'], ["RATE:Calibration", "BW:Detector"], -1],
+        ['larnoiseburst_L1XE70', 'L1_XE70', [], ['LArNoiseBurst'], ["RATE:Calibration", "BW:Detector"], -1],
+        ['larnoiseburst_L1XE80', 'L1_XE80', [], ['LArNoiseBurst'], ["RATE:Calibration", "BW:Detector"], -1],
         ['larnoiseburst_L1J75',             'L1_J75',       [], ['LArNoiseBurst'], ["RATE:Calibration", "BW:Detector"], -1],
         ['larnoiseburst_L1J100', 'L1_J100', [], ['LArNoiseBurst'], ["RATE:Calibration", "BW:Detector"], -1],
-        ['larnoiseburst_L1J40_XE50',            'L1_J40_XE50',       [], ['LArNoiseBurst'], ["RATE:Calibration", "BW:Detector"], -1], 
-        ['larnoiseburst_L1J75_XE40',            'L1_J75_XE40',       [], ['LArNoiseBurst'], ["RATE:Calibration", "BW:Detector"], -1], 
-
+        ['larnoiseburst_L1J40_XE60',            'L1_J40_XE60',       [], ['LArNoiseBurst'], ["RATE:Calibration", "BW:Detector"], -1], 
+        
         # larpeb
         ['g8_loose_larpeb',                      'L1_EM7',     [], ['LArCells'], ['RATE:SinglePhoton', 'BW:Egamma'],-1],
         ['g12_loose_larpeb',                     'L1_EM10',     [], ['LArCells'], ['RATE:SinglePhoton', 'BW:Egamma'],-1],
@@ -523,8 +567,8 @@ def setupMenu():
         ['g40_loose_larpeb',                     'L1_EM20', [], ['LArCells'], ['RATE:SinglePhoton', 'BW:Egamma'],-1],
         ['g60_loose_larpeb',                     'L1_EM20', [], ['LArCells'], ['RATE:SinglePhoton', 'BW:Egamma'],-1],
         ['g80_loose_larpeb',                     'L1_EM20', [], ['LArCells'], ['RATE:SinglePhoton', 'BW:Egamma'],-1],
-        ['conej40_larpebj',  'L1_J12',     [], ['LArCells'], ['RATE:Calibration', 'BW:Detector'],-1],
-        ['conej165_larpebj', 'L1_J75',     [], ['LArCells'], ['RATE:Calibration', 'BW:Detector'],-1],
+        ['conej40_larpebj',  'L1_J20',     [], ['LArCells'], ['RATE:Calibration', 'BW:Detector'],-1],
+        ['conej165_larpebj', 'L1_J100',     [], ['LArCells'], ['RATE:Calibration', 'BW:Detector'],-1],
         ['conej75_320eta490_larpebj',  'L1_J30.31ETA49',     [], ['LArCells'], ['RATE:Calibration', 'BW:Detector'],-1],
         ['conej140_320eta490_larpebj', 'L1_J75.31ETA49',     [], ['LArCells'], ['RATE:Calibration', 'BW:Detector'],-1],
         
@@ -576,17 +620,24 @@ def setupMenu():
 	['noalg_mb_L1TE10000',      'L1_TE10000', [], [MinBiasStream], ["BW:MinBias", "RATE:MinBias"], 1],
 	['noalg_mb_L1TE12000',      'L1_TE12000', [], [MinBiasStream], ["BW:MinBias", "RATE:MinBias"], 1],
 	#['noalg_mb_L1TE14000',      'L1_TE14000', [], [MinBiasStream], ["BW:MinBias", "RATE:MinBias"], 1],
-
+    
 	#TE restricted calo
-        ['noalg_mb_L1TE500.0ETA49',      'L1_TE500.0ETA49', [], [MinBiasStream], ["BW:MinBias", "RATE:MinBias"], 1],
+    ['noalg_mb_L1TE3.0ETA49',      'L1_TE3.0ETA49', [], [MinBiasStream], ["BW:MinBias", "RATE:MinBias"], 1],
+    ['noalg_mb_L1TE7.0ETA49',      'L1_TE7.0ETA49', [], [MinBiasStream], ["BW:MinBias", "RATE:MinBias"], 1],
+    ['noalg_mb_L1TE600.0ETA49',      'L1_TE600.0ETA49', [], [MinBiasStream], ["BW:MinBias", "RATE:MinBias"], 1],
 	['noalg_mb_L1TE1500.0ETA49',      'L1_TE1500.0ETA49', [], [MinBiasStream], ["BW:MinBias", "RATE:MinBias"], 1],
 	['noalg_mb_L1TE3000.0ETA49',      'L1_TE3000.0ETA49', [], [MinBiasStream], ["BW:MinBias", "RATE:MinBias"], 1],
 	['noalg_mb_L1TE3500.0ETA49',      'L1_TE3500.0ETA49', [], [MinBiasStream], ["BW:MinBias", "RATE:MinBias"], 1],
-	['noalg_mb_L1TE5000.0ETA49',      'L1_TE5000.0ETA49', [], [MinBiasStream], ["BW:MinBias", "RATE:MinBias"], 1],
+	#['noalg_mb_L1TE5000.0ETA49',      'L1_TE5000.0ETA49', [], [MinBiasStream], ["BW:MinBias", "RATE:MinBias"], 1],
 	['noalg_mb_L1TE6500.0ETA49',      'L1_TE6500.0ETA49', [], [MinBiasStream], ["BW:MinBias", "RATE:MinBias"], 1],
 	['noalg_mb_L1TE8000.0ETA49',      'L1_TE8000.0ETA49', [], [MinBiasStream], ["BW:MinBias", "RATE:MinBias"], 1],
-	['noalg_mb_L1TE9000.0ETA49',      'L1_TE9000.0ETA49', [], [MinBiasStream], ["BW:MinBias", "RATE:MinBias"], 1],
-
+	#['noalg_mb_L1TE9000.0ETA49',      'L1_TE9000.0ETA49', [], [MinBiasStream], ["BW:MinBias", "RATE:MinBias"], 1],
+    
+    #PC
+ 	['noalg_pc_L1TE50_VTE600',      'L1_TE50_VTE600.0ETA49', [], [PCStream], ["BW:PC", "RATE:PC"], 1],
+	#CC
+	['noalg_cc_L1TE600',      'L1_TE600.0ETA49', [], [CCStream], ["BW:CC", "RATE:CC"], 1],
+    
 	#min bias
         ['noalg_mb_L1MBTS_2',    'L1_MBTS_2', [], [MinBiasStream], ["BW:MinBias", "RATE:MinBias"], 1],
         ['noalg_mb_L1MBTS_1_1',  'L1_MBTS_1_1', [], [MinBiasStream, 'express'], ["BW:MinBias", "RATE:MinBias"], 1],
@@ -621,7 +672,7 @@ def setupMenu():
 	#muon
 	['noalg_L1MU4',    'L1_MU4', [],   [HardProbesStream, 'express'], ["BW:SingleMuon", "RATE:Muon"], 1],
 	['noalg_L1MU6',    'L1_MU6', [],  [HardProbesStream, 'express'], ["BW:SingleMuon", "RATE:Muon"], 1],	
-	['noalg_L1MU11',   'L1_MU4', [],  [HardProbesStream, 'express'], ["BW:SingleMuon", "RATE:Muon"], 1],
+	['noalg_L1MU11',   'L1_MU11', [],  [HardProbesStream, 'express'], ["BW:SingleMuon", "RATE:Muon"], 1],
 	['noalg_L1MU15',   'L1_MU15', [], [HardProbesStream], ["BW:SingleMuon", "RATE:Muon"], 1],
 	['noalg_L1MU20',   'L1_MU20', [], [HardProbesStream], ["BW:SingleMuon", "RATE:Muon"], 1],
 
@@ -651,14 +702,14 @@ def setupMenu():
 	['noalg_L1TE50_OVERLAY',   'L1_TE50_OVERLAY', [], ['MinBiasOverlay'], ["BW:MinBiasOverlay", "RATE:MinBiasOverlay"], 1],
 	
 	#TE restricted calo in |eta|<4.9   
-        ['noalg_mb_L1TE500.0ETA49_OVERLAY',       'L1_TE500.0ETA49_OVERLAY', [], ['MinBiasOverlay'], ["BW:MinBiasOverlay", "RATE:MinBiasOverlay"], 1],
+        ['noalg_mb_L1TE600.0ETA49_OVERLAY',       'L1_TE600.0ETA49_OVERLAY', [], ['MinBiasOverlay'], ["BW:MinBiasOverlay", "RATE:MinBiasOverlay"], 1],
         ['noalg_mb_L1TE1500.0ETA49_OVERLAY',      'L1_TE1500.0ETA49_OVERLAY', [], ['MinBiasOverlay'], ["BW:MinBiasOverlay", "RATE:MinBiasOverlay"], 1],
         ['noalg_mb_L1TE3000.0ETA49_OVERLAY',      'L1_TE3000.0ETA49_OVERLAY', [], ['MinBiasOverlay'], ["BW:MinBiasOverlay", "RATE:MinBiasOverlay"], 1],
         ['noalg_mb_L1TE3500.0ETA49_OVERLAY',      'L1_TE3500.0ETA49_OVERLAY', [], ['MinBiasOverlay'], ["BW:MinBiasOverlay", "RATE:MinBiasOverlay"], 1],
-        ['noalg_mb_L1TE5000.0ETA49_OVERLAY',      'L1_TE5000.0ETA49_OVERLAY', [], ['MinBiasOverlay'], ["BW:MinBiasOverlay", "RATE:MinBiasOverlay"], 1],
+        #['noalg_mb_L1TE5000.0ETA49_OVERLAY',      'L1_TE5000.0ETA49_OVERLAY', [], ['MinBiasOverlay'], ["BW:MinBiasOverlay", "RATE:MinBiasOverlay"], 1],
         ['noalg_mb_L1TE6500.0ETA49_OVERLAY',      'L1_TE6500.0ETA49_OVERLAY', [], ['MinBiasOverlay'], ["BW:MinBiasOverlay", "RATE:MinBiasOverlay"], 1],
         ['noalg_mb_L1TE8000.0ETA49_OVERLAY',      'L1_TE8000.0ETA49_OVERLAY', [], ['MinBiasOverlay'], ["BW:MinBiasOverlay", "RATE:MinBiasOverlay"], 1],
-        ['noalg_mb_L1TE9000.0ETA49_OVERLAY',      'L1_TE9000.0ETA49_OVERLAY', [], ['MinBiasOverlay'], ["BW:MinBiasOverlay", "RATE:MinBiasOverlay"], 1],
+        #['noalg_mb_L1TE9000.0ETA49_OVERLAY',      'L1_TE9000.0ETA49_OVERLAY', [], ['MinBiasOverlay'], ["BW:MinBiasOverlay", "RATE:MinBiasOverlay"], 1],
 
 	#data zero bias overlay
 	['noalg_zb_L1ZB',   'L1_ZB', [], ['ZeroBias'], ["BW:ZeroBias", "RATE:ZeroBias"], 1],
@@ -707,9 +758,65 @@ def setupMenu():
         ['noalg_eb_L1TE50', 'L1_TE50', [], ['EnhancedBias'], ["RATE:EnhancedBias", "BW:Detector"], -1],
         ['noalg_eb_L1TE12000', 'L1_TE12000', [], ['EnhancedBias'], ["RATE:EnhancedBias", "BW:Detector"], -1],
         
+        #LAr demonostartors
+        ['noalg_larcells_L1LAR-EM',                'L1_LAR-EM',           [], ['LArCells'],     ["RATE:SeededStreamers", "BW:Other"], -1], 
+        ['noalg_larcells_L1LAR-J',                 'L1_LAR-J',            [], ['LArCells'],     ["RATE:SeededStreamers", "BW:Other"], -1], 
+        ['noalg_larcells_L1LAR-ZEE_LAR-EM',        'L1_LAR-ZEE_LAR-EM',   [], ['LArCells'],     ["RATE:SeededStreamers", "BW:Other"], -1],
+        ['noalg_larcells_L1LAR-ZEE',               'L1_LAR-ZEE',          [], ['LArCells'],     ["RATE:SeededStreamers", "BW:Other"], -1],
+
+        
         ["noalg_l1topo_L1LAR-EM",          			"L1_LAR-EM",          [], ["L1Topo"], ["RATE:L1TopoStreamers", "BW:Other"], -1 ],
 	    ["noalg_l1topo_L1LAR-J",          			"L1_LAR-J",          [], ["L1Topo"], ["RATE:L1TopoStreamers", "BW:Other"], -1 ],
 
+        #ATR-18734 b-jet+HT
+        ["noalg_l1topo_L1HT190-J15s5.ETA21",                  "L1_HT190-J15s5.ETA21",          [], ["L1Topo"], ["RATE:L1TopoStreamers", "BW:Other"], -1 ],
+        #ATR-18734 B->K*ee
+        ["noalg_l1topo_L1BPH-0M9-EM7-EM5_2MU4",          "L1_BPH-0M9-EM7-EM5_2MU4",          [], ["L1Topo"], ["RATE:L1TopoStreamers", "BW:Other"], -1 ],
+        ["noalg_l1topo_L1BPH-0M9-EM7-EM5_MU6",          "L1_BPH-0M9-EM7-EM5_MU6",          [], ["L1Topo"], ["RATE:L1TopoStreamers", "BW:Other"], -1 ],
+        ["noalg_l1topo_L1BPH-0DR3-EM7J15_2MU4",          "L1_BPH-0DR3-EM7J15_2MU4",          [], ["L1Topo"], ["RATE:L1TopoStreamers", "BW:Other"], -1 ],
+        ["noalg_l1topo_L1BPH-0DR3-EM7J15_MU6",          "L1_BPH-0DR3-EM7J15_MU6",          [], ["L1Topo"], ["RATE:L1TopoStreamers", "BW:Other"], -1 ],
+        #ATR-18734 jpsi->ee T&P
+        ["noalg_l1topo_L1JPSI-1M5-EM7",                 "L1_JPSI-1M5-EM7",          [], ["L1Topo"], ["RATE:L1TopoStreamers", "BW:Other"], -1 ],
+        ["noalg_l1topo_L1JPSI-1M5-EM12",                 "L1_JPSI-1M5-EM12",          [], ["L1Topo"], ["RATE:L1TopoStreamers", "BW:Other"], -1 ],
+        #ATR-18734 VBF inclusive
+        ["noalg_l1topo_L1MJJ-500-NFF",                  "L1_MJJ-500-NFF",          [], ["L1Topo"], ["RATE:L1TopoStreamers", "BW:Other"], -1      ],
+        ["noalg_l1topo_L1MJJ-700",                  "L1_MJJ-700",          [], ["L1Topo"], ["RATE:L1TopoStreamers", "BW:Other"], -1      ],
+        #ATR-18734 VBF H->bb + photon
+        #['noalg_l1topo_L1EM18VHI_MJJ-300',   'L1_EM18VHI_MJJ-300',    [], ['L1Topo'],    ["RATE:SeededStreamers", "BW:Other"], -1],
+        ['noalg_l1topo_L1EM18VH_MJJ-300',   'L1_EM18VH_MJJ-300',    [], ['L1Topo'],    ["RATE:SeededStreamers", "BW:Other"], -1],
+        #ATR-18734
+        #["noalg_l1topo_L1HT150-J20s5.ETA31",                  "L1_HT150-J20s5.ETA31",          [], ["L1Topo"], ["RATE:L1TopoStreamers", "BW:Other"], -1 ],
+        ["noalg_l1topo_L1HT150-J20s5.ETA31_MJJ-400-CF",                    "L1_HT150-J20s5.ETA31_MJJ-400-CF",          [], ["L1Topo"], ["RATE:L1TopoStreamers", "BW:Other"], -1 ],
+
+        #ATR-18734 g + tau for excl Higgs decays
+        ["noalg_l1topo_L130M-EM20ITAU12",                     "L1_30M-EM20ITAU12",          [], ["L1Topo"], ["RATE:L1TopoStreamers", "BW:Other"], -1 ],
+        #ATR-18734 Exotics LLP cal-ratio
+        ["noalg_l1topo_L1LLP-RO",                 "L1_LLP-RO",          [], ["L1Topo"], ["RATE:L1TopoStreamers", "BW:Other"], -1 ],
+        ["noalg_l1topo_L1LLP-NOMATCH",                  "L1_LLP-NOMATCH",          [], ["L1Topo"], ["RATE:L1TopoStreamers", "BW:Other"], -1 ],
+        #ATR-18734 SUSY Higgsino
+        ['noalg_l1topo_L12MU4_J20_XE30_DPHI-J20s2XE30',   'L1_2MU4_J20_XE30_DPHI-J20s2XE30',    [], ['L1Topo'],    ["RATE:SeededStreamers", "BW:Other"], -1],
+        ['noalg_l1topo_L1MU4_J30_XE40_DPHI-J20s2XE30',   'L1_MU4_J30_XE40_DPHI-J20s2XE30',    [], ['L1Topo'],    ["RATE:SeededStreamers", "BW:Other"], -1],
+        ['noalg_l1topo_L1MU4_J50_XE50_DPHI-J20s2XE30',   'L1_MU4_J50_XE50_DPHI-J20s2XE30',    [], ['L1Topo'],    ["RATE:SeededStreamers", "BW:Other"], -1],
+        ["noalg_l1topo_L1J40_XE50_DPHI-J20s2XE50",                 "L1_J40_XE50_DPHI-J20s2XE50",          [], ["L1Topo"], ["RATE:L1TopoStreamers", "BW:Other"], -1 ],
+        #ATR-18734 Axion search
+        ["noalg_l1topo_L1DPHI-2EM3",                    "L1_DPHI-2EM3",          [], ["L1Topo"], ["RATE:L1TopoStreamers", "BW:Other"], -1 ],
+        #ATR-18734 LAr
+        #["noalg_l1topo_L1LAR-J",                        "L1_LAR-J",          [], ["L1Topo"], ["RATE:L1TopoStreamers", "BW:Other"], -1 ],
+        #["noalg_l1topo_L1LAR-EM",                       "L1_LAR-EM",          [], ["L1Topo"], ["RATE:L1TopoStreamers", "BW:Other"], -1 ],
+        ['noalg_l1topo_L1LAR-ZEE',                              'L1_LAR-ZEE',          [], ['L1Topo'],     ["RATE:L1TopoStreamers", "BW:Other"], -1],     
+        ['noalg_l1topo_L1LAR-ZEE_LAR-EM',                       'L1_LAR-ZEE_LAR-EM',   [], ['L1Topo'],     ["RATE:L1TopoStreamers", "BW:Other"], -1],
+
+        #ATR-18734 Tau
+        ["noalg_l1topo_L1DR-EM15TAU12I-J25",                  "L1_DR-EM15TAU12I-J25",          [], ["L1Topo"], ["RATE:L1TopoStreamers", "BW:Other"], -1 ],
+        ["noalg_l1topo_L1DR-TAU20ITAU12I-J25",                "L1_DR-TAU20ITAU12I-J25",          [], ["L1Topo"], ["RATE:L1TopoStreamers", "BW:Other"], -1 ],
+        ["noalg_l1topo_L1TAU60_DR-TAU20ITAU12I",                    "L1_TAU60_DR-TAU20ITAU12I",          [], ["L1Topo"], ["RATE:L1TopoStream     ers", "BW:Other"], -1 ],
+        #ATR-18734 Jets
+        ["noalg_l1topo_L1SC111-CJ15",                   "L1_SC111-CJ15",          [], ["L1Topo"], ["RATE:L1TopoStreamers", "BW:Other"], -1 ],
+        #ATR-18734 TLA
+        ["noalg_l1topo_L1J50_DETA20-J50J",                    "L1_J50_DETA20-J50J",          [], ["L1Topo"], ["RATE:L1TopoStreamers", "BW:Other"], -1 ],
+        
+
+
         ]
 
     TriggerFlags.BeamspotSlice.signatures = [
@@ -755,6 +862,21 @@ class Prescales:
     HLTPrescales = {
         }
 
+######################################################
+# TIGHT physics prescales
+######################################################
+from copy import deepcopy
+# enable if desired: # setting all L1 prescales to 1
+#Prescales.L1Prescales = dict([(ctpid,1) for ctpid in Prescales.L1Prescales]) 
+ 
+Prescales.L1Prescales_tight_physics_prescale  = deepcopy(Prescales.L1Prescales)
+Prescales.HLTPrescales_tight_physics_prescale = deepcopy(Prescales.HLTPrescales)
+
+chain_list=[
+    'timeburner','mb_sp',
+    ]
+Prescales.HLTPrescales_tight_physics_prescale.update(dict(map(None,chain_list,len(chain_list)*[ [-1, 0,-1] ])))
+######################################################
 
 # StreamConfig = {
 #     'HardProbes':      [ 'egamma',
diff --git a/Trigger/TriggerCommon/TriggerMenu/python/menu/SignatureDicts.py b/Trigger/TriggerCommon/TriggerMenu/python/menu/SignatureDicts.py
index 8dfbdacc7ee612286abd42a8f73e68aa40e0037b..ace983b69947912b4a0b8b2ea6e916a9441d1844 100644
--- a/Trigger/TriggerCommon/TriggerMenu/python/menu/SignatureDicts.py
+++ b/Trigger/TriggerCommon/TriggerMenu/python/menu/SignatureDicts.py
@@ -131,7 +131,7 @@ JetChainParts = {
     'cleaning'     : ['cleanL','cleanT','cleanLLP',
                       'cleanLA','cleanTA','cleanLLPA', 'noCleaning'
                       ],
-    'recoAlg'      : ["a3","a4", "a10", "a10r", "a10t"],
+    'recoAlg'      : ["a2","a3","a4", "a10", "a10r", "a10t"],
     'dataType'     : ['TT', 'tc', 'cc', 'ion', 'sktc'],
     'calib'        : ["had","lcw","em"],
     'jetCalib'     : ["jes","sub","subjes","subjesIS", "nojcalib"],
@@ -558,22 +558,22 @@ MinBiasChainParts = {
     'multiplicity'   : '',    
     'trigType'       : ['mb'],
     'threshold'      : '',
-    'extra'          : ['noisesup', 'vetombts2in', 'vetombts1side2in',  'vetospmbts2in', "vetosp" ,'ion', 'ncb', 'blayer', 'exclusiveloose', 'exclusivetight'], #ncb = non collision background, blayer = only sum innermost pix layer
+    'extra'          : ['noisesup', 'vetombts2in', 'vetombts1side2in',  'vetospmbts2in', "vetosp" ,'ion', 'ncb', 'blayer', 'exclusiveloose', 'exclusiveloose1', 'exclusiveloose2', 'exclusivetight'], #ncb = non collision background, blayer = only sum innermost pix layer
     'IDinfo'         : [],
     'ZDCinfo'        : ['lg', 'hg'],
     'trkInfo'        : ['hlttr', 'ftk', 'costr'],
-    'hypoL2Info'     : ['sp2', 'sp3', 'sp5', 'sp10', 'sp15', 'sp100', 'sp300', 'sp400', 'sp500', 'sp600', 'sp700', 'sp800', 'sp900',
+    'hypoL2Info'     : ['sp2', 'sp3', 'sp5', 'sp10', 'sp15', 'sp50', 'sp100', 'sp300', 'sp400', 'sp500', 'sp600', 'sp700', 'sp800', 'sp900',
                         'sp1000', 'sp1100', 'sp1200', 'sp1300', 'sp1400', 'sp1500', 'sp1600', 'sp1700', 'sp1800', 'sp1900',
                         'sp2000', 'sp2100', 'sp2200', 'sp2300', 'sp2400', 'sp2500', 'sp2700', 'sp2800', 'sp2900', 'sp3000',
-                        'sp3100', 'sp3500', 'sp4100', 'sp4500', 'sp4800', 'sp5000', 'sp5200',],
+                        'sp3100', 'sp3500', 'sp4100', 'sp4500', 'sp4800', 'sp5000', 'sp5200','vetosp1500'],
     'pileupInfo'     : ['pusup200','pusup300','pusup350', 'pusup400', 'pusup450', 'pusup500', 'pusup550', 'pusup600', 'pusup650', 'pusup700', 'pusup750', 'pusup800', 'pusup850', 'pusup900',
                         'pusup1000', 'pusup1100', 'pusup1200', 'pusup1300', 'pusup1400', 'pusup1500',],
-    'hypoEFInfo'     : ['trk3','trk5','trk10','trk15',  'trk20',  'trk30',  'trk40', 'trk45', 'trk50', 'trk55', 'trk60', 'trk65', 'trk70', 'trk75', 'trk80', 'trk90',
+    'hypoEFInfo'     : ['trk3','trk5','trk10','trk15',  'trk20', 'trk25' ,  'trk30', 'trk35', 'trk40', 'trk45', 'trk50', 'trk55', 'trk60', 'trk65', 'trk70', 'trk75', 'trk80', 'trk90',
                         'trk100', 'trk110', 'trk120', 'trk130', 'trk140', 'trk150', 'trk160', 'trk180', 'trk200', 'trk220', 'trk240', 'trk260', 'trk280',      
                         'pt2', 'pt4', 'pt6', 'pt8', ],
     'hypoEFsumEtInfo': ['sumet40', 'sumet50', 'sumet60', 'sumet70', 'sumet80', 'sumet90', 'sumet110', 'sumet150',],
     'recoAlg'        : ['mbts', 'sptrk', 'sp', 'noalg', 'perf', 'hmt', 'hmtperf', 'idperf', 'zdcperf'],
-    'addInfo'        : ['peb'],
+    'addInfo'        : ['peb','hipeb'],
     }
 # ---- MinBiasDictinary of default Values ----
 MinBiasChainParts_Default = {
@@ -618,8 +618,8 @@ HeavyIonChainParts = {
     'hypoEFInfo'     : [],
     'hypoEFsumEtInfo': ['fcalet3000', 'fcalet3306', 'fcalet3391', 'fcalet3516',],
     'recoAlg'        : ['ucc', 'upc'],
-    'addInfo'        : [ ],
-    'gap'            : [ 'FgapA', 'FgapC', 'FgapAC',   'L2FgapA', 'L2FgapC', 'L2FgapAC',   'EFFgapA', 'EFFgapC', 'EFFgapAC' ],
+    'addInfo'        : ['hipeb'],
+    'gap'            : [ 'FgapA', 'FgapC', 'FgapAC', 'FgapA5', 'FgapC5', 'FgapA10', 'FgapC10',  'L2FgapA', 'L2FgapC', 'L2FgapAC',   'EFFgapA', 'EFFgapC', 'EFFgapAC' ],
     }
 
 # ---- HeavyIonDictinary of default Values ----
@@ -700,7 +700,7 @@ StreamingChainParts = {
     'multiplicity'   : '',
     'streamingInfo'  : ['bkg', 'idmon', 'mb', 'eb', 'zb','to','standby',
                         'hltpassthrough', 'jettauetmiss', 'larcells', 
-                        'cosmiccalo', 'cosmicmuons','idcosmic', 'dcmmon','zb', 'l1calo', 'l1topo','ftk'],
+                        'cosmiccalo', 'cosmicmuons','idcosmic', 'dcmmon','zb', 'l1calo', 'l1topo','ftk','cc','pc'],
     'trigType'       : 'streamer', 
     'extra'          : '',
     'streamType'        : AllowedStreamingChainIdentifiers,
diff --git a/Trigger/TriggerCommon/TriggerMenu/python/menu/StreamInfo.py b/Trigger/TriggerCommon/TriggerMenu/python/menu/StreamInfo.py
index d99e4b018c24d9b58dd48e13a0db1846269f99a0..8046be2f6c7172acf3bcea88227c7f4ad8be6e6e 100644
--- a/Trigger/TriggerCommon/TriggerMenu/python/menu/StreamInfo.py
+++ b/Trigger/TriggerCommon/TriggerMenu/python/menu/StreamInfo.py
@@ -29,10 +29,11 @@ physicsStreams = ['Main',
                   'MinBiasOverlay',
                   'UPC',
                   'UCC',
-                  'PC',
                   'Mistimed',
                   'ExoDelayed',
                   'FTK',
+                  'PC',
+                  'CC',
                   ]
 
 calibStreams = [
@@ -60,7 +61,9 @@ calibStreams = [
                 'RPCsecondaryreadout',
                 'IDprescaledL1',
                 'LArPEB',
-                'L1TopoMismatches'
+                'L1TopoMismatches',
+                'PCPEB',
+                'CCPEB',
                 ]
 
 ##NOTE: DataScouting_xx_NAME: 
diff --git a/Trigger/TriggerCommon/TriggerMenu/python/minbias/MinBiasDef.py b/Trigger/TriggerCommon/TriggerMenu/python/minbias/MinBiasDef.py
index 849bdb5a6ea9833aa8ffc46862e638d56d320fcc..69b3df2e7f9c9c926a79d32e8eeb48b79fb4cbf3 100644
--- a/Trigger/TriggerCommon/TriggerMenu/python/minbias/MinBiasDef.py
+++ b/Trigger/TriggerCommon/TriggerMenu/python/minbias/MinBiasDef.py
@@ -16,7 +16,7 @@ from TriggerMenu.menu.HltConfig import L2EFChainDef,mergeRemovingOverlap
 
 from TrigT2MinBias.TrigT2MinBiasConfig import (MbMbtsHypo,L2MbMbtsFex,L2MbSpFex,L2MbSpFex_SCTNoiseSup,L2MbSpFex_ncb,
                                                L2MbSpHypo_blayer,L2MbSpHypo_veto,L2MbSpFex_noPix,L2MbSpMhNoPixHypo_hip,
-                                               L2MbSpFex_BLayer,L2MbSpHypo_ncb,L2MbSpHypo,L2MbSpHypo_PT,
+                                               L2MbSpFex_BLayer,L2MbSpHypo_ncb,L2MbSpHypo,L2MbSpHypo_PT,L2MbSpMhNoPixHypo_veto,
                                                L2MbMbtsHypo_PT,L2MbZdcFex_LG,L2MbZdcHypo_PT,L2MbZdcFex_HG,trigT2MinBiasProperties)
 from InDetTrigRecExample.EFInDetConfig import TrigEFIDSequence
 #fexes.efid = TrigEFIDSequence("minBias","minBias","InsideOut").getSequence()
@@ -139,7 +139,9 @@ class L2EFChain_MB(L2EFChainDef):
         doVetoSp=False
         if 'vetosp' in self.chainPart['extra']:
             doVetoSp=True
-
+        doVetoSpN=False
+        if 'vetosp' in self.chainPart['hypoL2Info']:
+            doVetoSpN=True
         doSptrk=False
         if "sptrk" in self.chainPart['recoAlg']: #do EFID
             doSptrk=True
@@ -154,7 +156,7 @@ class L2EFChain_MB(L2EFChainDef):
             doMbtsVeto=True
             theL2MbtsFex=L2MbMbtsFex
             theL2MbtsHypo=MbMbtsHypo("L2MbMbtsHypo_1_1_inn_one_side_veto")
-
+        doexclusivelooseN=False
         ########## L2 algos ##################
         #if "sptrk" or "sp" in self.chainPart['recoAlg']:
         if "noisesup" in self.chainPart['extra']:
@@ -171,7 +173,8 @@ class L2EFChain_MB(L2EFChainDef):
         else:
             theL2Fex  = L2MbSpFex
             if doSptrk:
-                chainSuffix = "sptrk"
+                if not doVetoSpN: chainSuffix = "sptrk"
+                else: chainSuffix = "sptrk_"+self.chainPart['hypoL2Info']
             elif doVetoSp:
                 chainSuffix = "sp_vetosp"
             else:
@@ -194,19 +197,24 @@ class L2EFChain_MB(L2EFChainDef):
             theL2Hypo = L2MbSpHypo_veto
         else:
             theL2Hypo = L2MbSpHypo
-
+        if doVetoSpN: 
+            l2hypo2 = self.chainPart['hypoL2Info']
+            l2th=l2hypo2.lstrip('vetosp')
+            theL2Hypo2 = L2MbSpMhNoPixHypo_veto("L2MbSpMhNoPixHypo_veto_"+l2th,float(l2th))
+            #chainSuffix = chainSuffix+'_vetosp'+l2th
         ########## EF algos ##################
         #if "sptrk" in self.chainPart['recoAlg']:
+        chainSuffixEF=chainSuffix
         if "costr" in self.chainPart['trkInfo']:
-            chainSuffix = chainSuffix+"_costr"
+            chainSuffixEF = chainSuffixEF+"_costr"
                 
             from InDetTrigRecExample.EFInDetConfig import TrigEFIDInsideOut_CosmicsN
             efid_costr=TrigEFIDInsideOut_CosmicsN()
             theEFFex1 = efid_costr.getSequence()
             from TrigMinBias.TrigMinBiasConfig import MbTrkFex_1, MbTrkHypo_1
-            theEFFex2 =  MbTrkFex_1("MbTrkFex_"+chainSuffix)
+            theEFFex2 =  MbTrkFex_1("MbTrkFex_"+chainSuffixEF)
             theEFFex2.InputTrackContainerName = "InDetTrigTrackSlimmerIOTRT_CosmicsN_EFID"
-            theEFHypo = MbTrkHypo_1("MbTrkHypo_"+chainSuffix)
+            theEFHypo = MbTrkHypo_1("MbTrkHypo_"+chainSuffixEF)
             theEFHypo.AcceptAll_EF=False
             theEFHypo.Required_ntrks=1
             theEFHypo.Max_z0=1000.0
@@ -218,6 +226,7 @@ class L2EFChain_MB(L2EFChainDef):
 
             theEFFex2 =  EFMbTrkFex
             efhypo = self.chainPart['hypoEFInfo']
+            efextra = self.chainPart['extra']
             if efhypo:
                 if "pt" in self.chainPart['hypoEFInfo']:
                     efth=efhypo.lstrip('pt')
@@ -225,22 +234,31 @@ class L2EFChain_MB(L2EFChainDef):
                     theEFHypo = MbTrkHypo('EFMbTrkHypo_pt%d'% threshold)
                     theEFHypo.Min_pt = threshold
                     theEFHypo.Max_z0 = 401.
-                    chainSuffix = chainSuffix+'_pt'+efth
+                    chainSuffixEF = chainSuffixEF+'_pt'+efth
                 elif "trk" in self.chainPart['hypoEFInfo']:
                     efth=efhypo.lstrip('trk')
                     theEFHypo = MbTrkHypo('EFMbTrkHypo_trk%i'% int(efth))
                     theEFHypo.Required_ntrks = int(efth)
                     theEFHypo.Min_pt = 0.200
                     theEFHypo.Max_z0 = 401.
-                    chainSuffix = chainSuffix+'_trk'+efth
+                    chainSuffixEF = chainSuffixEF+'_trk'+efth
             elif 'exclusiveloose' in self.chainPart['extra']:
                 efth=0.200 #default
                 theEFHypo =  EFMbTrkHypoExclusiveLoose
-                chainSuffix = chainSuffix+"_exclusiveloose"
+                efthX=efextra.lstrip('exclusiveloose')
+                chainSuffixEF = chainSuffixEF+"_exclusiveloose"
+                
+                if efthX:
+                    doexclusivelooseN=True
+                    threshold=int(efthX)
+                    theEFHypo2 = MbTrkHypo('EFMbTrkHypo2_pt1_trk%i'% threshold)
+                    theEFHypo2.Min_pt = 1.
+                    theEFHypo2.Required_ntrks = int(efthX)
+                    theEFHypo2.Max_z0 = 401.
             elif 'exclusivetight' in self.chainPart['extra']:
                 efth=0.200 #default
                 theEFHypo =  EFMbTrkHypoExclusiveTight
-                chainSuffix = chainSuffix+"_exclusivetight"
+                chainSuffixEF = chainSuffixEF+"_exclusivetight"
             else:
                 efth=0.200 #default
                 theEFHypo =  EFMbTrkHypo
@@ -265,23 +283,41 @@ class L2EFChain_MB(L2EFChainDef):
             self.L2sequenceList += [['L2_mb_dummy',
                                      efiddataprep,
                                      'L2_mb_iddataprep']] 
-
-        self.L2sequenceList += [[['L2_mb_iddataprep'],
-                                 [theL2Fex, theL2Hypo],
-                                 'L2_mb_step1']]
-
+        if doVetoSpN:
+            self.L2sequenceList += [[['L2_mb_iddataprep'],
+                                     [theL2Fex, theL2Hypo],
+                                     'L2_mb_spveto']]
+            self.L2sequenceList += [[['L2_mb_spveto'],
+                                     [theL2Hypo2],
+                                     'L2_mb_step1']]
+        else:    
+            self.L2sequenceList += [[['L2_mb_iddataprep'],
+                                     [theL2Fex, theL2Hypo],
+                                     'L2_mb_step1']]
         if doSptrk:
             self.EFsequenceList += [[['L2_mb_step1'],
                                      theEFFex1+[theEFFex2, theEFHypo],
                                      'EF_mb_step1']]
-            if 'peb' in self.chainPart['addInfo']:
+            if doexclusivelooseN:      
+                self.EFsequenceList += [[['EF_mb_step1'],
+                                         [theEFHypo2],
+                                         'EF_mb_step2']]                         
+            if 'hipeb' in self.chainPart['addInfo']:
+                from TrigDetCalib.TrigDetCalibConfig import TrigSubDetListWriter
+                HISubDetListWriter = TrigSubDetListWriter("HISubDetListWriter")
+                HISubDetListWriter.SubdetId = ['TDAQ_CTP','InnerDetector','FCal','FORWARD_ZDC']
+                HISubDetListWriter.MaxRoIsPerEvent=1
+                self.EFsequenceList += [[['EF_mb_step1'],
+                                         [ HISubDetListWriter ],
+                                         'EF_mb_step2']]
+            elif 'peb' in self.chainPart['addInfo']:
                 from TrigDetCalib.TrigDetCalibConfig import TrigSubDetListWriter
                 ALFASubDetListWriter = TrigSubDetListWriter("ALFASubDetListWriter")
                 ALFASubDetListWriter.SubdetId = ['TDAQ_HLT','TDAQ_CTP','InnerDetector','DBM','FORWARD_ALPHA','FORWARD_LUCID','FORWARD_ZDC','FORWARD_BCM']
                 ALFASubDetListWriter.MaxRoIsPerEvent=1
                 self.EFsequenceList += [[['EF_mb_step1'],
                                          [ ALFASubDetListWriter ],
-                                         'EF_mb_step2']]
+                                         'EF_mb_step2']]                             
 
         ########### Signatures ###########
         
@@ -289,10 +325,14 @@ class L2EFChain_MB(L2EFChainDef):
         if doMbtsVeto:
             self.L2signatureList += [ [['L2_mb_mbtsveto']] ]
         self.L2signatureList += [ [['L2_mb_iddataprep']] ]
+        if doVetoSpN:
+            self.L2signatureList += [ [['L2_mb_spveto']] ]
         self.L2signatureList += [ [['L2_mb_step1']] ]
         if doSptrk:
             self.EFsignatureList += [ [['EF_mb_step1']] ]
-            if 'peb' in self.chainPart['addInfo']:
+            if doexclusivelooseN:
+                self.EFsignatureList += [ [['EF_mb_step2']] ]
+            if 'peb' in self.chainPart['addInfo'] or 'hipeb' in self.chainPart['addInfo']:
                 self.EFsignatureList += [ [['EF_mb_step2']] ]
 
         self.TErenamingDict = {
@@ -300,12 +340,15 @@ class L2EFChain_MB(L2EFChainDef):
             'L2_mb_mbtsveto': mergeRemovingOverlap('L2_mbtsveto_', chainSuffix),        
             'L2_mb_iddataprep': mergeRemovingOverlap('L2_iddataprep_', chainSuffix),
             'L2_mb_step1': mergeRemovingOverlap('L2_', chainSuffix),
-            'EF_mb_step1': mergeRemovingOverlap('EF_', chainSuffix),
+            'EF_mb_step1': mergeRemovingOverlap('EF_', chainSuffixEF),
             }
 
-        if 'peb' in self.chainPart['addInfo']:
-            self.TErenamingDict ['EF_mb_step2'] = mergeRemovingOverlap('EF_', chainSuffix+'_peb')
-
+        if doVetoSpN:
+            self.TErenamingDict ['L2_mb_spveto'] = mergeRemovingOverlap('L2_', chainSuffix + '_vetosp')
+        if 'peb' in self.chainPart['addInfo'] or 'hipeb' in self.chainPart['addInfo']:
+            self.TErenamingDict ['EF_mb_step2'] = mergeRemovingOverlap('EF_', chainSuffixEF+'_peb')
+        if doexclusivelooseN:
+            self.TErenamingDict ['EF_mb_step2'] = mergeRemovingOverlap('EF_', chainSuffixEF+efthX)    
 ###########################
     def setup_mb_idperf(self):
         doHeavyIon=False
diff --git a/Trigger/TriggerCommon/TriggerMenuXML/CMakeLists.txt b/Trigger/TriggerCommon/TriggerMenuXML/CMakeLists.txt
index 32c3ba18f7a1c7ea0e0f560dbce33a83df2c0ac2..a1c268778a2009ce145a0983f7687a7768877cf4 100644
--- a/Trigger/TriggerCommon/TriggerMenuXML/CMakeLists.txt
+++ b/Trigger/TriggerCommon/TriggerMenuXML/CMakeLists.txt
@@ -117,6 +117,7 @@ atlas_build_trigger_menu( MC_pp_v7_CPSampleProd_mc_prescale )
 atlas_build_trigger_menu( MC_pp_v7_TriggerValidation_mc_prescale )
 
 atlas_build_trigger_menu( Physics_HI_v5 )
+atlas_build_trigger_menu( Physics_HI_v5_tight_physics_prescale )
 atlas_build_trigger_menu( MC_HI_v5 )
 atlas_build_trigger_menu( MC_HI_v5_tight_mc_prescale )
 
diff --git a/Trigger/TriggerCommon/TriggerMenuXML/data/LVL1config_MC_HI_v5.xml b/Trigger/TriggerCommon/TriggerMenuXML/data/LVL1config_MC_HI_v5.xml
index a5107fb63c0061f33f656e6ee48aaf4d2d41a313..65d9c0990c1d74c2091c8016fdd409cfe6022aec 100644
--- a/Trigger/TriggerCommon/TriggerMenuXML/data/LVL1config_MC_HI_v5.xml
+++ b/Trigger/TriggerCommon/TriggerMenuXML/data/LVL1config_MC_HI_v5.xml
@@ -3,7 +3,7 @@
 <LVL1Config name="MC_HI_v5" ctpVersion="4" l1Version="1">
   <!--File is generated by TriggerMenu-->
   <!--No. L1 thresholds defined: 316-->
-  <!--No. L1 items defined: 292-->
+  <!--No. L1 items defined: 342-->
   <TriggerMenu name="MC_HI_v5" phase="lumi">
     <TriggerItem ctpid="0" partition="1" name="L1_EM18" complex_deadtime="0" definition="(EM18[x1]&amp;BGRP0&amp;BGRP1)" trigger_type="10000100" monitor="LF:000|HF:000">
       <AND>
@@ -54,23 +54,24 @@
         <InternalTrigger name="BGRP3"/>
       </AND>
     </TriggerItem>
-    <TriggerItem ctpid="7" partition="1" name="L1_3MU6" complex_deadtime="0" definition="(MU6[x3]&amp;BGRP0&amp;BGRP1)" trigger_type="10001000" monitor="LF:000|HF:000">
+    <TriggerItem ctpid="7" partition="1" name="L1_HT190-J15s5.ETA21" complex_deadtime="0" definition="(HT190-J15s5.ETA21[x1]&amp;BGRP0&amp;BGRP1)" trigger_type="10000000" monitor="LF:000|HF:000">
       <AND>
-        <TriggerCondition multi="3" name="MU6_x3" triggerthreshold="MU6"/>
+        <TriggerCondition multi="1" name="HT190-J15s5.ETA21_x1" triggerthreshold="HT190-J15s5.ETA21"/>
         <InternalTrigger name="BGRP0"/>
         <InternalTrigger name="BGRP1"/>
       </AND>
     </TriggerItem>
-    <TriggerItem ctpid="8" partition="1" name="L1_J75" complex_deadtime="0" definition="(J75[x1]&amp;BGRP0&amp;BGRP1)" trigger_type="10000100" monitor="LF:000|HF:000">
+    <TriggerItem ctpid="8" partition="1" name="L1_BPH-0M9-EM7-EM5_2MU4" complex_deadtime="0" definition="(MU4[x2]&amp;0INVM9-EM7ab-EMab[x1]&amp;BGRP0&amp;BGRP1)" trigger_type="10000000" monitor="LF:000|HF:000">
       <AND>
-        <TriggerCondition multi="1" name="J75_x1" triggerthreshold="J75"/>
+        <TriggerCondition multi="2" name="MU4_x2" triggerthreshold="MU4"/>
+        <TriggerCondition multi="1" name="0INVM9-EM7ab-EMab_x1" triggerthreshold="0INVM9-EM7ab-EMab"/>
         <InternalTrigger name="BGRP0"/>
         <InternalTrigger name="BGRP1"/>
       </AND>
     </TriggerItem>
-    <TriggerItem ctpid="9" partition="1" name="L1_J175" complex_deadtime="0" definition="(J175[x1]&amp;BGRP0&amp;BGRP1)" trigger_type="10000100" monitor="LF:000|HF:000">
+    <TriggerItem ctpid="9" partition="1" name="L1_2EM16" complex_deadtime="0" definition="(EM16[x2]&amp;BGRP0&amp;BGRP1)" trigger_type="10000100" monitor="LF:000|HF:000">
       <AND>
-        <TriggerCondition multi="1" name="J175_x1" triggerthreshold="J175"/>
+        <TriggerCondition multi="2" name="EM16_x2" triggerthreshold="EM16"/>
         <InternalTrigger name="BGRP0"/>
         <InternalTrigger name="BGRP1"/>
       </AND>
@@ -96,16 +97,18 @@
         <InternalTrigger name="BGRP1"/>
       </AND>
     </TriggerItem>
-    <TriggerItem ctpid="13" partition="1" name="L1_2J15" complex_deadtime="0" definition="(J15[x2]&amp;BGRP0&amp;BGRP1)" trigger_type="10000100" monitor="LF:000|HF:000">
+    <TriggerItem ctpid="13" partition="1" name="L1_BPH-0M9-EM7-EM5_MU6" complex_deadtime="0" definition="(MU6[x1]&amp;0INVM9-EM7ab-EMab[x1]&amp;BGRP0&amp;BGRP1)" trigger_type="10000000" monitor="LF:000|HF:000">
       <AND>
-        <TriggerCondition multi="2" name="J15_x2" triggerthreshold="J15"/>
+        <TriggerCondition multi="1" name="MU6_x1" triggerthreshold="MU6"/>
+        <TriggerCondition multi="1" name="0INVM9-EM7ab-EMab_x1" triggerthreshold="0INVM9-EM7ab-EMab"/>
         <InternalTrigger name="BGRP0"/>
         <InternalTrigger name="BGRP1"/>
       </AND>
     </TriggerItem>
-    <TriggerItem ctpid="14" partition="1" name="L1_J10.31ETA49" complex_deadtime="0" definition="(J10.31ETA49[x1]&amp;BGRP0&amp;BGRP1)" trigger_type="10000100" monitor="LF:000|HF:000">
+    <TriggerItem ctpid="14" partition="1" name="L1_BPH-0DR3-EM7J15_2MU4" complex_deadtime="0" definition="(MU4[x2]&amp;0DR03-EM7ab-CJ15ab[x1]&amp;BGRP0&amp;BGRP1)" trigger_type="10000000" monitor="LF:000|HF:000">
       <AND>
-        <TriggerCondition multi="1" name="J10.31ETA49_x1" triggerthreshold="J10.31ETA49"/>
+        <TriggerCondition multi="2" name="MU4_x2" triggerthreshold="MU4"/>
+        <TriggerCondition multi="1" name="0DR03-EM7ab-CJ15ab_x1" triggerthreshold="0DR03-EM7ab-CJ15ab"/>
         <InternalTrigger name="BGRP0"/>
         <InternalTrigger name="BGRP1"/>
       </AND>
@@ -154,55 +157,46 @@
         <InternalTrigger name="BGRP4"/>
       </AND>
     </TriggerItem>
-    <TriggerItem ctpid="21" partition="1" name="L1_MBTS_1_1_VTE50" complex_deadtime="0" definition="(MBTS_A[x1]&amp;MBTS_C[x1]&amp;!TE50[x1]&amp;BGRP0&amp;BGRP1)" trigger_type="10100000" monitor="LF:000|HF:000">
+    <TriggerItem ctpid="21" partition="1" name="L1_BPH-0DR3-EM7J15_MU6" complex_deadtime="0" definition="(MU6[x1]&amp;0DR03-EM7ab-CJ15ab[x1]&amp;BGRP0&amp;BGRP1)" trigger_type="10000000" monitor="LF:111|HF:000">
       <AND>
-        <TriggerCondition multi="1" name="MBTS_A_x1" triggerthreshold="MBTS_A"/>
-        <TriggerCondition multi="1" name="MBTS_C_x1" triggerthreshold="MBTS_C"/>
-        <NOT>
-          <TriggerCondition multi="1" name="TE50_x1" triggerthreshold="TE50"/>
-        </NOT>
+        <TriggerCondition multi="1" name="MU6_x1" triggerthreshold="MU6"/>
+        <TriggerCondition multi="1" name="0DR03-EM7ab-CJ15ab_x1" triggerthreshold="0DR03-EM7ab-CJ15ab"/>
         <InternalTrigger name="BGRP0"/>
         <InternalTrigger name="BGRP1"/>
       </AND>
     </TriggerItem>
-    <TriggerItem ctpid="22" partition="1" name="L1_MBTS_2_2_VTE50" complex_deadtime="0" definition="(MBTS_A[x2]&amp;MBTS_C[x2]&amp;!TE50[x1]&amp;BGRP0&amp;BGRP1)" trigger_type="10100000" monitor="LF:000|HF:000">
+    <TriggerItem ctpid="22" partition="1" name="L1_JPSI-1M5-EM7" complex_deadtime="0" definition="(1INVM5-EM7s1-EMs6[x1]&amp;BGRP0&amp;BGRP1)" trigger_type="10000000" monitor="LF:111|HF:000">
       <AND>
-        <TriggerCondition multi="2" name="MBTS_A_x2" triggerthreshold="MBTS_A"/>
-        <TriggerCondition multi="2" name="MBTS_C_x2" triggerthreshold="MBTS_C"/>
-        <NOT>
-          <TriggerCondition multi="1" name="TE50_x1" triggerthreshold="TE50"/>
-        </NOT>
+        <TriggerCondition multi="1" name="1INVM5-EM7s1-EMs6_x1" triggerthreshold="1INVM5-EM7s1-EMs6"/>
         <InternalTrigger name="BGRP0"/>
         <InternalTrigger name="BGRP1"/>
       </AND>
     </TriggerItem>
-    <TriggerItem ctpid="23" partition="1" name="L1_TE5_NZ" complex_deadtime="0" definition="(TE5[x1]&amp;!ZDC_AND[x1]&amp;BGRP0&amp;BGRP1)" trigger_type="10000100" monitor="LF:000|HF:000">
+    <TriggerItem ctpid="23" partition="1" name="L1_JPSI-1M5-EM12" complex_deadtime="0" definition="(1INVM5-EM12s1-EMs6[x1]&amp;BGRP0&amp;BGRP1)" trigger_type="10000000" monitor="LF:000|HF:000">
       <AND>
-        <TriggerCondition multi="1" name="TE5_x1" triggerthreshold="TE5"/>
-        <NOT>
-          <TriggerCondition multi="1" name="ZDC_AND_x1" triggerthreshold="ZDC_AND"/>
-        </NOT>
+        <TriggerCondition multi="1" name="1INVM5-EM12s1-EMs6_x1" triggerthreshold="1INVM5-EM12s1-EMs6"/>
         <InternalTrigger name="BGRP0"/>
         <InternalTrigger name="BGRP1"/>
       </AND>
     </TriggerItem>
-    <TriggerItem ctpid="24" partition="1" name="L1_TE5000.0ETA49" complex_deadtime="0" definition="(TE5000.0ETA49[x1]&amp;BGRP0&amp;BGRP1)" trigger_type="10000100" monitor="LF:000|HF:000">
+    <TriggerItem ctpid="24" partition="1" name="L1_MJJ-500-NFF" complex_deadtime="0" definition="(500INVM9999-J30s6-AJ20s6[x1]&amp;BGRP0&amp;BGRP1)" trigger_type="10000000" monitor="LF:111|HF:000">
       <AND>
-        <TriggerCondition multi="1" name="TE5000.0ETA49_x1" triggerthreshold="TE5000.0ETA49"/>
+        <TriggerCondition multi="1" name="500INVM9999-J30s6-AJ20s6_x1" triggerthreshold="500INVM9999-J30s6-AJ20s6"/>
         <InternalTrigger name="BGRP0"/>
         <InternalTrigger name="BGRP1"/>
       </AND>
     </TriggerItem>
-    <TriggerItem ctpid="25" partition="1" name="L1_TE5000.0ETA49_OVERLAY" complex_deadtime="0" definition="(TE5000.0ETA49[x1]&amp;BGRP0&amp;BGRP1)" trigger_type="10000010" monitor="LF:000|HF:000">
+    <TriggerItem ctpid="25" partition="1" name="L1_MJJ-700" complex_deadtime="0" definition="(700INVM9999-AJ30s6-AJ20s6[x1]&amp;BGRP0&amp;BGRP1)" trigger_type="10000000" monitor="LF:000|HF:000">
       <AND>
-        <TriggerCondition multi="1" name="TE5000.0ETA49_x1" triggerthreshold="TE5000.0ETA49"/>
+        <TriggerCondition multi="1" name="700INVM9999-AJ30s6-AJ20s6_x1" triggerthreshold="700INVM9999-AJ30s6-AJ20s6"/>
         <InternalTrigger name="BGRP0"/>
         <InternalTrigger name="BGRP1"/>
       </AND>
     </TriggerItem>
-    <TriggerItem ctpid="26" partition="1" name="L1_TE6500.0ETA49_OVERLAY" complex_deadtime="0" definition="(TE6500.0ETA49[x1]&amp;BGRP0&amp;BGRP1)" trigger_type="10000010" monitor="LF:000|HF:000">
+    <TriggerItem ctpid="26" partition="1" name="L1_EM18VH_MJJ-300" complex_deadtime="0" definition="(EM18VH[x1]&amp;300INVM9999-AJ30s6-AJ20s6[x1]&amp;BGRP0&amp;BGRP1)" trigger_type="10000000" monitor="LF:000|HF:000">
       <AND>
-        <TriggerCondition multi="1" name="TE6500.0ETA49_x1" triggerthreshold="TE6500.0ETA49"/>
+        <TriggerCondition multi="1" name="EM18VH_x1" triggerthreshold="EM18VH"/>
+        <TriggerCondition multi="1" name="300INVM9999-AJ30s6-AJ20s6_x1" triggerthreshold="300INVM9999-AJ30s6-AJ20s6"/>
         <InternalTrigger name="BGRP0"/>
         <InternalTrigger name="BGRP1"/>
       </AND>
@@ -217,72 +211,64 @@
         <InternalTrigger name="BGRP1"/>
       </AND>
     </TriggerItem>
-    <TriggerItem ctpid="28" partition="1" name="L1_BCM_Wide" complex_deadtime="0" definition="(BCM_Wide[x1]&amp;BGRP0&amp;BGRP1)" trigger_type="10100000" monitor="LF:000|HF:000">
+    <TriggerItem ctpid="28" partition="1" name="L1_HT150-J20s5.ETA31_MJJ-400-CF" complex_deadtime="0" definition="(HT150-J20s5.ETA31[x1]&amp;400INVM9999-AJ30s6.ETA31-AJ20s6.31ETA49[x1]&amp;BGRP0&amp;BGRP1)" trigger_type="10000000" monitor="LF:000|HF:000">
       <AND>
-        <TriggerCondition multi="1" name="BCM_Wide_x1" triggerthreshold="BCM_Wide"/>
+        <TriggerCondition multi="1" name="HT150-J20s5.ETA31_x1" triggerthreshold="HT150-J20s5.ETA31"/>
+        <TriggerCondition multi="1" name="400INVM9999-AJ30s6.ETA31-AJ20s6.31ETA49_x1" triggerthreshold="400INVM9999-AJ30s6.ETA31-AJ20s6.31ETA49"/>
         <InternalTrigger name="BGRP0"/>
         <InternalTrigger name="BGRP1"/>
       </AND>
     </TriggerItem>
-    <TriggerItem ctpid="29" partition="1" name="L1_J15_NZ" complex_deadtime="0" definition="(J15[x1]&amp;!ZDC_AND[x1]&amp;BGRP0&amp;BGRP1)" trigger_type="10000100" monitor="LF:000|HF:000">
+    <TriggerItem ctpid="29" partition="1" name="L1_30M-EM20ITAU12" complex_deadtime="0" definition="(DISAMB-30INVM-EM20his2-TAU12ab[x1]&amp;BGRP0&amp;BGRP1)" trigger_type="10000000" monitor="LF:000|HF:000">
       <AND>
-        <TriggerCondition multi="1" name="J15_x1" triggerthreshold="J15"/>
-        <NOT>
-          <TriggerCondition multi="1" name="ZDC_AND_x1" triggerthreshold="ZDC_AND"/>
-        </NOT>
+        <TriggerCondition multi="1" name="DISAMB-30INVM-EM20his2-TAU12ab_x1" triggerthreshold="DISAMB-30INVM-EM20his2-TAU12ab"/>
         <InternalTrigger name="BGRP0"/>
         <InternalTrigger name="BGRP1"/>
       </AND>
     </TriggerItem>
-    <TriggerItem ctpid="30" partition="1" name="L1_2J15_NZ" complex_deadtime="0" definition="(J15[x2]&amp;!ZDC_AND[x1]&amp;BGRP0&amp;BGRP1)" trigger_type="10000100" monitor="LF:000|HF:000">
+    <TriggerItem ctpid="30" partition="1" name="L1_LLP-RO" complex_deadtime="0" definition="(100RATIO-0MATCH-TAU30si2-EMall[x1]&amp;BGRP0&amp;BGRP1)" trigger_type="10000000" monitor="LF:000|HF:000">
       <AND>
-        <TriggerCondition multi="2" name="J15_x2" triggerthreshold="J15"/>
-        <NOT>
-          <TriggerCondition multi="1" name="ZDC_AND_x1" triggerthreshold="ZDC_AND"/>
-        </NOT>
+        <TriggerCondition multi="1" name="100RATIO-0MATCH-TAU30si2-EMall_x1" triggerthreshold="100RATIO-0MATCH-TAU30si2-EMall"/>
         <InternalTrigger name="BGRP0"/>
         <InternalTrigger name="BGRP1"/>
       </AND>
     </TriggerItem>
-    <TriggerItem ctpid="31" partition="1" name="L1_J15_NL" complex_deadtime="0" definition="(J15[x1]&amp;!LUCID_A[x1]&amp;!LUCID_C[x1]&amp;BGRP0&amp;BGRP1)" trigger_type="10000100" monitor="LF:000|HF:000">
+    <TriggerItem ctpid="31" partition="1" name="L1_LLP-NOMATCH" complex_deadtime="0" definition="(NOT-0MATCH-TAU30si1-EMall[x1]&amp;BGRP0&amp;BGRP1)" trigger_type="10000000" monitor="LF:000|HF:000">
       <AND>
-        <TriggerCondition multi="1" name="J15_x1" triggerthreshold="J15"/>
-        <NOT>
-          <TriggerCondition multi="1" name="LUCID_A_x1" triggerthreshold="LUCID_A"/>
-        </NOT>
-        <NOT>
-          <TriggerCondition multi="1" name="LUCID_C_x1" triggerthreshold="LUCID_C"/>
-        </NOT>
+        <TriggerCondition multi="1" name="NOT-0MATCH-TAU30si1-EMall_x1" triggerthreshold="NOT-0MATCH-TAU30si1-EMall"/>
         <InternalTrigger name="BGRP0"/>
         <InternalTrigger name="BGRP1"/>
       </AND>
     </TriggerItem>
-    <TriggerItem ctpid="32" partition="1" name="L1_2J15_NL" complex_deadtime="0" definition="(J15[x2]&amp;!LUCID_A[x1]&amp;!LUCID_C[x1]&amp;BGRP0&amp;BGRP1)" trigger_type="10000100" monitor="LF:000|HF:000">
+    <TriggerItem ctpid="32" partition="1" name="L1_2MU4_J20_XE30_DPHI-J20s2XE30" complex_deadtime="0" definition="(MU4[x2]&amp;J20[x1]&amp;XE30[x1]&amp;10MINDPHI-J20s2-XE30[x1]&amp;BGRP0&amp;BGRP1)" trigger_type="10000000" monitor="LF:000|HF:000">
       <AND>
-        <TriggerCondition multi="2" name="J15_x2" triggerthreshold="J15"/>
-        <NOT>
-          <TriggerCondition multi="1" name="LUCID_A_x1" triggerthreshold="LUCID_A"/>
-        </NOT>
-        <NOT>
-          <TriggerCondition multi="1" name="LUCID_C_x1" triggerthreshold="LUCID_C"/>
-        </NOT>
+        <TriggerCondition multi="2" name="MU4_x2" triggerthreshold="MU4"/>
+        <TriggerCondition multi="1" name="J20_x1" triggerthreshold="J20"/>
+        <TriggerCondition multi="1" name="XE30_x1" triggerthreshold="XE30"/>
+        <TriggerCondition multi="1" name="10MINDPHI-J20s2-XE30_x1" triggerthreshold="10MINDPHI-J20s2-XE30"/>
         <InternalTrigger name="BGRP0"/>
         <InternalTrigger name="BGRP1"/>
       </AND>
     </TriggerItem>
-    <TriggerItem ctpid="33" partition="1" name="L1_ZDC_A_C_BGRP7" complex_deadtime="0" definition="(ZDC_A[x1]&amp;ZDC_C[x1]&amp;BGRP0&amp;BGRP7)" trigger_type="10100000" monitor="LF:000|HF:000">
+    <TriggerItem ctpid="33" partition="1" name="L1_MU4_J30_XE40_DPHI-J20s2XE30" complex_deadtime="0" definition="(MU4[x1]&amp;J30[x1]&amp;XE40[x1]&amp;10MINDPHI-J20s2-XE30[x1]&amp;BGRP0&amp;BGRP1)" trigger_type="10000000" monitor="LF:000|HF:000">
       <AND>
-        <TriggerCondition multi="1" name="ZDC_A_x1" triggerthreshold="ZDC_A"/>
-        <TriggerCondition multi="1" name="ZDC_C_x1" triggerthreshold="ZDC_C"/>
+        <TriggerCondition multi="1" name="MU4_x1" triggerthreshold="MU4"/>
+        <TriggerCondition multi="1" name="J30_x1" triggerthreshold="J30"/>
+        <TriggerCondition multi="1" name="XE40_x1" triggerthreshold="XE40"/>
+        <TriggerCondition multi="1" name="10MINDPHI-J20s2-XE30_x1" triggerthreshold="10MINDPHI-J20s2-XE30"/>
         <InternalTrigger name="BGRP0"/>
-        <InternalTrigger name="BGRP7"/>
+        <InternalTrigger name="BGRP1"/>
       </AND>
     </TriggerItem>
-    <TriggerItem ctpid="34" partition="1" name="L1_TAU12_UNPAIRED_ISO" complex_deadtime="0" definition="(HA12[x1]&amp;BGRP0&amp;BGRP4)" trigger_type="10000100" monitor="LF:000|HF:000">
+    <TriggerItem ctpid="34" partition="1" name="L1_ZDC_A_C_VTE50_PEB" complex_deadtime="0" definition="(ZDC_A[x1]&amp;ZDC_C[x1]&amp;!TE50[x1]&amp;BGRP0&amp;BGRP1)" trigger_type="10100000" monitor="LF:000|HF:000">
       <AND>
-        <TriggerCondition multi="1" name="HA12_x1" triggerthreshold="HA12"/>
+        <TriggerCondition multi="1" name="ZDC_A_x1" triggerthreshold="ZDC_A"/>
+        <TriggerCondition multi="1" name="ZDC_C_x1" triggerthreshold="ZDC_C"/>
+        <NOT>
+          <TriggerCondition multi="1" name="TE50_x1" triggerthreshold="TE50"/>
+        </NOT>
         <InternalTrigger name="BGRP0"/>
-        <InternalTrigger name="BGRP4"/>
+        <InternalTrigger name="BGRP1"/>
       </AND>
     </TriggerItem>
     <TriggerItem ctpid="35" partition="1" name="L1_2MU4_VTE50" complex_deadtime="0" definition="(MU4[x2]&amp;!TE50[x1]&amp;BGRP0&amp;BGRP1)" trigger_type="10001000" monitor="LF:000|HF:000">
@@ -430,11 +416,14 @@
         <InternalTrigger name="BGRP7"/>
       </AND>
     </TriggerItem>
-    <TriggerItem ctpid="49" partition="1" name="L1_TAU12_UNPAIRED_NONISO" complex_deadtime="0" definition="(HA12[x1]&amp;BGRP0&amp;BGRP5)" trigger_type="10000100" monitor="LF:000|HF:000">
+    <TriggerItem ctpid="49" partition="1" name="L1_MU4_J50_XE50_DPHI-J20s2XE30" complex_deadtime="0" definition="(MU4[x1]&amp;J50[x1]&amp;XE50[x1]&amp;10MINDPHI-J20s2-XE30[x1]&amp;BGRP0&amp;BGRP1)" trigger_type="10000000" monitor="LF:000|HF:000">
       <AND>
-        <TriggerCondition multi="1" name="HA12_x1" triggerthreshold="HA12"/>
+        <TriggerCondition multi="1" name="MU4_x1" triggerthreshold="MU4"/>
+        <TriggerCondition multi="1" name="J50_x1" triggerthreshold="J50"/>
+        <TriggerCondition multi="1" name="XE50_x1" triggerthreshold="XE50"/>
+        <TriggerCondition multi="1" name="10MINDPHI-J20s2-XE30_x1" triggerthreshold="10MINDPHI-J20s2-XE30"/>
         <InternalTrigger name="BGRP0"/>
-        <InternalTrigger name="BGRP5"/>
+        <InternalTrigger name="BGRP1"/>
       </AND>
     </TriggerItem>
     <TriggerItem ctpid="50" partition="1" name="L1_MBTSC4" complex_deadtime="0" definition="(MBTS_C4[x1]&amp;BGRP0&amp;BGRP1)" trigger_type="10100000" monitor="LF:000|HF:000">
@@ -472,11 +461,13 @@
         <InternalTrigger name="BGRP1"/>
       </AND>
     </TriggerItem>
-    <TriggerItem ctpid="55" partition="1" name="L1_TAU12_EMPTY" complex_deadtime="0" definition="(HA12[x1]&amp;BGRP0&amp;BGRP3)" trigger_type="10000100" monitor="LF:000|HF:000">
+    <TriggerItem ctpid="55" partition="1" name="L1_J40_XE50_DPHI-J20s2XE50" complex_deadtime="0" definition="(J40[x1]&amp;XE50[x1]&amp;10MINDPHI-J20s2-XE50[x1]&amp;BGRP0&amp;BGRP1)" trigger_type="10000000" monitor="LF:000|HF:000">
       <AND>
-        <TriggerCondition multi="1" name="HA12_x1" triggerthreshold="HA12"/>
+        <TriggerCondition multi="1" name="J40_x1" triggerthreshold="J40"/>
+        <TriggerCondition multi="1" name="XE50_x1" triggerthreshold="XE50"/>
+        <TriggerCondition multi="1" name="10MINDPHI-J20s2-XE50_x1" triggerthreshold="10MINDPHI-J20s2-XE50"/>
         <InternalTrigger name="BGRP0"/>
-        <InternalTrigger name="BGRP3"/>
+        <InternalTrigger name="BGRP1"/>
       </AND>
     </TriggerItem>
     <TriggerItem ctpid="56" partition="1" name="L1_MBTSC10" complex_deadtime="0" definition="(MBTS_C10[x1]&amp;BGRP0&amp;BGRP1)" trigger_type="10100000" monitor="LF:000|HF:000">
@@ -486,11 +477,11 @@
         <InternalTrigger name="BGRP1"/>
       </AND>
     </TriggerItem>
-    <TriggerItem ctpid="57" partition="1" name="L1_TAU12_FIRSTEMPTY" complex_deadtime="0" definition="(HA12[x1]&amp;BGRP0&amp;BGRP6)" trigger_type="10000100" monitor="LF:000|HF:000">
+    <TriggerItem ctpid="57" partition="1" name="L1_DPHI-2EM3" complex_deadtime="0" definition="(27DPHI32-EMs1-EMs6[x1]&amp;BGRP0&amp;BGRP1)" trigger_type="10000000" monitor="LF:111|HF:000">
       <AND>
-        <TriggerCondition multi="1" name="HA12_x1" triggerthreshold="HA12"/>
+        <TriggerCondition multi="1" name="27DPHI32-EMs1-EMs6_x1" triggerthreshold="27DPHI32-EMs1-EMs6"/>
         <InternalTrigger name="BGRP0"/>
-        <InternalTrigger name="BGRP6"/>
+        <InternalTrigger name="BGRP1"/>
       </AND>
     </TriggerItem>
     <TriggerItem ctpid="58" partition="1" name="L1_MBTSC12" complex_deadtime="0" definition="(MBTS_C12[x1]&amp;BGRP0&amp;BGRP1)" trigger_type="10100000" monitor="LF:000|HF:000">
@@ -500,11 +491,11 @@
         <InternalTrigger name="BGRP1"/>
       </AND>
     </TriggerItem>
-    <TriggerItem ctpid="59" partition="1" name="L1_J10.31ETA49_EMPTY" complex_deadtime="0" definition="(J10.31ETA49[x1]&amp;BGRP0&amp;BGRP3)" trigger_type="10000100" monitor="LF:000|HF:000">
+    <TriggerItem ctpid="59" partition="1" name="L1_LAR-ZEE" complex_deadtime="0" definition="(ZEE-EM20shi2[x1]&amp;BGRP0&amp;BGRP1)" trigger_type="10000100" monitor="LF:111|HF:000">
       <AND>
-        <TriggerCondition multi="1" name="J10.31ETA49_x1" triggerthreshold="J10.31ETA49"/>
+        <TriggerCondition multi="1" name="ZEE-EM20shi2_x1" triggerthreshold="ZEE-EM20shi2"/>
         <InternalTrigger name="BGRP0"/>
-        <InternalTrigger name="BGRP3"/>
+        <InternalTrigger name="BGRP1"/>
       </AND>
     </TriggerItem>
     <TriggerItem ctpid="60" partition="1" name="L1_MBTSC14" complex_deadtime="0" definition="(MBTS_C14[x1]&amp;BGRP0&amp;BGRP1)" trigger_type="10100000" monitor="LF:000|HF:000">
@@ -514,11 +505,12 @@
         <InternalTrigger name="BGRP1"/>
       </AND>
     </TriggerItem>
-    <TriggerItem ctpid="61" partition="1" name="L1_ZDC_AND_EMPTY" complex_deadtime="0" definition="(ZDC_AND[x1]&amp;BGRP0&amp;BGRP3)" trigger_type="10100000" monitor="LF:000|HF:000">
+    <TriggerItem ctpid="61" partition="1" name="L1_LAR-ZEE_LAR-EM" complex_deadtime="0" definition="(ZEE-EM20shi2[x1]&amp;LAR-EM20shi1[x1]&amp;BGRP0&amp;BGRP1)" trigger_type="10010000" monitor="LF:000|HF:000">
       <AND>
-        <TriggerCondition multi="1" name="ZDC_AND_x1" triggerthreshold="ZDC_AND"/>
+        <TriggerCondition multi="1" name="ZEE-EM20shi2_x1" triggerthreshold="ZEE-EM20shi2"/>
+        <TriggerCondition multi="1" name="LAR-EM20shi1_x1" triggerthreshold="LAR-EM20shi1"/>
         <InternalTrigger name="BGRP0"/>
-        <InternalTrigger name="BGRP3"/>
+        <InternalTrigger name="BGRP1"/>
       </AND>
     </TriggerItem>
     <TriggerItem ctpid="62" partition="1" name="L1_RD0_EMPTY" complex_deadtime="0" definition="(RNDM0&amp;BGRP0&amp;BGRP3)" trigger_type="10000001" monitor="LF:000|HF:000">
@@ -535,11 +527,11 @@
         <InternalTrigger name="BGRP1"/>
       </AND>
     </TriggerItem>
-    <TriggerItem ctpid="64" partition="1" name="L1_ZDC_AND_UNPAIRED_ISO" complex_deadtime="0" definition="(ZDC_AND[x1]&amp;BGRP0&amp;BGRP4)" trigger_type="10100000" monitor="LF:000|HF:000">
+    <TriggerItem ctpid="64" partition="1" name="L1_TAU2" complex_deadtime="0" definition="(HA2[x1]&amp;BGRP0&amp;BGRP1)" trigger_type="10000100" monitor="LF:000|HF:000">
       <AND>
-        <TriggerCondition multi="1" name="ZDC_AND_x1" triggerthreshold="ZDC_AND"/>
+        <TriggerCondition multi="1" name="HA2_x1" triggerthreshold="HA2"/>
         <InternalTrigger name="BGRP0"/>
-        <InternalTrigger name="BGRP4"/>
+        <InternalTrigger name="BGRP1"/>
       </AND>
     </TriggerItem>
     <TriggerItem ctpid="65" partition="1" name="L1_MBTSC3" complex_deadtime="0" definition="(MBTS_C3[x1]&amp;BGRP0&amp;BGRP1)" trigger_type="10100000" monitor="LF:000|HF:000">
@@ -549,11 +541,11 @@
         <InternalTrigger name="BGRP1"/>
       </AND>
     </TriggerItem>
-    <TriggerItem ctpid="66" partition="1" name="L1_ZDC_AND_UNPAIRED_NONISO" complex_deadtime="0" definition="(ZDC_AND[x1]&amp;BGRP0&amp;BGRP5)" trigger_type="10100000" monitor="LF:000|HF:000">
+    <TriggerItem ctpid="66" partition="1" name="L1_TAU3" complex_deadtime="0" definition="(HA3[x1]&amp;BGRP0&amp;BGRP1)" trigger_type="10000100" monitor="LF:000|HF:000">
       <AND>
-        <TriggerCondition multi="1" name="ZDC_AND_x1" triggerthreshold="ZDC_AND"/>
+        <TriggerCondition multi="1" name="HA3_x1" triggerthreshold="HA3"/>
         <InternalTrigger name="BGRP0"/>
-        <InternalTrigger name="BGRP5"/>
+        <InternalTrigger name="BGRP1"/>
       </AND>
     </TriggerItem>
     <TriggerItem ctpid="67" partition="1" name="L1_MU4_FIRSTEMPTY" complex_deadtime="0" definition="(MU4[x1]&amp;BGRP0&amp;BGRP6)" trigger_type="10001000" monitor="LF:000|HF:000">
@@ -570,24 +562,16 @@
         <InternalTrigger name="BGRP6"/>
       </AND>
     </TriggerItem>
-    <TriggerItem ctpid="69" partition="1" name="L1_MLZ_A" complex_deadtime="0" definition="((MBTS_A[x1]|ZDC_A[x1]|LUCID_A[x1])&amp;BGRP0&amp;BGRP1)" trigger_type="10100000" monitor="LF:000|HF:000">
+    <TriggerItem ctpid="69" partition="1" name="L1_DR-EM15TAU12I-J25" complex_deadtime="0" definition="(1DISAMB-J25ab-0DR28-EM15his2-TAU12abi[x1]&amp;BGRP0&amp;BGRP1)" trigger_type="10000000" monitor="LF:000|HF:000">
       <AND>
-        <OR>
-          <TriggerCondition multi="1" name="MBTS_A_x1" triggerthreshold="MBTS_A"/>
-          <TriggerCondition multi="1" name="ZDC_A_x1" triggerthreshold="ZDC_A"/>
-          <TriggerCondition multi="1" name="LUCID_A_x1" triggerthreshold="LUCID_A"/>
-        </OR>
+        <TriggerCondition multi="1" name="1DISAMB-J25ab-0DR28-EM15his2-TAU12abi_x1" triggerthreshold="1DISAMB-J25ab-0DR28-EM15his2-TAU12abi"/>
         <InternalTrigger name="BGRP0"/>
         <InternalTrigger name="BGRP1"/>
       </AND>
     </TriggerItem>
-    <TriggerItem ctpid="70" partition="1" name="L1_MLZ_C" complex_deadtime="0" definition="((MBTS_C[x1]|ZDC_C[x1]|LUCID_C[x1])&amp;BGRP0&amp;BGRP1)" trigger_type="10100000" monitor="LF:000|HF:000">
+    <TriggerItem ctpid="70" partition="1" name="L1_DR-TAU20ITAU12I-J25" complex_deadtime="0" definition="(1DISAMB-J25ab-0DR28-TAU20abi-TAU12abi[x1]&amp;BGRP0&amp;BGRP1)" trigger_type="10000000" monitor="LF:111|HF:000">
       <AND>
-        <OR>
-          <TriggerCondition multi="1" name="MBTS_C_x1" triggerthreshold="MBTS_C"/>
-          <TriggerCondition multi="1" name="ZDC_C_x1" triggerthreshold="ZDC_C"/>
-          <TriggerCondition multi="1" name="LUCID_C_x1" triggerthreshold="LUCID_C"/>
-        </OR>
+        <TriggerCondition multi="1" name="1DISAMB-J25ab-0DR28-TAU20abi-TAU12abi_x1" triggerthreshold="1DISAMB-J25ab-0DR28-TAU20abi-TAU12abi"/>
         <InternalTrigger name="BGRP0"/>
         <InternalTrigger name="BGRP1"/>
       </AND>
@@ -613,23 +597,10 @@
         <InternalTrigger name="BGRP1"/>
       </AND>
     </TriggerItem>
-    <TriggerItem ctpid="74" partition="1" name="L1_MBLZ" complex_deadtime="0" definition="((((MBTS_A[x1]|ZDC_A[x1]|LUCID_A[x1])&amp;(MBTS_C[x1]|ZDC_C[x1]|LUCID_C[x1]))|BCM_Wide[x1])&amp;BGRP0&amp;BGRP1)" trigger_type="10100000" monitor="LF:000|HF:000">
+    <TriggerItem ctpid="74" partition="1" name="L1_TAU60_DR-TAU20ITAU12I" complex_deadtime="0" definition="(HA60[x1]&amp;0DR28-TAU20abi-TAU12abi[x1]&amp;BGRP0&amp;BGRP1)" trigger_type="10000000" monitor="LF:000|HF:000">
       <AND>
-        <OR>
-          <AND>
-            <OR>
-              <TriggerCondition multi="1" name="MBTS_A_x1" triggerthreshold="MBTS_A"/>
-              <TriggerCondition multi="1" name="ZDC_A_x1" triggerthreshold="ZDC_A"/>
-              <TriggerCondition multi="1" name="LUCID_A_x1" triggerthreshold="LUCID_A"/>
-            </OR>
-            <OR>
-              <TriggerCondition multi="1" name="MBTS_C_x1" triggerthreshold="MBTS_C"/>
-              <TriggerCondition multi="1" name="ZDC_C_x1" triggerthreshold="ZDC_C"/>
-              <TriggerCondition multi="1" name="LUCID_C_x1" triggerthreshold="LUCID_C"/>
-            </OR>
-          </AND>
-          <TriggerCondition multi="1" name="BCM_Wide_x1" triggerthreshold="BCM_Wide"/>
-        </OR>
+        <TriggerCondition multi="1" name="HA60_x1" triggerthreshold="HA60"/>
+        <TriggerCondition multi="1" name="0DR28-TAU20abi-TAU12abi_x1" triggerthreshold="0DR28-TAU20abi-TAU12abi"/>
         <InternalTrigger name="BGRP0"/>
         <InternalTrigger name="BGRP1"/>
       </AND>
@@ -648,10 +619,26 @@
         <InternalTrigger name="BGRP1"/>
       </AND>
     </TriggerItem>
-    <TriggerItem ctpid="77" partition="1" name="L1_BGRP0" complex_deadtime="0" definition="(RNDM0&amp;BGRP0)" trigger_type="10000001" monitor="LF:000|HF:000">
+    <TriggerItem ctpid="77" partition="1" name="L1_SC111-CJ15" complex_deadtime="0" definition="(SC111-CJ15ab.ETA26[x1]&amp;BGRP0&amp;BGRP1)" trigger_type="10000000" monitor="LF:111|HF:000">
       <AND>
-        <InternalTrigger name="RNDM0"/>
+        <TriggerCondition multi="1" name="SC111-CJ15ab.ETA26_x1" triggerthreshold="SC111-CJ15ab.ETA26"/>
         <InternalTrigger name="BGRP0"/>
+        <InternalTrigger name="BGRP1"/>
+      </AND>
+    </TriggerItem>
+    <TriggerItem ctpid="78" partition="1" name="L1_J50_DETA20-J50J" complex_deadtime="0" definition="(J50[x1]&amp;0DETA20-J50s1-Js2[x1]&amp;BGRP0&amp;BGRP1)" trigger_type="10000000" monitor="LF:111|HF:000">
+      <AND>
+        <TriggerCondition multi="1" name="J50_x1" triggerthreshold="J50"/>
+        <TriggerCondition multi="1" name="0DETA20-J50s1-Js2_x1" triggerthreshold="0DETA20-J50s1-Js2"/>
+        <InternalTrigger name="BGRP0"/>
+        <InternalTrigger name="BGRP1"/>
+      </AND>
+    </TriggerItem>
+    <TriggerItem ctpid="79" partition="1" name="L1_3MU6" complex_deadtime="0" definition="(MU6[x3]&amp;BGRP0&amp;BGRP1)" trigger_type="10001000" monitor="LF:000|HF:000">
+      <AND>
+        <TriggerCondition multi="3" name="MU6_x3" triggerthreshold="MU6"/>
+        <InternalTrigger name="BGRP0"/>
+        <InternalTrigger name="BGRP1"/>
       </AND>
     </TriggerItem>
     <TriggerItem ctpid="80" partition="1" name="L1_BCM_Wide_BGRP0" complex_deadtime="0" definition="(BCM_Wide[x1]&amp;BGRP0)" trigger_type="10100000" monitor="LF:000|HF:111">
@@ -676,6 +663,13 @@
         <InternalTrigger name="BGRP1"/>
       </AND>
     </TriggerItem>
+    <TriggerItem ctpid="83" partition="1" name="L1_J75" complex_deadtime="0" definition="(J75[x1]&amp;BGRP0&amp;BGRP1)" trigger_type="10000100" monitor="LF:000|HF:000">
+      <AND>
+        <TriggerCondition multi="1" name="J75_x1" triggerthreshold="J75"/>
+        <InternalTrigger name="BGRP0"/>
+        <InternalTrigger name="BGRP1"/>
+      </AND>
+    </TriggerItem>
     <TriggerItem ctpid="84" partition="1" name="L1_EM20" complex_deadtime="0" definition="(EM20[x1]&amp;BGRP0&amp;BGRP1)" trigger_type="10000100" monitor="LF:000|HF:000">
       <AND>
         <TriggerCondition multi="1" name="EM20_x1" triggerthreshold="EM20"/>
@@ -711,6 +705,13 @@
         <InternalTrigger name="BGRP1"/>
       </AND>
     </TriggerItem>
+    <TriggerItem ctpid="89" partition="1" name="L1_J175" complex_deadtime="0" definition="(J175[x1]&amp;BGRP0&amp;BGRP1)" trigger_type="10000100" monitor="LF:000|HF:000">
+      <AND>
+        <TriggerCondition multi="1" name="J175_x1" triggerthreshold="J175"/>
+        <InternalTrigger name="BGRP0"/>
+        <InternalTrigger name="BGRP1"/>
+      </AND>
+    </TriggerItem>
     <TriggerItem ctpid="90" partition="1" name="L1_MU6" complex_deadtime="0" definition="(MU6[x1]&amp;BGRP0&amp;BGRP1)" trigger_type="10001000" monitor="LF:000|HF:000">
       <AND>
         <TriggerCondition multi="1" name="MU6_x1" triggerthreshold="MU6"/>
@@ -739,6 +740,13 @@
         <InternalTrigger name="BGRP1"/>
       </AND>
     </TriggerItem>
+    <TriggerItem ctpid="94" partition="1" name="L1_2J15" complex_deadtime="0" definition="(J15[x2]&amp;BGRP0&amp;BGRP1)" trigger_type="10000100" monitor="LF:000|HF:000">
+      <AND>
+        <TriggerCondition multi="2" name="J15_x2" triggerthreshold="J15"/>
+        <InternalTrigger name="BGRP0"/>
+        <InternalTrigger name="BGRP1"/>
+      </AND>
+    </TriggerItem>
     <TriggerItem ctpid="95" partition="1" name="L1_2MU4" complex_deadtime="0" definition="(MU4[x2]&amp;BGRP0&amp;BGRP1)" trigger_type="10001000" monitor="LF:000|HF:000">
       <AND>
         <TriggerCondition multi="2" name="MU4_x2" triggerthreshold="MU4"/>
@@ -753,6 +761,17 @@
         <InternalTrigger name="BGRP1"/>
       </AND>
     </TriggerItem>
+    <TriggerItem ctpid="97" partition="1" name="L1_MBTS_1_1_VTE50" complex_deadtime="0" definition="(MBTS_A[x1]&amp;MBTS_C[x1]&amp;!TE50[x1]&amp;BGRP0&amp;BGRP1)" trigger_type="10100000" monitor="LF:000|HF:000">
+      <AND>
+        <TriggerCondition multi="1" name="MBTS_A_x1" triggerthreshold="MBTS_A"/>
+        <TriggerCondition multi="1" name="MBTS_C_x1" triggerthreshold="MBTS_C"/>
+        <NOT>
+          <TriggerCondition multi="1" name="TE50_x1" triggerthreshold="TE50"/>
+        </NOT>
+        <InternalTrigger name="BGRP0"/>
+        <InternalTrigger name="BGRP1"/>
+      </AND>
+    </TriggerItem>
     <TriggerItem ctpid="98" partition="1" name="L1_J15" complex_deadtime="0" definition="(J15[x1]&amp;BGRP0&amp;BGRP1)" trigger_type="10000100" monitor="LF:000|HF:000">
       <AND>
         <TriggerCondition multi="1" name="J15_x1" triggerthreshold="J15"/>
@@ -767,6 +786,27 @@
         <InternalTrigger name="BGRP1"/>
       </AND>
     </TriggerItem>
+    <TriggerItem ctpid="100" partition="1" name="L1_MBTS_2_2_VTE50" complex_deadtime="0" definition="(MBTS_A[x2]&amp;MBTS_C[x2]&amp;!TE50[x1]&amp;BGRP0&amp;BGRP1)" trigger_type="10100000" monitor="LF:000|HF:000">
+      <AND>
+        <TriggerCondition multi="2" name="MBTS_A_x2" triggerthreshold="MBTS_A"/>
+        <TriggerCondition multi="2" name="MBTS_C_x2" triggerthreshold="MBTS_C"/>
+        <NOT>
+          <TriggerCondition multi="1" name="TE50_x1" triggerthreshold="TE50"/>
+        </NOT>
+        <InternalTrigger name="BGRP0"/>
+        <InternalTrigger name="BGRP1"/>
+      </AND>
+    </TriggerItem>
+    <TriggerItem ctpid="101" partition="1" name="L1_TE5_NZ" complex_deadtime="0" definition="(TE5[x1]&amp;!ZDC_AND[x1]&amp;BGRP0&amp;BGRP1)" trigger_type="10000100" monitor="LF:000|HF:000">
+      <AND>
+        <TriggerCondition multi="1" name="TE5_x1" triggerthreshold="TE5"/>
+        <NOT>
+          <TriggerCondition multi="1" name="ZDC_AND_x1" triggerthreshold="ZDC_AND"/>
+        </NOT>
+        <InternalTrigger name="BGRP0"/>
+        <InternalTrigger name="BGRP1"/>
+      </AND>
+    </TriggerItem>
     <TriggerItem ctpid="102" partition="1" name="L1_J50" complex_deadtime="0" definition="(J50[x1]&amp;BGRP0&amp;BGRP1)" trigger_type="10000100" monitor="LF:000|HF:000">
       <AND>
         <TriggerCondition multi="1" name="J50_x1" triggerthreshold="J50"/>
@@ -774,6 +814,30 @@
         <InternalTrigger name="BGRP1"/>
       </AND>
     </TriggerItem>
+    <TriggerItem ctpid="103" partition="1" name="L1_TE6500.0ETA49_OVERLAY" complex_deadtime="0" definition="(TE6500.0ETA49[x1]&amp;BGRP0&amp;BGRP1)" trigger_type="10000010" monitor="LF:000|HF:000">
+      <AND>
+        <TriggerCondition multi="1" name="TE6500.0ETA49_x1" triggerthreshold="TE6500.0ETA49"/>
+        <InternalTrigger name="BGRP0"/>
+        <InternalTrigger name="BGRP1"/>
+      </AND>
+    </TriggerItem>
+    <TriggerItem ctpid="104" partition="1" name="L1_BCM_Wide" complex_deadtime="0" definition="(BCM_Wide[x1]&amp;BGRP0&amp;BGRP1)" trigger_type="10100000" monitor="LF:000|HF:000">
+      <AND>
+        <TriggerCondition multi="1" name="BCM_Wide_x1" triggerthreshold="BCM_Wide"/>
+        <InternalTrigger name="BGRP0"/>
+        <InternalTrigger name="BGRP1"/>
+      </AND>
+    </TriggerItem>
+    <TriggerItem ctpid="105" partition="1" name="L1_J15_NZ" complex_deadtime="0" definition="(J15[x1]&amp;!ZDC_AND[x1]&amp;BGRP0&amp;BGRP1)" trigger_type="10000100" monitor="LF:000|HF:000">
+      <AND>
+        <TriggerCondition multi="1" name="J15_x1" triggerthreshold="J15"/>
+        <NOT>
+          <TriggerCondition multi="1" name="ZDC_AND_x1" triggerthreshold="ZDC_AND"/>
+        </NOT>
+        <InternalTrigger name="BGRP0"/>
+        <InternalTrigger name="BGRP1"/>
+      </AND>
+    </TriggerItem>
     <TriggerItem ctpid="106" partition="1" name="L1_BCM_AC_CA_UNPAIRED_ISO" complex_deadtime="0" definition="((BCM_AtoC[x1]|BCM_CtoA[x1])&amp;BGRP0&amp;BGRP4)" trigger_type="10100000" monitor="LF:000|HF:000">
       <AND>
         <OR>
@@ -798,6 +862,50 @@
         <InternalTrigger name="BGRP4"/>
       </AND>
     </TriggerItem>
+    <TriggerItem ctpid="109" partition="1" name="L1_2J15_NZ" complex_deadtime="0" definition="(J15[x2]&amp;!ZDC_AND[x1]&amp;BGRP0&amp;BGRP1)" trigger_type="10000100" monitor="LF:000|HF:000">
+      <AND>
+        <TriggerCondition multi="2" name="J15_x2" triggerthreshold="J15"/>
+        <NOT>
+          <TriggerCondition multi="1" name="ZDC_AND_x1" triggerthreshold="ZDC_AND"/>
+        </NOT>
+        <InternalTrigger name="BGRP0"/>
+        <InternalTrigger name="BGRP1"/>
+      </AND>
+    </TriggerItem>
+    <TriggerItem ctpid="110" partition="1" name="L1_J15_NL" complex_deadtime="0" definition="(J15[x1]&amp;!LUCID_A[x1]&amp;!LUCID_C[x1]&amp;BGRP0&amp;BGRP1)" trigger_type="10000100" monitor="LF:000|HF:000">
+      <AND>
+        <TriggerCondition multi="1" name="J15_x1" triggerthreshold="J15"/>
+        <NOT>
+          <TriggerCondition multi="1" name="LUCID_A_x1" triggerthreshold="LUCID_A"/>
+        </NOT>
+        <NOT>
+          <TriggerCondition multi="1" name="LUCID_C_x1" triggerthreshold="LUCID_C"/>
+        </NOT>
+        <InternalTrigger name="BGRP0"/>
+        <InternalTrigger name="BGRP1"/>
+      </AND>
+    </TriggerItem>
+    <TriggerItem ctpid="111" partition="1" name="L1_2J15_NL" complex_deadtime="0" definition="(J15[x2]&amp;!LUCID_A[x1]&amp;!LUCID_C[x1]&amp;BGRP0&amp;BGRP1)" trigger_type="10000100" monitor="LF:000|HF:000">
+      <AND>
+        <TriggerCondition multi="2" name="J15_x2" triggerthreshold="J15"/>
+        <NOT>
+          <TriggerCondition multi="1" name="LUCID_A_x1" triggerthreshold="LUCID_A"/>
+        </NOT>
+        <NOT>
+          <TriggerCondition multi="1" name="LUCID_C_x1" triggerthreshold="LUCID_C"/>
+        </NOT>
+        <InternalTrigger name="BGRP0"/>
+        <InternalTrigger name="BGRP1"/>
+      </AND>
+    </TriggerItem>
+    <TriggerItem ctpid="112" partition="1" name="L1_ZDC_A_C_BGRP7" complex_deadtime="0" definition="(ZDC_A[x1]&amp;ZDC_C[x1]&amp;BGRP0&amp;BGRP7)" trigger_type="10100000" monitor="LF:000|HF:000">
+      <AND>
+        <TriggerCondition multi="1" name="ZDC_A_x1" triggerthreshold="ZDC_A"/>
+        <TriggerCondition multi="1" name="ZDC_C_x1" triggerthreshold="ZDC_C"/>
+        <InternalTrigger name="BGRP0"/>
+        <InternalTrigger name="BGRP7"/>
+      </AND>
+    </TriggerItem>
     <TriggerItem ctpid="113" partition="1" name="L1_LUCID_UNPAIRED_ISO" complex_deadtime="0" definition="((LUCID_A[x1]|LUCID_C[x1])&amp;BGRP0&amp;BGRP4)" trigger_type="10100000" monitor="LF:000|HF:000">
       <AND>
         <OR>
@@ -808,12 +916,47 @@
         <InternalTrigger name="BGRP4"/>
       </AND>
     </TriggerItem>
+    <TriggerItem ctpid="114" partition="1" name="L1_TAU12_UNPAIRED_ISO" complex_deadtime="0" definition="(HA12[x1]&amp;BGRP0&amp;BGRP4)" trigger_type="10000100" monitor="LF:000|HF:000">
+      <AND>
+        <TriggerCondition multi="1" name="HA12_x1" triggerthreshold="HA12"/>
+        <InternalTrigger name="BGRP0"/>
+        <InternalTrigger name="BGRP4"/>
+      </AND>
+    </TriggerItem>
+    <TriggerItem ctpid="115" partition="1" name="L1_TAU12_UNPAIRED_NONISO" complex_deadtime="0" definition="(HA12[x1]&amp;BGRP0&amp;BGRP5)" trigger_type="10000100" monitor="LF:000|HF:000">
+      <AND>
+        <TriggerCondition multi="1" name="HA12_x1" triggerthreshold="HA12"/>
+        <InternalTrigger name="BGRP0"/>
+        <InternalTrigger name="BGRP5"/>
+      </AND>
+    </TriggerItem>
+    <TriggerItem ctpid="116" partition="1" name="L1_TAU12_EMPTY" complex_deadtime="0" definition="(HA12[x1]&amp;BGRP0&amp;BGRP3)" trigger_type="10000100" monitor="LF:000|HF:000">
+      <AND>
+        <TriggerCondition multi="1" name="HA12_x1" triggerthreshold="HA12"/>
+        <InternalTrigger name="BGRP0"/>
+        <InternalTrigger name="BGRP3"/>
+      </AND>
+    </TriggerItem>
     <TriggerItem ctpid="117" partition="1" name="L1_ZDC_A_C_UNPAIRED_ISO" complex_deadtime="0" definition="(ZDC_A[x1]&amp;ZDC_C[x1]&amp;BGRP0&amp;BGRP4)" trigger_type="10100000" monitor="LF:000|HF:000">
       <AND>
         <TriggerCondition multi="1" name="ZDC_A_x1" triggerthreshold="ZDC_A"/>
         <TriggerCondition multi="1" name="ZDC_C_x1" triggerthreshold="ZDC_C"/>
         <InternalTrigger name="BGRP0"/>
-        <InternalTrigger name="BGRP4"/>
+        <InternalTrigger name="BGRP4"/>
+      </AND>
+    </TriggerItem>
+    <TriggerItem ctpid="118" partition="1" name="L1_TAU12_FIRSTEMPTY" complex_deadtime="0" definition="(HA12[x1]&amp;BGRP0&amp;BGRP6)" trigger_type="10000100" monitor="LF:000|HF:000">
+      <AND>
+        <TriggerCondition multi="1" name="HA12_x1" triggerthreshold="HA12"/>
+        <InternalTrigger name="BGRP0"/>
+        <InternalTrigger name="BGRP6"/>
+      </AND>
+    </TriggerItem>
+    <TriggerItem ctpid="119" partition="1" name="L1_ZDC_AND_EMPTY" complex_deadtime="0" definition="(ZDC_AND[x1]&amp;BGRP0&amp;BGRP3)" trigger_type="10100000" monitor="LF:000|HF:000">
+      <AND>
+        <TriggerCondition multi="1" name="ZDC_AND_x1" triggerthreshold="ZDC_AND"/>
+        <InternalTrigger name="BGRP0"/>
+        <InternalTrigger name="BGRP3"/>
       </AND>
     </TriggerItem>
     <TriggerItem ctpid="120" partition="1" name="L1_MBTSA0" complex_deadtime="0" definition="(MBTS_A0[x1]&amp;BGRP0&amp;BGRP1)" trigger_type="10100000" monitor="LF:000|HF:000">
@@ -839,6 +982,13 @@
         <InternalTrigger name="BGRP1"/>
       </AND>
     </TriggerItem>
+    <TriggerItem ctpid="123" partition="1" name="L1_ZDC_AND_UNPAIRED_ISO" complex_deadtime="0" definition="(ZDC_AND[x1]&amp;BGRP0&amp;BGRP4)" trigger_type="10100000" monitor="LF:000|HF:000">
+      <AND>
+        <TriggerCondition multi="1" name="ZDC_AND_x1" triggerthreshold="ZDC_AND"/>
+        <InternalTrigger name="BGRP0"/>
+        <InternalTrigger name="BGRP4"/>
+      </AND>
+    </TriggerItem>
     <TriggerItem ctpid="124" partition="1" name="L1_2MU6_UNPAIRED_ISO" complex_deadtime="0" definition="(MU6[x2]&amp;BGRP0&amp;BGRP4)" trigger_type="10001000" monitor="LF:000|HF:000">
       <AND>
         <TriggerCondition multi="2" name="MU6_x2" triggerthreshold="MU6"/>
@@ -946,6 +1096,24 @@
         <InternalTrigger name="BGRP1"/>
       </AND>
     </TriggerItem>
+    <TriggerItem ctpid="139" partition="1" name="L1_ZDC_AND_UNPAIRED_NONISO" complex_deadtime="0" definition="(ZDC_AND[x1]&amp;BGRP0&amp;BGRP5)" trigger_type="10100000" monitor="LF:000|HF:000">
+      <AND>
+        <TriggerCondition multi="1" name="ZDC_AND_x1" triggerthreshold="ZDC_AND"/>
+        <InternalTrigger name="BGRP0"/>
+        <InternalTrigger name="BGRP5"/>
+      </AND>
+    </TriggerItem>
+    <TriggerItem ctpid="140" partition="1" name="L1_MLZ_A" complex_deadtime="0" definition="((MBTS_A[x1]|ZDC_A[x1]|LUCID_A[x1])&amp;BGRP0&amp;BGRP1)" trigger_type="10100000" monitor="LF:000|HF:000">
+      <AND>
+        <OR>
+          <TriggerCondition multi="1" name="MBTS_A_x1" triggerthreshold="MBTS_A"/>
+          <TriggerCondition multi="1" name="ZDC_A_x1" triggerthreshold="ZDC_A"/>
+          <TriggerCondition multi="1" name="LUCID_A_x1" triggerthreshold="LUCID_A"/>
+        </OR>
+        <InternalTrigger name="BGRP0"/>
+        <InternalTrigger name="BGRP1"/>
+      </AND>
+    </TriggerItem>
     <TriggerItem ctpid="141" partition="1" name="L1_TE12000" complex_deadtime="0" definition="(TE12000[x1]&amp;BGRP0&amp;BGRP1)" trigger_type="10000100" monitor="LF:000|HF:000">
       <AND>
         <TriggerCondition multi="1" name="TE12000_x1" triggerthreshold="TE12000"/>
@@ -1066,6 +1234,17 @@
         <InternalTrigger name="BGRP3"/>
       </AND>
     </TriggerItem>
+    <TriggerItem ctpid="152" partition="1" name="L1_MLZ_C" complex_deadtime="0" definition="((MBTS_C[x1]|ZDC_C[x1]|LUCID_C[x1])&amp;BGRP0&amp;BGRP1)" trigger_type="10100000" monitor="LF:000|HF:000">
+      <AND>
+        <OR>
+          <TriggerCondition multi="1" name="MBTS_C_x1" triggerthreshold="MBTS_C"/>
+          <TriggerCondition multi="1" name="ZDC_C_x1" triggerthreshold="ZDC_C"/>
+          <TriggerCondition multi="1" name="LUCID_C_x1" triggerthreshold="LUCID_C"/>
+        </OR>
+        <InternalTrigger name="BGRP0"/>
+        <InternalTrigger name="BGRP1"/>
+      </AND>
+    </TriggerItem>
     <TriggerItem ctpid="153" partition="1" name="L1_MBTSA4" complex_deadtime="0" definition="(MBTS_A4[x1]&amp;BGRP0&amp;BGRP1)" trigger_type="10100000" monitor="LF:000|HF:000">
       <AND>
         <TriggerCondition multi="1" name="MBTS_A4_x1" triggerthreshold="MBTS_A4"/>
@@ -1094,6 +1273,47 @@
         <InternalTrigger name="BGRP1"/>
       </AND>
     </TriggerItem>
+    <TriggerItem ctpid="157" partition="1" name="L1_MBLZ" complex_deadtime="0" definition="((((MBTS_A[x1]|ZDC_A[x1]|LUCID_A[x1])&amp;(MBTS_C[x1]|ZDC_C[x1]|LUCID_C[x1]))|BCM_Wide[x1])&amp;BGRP0&amp;BGRP1)" trigger_type="10100000" monitor="LF:000|HF:000">
+      <AND>
+        <OR>
+          <AND>
+            <OR>
+              <TriggerCondition multi="1" name="MBTS_A_x1" triggerthreshold="MBTS_A"/>
+              <TriggerCondition multi="1" name="ZDC_A_x1" triggerthreshold="ZDC_A"/>
+              <TriggerCondition multi="1" name="LUCID_A_x1" triggerthreshold="LUCID_A"/>
+            </OR>
+            <OR>
+              <TriggerCondition multi="1" name="MBTS_C_x1" triggerthreshold="MBTS_C"/>
+              <TriggerCondition multi="1" name="ZDC_C_x1" triggerthreshold="ZDC_C"/>
+              <TriggerCondition multi="1" name="LUCID_C_x1" triggerthreshold="LUCID_C"/>
+            </OR>
+          </AND>
+          <TriggerCondition multi="1" name="BCM_Wide_x1" triggerthreshold="BCM_Wide"/>
+        </OR>
+        <InternalTrigger name="BGRP0"/>
+        <InternalTrigger name="BGRP1"/>
+      </AND>
+    </TriggerItem>
+    <TriggerItem ctpid="158" partition="1" name="L1_J15.31ETA49" complex_deadtime="0" definition="(J15.31ETA49[x1]&amp;BGRP0&amp;BGRP1)" trigger_type="10000100" monitor="LF:000|HF:000">
+      <AND>
+        <TriggerCondition multi="1" name="J15.31ETA49_x1" triggerthreshold="J15.31ETA49"/>
+        <InternalTrigger name="BGRP0"/>
+        <InternalTrigger name="BGRP1"/>
+      </AND>
+    </TriggerItem>
+    <TriggerItem ctpid="159" partition="1" name="L1_J20.31ETA49" complex_deadtime="0" definition="(J20.31ETA49[x1]&amp;BGRP0&amp;BGRP1)" trigger_type="10000100" monitor="LF:000|HF:000">
+      <AND>
+        <TriggerCondition multi="1" name="J20.31ETA49_x1" triggerthreshold="J20.31ETA49"/>
+        <InternalTrigger name="BGRP0"/>
+        <InternalTrigger name="BGRP1"/>
+      </AND>
+    </TriggerItem>
+    <TriggerItem ctpid="160" partition="1" name="L1_BGRP0" complex_deadtime="0" definition="(RNDM0&amp;BGRP0)" trigger_type="10000001" monitor="LF:000|HF:000">
+      <AND>
+        <InternalTrigger name="RNDM0"/>
+        <InternalTrigger name="BGRP0"/>
+      </AND>
+    </TriggerItem>
     <TriggerItem ctpid="161" partition="1" name="L1_MBTSA8" complex_deadtime="0" definition="(MBTS_A8[x1]&amp;BGRP0&amp;BGRP1)" trigger_type="10100000" monitor="LF:000|HF:000">
       <AND>
         <TriggerCondition multi="1" name="MBTS_A8_x1" triggerthreshold="MBTS_A8"/>
@@ -1868,13 +2088,6 @@
         <InternalTrigger name="BGRP1"/>
       </AND>
     </TriggerItem>
-    <TriggerItem ctpid="299" partition="1" name="L1_TAU60" complex_deadtime="0" definition="(HA60[x1]&amp;BGRP0&amp;BGRP1)" trigger_type="10000100" monitor="LF:000|HF:000">
-      <AND>
-        <TriggerCondition multi="1" name="HA60_x1" triggerthreshold="HA60"/>
-        <InternalTrigger name="BGRP0"/>
-        <InternalTrigger name="BGRP1"/>
-      </AND>
-    </TriggerItem>
     <TriggerItem ctpid="300" partition="1" name="L1_EM20VH_FIRSTEMPTY" complex_deadtime="0" definition="(EM20VH[x1]&amp;BGRP0&amp;BGRP6)" trigger_type="10000100" monitor="LF:000|HF:000">
       <AND>
         <TriggerCondition multi="1" name="EM20VH_x1" triggerthreshold="EM20VH"/>
@@ -1910,6 +2123,23 @@
         <InternalTrigger name="BGRP1"/>
       </AND>
     </TriggerItem>
+    <TriggerItem ctpid="305" partition="1" name="L1_TE50_VTE600.0ETA49_PEB" complex_deadtime="0" definition="(TE50[x1]&amp;!TE600.0ETA49[x1]&amp;BGRP0&amp;BGRP1)" trigger_type="10000100" monitor="LF:000|HF:000">
+      <AND>
+        <TriggerCondition multi="1" name="TE50_x1" triggerthreshold="TE50"/>
+        <NOT>
+          <TriggerCondition multi="1" name="TE600.0ETA49_x1" triggerthreshold="TE600.0ETA49"/>
+        </NOT>
+        <InternalTrigger name="BGRP0"/>
+        <InternalTrigger name="BGRP1"/>
+      </AND>
+    </TriggerItem>
+    <TriggerItem ctpid="306" partition="1" name="L1_TE600.0ETA49_PEB" complex_deadtime="0" definition="(TE600.0ETA49[x1]&amp;BGRP0&amp;BGRP1)" trigger_type="10000100" monitor="LF:000|HF:000">
+      <AND>
+        <TriggerCondition multi="1" name="TE600.0ETA49_x1" triggerthreshold="TE600.0ETA49"/>
+        <InternalTrigger name="BGRP0"/>
+        <InternalTrigger name="BGRP1"/>
+      </AND>
+    </TriggerItem>
     <TriggerItem ctpid="307" partition="1" name="L1_J100_FIRSTEMPTY" complex_deadtime="0" definition="(J100[x1]&amp;BGRP0&amp;BGRP6)" trigger_type="10000100" monitor="LF:000|HF:000">
       <AND>
         <TriggerCondition multi="1" name="J100_x1" triggerthreshold="J100"/>
@@ -1952,10 +2182,10 @@
         <InternalTrigger name="BGRP3"/>
       </AND>
     </TriggerItem>
-    <TriggerItem ctpid="313" partition="1" name="L1_J40_XE50" complex_deadtime="0" definition="(J40[x1]&amp;XE50[x1]&amp;BGRP0&amp;BGRP1)" trigger_type="10000100" monitor="LF:000|HF:000">
+    <TriggerItem ctpid="313" partition="1" name="L1_J40_XE60" complex_deadtime="0" definition="(J40[x1]&amp;XE60[x1]&amp;BGRP0&amp;BGRP1)" trigger_type="10000100" monitor="LF:000|HF:000">
       <AND>
         <TriggerCondition multi="1" name="J40_x1" triggerthreshold="J40"/>
-        <TriggerCondition multi="1" name="XE50_x1" triggerthreshold="XE50"/>
+        <TriggerCondition multi="1" name="XE60_x1" triggerthreshold="XE60"/>
         <InternalTrigger name="BGRP0"/>
         <InternalTrigger name="BGRP1"/>
       </AND>
@@ -2052,9 +2282,9 @@
         <InternalTrigger name="BGRP1"/>
       </AND>
     </TriggerItem>
-    <TriggerItem ctpid="326" partition="1" name="L1_TE500.0ETA49" complex_deadtime="0" definition="(TE500.0ETA49[x1]&amp;BGRP0&amp;BGRP1)" trigger_type="10000100" monitor="LF:000|HF:000">
+    <TriggerItem ctpid="326" partition="1" name="L1_TE600.0ETA49" complex_deadtime="0" definition="(TE600.0ETA49[x1]&amp;BGRP0&amp;BGRP1)" trigger_type="10000100" monitor="LF:000|HF:000">
       <AND>
-        <TriggerCondition multi="1" name="TE500.0ETA49_x1" triggerthreshold="TE500.0ETA49"/>
+        <TriggerCondition multi="1" name="TE600.0ETA49_x1" triggerthreshold="TE600.0ETA49"/>
         <InternalTrigger name="BGRP0"/>
         <InternalTrigger name="BGRP1"/>
       </AND>
@@ -2094,102 +2324,345 @@
         <InternalTrigger name="BGRP1"/>
       </AND>
     </TriggerItem>
-    <TriggerItem ctpid="333" partition="1" name="L1_TE9000.0ETA49" complex_deadtime="0" definition="(TE9000.0ETA49[x1]&amp;BGRP0&amp;BGRP1)" trigger_type="10000100" monitor="LF:000|HF:000">
+    <TriggerItem ctpid="333" partition="1" name="L1_TE3.0ETA49" complex_deadtime="0" definition="(TE3.0ETA49[x1]&amp;BGRP0&amp;BGRP1)" trigger_type="10000100" monitor="LF:000|HF:000">
+      <AND>
+        <TriggerCondition multi="1" name="TE3.0ETA49_x1" triggerthreshold="TE3.0ETA49"/>
+        <InternalTrigger name="BGRP0"/>
+        <InternalTrigger name="BGRP1"/>
+      </AND>
+    </TriggerItem>
+    <TriggerItem ctpid="334" partition="1" name="L1_TE50_VTE600.0ETA49" complex_deadtime="0" definition="(TE50[x1]&amp;!TE600.0ETA49[x1]&amp;BGRP0&amp;BGRP1)" trigger_type="10000100" monitor="LF:000|HF:000">
+      <AND>
+        <TriggerCondition multi="1" name="TE50_x1" triggerthreshold="TE50"/>
+        <NOT>
+          <TriggerCondition multi="1" name="TE600.0ETA49_x1" triggerthreshold="TE600.0ETA49"/>
+        </NOT>
+        <InternalTrigger name="BGRP0"/>
+        <InternalTrigger name="BGRP1"/>
+      </AND>
+    </TriggerItem>
+    <TriggerItem ctpid="335" partition="1" name="L1_TE5_VTE200" complex_deadtime="0" definition="(TE5[x1]&amp;!TE200[x1]&amp;BGRP0&amp;BGRP1)" trigger_type="10000100" monitor="LF:000|HF:000">
+      <AND>
+        <TriggerCondition multi="1" name="TE5_x1" triggerthreshold="TE5"/>
+        <NOT>
+          <TriggerCondition multi="1" name="TE200_x1" triggerthreshold="TE200"/>
+        </NOT>
+        <InternalTrigger name="BGRP0"/>
+        <InternalTrigger name="BGRP1"/>
+      </AND>
+    </TriggerItem>
+    <TriggerItem ctpid="336" partition="1" name="L1_TE600.0ETA49_OVERLAY" complex_deadtime="0" definition="(TE600.0ETA49[x1]&amp;BGRP0&amp;BGRP1)" trigger_type="10000010" monitor="LF:000|HF:000">
+      <AND>
+        <TriggerCondition multi="1" name="TE600.0ETA49_x1" triggerthreshold="TE600.0ETA49"/>
+        <InternalTrigger name="BGRP0"/>
+        <InternalTrigger name="BGRP1"/>
+      </AND>
+    </TriggerItem>
+    <TriggerItem ctpid="337" partition="1" name="L1_TE1500.0ETA49_OVERLAY" complex_deadtime="0" definition="(TE1500.0ETA49[x1]&amp;BGRP0&amp;BGRP1)" trigger_type="10000010" monitor="LF:000|HF:000">
+      <AND>
+        <TriggerCondition multi="1" name="TE1500.0ETA49_x1" triggerthreshold="TE1500.0ETA49"/>
+        <InternalTrigger name="BGRP0"/>
+        <InternalTrigger name="BGRP1"/>
+      </AND>
+    </TriggerItem>
+    <TriggerItem ctpid="338" partition="1" name="L1_TE3000.0ETA49_OVERLAY" complex_deadtime="0" definition="(TE3000.0ETA49[x1]&amp;BGRP0&amp;BGRP1)" trigger_type="10000010" monitor="LF:000|HF:000">
+      <AND>
+        <TriggerCondition multi="1" name="TE3000.0ETA49_x1" triggerthreshold="TE3000.0ETA49"/>
+        <InternalTrigger name="BGRP0"/>
+        <InternalTrigger name="BGRP1"/>
+      </AND>
+    </TriggerItem>
+    <TriggerItem ctpid="339" partition="1" name="L1_TE3500.0ETA49_OVERLAY" complex_deadtime="0" definition="(TE3500.0ETA49[x1]&amp;BGRP0&amp;BGRP1)" trigger_type="10000010" monitor="LF:000|HF:000">
+      <AND>
+        <TriggerCondition multi="1" name="TE3500.0ETA49_x1" triggerthreshold="TE3500.0ETA49"/>
+        <InternalTrigger name="BGRP0"/>
+        <InternalTrigger name="BGRP1"/>
+      </AND>
+    </TriggerItem>
+    <TriggerItem ctpid="342" partition="1" name="L1_TE8000.0ETA49_OVERLAY" complex_deadtime="0" definition="(TE8000.0ETA49[x1]&amp;BGRP0&amp;BGRP1)" trigger_type="10000010" monitor="LF:000|HF:000">
+      <AND>
+        <TriggerCondition multi="1" name="TE8000.0ETA49_x1" triggerthreshold="TE8000.0ETA49"/>
+        <InternalTrigger name="BGRP0"/>
+        <InternalTrigger name="BGRP1"/>
+      </AND>
+    </TriggerItem>
+    <TriggerItem ctpid="343" partition="1" name="L1_TE7.0ETA49" complex_deadtime="0" definition="(TE7.0ETA49[x1]&amp;BGRP0&amp;BGRP1)" trigger_type="10000100" monitor="LF:000|HF:000">
+      <AND>
+        <TriggerCondition multi="1" name="TE7.0ETA49_x1" triggerthreshold="TE7.0ETA49"/>
+        <InternalTrigger name="BGRP0"/>
+        <InternalTrigger name="BGRP1"/>
+      </AND>
+    </TriggerItem>
+    <TriggerItem ctpid="344" partition="1" name="L1_EM8" complex_deadtime="0" definition="(EM8[x1]&amp;BGRP0&amp;BGRP1)" trigger_type="10000100" monitor="LF:000|HF:000">
+      <AND>
+        <TriggerCondition multi="1" name="EM8_x1" triggerthreshold="EM8"/>
+        <InternalTrigger name="BGRP0"/>
+        <InternalTrigger name="BGRP1"/>
+      </AND>
+    </TriggerItem>
+    <TriggerItem ctpid="345" partition="1" name="L1_2EM7" complex_deadtime="0" definition="(EM7[x2]&amp;BGRP0&amp;BGRP1)" trigger_type="10000100" monitor="LF:000|HF:000">
+      <AND>
+        <TriggerCondition multi="2" name="EM7_x2" triggerthreshold="EM7"/>
+        <InternalTrigger name="BGRP0"/>
+        <InternalTrigger name="BGRP1"/>
+      </AND>
+    </TriggerItem>
+    <TriggerItem ctpid="346" partition="1" name="L1_TE5_VTE100" complex_deadtime="0" definition="(TE5[x1]&amp;!TE100[x1]&amp;BGRP0&amp;BGRP1)" trigger_type="10000100" monitor="LF:000|HF:000">
+      <AND>
+        <TriggerCondition multi="1" name="TE5_x1" triggerthreshold="TE5"/>
+        <NOT>
+          <TriggerCondition multi="1" name="TE100_x1" triggerthreshold="TE100"/>
+        </NOT>
+        <InternalTrigger name="BGRP0"/>
+        <InternalTrigger name="BGRP1"/>
+      </AND>
+    </TriggerItem>
+    <TriggerItem ctpid="347" partition="1" name="L1_TE5_VTE50" complex_deadtime="0" definition="(TE5[x1]&amp;!TE50[x1]&amp;BGRP0&amp;BGRP1)" trigger_type="10000100" monitor="LF:000|HF:000">
+      <AND>
+        <TriggerCondition multi="1" name="TE5_x1" triggerthreshold="TE5"/>
+        <NOT>
+          <TriggerCondition multi="1" name="TE50_x1" triggerthreshold="TE50"/>
+        </NOT>
+        <InternalTrigger name="BGRP0"/>
+        <InternalTrigger name="BGRP1"/>
+      </AND>
+    </TriggerItem>
+    <TriggerItem ctpid="348" partition="1" name="L1_TE4_VTE200" complex_deadtime="0" definition="(TE4[x1]&amp;!TE200[x1]&amp;BGRP0&amp;BGRP1)" trigger_type="10000100" monitor="LF:000|HF:000">
+      <AND>
+        <TriggerCondition multi="1" name="TE4_x1" triggerthreshold="TE4"/>
+        <NOT>
+          <TriggerCondition multi="1" name="TE200_x1" triggerthreshold="TE200"/>
+        </NOT>
+        <InternalTrigger name="BGRP0"/>
+        <InternalTrigger name="BGRP1"/>
+      </AND>
+    </TriggerItem>
+    <TriggerItem ctpid="349" partition="1" name="L1_TE4_VTE100" complex_deadtime="0" definition="(TE4[x1]&amp;!TE100[x1]&amp;BGRP0&amp;BGRP1)" trigger_type="10000100" monitor="LF:000|HF:000">
+      <AND>
+        <TriggerCondition multi="1" name="TE4_x1" triggerthreshold="TE4"/>
+        <NOT>
+          <TriggerCondition multi="1" name="TE100_x1" triggerthreshold="TE100"/>
+        </NOT>
+        <InternalTrigger name="BGRP0"/>
+        <InternalTrigger name="BGRP1"/>
+      </AND>
+    </TriggerItem>
+    <TriggerItem ctpid="350" partition="1" name="L1_TE4_VTE50" complex_deadtime="0" definition="(TE4[x1]&amp;!TE50[x1]&amp;BGRP0&amp;BGRP1)" trigger_type="10000100" monitor="LF:000|HF:000">
+      <AND>
+        <TriggerCondition multi="1" name="TE4_x1" triggerthreshold="TE4"/>
+        <NOT>
+          <TriggerCondition multi="1" name="TE50_x1" triggerthreshold="TE50"/>
+        </NOT>
+        <InternalTrigger name="BGRP0"/>
+        <InternalTrigger name="BGRP1"/>
+      </AND>
+    </TriggerItem>
+    <TriggerItem ctpid="351" partition="1" name="L1_2TAU2_VTE50" complex_deadtime="0" definition="(HA2[x2]&amp;!TE50[x1]&amp;BGRP0&amp;BGRP1)" trigger_type="10000100" monitor="LF:000|HF:000">
+      <AND>
+        <TriggerCondition multi="2" name="HA2_x2" triggerthreshold="HA2"/>
+        <NOT>
+          <TriggerCondition multi="1" name="TE50_x1" triggerthreshold="TE50"/>
+        </NOT>
+        <InternalTrigger name="BGRP0"/>
+        <InternalTrigger name="BGRP1"/>
+      </AND>
+    </TriggerItem>
+    <TriggerItem ctpid="352" partition="1" name="L1_2TAU3_VTE50" complex_deadtime="0" definition="(HA3[x2]&amp;!TE50[x1]&amp;BGRP0&amp;BGRP1)" trigger_type="10000100" monitor="LF:000|HF:000">
+      <AND>
+        <TriggerCondition multi="2" name="HA3_x2" triggerthreshold="HA3"/>
+        <NOT>
+          <TriggerCondition multi="1" name="TE50_x1" triggerthreshold="TE50"/>
+        </NOT>
+        <InternalTrigger name="BGRP0"/>
+        <InternalTrigger name="BGRP1"/>
+      </AND>
+    </TriggerItem>
+    <TriggerItem ctpid="353" partition="1" name="L1_2TAU2_VTE100" complex_deadtime="0" definition="(HA2[x2]&amp;!TE100[x1]&amp;BGRP0&amp;BGRP1)" trigger_type="10000100" monitor="LF:000|HF:000">
+      <AND>
+        <TriggerCondition multi="2" name="HA2_x2" triggerthreshold="HA2"/>
+        <NOT>
+          <TriggerCondition multi="1" name="TE100_x1" triggerthreshold="TE100"/>
+        </NOT>
+        <InternalTrigger name="BGRP0"/>
+        <InternalTrigger name="BGRP1"/>
+      </AND>
+    </TriggerItem>
+    <TriggerItem ctpid="354" partition="1" name="L1_2TAU3_VTE100" complex_deadtime="0" definition="(HA3[x2]&amp;!TE100[x1]&amp;BGRP0&amp;BGRP1)" trigger_type="10000100" monitor="LF:000|HF:000">
+      <AND>
+        <TriggerCondition multi="2" name="HA3_x2" triggerthreshold="HA3"/>
+        <NOT>
+          <TriggerCondition multi="1" name="TE100_x1" triggerthreshold="TE100"/>
+        </NOT>
+        <InternalTrigger name="BGRP0"/>
+        <InternalTrigger name="BGRP1"/>
+      </AND>
+    </TriggerItem>
+    <TriggerItem ctpid="355" partition="1" name="L1_2TAU2_VTE200" complex_deadtime="0" definition="(HA2[x2]&amp;!TE200[x1]&amp;BGRP0&amp;BGRP1)" trigger_type="10000100" monitor="LF:000|HF:000">
+      <AND>
+        <TriggerCondition multi="2" name="HA2_x2" triggerthreshold="HA2"/>
+        <NOT>
+          <TriggerCondition multi="1" name="TE200_x1" triggerthreshold="TE200"/>
+        </NOT>
+        <InternalTrigger name="BGRP0"/>
+        <InternalTrigger name="BGRP1"/>
+      </AND>
+    </TriggerItem>
+    <TriggerItem ctpid="356" partition="1" name="L1_2TAU3_VTE200" complex_deadtime="0" definition="(HA3[x2]&amp;!TE200[x1]&amp;BGRP0&amp;BGRP1)" trigger_type="10000100" monitor="LF:000|HF:000">
       <AND>
-        <TriggerCondition multi="1" name="TE9000.0ETA49_x1" triggerthreshold="TE9000.0ETA49"/>
+        <TriggerCondition multi="2" name="HA3_x2" triggerthreshold="HA3"/>
+        <NOT>
+          <TriggerCondition multi="1" name="TE200_x1" triggerthreshold="TE200"/>
+        </NOT>
         <InternalTrigger name="BGRP0"/>
         <InternalTrigger name="BGRP1"/>
       </AND>
     </TriggerItem>
-    <TriggerItem ctpid="335" partition="1" name="L1_TE5_VTE200" complex_deadtime="0" definition="(TE5[x1]&amp;!TE200[x1]&amp;BGRP0&amp;BGRP1)" trigger_type="10000100" monitor="LF:000|HF:000">
+    <TriggerItem ctpid="357" partition="1" name="L1_XE60" complex_deadtime="0" definition="(XE60[x1]&amp;BGRP0&amp;BGRP1)" trigger_type="10000100" monitor="LF:000|HF:000">
       <AND>
-        <TriggerCondition multi="1" name="TE5_x1" triggerthreshold="TE5"/>
-        <NOT>
-          <TriggerCondition multi="1" name="TE200_x1" triggerthreshold="TE200"/>
-        </NOT>
+        <TriggerCondition multi="1" name="XE60_x1" triggerthreshold="XE60"/>
         <InternalTrigger name="BGRP0"/>
         <InternalTrigger name="BGRP1"/>
       </AND>
     </TriggerItem>
-    <TriggerItem ctpid="336" partition="1" name="L1_TE500.0ETA49_OVERLAY" complex_deadtime="0" definition="(TE500.0ETA49[x1]&amp;BGRP0&amp;BGRP1)" trigger_type="10000010" monitor="LF:000|HF:000">
+    <TriggerItem ctpid="358" partition="1" name="L1_XE70" complex_deadtime="0" definition="(XE70[x1]&amp;BGRP0&amp;BGRP1)" trigger_type="10000100" monitor="LF:000|HF:000">
       <AND>
-        <TriggerCondition multi="1" name="TE500.0ETA49_x1" triggerthreshold="TE500.0ETA49"/>
+        <TriggerCondition multi="1" name="XE70_x1" triggerthreshold="XE70"/>
         <InternalTrigger name="BGRP0"/>
         <InternalTrigger name="BGRP1"/>
       </AND>
     </TriggerItem>
-    <TriggerItem ctpid="337" partition="1" name="L1_TE1500.0ETA49_OVERLAY" complex_deadtime="0" definition="(TE1500.0ETA49[x1]&amp;BGRP0&amp;BGRP1)" trigger_type="10000010" monitor="LF:000|HF:000">
+    <TriggerItem ctpid="359" partition="1" name="L1_XE80" complex_deadtime="0" definition="(XE80[x1]&amp;BGRP0&amp;BGRP1)" trigger_type="10000100" monitor="LF:000|HF:000">
       <AND>
-        <TriggerCondition multi="1" name="TE1500.0ETA49_x1" triggerthreshold="TE1500.0ETA49"/>
+        <TriggerCondition multi="1" name="XE80_x1" triggerthreshold="XE80"/>
         <InternalTrigger name="BGRP0"/>
         <InternalTrigger name="BGRP1"/>
       </AND>
     </TriggerItem>
-    <TriggerItem ctpid="338" partition="1" name="L1_TE3000.0ETA49_OVERLAY" complex_deadtime="0" definition="(TE3000.0ETA49[x1]&amp;BGRP0&amp;BGRP1)" trigger_type="10000010" monitor="LF:000|HF:000">
+    <TriggerItem ctpid="470" partition="1" name="L1_MBTS_1_ZDC_A_VZDC_C_VTE200" complex_deadtime="0" definition="((MBTS_A[x1]|MBTS_C[x1])&amp;ZDC_A[x1]&amp;!ZDC_C[x1]&amp;!TE200[x1]&amp;BGRP0&amp;BGRP1)" trigger_type="10100000" monitor="LF:000|HF:000">
       <AND>
-        <TriggerCondition multi="1" name="TE3000.0ETA49_x1" triggerthreshold="TE3000.0ETA49"/>
+        <OR>
+          <TriggerCondition multi="1" name="MBTS_A_x1" triggerthreshold="MBTS_A"/>
+          <TriggerCondition multi="1" name="MBTS_C_x1" triggerthreshold="MBTS_C"/>
+        </OR>
+        <TriggerCondition multi="1" name="ZDC_A_x1" triggerthreshold="ZDC_A"/>
+        <NOT>
+          <TriggerCondition multi="1" name="ZDC_C_x1" triggerthreshold="ZDC_C"/>
+        </NOT>
+        <NOT>
+          <TriggerCondition multi="1" name="TE200_x1" triggerthreshold="TE200"/>
+        </NOT>
         <InternalTrigger name="BGRP0"/>
         <InternalTrigger name="BGRP1"/>
       </AND>
     </TriggerItem>
-    <TriggerItem ctpid="339" partition="1" name="L1_TE3500.0ETA49_OVERLAY" complex_deadtime="0" definition="(TE3500.0ETA49[x1]&amp;BGRP0&amp;BGRP1)" trigger_type="10000010" monitor="LF:000|HF:000">
+    <TriggerItem ctpid="471" partition="1" name="L1_MBTS_1_ZDC_C_VZDC_A_VTE200" complex_deadtime="0" definition="((MBTS_A[x1]|MBTS_C[x1])&amp;ZDC_C[x1]&amp;!ZDC_A[x1]&amp;!TE200[x1]&amp;BGRP0&amp;BGRP1)" trigger_type="10100000" monitor="LF:000|HF:000">
       <AND>
-        <TriggerCondition multi="1" name="TE3500.0ETA49_x1" triggerthreshold="TE3500.0ETA49"/>
+        <OR>
+          <TriggerCondition multi="1" name="MBTS_A_x1" triggerthreshold="MBTS_A"/>
+          <TriggerCondition multi="1" name="MBTS_C_x1" triggerthreshold="MBTS_C"/>
+        </OR>
+        <TriggerCondition multi="1" name="ZDC_C_x1" triggerthreshold="ZDC_C"/>
+        <NOT>
+          <TriggerCondition multi="1" name="ZDC_A_x1" triggerthreshold="ZDC_A"/>
+        </NOT>
+        <NOT>
+          <TriggerCondition multi="1" name="TE200_x1" triggerthreshold="TE200"/>
+        </NOT>
         <InternalTrigger name="BGRP0"/>
         <InternalTrigger name="BGRP1"/>
       </AND>
     </TriggerItem>
-    <TriggerItem ctpid="342" partition="1" name="L1_TE8000.0ETA49_OVERLAY" complex_deadtime="0" definition="(TE8000.0ETA49[x1]&amp;BGRP0&amp;BGRP1)" trigger_type="10000010" monitor="LF:000|HF:000">
+    <TriggerItem ctpid="472" partition="1" name="L1_TE4_ZDC_A_VZDC_C_VTE200" complex_deadtime="0" definition="(TE4[x1]&amp;ZDC_A[x1]&amp;!ZDC_C[x1]&amp;!TE200[x1]&amp;BGRP0&amp;BGRP1)" trigger_type="10100000" monitor="LF:000|HF:000">
       <AND>
-        <TriggerCondition multi="1" name="TE8000.0ETA49_x1" triggerthreshold="TE8000.0ETA49"/>
+        <TriggerCondition multi="1" name="TE4_x1" triggerthreshold="TE4"/>
+        <TriggerCondition multi="1" name="ZDC_A_x1" triggerthreshold="ZDC_A"/>
+        <NOT>
+          <TriggerCondition multi="1" name="ZDC_C_x1" triggerthreshold="ZDC_C"/>
+        </NOT>
+        <NOT>
+          <TriggerCondition multi="1" name="TE200_x1" triggerthreshold="TE200"/>
+        </NOT>
         <InternalTrigger name="BGRP0"/>
         <InternalTrigger name="BGRP1"/>
       </AND>
     </TriggerItem>
-    <TriggerItem ctpid="343" partition="1" name="L1_TE9000.0ETA49_OVERLAY" complex_deadtime="0" definition="(TE9000.0ETA49[x1]&amp;BGRP0&amp;BGRP1)" trigger_type="10000010" monitor="LF:000|HF:000">
+    <TriggerItem ctpid="473" partition="1" name="L1_TE4_ZDC_C_VZDC_A_VTE200" complex_deadtime="0" definition="(TE4[x1]&amp;ZDC_C[x1]&amp;!ZDC_A[x1]&amp;!TE200[x1]&amp;BGRP0&amp;BGRP1)" trigger_type="10100000" monitor="LF:000|HF:000">
       <AND>
-        <TriggerCondition multi="1" name="TE9000.0ETA49_x1" triggerthreshold="TE9000.0ETA49"/>
+        <TriggerCondition multi="1" name="TE4_x1" triggerthreshold="TE4"/>
+        <TriggerCondition multi="1" name="ZDC_C_x1" triggerthreshold="ZDC_C"/>
+        <NOT>
+          <TriggerCondition multi="1" name="ZDC_A_x1" triggerthreshold="ZDC_A"/>
+        </NOT>
+        <NOT>
+          <TriggerCondition multi="1" name="TE200_x1" triggerthreshold="TE200"/>
+        </NOT>
         <InternalTrigger name="BGRP0"/>
         <InternalTrigger name="BGRP1"/>
       </AND>
     </TriggerItem>
-    <TriggerItem ctpid="344" partition="1" name="L1_EM8" complex_deadtime="0" definition="(EM8[x1]&amp;BGRP0&amp;BGRP1)" trigger_type="10000100" monitor="LF:000|HF:000">
+    <TriggerItem ctpid="474" partition="1" name="L1_TE3.0ETA49_ZDC_A_VZDC_C_VTE200" complex_deadtime="0" definition="(TE3.0ETA49[x1]&amp;ZDC_A[x1]&amp;!ZDC_C[x1]&amp;!TE200[x1]&amp;BGRP0&amp;BGRP1)" trigger_type="10100000" monitor="LF:000|HF:000">
       <AND>
-        <TriggerCondition multi="1" name="EM8_x1" triggerthreshold="EM8"/>
+        <TriggerCondition multi="1" name="TE3.0ETA49_x1" triggerthreshold="TE3.0ETA49"/>
+        <TriggerCondition multi="1" name="ZDC_A_x1" triggerthreshold="ZDC_A"/>
+        <NOT>
+          <TriggerCondition multi="1" name="ZDC_C_x1" triggerthreshold="ZDC_C"/>
+        </NOT>
+        <NOT>
+          <TriggerCondition multi="1" name="TE200_x1" triggerthreshold="TE200"/>
+        </NOT>
         <InternalTrigger name="BGRP0"/>
         <InternalTrigger name="BGRP1"/>
       </AND>
     </TriggerItem>
-    <TriggerItem ctpid="345" partition="1" name="L1_2EM7" complex_deadtime="0" definition="(EM7[x2]&amp;BGRP0&amp;BGRP1)" trigger_type="10000100" monitor="LF:000|HF:000">
+    <TriggerItem ctpid="475" partition="1" name="L1_TE3.0ETA49_ZDC_C_VZDC_A_VTE200" complex_deadtime="0" definition="(TE3.0ETA49[x1]&amp;ZDC_C[x1]&amp;!ZDC_A[x1]&amp;!TE200[x1]&amp;BGRP0&amp;BGRP1)" trigger_type="10100000" monitor="LF:000|HF:000">
       <AND>
-        <TriggerCondition multi="2" name="EM7_x2" triggerthreshold="EM7"/>
+        <TriggerCondition multi="1" name="TE3.0ETA49_x1" triggerthreshold="TE3.0ETA49"/>
+        <TriggerCondition multi="1" name="ZDC_C_x1" triggerthreshold="ZDC_C"/>
+        <NOT>
+          <TriggerCondition multi="1" name="ZDC_A_x1" triggerthreshold="ZDC_A"/>
+        </NOT>
+        <NOT>
+          <TriggerCondition multi="1" name="TE200_x1" triggerthreshold="TE200"/>
+        </NOT>
         <InternalTrigger name="BGRP0"/>
         <InternalTrigger name="BGRP1"/>
       </AND>
     </TriggerItem>
-    <TriggerItem ctpid="346" partition="1" name="L1_TE5_VTE100" complex_deadtime="0" definition="(TE5[x1]&amp;!TE100[x1]&amp;BGRP0&amp;BGRP1)" trigger_type="10000100" monitor="LF:000|HF:000">
+    <TriggerItem ctpid="476" partition="1" name="L1_TE5_ZDC_A_VZDC_C_VTE200" complex_deadtime="0" definition="(TE5[x1]&amp;ZDC_A[x1]&amp;!ZDC_C[x1]&amp;!TE200[x1]&amp;BGRP0&amp;BGRP1)" trigger_type="10100000" monitor="LF:000|HF:000">
       <AND>
         <TriggerCondition multi="1" name="TE5_x1" triggerthreshold="TE5"/>
+        <TriggerCondition multi="1" name="ZDC_A_x1" triggerthreshold="ZDC_A"/>
         <NOT>
-          <TriggerCondition multi="1" name="TE100_x1" triggerthreshold="TE100"/>
+          <TriggerCondition multi="1" name="ZDC_C_x1" triggerthreshold="ZDC_C"/>
+        </NOT>
+        <NOT>
+          <TriggerCondition multi="1" name="TE200_x1" triggerthreshold="TE200"/>
         </NOT>
         <InternalTrigger name="BGRP0"/>
         <InternalTrigger name="BGRP1"/>
       </AND>
     </TriggerItem>
-    <TriggerItem ctpid="347" partition="1" name="L1_TE5_VTE50" complex_deadtime="0" definition="(TE5[x1]&amp;!TE50[x1]&amp;BGRP0&amp;BGRP1)" trigger_type="10000100" monitor="LF:000|HF:000">
+    <TriggerItem ctpid="477" partition="1" name="L1_TE5_ZDC_C_VZDC_A_VTE200" complex_deadtime="0" definition="(TE5[x1]&amp;ZDC_C[x1]&amp;!ZDC_A[x1]&amp;!TE200[x1]&amp;BGRP0&amp;BGRP1)" trigger_type="10100000" monitor="LF:000|HF:000">
       <AND>
         <TriggerCondition multi="1" name="TE5_x1" triggerthreshold="TE5"/>
+        <TriggerCondition multi="1" name="ZDC_C_x1" triggerthreshold="ZDC_C"/>
         <NOT>
-          <TriggerCondition multi="1" name="TE50_x1" triggerthreshold="TE50"/>
+          <TriggerCondition multi="1" name="ZDC_A_x1" triggerthreshold="ZDC_A"/>
+        </NOT>
+        <NOT>
+          <TriggerCondition multi="1" name="TE200_x1" triggerthreshold="TE200"/>
         </NOT>
         <InternalTrigger name="BGRP0"/>
         <InternalTrigger name="BGRP1"/>
       </AND>
     </TriggerItem>
-    <TriggerItem ctpid="348" partition="1" name="L1_TE4_VTE200" complex_deadtime="0" definition="(TE4[x1]&amp;!TE200[x1]&amp;BGRP0&amp;BGRP1)" trigger_type="10000100" monitor="LF:000|HF:000">
+    <TriggerItem ctpid="478" partition="1" name="L1_TE7.0ETA49_ZDC_A_VZDC_C_VTE200" complex_deadtime="0" definition="(TE7.0ETA49[x1]&amp;ZDC_A[x1]&amp;!ZDC_C[x1]&amp;!TE200[x1]&amp;BGRP0&amp;BGRP1)" trigger_type="10100000" monitor="LF:000|HF:000">
       <AND>
-        <TriggerCondition multi="1" name="TE4_x1" triggerthreshold="TE4"/>
+        <TriggerCondition multi="1" name="TE7.0ETA49_x1" triggerthreshold="TE7.0ETA49"/>
+        <TriggerCondition multi="1" name="ZDC_A_x1" triggerthreshold="ZDC_A"/>
+        <NOT>
+          <TriggerCondition multi="1" name="ZDC_C_x1" triggerthreshold="ZDC_C"/>
+        </NOT>
         <NOT>
           <TriggerCondition multi="1" name="TE200_x1" triggerthreshold="TE200"/>
         </NOT>
@@ -2197,19 +2670,28 @@
         <InternalTrigger name="BGRP1"/>
       </AND>
     </TriggerItem>
-    <TriggerItem ctpid="349" partition="1" name="L1_TE4_VTE100" complex_deadtime="0" definition="(TE4[x1]&amp;!TE100[x1]&amp;BGRP0&amp;BGRP1)" trigger_type="10000100" monitor="LF:000|HF:000">
+    <TriggerItem ctpid="479" partition="1" name="L1_TE7.0ETA49_ZDC_C_VZDC_A_VTE200" complex_deadtime="0" definition="(TE7.0ETA49[x1]&amp;ZDC_C[x1]&amp;!ZDC_A[x1]&amp;!TE200[x1]&amp;BGRP0&amp;BGRP1)" trigger_type="10100000" monitor="LF:000|HF:000">
       <AND>
-        <TriggerCondition multi="1" name="TE4_x1" triggerthreshold="TE4"/>
+        <TriggerCondition multi="1" name="TE7.0ETA49_x1" triggerthreshold="TE7.0ETA49"/>
+        <TriggerCondition multi="1" name="ZDC_C_x1" triggerthreshold="ZDC_C"/>
         <NOT>
-          <TriggerCondition multi="1" name="TE100_x1" triggerthreshold="TE100"/>
+          <TriggerCondition multi="1" name="ZDC_A_x1" triggerthreshold="ZDC_A"/>
+        </NOT>
+        <NOT>
+          <TriggerCondition multi="1" name="TE200_x1" triggerthreshold="TE200"/>
         </NOT>
         <InternalTrigger name="BGRP0"/>
         <InternalTrigger name="BGRP1"/>
       </AND>
     </TriggerItem>
-    <TriggerItem ctpid="350" partition="1" name="L1_TE4_VTE50" complex_deadtime="0" definition="(TE4[x1]&amp;!TE50[x1]&amp;BGRP0&amp;BGRP1)" trigger_type="10000100" monitor="LF:000|HF:000">
+    <TriggerItem ctpid="480" partition="1" name="L1_VZDC_A_C_VTE50" complex_deadtime="0" definition="(!ZDC_A[x1]&amp;!ZDC_C[x1]&amp;!TE50[x1]&amp;BGRP0&amp;BGRP1)" trigger_type="10100000" monitor="LF:000|HF:000">
       <AND>
-        <TriggerCondition multi="1" name="TE4_x1" triggerthreshold="TE4"/>
+        <NOT>
+          <TriggerCondition multi="1" name="ZDC_A_x1" triggerthreshold="ZDC_A"/>
+        </NOT>
+        <NOT>
+          <TriggerCondition multi="1" name="ZDC_C_x1" triggerthreshold="ZDC_C"/>
+        </NOT>
         <NOT>
           <TriggerCondition multi="1" name="TE50_x1" triggerthreshold="TE50"/>
         </NOT>
@@ -2609,52 +3091,52 @@
     <Prescale ctpid="75" cut="000001" value="1"/>
     <Prescale ctpid="76" cut="000001" value="1"/>
     <Prescale ctpid="77" cut="000001" value="1"/>
-    <Prescale ctpid="78" cut="-000001" value="-1"/>
-    <Prescale ctpid="79" cut="-000001" value="-1"/>
+    <Prescale ctpid="78" cut="000001" value="1"/>
+    <Prescale ctpid="79" cut="000001" value="1"/>
     <Prescale ctpid="80" cut="000001" value="1"/>
     <Prescale ctpid="81" cut="000001" value="1"/>
     <Prescale ctpid="82" cut="000001" value="1"/>
-    <Prescale ctpid="83" cut="-000001" value="-1"/>
+    <Prescale ctpid="83" cut="000001" value="1"/>
     <Prescale ctpid="84" cut="000001" value="1"/>
     <Prescale ctpid="85" cut="000001" value="1"/>
     <Prescale ctpid="86" cut="000001" value="1"/>
     <Prescale ctpid="87" cut="000001" value="1"/>
     <Prescale ctpid="88" cut="000001" value="1"/>
-    <Prescale ctpid="89" cut="-000001" value="-1"/>
+    <Prescale ctpid="89" cut="000001" value="1"/>
     <Prescale ctpid="90" cut="000001" value="1"/>
     <Prescale ctpid="91" cut="000001" value="1"/>
     <Prescale ctpid="92" cut="000001" value="1"/>
     <Prescale ctpid="93" cut="000001" value="1"/>
-    <Prescale ctpid="94" cut="-000001" value="-1"/>
+    <Prescale ctpid="94" cut="000001" value="1"/>
     <Prescale ctpid="95" cut="000001" value="1"/>
     <Prescale ctpid="96" cut="000001" value="1"/>
-    <Prescale ctpid="97" cut="-000001" value="-1"/>
+    <Prescale ctpid="97" cut="000001" value="1"/>
     <Prescale ctpid="98" cut="000001" value="1"/>
     <Prescale ctpid="99" cut="000001" value="1"/>
-    <Prescale ctpid="100" cut="-000001" value="-1"/>
-    <Prescale ctpid="101" cut="-000001" value="-1"/>
+    <Prescale ctpid="100" cut="000001" value="1"/>
+    <Prescale ctpid="101" cut="000001" value="1"/>
     <Prescale ctpid="102" cut="000001" value="1"/>
-    <Prescale ctpid="103" cut="-000001" value="-1"/>
-    <Prescale ctpid="104" cut="-000001" value="-1"/>
-    <Prescale ctpid="105" cut="-000001" value="-1"/>
+    <Prescale ctpid="103" cut="000001" value="1"/>
+    <Prescale ctpid="104" cut="000001" value="1"/>
+    <Prescale ctpid="105" cut="000001" value="1"/>
     <Prescale ctpid="106" cut="000001" value="1"/>
     <Prescale ctpid="107" cut="000001" value="1"/>
     <Prescale ctpid="108" cut="000001" value="1"/>
-    <Prescale ctpid="109" cut="-000001" value="-1"/>
-    <Prescale ctpid="110" cut="-000001" value="-1"/>
-    <Prescale ctpid="111" cut="-000001" value="-1"/>
-    <Prescale ctpid="112" cut="-000001" value="-1"/>
+    <Prescale ctpid="109" cut="000001" value="1"/>
+    <Prescale ctpid="110" cut="000001" value="1"/>
+    <Prescale ctpid="111" cut="000001" value="1"/>
+    <Prescale ctpid="112" cut="000001" value="1"/>
     <Prescale ctpid="113" cut="000001" value="1"/>
-    <Prescale ctpid="114" cut="-000001" value="-1"/>
-    <Prescale ctpid="115" cut="-000001" value="-1"/>
-    <Prescale ctpid="116" cut="-000001" value="-1"/>
+    <Prescale ctpid="114" cut="000001" value="1"/>
+    <Prescale ctpid="115" cut="000001" value="1"/>
+    <Prescale ctpid="116" cut="000001" value="1"/>
     <Prescale ctpid="117" cut="000001" value="1"/>
-    <Prescale ctpid="118" cut="-000001" value="-1"/>
-    <Prescale ctpid="119" cut="-000001" value="-1"/>
+    <Prescale ctpid="118" cut="000001" value="1"/>
+    <Prescale ctpid="119" cut="000001" value="1"/>
     <Prescale ctpid="120" cut="000001" value="1"/>
     <Prescale ctpid="121" cut="000001" value="1"/>
     <Prescale ctpid="122" cut="000001" value="1"/>
-    <Prescale ctpid="123" cut="-000001" value="-1"/>
+    <Prescale ctpid="123" cut="000001" value="1"/>
     <Prescale ctpid="124" cut="000001" value="1"/>
     <Prescale ctpid="125" cut="000001" value="1"/>
     <Prescale ctpid="126" cut="000001" value="1"/>
@@ -2670,8 +3152,8 @@
     <Prescale ctpid="136" cut="000001" value="1"/>
     <Prescale ctpid="137" cut="000001" value="1"/>
     <Prescale ctpid="138" cut="000001" value="1"/>
-    <Prescale ctpid="139" cut="-000001" value="-1"/>
-    <Prescale ctpid="140" cut="-000001" value="-1"/>
+    <Prescale ctpid="139" cut="000001" value="1"/>
+    <Prescale ctpid="140" cut="000001" value="1"/>
     <Prescale ctpid="141" cut="000001" value="1"/>
     <Prescale ctpid="142" cut="000001" value="1"/>
     <Prescale ctpid="143" cut="000001" value="1"/>
@@ -2683,15 +3165,15 @@
     <Prescale ctpid="149" cut="000001" value="1"/>
     <Prescale ctpid="150" cut="000001" value="1"/>
     <Prescale ctpid="151" cut="000001" value="1"/>
-    <Prescale ctpid="152" cut="-000001" value="-1"/>
+    <Prescale ctpid="152" cut="000001" value="1"/>
     <Prescale ctpid="153" cut="000001" value="1"/>
     <Prescale ctpid="154" cut="000001" value="1"/>
     <Prescale ctpid="155" cut="000001" value="1"/>
     <Prescale ctpid="156" cut="000001" value="1"/>
-    <Prescale ctpid="157" cut="-000001" value="-1"/>
-    <Prescale ctpid="158" cut="-000001" value="-1"/>
-    <Prescale ctpid="159" cut="-000001" value="-1"/>
-    <Prescale ctpid="160" cut="-000001" value="-1"/>
+    <Prescale ctpid="157" cut="000001" value="1"/>
+    <Prescale ctpid="158" cut="000001" value="1"/>
+    <Prescale ctpid="159" cut="000001" value="1"/>
+    <Prescale ctpid="160" cut="000001" value="1"/>
     <Prescale ctpid="161" cut="000001" value="1"/>
     <Prescale ctpid="162" cut="-000001" value="-1"/>
     <Prescale ctpid="163" cut="-000001" value="-1"/>
@@ -2830,14 +3312,14 @@
     <Prescale ctpid="296" cut="000001" value="1"/>
     <Prescale ctpid="297" cut="000001" value="1"/>
     <Prescale ctpid="298" cut="000001" value="1"/>
-    <Prescale ctpid="299" cut="000001" value="1"/>
+    <Prescale ctpid="299" cut="-000001" value="-1"/>
     <Prescale ctpid="300" cut="000001" value="1"/>
     <Prescale ctpid="301" cut="000001" value="1"/>
     <Prescale ctpid="302" cut="000001" value="1"/>
     <Prescale ctpid="303" cut="000001" value="1"/>
     <Prescale ctpid="304" cut="000001" value="1"/>
-    <Prescale ctpid="305" cut="-000001" value="-1"/>
-    <Prescale ctpid="306" cut="-000001" value="-1"/>
+    <Prescale ctpid="305" cut="000001" value="1"/>
+    <Prescale ctpid="306" cut="000001" value="1"/>
     <Prescale ctpid="307" cut="000001" value="1"/>
     <Prescale ctpid="308" cut="000001" value="1"/>
     <Prescale ctpid="309" cut="000001" value="1"/>
@@ -2865,7 +3347,7 @@
     <Prescale ctpid="331" cut="000001" value="1"/>
     <Prescale ctpid="332" cut="000001" value="1"/>
     <Prescale ctpid="333" cut="000001" value="1"/>
-    <Prescale ctpid="334" cut="-000001" value="-1"/>
+    <Prescale ctpid="334" cut="000001" value="1"/>
     <Prescale ctpid="335" cut="000001" value="1"/>
     <Prescale ctpid="336" cut="000001" value="1"/>
     <Prescale ctpid="337" cut="000001" value="1"/>
@@ -2882,15 +3364,15 @@
     <Prescale ctpid="348" cut="000001" value="1"/>
     <Prescale ctpid="349" cut="000001" value="1"/>
     <Prescale ctpid="350" cut="000001" value="1"/>
-    <Prescale ctpid="351" cut="-000001" value="-1"/>
-    <Prescale ctpid="352" cut="-000001" value="-1"/>
-    <Prescale ctpid="353" cut="-000001" value="-1"/>
-    <Prescale ctpid="354" cut="-000001" value="-1"/>
-    <Prescale ctpid="355" cut="-000001" value="-1"/>
-    <Prescale ctpid="356" cut="-000001" value="-1"/>
-    <Prescale ctpid="357" cut="-000001" value="-1"/>
-    <Prescale ctpid="358" cut="-000001" value="-1"/>
-    <Prescale ctpid="359" cut="-000001" value="-1"/>
+    <Prescale ctpid="351" cut="000001" value="1"/>
+    <Prescale ctpid="352" cut="000001" value="1"/>
+    <Prescale ctpid="353" cut="000001" value="1"/>
+    <Prescale ctpid="354" cut="000001" value="1"/>
+    <Prescale ctpid="355" cut="000001" value="1"/>
+    <Prescale ctpid="356" cut="000001" value="1"/>
+    <Prescale ctpid="357" cut="000001" value="1"/>
+    <Prescale ctpid="358" cut="000001" value="1"/>
+    <Prescale ctpid="359" cut="000001" value="1"/>
     <Prescale ctpid="360" cut="-000001" value="-1"/>
     <Prescale ctpid="361" cut="-000001" value="-1"/>
     <Prescale ctpid="362" cut="-000001" value="-1"/>
@@ -3001,17 +3483,17 @@
     <Prescale ctpid="467" cut="-000001" value="-1"/>
     <Prescale ctpid="468" cut="-000001" value="-1"/>
     <Prescale ctpid="469" cut="-000001" value="-1"/>
-    <Prescale ctpid="470" cut="-000001" value="-1"/>
-    <Prescale ctpid="471" cut="-000001" value="-1"/>
-    <Prescale ctpid="472" cut="-000001" value="-1"/>
-    <Prescale ctpid="473" cut="-000001" value="-1"/>
-    <Prescale ctpid="474" cut="-000001" value="-1"/>
-    <Prescale ctpid="475" cut="-000001" value="-1"/>
-    <Prescale ctpid="476" cut="-000001" value="-1"/>
-    <Prescale ctpid="477" cut="-000001" value="-1"/>
-    <Prescale ctpid="478" cut="-000001" value="-1"/>
-    <Prescale ctpid="479" cut="-000001" value="-1"/>
-    <Prescale ctpid="480" cut="-000001" value="-1"/>
+    <Prescale ctpid="470" cut="000001" value="1"/>
+    <Prescale ctpid="471" cut="000001" value="1"/>
+    <Prescale ctpid="472" cut="000001" value="1"/>
+    <Prescale ctpid="473" cut="000001" value="1"/>
+    <Prescale ctpid="474" cut="000001" value="1"/>
+    <Prescale ctpid="475" cut="000001" value="1"/>
+    <Prescale ctpid="476" cut="000001" value="1"/>
+    <Prescale ctpid="477" cut="000001" value="1"/>
+    <Prescale ctpid="478" cut="000001" value="1"/>
+    <Prescale ctpid="479" cut="000001" value="1"/>
+    <Prescale ctpid="480" cut="000001" value="1"/>
     <Prescale ctpid="481" cut="000001" value="1"/>
     <Prescale ctpid="482" cut="000001" value="1"/>
     <Prescale ctpid="483" cut="000001" value="1"/>
@@ -3201,27 +3683,6 @@
     <TriggerCounter name="7EM12" type="CTPIN">
       <TriggerCondition name="7EM12" triggerthreshold="EM12" multi="7"/>
     </TriggerCounter>
-    <TriggerCounter name="1EM13VH" type="CTPIN">
-      <TriggerCondition name="1EM13VH" triggerthreshold="EM13VH" multi="1"/>
-    </TriggerCounter>
-    <TriggerCounter name="2EM13VH" type="CTPIN">
-      <TriggerCondition name="2EM13VH" triggerthreshold="EM13VH" multi="2"/>
-    </TriggerCounter>
-    <TriggerCounter name="3EM13VH" type="CTPIN">
-      <TriggerCondition name="3EM13VH" triggerthreshold="EM13VH" multi="3"/>
-    </TriggerCounter>
-    <TriggerCounter name="4EM13VH" type="CTPIN">
-      <TriggerCondition name="4EM13VH" triggerthreshold="EM13VH" multi="4"/>
-    </TriggerCounter>
-    <TriggerCounter name="5EM13VH" type="CTPIN">
-      <TriggerCondition name="5EM13VH" triggerthreshold="EM13VH" multi="5"/>
-    </TriggerCounter>
-    <TriggerCounter name="6EM13VH" type="CTPIN">
-      <TriggerCondition name="6EM13VH" triggerthreshold="EM13VH" multi="6"/>
-    </TriggerCounter>
-    <TriggerCounter name="7EM13VH" type="CTPIN">
-      <TriggerCondition name="7EM13VH" triggerthreshold="EM13VH" multi="7"/>
-    </TriggerCounter>
     <TriggerCounter name="1EM14" type="CTPIN">
       <TriggerCondition name="1EM14" triggerthreshold="EM14" multi="1"/>
     </TriggerCounter>
@@ -3327,6 +3788,27 @@
     <TriggerCounter name="7EM18" type="CTPIN">
       <TriggerCondition name="7EM18" triggerthreshold="EM18" multi="7"/>
     </TriggerCounter>
+    <TriggerCounter name="1EM18VH" type="CTPIN">
+      <TriggerCondition name="1EM18VH" triggerthreshold="EM18VH" multi="1"/>
+    </TriggerCounter>
+    <TriggerCounter name="2EM18VH" type="CTPIN">
+      <TriggerCondition name="2EM18VH" triggerthreshold="EM18VH" multi="2"/>
+    </TriggerCounter>
+    <TriggerCounter name="3EM18VH" type="CTPIN">
+      <TriggerCondition name="3EM18VH" triggerthreshold="EM18VH" multi="3"/>
+    </TriggerCounter>
+    <TriggerCounter name="4EM18VH" type="CTPIN">
+      <TriggerCondition name="4EM18VH" triggerthreshold="EM18VH" multi="4"/>
+    </TriggerCounter>
+    <TriggerCounter name="5EM18VH" type="CTPIN">
+      <TriggerCondition name="5EM18VH" triggerthreshold="EM18VH" multi="5"/>
+    </TriggerCounter>
+    <TriggerCounter name="6EM18VH" type="CTPIN">
+      <TriggerCondition name="6EM18VH" triggerthreshold="EM18VH" multi="6"/>
+    </TriggerCounter>
+    <TriggerCounter name="7EM18VH" type="CTPIN">
+      <TriggerCondition name="7EM18VH" triggerthreshold="EM18VH" multi="7"/>
+    </TriggerCounter>
     <TriggerCounter name="1EM20" type="CTPIN">
       <TriggerCondition name="1EM20" triggerthreshold="EM20" multi="1"/>
     </TriggerCounter>
@@ -3474,27 +3956,6 @@
     <TriggerCounter name="7EM8I" type="CTPIN">
       <TriggerCondition name="7EM8I" triggerthreshold="EM8I" multi="7"/>
     </TriggerCounter>
-    <TriggerCounter name="1HA100" type="CTPIN">
-      <TriggerCondition name="1HA100" triggerthreshold="HA100" multi="1"/>
-    </TriggerCounter>
-    <TriggerCounter name="2HA100" type="CTPIN">
-      <TriggerCondition name="2HA100" triggerthreshold="HA100" multi="2"/>
-    </TriggerCounter>
-    <TriggerCounter name="3HA100" type="CTPIN">
-      <TriggerCondition name="3HA100" triggerthreshold="HA100" multi="3"/>
-    </TriggerCounter>
-    <TriggerCounter name="4HA100" type="CTPIN">
-      <TriggerCondition name="4HA100" triggerthreshold="HA100" multi="4"/>
-    </TriggerCounter>
-    <TriggerCounter name="5HA100" type="CTPIN">
-      <TriggerCondition name="5HA100" triggerthreshold="HA100" multi="5"/>
-    </TriggerCounter>
-    <TriggerCounter name="6HA100" type="CTPIN">
-      <TriggerCondition name="6HA100" triggerthreshold="HA100" multi="6"/>
-    </TriggerCounter>
-    <TriggerCounter name="7HA100" type="CTPIN">
-      <TriggerCondition name="7HA100" triggerthreshold="HA100" multi="7"/>
-    </TriggerCounter>
     <TriggerCounter name="1HA12" type="CTPIN">
       <TriggerCondition name="1HA12" triggerthreshold="HA12" multi="1"/>
     </TriggerCounter>
@@ -3600,6 +4061,27 @@
     <TriggerCounter name="7HA15" type="CTPIN">
       <TriggerCondition name="7HA15" triggerthreshold="HA15" multi="7"/>
     </TriggerCounter>
+    <TriggerCounter name="1HA2" type="CTPIN">
+      <TriggerCondition name="1HA2" triggerthreshold="HA2" multi="1"/>
+    </TriggerCounter>
+    <TriggerCounter name="2HA2" type="CTPIN">
+      <TriggerCondition name="2HA2" triggerthreshold="HA2" multi="2"/>
+    </TriggerCounter>
+    <TriggerCounter name="3HA2" type="CTPIN">
+      <TriggerCondition name="3HA2" triggerthreshold="HA2" multi="3"/>
+    </TriggerCounter>
+    <TriggerCounter name="4HA2" type="CTPIN">
+      <TriggerCondition name="4HA2" triggerthreshold="HA2" multi="4"/>
+    </TriggerCounter>
+    <TriggerCounter name="5HA2" type="CTPIN">
+      <TriggerCondition name="5HA2" triggerthreshold="HA2" multi="5"/>
+    </TriggerCounter>
+    <TriggerCounter name="6HA2" type="CTPIN">
+      <TriggerCondition name="6HA2" triggerthreshold="HA2" multi="6"/>
+    </TriggerCounter>
+    <TriggerCounter name="7HA2" type="CTPIN">
+      <TriggerCondition name="7HA2" triggerthreshold="HA2" multi="7"/>
+    </TriggerCounter>
     <TriggerCounter name="1HA20" type="CTPIN">
       <TriggerCondition name="1HA20" triggerthreshold="HA20" multi="1"/>
     </TriggerCounter>
@@ -3684,27 +4166,6 @@
     <TriggerCounter name="7HA20IT" type="CTPIN">
       <TriggerCondition name="7HA20IT" triggerthreshold="HA20IT" multi="7"/>
     </TriggerCounter>
-    <TriggerCounter name="1HA25" type="CTPIN">
-      <TriggerCondition name="1HA25" triggerthreshold="HA25" multi="1"/>
-    </TriggerCounter>
-    <TriggerCounter name="2HA25" type="CTPIN">
-      <TriggerCondition name="2HA25" triggerthreshold="HA25" multi="2"/>
-    </TriggerCounter>
-    <TriggerCounter name="3HA25" type="CTPIN">
-      <TriggerCondition name="3HA25" triggerthreshold="HA25" multi="3"/>
-    </TriggerCounter>
-    <TriggerCounter name="4HA25" type="CTPIN">
-      <TriggerCondition name="4HA25" triggerthreshold="HA25" multi="4"/>
-    </TriggerCounter>
-    <TriggerCounter name="5HA25" type="CTPIN">
-      <TriggerCondition name="5HA25" triggerthreshold="HA25" multi="5"/>
-    </TriggerCounter>
-    <TriggerCounter name="6HA25" type="CTPIN">
-      <TriggerCondition name="6HA25" triggerthreshold="HA25" multi="6"/>
-    </TriggerCounter>
-    <TriggerCounter name="7HA25" type="CTPIN">
-      <TriggerCondition name="7HA25" triggerthreshold="HA25" multi="7"/>
-    </TriggerCounter>
     <TriggerCounter name="1HA25IT" type="CTPIN">
       <TriggerCondition name="1HA25IT" triggerthreshold="HA25IT" multi="1"/>
     </TriggerCounter>
@@ -3726,6 +4187,27 @@
     <TriggerCounter name="7HA25IT" type="CTPIN">
       <TriggerCondition name="7HA25IT" triggerthreshold="HA25IT" multi="7"/>
     </TriggerCounter>
+    <TriggerCounter name="1HA3" type="CTPIN">
+      <TriggerCondition name="1HA3" triggerthreshold="HA3" multi="1"/>
+    </TriggerCounter>
+    <TriggerCounter name="2HA3" type="CTPIN">
+      <TriggerCondition name="2HA3" triggerthreshold="HA3" multi="2"/>
+    </TriggerCounter>
+    <TriggerCounter name="3HA3" type="CTPIN">
+      <TriggerCondition name="3HA3" triggerthreshold="HA3" multi="3"/>
+    </TriggerCounter>
+    <TriggerCounter name="4HA3" type="CTPIN">
+      <TriggerCondition name="4HA3" triggerthreshold="HA3" multi="4"/>
+    </TriggerCounter>
+    <TriggerCounter name="5HA3" type="CTPIN">
+      <TriggerCondition name="5HA3" triggerthreshold="HA3" multi="5"/>
+    </TriggerCounter>
+    <TriggerCounter name="6HA3" type="CTPIN">
+      <TriggerCondition name="6HA3" triggerthreshold="HA3" multi="6"/>
+    </TriggerCounter>
+    <TriggerCounter name="7HA3" type="CTPIN">
+      <TriggerCondition name="7HA3" triggerthreshold="HA3" multi="7"/>
+    </TriggerCounter>
     <TriggerCounter name="1HA30" type="CTPIN">
       <TriggerCondition name="1HA30" triggerthreshold="HA30" multi="1"/>
     </TriggerCounter>
@@ -3810,15 +4292,6 @@
     <TriggerCounter name="7HA8" type="CTPIN">
       <TriggerCondition name="7HA8" triggerthreshold="HA8" multi="7"/>
     </TriggerCounter>
-    <TriggerCounter name="1J10.31ETA49" type="CTPIN">
-      <TriggerCondition name="1J10.31ETA49" triggerthreshold="J10.31ETA49" multi="1"/>
-    </TriggerCounter>
-    <TriggerCounter name="2J10.31ETA49" type="CTPIN">
-      <TriggerCondition name="2J10.31ETA49" triggerthreshold="J10.31ETA49" multi="2"/>
-    </TriggerCounter>
-    <TriggerCounter name="3J10.31ETA49" type="CTPIN">
-      <TriggerCondition name="3J10.31ETA49" triggerthreshold="J10.31ETA49" multi="3"/>
-    </TriggerCounter>
     <TriggerCounter name="1J100" type="CTPIN">
       <TriggerCondition name="1J100" triggerthreshold="J100" multi="1"/>
     </TriggerCounter>
@@ -4080,6 +4553,15 @@
     <TriggerCounter name="3J50" type="CTPIN">
       <TriggerCondition name="3J50" triggerthreshold="J50" multi="3"/>
     </TriggerCounter>
+    <TriggerCounter name="1J50.31ETA49" type="CTPIN">
+      <TriggerCondition name="1J50.31ETA49" triggerthreshold="J50.31ETA49" multi="1"/>
+    </TriggerCounter>
+    <TriggerCounter name="2J50.31ETA49" type="CTPIN">
+      <TriggerCondition name="2J50.31ETA49" triggerthreshold="J50.31ETA49" multi="2"/>
+    </TriggerCounter>
+    <TriggerCounter name="3J50.31ETA49" type="CTPIN">
+      <TriggerCondition name="3J50.31ETA49" triggerthreshold="J50.31ETA49" multi="3"/>
+    </TriggerCounter>
     <TriggerCounter name="1J75" type="CTPIN">
       <TriggerCondition name="1J75" triggerthreshold="J75" multi="1"/>
     </TriggerCounter>
@@ -4521,6 +5003,9 @@
     <TriggerCounter name="1TE200" type="CTPIN">
       <TriggerCondition name="1TE200" triggerthreshold="TE200" multi="1"/>
     </TriggerCounter>
+    <TriggerCounter name="1TE3.0ETA49" type="CTPIN">
+      <TriggerCondition name="1TE3.0ETA49" triggerthreshold="TE3.0ETA49" multi="1"/>
+    </TriggerCounter>
     <TriggerCounter name="1TE3000.0ETA49" type="CTPIN">
       <TriggerCondition name="1TE3000.0ETA49" triggerthreshold="TE3000.0ETA49" multi="1"/>
     </TriggerCounter>
@@ -4539,20 +5024,35 @@
     <TriggerCounter name="1TE50" type="CTPMON">
       <TriggerCondition name="1TE50" triggerthreshold="TE50" multi="1"/>
     </TriggerCounter>
-    <TriggerCounter name="1TE500.0ETA49" type="CTPIN">
-      <TriggerCondition name="1TE500.0ETA49" triggerthreshold="TE500.0ETA49" multi="1"/>
-    </TriggerCounter>
-    <TriggerCounter name="1TE5000.0ETA49" type="CTPIN">
-      <TriggerCondition name="1TE5000.0ETA49" triggerthreshold="TE5000.0ETA49" multi="1"/>
+    <TriggerCounter name="1TE600.0ETA49" type="CTPIN">
+      <TriggerCondition name="1TE600.0ETA49" triggerthreshold="TE600.0ETA49" multi="1"/>
     </TriggerCounter>
     <TriggerCounter name="1TE6500.0ETA49" type="CTPIN">
       <TriggerCondition name="1TE6500.0ETA49" triggerthreshold="TE6500.0ETA49" multi="1"/>
     </TriggerCounter>
+    <TriggerCounter name="1TE7.0ETA49" type="CTPIN">
+      <TriggerCondition name="1TE7.0ETA49" triggerthreshold="TE7.0ETA49" multi="1"/>
+    </TriggerCounter>
     <TriggerCounter name="1TE8000.0ETA49" type="CTPIN">
       <TriggerCondition name="1TE8000.0ETA49" triggerthreshold="TE8000.0ETA49" multi="1"/>
     </TriggerCounter>
-    <TriggerCounter name="1TE9000.0ETA49" type="CTPIN">
-      <TriggerCondition name="1TE9000.0ETA49" triggerthreshold="TE9000.0ETA49" multi="1"/>
+    <TriggerCounter name="1XE10" type="CTPIN">
+      <TriggerCondition name="1XE10" triggerthreshold="XE10" multi="1"/>
+    </TriggerCounter>
+    <TriggerCounter name="1XE150" type="CTPIN">
+      <TriggerCondition name="1XE150" triggerthreshold="XE150" multi="1"/>
+    </TriggerCounter>
+    <TriggerCounter name="1XE20" type="CTPIN">
+      <TriggerCondition name="1XE20" triggerthreshold="XE20" multi="1"/>
+    </TriggerCounter>
+    <TriggerCounter name="1XE25" type="CTPIN">
+      <TriggerCondition name="1XE25" triggerthreshold="XE25" multi="1"/>
+    </TriggerCounter>
+    <TriggerCounter name="1XE30" type="CTPIN">
+      <TriggerCondition name="1XE30" triggerthreshold="XE30" multi="1"/>
+    </TriggerCounter>
+    <TriggerCounter name="1XE300" type="CTPIN">
+      <TriggerCondition name="1XE300" triggerthreshold="XE300" multi="1"/>
     </TriggerCounter>
     <TriggerCounter name="1XE35" type="CTPIN">
       <TriggerCondition name="1XE35" triggerthreshold="XE35" multi="1"/>
@@ -4560,54 +5060,36 @@
     <TriggerCounter name="1XE35" type="CTPMON">
       <TriggerCondition name="1XE35" triggerthreshold="XE35" multi="1"/>
     </TriggerCounter>
-    <TriggerCounter name="1XE35.0ETA24" type="CTPIN">
-      <TriggerCondition name="1XE35.0ETA24" triggerthreshold="XE35.0ETA24" multi="1"/>
-    </TriggerCounter>
     <TriggerCounter name="1XE40" type="CTPIN">
       <TriggerCondition name="1XE40" triggerthreshold="XE40" multi="1"/>
     </TriggerCounter>
-    <TriggerCounter name="1XE40.0ETA24" type="CTPIN">
-      <TriggerCondition name="1XE40.0ETA24" triggerthreshold="XE40.0ETA24" multi="1"/>
-    </TriggerCounter>
     <TriggerCounter name="1XE45" type="CTPIN">
       <TriggerCondition name="1XE45" triggerthreshold="XE45" multi="1"/>
     </TriggerCounter>
-    <TriggerCounter name="1XE45.0ETA24" type="CTPIN">
-      <TriggerCondition name="1XE45.0ETA24" triggerthreshold="XE45.0ETA24" multi="1"/>
-    </TriggerCounter>
     <TriggerCounter name="1XE50" type="CTPIN">
       <TriggerCondition name="1XE50" triggerthreshold="XE50" multi="1"/>
     </TriggerCounter>
-    <TriggerCounter name="1XE50.0ETA24" type="CTPIN">
-      <TriggerCondition name="1XE50.0ETA24" triggerthreshold="XE50.0ETA24" multi="1"/>
-    </TriggerCounter>
     <TriggerCounter name="1XE55" type="CTPIN">
       <TriggerCondition name="1XE55" triggerthreshold="XE55" multi="1"/>
     </TriggerCounter>
-    <TriggerCounter name="1XE55.0ETA24" type="CTPIN">
-      <TriggerCondition name="1XE55.0ETA24" triggerthreshold="XE55.0ETA24" multi="1"/>
-    </TriggerCounter>
     <TriggerCounter name="1XE60" type="CTPIN">
       <TriggerCondition name="1XE60" triggerthreshold="XE60" multi="1"/>
     </TriggerCounter>
     <TriggerCounter name="1XE60" type="CTPMON">
       <TriggerCondition name="1XE60" triggerthreshold="XE60" multi="1"/>
     </TriggerCounter>
-    <TriggerCounter name="1XE60.0ETA24" type="CTPIN">
-      <TriggerCondition name="1XE60.0ETA24" triggerthreshold="XE60.0ETA24" multi="1"/>
+    <TriggerCounter name="1XE65" type="CTPIN">
+      <TriggerCondition name="1XE65" triggerthreshold="XE65" multi="1"/>
     </TriggerCounter>
     <TriggerCounter name="1XE70" type="CTPIN">
       <TriggerCondition name="1XE70" triggerthreshold="XE70" multi="1"/>
     </TriggerCounter>
-    <TriggerCounter name="1XE70.0ETA24" type="CTPIN">
-      <TriggerCondition name="1XE70.0ETA24" triggerthreshold="XE70.0ETA24" multi="1"/>
+    <TriggerCounter name="1XE75" type="CTPIN">
+      <TriggerCondition name="1XE75" triggerthreshold="XE75" multi="1"/>
     </TriggerCounter>
     <TriggerCounter name="1XE80" type="CTPIN">
       <TriggerCondition name="1XE80" triggerthreshold="XE80" multi="1"/>
     </TriggerCounter>
-    <TriggerCounter name="1XE80.0ETA24" type="CTPIN">
-      <TriggerCondition name="1XE80.0ETA24" triggerthreshold="XE80.0ETA24" multi="1"/>
-    </TriggerCounter>
     <TriggerCounter name="1XS20" type="CTPIN">
       <TriggerCondition name="1XS20" triggerthreshold="XS20" multi="1"/>
     </TriggerCounter>
@@ -4948,52 +5430,54 @@
         <Signal range_begin="15" range_end="17"/>
       </Cable>
     </TriggerThreshold>
-    <TriggerThreshold active="1" bitnum="3" id="56" mapping="6" name="EM13VH" type="EM" input="ctpin" version="1">
-      <TriggerThresholdValue em_isolation="63" etamin="-49" etamax="49" had_isolation="63" had_veto="99" isobits="00001" name="EM13VHfull" phimin="0" phimax="64" priority="1" thresholdval="15" type="EM" window="0"/>
-      <TriggerThresholdValue em_isolation="63" etamin="-25" etamax="-17" had_isolation="63" had_veto="99" isobits="00001" name="EM13VHfull" phimin="0" phimax="64" priority="2" thresholdval="14" type="EM" window="0"/>
-      <TriggerThresholdValue em_isolation="63" etamin="-17" etamax="-15" had_isolation="63" had_veto="99" isobits="00001" name="EM13VHfull" phimin="0" phimax="64" priority="2" thresholdval="13" type="EM" window="0"/>
-      <TriggerThresholdValue em_isolation="63" etamin="-15" etamax="-14" had_isolation="63" had_veto="99" isobits="00001" name="EM13VHfull" phimin="0" phimax="64" priority="2" thresholdval="11" type="EM" window="0"/>
-      <TriggerThresholdValue em_isolation="63" etamin="-14" etamax="-12" had_isolation="63" had_veto="99" isobits="00001" name="EM13VHfull" phimin="0" phimax="64" priority="2" thresholdval="12" type="EM" window="0"/>
-      <TriggerThresholdValue em_isolation="63" etamin="-12" etamax="-9" had_isolation="63" had_veto="99" isobits="00001" name="EM13VHfull" phimin="0" phimax="64" priority="2" thresholdval="13" type="EM" window="0"/>
-      <TriggerThresholdValue em_isolation="63" etamin="-9" etamax="-7" had_isolation="63" had_veto="99" isobits="00001" name="EM13VHfull" phimin="0" phimax="64" priority="2" thresholdval="14" type="EM" window="0"/>
-      <TriggerThresholdValue em_isolation="63" etamin="-7" etamax="0" had_isolation="63" had_veto="99" isobits="00001" name="EM13VHfull" phimin="0" phimax="64" priority="2" thresholdval="15" type="EM" window="0"/>
-      <TriggerThresholdValue em_isolation="63" etamin="0" etamax="7" had_isolation="63" had_veto="99" isobits="00001" name="EM13VHfull" phimin="0" phimax="64" priority="2" thresholdval="15" type="EM" window="0"/>
-      <TriggerThresholdValue em_isolation="63" etamin="7" etamax="9" had_isolation="63" had_veto="99" isobits="00001" name="EM13VHfull" phimin="0" phimax="64" priority="2" thresholdval="14" type="EM" window="0"/>
-      <TriggerThresholdValue em_isolation="63" etamin="9" etamax="12" had_isolation="63" had_veto="99" isobits="00001" name="EM13VHfull" phimin="0" phimax="64" priority="2" thresholdval="13" type="EM" window="0"/>
-      <TriggerThresholdValue em_isolation="63" etamin="12" etamax="14" had_isolation="63" had_veto="99" isobits="00001" name="EM13VHfull" phimin="0" phimax="64" priority="2" thresholdval="12" type="EM" window="0"/>
-      <TriggerThresholdValue em_isolation="63" etamin="14" etamax="15" had_isolation="63" had_veto="99" isobits="00001" name="EM13VHfull" phimin="0" phimax="64" priority="2" thresholdval="11" type="EM" window="0"/>
-      <TriggerThresholdValue em_isolation="63" etamin="15" etamax="17" had_isolation="63" had_veto="99" isobits="00001" name="EM13VHfull" phimin="0" phimax="64" priority="2" thresholdval="13" type="EM" window="0"/>
-      <TriggerThresholdValue em_isolation="63" etamin="17" etamax="25" had_isolation="63" had_veto="99" isobits="00001" name="EM13VHfull" phimin="0" phimax="64" priority="2" thresholdval="14" type="EM" window="0"/>
+    <TriggerThreshold active="1" bitnum="3" id="56" mapping="6" name="EM14" type="EM" input="ctpin" version="1">
+      <TriggerThresholdValue em_isolation="63" etamin="-49" etamax="49" had_isolation="63" had_veto="99" isobits="00000" name="EM14full" phimin="0" phimax="64" priority="1" thresholdval="14" type="EM" window="0"/>
       <Cable connector="CON0" input="SLOT7" name="EM1">
         <Signal range_begin="18" range_end="20"/>
       </Cable>
     </TriggerThreshold>
-    <TriggerThreshold active="1" bitnum="3" id="57" mapping="7" name="EM14" type="EM" input="ctpin" version="1">
-      <TriggerThresholdValue em_isolation="63" etamin="-49" etamax="49" had_isolation="63" had_veto="99" isobits="00000" name="EM14full" phimin="0" phimax="64" priority="1" thresholdval="14" type="EM" window="0"/>
+    <TriggerThreshold active="1" bitnum="3" id="57" mapping="7" name="EM15" type="EM" input="ctpin" version="1">
+      <TriggerThresholdValue em_isolation="63" etamin="-49" etamax="49" had_isolation="63" had_veto="99" isobits="00000" name="EM15full" phimin="0" phimax="64" priority="1" thresholdval="15" type="EM" window="0"/>
       <Cable connector="CON0" input="SLOT7" name="EM1">
         <Signal range_begin="21" range_end="23"/>
       </Cable>
     </TriggerThreshold>
-    <TriggerThreshold active="1" bitnum="3" id="58" mapping="8" name="EM15" type="EM" input="ctpin" version="1">
-      <TriggerThresholdValue em_isolation="63" etamin="-49" etamax="49" had_isolation="63" had_veto="99" isobits="00000" name="EM15full" phimin="0" phimax="64" priority="1" thresholdval="15" type="EM" window="0"/>
+    <TriggerThreshold active="1" bitnum="3" id="58" mapping="8" name="EM15HI" type="EM" input="ctpin" version="1">
+      <TriggerThresholdValue em_isolation="63" etamin="-49" etamax="49" had_isolation="63" had_veto="99" isobits="00100" name="EM15HIfull" phimin="0" phimax="64" priority="1" thresholdval="15" type="EM" window="0"/>
       <Cable connector="CON1" input="SLOT7" name="EM2">
         <Signal range_begin="0" range_end="2"/>
       </Cable>
     </TriggerThreshold>
-    <TriggerThreshold active="1" bitnum="3" id="59" mapping="9" name="EM15HI" type="EM" input="ctpin" version="1">
-      <TriggerThresholdValue em_isolation="63" etamin="-49" etamax="49" had_isolation="63" had_veto="99" isobits="00100" name="EM15HIfull" phimin="0" phimax="64" priority="1" thresholdval="15" type="EM" window="0"/>
+    <TriggerThreshold active="1" bitnum="3" id="59" mapping="9" name="EM16" type="EM" input="ctpin" version="1">
+      <TriggerThresholdValue em_isolation="63" etamin="-49" etamax="49" had_isolation="63" had_veto="99" isobits="00000" name="EM16full" phimin="0" phimax="64" priority="1" thresholdval="16" type="EM" window="0"/>
       <Cable connector="CON1" input="SLOT7" name="EM2">
         <Signal range_begin="3" range_end="5"/>
       </Cable>
     </TriggerThreshold>
-    <TriggerThreshold active="1" bitnum="3" id="60" mapping="10" name="EM16" type="EM" input="ctpin" version="1">
-      <TriggerThresholdValue em_isolation="63" etamin="-49" etamax="49" had_isolation="63" had_veto="99" isobits="00000" name="EM16full" phimin="0" phimax="64" priority="1" thresholdval="16" type="EM" window="0"/>
+    <TriggerThreshold active="1" bitnum="3" id="60" mapping="10" name="EM18" type="EM" input="ctpin" version="1">
+      <TriggerThresholdValue em_isolation="63" etamin="-49" etamax="49" had_isolation="63" had_veto="99" isobits="00000" name="EM18full" phimin="0" phimax="64" priority="1" thresholdval="18" type="EM" window="0"/>
       <Cable connector="CON1" input="SLOT7" name="EM2">
         <Signal range_begin="6" range_end="8"/>
       </Cable>
     </TriggerThreshold>
-    <TriggerThreshold active="1" bitnum="3" id="61" mapping="11" name="EM18" type="EM" input="ctpin" version="1">
-      <TriggerThresholdValue em_isolation="63" etamin="-49" etamax="49" had_isolation="63" had_veto="99" isobits="00000" name="EM18full" phimin="0" phimax="64" priority="1" thresholdval="18" type="EM" window="0"/>
+    <TriggerThreshold active="1" bitnum="3" id="61" mapping="11" name="EM18VH" type="EM" input="ctpin" version="1">
+      <TriggerThresholdValue em_isolation="63" etamin="-49" etamax="49" had_isolation="63" had_veto="99" isobits="00001" name="EM18VHfull" phimin="0" phimax="64" priority="1" thresholdval="20" type="EM" window="0"/>
+      <TriggerThresholdValue em_isolation="63" etamin="-25" etamax="-17" had_isolation="63" had_veto="99" isobits="00001" name="EM18VHfull" phimin="0" phimax="64" priority="2" thresholdval="19" type="EM" window="0"/>
+      <TriggerThresholdValue em_isolation="63" etamin="-17" etamax="-15" had_isolation="63" had_veto="99" isobits="00001" name="EM18VHfull" phimin="0" phimax="64" priority="2" thresholdval="17" type="EM" window="0"/>
+      <TriggerThresholdValue em_isolation="63" etamin="-15" etamax="-14" had_isolation="63" had_veto="99" isobits="00001" name="EM18VHfull" phimin="0" phimax="64" priority="2" thresholdval="15" type="EM" window="0"/>
+      <TriggerThresholdValue em_isolation="63" etamin="-14" etamax="-13" had_isolation="63" had_veto="99" isobits="00001" name="EM18VHfull" phimin="0" phimax="64" priority="2" thresholdval="16" type="EM" window="0"/>
+      <TriggerThresholdValue em_isolation="63" etamin="-13" etamax="-11" had_isolation="63" had_veto="99" isobits="00001" name="EM18VHfull" phimin="0" phimax="64" priority="2" thresholdval="17" type="EM" window="0"/>
+      <TriggerThresholdValue em_isolation="63" etamin="-11" etamax="-8" had_isolation="63" had_veto="99" isobits="00001" name="EM18VHfull" phimin="0" phimax="64" priority="2" thresholdval="18" type="EM" window="0"/>
+      <TriggerThresholdValue em_isolation="63" etamin="-8" etamax="-7" had_isolation="63" had_veto="99" isobits="00001" name="EM18VHfull" phimin="0" phimax="64" priority="2" thresholdval="19" type="EM" window="0"/>
+      <TriggerThresholdValue em_isolation="63" etamin="-7" etamax="0" had_isolation="63" had_veto="99" isobits="00001" name="EM18VHfull" phimin="0" phimax="64" priority="2" thresholdval="20" type="EM" window="0"/>
+      <TriggerThresholdValue em_isolation="63" etamin="0" etamax="7" had_isolation="63" had_veto="99" isobits="00001" name="EM18VHfull" phimin="0" phimax="64" priority="2" thresholdval="20" type="EM" window="0"/>
+      <TriggerThresholdValue em_isolation="63" etamin="7" etamax="8" had_isolation="63" had_veto="99" isobits="00001" name="EM18VHfull" phimin="0" phimax="64" priority="2" thresholdval="19" type="EM" window="0"/>
+      <TriggerThresholdValue em_isolation="63" etamin="8" etamax="11" had_isolation="63" had_veto="99" isobits="00001" name="EM18VHfull" phimin="0" phimax="64" priority="2" thresholdval="18" type="EM" window="0"/>
+      <TriggerThresholdValue em_isolation="63" etamin="11" etamax="13" had_isolation="63" had_veto="99" isobits="00001" name="EM18VHfull" phimin="0" phimax="64" priority="2" thresholdval="17" type="EM" window="0"/>
+      <TriggerThresholdValue em_isolation="63" etamin="13" etamax="14" had_isolation="63" had_veto="99" isobits="00001" name="EM18VHfull" phimin="0" phimax="64" priority="2" thresholdval="16" type="EM" window="0"/>
+      <TriggerThresholdValue em_isolation="63" etamin="14" etamax="15" had_isolation="63" had_veto="99" isobits="00001" name="EM18VHfull" phimin="0" phimax="64" priority="2" thresholdval="15" type="EM" window="0"/>
+      <TriggerThresholdValue em_isolation="63" etamin="15" etamax="17" had_isolation="63" had_veto="99" isobits="00001" name="EM18VHfull" phimin="0" phimax="64" priority="2" thresholdval="17" type="EM" window="0"/>
+      <TriggerThresholdValue em_isolation="63" etamin="17" etamax="25" had_isolation="63" had_veto="99" isobits="00001" name="EM18VHfull" phimin="0" phimax="64" priority="2" thresholdval="19" type="EM" window="0"/>
       <Cable connector="CON1" input="SLOT7" name="EM2">
         <Signal range_begin="9" range_end="11"/>
       </Cable>
@@ -5189,34 +5673,34 @@
         <Signal range_begin="16" range_end="17"/>
       </Cable>
     </TriggerThreshold>
-    <TriggerThreshold active="1" bitnum="2" id="85" mapping="19" name="J10.31ETA49" type="JET" input="ctpin" version="1">
-      <TriggerThresholdValue em_isolation="63" etamin="-49" etamax="49" had_isolation="63" had_veto="63" name="J10.31ETA49full" phimin="0" phimax="64" priority="0" thresholdval="1023" type="JET" window="8" windowSize="LARGE"/>
-      <TriggerThresholdValue em_isolation="63" etamin="-49" etamax="-31" had_isolation="63" had_veto="63" name="J10.31ETA49full" phimin="0" phimax="64" priority="1" thresholdval="10" type="JET" window="8" windowSize="LARGE"/>
-      <TriggerThresholdValue em_isolation="63" etamin="31" etamax="49" had_isolation="63" had_veto="63" name="J10.31ETA49full" phimin="0" phimax="64" priority="1" thresholdval="10" type="JET" window="8" windowSize="LARGE"/>
-      <Cable connector="CON1" input="SLOT8" name="JET2">
-        <Signal range_begin="18" range_end="19"/>
-      </Cable>
-    </TriggerThreshold>
-    <TriggerThreshold active="1" bitnum="2" id="86" mapping="20" name="J15.31ETA49" type="JET" input="ctpin" version="1">
+    <TriggerThreshold active="1" bitnum="2" id="85" mapping="19" name="J15.31ETA49" type="JET" input="ctpin" version="1">
       <TriggerThresholdValue em_isolation="63" etamin="-49" etamax="49" had_isolation="63" had_veto="63" name="J15.31ETA49full" phimin="0" phimax="64" priority="0" thresholdval="1023" type="JET" window="8" windowSize="LARGE"/>
       <TriggerThresholdValue em_isolation="63" etamin="-49" etamax="-31" had_isolation="63" had_veto="63" name="J15.31ETA49full" phimin="0" phimax="64" priority="1" thresholdval="15" type="JET" window="8" windowSize="LARGE"/>
       <TriggerThresholdValue em_isolation="63" etamin="31" etamax="49" had_isolation="63" had_veto="63" name="J15.31ETA49full" phimin="0" phimax="64" priority="1" thresholdval="15" type="JET" window="8" windowSize="LARGE"/>
       <Cable connector="CON1" input="SLOT8" name="JET2">
-        <Signal range_begin="20" range_end="21"/>
+        <Signal range_begin="18" range_end="19"/>
       </Cable>
     </TriggerThreshold>
-    <TriggerThreshold active="1" bitnum="2" id="87" mapping="21" name="J20.31ETA49" type="JET" input="ctpin" version="1">
+    <TriggerThreshold active="1" bitnum="2" id="86" mapping="20" name="J20.31ETA49" type="JET" input="ctpin" version="1">
       <TriggerThresholdValue em_isolation="63" etamin="-49" etamax="49" had_isolation="63" had_veto="63" name="J20.31ETA49full" phimin="0" phimax="64" priority="0" thresholdval="1023" type="JET" window="8" windowSize="LARGE"/>
       <TriggerThresholdValue em_isolation="63" etamin="-49" etamax="-31" had_isolation="63" had_veto="63" name="J20.31ETA49full" phimin="0" phimax="64" priority="1" thresholdval="20" type="JET" window="8" windowSize="LARGE"/>
       <TriggerThresholdValue em_isolation="63" etamin="31" etamax="49" had_isolation="63" had_veto="63" name="J20.31ETA49full" phimin="0" phimax="64" priority="1" thresholdval="20" type="JET" window="8" windowSize="LARGE"/>
       <Cable connector="CON1" input="SLOT8" name="JET2">
-        <Signal range_begin="22" range_end="23"/>
+        <Signal range_begin="20" range_end="21"/>
       </Cable>
     </TriggerThreshold>
-    <TriggerThreshold active="1" bitnum="2" id="88" mapping="22" name="J30.31ETA49" type="JET" input="ctpin" version="1">
+    <TriggerThreshold active="1" bitnum="2" id="87" mapping="21" name="J30.31ETA49" type="JET" input="ctpin" version="1">
       <TriggerThresholdValue em_isolation="63" etamin="-49" etamax="49" had_isolation="63" had_veto="63" name="J30.31ETA49full" phimin="0" phimax="64" priority="0" thresholdval="1023" type="JET" window="8" windowSize="LARGE"/>
       <TriggerThresholdValue em_isolation="63" etamin="-49" etamax="-31" had_isolation="63" had_veto="63" name="J30.31ETA49full" phimin="0" phimax="64" priority="1" thresholdval="30" type="JET" window="8" windowSize="LARGE"/>
       <TriggerThresholdValue em_isolation="63" etamin="31" etamax="49" had_isolation="63" had_veto="63" name="J30.31ETA49full" phimin="0" phimax="64" priority="1" thresholdval="30" type="JET" window="8" windowSize="LARGE"/>
+      <Cable connector="CON1" input="SLOT8" name="JET2">
+        <Signal range_begin="22" range_end="23"/>
+      </Cable>
+    </TriggerThreshold>
+    <TriggerThreshold active="1" bitnum="2" id="88" mapping="22" name="J50.31ETA49" type="JET" input="ctpin" version="1">
+      <TriggerThresholdValue em_isolation="63" etamin="-49" etamax="49" had_isolation="63" had_veto="63" name="J50.31ETA49full" phimin="0" phimax="64" priority="0" thresholdval="1023" type="JET" window="8" windowSize="LARGE"/>
+      <TriggerThresholdValue em_isolation="63" etamin="-49" etamax="-31" had_isolation="63" had_veto="63" name="J50.31ETA49full" phimin="0" phimax="64" priority="1" thresholdval="50" type="JET" window="8" windowSize="LARGE"/>
+      <TriggerThresholdValue em_isolation="63" etamin="31" etamax="49" had_isolation="63" had_veto="63" name="J50.31ETA49full" phimin="0" phimax="64" priority="1" thresholdval="50" type="JET" window="8" windowSize="LARGE"/>
       <Cable connector="CON1" input="SLOT8" name="JET2">
         <Signal range_begin="24" range_end="25"/>
       </Cable>
@@ -5597,98 +6081,98 @@
         <Signal range_begin="21" range_end="21"/>
       </Cable>
     </TriggerThreshold>
-    <TriggerThreshold active="1" bitnum="3" id="146" mapping="0" name="HA8" type="TAU" input="ctpin" version="1">
-      <TriggerThresholdValue em_isolation="63" etamin="-49" etamax="49" had_isolation="63" had_veto="99" isobits="00000" name="HA8full" phimin="0" phimax="64" priority="1" thresholdval="8" type="TAU" window="0"/>
+    <TriggerThreshold active="1" bitnum="3" id="146" mapping="0" name="HA2" type="TAU" input="ctpin" version="1">
+      <TriggerThresholdValue em_isolation="63" etamin="-49" etamax="49" had_isolation="63" had_veto="99" isobits="00000" name="HA2full" phimin="0" phimax="64" priority="1" thresholdval="2" type="TAU" window="0"/>
       <Cable connector="CON2" input="SLOT7" name="TAU1">
         <Signal range_begin="0" range_end="2"/>
       </Cable>
     </TriggerThreshold>
-    <TriggerThreshold active="1" bitnum="3" id="147" mapping="1" name="HA12" type="TAU" input="ctpin" version="1">
-      <TriggerThresholdValue em_isolation="63" etamin="-49" etamax="49" had_isolation="63" had_veto="99" isobits="00000" name="HA12full" phimin="0" phimax="64" priority="1" thresholdval="12" type="TAU" window="0"/>
+    <TriggerThreshold active="1" bitnum="3" id="147" mapping="1" name="HA3" type="TAU" input="ctpin" version="1">
+      <TriggerThresholdValue em_isolation="63" etamin="-49" etamax="49" had_isolation="63" had_veto="99" isobits="00000" name="HA3full" phimin="0" phimax="64" priority="1" thresholdval="3" type="TAU" window="0"/>
       <Cable connector="CON2" input="SLOT7" name="TAU1">
         <Signal range_begin="3" range_end="5"/>
       </Cable>
     </TriggerThreshold>
-    <TriggerThreshold active="1" bitnum="3" id="148" mapping="2" name="HA12IL" type="TAU" input="ctpin" version="1">
-      <TriggerThresholdValue em_isolation="63" etamin="-49" etamax="49" had_isolation="63" had_veto="99" isobits="00001" name="HA12ILfull" phimin="0" phimax="64" priority="1" thresholdval="12" type="TAU" window="0"/>
+    <TriggerThreshold active="1" bitnum="3" id="148" mapping="2" name="HA8" type="TAU" input="ctpin" version="1">
+      <TriggerThresholdValue em_isolation="63" etamin="-49" etamax="49" had_isolation="63" had_veto="99" isobits="00000" name="HA8full" phimin="0" phimax="64" priority="1" thresholdval="8" type="TAU" window="0"/>
       <Cable connector="CON2" input="SLOT7" name="TAU1">
         <Signal range_begin="6" range_end="8"/>
       </Cable>
     </TriggerThreshold>
-    <TriggerThreshold active="1" bitnum="3" id="149" mapping="3" name="HA12IM" type="TAU" input="ctpin" version="1">
-      <TriggerThresholdValue em_isolation="63" etamin="-49" etamax="49" had_isolation="63" had_veto="99" isobits="00010" name="HA12IMfull" phimin="0" phimax="64" priority="1" thresholdval="12" type="TAU" window="0"/>
+    <TriggerThreshold active="1" bitnum="3" id="149" mapping="3" name="HA12" type="TAU" input="ctpin" version="1">
+      <TriggerThresholdValue em_isolation="63" etamin="-49" etamax="49" had_isolation="63" had_veto="99" isobits="00000" name="HA12full" phimin="0" phimax="64" priority="1" thresholdval="12" type="TAU" window="0"/>
       <Cable connector="CON2" input="SLOT7" name="TAU1">
         <Signal range_begin="9" range_end="11"/>
       </Cable>
     </TriggerThreshold>
-    <TriggerThreshold active="1" bitnum="3" id="150" mapping="4" name="HA12IT" type="TAU" input="ctpin" version="1">
-      <TriggerThresholdValue em_isolation="63" etamin="-49" etamax="49" had_isolation="63" had_veto="99" isobits="00100" name="HA12ITfull" phimin="0" phimax="64" priority="1" thresholdval="12" type="TAU" window="0"/>
+    <TriggerThreshold active="1" bitnum="3" id="150" mapping="4" name="HA12IL" type="TAU" input="ctpin" version="1">
+      <TriggerThresholdValue em_isolation="63" etamin="-49" etamax="49" had_isolation="63" had_veto="99" isobits="00001" name="HA12ILfull" phimin="0" phimax="64" priority="1" thresholdval="12" type="TAU" window="0"/>
       <Cable connector="CON2" input="SLOT7" name="TAU1">
         <Signal range_begin="12" range_end="14"/>
       </Cable>
     </TriggerThreshold>
-    <TriggerThreshold active="1" bitnum="3" id="151" mapping="5" name="HA15" type="TAU" input="ctpin" version="1">
-      <TriggerThresholdValue em_isolation="63" etamin="-49" etamax="49" had_isolation="63" had_veto="99" isobits="00000" name="HA15full" phimin="0" phimax="64" priority="1" thresholdval="15" type="TAU" window="0"/>
+    <TriggerThreshold active="1" bitnum="3" id="151" mapping="5" name="HA12IM" type="TAU" input="ctpin" version="1">
+      <TriggerThresholdValue em_isolation="63" etamin="-49" etamax="49" had_isolation="63" had_veto="99" isobits="00010" name="HA12IMfull" phimin="0" phimax="64" priority="1" thresholdval="12" type="TAU" window="0"/>
       <Cable connector="CON2" input="SLOT7" name="TAU1">
         <Signal range_begin="15" range_end="17"/>
       </Cable>
     </TriggerThreshold>
-    <TriggerThreshold active="1" bitnum="3" id="152" mapping="6" name="HA20" type="TAU" input="ctpin" version="1">
-      <TriggerThresholdValue em_isolation="63" etamin="-49" etamax="49" had_isolation="63" had_veto="99" isobits="00000" name="HA20full" phimin="0" phimax="64" priority="1" thresholdval="20" type="TAU" window="0"/>
+    <TriggerThreshold active="1" bitnum="3" id="152" mapping="6" name="HA12IT" type="TAU" input="ctpin" version="1">
+      <TriggerThresholdValue em_isolation="63" etamin="-49" etamax="49" had_isolation="63" had_veto="99" isobits="00100" name="HA12ITfull" phimin="0" phimax="64" priority="1" thresholdval="12" type="TAU" window="0"/>
       <Cable connector="CON2" input="SLOT7" name="TAU1">
         <Signal range_begin="18" range_end="20"/>
       </Cable>
     </TriggerThreshold>
-    <TriggerThreshold active="1" bitnum="3" id="153" mapping="7" name="HA20IL" type="TAU" input="ctpin" version="1">
-      <TriggerThresholdValue em_isolation="63" etamin="-49" etamax="49" had_isolation="63" had_veto="99" isobits="00001" name="HA20ILfull" phimin="0" phimax="64" priority="1" thresholdval="20" type="TAU" window="0"/>
+    <TriggerThreshold active="1" bitnum="3" id="153" mapping="7" name="HA15" type="TAU" input="ctpin" version="1">
+      <TriggerThresholdValue em_isolation="63" etamin="-49" etamax="49" had_isolation="63" had_veto="99" isobits="00000" name="HA15full" phimin="0" phimax="64" priority="1" thresholdval="15" type="TAU" window="0"/>
       <Cable connector="CON2" input="SLOT7" name="TAU1">
         <Signal range_begin="21" range_end="23"/>
       </Cable>
     </TriggerThreshold>
-    <TriggerThreshold active="1" bitnum="3" id="154" mapping="8" name="HA20IM" type="TAU" input="ctpin" version="1">
-      <TriggerThresholdValue em_isolation="63" etamin="-49" etamax="49" had_isolation="63" had_veto="99" isobits="00010" name="HA20IMfull" phimin="0" phimax="64" priority="1" thresholdval="20" type="TAU" window="0"/>
+    <TriggerThreshold active="1" bitnum="3" id="154" mapping="8" name="HA20" type="TAU" input="ctpin" version="1">
+      <TriggerThresholdValue em_isolation="63" etamin="-49" etamax="49" had_isolation="63" had_veto="99" isobits="00000" name="HA20full" phimin="0" phimax="64" priority="1" thresholdval="20" type="TAU" window="0"/>
       <Cable connector="CON3" input="SLOT7" name="TAU2">
         <Signal range_begin="0" range_end="2"/>
       </Cable>
     </TriggerThreshold>
-    <TriggerThreshold active="1" bitnum="3" id="155" mapping="9" name="HA20IT" type="TAU" input="ctpin" version="1">
-      <TriggerThresholdValue em_isolation="63" etamin="-49" etamax="49" had_isolation="63" had_veto="99" isobits="00100" name="HA20ITfull" phimin="0" phimax="64" priority="1" thresholdval="20" type="TAU" window="0"/>
+    <TriggerThreshold active="1" bitnum="3" id="155" mapping="9" name="HA20IL" type="TAU" input="ctpin" version="1">
+      <TriggerThresholdValue em_isolation="63" etamin="-49" etamax="49" had_isolation="63" had_veto="99" isobits="00001" name="HA20ILfull" phimin="0" phimax="64" priority="1" thresholdval="20" type="TAU" window="0"/>
       <Cable connector="CON3" input="SLOT7" name="TAU2">
         <Signal range_begin="3" range_end="5"/>
       </Cable>
     </TriggerThreshold>
-    <TriggerThreshold active="1" bitnum="3" id="156" mapping="10" name="HA25" type="TAU" input="ctpin" version="1">
-      <TriggerThresholdValue em_isolation="63" etamin="-49" etamax="49" had_isolation="63" had_veto="99" isobits="00000" name="HA25full" phimin="0" phimax="64" priority="1" thresholdval="25" type="TAU" window="0"/>
+    <TriggerThreshold active="1" bitnum="3" id="156" mapping="10" name="HA20IM" type="TAU" input="ctpin" version="1">
+      <TriggerThresholdValue em_isolation="63" etamin="-49" etamax="49" had_isolation="63" had_veto="99" isobits="00010" name="HA20IMfull" phimin="0" phimax="64" priority="1" thresholdval="20" type="TAU" window="0"/>
       <Cable connector="CON3" input="SLOT7" name="TAU2">
         <Signal range_begin="6" range_end="8"/>
       </Cable>
     </TriggerThreshold>
-    <TriggerThreshold active="1" bitnum="3" id="157" mapping="11" name="HA25IT" type="TAU" input="ctpin" version="1">
-      <TriggerThresholdValue em_isolation="63" etamin="-49" etamax="49" had_isolation="63" had_veto="99" isobits="00100" name="HA25ITfull" phimin="0" phimax="64" priority="1" thresholdval="25" type="TAU" window="0"/>
+    <TriggerThreshold active="1" bitnum="3" id="157" mapping="11" name="HA20IT" type="TAU" input="ctpin" version="1">
+      <TriggerThresholdValue em_isolation="63" etamin="-49" etamax="49" had_isolation="63" had_veto="99" isobits="00100" name="HA20ITfull" phimin="0" phimax="64" priority="1" thresholdval="20" type="TAU" window="0"/>
       <Cable connector="CON3" input="SLOT7" name="TAU2">
         <Signal range_begin="9" range_end="11"/>
       </Cable>
     </TriggerThreshold>
-    <TriggerThreshold active="1" bitnum="3" id="158" mapping="12" name="HA30" type="TAU" input="ctpin" version="1">
-      <TriggerThresholdValue em_isolation="63" etamin="-49" etamax="49" had_isolation="63" had_veto="99" isobits="00000" name="HA30full" phimin="0" phimax="64" priority="1" thresholdval="30" type="TAU" window="0"/>
+    <TriggerThreshold active="1" bitnum="3" id="158" mapping="12" name="HA25IT" type="TAU" input="ctpin" version="1">
+      <TriggerThresholdValue em_isolation="63" etamin="-49" etamax="49" had_isolation="63" had_veto="99" isobits="00100" name="HA25ITfull" phimin="0" phimax="64" priority="1" thresholdval="25" type="TAU" window="0"/>
       <Cable connector="CON3" input="SLOT7" name="TAU2">
         <Signal range_begin="12" range_end="14"/>
       </Cable>
     </TriggerThreshold>
-    <TriggerThreshold active="1" bitnum="3" id="159" mapping="13" name="HA40" type="TAU" input="ctpin" version="1">
-      <TriggerThresholdValue em_isolation="63" etamin="-49" etamax="49" had_isolation="63" had_veto="99" isobits="00000" name="HA40full" phimin="0" phimax="64" priority="1" thresholdval="40" type="TAU" window="0"/>
+    <TriggerThreshold active="1" bitnum="3" id="159" mapping="13" name="HA30" type="TAU" input="ctpin" version="1">
+      <TriggerThresholdValue em_isolation="63" etamin="-49" etamax="49" had_isolation="63" had_veto="99" isobits="00000" name="HA30full" phimin="0" phimax="64" priority="1" thresholdval="30" type="TAU" window="0"/>
       <Cable connector="CON3" input="SLOT7" name="TAU2">
         <Signal range_begin="15" range_end="17"/>
       </Cable>
     </TriggerThreshold>
-    <TriggerThreshold active="1" bitnum="3" id="160" mapping="14" name="HA60" type="TAU" input="ctpin" version="1">
-      <TriggerThresholdValue em_isolation="63" etamin="-49" etamax="49" had_isolation="63" had_veto="99" isobits="00000" name="HA60full" phimin="0" phimax="64" priority="1" thresholdval="60" type="TAU" window="0"/>
+    <TriggerThreshold active="1" bitnum="3" id="160" mapping="14" name="HA40" type="TAU" input="ctpin" version="1">
+      <TriggerThresholdValue em_isolation="63" etamin="-49" etamax="49" had_isolation="63" had_veto="99" isobits="00000" name="HA40full" phimin="0" phimax="64" priority="1" thresholdval="40" type="TAU" window="0"/>
       <Cable connector="CON3" input="SLOT7" name="TAU2">
         <Signal range_begin="18" range_end="20"/>
       </Cable>
     </TriggerThreshold>
-    <TriggerThreshold active="1" bitnum="3" id="161" mapping="15" name="HA100" type="TAU" input="ctpin" version="1">
-      <TriggerThresholdValue em_isolation="63" etamin="-49" etamax="49" had_isolation="63" had_veto="99" isobits="00000" name="HA100full" phimin="0" phimax="64" priority="1" thresholdval="100" type="TAU" window="0"/>
+    <TriggerThreshold active="1" bitnum="3" id="161" mapping="15" name="HA60" type="TAU" input="ctpin" version="1">
+      <TriggerThresholdValue em_isolation="63" etamin="-49" etamax="49" had_isolation="63" had_veto="99" isobits="00000" name="HA60full" phimin="0" phimax="64" priority="1" thresholdval="60" type="TAU" window="0"/>
       <Cable connector="CON3" input="SLOT7" name="TAU2">
         <Signal range_begin="21" range_end="23"/>
       </Cable>
@@ -5741,58 +6225,58 @@
         <Signal range_begin="7" range_end="7"/>
       </Cable>
     </TriggerThreshold>
-    <TriggerThreshold active="1" bitnum="1" id="170" mapping="8" name="TE500.0ETA49" type="TE" input="ctpin" version="1">
-      <TriggerThresholdValue em_isolation="63" etamin="-49" etamax="49" had_isolation="63" had_veto="63" name="TE500.0ETA49full" phimin="0" phimax="64" priority="0" thresholdval="32767" type="TE" window="0"/>
-      <TriggerThresholdValue em_isolation="63" etamin="-49" etamax="49" had_isolation="63" had_veto="63" name="TE500.0ETA49full" phimin="0" phimax="64" priority="1" thresholdval="500" type="TE" window="0"/>
+    <TriggerThreshold active="1" bitnum="1" id="170" mapping="8" name="TE3.0ETA49" type="TE" input="ctpin" version="1">
+      <TriggerThresholdValue em_isolation="63" etamin="-49" etamax="49" had_isolation="63" had_veto="63" name="TE3.0ETA49full" phimin="0" phimax="64" priority="0" thresholdval="32767" type="TE" window="0"/>
+      <TriggerThresholdValue em_isolation="63" etamin="-49" etamax="49" had_isolation="63" had_veto="63" name="TE3.0ETA49full" phimin="0" phimax="64" priority="1" thresholdval="3" type="TE" window="0"/>
       <Cable connector="CON3" input="SLOT8" name="EN2">
         <Signal range_begin="0" range_end="0"/>
       </Cable>
     </TriggerThreshold>
-    <TriggerThreshold active="1" bitnum="1" id="171" mapping="9" name="TE1500.0ETA49" type="TE" input="ctpin" version="1">
-      <TriggerThresholdValue em_isolation="63" etamin="-49" etamax="49" had_isolation="63" had_veto="63" name="TE1500.0ETA49full" phimin="0" phimax="64" priority="0" thresholdval="32767" type="TE" window="0"/>
-      <TriggerThresholdValue em_isolation="63" etamin="-49" etamax="49" had_isolation="63" had_veto="63" name="TE1500.0ETA49full" phimin="0" phimax="64" priority="1" thresholdval="1500" type="TE" window="0"/>
+    <TriggerThreshold active="1" bitnum="1" id="171" mapping="9" name="TE7.0ETA49" type="TE" input="ctpin" version="1">
+      <TriggerThresholdValue em_isolation="63" etamin="-49" etamax="49" had_isolation="63" had_veto="63" name="TE7.0ETA49full" phimin="0" phimax="64" priority="0" thresholdval="32767" type="TE" window="0"/>
+      <TriggerThresholdValue em_isolation="63" etamin="-49" etamax="49" had_isolation="63" had_veto="63" name="TE7.0ETA49full" phimin="0" phimax="64" priority="1" thresholdval="7" type="TE" window="0"/>
       <Cable connector="CON3" input="SLOT8" name="EN2">
         <Signal range_begin="1" range_end="1"/>
       </Cable>
     </TriggerThreshold>
-    <TriggerThreshold active="1" bitnum="1" id="172" mapping="10" name="TE3000.0ETA49" type="TE" input="ctpin" version="1">
-      <TriggerThresholdValue em_isolation="63" etamin="-49" etamax="49" had_isolation="63" had_veto="63" name="TE3000.0ETA49full" phimin="0" phimax="64" priority="0" thresholdval="32767" type="TE" window="0"/>
-      <TriggerThresholdValue em_isolation="63" etamin="-49" etamax="49" had_isolation="63" had_veto="63" name="TE3000.0ETA49full" phimin="0" phimax="64" priority="1" thresholdval="3000" type="TE" window="0"/>
+    <TriggerThreshold active="1" bitnum="1" id="172" mapping="10" name="TE600.0ETA49" type="TE" input="ctpin" version="1">
+      <TriggerThresholdValue em_isolation="63" etamin="-49" etamax="49" had_isolation="63" had_veto="63" name="TE600.0ETA49full" phimin="0" phimax="64" priority="0" thresholdval="32767" type="TE" window="0"/>
+      <TriggerThresholdValue em_isolation="63" etamin="-49" etamax="49" had_isolation="63" had_veto="63" name="TE600.0ETA49full" phimin="0" phimax="64" priority="1" thresholdval="600" type="TE" window="0"/>
       <Cable connector="CON3" input="SLOT8" name="EN2">
         <Signal range_begin="2" range_end="2"/>
       </Cable>
     </TriggerThreshold>
-    <TriggerThreshold active="1" bitnum="1" id="173" mapping="11" name="TE3500.0ETA49" type="TE" input="ctpin" version="1">
-      <TriggerThresholdValue em_isolation="63" etamin="-49" etamax="49" had_isolation="63" had_veto="63" name="TE3500.0ETA49full" phimin="0" phimax="64" priority="0" thresholdval="32767" type="TE" window="0"/>
-      <TriggerThresholdValue em_isolation="63" etamin="-49" etamax="49" had_isolation="63" had_veto="63" name="TE3500.0ETA49full" phimin="0" phimax="64" priority="1" thresholdval="3500" type="TE" window="0"/>
+    <TriggerThreshold active="1" bitnum="1" id="173" mapping="11" name="TE1500.0ETA49" type="TE" input="ctpin" version="1">
+      <TriggerThresholdValue em_isolation="63" etamin="-49" etamax="49" had_isolation="63" had_veto="63" name="TE1500.0ETA49full" phimin="0" phimax="64" priority="0" thresholdval="32767" type="TE" window="0"/>
+      <TriggerThresholdValue em_isolation="63" etamin="-49" etamax="49" had_isolation="63" had_veto="63" name="TE1500.0ETA49full" phimin="0" phimax="64" priority="1" thresholdval="1500" type="TE" window="0"/>
       <Cable connector="CON3" input="SLOT8" name="EN2">
         <Signal range_begin="3" range_end="3"/>
       </Cable>
     </TriggerThreshold>
-    <TriggerThreshold active="1" bitnum="1" id="174" mapping="12" name="TE5000.0ETA49" type="TE" input="ctpin" version="1">
-      <TriggerThresholdValue em_isolation="63" etamin="-49" etamax="49" had_isolation="63" had_veto="63" name="TE5000.0ETA49full" phimin="0" phimax="64" priority="0" thresholdval="32767" type="TE" window="0"/>
-      <TriggerThresholdValue em_isolation="63" etamin="-49" etamax="49" had_isolation="63" had_veto="63" name="TE5000.0ETA49full" phimin="0" phimax="64" priority="1" thresholdval="5000" type="TE" window="0"/>
+    <TriggerThreshold active="1" bitnum="1" id="174" mapping="12" name="TE3000.0ETA49" type="TE" input="ctpin" version="1">
+      <TriggerThresholdValue em_isolation="63" etamin="-49" etamax="49" had_isolation="63" had_veto="63" name="TE3000.0ETA49full" phimin="0" phimax="64" priority="0" thresholdval="32767" type="TE" window="0"/>
+      <TriggerThresholdValue em_isolation="63" etamin="-49" etamax="49" had_isolation="63" had_veto="63" name="TE3000.0ETA49full" phimin="0" phimax="64" priority="1" thresholdval="3000" type="TE" window="0"/>
       <Cable connector="CON3" input="SLOT8" name="EN2">
         <Signal range_begin="4" range_end="4"/>
       </Cable>
     </TriggerThreshold>
-    <TriggerThreshold active="1" bitnum="1" id="175" mapping="13" name="TE6500.0ETA49" type="TE" input="ctpin" version="1">
-      <TriggerThresholdValue em_isolation="63" etamin="-49" etamax="49" had_isolation="63" had_veto="63" name="TE6500.0ETA49full" phimin="0" phimax="64" priority="0" thresholdval="32767" type="TE" window="0"/>
-      <TriggerThresholdValue em_isolation="63" etamin="-49" etamax="49" had_isolation="63" had_veto="63" name="TE6500.0ETA49full" phimin="0" phimax="64" priority="1" thresholdval="6500" type="TE" window="0"/>
+    <TriggerThreshold active="1" bitnum="1" id="175" mapping="13" name="TE3500.0ETA49" type="TE" input="ctpin" version="1">
+      <TriggerThresholdValue em_isolation="63" etamin="-49" etamax="49" had_isolation="63" had_veto="63" name="TE3500.0ETA49full" phimin="0" phimax="64" priority="0" thresholdval="32767" type="TE" window="0"/>
+      <TriggerThresholdValue em_isolation="63" etamin="-49" etamax="49" had_isolation="63" had_veto="63" name="TE3500.0ETA49full" phimin="0" phimax="64" priority="1" thresholdval="3500" type="TE" window="0"/>
       <Cable connector="CON3" input="SLOT8" name="EN2">
         <Signal range_begin="5" range_end="5"/>
       </Cable>
     </TriggerThreshold>
-    <TriggerThreshold active="1" bitnum="1" id="176" mapping="14" name="TE8000.0ETA49" type="TE" input="ctpin" version="1">
-      <TriggerThresholdValue em_isolation="63" etamin="-49" etamax="49" had_isolation="63" had_veto="63" name="TE8000.0ETA49full" phimin="0" phimax="64" priority="0" thresholdval="32767" type="TE" window="0"/>
-      <TriggerThresholdValue em_isolation="63" etamin="-49" etamax="49" had_isolation="63" had_veto="63" name="TE8000.0ETA49full" phimin="0" phimax="64" priority="1" thresholdval="8000" type="TE" window="0"/>
+    <TriggerThreshold active="1" bitnum="1" id="176" mapping="14" name="TE6500.0ETA49" type="TE" input="ctpin" version="1">
+      <TriggerThresholdValue em_isolation="63" etamin="-49" etamax="49" had_isolation="63" had_veto="63" name="TE6500.0ETA49full" phimin="0" phimax="64" priority="0" thresholdval="32767" type="TE" window="0"/>
+      <TriggerThresholdValue em_isolation="63" etamin="-49" etamax="49" had_isolation="63" had_veto="63" name="TE6500.0ETA49full" phimin="0" phimax="64" priority="1" thresholdval="6500" type="TE" window="0"/>
       <Cable connector="CON3" input="SLOT8" name="EN2">
         <Signal range_begin="6" range_end="6"/>
       </Cable>
     </TriggerThreshold>
-    <TriggerThreshold active="1" bitnum="1" id="177" mapping="15" name="TE9000.0ETA49" type="TE" input="ctpin" version="1">
-      <TriggerThresholdValue em_isolation="63" etamin="-49" etamax="49" had_isolation="63" had_veto="63" name="TE9000.0ETA49full" phimin="0" phimax="64" priority="0" thresholdval="32767" type="TE" window="0"/>
-      <TriggerThresholdValue em_isolation="63" etamin="-49" etamax="49" had_isolation="63" had_veto="63" name="TE9000.0ETA49full" phimin="0" phimax="64" priority="1" thresholdval="9000" type="TE" window="0"/>
+    <TriggerThreshold active="1" bitnum="1" id="177" mapping="15" name="TE8000.0ETA49" type="TE" input="ctpin" version="1">
+      <TriggerThresholdValue em_isolation="63" etamin="-49" etamax="49" had_isolation="63" had_veto="63" name="TE8000.0ETA49full" phimin="0" phimax="64" priority="0" thresholdval="32767" type="TE" window="0"/>
+      <TriggerThresholdValue em_isolation="63" etamin="-49" etamax="49" had_isolation="63" had_veto="63" name="TE8000.0ETA49full" phimin="0" phimax="64" priority="1" thresholdval="8000" type="TE" window="0"/>
       <Cable connector="CON3" input="SLOT8" name="EN2">
         <Signal range_begin="7" range_end="7"/>
       </Cable>
@@ -6352,106 +6836,98 @@
         <Signal range_begin="31" range_end="31" clock="1"/>
       </Cable>
     </TriggerThreshold>
-    <TriggerThreshold active="1" bitnum="1" id="289" mapping="0" name="XE35" type="XE" input="ctpin" version="1">
-      <TriggerThresholdValue em_isolation="63" etamin="-49" etamax="49" had_isolation="63" had_veto="63" name="XE35full" phimin="0" phimax="64" priority="0" thresholdval="35" type="XE" window="0"/>
+    <TriggerThreshold active="1" bitnum="1" id="289" mapping="0" name="XE10" type="XE" input="ctpin" version="1">
+      <TriggerThresholdValue em_isolation="63" etamin="-49" etamax="49" had_isolation="63" had_veto="63" name="XE10full" phimin="0" phimax="64" priority="0" thresholdval="10" type="XE" window="0"/>
       <Cable connector="CON2" input="SLOT8" name="EN1">
         <Signal range_begin="8" range_end="8"/>
       </Cable>
     </TriggerThreshold>
-    <TriggerThreshold active="1" bitnum="1" id="290" mapping="1" name="XE40" type="XE" input="ctpin" version="1">
-      <TriggerThresholdValue em_isolation="63" etamin="-49" etamax="49" had_isolation="63" had_veto="63" name="XE40full" phimin="0" phimax="64" priority="0" thresholdval="40" type="XE" window="0"/>
+    <TriggerThreshold active="1" bitnum="1" id="290" mapping="1" name="XE20" type="XE" input="ctpin" version="1">
+      <TriggerThresholdValue em_isolation="63" etamin="-49" etamax="49" had_isolation="63" had_veto="63" name="XE20full" phimin="0" phimax="64" priority="0" thresholdval="20" type="XE" window="0"/>
       <Cable connector="CON2" input="SLOT8" name="EN1">
         <Signal range_begin="9" range_end="9"/>
       </Cable>
     </TriggerThreshold>
-    <TriggerThreshold active="1" bitnum="1" id="291" mapping="2" name="XE45" type="XE" input="ctpin" version="1">
-      <TriggerThresholdValue em_isolation="63" etamin="-49" etamax="49" had_isolation="63" had_veto="63" name="XE45full" phimin="0" phimax="64" priority="0" thresholdval="45" type="XE" window="0"/>
+    <TriggerThreshold active="1" bitnum="1" id="291" mapping="2" name="XE25" type="XE" input="ctpin" version="1">
+      <TriggerThresholdValue em_isolation="63" etamin="-49" etamax="49" had_isolation="63" had_veto="63" name="XE25full" phimin="0" phimax="64" priority="0" thresholdval="25" type="XE" window="0"/>
       <Cable connector="CON2" input="SLOT8" name="EN1">
         <Signal range_begin="10" range_end="10"/>
       </Cable>
     </TriggerThreshold>
-    <TriggerThreshold active="1" bitnum="1" id="292" mapping="3" name="XE50" type="XE" input="ctpin" version="1">
-      <TriggerThresholdValue em_isolation="63" etamin="-49" etamax="49" had_isolation="63" had_veto="63" name="XE50full" phimin="0" phimax="64" priority="0" thresholdval="50" type="XE" window="0"/>
+    <TriggerThreshold active="1" bitnum="1" id="292" mapping="3" name="XE30" type="XE" input="ctpin" version="1">
+      <TriggerThresholdValue em_isolation="63" etamin="-49" etamax="49" had_isolation="63" had_veto="63" name="XE30full" phimin="0" phimax="64" priority="0" thresholdval="30" type="XE" window="0"/>
       <Cable connector="CON2" input="SLOT8" name="EN1">
         <Signal range_begin="11" range_end="11"/>
       </Cable>
     </TriggerThreshold>
-    <TriggerThreshold active="1" bitnum="1" id="293" mapping="4" name="XE55" type="XE" input="ctpin" version="1">
-      <TriggerThresholdValue em_isolation="63" etamin="-49" etamax="49" had_isolation="63" had_veto="63" name="XE55full" phimin="0" phimax="64" priority="0" thresholdval="55" type="XE" window="0"/>
+    <TriggerThreshold active="1" bitnum="1" id="293" mapping="4" name="XE35" type="XE" input="ctpin" version="1">
+      <TriggerThresholdValue em_isolation="63" etamin="-49" etamax="49" had_isolation="63" had_veto="63" name="XE35full" phimin="0" phimax="64" priority="0" thresholdval="35" type="XE" window="0"/>
       <Cable connector="CON2" input="SLOT8" name="EN1">
         <Signal range_begin="12" range_end="12"/>
       </Cable>
     </TriggerThreshold>
-    <TriggerThreshold active="1" bitnum="1" id="294" mapping="5" name="XE60" type="XE" input="ctpin" version="1">
-      <TriggerThresholdValue em_isolation="63" etamin="-49" etamax="49" had_isolation="63" had_veto="63" name="XE60full" phimin="0" phimax="64" priority="0" thresholdval="60" type="XE" window="0"/>
+    <TriggerThreshold active="1" bitnum="1" id="294" mapping="5" name="XE40" type="XE" input="ctpin" version="1">
+      <TriggerThresholdValue em_isolation="63" etamin="-49" etamax="49" had_isolation="63" had_veto="63" name="XE40full" phimin="0" phimax="64" priority="0" thresholdval="40" type="XE" window="0"/>
       <Cable connector="CON2" input="SLOT8" name="EN1">
         <Signal range_begin="13" range_end="13"/>
       </Cable>
     </TriggerThreshold>
-    <TriggerThreshold active="1" bitnum="1" id="295" mapping="6" name="XE70" type="XE" input="ctpin" version="1">
-      <TriggerThresholdValue em_isolation="63" etamin="-49" etamax="49" had_isolation="63" had_veto="63" name="XE70full" phimin="0" phimax="64" priority="0" thresholdval="70" type="XE" window="0"/>
+    <TriggerThreshold active="1" bitnum="1" id="295" mapping="6" name="XE45" type="XE" input="ctpin" version="1">
+      <TriggerThresholdValue em_isolation="63" etamin="-49" etamax="49" had_isolation="63" had_veto="63" name="XE45full" phimin="0" phimax="64" priority="0" thresholdval="45" type="XE" window="0"/>
       <Cable connector="CON2" input="SLOT8" name="EN1">
         <Signal range_begin="14" range_end="14"/>
       </Cable>
     </TriggerThreshold>
-    <TriggerThreshold active="1" bitnum="1" id="296" mapping="7" name="XE80" type="XE" input="ctpin" version="1">
-      <TriggerThresholdValue em_isolation="63" etamin="-49" etamax="49" had_isolation="63" had_veto="63" name="XE80full" phimin="0" phimax="64" priority="0" thresholdval="80" type="XE" window="0"/>
+    <TriggerThreshold active="1" bitnum="1" id="296" mapping="7" name="XE50" type="XE" input="ctpin" version="1">
+      <TriggerThresholdValue em_isolation="63" etamin="-49" etamax="49" had_isolation="63" had_veto="63" name="XE50full" phimin="0" phimax="64" priority="0" thresholdval="50" type="XE" window="0"/>
       <Cable connector="CON2" input="SLOT8" name="EN1">
         <Signal range_begin="15" range_end="15"/>
       </Cable>
     </TriggerThreshold>
-    <TriggerThreshold active="1" bitnum="1" id="297" mapping="8" name="XE35.0ETA24" type="XE" input="ctpin" version="1">
-      <TriggerThresholdValue em_isolation="63" etamin="-49" etamax="49" had_isolation="63" had_veto="63" name="XE35.0ETA24full" phimin="0" phimax="64" priority="0" thresholdval="32767" type="XE" window="0"/>
-      <TriggerThresholdValue em_isolation="63" etamin="-24" etamax="24" had_isolation="63" had_veto="63" name="XE35.0ETA24full" phimin="0" phimax="64" priority="1" thresholdval="35" type="XE" window="0"/>
+    <TriggerThreshold active="1" bitnum="1" id="297" mapping="8" name="XE55" type="XE" input="ctpin" version="1">
+      <TriggerThresholdValue em_isolation="63" etamin="-49" etamax="49" had_isolation="63" had_veto="63" name="XE55full" phimin="0" phimax="64" priority="0" thresholdval="55" type="XE" window="0"/>
       <Cable connector="CON3" input="SLOT8" name="EN2">
         <Signal range_begin="8" range_end="8"/>
       </Cable>
     </TriggerThreshold>
-    <TriggerThreshold active="1" bitnum="1" id="298" mapping="9" name="XE40.0ETA24" type="XE" input="ctpin" version="1">
-      <TriggerThresholdValue em_isolation="63" etamin="-49" etamax="49" had_isolation="63" had_veto="63" name="XE40.0ETA24full" phimin="0" phimax="64" priority="0" thresholdval="32767" type="XE" window="0"/>
-      <TriggerThresholdValue em_isolation="63" etamin="-24" etamax="24" had_isolation="63" had_veto="63" name="XE40.0ETA24full" phimin="0" phimax="64" priority="1" thresholdval="40" type="XE" window="0"/>
+    <TriggerThreshold active="1" bitnum="1" id="298" mapping="9" name="XE60" type="XE" input="ctpin" version="1">
+      <TriggerThresholdValue em_isolation="63" etamin="-49" etamax="49" had_isolation="63" had_veto="63" name="XE60full" phimin="0" phimax="64" priority="0" thresholdval="60" type="XE" window="0"/>
       <Cable connector="CON3" input="SLOT8" name="EN2">
         <Signal range_begin="9" range_end="9"/>
       </Cable>
     </TriggerThreshold>
-    <TriggerThreshold active="1" bitnum="1" id="299" mapping="10" name="XE45.0ETA24" type="XE" input="ctpin" version="1">
-      <TriggerThresholdValue em_isolation="63" etamin="-49" etamax="49" had_isolation="63" had_veto="63" name="XE45.0ETA24full" phimin="0" phimax="64" priority="0" thresholdval="32767" type="XE" window="0"/>
-      <TriggerThresholdValue em_isolation="63" etamin="-24" etamax="24" had_isolation="63" had_veto="63" name="XE45.0ETA24full" phimin="0" phimax="64" priority="1" thresholdval="45" type="XE" window="0"/>
+    <TriggerThreshold active="1" bitnum="1" id="299" mapping="10" name="XE65" type="XE" input="ctpin" version="1">
+      <TriggerThresholdValue em_isolation="63" etamin="-49" etamax="49" had_isolation="63" had_veto="63" name="XE65full" phimin="0" phimax="64" priority="0" thresholdval="65" type="XE" window="0"/>
       <Cable connector="CON3" input="SLOT8" name="EN2">
         <Signal range_begin="10" range_end="10"/>
       </Cable>
     </TriggerThreshold>
-    <TriggerThreshold active="1" bitnum="1" id="300" mapping="11" name="XE50.0ETA24" type="XE" input="ctpin" version="1">
-      <TriggerThresholdValue em_isolation="63" etamin="-49" etamax="49" had_isolation="63" had_veto="63" name="XE50.0ETA24full" phimin="0" phimax="64" priority="0" thresholdval="32767" type="XE" window="0"/>
-      <TriggerThresholdValue em_isolation="63" etamin="-24" etamax="24" had_isolation="63" had_veto="63" name="XE50.0ETA24full" phimin="0" phimax="64" priority="1" thresholdval="50" type="XE" window="0"/>
+    <TriggerThreshold active="1" bitnum="1" id="300" mapping="11" name="XE70" type="XE" input="ctpin" version="1">
+      <TriggerThresholdValue em_isolation="63" etamin="-49" etamax="49" had_isolation="63" had_veto="63" name="XE70full" phimin="0" phimax="64" priority="0" thresholdval="70" type="XE" window="0"/>
       <Cable connector="CON3" input="SLOT8" name="EN2">
         <Signal range_begin="11" range_end="11"/>
       </Cable>
     </TriggerThreshold>
-    <TriggerThreshold active="1" bitnum="1" id="301" mapping="12" name="XE55.0ETA24" type="XE" input="ctpin" version="1">
-      <TriggerThresholdValue em_isolation="63" etamin="-49" etamax="49" had_isolation="63" had_veto="63" name="XE55.0ETA24full" phimin="0" phimax="64" priority="0" thresholdval="32767" type="XE" window="0"/>
-      <TriggerThresholdValue em_isolation="63" etamin="-24" etamax="24" had_isolation="63" had_veto="63" name="XE55.0ETA24full" phimin="0" phimax="64" priority="1" thresholdval="55" type="XE" window="0"/>
+    <TriggerThreshold active="1" bitnum="1" id="301" mapping="12" name="XE75" type="XE" input="ctpin" version="1">
+      <TriggerThresholdValue em_isolation="63" etamin="-49" etamax="49" had_isolation="63" had_veto="63" name="XE75full" phimin="0" phimax="64" priority="0" thresholdval="75" type="XE" window="0"/>
       <Cable connector="CON3" input="SLOT8" name="EN2">
         <Signal range_begin="12" range_end="12"/>
       </Cable>
     </TriggerThreshold>
-    <TriggerThreshold active="1" bitnum="1" id="302" mapping="13" name="XE60.0ETA24" type="XE" input="ctpin" version="1">
-      <TriggerThresholdValue em_isolation="63" etamin="-49" etamax="49" had_isolation="63" had_veto="63" name="XE60.0ETA24full" phimin="0" phimax="64" priority="0" thresholdval="32767" type="XE" window="0"/>
-      <TriggerThresholdValue em_isolation="63" etamin="-24" etamax="24" had_isolation="63" had_veto="63" name="XE60.0ETA24full" phimin="0" phimax="64" priority="1" thresholdval="60" type="XE" window="0"/>
+    <TriggerThreshold active="1" bitnum="1" id="302" mapping="13" name="XE80" type="XE" input="ctpin" version="1">
+      <TriggerThresholdValue em_isolation="63" etamin="-49" etamax="49" had_isolation="63" had_veto="63" name="XE80full" phimin="0" phimax="64" priority="0" thresholdval="80" type="XE" window="0"/>
       <Cable connector="CON3" input="SLOT8" name="EN2">
         <Signal range_begin="13" range_end="13"/>
       </Cable>
     </TriggerThreshold>
-    <TriggerThreshold active="1" bitnum="1" id="303" mapping="14" name="XE70.0ETA24" type="XE" input="ctpin" version="1">
-      <TriggerThresholdValue em_isolation="63" etamin="-49" etamax="49" had_isolation="63" had_veto="63" name="XE70.0ETA24full" phimin="0" phimax="64" priority="0" thresholdval="32767" type="XE" window="0"/>
-      <TriggerThresholdValue em_isolation="63" etamin="-24" etamax="24" had_isolation="63" had_veto="63" name="XE70.0ETA24full" phimin="0" phimax="64" priority="1" thresholdval="70" type="XE" window="0"/>
+    <TriggerThreshold active="1" bitnum="1" id="303" mapping="14" name="XE150" type="XE" input="ctpin" version="1">
+      <TriggerThresholdValue em_isolation="63" etamin="-49" etamax="49" had_isolation="63" had_veto="63" name="XE150full" phimin="0" phimax="64" priority="0" thresholdval="150" type="XE" window="0"/>
       <Cable connector="CON3" input="SLOT8" name="EN2">
         <Signal range_begin="14" range_end="14"/>
       </Cable>
     </TriggerThreshold>
-    <TriggerThreshold active="1" bitnum="1" id="304" mapping="15" name="XE80.0ETA24" type="XE" input="ctpin" version="1">
-      <TriggerThresholdValue em_isolation="63" etamin="-49" etamax="49" had_isolation="63" had_veto="63" name="XE80.0ETA24full" phimin="0" phimax="64" priority="0" thresholdval="32767" type="XE" window="0"/>
-      <TriggerThresholdValue em_isolation="63" etamin="-24" etamax="24" had_isolation="63" had_veto="63" name="XE80.0ETA24full" phimin="0" phimax="64" priority="1" thresholdval="80" type="XE" window="0"/>
+    <TriggerThreshold active="1" bitnum="1" id="304" mapping="15" name="XE300" type="XE" input="ctpin" version="1">
+      <TriggerThresholdValue em_isolation="63" etamin="-49" etamax="49" had_isolation="63" had_veto="63" name="XE300full" phimin="0" phimax="64" priority="0" thresholdval="300" type="XE" window="0"/>
       <Cable connector="CON3" input="SLOT8" name="EN2">
         <Signal range_begin="15" range_end="15"/>
       </Cable>
@@ -6578,9 +7054,9 @@
       <Parametrization isobit="5" offset="30" slope="100" mincut="0" upperlimit="60" etamin="-49" etamax="49" priority="0"/>
     </Isolation>
     <MinimumTOBPt thrtype="EM" ptmin="7" etamin="-49" etamax="49" priority="0"/>
-    <MinimumTOBPt thrtype="TAU" ptmin="12" etamin="-49" etamax="49" priority="0"/>
-    <MinimumTOBPt thrtype="JETS" window="4" ptmin="10" etamin="-49" etamax="49" priority="0"/>
-    <MinimumTOBPt thrtype="JETL" window="8" ptmin="10" etamin="-49" etamax="49" priority="0"/>
+    <MinimumTOBPt thrtype="TAU" ptmin="2" etamin="-49" etamax="49" priority="0"/>
+    <MinimumTOBPt thrtype="JETS" window="4" ptmin="12" etamin="-49" etamax="49" priority="0"/>
+    <MinimumTOBPt thrtype="JETL" window="8" ptmin="12" etamin="-49" etamax="49" priority="0"/>
   </CaloInfo>
   <MuctpiInfo name="muctpi" low_pt="1" high_pt="1" max_cand="13"/>
 </LVL1Config>
diff --git a/Trigger/TriggerCommon/TriggerMenuXML/data/LVL1config_Physics_HI_v5.xml b/Trigger/TriggerCommon/TriggerMenuXML/data/LVL1config_Physics_HI_v5.xml
index df08db28073252f0f52d34fd017980a1e2cdde10..e84c562c6c624835cd12cc488bc76f7edc85e873 100644
--- a/Trigger/TriggerCommon/TriggerMenuXML/data/LVL1config_Physics_HI_v5.xml
+++ b/Trigger/TriggerCommon/TriggerMenuXML/data/LVL1config_Physics_HI_v5.xml
@@ -3,7 +3,7 @@
 <LVL1Config name="Physics_HI_v5" ctpVersion="4" l1Version="1">
   <!--File is generated by TriggerMenu-->
   <!--No. L1 thresholds defined: 316-->
-  <!--No. L1 items defined: 292-->
+  <!--No. L1 items defined: 342-->
   <TriggerMenu name="Physics_HI_v5" phase="lumi">
     <TriggerItem ctpid="0" partition="1" name="L1_EM18" complex_deadtime="0" definition="(EM18[x1]&amp;BGRP0&amp;BGRP1)" trigger_type="10000100" monitor="LF:000|HF:000">
       <AND>
@@ -54,23 +54,24 @@
         <InternalTrigger name="BGRP3"/>
       </AND>
     </TriggerItem>
-    <TriggerItem ctpid="7" partition="1" name="L1_3MU6" complex_deadtime="0" definition="(MU6[x3]&amp;BGRP0&amp;BGRP1)" trigger_type="10001000" monitor="LF:000|HF:000">
+    <TriggerItem ctpid="7" partition="1" name="L1_HT190-J15s5.ETA21" complex_deadtime="0" definition="(HT190-J15s5.ETA21[x1]&amp;BGRP0&amp;BGRP1)" trigger_type="10000000" monitor="LF:000|HF:000">
       <AND>
-        <TriggerCondition multi="3" name="MU6_x3" triggerthreshold="MU6"/>
+        <TriggerCondition multi="1" name="HT190-J15s5.ETA21_x1" triggerthreshold="HT190-J15s5.ETA21"/>
         <InternalTrigger name="BGRP0"/>
         <InternalTrigger name="BGRP1"/>
       </AND>
     </TriggerItem>
-    <TriggerItem ctpid="8" partition="1" name="L1_J75" complex_deadtime="0" definition="(J75[x1]&amp;BGRP0&amp;BGRP1)" trigger_type="10000100" monitor="LF:000|HF:000">
+    <TriggerItem ctpid="8" partition="1" name="L1_BPH-0M9-EM7-EM5_2MU4" complex_deadtime="0" definition="(MU4[x2]&amp;0INVM9-EM7ab-EMab[x1]&amp;BGRP0&amp;BGRP1)" trigger_type="10000000" monitor="LF:000|HF:000">
       <AND>
-        <TriggerCondition multi="1" name="J75_x1" triggerthreshold="J75"/>
+        <TriggerCondition multi="2" name="MU4_x2" triggerthreshold="MU4"/>
+        <TriggerCondition multi="1" name="0INVM9-EM7ab-EMab_x1" triggerthreshold="0INVM9-EM7ab-EMab"/>
         <InternalTrigger name="BGRP0"/>
         <InternalTrigger name="BGRP1"/>
       </AND>
     </TriggerItem>
-    <TriggerItem ctpid="9" partition="1" name="L1_J175" complex_deadtime="0" definition="(J175[x1]&amp;BGRP0&amp;BGRP1)" trigger_type="10000100" monitor="LF:000|HF:000">
+    <TriggerItem ctpid="9" partition="1" name="L1_2EM16" complex_deadtime="0" definition="(EM16[x2]&amp;BGRP0&amp;BGRP1)" trigger_type="10000100" monitor="LF:000|HF:000">
       <AND>
-        <TriggerCondition multi="1" name="J175_x1" triggerthreshold="J175"/>
+        <TriggerCondition multi="2" name="EM16_x2" triggerthreshold="EM16"/>
         <InternalTrigger name="BGRP0"/>
         <InternalTrigger name="BGRP1"/>
       </AND>
@@ -96,16 +97,18 @@
         <InternalTrigger name="BGRP1"/>
       </AND>
     </TriggerItem>
-    <TriggerItem ctpid="13" partition="1" name="L1_2J15" complex_deadtime="0" definition="(J15[x2]&amp;BGRP0&amp;BGRP1)" trigger_type="10000100" monitor="LF:000|HF:000">
+    <TriggerItem ctpid="13" partition="1" name="L1_BPH-0M9-EM7-EM5_MU6" complex_deadtime="0" definition="(MU6[x1]&amp;0INVM9-EM7ab-EMab[x1]&amp;BGRP0&amp;BGRP1)" trigger_type="10000000" monitor="LF:000|HF:000">
       <AND>
-        <TriggerCondition multi="2" name="J15_x2" triggerthreshold="J15"/>
+        <TriggerCondition multi="1" name="MU6_x1" triggerthreshold="MU6"/>
+        <TriggerCondition multi="1" name="0INVM9-EM7ab-EMab_x1" triggerthreshold="0INVM9-EM7ab-EMab"/>
         <InternalTrigger name="BGRP0"/>
         <InternalTrigger name="BGRP1"/>
       </AND>
     </TriggerItem>
-    <TriggerItem ctpid="14" partition="1" name="L1_J10.31ETA49" complex_deadtime="0" definition="(J10.31ETA49[x1]&amp;BGRP0&amp;BGRP1)" trigger_type="10000100" monitor="LF:000|HF:000">
+    <TriggerItem ctpid="14" partition="1" name="L1_BPH-0DR3-EM7J15_2MU4" complex_deadtime="0" definition="(MU4[x2]&amp;0DR03-EM7ab-CJ15ab[x1]&amp;BGRP0&amp;BGRP1)" trigger_type="10000000" monitor="LF:000|HF:000">
       <AND>
-        <TriggerCondition multi="1" name="J10.31ETA49_x1" triggerthreshold="J10.31ETA49"/>
+        <TriggerCondition multi="2" name="MU4_x2" triggerthreshold="MU4"/>
+        <TriggerCondition multi="1" name="0DR03-EM7ab-CJ15ab_x1" triggerthreshold="0DR03-EM7ab-CJ15ab"/>
         <InternalTrigger name="BGRP0"/>
         <InternalTrigger name="BGRP1"/>
       </AND>
@@ -154,55 +157,46 @@
         <InternalTrigger name="BGRP4"/>
       </AND>
     </TriggerItem>
-    <TriggerItem ctpid="21" partition="1" name="L1_MBTS_1_1_VTE50" complex_deadtime="0" definition="(MBTS_A[x1]&amp;MBTS_C[x1]&amp;!TE50[x1]&amp;BGRP0&amp;BGRP1)" trigger_type="10100000" monitor="LF:000|HF:000">
+    <TriggerItem ctpid="21" partition="1" name="L1_BPH-0DR3-EM7J15_MU6" complex_deadtime="0" definition="(MU6[x1]&amp;0DR03-EM7ab-CJ15ab[x1]&amp;BGRP0&amp;BGRP1)" trigger_type="10000000" monitor="LF:111|HF:000">
       <AND>
-        <TriggerCondition multi="1" name="MBTS_A_x1" triggerthreshold="MBTS_A"/>
-        <TriggerCondition multi="1" name="MBTS_C_x1" triggerthreshold="MBTS_C"/>
-        <NOT>
-          <TriggerCondition multi="1" name="TE50_x1" triggerthreshold="TE50"/>
-        </NOT>
+        <TriggerCondition multi="1" name="MU6_x1" triggerthreshold="MU6"/>
+        <TriggerCondition multi="1" name="0DR03-EM7ab-CJ15ab_x1" triggerthreshold="0DR03-EM7ab-CJ15ab"/>
         <InternalTrigger name="BGRP0"/>
         <InternalTrigger name="BGRP1"/>
       </AND>
     </TriggerItem>
-    <TriggerItem ctpid="22" partition="1" name="L1_MBTS_2_2_VTE50" complex_deadtime="0" definition="(MBTS_A[x2]&amp;MBTS_C[x2]&amp;!TE50[x1]&amp;BGRP0&amp;BGRP1)" trigger_type="10100000" monitor="LF:000|HF:000">
+    <TriggerItem ctpid="22" partition="1" name="L1_JPSI-1M5-EM7" complex_deadtime="0" definition="(1INVM5-EM7s1-EMs6[x1]&amp;BGRP0&amp;BGRP1)" trigger_type="10000000" monitor="LF:111|HF:000">
       <AND>
-        <TriggerCondition multi="2" name="MBTS_A_x2" triggerthreshold="MBTS_A"/>
-        <TriggerCondition multi="2" name="MBTS_C_x2" triggerthreshold="MBTS_C"/>
-        <NOT>
-          <TriggerCondition multi="1" name="TE50_x1" triggerthreshold="TE50"/>
-        </NOT>
+        <TriggerCondition multi="1" name="1INVM5-EM7s1-EMs6_x1" triggerthreshold="1INVM5-EM7s1-EMs6"/>
         <InternalTrigger name="BGRP0"/>
         <InternalTrigger name="BGRP1"/>
       </AND>
     </TriggerItem>
-    <TriggerItem ctpid="23" partition="1" name="L1_TE5_NZ" complex_deadtime="0" definition="(TE5[x1]&amp;!ZDC_AND[x1]&amp;BGRP0&amp;BGRP1)" trigger_type="10000100" monitor="LF:000|HF:000">
+    <TriggerItem ctpid="23" partition="1" name="L1_JPSI-1M5-EM12" complex_deadtime="0" definition="(1INVM5-EM12s1-EMs6[x1]&amp;BGRP0&amp;BGRP1)" trigger_type="10000000" monitor="LF:000|HF:000">
       <AND>
-        <TriggerCondition multi="1" name="TE5_x1" triggerthreshold="TE5"/>
-        <NOT>
-          <TriggerCondition multi="1" name="ZDC_AND_x1" triggerthreshold="ZDC_AND"/>
-        </NOT>
+        <TriggerCondition multi="1" name="1INVM5-EM12s1-EMs6_x1" triggerthreshold="1INVM5-EM12s1-EMs6"/>
         <InternalTrigger name="BGRP0"/>
         <InternalTrigger name="BGRP1"/>
       </AND>
     </TriggerItem>
-    <TriggerItem ctpid="24" partition="1" name="L1_TE5000.0ETA49" complex_deadtime="0" definition="(TE5000.0ETA49[x1]&amp;BGRP0&amp;BGRP1)" trigger_type="10000100" monitor="LF:000|HF:000">
+    <TriggerItem ctpid="24" partition="1" name="L1_MJJ-500-NFF" complex_deadtime="0" definition="(500INVM9999-J30s6-AJ20s6[x1]&amp;BGRP0&amp;BGRP1)" trigger_type="10000000" monitor="LF:111|HF:000">
       <AND>
-        <TriggerCondition multi="1" name="TE5000.0ETA49_x1" triggerthreshold="TE5000.0ETA49"/>
+        <TriggerCondition multi="1" name="500INVM9999-J30s6-AJ20s6_x1" triggerthreshold="500INVM9999-J30s6-AJ20s6"/>
         <InternalTrigger name="BGRP0"/>
         <InternalTrigger name="BGRP1"/>
       </AND>
     </TriggerItem>
-    <TriggerItem ctpid="25" partition="1" name="L1_TE5000.0ETA49_OVERLAY" complex_deadtime="0" definition="(TE5000.0ETA49[x1]&amp;BGRP0&amp;BGRP1)" trigger_type="10000010" monitor="LF:000|HF:000">
+    <TriggerItem ctpid="25" partition="1" name="L1_MJJ-700" complex_deadtime="0" definition="(700INVM9999-AJ30s6-AJ20s6[x1]&amp;BGRP0&amp;BGRP1)" trigger_type="10000000" monitor="LF:000|HF:000">
       <AND>
-        <TriggerCondition multi="1" name="TE5000.0ETA49_x1" triggerthreshold="TE5000.0ETA49"/>
+        <TriggerCondition multi="1" name="700INVM9999-AJ30s6-AJ20s6_x1" triggerthreshold="700INVM9999-AJ30s6-AJ20s6"/>
         <InternalTrigger name="BGRP0"/>
         <InternalTrigger name="BGRP1"/>
       </AND>
     </TriggerItem>
-    <TriggerItem ctpid="26" partition="1" name="L1_TE6500.0ETA49_OVERLAY" complex_deadtime="0" definition="(TE6500.0ETA49[x1]&amp;BGRP0&amp;BGRP1)" trigger_type="10000010" monitor="LF:000|HF:000">
+    <TriggerItem ctpid="26" partition="1" name="L1_EM18VH_MJJ-300" complex_deadtime="0" definition="(EM18VH[x1]&amp;300INVM9999-AJ30s6-AJ20s6[x1]&amp;BGRP0&amp;BGRP1)" trigger_type="10000000" monitor="LF:000|HF:000">
       <AND>
-        <TriggerCondition multi="1" name="TE6500.0ETA49_x1" triggerthreshold="TE6500.0ETA49"/>
+        <TriggerCondition multi="1" name="EM18VH_x1" triggerthreshold="EM18VH"/>
+        <TriggerCondition multi="1" name="300INVM9999-AJ30s6-AJ20s6_x1" triggerthreshold="300INVM9999-AJ30s6-AJ20s6"/>
         <InternalTrigger name="BGRP0"/>
         <InternalTrigger name="BGRP1"/>
       </AND>
@@ -217,72 +211,64 @@
         <InternalTrigger name="BGRP1"/>
       </AND>
     </TriggerItem>
-    <TriggerItem ctpid="28" partition="1" name="L1_BCM_Wide" complex_deadtime="0" definition="(BCM_Wide[x1]&amp;BGRP0&amp;BGRP1)" trigger_type="10100000" monitor="LF:000|HF:000">
+    <TriggerItem ctpid="28" partition="1" name="L1_HT150-J20s5.ETA31_MJJ-400-CF" complex_deadtime="0" definition="(HT150-J20s5.ETA31[x1]&amp;400INVM9999-AJ30s6.ETA31-AJ20s6.31ETA49[x1]&amp;BGRP0&amp;BGRP1)" trigger_type="10000000" monitor="LF:000|HF:000">
       <AND>
-        <TriggerCondition multi="1" name="BCM_Wide_x1" triggerthreshold="BCM_Wide"/>
+        <TriggerCondition multi="1" name="HT150-J20s5.ETA31_x1" triggerthreshold="HT150-J20s5.ETA31"/>
+        <TriggerCondition multi="1" name="400INVM9999-AJ30s6.ETA31-AJ20s6.31ETA49_x1" triggerthreshold="400INVM9999-AJ30s6.ETA31-AJ20s6.31ETA49"/>
         <InternalTrigger name="BGRP0"/>
         <InternalTrigger name="BGRP1"/>
       </AND>
     </TriggerItem>
-    <TriggerItem ctpid="29" partition="1" name="L1_J15_NZ" complex_deadtime="0" definition="(J15[x1]&amp;!ZDC_AND[x1]&amp;BGRP0&amp;BGRP1)" trigger_type="10000100" monitor="LF:000|HF:000">
+    <TriggerItem ctpid="29" partition="1" name="L1_30M-EM20ITAU12" complex_deadtime="0" definition="(DISAMB-30INVM-EM20his2-TAU12ab[x1]&amp;BGRP0&amp;BGRP1)" trigger_type="10000000" monitor="LF:000|HF:000">
       <AND>
-        <TriggerCondition multi="1" name="J15_x1" triggerthreshold="J15"/>
-        <NOT>
-          <TriggerCondition multi="1" name="ZDC_AND_x1" triggerthreshold="ZDC_AND"/>
-        </NOT>
+        <TriggerCondition multi="1" name="DISAMB-30INVM-EM20his2-TAU12ab_x1" triggerthreshold="DISAMB-30INVM-EM20his2-TAU12ab"/>
         <InternalTrigger name="BGRP0"/>
         <InternalTrigger name="BGRP1"/>
       </AND>
     </TriggerItem>
-    <TriggerItem ctpid="30" partition="1" name="L1_2J15_NZ" complex_deadtime="0" definition="(J15[x2]&amp;!ZDC_AND[x1]&amp;BGRP0&amp;BGRP1)" trigger_type="10000100" monitor="LF:000|HF:000">
+    <TriggerItem ctpid="30" partition="1" name="L1_LLP-RO" complex_deadtime="0" definition="(100RATIO-0MATCH-TAU30si2-EMall[x1]&amp;BGRP0&amp;BGRP1)" trigger_type="10000000" monitor="LF:000|HF:000">
       <AND>
-        <TriggerCondition multi="2" name="J15_x2" triggerthreshold="J15"/>
-        <NOT>
-          <TriggerCondition multi="1" name="ZDC_AND_x1" triggerthreshold="ZDC_AND"/>
-        </NOT>
+        <TriggerCondition multi="1" name="100RATIO-0MATCH-TAU30si2-EMall_x1" triggerthreshold="100RATIO-0MATCH-TAU30si2-EMall"/>
         <InternalTrigger name="BGRP0"/>
         <InternalTrigger name="BGRP1"/>
       </AND>
     </TriggerItem>
-    <TriggerItem ctpid="31" partition="1" name="L1_J15_NL" complex_deadtime="0" definition="(J15[x1]&amp;!LUCID_A[x1]&amp;!LUCID_C[x1]&amp;BGRP0&amp;BGRP1)" trigger_type="10000100" monitor="LF:000|HF:000">
+    <TriggerItem ctpid="31" partition="1" name="L1_LLP-NOMATCH" complex_deadtime="0" definition="(NOT-0MATCH-TAU30si1-EMall[x1]&amp;BGRP0&amp;BGRP1)" trigger_type="10000000" monitor="LF:000|HF:000">
       <AND>
-        <TriggerCondition multi="1" name="J15_x1" triggerthreshold="J15"/>
-        <NOT>
-          <TriggerCondition multi="1" name="LUCID_A_x1" triggerthreshold="LUCID_A"/>
-        </NOT>
-        <NOT>
-          <TriggerCondition multi="1" name="LUCID_C_x1" triggerthreshold="LUCID_C"/>
-        </NOT>
+        <TriggerCondition multi="1" name="NOT-0MATCH-TAU30si1-EMall_x1" triggerthreshold="NOT-0MATCH-TAU30si1-EMall"/>
         <InternalTrigger name="BGRP0"/>
         <InternalTrigger name="BGRP1"/>
       </AND>
     </TriggerItem>
-    <TriggerItem ctpid="32" partition="1" name="L1_2J15_NL" complex_deadtime="0" definition="(J15[x2]&amp;!LUCID_A[x1]&amp;!LUCID_C[x1]&amp;BGRP0&amp;BGRP1)" trigger_type="10000100" monitor="LF:000|HF:000">
+    <TriggerItem ctpid="32" partition="1" name="L1_2MU4_J20_XE30_DPHI-J20s2XE30" complex_deadtime="0" definition="(MU4[x2]&amp;J20[x1]&amp;XE30[x1]&amp;10MINDPHI-J20s2-XE30[x1]&amp;BGRP0&amp;BGRP1)" trigger_type="10000000" monitor="LF:000|HF:000">
       <AND>
-        <TriggerCondition multi="2" name="J15_x2" triggerthreshold="J15"/>
-        <NOT>
-          <TriggerCondition multi="1" name="LUCID_A_x1" triggerthreshold="LUCID_A"/>
-        </NOT>
-        <NOT>
-          <TriggerCondition multi="1" name="LUCID_C_x1" triggerthreshold="LUCID_C"/>
-        </NOT>
+        <TriggerCondition multi="2" name="MU4_x2" triggerthreshold="MU4"/>
+        <TriggerCondition multi="1" name="J20_x1" triggerthreshold="J20"/>
+        <TriggerCondition multi="1" name="XE30_x1" triggerthreshold="XE30"/>
+        <TriggerCondition multi="1" name="10MINDPHI-J20s2-XE30_x1" triggerthreshold="10MINDPHI-J20s2-XE30"/>
         <InternalTrigger name="BGRP0"/>
         <InternalTrigger name="BGRP1"/>
       </AND>
     </TriggerItem>
-    <TriggerItem ctpid="33" partition="1" name="L1_ZDC_A_C_BGRP7" complex_deadtime="0" definition="(ZDC_A[x1]&amp;ZDC_C[x1]&amp;BGRP0&amp;BGRP7)" trigger_type="10100000" monitor="LF:000|HF:000">
+    <TriggerItem ctpid="33" partition="1" name="L1_MU4_J30_XE40_DPHI-J20s2XE30" complex_deadtime="0" definition="(MU4[x1]&amp;J30[x1]&amp;XE40[x1]&amp;10MINDPHI-J20s2-XE30[x1]&amp;BGRP0&amp;BGRP1)" trigger_type="10000000" monitor="LF:000|HF:000">
       <AND>
-        <TriggerCondition multi="1" name="ZDC_A_x1" triggerthreshold="ZDC_A"/>
-        <TriggerCondition multi="1" name="ZDC_C_x1" triggerthreshold="ZDC_C"/>
+        <TriggerCondition multi="1" name="MU4_x1" triggerthreshold="MU4"/>
+        <TriggerCondition multi="1" name="J30_x1" triggerthreshold="J30"/>
+        <TriggerCondition multi="1" name="XE40_x1" triggerthreshold="XE40"/>
+        <TriggerCondition multi="1" name="10MINDPHI-J20s2-XE30_x1" triggerthreshold="10MINDPHI-J20s2-XE30"/>
         <InternalTrigger name="BGRP0"/>
-        <InternalTrigger name="BGRP7"/>
+        <InternalTrigger name="BGRP1"/>
       </AND>
     </TriggerItem>
-    <TriggerItem ctpid="34" partition="1" name="L1_TAU12_UNPAIRED_ISO" complex_deadtime="0" definition="(HA12[x1]&amp;BGRP0&amp;BGRP4)" trigger_type="10000100" monitor="LF:000|HF:000">
+    <TriggerItem ctpid="34" partition="1" name="L1_ZDC_A_C_VTE50_PEB" complex_deadtime="0" definition="(ZDC_A[x1]&amp;ZDC_C[x1]&amp;!TE50[x1]&amp;BGRP0&amp;BGRP1)" trigger_type="10100000" monitor="LF:000|HF:000">
       <AND>
-        <TriggerCondition multi="1" name="HA12_x1" triggerthreshold="HA12"/>
+        <TriggerCondition multi="1" name="ZDC_A_x1" triggerthreshold="ZDC_A"/>
+        <TriggerCondition multi="1" name="ZDC_C_x1" triggerthreshold="ZDC_C"/>
+        <NOT>
+          <TriggerCondition multi="1" name="TE50_x1" triggerthreshold="TE50"/>
+        </NOT>
         <InternalTrigger name="BGRP0"/>
-        <InternalTrigger name="BGRP4"/>
+        <InternalTrigger name="BGRP1"/>
       </AND>
     </TriggerItem>
     <TriggerItem ctpid="35" partition="1" name="L1_2MU4_VTE50" complex_deadtime="0" definition="(MU4[x2]&amp;!TE50[x1]&amp;BGRP0&amp;BGRP1)" trigger_type="10001000" monitor="LF:000|HF:000">
@@ -430,11 +416,14 @@
         <InternalTrigger name="BGRP7"/>
       </AND>
     </TriggerItem>
-    <TriggerItem ctpid="49" partition="1" name="L1_TAU12_UNPAIRED_NONISO" complex_deadtime="0" definition="(HA12[x1]&amp;BGRP0&amp;BGRP5)" trigger_type="10000100" monitor="LF:000|HF:000">
+    <TriggerItem ctpid="49" partition="1" name="L1_MU4_J50_XE50_DPHI-J20s2XE30" complex_deadtime="0" definition="(MU4[x1]&amp;J50[x1]&amp;XE50[x1]&amp;10MINDPHI-J20s2-XE30[x1]&amp;BGRP0&amp;BGRP1)" trigger_type="10000000" monitor="LF:000|HF:000">
       <AND>
-        <TriggerCondition multi="1" name="HA12_x1" triggerthreshold="HA12"/>
+        <TriggerCondition multi="1" name="MU4_x1" triggerthreshold="MU4"/>
+        <TriggerCondition multi="1" name="J50_x1" triggerthreshold="J50"/>
+        <TriggerCondition multi="1" name="XE50_x1" triggerthreshold="XE50"/>
+        <TriggerCondition multi="1" name="10MINDPHI-J20s2-XE30_x1" triggerthreshold="10MINDPHI-J20s2-XE30"/>
         <InternalTrigger name="BGRP0"/>
-        <InternalTrigger name="BGRP5"/>
+        <InternalTrigger name="BGRP1"/>
       </AND>
     </TriggerItem>
     <TriggerItem ctpid="50" partition="1" name="L1_MBTSC4" complex_deadtime="0" definition="(MBTS_C4[x1]&amp;BGRP0&amp;BGRP1)" trigger_type="10100000" monitor="LF:000|HF:000">
@@ -472,11 +461,13 @@
         <InternalTrigger name="BGRP1"/>
       </AND>
     </TriggerItem>
-    <TriggerItem ctpid="55" partition="1" name="L1_TAU12_EMPTY" complex_deadtime="0" definition="(HA12[x1]&amp;BGRP0&amp;BGRP3)" trigger_type="10000100" monitor="LF:000|HF:000">
+    <TriggerItem ctpid="55" partition="1" name="L1_J40_XE50_DPHI-J20s2XE50" complex_deadtime="0" definition="(J40[x1]&amp;XE50[x1]&amp;10MINDPHI-J20s2-XE50[x1]&amp;BGRP0&amp;BGRP1)" trigger_type="10000000" monitor="LF:000|HF:000">
       <AND>
-        <TriggerCondition multi="1" name="HA12_x1" triggerthreshold="HA12"/>
+        <TriggerCondition multi="1" name="J40_x1" triggerthreshold="J40"/>
+        <TriggerCondition multi="1" name="XE50_x1" triggerthreshold="XE50"/>
+        <TriggerCondition multi="1" name="10MINDPHI-J20s2-XE50_x1" triggerthreshold="10MINDPHI-J20s2-XE50"/>
         <InternalTrigger name="BGRP0"/>
-        <InternalTrigger name="BGRP3"/>
+        <InternalTrigger name="BGRP1"/>
       </AND>
     </TriggerItem>
     <TriggerItem ctpid="56" partition="1" name="L1_MBTSC10" complex_deadtime="0" definition="(MBTS_C10[x1]&amp;BGRP0&amp;BGRP1)" trigger_type="10100000" monitor="LF:000|HF:000">
@@ -486,11 +477,11 @@
         <InternalTrigger name="BGRP1"/>
       </AND>
     </TriggerItem>
-    <TriggerItem ctpid="57" partition="1" name="L1_TAU12_FIRSTEMPTY" complex_deadtime="0" definition="(HA12[x1]&amp;BGRP0&amp;BGRP6)" trigger_type="10000100" monitor="LF:000|HF:000">
+    <TriggerItem ctpid="57" partition="1" name="L1_DPHI-2EM3" complex_deadtime="0" definition="(27DPHI32-EMs1-EMs6[x1]&amp;BGRP0&amp;BGRP1)" trigger_type="10000000" monitor="LF:111|HF:000">
       <AND>
-        <TriggerCondition multi="1" name="HA12_x1" triggerthreshold="HA12"/>
+        <TriggerCondition multi="1" name="27DPHI32-EMs1-EMs6_x1" triggerthreshold="27DPHI32-EMs1-EMs6"/>
         <InternalTrigger name="BGRP0"/>
-        <InternalTrigger name="BGRP6"/>
+        <InternalTrigger name="BGRP1"/>
       </AND>
     </TriggerItem>
     <TriggerItem ctpid="58" partition="1" name="L1_MBTSC12" complex_deadtime="0" definition="(MBTS_C12[x1]&amp;BGRP0&amp;BGRP1)" trigger_type="10100000" monitor="LF:000|HF:000">
@@ -500,11 +491,11 @@
         <InternalTrigger name="BGRP1"/>
       </AND>
     </TriggerItem>
-    <TriggerItem ctpid="59" partition="1" name="L1_J10.31ETA49_EMPTY" complex_deadtime="0" definition="(J10.31ETA49[x1]&amp;BGRP0&amp;BGRP3)" trigger_type="10000100" monitor="LF:000|HF:000">
+    <TriggerItem ctpid="59" partition="1" name="L1_LAR-ZEE" complex_deadtime="0" definition="(ZEE-EM20shi2[x1]&amp;BGRP0&amp;BGRP1)" trigger_type="10000100" monitor="LF:111|HF:000">
       <AND>
-        <TriggerCondition multi="1" name="J10.31ETA49_x1" triggerthreshold="J10.31ETA49"/>
+        <TriggerCondition multi="1" name="ZEE-EM20shi2_x1" triggerthreshold="ZEE-EM20shi2"/>
         <InternalTrigger name="BGRP0"/>
-        <InternalTrigger name="BGRP3"/>
+        <InternalTrigger name="BGRP1"/>
       </AND>
     </TriggerItem>
     <TriggerItem ctpid="60" partition="1" name="L1_MBTSC14" complex_deadtime="0" definition="(MBTS_C14[x1]&amp;BGRP0&amp;BGRP1)" trigger_type="10100000" monitor="LF:000|HF:000">
@@ -514,11 +505,12 @@
         <InternalTrigger name="BGRP1"/>
       </AND>
     </TriggerItem>
-    <TriggerItem ctpid="61" partition="1" name="L1_ZDC_AND_EMPTY" complex_deadtime="0" definition="(ZDC_AND[x1]&amp;BGRP0&amp;BGRP3)" trigger_type="10100000" monitor="LF:000|HF:000">
+    <TriggerItem ctpid="61" partition="1" name="L1_LAR-ZEE_LAR-EM" complex_deadtime="0" definition="(ZEE-EM20shi2[x1]&amp;LAR-EM20shi1[x1]&amp;BGRP0&amp;BGRP1)" trigger_type="10010000" monitor="LF:000|HF:000">
       <AND>
-        <TriggerCondition multi="1" name="ZDC_AND_x1" triggerthreshold="ZDC_AND"/>
+        <TriggerCondition multi="1" name="ZEE-EM20shi2_x1" triggerthreshold="ZEE-EM20shi2"/>
+        <TriggerCondition multi="1" name="LAR-EM20shi1_x1" triggerthreshold="LAR-EM20shi1"/>
         <InternalTrigger name="BGRP0"/>
-        <InternalTrigger name="BGRP3"/>
+        <InternalTrigger name="BGRP1"/>
       </AND>
     </TriggerItem>
     <TriggerItem ctpid="62" partition="1" name="L1_RD0_EMPTY" complex_deadtime="0" definition="(RNDM0&amp;BGRP0&amp;BGRP3)" trigger_type="10000001" monitor="LF:000|HF:000">
@@ -535,11 +527,11 @@
         <InternalTrigger name="BGRP1"/>
       </AND>
     </TriggerItem>
-    <TriggerItem ctpid="64" partition="1" name="L1_ZDC_AND_UNPAIRED_ISO" complex_deadtime="0" definition="(ZDC_AND[x1]&amp;BGRP0&amp;BGRP4)" trigger_type="10100000" monitor="LF:000|HF:000">
+    <TriggerItem ctpid="64" partition="1" name="L1_TAU2" complex_deadtime="0" definition="(HA2[x1]&amp;BGRP0&amp;BGRP1)" trigger_type="10000100" monitor="LF:000|HF:000">
       <AND>
-        <TriggerCondition multi="1" name="ZDC_AND_x1" triggerthreshold="ZDC_AND"/>
+        <TriggerCondition multi="1" name="HA2_x1" triggerthreshold="HA2"/>
         <InternalTrigger name="BGRP0"/>
-        <InternalTrigger name="BGRP4"/>
+        <InternalTrigger name="BGRP1"/>
       </AND>
     </TriggerItem>
     <TriggerItem ctpid="65" partition="1" name="L1_MBTSC3" complex_deadtime="0" definition="(MBTS_C3[x1]&amp;BGRP0&amp;BGRP1)" trigger_type="10100000" monitor="LF:000|HF:000">
@@ -549,11 +541,11 @@
         <InternalTrigger name="BGRP1"/>
       </AND>
     </TriggerItem>
-    <TriggerItem ctpid="66" partition="1" name="L1_ZDC_AND_UNPAIRED_NONISO" complex_deadtime="0" definition="(ZDC_AND[x1]&amp;BGRP0&amp;BGRP5)" trigger_type="10100000" monitor="LF:000|HF:000">
+    <TriggerItem ctpid="66" partition="1" name="L1_TAU3" complex_deadtime="0" definition="(HA3[x1]&amp;BGRP0&amp;BGRP1)" trigger_type="10000100" monitor="LF:000|HF:000">
       <AND>
-        <TriggerCondition multi="1" name="ZDC_AND_x1" triggerthreshold="ZDC_AND"/>
+        <TriggerCondition multi="1" name="HA3_x1" triggerthreshold="HA3"/>
         <InternalTrigger name="BGRP0"/>
-        <InternalTrigger name="BGRP5"/>
+        <InternalTrigger name="BGRP1"/>
       </AND>
     </TriggerItem>
     <TriggerItem ctpid="67" partition="1" name="L1_MU4_FIRSTEMPTY" complex_deadtime="0" definition="(MU4[x1]&amp;BGRP0&amp;BGRP6)" trigger_type="10001000" monitor="LF:000|HF:000">
@@ -570,24 +562,16 @@
         <InternalTrigger name="BGRP6"/>
       </AND>
     </TriggerItem>
-    <TriggerItem ctpid="69" partition="1" name="L1_MLZ_A" complex_deadtime="0" definition="((MBTS_A[x1]|ZDC_A[x1]|LUCID_A[x1])&amp;BGRP0&amp;BGRP1)" trigger_type="10100000" monitor="LF:000|HF:000">
+    <TriggerItem ctpid="69" partition="1" name="L1_DR-EM15TAU12I-J25" complex_deadtime="0" definition="(1DISAMB-J25ab-0DR28-EM15his2-TAU12abi[x1]&amp;BGRP0&amp;BGRP1)" trigger_type="10000000" monitor="LF:000|HF:000">
       <AND>
-        <OR>
-          <TriggerCondition multi="1" name="MBTS_A_x1" triggerthreshold="MBTS_A"/>
-          <TriggerCondition multi="1" name="ZDC_A_x1" triggerthreshold="ZDC_A"/>
-          <TriggerCondition multi="1" name="LUCID_A_x1" triggerthreshold="LUCID_A"/>
-        </OR>
+        <TriggerCondition multi="1" name="1DISAMB-J25ab-0DR28-EM15his2-TAU12abi_x1" triggerthreshold="1DISAMB-J25ab-0DR28-EM15his2-TAU12abi"/>
         <InternalTrigger name="BGRP0"/>
         <InternalTrigger name="BGRP1"/>
       </AND>
     </TriggerItem>
-    <TriggerItem ctpid="70" partition="1" name="L1_MLZ_C" complex_deadtime="0" definition="((MBTS_C[x1]|ZDC_C[x1]|LUCID_C[x1])&amp;BGRP0&amp;BGRP1)" trigger_type="10100000" monitor="LF:000|HF:000">
+    <TriggerItem ctpid="70" partition="1" name="L1_DR-TAU20ITAU12I-J25" complex_deadtime="0" definition="(1DISAMB-J25ab-0DR28-TAU20abi-TAU12abi[x1]&amp;BGRP0&amp;BGRP1)" trigger_type="10000000" monitor="LF:111|HF:000">
       <AND>
-        <OR>
-          <TriggerCondition multi="1" name="MBTS_C_x1" triggerthreshold="MBTS_C"/>
-          <TriggerCondition multi="1" name="ZDC_C_x1" triggerthreshold="ZDC_C"/>
-          <TriggerCondition multi="1" name="LUCID_C_x1" triggerthreshold="LUCID_C"/>
-        </OR>
+        <TriggerCondition multi="1" name="1DISAMB-J25ab-0DR28-TAU20abi-TAU12abi_x1" triggerthreshold="1DISAMB-J25ab-0DR28-TAU20abi-TAU12abi"/>
         <InternalTrigger name="BGRP0"/>
         <InternalTrigger name="BGRP1"/>
       </AND>
@@ -613,23 +597,10 @@
         <InternalTrigger name="BGRP1"/>
       </AND>
     </TriggerItem>
-    <TriggerItem ctpid="74" partition="1" name="L1_MBLZ" complex_deadtime="0" definition="((((MBTS_A[x1]|ZDC_A[x1]|LUCID_A[x1])&amp;(MBTS_C[x1]|ZDC_C[x1]|LUCID_C[x1]))|BCM_Wide[x1])&amp;BGRP0&amp;BGRP1)" trigger_type="10100000" monitor="LF:000|HF:000">
+    <TriggerItem ctpid="74" partition="1" name="L1_TAU60_DR-TAU20ITAU12I" complex_deadtime="0" definition="(HA60[x1]&amp;0DR28-TAU20abi-TAU12abi[x1]&amp;BGRP0&amp;BGRP1)" trigger_type="10000000" monitor="LF:000|HF:000">
       <AND>
-        <OR>
-          <AND>
-            <OR>
-              <TriggerCondition multi="1" name="MBTS_A_x1" triggerthreshold="MBTS_A"/>
-              <TriggerCondition multi="1" name="ZDC_A_x1" triggerthreshold="ZDC_A"/>
-              <TriggerCondition multi="1" name="LUCID_A_x1" triggerthreshold="LUCID_A"/>
-            </OR>
-            <OR>
-              <TriggerCondition multi="1" name="MBTS_C_x1" triggerthreshold="MBTS_C"/>
-              <TriggerCondition multi="1" name="ZDC_C_x1" triggerthreshold="ZDC_C"/>
-              <TriggerCondition multi="1" name="LUCID_C_x1" triggerthreshold="LUCID_C"/>
-            </OR>
-          </AND>
-          <TriggerCondition multi="1" name="BCM_Wide_x1" triggerthreshold="BCM_Wide"/>
-        </OR>
+        <TriggerCondition multi="1" name="HA60_x1" triggerthreshold="HA60"/>
+        <TriggerCondition multi="1" name="0DR28-TAU20abi-TAU12abi_x1" triggerthreshold="0DR28-TAU20abi-TAU12abi"/>
         <InternalTrigger name="BGRP0"/>
         <InternalTrigger name="BGRP1"/>
       </AND>
@@ -648,10 +619,26 @@
         <InternalTrigger name="BGRP1"/>
       </AND>
     </TriggerItem>
-    <TriggerItem ctpid="77" partition="1" name="L1_BGRP0" complex_deadtime="0" definition="(RNDM0&amp;BGRP0)" trigger_type="10000001" monitor="LF:000|HF:000">
+    <TriggerItem ctpid="77" partition="1" name="L1_SC111-CJ15" complex_deadtime="0" definition="(SC111-CJ15ab.ETA26[x1]&amp;BGRP0&amp;BGRP1)" trigger_type="10000000" monitor="LF:111|HF:000">
       <AND>
-        <InternalTrigger name="RNDM0"/>
+        <TriggerCondition multi="1" name="SC111-CJ15ab.ETA26_x1" triggerthreshold="SC111-CJ15ab.ETA26"/>
         <InternalTrigger name="BGRP0"/>
+        <InternalTrigger name="BGRP1"/>
+      </AND>
+    </TriggerItem>
+    <TriggerItem ctpid="78" partition="1" name="L1_J50_DETA20-J50J" complex_deadtime="0" definition="(J50[x1]&amp;0DETA20-J50s1-Js2[x1]&amp;BGRP0&amp;BGRP1)" trigger_type="10000000" monitor="LF:111|HF:000">
+      <AND>
+        <TriggerCondition multi="1" name="J50_x1" triggerthreshold="J50"/>
+        <TriggerCondition multi="1" name="0DETA20-J50s1-Js2_x1" triggerthreshold="0DETA20-J50s1-Js2"/>
+        <InternalTrigger name="BGRP0"/>
+        <InternalTrigger name="BGRP1"/>
+      </AND>
+    </TriggerItem>
+    <TriggerItem ctpid="79" partition="1" name="L1_3MU6" complex_deadtime="0" definition="(MU6[x3]&amp;BGRP0&amp;BGRP1)" trigger_type="10001000" monitor="LF:000|HF:000">
+      <AND>
+        <TriggerCondition multi="3" name="MU6_x3" triggerthreshold="MU6"/>
+        <InternalTrigger name="BGRP0"/>
+        <InternalTrigger name="BGRP1"/>
       </AND>
     </TriggerItem>
     <TriggerItem ctpid="80" partition="1" name="L1_BCM_Wide_BGRP0" complex_deadtime="0" definition="(BCM_Wide[x1]&amp;BGRP0)" trigger_type="10100000" monitor="LF:000|HF:111">
@@ -676,6 +663,13 @@
         <InternalTrigger name="BGRP1"/>
       </AND>
     </TriggerItem>
+    <TriggerItem ctpid="83" partition="1" name="L1_J75" complex_deadtime="0" definition="(J75[x1]&amp;BGRP0&amp;BGRP1)" trigger_type="10000100" monitor="LF:000|HF:000">
+      <AND>
+        <TriggerCondition multi="1" name="J75_x1" triggerthreshold="J75"/>
+        <InternalTrigger name="BGRP0"/>
+        <InternalTrigger name="BGRP1"/>
+      </AND>
+    </TriggerItem>
     <TriggerItem ctpid="84" partition="1" name="L1_EM20" complex_deadtime="0" definition="(EM20[x1]&amp;BGRP0&amp;BGRP1)" trigger_type="10000100" monitor="LF:000|HF:000">
       <AND>
         <TriggerCondition multi="1" name="EM20_x1" triggerthreshold="EM20"/>
@@ -711,6 +705,13 @@
         <InternalTrigger name="BGRP1"/>
       </AND>
     </TriggerItem>
+    <TriggerItem ctpid="89" partition="1" name="L1_J175" complex_deadtime="0" definition="(J175[x1]&amp;BGRP0&amp;BGRP1)" trigger_type="10000100" monitor="LF:000|HF:000">
+      <AND>
+        <TriggerCondition multi="1" name="J175_x1" triggerthreshold="J175"/>
+        <InternalTrigger name="BGRP0"/>
+        <InternalTrigger name="BGRP1"/>
+      </AND>
+    </TriggerItem>
     <TriggerItem ctpid="90" partition="1" name="L1_MU6" complex_deadtime="0" definition="(MU6[x1]&amp;BGRP0&amp;BGRP1)" trigger_type="10001000" monitor="LF:000|HF:000">
       <AND>
         <TriggerCondition multi="1" name="MU6_x1" triggerthreshold="MU6"/>
@@ -739,6 +740,13 @@
         <InternalTrigger name="BGRP1"/>
       </AND>
     </TriggerItem>
+    <TriggerItem ctpid="94" partition="1" name="L1_2J15" complex_deadtime="0" definition="(J15[x2]&amp;BGRP0&amp;BGRP1)" trigger_type="10000100" monitor="LF:000|HF:000">
+      <AND>
+        <TriggerCondition multi="2" name="J15_x2" triggerthreshold="J15"/>
+        <InternalTrigger name="BGRP0"/>
+        <InternalTrigger name="BGRP1"/>
+      </AND>
+    </TriggerItem>
     <TriggerItem ctpid="95" partition="1" name="L1_2MU4" complex_deadtime="0" definition="(MU4[x2]&amp;BGRP0&amp;BGRP1)" trigger_type="10001000" monitor="LF:000|HF:000">
       <AND>
         <TriggerCondition multi="2" name="MU4_x2" triggerthreshold="MU4"/>
@@ -753,6 +761,17 @@
         <InternalTrigger name="BGRP1"/>
       </AND>
     </TriggerItem>
+    <TriggerItem ctpid="97" partition="1" name="L1_MBTS_1_1_VTE50" complex_deadtime="0" definition="(MBTS_A[x1]&amp;MBTS_C[x1]&amp;!TE50[x1]&amp;BGRP0&amp;BGRP1)" trigger_type="10100000" monitor="LF:000|HF:000">
+      <AND>
+        <TriggerCondition multi="1" name="MBTS_A_x1" triggerthreshold="MBTS_A"/>
+        <TriggerCondition multi="1" name="MBTS_C_x1" triggerthreshold="MBTS_C"/>
+        <NOT>
+          <TriggerCondition multi="1" name="TE50_x1" triggerthreshold="TE50"/>
+        </NOT>
+        <InternalTrigger name="BGRP0"/>
+        <InternalTrigger name="BGRP1"/>
+      </AND>
+    </TriggerItem>
     <TriggerItem ctpid="98" partition="1" name="L1_J15" complex_deadtime="0" definition="(J15[x1]&amp;BGRP0&amp;BGRP1)" trigger_type="10000100" monitor="LF:000|HF:000">
       <AND>
         <TriggerCondition multi="1" name="J15_x1" triggerthreshold="J15"/>
@@ -767,6 +786,27 @@
         <InternalTrigger name="BGRP1"/>
       </AND>
     </TriggerItem>
+    <TriggerItem ctpid="100" partition="1" name="L1_MBTS_2_2_VTE50" complex_deadtime="0" definition="(MBTS_A[x2]&amp;MBTS_C[x2]&amp;!TE50[x1]&amp;BGRP0&amp;BGRP1)" trigger_type="10100000" monitor="LF:000|HF:000">
+      <AND>
+        <TriggerCondition multi="2" name="MBTS_A_x2" triggerthreshold="MBTS_A"/>
+        <TriggerCondition multi="2" name="MBTS_C_x2" triggerthreshold="MBTS_C"/>
+        <NOT>
+          <TriggerCondition multi="1" name="TE50_x1" triggerthreshold="TE50"/>
+        </NOT>
+        <InternalTrigger name="BGRP0"/>
+        <InternalTrigger name="BGRP1"/>
+      </AND>
+    </TriggerItem>
+    <TriggerItem ctpid="101" partition="1" name="L1_TE5_NZ" complex_deadtime="0" definition="(TE5[x1]&amp;!ZDC_AND[x1]&amp;BGRP0&amp;BGRP1)" trigger_type="10000100" monitor="LF:000|HF:000">
+      <AND>
+        <TriggerCondition multi="1" name="TE5_x1" triggerthreshold="TE5"/>
+        <NOT>
+          <TriggerCondition multi="1" name="ZDC_AND_x1" triggerthreshold="ZDC_AND"/>
+        </NOT>
+        <InternalTrigger name="BGRP0"/>
+        <InternalTrigger name="BGRP1"/>
+      </AND>
+    </TriggerItem>
     <TriggerItem ctpid="102" partition="1" name="L1_J50" complex_deadtime="0" definition="(J50[x1]&amp;BGRP0&amp;BGRP1)" trigger_type="10000100" monitor="LF:000|HF:000">
       <AND>
         <TriggerCondition multi="1" name="J50_x1" triggerthreshold="J50"/>
@@ -774,6 +814,30 @@
         <InternalTrigger name="BGRP1"/>
       </AND>
     </TriggerItem>
+    <TriggerItem ctpid="103" partition="1" name="L1_TE6500.0ETA49_OVERLAY" complex_deadtime="0" definition="(TE6500.0ETA49[x1]&amp;BGRP0&amp;BGRP1)" trigger_type="10000010" monitor="LF:000|HF:000">
+      <AND>
+        <TriggerCondition multi="1" name="TE6500.0ETA49_x1" triggerthreshold="TE6500.0ETA49"/>
+        <InternalTrigger name="BGRP0"/>
+        <InternalTrigger name="BGRP1"/>
+      </AND>
+    </TriggerItem>
+    <TriggerItem ctpid="104" partition="1" name="L1_BCM_Wide" complex_deadtime="0" definition="(BCM_Wide[x1]&amp;BGRP0&amp;BGRP1)" trigger_type="10100000" monitor="LF:000|HF:000">
+      <AND>
+        <TriggerCondition multi="1" name="BCM_Wide_x1" triggerthreshold="BCM_Wide"/>
+        <InternalTrigger name="BGRP0"/>
+        <InternalTrigger name="BGRP1"/>
+      </AND>
+    </TriggerItem>
+    <TriggerItem ctpid="105" partition="1" name="L1_J15_NZ" complex_deadtime="0" definition="(J15[x1]&amp;!ZDC_AND[x1]&amp;BGRP0&amp;BGRP1)" trigger_type="10000100" monitor="LF:000|HF:000">
+      <AND>
+        <TriggerCondition multi="1" name="J15_x1" triggerthreshold="J15"/>
+        <NOT>
+          <TriggerCondition multi="1" name="ZDC_AND_x1" triggerthreshold="ZDC_AND"/>
+        </NOT>
+        <InternalTrigger name="BGRP0"/>
+        <InternalTrigger name="BGRP1"/>
+      </AND>
+    </TriggerItem>
     <TriggerItem ctpid="106" partition="1" name="L1_BCM_AC_CA_UNPAIRED_ISO" complex_deadtime="0" definition="((BCM_AtoC[x1]|BCM_CtoA[x1])&amp;BGRP0&amp;BGRP4)" trigger_type="10100000" monitor="LF:000|HF:000">
       <AND>
         <OR>
@@ -798,6 +862,50 @@
         <InternalTrigger name="BGRP4"/>
       </AND>
     </TriggerItem>
+    <TriggerItem ctpid="109" partition="1" name="L1_2J15_NZ" complex_deadtime="0" definition="(J15[x2]&amp;!ZDC_AND[x1]&amp;BGRP0&amp;BGRP1)" trigger_type="10000100" monitor="LF:000|HF:000">
+      <AND>
+        <TriggerCondition multi="2" name="J15_x2" triggerthreshold="J15"/>
+        <NOT>
+          <TriggerCondition multi="1" name="ZDC_AND_x1" triggerthreshold="ZDC_AND"/>
+        </NOT>
+        <InternalTrigger name="BGRP0"/>
+        <InternalTrigger name="BGRP1"/>
+      </AND>
+    </TriggerItem>
+    <TriggerItem ctpid="110" partition="1" name="L1_J15_NL" complex_deadtime="0" definition="(J15[x1]&amp;!LUCID_A[x1]&amp;!LUCID_C[x1]&amp;BGRP0&amp;BGRP1)" trigger_type="10000100" monitor="LF:000|HF:000">
+      <AND>
+        <TriggerCondition multi="1" name="J15_x1" triggerthreshold="J15"/>
+        <NOT>
+          <TriggerCondition multi="1" name="LUCID_A_x1" triggerthreshold="LUCID_A"/>
+        </NOT>
+        <NOT>
+          <TriggerCondition multi="1" name="LUCID_C_x1" triggerthreshold="LUCID_C"/>
+        </NOT>
+        <InternalTrigger name="BGRP0"/>
+        <InternalTrigger name="BGRP1"/>
+      </AND>
+    </TriggerItem>
+    <TriggerItem ctpid="111" partition="1" name="L1_2J15_NL" complex_deadtime="0" definition="(J15[x2]&amp;!LUCID_A[x1]&amp;!LUCID_C[x1]&amp;BGRP0&amp;BGRP1)" trigger_type="10000100" monitor="LF:000|HF:000">
+      <AND>
+        <TriggerCondition multi="2" name="J15_x2" triggerthreshold="J15"/>
+        <NOT>
+          <TriggerCondition multi="1" name="LUCID_A_x1" triggerthreshold="LUCID_A"/>
+        </NOT>
+        <NOT>
+          <TriggerCondition multi="1" name="LUCID_C_x1" triggerthreshold="LUCID_C"/>
+        </NOT>
+        <InternalTrigger name="BGRP0"/>
+        <InternalTrigger name="BGRP1"/>
+      </AND>
+    </TriggerItem>
+    <TriggerItem ctpid="112" partition="1" name="L1_ZDC_A_C_BGRP7" complex_deadtime="0" definition="(ZDC_A[x1]&amp;ZDC_C[x1]&amp;BGRP0&amp;BGRP7)" trigger_type="10100000" monitor="LF:000|HF:000">
+      <AND>
+        <TriggerCondition multi="1" name="ZDC_A_x1" triggerthreshold="ZDC_A"/>
+        <TriggerCondition multi="1" name="ZDC_C_x1" triggerthreshold="ZDC_C"/>
+        <InternalTrigger name="BGRP0"/>
+        <InternalTrigger name="BGRP7"/>
+      </AND>
+    </TriggerItem>
     <TriggerItem ctpid="113" partition="1" name="L1_LUCID_UNPAIRED_ISO" complex_deadtime="0" definition="((LUCID_A[x1]|LUCID_C[x1])&amp;BGRP0&amp;BGRP4)" trigger_type="10100000" monitor="LF:000|HF:000">
       <AND>
         <OR>
@@ -808,12 +916,47 @@
         <InternalTrigger name="BGRP4"/>
       </AND>
     </TriggerItem>
+    <TriggerItem ctpid="114" partition="1" name="L1_TAU12_UNPAIRED_ISO" complex_deadtime="0" definition="(HA12[x1]&amp;BGRP0&amp;BGRP4)" trigger_type="10000100" monitor="LF:000|HF:000">
+      <AND>
+        <TriggerCondition multi="1" name="HA12_x1" triggerthreshold="HA12"/>
+        <InternalTrigger name="BGRP0"/>
+        <InternalTrigger name="BGRP4"/>
+      </AND>
+    </TriggerItem>
+    <TriggerItem ctpid="115" partition="1" name="L1_TAU12_UNPAIRED_NONISO" complex_deadtime="0" definition="(HA12[x1]&amp;BGRP0&amp;BGRP5)" trigger_type="10000100" monitor="LF:000|HF:000">
+      <AND>
+        <TriggerCondition multi="1" name="HA12_x1" triggerthreshold="HA12"/>
+        <InternalTrigger name="BGRP0"/>
+        <InternalTrigger name="BGRP5"/>
+      </AND>
+    </TriggerItem>
+    <TriggerItem ctpid="116" partition="1" name="L1_TAU12_EMPTY" complex_deadtime="0" definition="(HA12[x1]&amp;BGRP0&amp;BGRP3)" trigger_type="10000100" monitor="LF:000|HF:000">
+      <AND>
+        <TriggerCondition multi="1" name="HA12_x1" triggerthreshold="HA12"/>
+        <InternalTrigger name="BGRP0"/>
+        <InternalTrigger name="BGRP3"/>
+      </AND>
+    </TriggerItem>
     <TriggerItem ctpid="117" partition="1" name="L1_ZDC_A_C_UNPAIRED_ISO" complex_deadtime="0" definition="(ZDC_A[x1]&amp;ZDC_C[x1]&amp;BGRP0&amp;BGRP4)" trigger_type="10100000" monitor="LF:000|HF:000">
       <AND>
         <TriggerCondition multi="1" name="ZDC_A_x1" triggerthreshold="ZDC_A"/>
         <TriggerCondition multi="1" name="ZDC_C_x1" triggerthreshold="ZDC_C"/>
         <InternalTrigger name="BGRP0"/>
-        <InternalTrigger name="BGRP4"/>
+        <InternalTrigger name="BGRP4"/>
+      </AND>
+    </TriggerItem>
+    <TriggerItem ctpid="118" partition="1" name="L1_TAU12_FIRSTEMPTY" complex_deadtime="0" definition="(HA12[x1]&amp;BGRP0&amp;BGRP6)" trigger_type="10000100" monitor="LF:000|HF:000">
+      <AND>
+        <TriggerCondition multi="1" name="HA12_x1" triggerthreshold="HA12"/>
+        <InternalTrigger name="BGRP0"/>
+        <InternalTrigger name="BGRP6"/>
+      </AND>
+    </TriggerItem>
+    <TriggerItem ctpid="119" partition="1" name="L1_ZDC_AND_EMPTY" complex_deadtime="0" definition="(ZDC_AND[x1]&amp;BGRP0&amp;BGRP3)" trigger_type="10100000" monitor="LF:000|HF:000">
+      <AND>
+        <TriggerCondition multi="1" name="ZDC_AND_x1" triggerthreshold="ZDC_AND"/>
+        <InternalTrigger name="BGRP0"/>
+        <InternalTrigger name="BGRP3"/>
       </AND>
     </TriggerItem>
     <TriggerItem ctpid="120" partition="1" name="L1_MBTSA0" complex_deadtime="0" definition="(MBTS_A0[x1]&amp;BGRP0&amp;BGRP1)" trigger_type="10100000" monitor="LF:000|HF:000">
@@ -839,6 +982,13 @@
         <InternalTrigger name="BGRP1"/>
       </AND>
     </TriggerItem>
+    <TriggerItem ctpid="123" partition="1" name="L1_ZDC_AND_UNPAIRED_ISO" complex_deadtime="0" definition="(ZDC_AND[x1]&amp;BGRP0&amp;BGRP4)" trigger_type="10100000" monitor="LF:000|HF:000">
+      <AND>
+        <TriggerCondition multi="1" name="ZDC_AND_x1" triggerthreshold="ZDC_AND"/>
+        <InternalTrigger name="BGRP0"/>
+        <InternalTrigger name="BGRP4"/>
+      </AND>
+    </TriggerItem>
     <TriggerItem ctpid="124" partition="1" name="L1_2MU6_UNPAIRED_ISO" complex_deadtime="0" definition="(MU6[x2]&amp;BGRP0&amp;BGRP4)" trigger_type="10001000" monitor="LF:000|HF:000">
       <AND>
         <TriggerCondition multi="2" name="MU6_x2" triggerthreshold="MU6"/>
@@ -946,6 +1096,24 @@
         <InternalTrigger name="BGRP1"/>
       </AND>
     </TriggerItem>
+    <TriggerItem ctpid="139" partition="1" name="L1_ZDC_AND_UNPAIRED_NONISO" complex_deadtime="0" definition="(ZDC_AND[x1]&amp;BGRP0&amp;BGRP5)" trigger_type="10100000" monitor="LF:000|HF:000">
+      <AND>
+        <TriggerCondition multi="1" name="ZDC_AND_x1" triggerthreshold="ZDC_AND"/>
+        <InternalTrigger name="BGRP0"/>
+        <InternalTrigger name="BGRP5"/>
+      </AND>
+    </TriggerItem>
+    <TriggerItem ctpid="140" partition="1" name="L1_MLZ_A" complex_deadtime="0" definition="((MBTS_A[x1]|ZDC_A[x1]|LUCID_A[x1])&amp;BGRP0&amp;BGRP1)" trigger_type="10100000" monitor="LF:000|HF:000">
+      <AND>
+        <OR>
+          <TriggerCondition multi="1" name="MBTS_A_x1" triggerthreshold="MBTS_A"/>
+          <TriggerCondition multi="1" name="ZDC_A_x1" triggerthreshold="ZDC_A"/>
+          <TriggerCondition multi="1" name="LUCID_A_x1" triggerthreshold="LUCID_A"/>
+        </OR>
+        <InternalTrigger name="BGRP0"/>
+        <InternalTrigger name="BGRP1"/>
+      </AND>
+    </TriggerItem>
     <TriggerItem ctpid="141" partition="1" name="L1_TE12000" complex_deadtime="0" definition="(TE12000[x1]&amp;BGRP0&amp;BGRP1)" trigger_type="10000100" monitor="LF:000|HF:000">
       <AND>
         <TriggerCondition multi="1" name="TE12000_x1" triggerthreshold="TE12000"/>
@@ -1066,6 +1234,17 @@
         <InternalTrigger name="BGRP3"/>
       </AND>
     </TriggerItem>
+    <TriggerItem ctpid="152" partition="1" name="L1_MLZ_C" complex_deadtime="0" definition="((MBTS_C[x1]|ZDC_C[x1]|LUCID_C[x1])&amp;BGRP0&amp;BGRP1)" trigger_type="10100000" monitor="LF:000|HF:000">
+      <AND>
+        <OR>
+          <TriggerCondition multi="1" name="MBTS_C_x1" triggerthreshold="MBTS_C"/>
+          <TriggerCondition multi="1" name="ZDC_C_x1" triggerthreshold="ZDC_C"/>
+          <TriggerCondition multi="1" name="LUCID_C_x1" triggerthreshold="LUCID_C"/>
+        </OR>
+        <InternalTrigger name="BGRP0"/>
+        <InternalTrigger name="BGRP1"/>
+      </AND>
+    </TriggerItem>
     <TriggerItem ctpid="153" partition="1" name="L1_MBTSA4" complex_deadtime="0" definition="(MBTS_A4[x1]&amp;BGRP0&amp;BGRP1)" trigger_type="10100000" monitor="LF:000|HF:000">
       <AND>
         <TriggerCondition multi="1" name="MBTS_A4_x1" triggerthreshold="MBTS_A4"/>
@@ -1094,6 +1273,47 @@
         <InternalTrigger name="BGRP1"/>
       </AND>
     </TriggerItem>
+    <TriggerItem ctpid="157" partition="1" name="L1_MBLZ" complex_deadtime="0" definition="((((MBTS_A[x1]|ZDC_A[x1]|LUCID_A[x1])&amp;(MBTS_C[x1]|ZDC_C[x1]|LUCID_C[x1]))|BCM_Wide[x1])&amp;BGRP0&amp;BGRP1)" trigger_type="10100000" monitor="LF:000|HF:000">
+      <AND>
+        <OR>
+          <AND>
+            <OR>
+              <TriggerCondition multi="1" name="MBTS_A_x1" triggerthreshold="MBTS_A"/>
+              <TriggerCondition multi="1" name="ZDC_A_x1" triggerthreshold="ZDC_A"/>
+              <TriggerCondition multi="1" name="LUCID_A_x1" triggerthreshold="LUCID_A"/>
+            </OR>
+            <OR>
+              <TriggerCondition multi="1" name="MBTS_C_x1" triggerthreshold="MBTS_C"/>
+              <TriggerCondition multi="1" name="ZDC_C_x1" triggerthreshold="ZDC_C"/>
+              <TriggerCondition multi="1" name="LUCID_C_x1" triggerthreshold="LUCID_C"/>
+            </OR>
+          </AND>
+          <TriggerCondition multi="1" name="BCM_Wide_x1" triggerthreshold="BCM_Wide"/>
+        </OR>
+        <InternalTrigger name="BGRP0"/>
+        <InternalTrigger name="BGRP1"/>
+      </AND>
+    </TriggerItem>
+    <TriggerItem ctpid="158" partition="1" name="L1_J15.31ETA49" complex_deadtime="0" definition="(J15.31ETA49[x1]&amp;BGRP0&amp;BGRP1)" trigger_type="10000100" monitor="LF:000|HF:000">
+      <AND>
+        <TriggerCondition multi="1" name="J15.31ETA49_x1" triggerthreshold="J15.31ETA49"/>
+        <InternalTrigger name="BGRP0"/>
+        <InternalTrigger name="BGRP1"/>
+      </AND>
+    </TriggerItem>
+    <TriggerItem ctpid="159" partition="1" name="L1_J20.31ETA49" complex_deadtime="0" definition="(J20.31ETA49[x1]&amp;BGRP0&amp;BGRP1)" trigger_type="10000100" monitor="LF:000|HF:000">
+      <AND>
+        <TriggerCondition multi="1" name="J20.31ETA49_x1" triggerthreshold="J20.31ETA49"/>
+        <InternalTrigger name="BGRP0"/>
+        <InternalTrigger name="BGRP1"/>
+      </AND>
+    </TriggerItem>
+    <TriggerItem ctpid="160" partition="1" name="L1_BGRP0" complex_deadtime="0" definition="(RNDM0&amp;BGRP0)" trigger_type="10000001" monitor="LF:000|HF:000">
+      <AND>
+        <InternalTrigger name="RNDM0"/>
+        <InternalTrigger name="BGRP0"/>
+      </AND>
+    </TriggerItem>
     <TriggerItem ctpid="161" partition="1" name="L1_MBTSA8" complex_deadtime="0" definition="(MBTS_A8[x1]&amp;BGRP0&amp;BGRP1)" trigger_type="10100000" monitor="LF:000|HF:000">
       <AND>
         <TriggerCondition multi="1" name="MBTS_A8_x1" triggerthreshold="MBTS_A8"/>
@@ -1868,13 +2088,6 @@
         <InternalTrigger name="BGRP1"/>
       </AND>
     </TriggerItem>
-    <TriggerItem ctpid="299" partition="1" name="L1_TAU60" complex_deadtime="0" definition="(HA60[x1]&amp;BGRP0&amp;BGRP1)" trigger_type="10000100" monitor="LF:000|HF:000">
-      <AND>
-        <TriggerCondition multi="1" name="HA60_x1" triggerthreshold="HA60"/>
-        <InternalTrigger name="BGRP0"/>
-        <InternalTrigger name="BGRP1"/>
-      </AND>
-    </TriggerItem>
     <TriggerItem ctpid="300" partition="1" name="L1_EM20VH_FIRSTEMPTY" complex_deadtime="0" definition="(EM20VH[x1]&amp;BGRP0&amp;BGRP6)" trigger_type="10000100" monitor="LF:000|HF:000">
       <AND>
         <TriggerCondition multi="1" name="EM20VH_x1" triggerthreshold="EM20VH"/>
@@ -1910,6 +2123,23 @@
         <InternalTrigger name="BGRP1"/>
       </AND>
     </TriggerItem>
+    <TriggerItem ctpid="305" partition="1" name="L1_TE50_VTE600.0ETA49_PEB" complex_deadtime="0" definition="(TE50[x1]&amp;!TE600.0ETA49[x1]&amp;BGRP0&amp;BGRP1)" trigger_type="10000100" monitor="LF:000|HF:000">
+      <AND>
+        <TriggerCondition multi="1" name="TE50_x1" triggerthreshold="TE50"/>
+        <NOT>
+          <TriggerCondition multi="1" name="TE600.0ETA49_x1" triggerthreshold="TE600.0ETA49"/>
+        </NOT>
+        <InternalTrigger name="BGRP0"/>
+        <InternalTrigger name="BGRP1"/>
+      </AND>
+    </TriggerItem>
+    <TriggerItem ctpid="306" partition="1" name="L1_TE600.0ETA49_PEB" complex_deadtime="0" definition="(TE600.0ETA49[x1]&amp;BGRP0&amp;BGRP1)" trigger_type="10000100" monitor="LF:000|HF:000">
+      <AND>
+        <TriggerCondition multi="1" name="TE600.0ETA49_x1" triggerthreshold="TE600.0ETA49"/>
+        <InternalTrigger name="BGRP0"/>
+        <InternalTrigger name="BGRP1"/>
+      </AND>
+    </TriggerItem>
     <TriggerItem ctpid="307" partition="1" name="L1_J100_FIRSTEMPTY" complex_deadtime="0" definition="(J100[x1]&amp;BGRP0&amp;BGRP6)" trigger_type="10000100" monitor="LF:000|HF:000">
       <AND>
         <TriggerCondition multi="1" name="J100_x1" triggerthreshold="J100"/>
@@ -1952,10 +2182,10 @@
         <InternalTrigger name="BGRP3"/>
       </AND>
     </TriggerItem>
-    <TriggerItem ctpid="313" partition="1" name="L1_J40_XE50" complex_deadtime="0" definition="(J40[x1]&amp;XE50[x1]&amp;BGRP0&amp;BGRP1)" trigger_type="10000100" monitor="LF:000|HF:000">
+    <TriggerItem ctpid="313" partition="1" name="L1_J40_XE60" complex_deadtime="0" definition="(J40[x1]&amp;XE60[x1]&amp;BGRP0&amp;BGRP1)" trigger_type="10000100" monitor="LF:000|HF:000">
       <AND>
         <TriggerCondition multi="1" name="J40_x1" triggerthreshold="J40"/>
-        <TriggerCondition multi="1" name="XE50_x1" triggerthreshold="XE50"/>
+        <TriggerCondition multi="1" name="XE60_x1" triggerthreshold="XE60"/>
         <InternalTrigger name="BGRP0"/>
         <InternalTrigger name="BGRP1"/>
       </AND>
@@ -2052,9 +2282,9 @@
         <InternalTrigger name="BGRP1"/>
       </AND>
     </TriggerItem>
-    <TriggerItem ctpid="326" partition="1" name="L1_TE500.0ETA49" complex_deadtime="0" definition="(TE500.0ETA49[x1]&amp;BGRP0&amp;BGRP1)" trigger_type="10000100" monitor="LF:000|HF:000">
+    <TriggerItem ctpid="326" partition="1" name="L1_TE600.0ETA49" complex_deadtime="0" definition="(TE600.0ETA49[x1]&amp;BGRP0&amp;BGRP1)" trigger_type="10000100" monitor="LF:000|HF:000">
       <AND>
-        <TriggerCondition multi="1" name="TE500.0ETA49_x1" triggerthreshold="TE500.0ETA49"/>
+        <TriggerCondition multi="1" name="TE600.0ETA49_x1" triggerthreshold="TE600.0ETA49"/>
         <InternalTrigger name="BGRP0"/>
         <InternalTrigger name="BGRP1"/>
       </AND>
@@ -2094,102 +2324,345 @@
         <InternalTrigger name="BGRP1"/>
       </AND>
     </TriggerItem>
-    <TriggerItem ctpid="333" partition="1" name="L1_TE9000.0ETA49" complex_deadtime="0" definition="(TE9000.0ETA49[x1]&amp;BGRP0&amp;BGRP1)" trigger_type="10000100" monitor="LF:000|HF:000">
+    <TriggerItem ctpid="333" partition="1" name="L1_TE3.0ETA49" complex_deadtime="0" definition="(TE3.0ETA49[x1]&amp;BGRP0&amp;BGRP1)" trigger_type="10000100" monitor="LF:000|HF:000">
+      <AND>
+        <TriggerCondition multi="1" name="TE3.0ETA49_x1" triggerthreshold="TE3.0ETA49"/>
+        <InternalTrigger name="BGRP0"/>
+        <InternalTrigger name="BGRP1"/>
+      </AND>
+    </TriggerItem>
+    <TriggerItem ctpid="334" partition="1" name="L1_TE50_VTE600.0ETA49" complex_deadtime="0" definition="(TE50[x1]&amp;!TE600.0ETA49[x1]&amp;BGRP0&amp;BGRP1)" trigger_type="10000100" monitor="LF:000|HF:000">
+      <AND>
+        <TriggerCondition multi="1" name="TE50_x1" triggerthreshold="TE50"/>
+        <NOT>
+          <TriggerCondition multi="1" name="TE600.0ETA49_x1" triggerthreshold="TE600.0ETA49"/>
+        </NOT>
+        <InternalTrigger name="BGRP0"/>
+        <InternalTrigger name="BGRP1"/>
+      </AND>
+    </TriggerItem>
+    <TriggerItem ctpid="335" partition="1" name="L1_TE5_VTE200" complex_deadtime="0" definition="(TE5[x1]&amp;!TE200[x1]&amp;BGRP0&amp;BGRP1)" trigger_type="10000100" monitor="LF:000|HF:000">
+      <AND>
+        <TriggerCondition multi="1" name="TE5_x1" triggerthreshold="TE5"/>
+        <NOT>
+          <TriggerCondition multi="1" name="TE200_x1" triggerthreshold="TE200"/>
+        </NOT>
+        <InternalTrigger name="BGRP0"/>
+        <InternalTrigger name="BGRP1"/>
+      </AND>
+    </TriggerItem>
+    <TriggerItem ctpid="336" partition="1" name="L1_TE600.0ETA49_OVERLAY" complex_deadtime="0" definition="(TE600.0ETA49[x1]&amp;BGRP0&amp;BGRP1)" trigger_type="10000010" monitor="LF:000|HF:000">
+      <AND>
+        <TriggerCondition multi="1" name="TE600.0ETA49_x1" triggerthreshold="TE600.0ETA49"/>
+        <InternalTrigger name="BGRP0"/>
+        <InternalTrigger name="BGRP1"/>
+      </AND>
+    </TriggerItem>
+    <TriggerItem ctpid="337" partition="1" name="L1_TE1500.0ETA49_OVERLAY" complex_deadtime="0" definition="(TE1500.0ETA49[x1]&amp;BGRP0&amp;BGRP1)" trigger_type="10000010" monitor="LF:000|HF:000">
+      <AND>
+        <TriggerCondition multi="1" name="TE1500.0ETA49_x1" triggerthreshold="TE1500.0ETA49"/>
+        <InternalTrigger name="BGRP0"/>
+        <InternalTrigger name="BGRP1"/>
+      </AND>
+    </TriggerItem>
+    <TriggerItem ctpid="338" partition="1" name="L1_TE3000.0ETA49_OVERLAY" complex_deadtime="0" definition="(TE3000.0ETA49[x1]&amp;BGRP0&amp;BGRP1)" trigger_type="10000010" monitor="LF:000|HF:000">
+      <AND>
+        <TriggerCondition multi="1" name="TE3000.0ETA49_x1" triggerthreshold="TE3000.0ETA49"/>
+        <InternalTrigger name="BGRP0"/>
+        <InternalTrigger name="BGRP1"/>
+      </AND>
+    </TriggerItem>
+    <TriggerItem ctpid="339" partition="1" name="L1_TE3500.0ETA49_OVERLAY" complex_deadtime="0" definition="(TE3500.0ETA49[x1]&amp;BGRP0&amp;BGRP1)" trigger_type="10000010" monitor="LF:000|HF:000">
+      <AND>
+        <TriggerCondition multi="1" name="TE3500.0ETA49_x1" triggerthreshold="TE3500.0ETA49"/>
+        <InternalTrigger name="BGRP0"/>
+        <InternalTrigger name="BGRP1"/>
+      </AND>
+    </TriggerItem>
+    <TriggerItem ctpid="342" partition="1" name="L1_TE8000.0ETA49_OVERLAY" complex_deadtime="0" definition="(TE8000.0ETA49[x1]&amp;BGRP0&amp;BGRP1)" trigger_type="10000010" monitor="LF:000|HF:000">
+      <AND>
+        <TriggerCondition multi="1" name="TE8000.0ETA49_x1" triggerthreshold="TE8000.0ETA49"/>
+        <InternalTrigger name="BGRP0"/>
+        <InternalTrigger name="BGRP1"/>
+      </AND>
+    </TriggerItem>
+    <TriggerItem ctpid="343" partition="1" name="L1_TE7.0ETA49" complex_deadtime="0" definition="(TE7.0ETA49[x1]&amp;BGRP0&amp;BGRP1)" trigger_type="10000100" monitor="LF:000|HF:000">
+      <AND>
+        <TriggerCondition multi="1" name="TE7.0ETA49_x1" triggerthreshold="TE7.0ETA49"/>
+        <InternalTrigger name="BGRP0"/>
+        <InternalTrigger name="BGRP1"/>
+      </AND>
+    </TriggerItem>
+    <TriggerItem ctpid="344" partition="1" name="L1_EM8" complex_deadtime="0" definition="(EM8[x1]&amp;BGRP0&amp;BGRP1)" trigger_type="10000100" monitor="LF:000|HF:000">
+      <AND>
+        <TriggerCondition multi="1" name="EM8_x1" triggerthreshold="EM8"/>
+        <InternalTrigger name="BGRP0"/>
+        <InternalTrigger name="BGRP1"/>
+      </AND>
+    </TriggerItem>
+    <TriggerItem ctpid="345" partition="1" name="L1_2EM7" complex_deadtime="0" definition="(EM7[x2]&amp;BGRP0&amp;BGRP1)" trigger_type="10000100" monitor="LF:000|HF:000">
+      <AND>
+        <TriggerCondition multi="2" name="EM7_x2" triggerthreshold="EM7"/>
+        <InternalTrigger name="BGRP0"/>
+        <InternalTrigger name="BGRP1"/>
+      </AND>
+    </TriggerItem>
+    <TriggerItem ctpid="346" partition="1" name="L1_TE5_VTE100" complex_deadtime="0" definition="(TE5[x1]&amp;!TE100[x1]&amp;BGRP0&amp;BGRP1)" trigger_type="10000100" monitor="LF:000|HF:000">
+      <AND>
+        <TriggerCondition multi="1" name="TE5_x1" triggerthreshold="TE5"/>
+        <NOT>
+          <TriggerCondition multi="1" name="TE100_x1" triggerthreshold="TE100"/>
+        </NOT>
+        <InternalTrigger name="BGRP0"/>
+        <InternalTrigger name="BGRP1"/>
+      </AND>
+    </TriggerItem>
+    <TriggerItem ctpid="347" partition="1" name="L1_TE5_VTE50" complex_deadtime="0" definition="(TE5[x1]&amp;!TE50[x1]&amp;BGRP0&amp;BGRP1)" trigger_type="10000100" monitor="LF:000|HF:000">
+      <AND>
+        <TriggerCondition multi="1" name="TE5_x1" triggerthreshold="TE5"/>
+        <NOT>
+          <TriggerCondition multi="1" name="TE50_x1" triggerthreshold="TE50"/>
+        </NOT>
+        <InternalTrigger name="BGRP0"/>
+        <InternalTrigger name="BGRP1"/>
+      </AND>
+    </TriggerItem>
+    <TriggerItem ctpid="348" partition="1" name="L1_TE4_VTE200" complex_deadtime="0" definition="(TE4[x1]&amp;!TE200[x1]&amp;BGRP0&amp;BGRP1)" trigger_type="10000100" monitor="LF:000|HF:000">
+      <AND>
+        <TriggerCondition multi="1" name="TE4_x1" triggerthreshold="TE4"/>
+        <NOT>
+          <TriggerCondition multi="1" name="TE200_x1" triggerthreshold="TE200"/>
+        </NOT>
+        <InternalTrigger name="BGRP0"/>
+        <InternalTrigger name="BGRP1"/>
+      </AND>
+    </TriggerItem>
+    <TriggerItem ctpid="349" partition="1" name="L1_TE4_VTE100" complex_deadtime="0" definition="(TE4[x1]&amp;!TE100[x1]&amp;BGRP0&amp;BGRP1)" trigger_type="10000100" monitor="LF:000|HF:000">
+      <AND>
+        <TriggerCondition multi="1" name="TE4_x1" triggerthreshold="TE4"/>
+        <NOT>
+          <TriggerCondition multi="1" name="TE100_x1" triggerthreshold="TE100"/>
+        </NOT>
+        <InternalTrigger name="BGRP0"/>
+        <InternalTrigger name="BGRP1"/>
+      </AND>
+    </TriggerItem>
+    <TriggerItem ctpid="350" partition="1" name="L1_TE4_VTE50" complex_deadtime="0" definition="(TE4[x1]&amp;!TE50[x1]&amp;BGRP0&amp;BGRP1)" trigger_type="10000100" monitor="LF:000|HF:000">
+      <AND>
+        <TriggerCondition multi="1" name="TE4_x1" triggerthreshold="TE4"/>
+        <NOT>
+          <TriggerCondition multi="1" name="TE50_x1" triggerthreshold="TE50"/>
+        </NOT>
+        <InternalTrigger name="BGRP0"/>
+        <InternalTrigger name="BGRP1"/>
+      </AND>
+    </TriggerItem>
+    <TriggerItem ctpid="351" partition="1" name="L1_2TAU2_VTE50" complex_deadtime="0" definition="(HA2[x2]&amp;!TE50[x1]&amp;BGRP0&amp;BGRP1)" trigger_type="10000100" monitor="LF:000|HF:000">
+      <AND>
+        <TriggerCondition multi="2" name="HA2_x2" triggerthreshold="HA2"/>
+        <NOT>
+          <TriggerCondition multi="1" name="TE50_x1" triggerthreshold="TE50"/>
+        </NOT>
+        <InternalTrigger name="BGRP0"/>
+        <InternalTrigger name="BGRP1"/>
+      </AND>
+    </TriggerItem>
+    <TriggerItem ctpid="352" partition="1" name="L1_2TAU3_VTE50" complex_deadtime="0" definition="(HA3[x2]&amp;!TE50[x1]&amp;BGRP0&amp;BGRP1)" trigger_type="10000100" monitor="LF:000|HF:000">
+      <AND>
+        <TriggerCondition multi="2" name="HA3_x2" triggerthreshold="HA3"/>
+        <NOT>
+          <TriggerCondition multi="1" name="TE50_x1" triggerthreshold="TE50"/>
+        </NOT>
+        <InternalTrigger name="BGRP0"/>
+        <InternalTrigger name="BGRP1"/>
+      </AND>
+    </TriggerItem>
+    <TriggerItem ctpid="353" partition="1" name="L1_2TAU2_VTE100" complex_deadtime="0" definition="(HA2[x2]&amp;!TE100[x1]&amp;BGRP0&amp;BGRP1)" trigger_type="10000100" monitor="LF:000|HF:000">
+      <AND>
+        <TriggerCondition multi="2" name="HA2_x2" triggerthreshold="HA2"/>
+        <NOT>
+          <TriggerCondition multi="1" name="TE100_x1" triggerthreshold="TE100"/>
+        </NOT>
+        <InternalTrigger name="BGRP0"/>
+        <InternalTrigger name="BGRP1"/>
+      </AND>
+    </TriggerItem>
+    <TriggerItem ctpid="354" partition="1" name="L1_2TAU3_VTE100" complex_deadtime="0" definition="(HA3[x2]&amp;!TE100[x1]&amp;BGRP0&amp;BGRP1)" trigger_type="10000100" monitor="LF:000|HF:000">
+      <AND>
+        <TriggerCondition multi="2" name="HA3_x2" triggerthreshold="HA3"/>
+        <NOT>
+          <TriggerCondition multi="1" name="TE100_x1" triggerthreshold="TE100"/>
+        </NOT>
+        <InternalTrigger name="BGRP0"/>
+        <InternalTrigger name="BGRP1"/>
+      </AND>
+    </TriggerItem>
+    <TriggerItem ctpid="355" partition="1" name="L1_2TAU2_VTE200" complex_deadtime="0" definition="(HA2[x2]&amp;!TE200[x1]&amp;BGRP0&amp;BGRP1)" trigger_type="10000100" monitor="LF:000|HF:000">
+      <AND>
+        <TriggerCondition multi="2" name="HA2_x2" triggerthreshold="HA2"/>
+        <NOT>
+          <TriggerCondition multi="1" name="TE200_x1" triggerthreshold="TE200"/>
+        </NOT>
+        <InternalTrigger name="BGRP0"/>
+        <InternalTrigger name="BGRP1"/>
+      </AND>
+    </TriggerItem>
+    <TriggerItem ctpid="356" partition="1" name="L1_2TAU3_VTE200" complex_deadtime="0" definition="(HA3[x2]&amp;!TE200[x1]&amp;BGRP0&amp;BGRP1)" trigger_type="10000100" monitor="LF:000|HF:000">
       <AND>
-        <TriggerCondition multi="1" name="TE9000.0ETA49_x1" triggerthreshold="TE9000.0ETA49"/>
+        <TriggerCondition multi="2" name="HA3_x2" triggerthreshold="HA3"/>
+        <NOT>
+          <TriggerCondition multi="1" name="TE200_x1" triggerthreshold="TE200"/>
+        </NOT>
         <InternalTrigger name="BGRP0"/>
         <InternalTrigger name="BGRP1"/>
       </AND>
     </TriggerItem>
-    <TriggerItem ctpid="335" partition="1" name="L1_TE5_VTE200" complex_deadtime="0" definition="(TE5[x1]&amp;!TE200[x1]&amp;BGRP0&amp;BGRP1)" trigger_type="10000100" monitor="LF:000|HF:000">
+    <TriggerItem ctpid="357" partition="1" name="L1_XE60" complex_deadtime="0" definition="(XE60[x1]&amp;BGRP0&amp;BGRP1)" trigger_type="10000100" monitor="LF:000|HF:000">
       <AND>
-        <TriggerCondition multi="1" name="TE5_x1" triggerthreshold="TE5"/>
-        <NOT>
-          <TriggerCondition multi="1" name="TE200_x1" triggerthreshold="TE200"/>
-        </NOT>
+        <TriggerCondition multi="1" name="XE60_x1" triggerthreshold="XE60"/>
         <InternalTrigger name="BGRP0"/>
         <InternalTrigger name="BGRP1"/>
       </AND>
     </TriggerItem>
-    <TriggerItem ctpid="336" partition="1" name="L1_TE500.0ETA49_OVERLAY" complex_deadtime="0" definition="(TE500.0ETA49[x1]&amp;BGRP0&amp;BGRP1)" trigger_type="10000010" monitor="LF:000|HF:000">
+    <TriggerItem ctpid="358" partition="1" name="L1_XE70" complex_deadtime="0" definition="(XE70[x1]&amp;BGRP0&amp;BGRP1)" trigger_type="10000100" monitor="LF:000|HF:000">
       <AND>
-        <TriggerCondition multi="1" name="TE500.0ETA49_x1" triggerthreshold="TE500.0ETA49"/>
+        <TriggerCondition multi="1" name="XE70_x1" triggerthreshold="XE70"/>
         <InternalTrigger name="BGRP0"/>
         <InternalTrigger name="BGRP1"/>
       </AND>
     </TriggerItem>
-    <TriggerItem ctpid="337" partition="1" name="L1_TE1500.0ETA49_OVERLAY" complex_deadtime="0" definition="(TE1500.0ETA49[x1]&amp;BGRP0&amp;BGRP1)" trigger_type="10000010" monitor="LF:000|HF:000">
+    <TriggerItem ctpid="359" partition="1" name="L1_XE80" complex_deadtime="0" definition="(XE80[x1]&amp;BGRP0&amp;BGRP1)" trigger_type="10000100" monitor="LF:000|HF:000">
       <AND>
-        <TriggerCondition multi="1" name="TE1500.0ETA49_x1" triggerthreshold="TE1500.0ETA49"/>
+        <TriggerCondition multi="1" name="XE80_x1" triggerthreshold="XE80"/>
         <InternalTrigger name="BGRP0"/>
         <InternalTrigger name="BGRP1"/>
       </AND>
     </TriggerItem>
-    <TriggerItem ctpid="338" partition="1" name="L1_TE3000.0ETA49_OVERLAY" complex_deadtime="0" definition="(TE3000.0ETA49[x1]&amp;BGRP0&amp;BGRP1)" trigger_type="10000010" monitor="LF:000|HF:000">
+    <TriggerItem ctpid="470" partition="1" name="L1_MBTS_1_ZDC_A_VZDC_C_VTE200" complex_deadtime="0" definition="((MBTS_A[x1]|MBTS_C[x1])&amp;ZDC_A[x1]&amp;!ZDC_C[x1]&amp;!TE200[x1]&amp;BGRP0&amp;BGRP1)" trigger_type="10100000" monitor="LF:000|HF:000">
       <AND>
-        <TriggerCondition multi="1" name="TE3000.0ETA49_x1" triggerthreshold="TE3000.0ETA49"/>
+        <OR>
+          <TriggerCondition multi="1" name="MBTS_A_x1" triggerthreshold="MBTS_A"/>
+          <TriggerCondition multi="1" name="MBTS_C_x1" triggerthreshold="MBTS_C"/>
+        </OR>
+        <TriggerCondition multi="1" name="ZDC_A_x1" triggerthreshold="ZDC_A"/>
+        <NOT>
+          <TriggerCondition multi="1" name="ZDC_C_x1" triggerthreshold="ZDC_C"/>
+        </NOT>
+        <NOT>
+          <TriggerCondition multi="1" name="TE200_x1" triggerthreshold="TE200"/>
+        </NOT>
         <InternalTrigger name="BGRP0"/>
         <InternalTrigger name="BGRP1"/>
       </AND>
     </TriggerItem>
-    <TriggerItem ctpid="339" partition="1" name="L1_TE3500.0ETA49_OVERLAY" complex_deadtime="0" definition="(TE3500.0ETA49[x1]&amp;BGRP0&amp;BGRP1)" trigger_type="10000010" monitor="LF:000|HF:000">
+    <TriggerItem ctpid="471" partition="1" name="L1_MBTS_1_ZDC_C_VZDC_A_VTE200" complex_deadtime="0" definition="((MBTS_A[x1]|MBTS_C[x1])&amp;ZDC_C[x1]&amp;!ZDC_A[x1]&amp;!TE200[x1]&amp;BGRP0&amp;BGRP1)" trigger_type="10100000" monitor="LF:000|HF:000">
       <AND>
-        <TriggerCondition multi="1" name="TE3500.0ETA49_x1" triggerthreshold="TE3500.0ETA49"/>
+        <OR>
+          <TriggerCondition multi="1" name="MBTS_A_x1" triggerthreshold="MBTS_A"/>
+          <TriggerCondition multi="1" name="MBTS_C_x1" triggerthreshold="MBTS_C"/>
+        </OR>
+        <TriggerCondition multi="1" name="ZDC_C_x1" triggerthreshold="ZDC_C"/>
+        <NOT>
+          <TriggerCondition multi="1" name="ZDC_A_x1" triggerthreshold="ZDC_A"/>
+        </NOT>
+        <NOT>
+          <TriggerCondition multi="1" name="TE200_x1" triggerthreshold="TE200"/>
+        </NOT>
         <InternalTrigger name="BGRP0"/>
         <InternalTrigger name="BGRP1"/>
       </AND>
     </TriggerItem>
-    <TriggerItem ctpid="342" partition="1" name="L1_TE8000.0ETA49_OVERLAY" complex_deadtime="0" definition="(TE8000.0ETA49[x1]&amp;BGRP0&amp;BGRP1)" trigger_type="10000010" monitor="LF:000|HF:000">
+    <TriggerItem ctpid="472" partition="1" name="L1_TE4_ZDC_A_VZDC_C_VTE200" complex_deadtime="0" definition="(TE4[x1]&amp;ZDC_A[x1]&amp;!ZDC_C[x1]&amp;!TE200[x1]&amp;BGRP0&amp;BGRP1)" trigger_type="10100000" monitor="LF:000|HF:000">
       <AND>
-        <TriggerCondition multi="1" name="TE8000.0ETA49_x1" triggerthreshold="TE8000.0ETA49"/>
+        <TriggerCondition multi="1" name="TE4_x1" triggerthreshold="TE4"/>
+        <TriggerCondition multi="1" name="ZDC_A_x1" triggerthreshold="ZDC_A"/>
+        <NOT>
+          <TriggerCondition multi="1" name="ZDC_C_x1" triggerthreshold="ZDC_C"/>
+        </NOT>
+        <NOT>
+          <TriggerCondition multi="1" name="TE200_x1" triggerthreshold="TE200"/>
+        </NOT>
         <InternalTrigger name="BGRP0"/>
         <InternalTrigger name="BGRP1"/>
       </AND>
     </TriggerItem>
-    <TriggerItem ctpid="343" partition="1" name="L1_TE9000.0ETA49_OVERLAY" complex_deadtime="0" definition="(TE9000.0ETA49[x1]&amp;BGRP0&amp;BGRP1)" trigger_type="10000010" monitor="LF:000|HF:000">
+    <TriggerItem ctpid="473" partition="1" name="L1_TE4_ZDC_C_VZDC_A_VTE200" complex_deadtime="0" definition="(TE4[x1]&amp;ZDC_C[x1]&amp;!ZDC_A[x1]&amp;!TE200[x1]&amp;BGRP0&amp;BGRP1)" trigger_type="10100000" monitor="LF:000|HF:000">
       <AND>
-        <TriggerCondition multi="1" name="TE9000.0ETA49_x1" triggerthreshold="TE9000.0ETA49"/>
+        <TriggerCondition multi="1" name="TE4_x1" triggerthreshold="TE4"/>
+        <TriggerCondition multi="1" name="ZDC_C_x1" triggerthreshold="ZDC_C"/>
+        <NOT>
+          <TriggerCondition multi="1" name="ZDC_A_x1" triggerthreshold="ZDC_A"/>
+        </NOT>
+        <NOT>
+          <TriggerCondition multi="1" name="TE200_x1" triggerthreshold="TE200"/>
+        </NOT>
         <InternalTrigger name="BGRP0"/>
         <InternalTrigger name="BGRP1"/>
       </AND>
     </TriggerItem>
-    <TriggerItem ctpid="344" partition="1" name="L1_EM8" complex_deadtime="0" definition="(EM8[x1]&amp;BGRP0&amp;BGRP1)" trigger_type="10000100" monitor="LF:000|HF:000">
+    <TriggerItem ctpid="474" partition="1" name="L1_TE3.0ETA49_ZDC_A_VZDC_C_VTE200" complex_deadtime="0" definition="(TE3.0ETA49[x1]&amp;ZDC_A[x1]&amp;!ZDC_C[x1]&amp;!TE200[x1]&amp;BGRP0&amp;BGRP1)" trigger_type="10100000" monitor="LF:000|HF:000">
       <AND>
-        <TriggerCondition multi="1" name="EM8_x1" triggerthreshold="EM8"/>
+        <TriggerCondition multi="1" name="TE3.0ETA49_x1" triggerthreshold="TE3.0ETA49"/>
+        <TriggerCondition multi="1" name="ZDC_A_x1" triggerthreshold="ZDC_A"/>
+        <NOT>
+          <TriggerCondition multi="1" name="ZDC_C_x1" triggerthreshold="ZDC_C"/>
+        </NOT>
+        <NOT>
+          <TriggerCondition multi="1" name="TE200_x1" triggerthreshold="TE200"/>
+        </NOT>
         <InternalTrigger name="BGRP0"/>
         <InternalTrigger name="BGRP1"/>
       </AND>
     </TriggerItem>
-    <TriggerItem ctpid="345" partition="1" name="L1_2EM7" complex_deadtime="0" definition="(EM7[x2]&amp;BGRP0&amp;BGRP1)" trigger_type="10000100" monitor="LF:000|HF:000">
+    <TriggerItem ctpid="475" partition="1" name="L1_TE3.0ETA49_ZDC_C_VZDC_A_VTE200" complex_deadtime="0" definition="(TE3.0ETA49[x1]&amp;ZDC_C[x1]&amp;!ZDC_A[x1]&amp;!TE200[x1]&amp;BGRP0&amp;BGRP1)" trigger_type="10100000" monitor="LF:000|HF:000">
       <AND>
-        <TriggerCondition multi="2" name="EM7_x2" triggerthreshold="EM7"/>
+        <TriggerCondition multi="1" name="TE3.0ETA49_x1" triggerthreshold="TE3.0ETA49"/>
+        <TriggerCondition multi="1" name="ZDC_C_x1" triggerthreshold="ZDC_C"/>
+        <NOT>
+          <TriggerCondition multi="1" name="ZDC_A_x1" triggerthreshold="ZDC_A"/>
+        </NOT>
+        <NOT>
+          <TriggerCondition multi="1" name="TE200_x1" triggerthreshold="TE200"/>
+        </NOT>
         <InternalTrigger name="BGRP0"/>
         <InternalTrigger name="BGRP1"/>
       </AND>
     </TriggerItem>
-    <TriggerItem ctpid="346" partition="1" name="L1_TE5_VTE100" complex_deadtime="0" definition="(TE5[x1]&amp;!TE100[x1]&amp;BGRP0&amp;BGRP1)" trigger_type="10000100" monitor="LF:000|HF:000">
+    <TriggerItem ctpid="476" partition="1" name="L1_TE5_ZDC_A_VZDC_C_VTE200" complex_deadtime="0" definition="(TE5[x1]&amp;ZDC_A[x1]&amp;!ZDC_C[x1]&amp;!TE200[x1]&amp;BGRP0&amp;BGRP1)" trigger_type="10100000" monitor="LF:000|HF:000">
       <AND>
         <TriggerCondition multi="1" name="TE5_x1" triggerthreshold="TE5"/>
+        <TriggerCondition multi="1" name="ZDC_A_x1" triggerthreshold="ZDC_A"/>
         <NOT>
-          <TriggerCondition multi="1" name="TE100_x1" triggerthreshold="TE100"/>
+          <TriggerCondition multi="1" name="ZDC_C_x1" triggerthreshold="ZDC_C"/>
+        </NOT>
+        <NOT>
+          <TriggerCondition multi="1" name="TE200_x1" triggerthreshold="TE200"/>
         </NOT>
         <InternalTrigger name="BGRP0"/>
         <InternalTrigger name="BGRP1"/>
       </AND>
     </TriggerItem>
-    <TriggerItem ctpid="347" partition="1" name="L1_TE5_VTE50" complex_deadtime="0" definition="(TE5[x1]&amp;!TE50[x1]&amp;BGRP0&amp;BGRP1)" trigger_type="10000100" monitor="LF:000|HF:000">
+    <TriggerItem ctpid="477" partition="1" name="L1_TE5_ZDC_C_VZDC_A_VTE200" complex_deadtime="0" definition="(TE5[x1]&amp;ZDC_C[x1]&amp;!ZDC_A[x1]&amp;!TE200[x1]&amp;BGRP0&amp;BGRP1)" trigger_type="10100000" monitor="LF:000|HF:000">
       <AND>
         <TriggerCondition multi="1" name="TE5_x1" triggerthreshold="TE5"/>
+        <TriggerCondition multi="1" name="ZDC_C_x1" triggerthreshold="ZDC_C"/>
         <NOT>
-          <TriggerCondition multi="1" name="TE50_x1" triggerthreshold="TE50"/>
+          <TriggerCondition multi="1" name="ZDC_A_x1" triggerthreshold="ZDC_A"/>
+        </NOT>
+        <NOT>
+          <TriggerCondition multi="1" name="TE200_x1" triggerthreshold="TE200"/>
         </NOT>
         <InternalTrigger name="BGRP0"/>
         <InternalTrigger name="BGRP1"/>
       </AND>
     </TriggerItem>
-    <TriggerItem ctpid="348" partition="1" name="L1_TE4_VTE200" complex_deadtime="0" definition="(TE4[x1]&amp;!TE200[x1]&amp;BGRP0&amp;BGRP1)" trigger_type="10000100" monitor="LF:000|HF:000">
+    <TriggerItem ctpid="478" partition="1" name="L1_TE7.0ETA49_ZDC_A_VZDC_C_VTE200" complex_deadtime="0" definition="(TE7.0ETA49[x1]&amp;ZDC_A[x1]&amp;!ZDC_C[x1]&amp;!TE200[x1]&amp;BGRP0&amp;BGRP1)" trigger_type="10100000" monitor="LF:000|HF:000">
       <AND>
-        <TriggerCondition multi="1" name="TE4_x1" triggerthreshold="TE4"/>
+        <TriggerCondition multi="1" name="TE7.0ETA49_x1" triggerthreshold="TE7.0ETA49"/>
+        <TriggerCondition multi="1" name="ZDC_A_x1" triggerthreshold="ZDC_A"/>
+        <NOT>
+          <TriggerCondition multi="1" name="ZDC_C_x1" triggerthreshold="ZDC_C"/>
+        </NOT>
         <NOT>
           <TriggerCondition multi="1" name="TE200_x1" triggerthreshold="TE200"/>
         </NOT>
@@ -2197,19 +2670,28 @@
         <InternalTrigger name="BGRP1"/>
       </AND>
     </TriggerItem>
-    <TriggerItem ctpid="349" partition="1" name="L1_TE4_VTE100" complex_deadtime="0" definition="(TE4[x1]&amp;!TE100[x1]&amp;BGRP0&amp;BGRP1)" trigger_type="10000100" monitor="LF:000|HF:000">
+    <TriggerItem ctpid="479" partition="1" name="L1_TE7.0ETA49_ZDC_C_VZDC_A_VTE200" complex_deadtime="0" definition="(TE7.0ETA49[x1]&amp;ZDC_C[x1]&amp;!ZDC_A[x1]&amp;!TE200[x1]&amp;BGRP0&amp;BGRP1)" trigger_type="10100000" monitor="LF:000|HF:000">
       <AND>
-        <TriggerCondition multi="1" name="TE4_x1" triggerthreshold="TE4"/>
+        <TriggerCondition multi="1" name="TE7.0ETA49_x1" triggerthreshold="TE7.0ETA49"/>
+        <TriggerCondition multi="1" name="ZDC_C_x1" triggerthreshold="ZDC_C"/>
         <NOT>
-          <TriggerCondition multi="1" name="TE100_x1" triggerthreshold="TE100"/>
+          <TriggerCondition multi="1" name="ZDC_A_x1" triggerthreshold="ZDC_A"/>
+        </NOT>
+        <NOT>
+          <TriggerCondition multi="1" name="TE200_x1" triggerthreshold="TE200"/>
         </NOT>
         <InternalTrigger name="BGRP0"/>
         <InternalTrigger name="BGRP1"/>
       </AND>
     </TriggerItem>
-    <TriggerItem ctpid="350" partition="1" name="L1_TE4_VTE50" complex_deadtime="0" definition="(TE4[x1]&amp;!TE50[x1]&amp;BGRP0&amp;BGRP1)" trigger_type="10000100" monitor="LF:000|HF:000">
+    <TriggerItem ctpid="480" partition="1" name="L1_VZDC_A_C_VTE50" complex_deadtime="0" definition="(!ZDC_A[x1]&amp;!ZDC_C[x1]&amp;!TE50[x1]&amp;BGRP0&amp;BGRP1)" trigger_type="10100000" monitor="LF:000|HF:000">
       <AND>
-        <TriggerCondition multi="1" name="TE4_x1" triggerthreshold="TE4"/>
+        <NOT>
+          <TriggerCondition multi="1" name="ZDC_A_x1" triggerthreshold="ZDC_A"/>
+        </NOT>
+        <NOT>
+          <TriggerCondition multi="1" name="ZDC_C_x1" triggerthreshold="ZDC_C"/>
+        </NOT>
         <NOT>
           <TriggerCondition multi="1" name="TE50_x1" triggerthreshold="TE50"/>
         </NOT>
@@ -2609,52 +3091,52 @@
     <Prescale ctpid="75" cut="000001" value="1"/>
     <Prescale ctpid="76" cut="000001" value="1"/>
     <Prescale ctpid="77" cut="000001" value="1"/>
-    <Prescale ctpid="78" cut="-000001" value="-1"/>
-    <Prescale ctpid="79" cut="-000001" value="-1"/>
+    <Prescale ctpid="78" cut="000001" value="1"/>
+    <Prescale ctpid="79" cut="000001" value="1"/>
     <Prescale ctpid="80" cut="000001" value="1"/>
     <Prescale ctpid="81" cut="000001" value="1"/>
     <Prescale ctpid="82" cut="000001" value="1"/>
-    <Prescale ctpid="83" cut="-000001" value="-1"/>
+    <Prescale ctpid="83" cut="000001" value="1"/>
     <Prescale ctpid="84" cut="000001" value="1"/>
     <Prescale ctpid="85" cut="000001" value="1"/>
     <Prescale ctpid="86" cut="000001" value="1"/>
     <Prescale ctpid="87" cut="000001" value="1"/>
     <Prescale ctpid="88" cut="000001" value="1"/>
-    <Prescale ctpid="89" cut="-000001" value="-1"/>
+    <Prescale ctpid="89" cut="000001" value="1"/>
     <Prescale ctpid="90" cut="000001" value="1"/>
     <Prescale ctpid="91" cut="000001" value="1"/>
     <Prescale ctpid="92" cut="000001" value="1"/>
     <Prescale ctpid="93" cut="000001" value="1"/>
-    <Prescale ctpid="94" cut="-000001" value="-1"/>
+    <Prescale ctpid="94" cut="000001" value="1"/>
     <Prescale ctpid="95" cut="000001" value="1"/>
     <Prescale ctpid="96" cut="000001" value="1"/>
-    <Prescale ctpid="97" cut="-000001" value="-1"/>
+    <Prescale ctpid="97" cut="000001" value="1"/>
     <Prescale ctpid="98" cut="000001" value="1"/>
     <Prescale ctpid="99" cut="000001" value="1"/>
-    <Prescale ctpid="100" cut="-000001" value="-1"/>
-    <Prescale ctpid="101" cut="-000001" value="-1"/>
+    <Prescale ctpid="100" cut="000001" value="1"/>
+    <Prescale ctpid="101" cut="000001" value="1"/>
     <Prescale ctpid="102" cut="000001" value="1"/>
-    <Prescale ctpid="103" cut="-000001" value="-1"/>
-    <Prescale ctpid="104" cut="-000001" value="-1"/>
-    <Prescale ctpid="105" cut="-000001" value="-1"/>
+    <Prescale ctpid="103" cut="000001" value="1"/>
+    <Prescale ctpid="104" cut="000001" value="1"/>
+    <Prescale ctpid="105" cut="000001" value="1"/>
     <Prescale ctpid="106" cut="000001" value="1"/>
     <Prescale ctpid="107" cut="000001" value="1"/>
     <Prescale ctpid="108" cut="000001" value="1"/>
-    <Prescale ctpid="109" cut="-000001" value="-1"/>
-    <Prescale ctpid="110" cut="-000001" value="-1"/>
-    <Prescale ctpid="111" cut="-000001" value="-1"/>
-    <Prescale ctpid="112" cut="-000001" value="-1"/>
+    <Prescale ctpid="109" cut="000001" value="1"/>
+    <Prescale ctpid="110" cut="000001" value="1"/>
+    <Prescale ctpid="111" cut="000001" value="1"/>
+    <Prescale ctpid="112" cut="000001" value="1"/>
     <Prescale ctpid="113" cut="000001" value="1"/>
-    <Prescale ctpid="114" cut="-000001" value="-1"/>
-    <Prescale ctpid="115" cut="-000001" value="-1"/>
-    <Prescale ctpid="116" cut="-000001" value="-1"/>
+    <Prescale ctpid="114" cut="000001" value="1"/>
+    <Prescale ctpid="115" cut="000001" value="1"/>
+    <Prescale ctpid="116" cut="000001" value="1"/>
     <Prescale ctpid="117" cut="000001" value="1"/>
-    <Prescale ctpid="118" cut="-000001" value="-1"/>
-    <Prescale ctpid="119" cut="-000001" value="-1"/>
+    <Prescale ctpid="118" cut="000001" value="1"/>
+    <Prescale ctpid="119" cut="000001" value="1"/>
     <Prescale ctpid="120" cut="000001" value="1"/>
     <Prescale ctpid="121" cut="000001" value="1"/>
     <Prescale ctpid="122" cut="000001" value="1"/>
-    <Prescale ctpid="123" cut="-000001" value="-1"/>
+    <Prescale ctpid="123" cut="000001" value="1"/>
     <Prescale ctpid="124" cut="000001" value="1"/>
     <Prescale ctpid="125" cut="000001" value="1"/>
     <Prescale ctpid="126" cut="000001" value="1"/>
@@ -2670,8 +3152,8 @@
     <Prescale ctpid="136" cut="000001" value="1"/>
     <Prescale ctpid="137" cut="000001" value="1"/>
     <Prescale ctpid="138" cut="000001" value="1"/>
-    <Prescale ctpid="139" cut="-000001" value="-1"/>
-    <Prescale ctpid="140" cut="-000001" value="-1"/>
+    <Prescale ctpid="139" cut="000001" value="1"/>
+    <Prescale ctpid="140" cut="000001" value="1"/>
     <Prescale ctpid="141" cut="000001" value="1"/>
     <Prescale ctpid="142" cut="000001" value="1"/>
     <Prescale ctpid="143" cut="000001" value="1"/>
@@ -2683,15 +3165,15 @@
     <Prescale ctpid="149" cut="000001" value="1"/>
     <Prescale ctpid="150" cut="000001" value="1"/>
     <Prescale ctpid="151" cut="000001" value="1"/>
-    <Prescale ctpid="152" cut="-000001" value="-1"/>
+    <Prescale ctpid="152" cut="000001" value="1"/>
     <Prescale ctpid="153" cut="000001" value="1"/>
     <Prescale ctpid="154" cut="000001" value="1"/>
     <Prescale ctpid="155" cut="000001" value="1"/>
     <Prescale ctpid="156" cut="000001" value="1"/>
-    <Prescale ctpid="157" cut="-000001" value="-1"/>
-    <Prescale ctpid="158" cut="-000001" value="-1"/>
-    <Prescale ctpid="159" cut="-000001" value="-1"/>
-    <Prescale ctpid="160" cut="-000001" value="-1"/>
+    <Prescale ctpid="157" cut="000001" value="1"/>
+    <Prescale ctpid="158" cut="000001" value="1"/>
+    <Prescale ctpid="159" cut="000001" value="1"/>
+    <Prescale ctpid="160" cut="000001" value="1"/>
     <Prescale ctpid="161" cut="000001" value="1"/>
     <Prescale ctpid="162" cut="-000001" value="-1"/>
     <Prescale ctpid="163" cut="-000001" value="-1"/>
@@ -2830,14 +3312,14 @@
     <Prescale ctpid="296" cut="000001" value="1"/>
     <Prescale ctpid="297" cut="000001" value="1"/>
     <Prescale ctpid="298" cut="000001" value="1"/>
-    <Prescale ctpid="299" cut="000001" value="1"/>
+    <Prescale ctpid="299" cut="-000001" value="-1"/>
     <Prescale ctpid="300" cut="000001" value="1"/>
     <Prescale ctpid="301" cut="000001" value="1"/>
     <Prescale ctpid="302" cut="000001" value="1"/>
     <Prescale ctpid="303" cut="000001" value="1"/>
     <Prescale ctpid="304" cut="000001" value="1"/>
-    <Prescale ctpid="305" cut="-000001" value="-1"/>
-    <Prescale ctpid="306" cut="-000001" value="-1"/>
+    <Prescale ctpid="305" cut="000001" value="1"/>
+    <Prescale ctpid="306" cut="000001" value="1"/>
     <Prescale ctpid="307" cut="000001" value="1"/>
     <Prescale ctpid="308" cut="000001" value="1"/>
     <Prescale ctpid="309" cut="000001" value="1"/>
@@ -2865,7 +3347,7 @@
     <Prescale ctpid="331" cut="000001" value="1"/>
     <Prescale ctpid="332" cut="000001" value="1"/>
     <Prescale ctpid="333" cut="000001" value="1"/>
-    <Prescale ctpid="334" cut="-000001" value="-1"/>
+    <Prescale ctpid="334" cut="000001" value="1"/>
     <Prescale ctpid="335" cut="000001" value="1"/>
     <Prescale ctpid="336" cut="000001" value="1"/>
     <Prescale ctpid="337" cut="000001" value="1"/>
@@ -2882,15 +3364,15 @@
     <Prescale ctpid="348" cut="000001" value="1"/>
     <Prescale ctpid="349" cut="000001" value="1"/>
     <Prescale ctpid="350" cut="000001" value="1"/>
-    <Prescale ctpid="351" cut="-000001" value="-1"/>
-    <Prescale ctpid="352" cut="-000001" value="-1"/>
-    <Prescale ctpid="353" cut="-000001" value="-1"/>
-    <Prescale ctpid="354" cut="-000001" value="-1"/>
-    <Prescale ctpid="355" cut="-000001" value="-1"/>
-    <Prescale ctpid="356" cut="-000001" value="-1"/>
-    <Prescale ctpid="357" cut="-000001" value="-1"/>
-    <Prescale ctpid="358" cut="-000001" value="-1"/>
-    <Prescale ctpid="359" cut="-000001" value="-1"/>
+    <Prescale ctpid="351" cut="000001" value="1"/>
+    <Prescale ctpid="352" cut="000001" value="1"/>
+    <Prescale ctpid="353" cut="000001" value="1"/>
+    <Prescale ctpid="354" cut="000001" value="1"/>
+    <Prescale ctpid="355" cut="000001" value="1"/>
+    <Prescale ctpid="356" cut="000001" value="1"/>
+    <Prescale ctpid="357" cut="000001" value="1"/>
+    <Prescale ctpid="358" cut="000001" value="1"/>
+    <Prescale ctpid="359" cut="000001" value="1"/>
     <Prescale ctpid="360" cut="-000001" value="-1"/>
     <Prescale ctpid="361" cut="-000001" value="-1"/>
     <Prescale ctpid="362" cut="-000001" value="-1"/>
@@ -3001,17 +3483,17 @@
     <Prescale ctpid="467" cut="-000001" value="-1"/>
     <Prescale ctpid="468" cut="-000001" value="-1"/>
     <Prescale ctpid="469" cut="-000001" value="-1"/>
-    <Prescale ctpid="470" cut="-000001" value="-1"/>
-    <Prescale ctpid="471" cut="-000001" value="-1"/>
-    <Prescale ctpid="472" cut="-000001" value="-1"/>
-    <Prescale ctpid="473" cut="-000001" value="-1"/>
-    <Prescale ctpid="474" cut="-000001" value="-1"/>
-    <Prescale ctpid="475" cut="-000001" value="-1"/>
-    <Prescale ctpid="476" cut="-000001" value="-1"/>
-    <Prescale ctpid="477" cut="-000001" value="-1"/>
-    <Prescale ctpid="478" cut="-000001" value="-1"/>
-    <Prescale ctpid="479" cut="-000001" value="-1"/>
-    <Prescale ctpid="480" cut="-000001" value="-1"/>
+    <Prescale ctpid="470" cut="000001" value="1"/>
+    <Prescale ctpid="471" cut="000001" value="1"/>
+    <Prescale ctpid="472" cut="000001" value="1"/>
+    <Prescale ctpid="473" cut="000001" value="1"/>
+    <Prescale ctpid="474" cut="000001" value="1"/>
+    <Prescale ctpid="475" cut="000001" value="1"/>
+    <Prescale ctpid="476" cut="000001" value="1"/>
+    <Prescale ctpid="477" cut="000001" value="1"/>
+    <Prescale ctpid="478" cut="000001" value="1"/>
+    <Prescale ctpid="479" cut="000001" value="1"/>
+    <Prescale ctpid="480" cut="000001" value="1"/>
     <Prescale ctpid="481" cut="000001" value="1"/>
     <Prescale ctpid="482" cut="000001" value="1"/>
     <Prescale ctpid="483" cut="000001" value="1"/>
@@ -3201,27 +3683,6 @@
     <TriggerCounter name="7EM12" type="CTPIN">
       <TriggerCondition name="7EM12" triggerthreshold="EM12" multi="7"/>
     </TriggerCounter>
-    <TriggerCounter name="1EM13VH" type="CTPIN">
-      <TriggerCondition name="1EM13VH" triggerthreshold="EM13VH" multi="1"/>
-    </TriggerCounter>
-    <TriggerCounter name="2EM13VH" type="CTPIN">
-      <TriggerCondition name="2EM13VH" triggerthreshold="EM13VH" multi="2"/>
-    </TriggerCounter>
-    <TriggerCounter name="3EM13VH" type="CTPIN">
-      <TriggerCondition name="3EM13VH" triggerthreshold="EM13VH" multi="3"/>
-    </TriggerCounter>
-    <TriggerCounter name="4EM13VH" type="CTPIN">
-      <TriggerCondition name="4EM13VH" triggerthreshold="EM13VH" multi="4"/>
-    </TriggerCounter>
-    <TriggerCounter name="5EM13VH" type="CTPIN">
-      <TriggerCondition name="5EM13VH" triggerthreshold="EM13VH" multi="5"/>
-    </TriggerCounter>
-    <TriggerCounter name="6EM13VH" type="CTPIN">
-      <TriggerCondition name="6EM13VH" triggerthreshold="EM13VH" multi="6"/>
-    </TriggerCounter>
-    <TriggerCounter name="7EM13VH" type="CTPIN">
-      <TriggerCondition name="7EM13VH" triggerthreshold="EM13VH" multi="7"/>
-    </TriggerCounter>
     <TriggerCounter name="1EM14" type="CTPIN">
       <TriggerCondition name="1EM14" triggerthreshold="EM14" multi="1"/>
     </TriggerCounter>
@@ -3327,6 +3788,27 @@
     <TriggerCounter name="7EM18" type="CTPIN">
       <TriggerCondition name="7EM18" triggerthreshold="EM18" multi="7"/>
     </TriggerCounter>
+    <TriggerCounter name="1EM18VH" type="CTPIN">
+      <TriggerCondition name="1EM18VH" triggerthreshold="EM18VH" multi="1"/>
+    </TriggerCounter>
+    <TriggerCounter name="2EM18VH" type="CTPIN">
+      <TriggerCondition name="2EM18VH" triggerthreshold="EM18VH" multi="2"/>
+    </TriggerCounter>
+    <TriggerCounter name="3EM18VH" type="CTPIN">
+      <TriggerCondition name="3EM18VH" triggerthreshold="EM18VH" multi="3"/>
+    </TriggerCounter>
+    <TriggerCounter name="4EM18VH" type="CTPIN">
+      <TriggerCondition name="4EM18VH" triggerthreshold="EM18VH" multi="4"/>
+    </TriggerCounter>
+    <TriggerCounter name="5EM18VH" type="CTPIN">
+      <TriggerCondition name="5EM18VH" triggerthreshold="EM18VH" multi="5"/>
+    </TriggerCounter>
+    <TriggerCounter name="6EM18VH" type="CTPIN">
+      <TriggerCondition name="6EM18VH" triggerthreshold="EM18VH" multi="6"/>
+    </TriggerCounter>
+    <TriggerCounter name="7EM18VH" type="CTPIN">
+      <TriggerCondition name="7EM18VH" triggerthreshold="EM18VH" multi="7"/>
+    </TriggerCounter>
     <TriggerCounter name="1EM20" type="CTPIN">
       <TriggerCondition name="1EM20" triggerthreshold="EM20" multi="1"/>
     </TriggerCounter>
@@ -3474,27 +3956,6 @@
     <TriggerCounter name="7EM8I" type="CTPIN">
       <TriggerCondition name="7EM8I" triggerthreshold="EM8I" multi="7"/>
     </TriggerCounter>
-    <TriggerCounter name="1HA100" type="CTPIN">
-      <TriggerCondition name="1HA100" triggerthreshold="HA100" multi="1"/>
-    </TriggerCounter>
-    <TriggerCounter name="2HA100" type="CTPIN">
-      <TriggerCondition name="2HA100" triggerthreshold="HA100" multi="2"/>
-    </TriggerCounter>
-    <TriggerCounter name="3HA100" type="CTPIN">
-      <TriggerCondition name="3HA100" triggerthreshold="HA100" multi="3"/>
-    </TriggerCounter>
-    <TriggerCounter name="4HA100" type="CTPIN">
-      <TriggerCondition name="4HA100" triggerthreshold="HA100" multi="4"/>
-    </TriggerCounter>
-    <TriggerCounter name="5HA100" type="CTPIN">
-      <TriggerCondition name="5HA100" triggerthreshold="HA100" multi="5"/>
-    </TriggerCounter>
-    <TriggerCounter name="6HA100" type="CTPIN">
-      <TriggerCondition name="6HA100" triggerthreshold="HA100" multi="6"/>
-    </TriggerCounter>
-    <TriggerCounter name="7HA100" type="CTPIN">
-      <TriggerCondition name="7HA100" triggerthreshold="HA100" multi="7"/>
-    </TriggerCounter>
     <TriggerCounter name="1HA12" type="CTPIN">
       <TriggerCondition name="1HA12" triggerthreshold="HA12" multi="1"/>
     </TriggerCounter>
@@ -3600,6 +4061,27 @@
     <TriggerCounter name="7HA15" type="CTPIN">
       <TriggerCondition name="7HA15" triggerthreshold="HA15" multi="7"/>
     </TriggerCounter>
+    <TriggerCounter name="1HA2" type="CTPIN">
+      <TriggerCondition name="1HA2" triggerthreshold="HA2" multi="1"/>
+    </TriggerCounter>
+    <TriggerCounter name="2HA2" type="CTPIN">
+      <TriggerCondition name="2HA2" triggerthreshold="HA2" multi="2"/>
+    </TriggerCounter>
+    <TriggerCounter name="3HA2" type="CTPIN">
+      <TriggerCondition name="3HA2" triggerthreshold="HA2" multi="3"/>
+    </TriggerCounter>
+    <TriggerCounter name="4HA2" type="CTPIN">
+      <TriggerCondition name="4HA2" triggerthreshold="HA2" multi="4"/>
+    </TriggerCounter>
+    <TriggerCounter name="5HA2" type="CTPIN">
+      <TriggerCondition name="5HA2" triggerthreshold="HA2" multi="5"/>
+    </TriggerCounter>
+    <TriggerCounter name="6HA2" type="CTPIN">
+      <TriggerCondition name="6HA2" triggerthreshold="HA2" multi="6"/>
+    </TriggerCounter>
+    <TriggerCounter name="7HA2" type="CTPIN">
+      <TriggerCondition name="7HA2" triggerthreshold="HA2" multi="7"/>
+    </TriggerCounter>
     <TriggerCounter name="1HA20" type="CTPIN">
       <TriggerCondition name="1HA20" triggerthreshold="HA20" multi="1"/>
     </TriggerCounter>
@@ -3684,27 +4166,6 @@
     <TriggerCounter name="7HA20IT" type="CTPIN">
       <TriggerCondition name="7HA20IT" triggerthreshold="HA20IT" multi="7"/>
     </TriggerCounter>
-    <TriggerCounter name="1HA25" type="CTPIN">
-      <TriggerCondition name="1HA25" triggerthreshold="HA25" multi="1"/>
-    </TriggerCounter>
-    <TriggerCounter name="2HA25" type="CTPIN">
-      <TriggerCondition name="2HA25" triggerthreshold="HA25" multi="2"/>
-    </TriggerCounter>
-    <TriggerCounter name="3HA25" type="CTPIN">
-      <TriggerCondition name="3HA25" triggerthreshold="HA25" multi="3"/>
-    </TriggerCounter>
-    <TriggerCounter name="4HA25" type="CTPIN">
-      <TriggerCondition name="4HA25" triggerthreshold="HA25" multi="4"/>
-    </TriggerCounter>
-    <TriggerCounter name="5HA25" type="CTPIN">
-      <TriggerCondition name="5HA25" triggerthreshold="HA25" multi="5"/>
-    </TriggerCounter>
-    <TriggerCounter name="6HA25" type="CTPIN">
-      <TriggerCondition name="6HA25" triggerthreshold="HA25" multi="6"/>
-    </TriggerCounter>
-    <TriggerCounter name="7HA25" type="CTPIN">
-      <TriggerCondition name="7HA25" triggerthreshold="HA25" multi="7"/>
-    </TriggerCounter>
     <TriggerCounter name="1HA25IT" type="CTPIN">
       <TriggerCondition name="1HA25IT" triggerthreshold="HA25IT" multi="1"/>
     </TriggerCounter>
@@ -3726,6 +4187,27 @@
     <TriggerCounter name="7HA25IT" type="CTPIN">
       <TriggerCondition name="7HA25IT" triggerthreshold="HA25IT" multi="7"/>
     </TriggerCounter>
+    <TriggerCounter name="1HA3" type="CTPIN">
+      <TriggerCondition name="1HA3" triggerthreshold="HA3" multi="1"/>
+    </TriggerCounter>
+    <TriggerCounter name="2HA3" type="CTPIN">
+      <TriggerCondition name="2HA3" triggerthreshold="HA3" multi="2"/>
+    </TriggerCounter>
+    <TriggerCounter name="3HA3" type="CTPIN">
+      <TriggerCondition name="3HA3" triggerthreshold="HA3" multi="3"/>
+    </TriggerCounter>
+    <TriggerCounter name="4HA3" type="CTPIN">
+      <TriggerCondition name="4HA3" triggerthreshold="HA3" multi="4"/>
+    </TriggerCounter>
+    <TriggerCounter name="5HA3" type="CTPIN">
+      <TriggerCondition name="5HA3" triggerthreshold="HA3" multi="5"/>
+    </TriggerCounter>
+    <TriggerCounter name="6HA3" type="CTPIN">
+      <TriggerCondition name="6HA3" triggerthreshold="HA3" multi="6"/>
+    </TriggerCounter>
+    <TriggerCounter name="7HA3" type="CTPIN">
+      <TriggerCondition name="7HA3" triggerthreshold="HA3" multi="7"/>
+    </TriggerCounter>
     <TriggerCounter name="1HA30" type="CTPIN">
       <TriggerCondition name="1HA30" triggerthreshold="HA30" multi="1"/>
     </TriggerCounter>
@@ -3810,15 +4292,6 @@
     <TriggerCounter name="7HA8" type="CTPIN">
       <TriggerCondition name="7HA8" triggerthreshold="HA8" multi="7"/>
     </TriggerCounter>
-    <TriggerCounter name="1J10.31ETA49" type="CTPIN">
-      <TriggerCondition name="1J10.31ETA49" triggerthreshold="J10.31ETA49" multi="1"/>
-    </TriggerCounter>
-    <TriggerCounter name="2J10.31ETA49" type="CTPIN">
-      <TriggerCondition name="2J10.31ETA49" triggerthreshold="J10.31ETA49" multi="2"/>
-    </TriggerCounter>
-    <TriggerCounter name="3J10.31ETA49" type="CTPIN">
-      <TriggerCondition name="3J10.31ETA49" triggerthreshold="J10.31ETA49" multi="3"/>
-    </TriggerCounter>
     <TriggerCounter name="1J100" type="CTPIN">
       <TriggerCondition name="1J100" triggerthreshold="J100" multi="1"/>
     </TriggerCounter>
@@ -4080,6 +4553,15 @@
     <TriggerCounter name="3J50" type="CTPIN">
       <TriggerCondition name="3J50" triggerthreshold="J50" multi="3"/>
     </TriggerCounter>
+    <TriggerCounter name="1J50.31ETA49" type="CTPIN">
+      <TriggerCondition name="1J50.31ETA49" triggerthreshold="J50.31ETA49" multi="1"/>
+    </TriggerCounter>
+    <TriggerCounter name="2J50.31ETA49" type="CTPIN">
+      <TriggerCondition name="2J50.31ETA49" triggerthreshold="J50.31ETA49" multi="2"/>
+    </TriggerCounter>
+    <TriggerCounter name="3J50.31ETA49" type="CTPIN">
+      <TriggerCondition name="3J50.31ETA49" triggerthreshold="J50.31ETA49" multi="3"/>
+    </TriggerCounter>
     <TriggerCounter name="1J75" type="CTPIN">
       <TriggerCondition name="1J75" triggerthreshold="J75" multi="1"/>
     </TriggerCounter>
@@ -4521,6 +5003,9 @@
     <TriggerCounter name="1TE200" type="CTPIN">
       <TriggerCondition name="1TE200" triggerthreshold="TE200" multi="1"/>
     </TriggerCounter>
+    <TriggerCounter name="1TE3.0ETA49" type="CTPIN">
+      <TriggerCondition name="1TE3.0ETA49" triggerthreshold="TE3.0ETA49" multi="1"/>
+    </TriggerCounter>
     <TriggerCounter name="1TE3000.0ETA49" type="CTPIN">
       <TriggerCondition name="1TE3000.0ETA49" triggerthreshold="TE3000.0ETA49" multi="1"/>
     </TriggerCounter>
@@ -4539,20 +5024,35 @@
     <TriggerCounter name="1TE50" type="CTPMON">
       <TriggerCondition name="1TE50" triggerthreshold="TE50" multi="1"/>
     </TriggerCounter>
-    <TriggerCounter name="1TE500.0ETA49" type="CTPIN">
-      <TriggerCondition name="1TE500.0ETA49" triggerthreshold="TE500.0ETA49" multi="1"/>
-    </TriggerCounter>
-    <TriggerCounter name="1TE5000.0ETA49" type="CTPIN">
-      <TriggerCondition name="1TE5000.0ETA49" triggerthreshold="TE5000.0ETA49" multi="1"/>
+    <TriggerCounter name="1TE600.0ETA49" type="CTPIN">
+      <TriggerCondition name="1TE600.0ETA49" triggerthreshold="TE600.0ETA49" multi="1"/>
     </TriggerCounter>
     <TriggerCounter name="1TE6500.0ETA49" type="CTPIN">
       <TriggerCondition name="1TE6500.0ETA49" triggerthreshold="TE6500.0ETA49" multi="1"/>
     </TriggerCounter>
+    <TriggerCounter name="1TE7.0ETA49" type="CTPIN">
+      <TriggerCondition name="1TE7.0ETA49" triggerthreshold="TE7.0ETA49" multi="1"/>
+    </TriggerCounter>
     <TriggerCounter name="1TE8000.0ETA49" type="CTPIN">
       <TriggerCondition name="1TE8000.0ETA49" triggerthreshold="TE8000.0ETA49" multi="1"/>
     </TriggerCounter>
-    <TriggerCounter name="1TE9000.0ETA49" type="CTPIN">
-      <TriggerCondition name="1TE9000.0ETA49" triggerthreshold="TE9000.0ETA49" multi="1"/>
+    <TriggerCounter name="1XE10" type="CTPIN">
+      <TriggerCondition name="1XE10" triggerthreshold="XE10" multi="1"/>
+    </TriggerCounter>
+    <TriggerCounter name="1XE150" type="CTPIN">
+      <TriggerCondition name="1XE150" triggerthreshold="XE150" multi="1"/>
+    </TriggerCounter>
+    <TriggerCounter name="1XE20" type="CTPIN">
+      <TriggerCondition name="1XE20" triggerthreshold="XE20" multi="1"/>
+    </TriggerCounter>
+    <TriggerCounter name="1XE25" type="CTPIN">
+      <TriggerCondition name="1XE25" triggerthreshold="XE25" multi="1"/>
+    </TriggerCounter>
+    <TriggerCounter name="1XE30" type="CTPIN">
+      <TriggerCondition name="1XE30" triggerthreshold="XE30" multi="1"/>
+    </TriggerCounter>
+    <TriggerCounter name="1XE300" type="CTPIN">
+      <TriggerCondition name="1XE300" triggerthreshold="XE300" multi="1"/>
     </TriggerCounter>
     <TriggerCounter name="1XE35" type="CTPIN">
       <TriggerCondition name="1XE35" triggerthreshold="XE35" multi="1"/>
@@ -4560,54 +5060,36 @@
     <TriggerCounter name="1XE35" type="CTPMON">
       <TriggerCondition name="1XE35" triggerthreshold="XE35" multi="1"/>
     </TriggerCounter>
-    <TriggerCounter name="1XE35.0ETA24" type="CTPIN">
-      <TriggerCondition name="1XE35.0ETA24" triggerthreshold="XE35.0ETA24" multi="1"/>
-    </TriggerCounter>
     <TriggerCounter name="1XE40" type="CTPIN">
       <TriggerCondition name="1XE40" triggerthreshold="XE40" multi="1"/>
     </TriggerCounter>
-    <TriggerCounter name="1XE40.0ETA24" type="CTPIN">
-      <TriggerCondition name="1XE40.0ETA24" triggerthreshold="XE40.0ETA24" multi="1"/>
-    </TriggerCounter>
     <TriggerCounter name="1XE45" type="CTPIN">
       <TriggerCondition name="1XE45" triggerthreshold="XE45" multi="1"/>
     </TriggerCounter>
-    <TriggerCounter name="1XE45.0ETA24" type="CTPIN">
-      <TriggerCondition name="1XE45.0ETA24" triggerthreshold="XE45.0ETA24" multi="1"/>
-    </TriggerCounter>
     <TriggerCounter name="1XE50" type="CTPIN">
       <TriggerCondition name="1XE50" triggerthreshold="XE50" multi="1"/>
     </TriggerCounter>
-    <TriggerCounter name="1XE50.0ETA24" type="CTPIN">
-      <TriggerCondition name="1XE50.0ETA24" triggerthreshold="XE50.0ETA24" multi="1"/>
-    </TriggerCounter>
     <TriggerCounter name="1XE55" type="CTPIN">
       <TriggerCondition name="1XE55" triggerthreshold="XE55" multi="1"/>
     </TriggerCounter>
-    <TriggerCounter name="1XE55.0ETA24" type="CTPIN">
-      <TriggerCondition name="1XE55.0ETA24" triggerthreshold="XE55.0ETA24" multi="1"/>
-    </TriggerCounter>
     <TriggerCounter name="1XE60" type="CTPIN">
       <TriggerCondition name="1XE60" triggerthreshold="XE60" multi="1"/>
     </TriggerCounter>
     <TriggerCounter name="1XE60" type="CTPMON">
       <TriggerCondition name="1XE60" triggerthreshold="XE60" multi="1"/>
     </TriggerCounter>
-    <TriggerCounter name="1XE60.0ETA24" type="CTPIN">
-      <TriggerCondition name="1XE60.0ETA24" triggerthreshold="XE60.0ETA24" multi="1"/>
+    <TriggerCounter name="1XE65" type="CTPIN">
+      <TriggerCondition name="1XE65" triggerthreshold="XE65" multi="1"/>
     </TriggerCounter>
     <TriggerCounter name="1XE70" type="CTPIN">
       <TriggerCondition name="1XE70" triggerthreshold="XE70" multi="1"/>
     </TriggerCounter>
-    <TriggerCounter name="1XE70.0ETA24" type="CTPIN">
-      <TriggerCondition name="1XE70.0ETA24" triggerthreshold="XE70.0ETA24" multi="1"/>
+    <TriggerCounter name="1XE75" type="CTPIN">
+      <TriggerCondition name="1XE75" triggerthreshold="XE75" multi="1"/>
     </TriggerCounter>
     <TriggerCounter name="1XE80" type="CTPIN">
       <TriggerCondition name="1XE80" triggerthreshold="XE80" multi="1"/>
     </TriggerCounter>
-    <TriggerCounter name="1XE80.0ETA24" type="CTPIN">
-      <TriggerCondition name="1XE80.0ETA24" triggerthreshold="XE80.0ETA24" multi="1"/>
-    </TriggerCounter>
     <TriggerCounter name="1XS20" type="CTPIN">
       <TriggerCondition name="1XS20" triggerthreshold="XS20" multi="1"/>
     </TriggerCounter>
@@ -4948,52 +5430,54 @@
         <Signal range_begin="15" range_end="17"/>
       </Cable>
     </TriggerThreshold>
-    <TriggerThreshold active="1" bitnum="3" id="56" mapping="6" name="EM13VH" type="EM" input="ctpin" version="1">
-      <TriggerThresholdValue em_isolation="63" etamin="-49" etamax="49" had_isolation="63" had_veto="99" isobits="00001" name="EM13VHfull" phimin="0" phimax="64" priority="1" thresholdval="15" type="EM" window="0"/>
-      <TriggerThresholdValue em_isolation="63" etamin="-25" etamax="-17" had_isolation="63" had_veto="99" isobits="00001" name="EM13VHfull" phimin="0" phimax="64" priority="2" thresholdval="14" type="EM" window="0"/>
-      <TriggerThresholdValue em_isolation="63" etamin="-17" etamax="-15" had_isolation="63" had_veto="99" isobits="00001" name="EM13VHfull" phimin="0" phimax="64" priority="2" thresholdval="13" type="EM" window="0"/>
-      <TriggerThresholdValue em_isolation="63" etamin="-15" etamax="-14" had_isolation="63" had_veto="99" isobits="00001" name="EM13VHfull" phimin="0" phimax="64" priority="2" thresholdval="11" type="EM" window="0"/>
-      <TriggerThresholdValue em_isolation="63" etamin="-14" etamax="-12" had_isolation="63" had_veto="99" isobits="00001" name="EM13VHfull" phimin="0" phimax="64" priority="2" thresholdval="12" type="EM" window="0"/>
-      <TriggerThresholdValue em_isolation="63" etamin="-12" etamax="-9" had_isolation="63" had_veto="99" isobits="00001" name="EM13VHfull" phimin="0" phimax="64" priority="2" thresholdval="13" type="EM" window="0"/>
-      <TriggerThresholdValue em_isolation="63" etamin="-9" etamax="-7" had_isolation="63" had_veto="99" isobits="00001" name="EM13VHfull" phimin="0" phimax="64" priority="2" thresholdval="14" type="EM" window="0"/>
-      <TriggerThresholdValue em_isolation="63" etamin="-7" etamax="0" had_isolation="63" had_veto="99" isobits="00001" name="EM13VHfull" phimin="0" phimax="64" priority="2" thresholdval="15" type="EM" window="0"/>
-      <TriggerThresholdValue em_isolation="63" etamin="0" etamax="7" had_isolation="63" had_veto="99" isobits="00001" name="EM13VHfull" phimin="0" phimax="64" priority="2" thresholdval="15" type="EM" window="0"/>
-      <TriggerThresholdValue em_isolation="63" etamin="7" etamax="9" had_isolation="63" had_veto="99" isobits="00001" name="EM13VHfull" phimin="0" phimax="64" priority="2" thresholdval="14" type="EM" window="0"/>
-      <TriggerThresholdValue em_isolation="63" etamin="9" etamax="12" had_isolation="63" had_veto="99" isobits="00001" name="EM13VHfull" phimin="0" phimax="64" priority="2" thresholdval="13" type="EM" window="0"/>
-      <TriggerThresholdValue em_isolation="63" etamin="12" etamax="14" had_isolation="63" had_veto="99" isobits="00001" name="EM13VHfull" phimin="0" phimax="64" priority="2" thresholdval="12" type="EM" window="0"/>
-      <TriggerThresholdValue em_isolation="63" etamin="14" etamax="15" had_isolation="63" had_veto="99" isobits="00001" name="EM13VHfull" phimin="0" phimax="64" priority="2" thresholdval="11" type="EM" window="0"/>
-      <TriggerThresholdValue em_isolation="63" etamin="15" etamax="17" had_isolation="63" had_veto="99" isobits="00001" name="EM13VHfull" phimin="0" phimax="64" priority="2" thresholdval="13" type="EM" window="0"/>
-      <TriggerThresholdValue em_isolation="63" etamin="17" etamax="25" had_isolation="63" had_veto="99" isobits="00001" name="EM13VHfull" phimin="0" phimax="64" priority="2" thresholdval="14" type="EM" window="0"/>
+    <TriggerThreshold active="1" bitnum="3" id="56" mapping="6" name="EM14" type="EM" input="ctpin" version="1">
+      <TriggerThresholdValue em_isolation="63" etamin="-49" etamax="49" had_isolation="63" had_veto="99" isobits="00000" name="EM14full" phimin="0" phimax="64" priority="1" thresholdval="14" type="EM" window="0"/>
       <Cable connector="CON0" input="SLOT7" name="EM1">
         <Signal range_begin="18" range_end="20"/>
       </Cable>
     </TriggerThreshold>
-    <TriggerThreshold active="1" bitnum="3" id="57" mapping="7" name="EM14" type="EM" input="ctpin" version="1">
-      <TriggerThresholdValue em_isolation="63" etamin="-49" etamax="49" had_isolation="63" had_veto="99" isobits="00000" name="EM14full" phimin="0" phimax="64" priority="1" thresholdval="14" type="EM" window="0"/>
+    <TriggerThreshold active="1" bitnum="3" id="57" mapping="7" name="EM15" type="EM" input="ctpin" version="1">
+      <TriggerThresholdValue em_isolation="63" etamin="-49" etamax="49" had_isolation="63" had_veto="99" isobits="00000" name="EM15full" phimin="0" phimax="64" priority="1" thresholdval="15" type="EM" window="0"/>
       <Cable connector="CON0" input="SLOT7" name="EM1">
         <Signal range_begin="21" range_end="23"/>
       </Cable>
     </TriggerThreshold>
-    <TriggerThreshold active="1" bitnum="3" id="58" mapping="8" name="EM15" type="EM" input="ctpin" version="1">
-      <TriggerThresholdValue em_isolation="63" etamin="-49" etamax="49" had_isolation="63" had_veto="99" isobits="00000" name="EM15full" phimin="0" phimax="64" priority="1" thresholdval="15" type="EM" window="0"/>
+    <TriggerThreshold active="1" bitnum="3" id="58" mapping="8" name="EM15HI" type="EM" input="ctpin" version="1">
+      <TriggerThresholdValue em_isolation="63" etamin="-49" etamax="49" had_isolation="63" had_veto="99" isobits="00100" name="EM15HIfull" phimin="0" phimax="64" priority="1" thresholdval="15" type="EM" window="0"/>
       <Cable connector="CON1" input="SLOT7" name="EM2">
         <Signal range_begin="0" range_end="2"/>
       </Cable>
     </TriggerThreshold>
-    <TriggerThreshold active="1" bitnum="3" id="59" mapping="9" name="EM15HI" type="EM" input="ctpin" version="1">
-      <TriggerThresholdValue em_isolation="63" etamin="-49" etamax="49" had_isolation="63" had_veto="99" isobits="00100" name="EM15HIfull" phimin="0" phimax="64" priority="1" thresholdval="15" type="EM" window="0"/>
+    <TriggerThreshold active="1" bitnum="3" id="59" mapping="9" name="EM16" type="EM" input="ctpin" version="1">
+      <TriggerThresholdValue em_isolation="63" etamin="-49" etamax="49" had_isolation="63" had_veto="99" isobits="00000" name="EM16full" phimin="0" phimax="64" priority="1" thresholdval="16" type="EM" window="0"/>
       <Cable connector="CON1" input="SLOT7" name="EM2">
         <Signal range_begin="3" range_end="5"/>
       </Cable>
     </TriggerThreshold>
-    <TriggerThreshold active="1" bitnum="3" id="60" mapping="10" name="EM16" type="EM" input="ctpin" version="1">
-      <TriggerThresholdValue em_isolation="63" etamin="-49" etamax="49" had_isolation="63" had_veto="99" isobits="00000" name="EM16full" phimin="0" phimax="64" priority="1" thresholdval="16" type="EM" window="0"/>
+    <TriggerThreshold active="1" bitnum="3" id="60" mapping="10" name="EM18" type="EM" input="ctpin" version="1">
+      <TriggerThresholdValue em_isolation="63" etamin="-49" etamax="49" had_isolation="63" had_veto="99" isobits="00000" name="EM18full" phimin="0" phimax="64" priority="1" thresholdval="18" type="EM" window="0"/>
       <Cable connector="CON1" input="SLOT7" name="EM2">
         <Signal range_begin="6" range_end="8"/>
       </Cable>
     </TriggerThreshold>
-    <TriggerThreshold active="1" bitnum="3" id="61" mapping="11" name="EM18" type="EM" input="ctpin" version="1">
-      <TriggerThresholdValue em_isolation="63" etamin="-49" etamax="49" had_isolation="63" had_veto="99" isobits="00000" name="EM18full" phimin="0" phimax="64" priority="1" thresholdval="18" type="EM" window="0"/>
+    <TriggerThreshold active="1" bitnum="3" id="61" mapping="11" name="EM18VH" type="EM" input="ctpin" version="1">
+      <TriggerThresholdValue em_isolation="63" etamin="-49" etamax="49" had_isolation="63" had_veto="99" isobits="00001" name="EM18VHfull" phimin="0" phimax="64" priority="1" thresholdval="20" type="EM" window="0"/>
+      <TriggerThresholdValue em_isolation="63" etamin="-25" etamax="-17" had_isolation="63" had_veto="99" isobits="00001" name="EM18VHfull" phimin="0" phimax="64" priority="2" thresholdval="19" type="EM" window="0"/>
+      <TriggerThresholdValue em_isolation="63" etamin="-17" etamax="-15" had_isolation="63" had_veto="99" isobits="00001" name="EM18VHfull" phimin="0" phimax="64" priority="2" thresholdval="17" type="EM" window="0"/>
+      <TriggerThresholdValue em_isolation="63" etamin="-15" etamax="-14" had_isolation="63" had_veto="99" isobits="00001" name="EM18VHfull" phimin="0" phimax="64" priority="2" thresholdval="15" type="EM" window="0"/>
+      <TriggerThresholdValue em_isolation="63" etamin="-14" etamax="-13" had_isolation="63" had_veto="99" isobits="00001" name="EM18VHfull" phimin="0" phimax="64" priority="2" thresholdval="16" type="EM" window="0"/>
+      <TriggerThresholdValue em_isolation="63" etamin="-13" etamax="-11" had_isolation="63" had_veto="99" isobits="00001" name="EM18VHfull" phimin="0" phimax="64" priority="2" thresholdval="17" type="EM" window="0"/>
+      <TriggerThresholdValue em_isolation="63" etamin="-11" etamax="-8" had_isolation="63" had_veto="99" isobits="00001" name="EM18VHfull" phimin="0" phimax="64" priority="2" thresholdval="18" type="EM" window="0"/>
+      <TriggerThresholdValue em_isolation="63" etamin="-8" etamax="-7" had_isolation="63" had_veto="99" isobits="00001" name="EM18VHfull" phimin="0" phimax="64" priority="2" thresholdval="19" type="EM" window="0"/>
+      <TriggerThresholdValue em_isolation="63" etamin="-7" etamax="0" had_isolation="63" had_veto="99" isobits="00001" name="EM18VHfull" phimin="0" phimax="64" priority="2" thresholdval="20" type="EM" window="0"/>
+      <TriggerThresholdValue em_isolation="63" etamin="0" etamax="7" had_isolation="63" had_veto="99" isobits="00001" name="EM18VHfull" phimin="0" phimax="64" priority="2" thresholdval="20" type="EM" window="0"/>
+      <TriggerThresholdValue em_isolation="63" etamin="7" etamax="8" had_isolation="63" had_veto="99" isobits="00001" name="EM18VHfull" phimin="0" phimax="64" priority="2" thresholdval="19" type="EM" window="0"/>
+      <TriggerThresholdValue em_isolation="63" etamin="8" etamax="11" had_isolation="63" had_veto="99" isobits="00001" name="EM18VHfull" phimin="0" phimax="64" priority="2" thresholdval="18" type="EM" window="0"/>
+      <TriggerThresholdValue em_isolation="63" etamin="11" etamax="13" had_isolation="63" had_veto="99" isobits="00001" name="EM18VHfull" phimin="0" phimax="64" priority="2" thresholdval="17" type="EM" window="0"/>
+      <TriggerThresholdValue em_isolation="63" etamin="13" etamax="14" had_isolation="63" had_veto="99" isobits="00001" name="EM18VHfull" phimin="0" phimax="64" priority="2" thresholdval="16" type="EM" window="0"/>
+      <TriggerThresholdValue em_isolation="63" etamin="14" etamax="15" had_isolation="63" had_veto="99" isobits="00001" name="EM18VHfull" phimin="0" phimax="64" priority="2" thresholdval="15" type="EM" window="0"/>
+      <TriggerThresholdValue em_isolation="63" etamin="15" etamax="17" had_isolation="63" had_veto="99" isobits="00001" name="EM18VHfull" phimin="0" phimax="64" priority="2" thresholdval="17" type="EM" window="0"/>
+      <TriggerThresholdValue em_isolation="63" etamin="17" etamax="25" had_isolation="63" had_veto="99" isobits="00001" name="EM18VHfull" phimin="0" phimax="64" priority="2" thresholdval="19" type="EM" window="0"/>
       <Cable connector="CON1" input="SLOT7" name="EM2">
         <Signal range_begin="9" range_end="11"/>
       </Cable>
@@ -5189,34 +5673,34 @@
         <Signal range_begin="16" range_end="17"/>
       </Cable>
     </TriggerThreshold>
-    <TriggerThreshold active="1" bitnum="2" id="85" mapping="19" name="J10.31ETA49" type="JET" input="ctpin" version="1">
-      <TriggerThresholdValue em_isolation="63" etamin="-49" etamax="49" had_isolation="63" had_veto="63" name="J10.31ETA49full" phimin="0" phimax="64" priority="0" thresholdval="1023" type="JET" window="8" windowSize="LARGE"/>
-      <TriggerThresholdValue em_isolation="63" etamin="-49" etamax="-31" had_isolation="63" had_veto="63" name="J10.31ETA49full" phimin="0" phimax="64" priority="1" thresholdval="10" type="JET" window="8" windowSize="LARGE"/>
-      <TriggerThresholdValue em_isolation="63" etamin="31" etamax="49" had_isolation="63" had_veto="63" name="J10.31ETA49full" phimin="0" phimax="64" priority="1" thresholdval="10" type="JET" window="8" windowSize="LARGE"/>
-      <Cable connector="CON1" input="SLOT8" name="JET2">
-        <Signal range_begin="18" range_end="19"/>
-      </Cable>
-    </TriggerThreshold>
-    <TriggerThreshold active="1" bitnum="2" id="86" mapping="20" name="J15.31ETA49" type="JET" input="ctpin" version="1">
+    <TriggerThreshold active="1" bitnum="2" id="85" mapping="19" name="J15.31ETA49" type="JET" input="ctpin" version="1">
       <TriggerThresholdValue em_isolation="63" etamin="-49" etamax="49" had_isolation="63" had_veto="63" name="J15.31ETA49full" phimin="0" phimax="64" priority="0" thresholdval="1023" type="JET" window="8" windowSize="LARGE"/>
       <TriggerThresholdValue em_isolation="63" etamin="-49" etamax="-31" had_isolation="63" had_veto="63" name="J15.31ETA49full" phimin="0" phimax="64" priority="1" thresholdval="15" type="JET" window="8" windowSize="LARGE"/>
       <TriggerThresholdValue em_isolation="63" etamin="31" etamax="49" had_isolation="63" had_veto="63" name="J15.31ETA49full" phimin="0" phimax="64" priority="1" thresholdval="15" type="JET" window="8" windowSize="LARGE"/>
       <Cable connector="CON1" input="SLOT8" name="JET2">
-        <Signal range_begin="20" range_end="21"/>
+        <Signal range_begin="18" range_end="19"/>
       </Cable>
     </TriggerThreshold>
-    <TriggerThreshold active="1" bitnum="2" id="87" mapping="21" name="J20.31ETA49" type="JET" input="ctpin" version="1">
+    <TriggerThreshold active="1" bitnum="2" id="86" mapping="20" name="J20.31ETA49" type="JET" input="ctpin" version="1">
       <TriggerThresholdValue em_isolation="63" etamin="-49" etamax="49" had_isolation="63" had_veto="63" name="J20.31ETA49full" phimin="0" phimax="64" priority="0" thresholdval="1023" type="JET" window="8" windowSize="LARGE"/>
       <TriggerThresholdValue em_isolation="63" etamin="-49" etamax="-31" had_isolation="63" had_veto="63" name="J20.31ETA49full" phimin="0" phimax="64" priority="1" thresholdval="20" type="JET" window="8" windowSize="LARGE"/>
       <TriggerThresholdValue em_isolation="63" etamin="31" etamax="49" had_isolation="63" had_veto="63" name="J20.31ETA49full" phimin="0" phimax="64" priority="1" thresholdval="20" type="JET" window="8" windowSize="LARGE"/>
       <Cable connector="CON1" input="SLOT8" name="JET2">
-        <Signal range_begin="22" range_end="23"/>
+        <Signal range_begin="20" range_end="21"/>
       </Cable>
     </TriggerThreshold>
-    <TriggerThreshold active="1" bitnum="2" id="88" mapping="22" name="J30.31ETA49" type="JET" input="ctpin" version="1">
+    <TriggerThreshold active="1" bitnum="2" id="87" mapping="21" name="J30.31ETA49" type="JET" input="ctpin" version="1">
       <TriggerThresholdValue em_isolation="63" etamin="-49" etamax="49" had_isolation="63" had_veto="63" name="J30.31ETA49full" phimin="0" phimax="64" priority="0" thresholdval="1023" type="JET" window="8" windowSize="LARGE"/>
       <TriggerThresholdValue em_isolation="63" etamin="-49" etamax="-31" had_isolation="63" had_veto="63" name="J30.31ETA49full" phimin="0" phimax="64" priority="1" thresholdval="30" type="JET" window="8" windowSize="LARGE"/>
       <TriggerThresholdValue em_isolation="63" etamin="31" etamax="49" had_isolation="63" had_veto="63" name="J30.31ETA49full" phimin="0" phimax="64" priority="1" thresholdval="30" type="JET" window="8" windowSize="LARGE"/>
+      <Cable connector="CON1" input="SLOT8" name="JET2">
+        <Signal range_begin="22" range_end="23"/>
+      </Cable>
+    </TriggerThreshold>
+    <TriggerThreshold active="1" bitnum="2" id="88" mapping="22" name="J50.31ETA49" type="JET" input="ctpin" version="1">
+      <TriggerThresholdValue em_isolation="63" etamin="-49" etamax="49" had_isolation="63" had_veto="63" name="J50.31ETA49full" phimin="0" phimax="64" priority="0" thresholdval="1023" type="JET" window="8" windowSize="LARGE"/>
+      <TriggerThresholdValue em_isolation="63" etamin="-49" etamax="-31" had_isolation="63" had_veto="63" name="J50.31ETA49full" phimin="0" phimax="64" priority="1" thresholdval="50" type="JET" window="8" windowSize="LARGE"/>
+      <TriggerThresholdValue em_isolation="63" etamin="31" etamax="49" had_isolation="63" had_veto="63" name="J50.31ETA49full" phimin="0" phimax="64" priority="1" thresholdval="50" type="JET" window="8" windowSize="LARGE"/>
       <Cable connector="CON1" input="SLOT8" name="JET2">
         <Signal range_begin="24" range_end="25"/>
       </Cable>
@@ -5597,98 +6081,98 @@
         <Signal range_begin="21" range_end="21"/>
       </Cable>
     </TriggerThreshold>
-    <TriggerThreshold active="1" bitnum="3" id="146" mapping="0" name="HA8" type="TAU" input="ctpin" version="1">
-      <TriggerThresholdValue em_isolation="63" etamin="-49" etamax="49" had_isolation="63" had_veto="99" isobits="00000" name="HA8full" phimin="0" phimax="64" priority="1" thresholdval="8" type="TAU" window="0"/>
+    <TriggerThreshold active="1" bitnum="3" id="146" mapping="0" name="HA2" type="TAU" input="ctpin" version="1">
+      <TriggerThresholdValue em_isolation="63" etamin="-49" etamax="49" had_isolation="63" had_veto="99" isobits="00000" name="HA2full" phimin="0" phimax="64" priority="1" thresholdval="2" type="TAU" window="0"/>
       <Cable connector="CON2" input="SLOT7" name="TAU1">
         <Signal range_begin="0" range_end="2"/>
       </Cable>
     </TriggerThreshold>
-    <TriggerThreshold active="1" bitnum="3" id="147" mapping="1" name="HA12" type="TAU" input="ctpin" version="1">
-      <TriggerThresholdValue em_isolation="63" etamin="-49" etamax="49" had_isolation="63" had_veto="99" isobits="00000" name="HA12full" phimin="0" phimax="64" priority="1" thresholdval="12" type="TAU" window="0"/>
+    <TriggerThreshold active="1" bitnum="3" id="147" mapping="1" name="HA3" type="TAU" input="ctpin" version="1">
+      <TriggerThresholdValue em_isolation="63" etamin="-49" etamax="49" had_isolation="63" had_veto="99" isobits="00000" name="HA3full" phimin="0" phimax="64" priority="1" thresholdval="3" type="TAU" window="0"/>
       <Cable connector="CON2" input="SLOT7" name="TAU1">
         <Signal range_begin="3" range_end="5"/>
       </Cable>
     </TriggerThreshold>
-    <TriggerThreshold active="1" bitnum="3" id="148" mapping="2" name="HA12IL" type="TAU" input="ctpin" version="1">
-      <TriggerThresholdValue em_isolation="63" etamin="-49" etamax="49" had_isolation="63" had_veto="99" isobits="00001" name="HA12ILfull" phimin="0" phimax="64" priority="1" thresholdval="12" type="TAU" window="0"/>
+    <TriggerThreshold active="1" bitnum="3" id="148" mapping="2" name="HA8" type="TAU" input="ctpin" version="1">
+      <TriggerThresholdValue em_isolation="63" etamin="-49" etamax="49" had_isolation="63" had_veto="99" isobits="00000" name="HA8full" phimin="0" phimax="64" priority="1" thresholdval="8" type="TAU" window="0"/>
       <Cable connector="CON2" input="SLOT7" name="TAU1">
         <Signal range_begin="6" range_end="8"/>
       </Cable>
     </TriggerThreshold>
-    <TriggerThreshold active="1" bitnum="3" id="149" mapping="3" name="HA12IM" type="TAU" input="ctpin" version="1">
-      <TriggerThresholdValue em_isolation="63" etamin="-49" etamax="49" had_isolation="63" had_veto="99" isobits="00010" name="HA12IMfull" phimin="0" phimax="64" priority="1" thresholdval="12" type="TAU" window="0"/>
+    <TriggerThreshold active="1" bitnum="3" id="149" mapping="3" name="HA12" type="TAU" input="ctpin" version="1">
+      <TriggerThresholdValue em_isolation="63" etamin="-49" etamax="49" had_isolation="63" had_veto="99" isobits="00000" name="HA12full" phimin="0" phimax="64" priority="1" thresholdval="12" type="TAU" window="0"/>
       <Cable connector="CON2" input="SLOT7" name="TAU1">
         <Signal range_begin="9" range_end="11"/>
       </Cable>
     </TriggerThreshold>
-    <TriggerThreshold active="1" bitnum="3" id="150" mapping="4" name="HA12IT" type="TAU" input="ctpin" version="1">
-      <TriggerThresholdValue em_isolation="63" etamin="-49" etamax="49" had_isolation="63" had_veto="99" isobits="00100" name="HA12ITfull" phimin="0" phimax="64" priority="1" thresholdval="12" type="TAU" window="0"/>
+    <TriggerThreshold active="1" bitnum="3" id="150" mapping="4" name="HA12IL" type="TAU" input="ctpin" version="1">
+      <TriggerThresholdValue em_isolation="63" etamin="-49" etamax="49" had_isolation="63" had_veto="99" isobits="00001" name="HA12ILfull" phimin="0" phimax="64" priority="1" thresholdval="12" type="TAU" window="0"/>
       <Cable connector="CON2" input="SLOT7" name="TAU1">
         <Signal range_begin="12" range_end="14"/>
       </Cable>
     </TriggerThreshold>
-    <TriggerThreshold active="1" bitnum="3" id="151" mapping="5" name="HA15" type="TAU" input="ctpin" version="1">
-      <TriggerThresholdValue em_isolation="63" etamin="-49" etamax="49" had_isolation="63" had_veto="99" isobits="00000" name="HA15full" phimin="0" phimax="64" priority="1" thresholdval="15" type="TAU" window="0"/>
+    <TriggerThreshold active="1" bitnum="3" id="151" mapping="5" name="HA12IM" type="TAU" input="ctpin" version="1">
+      <TriggerThresholdValue em_isolation="63" etamin="-49" etamax="49" had_isolation="63" had_veto="99" isobits="00010" name="HA12IMfull" phimin="0" phimax="64" priority="1" thresholdval="12" type="TAU" window="0"/>
       <Cable connector="CON2" input="SLOT7" name="TAU1">
         <Signal range_begin="15" range_end="17"/>
       </Cable>
     </TriggerThreshold>
-    <TriggerThreshold active="1" bitnum="3" id="152" mapping="6" name="HA20" type="TAU" input="ctpin" version="1">
-      <TriggerThresholdValue em_isolation="63" etamin="-49" etamax="49" had_isolation="63" had_veto="99" isobits="00000" name="HA20full" phimin="0" phimax="64" priority="1" thresholdval="20" type="TAU" window="0"/>
+    <TriggerThreshold active="1" bitnum="3" id="152" mapping="6" name="HA12IT" type="TAU" input="ctpin" version="1">
+      <TriggerThresholdValue em_isolation="63" etamin="-49" etamax="49" had_isolation="63" had_veto="99" isobits="00100" name="HA12ITfull" phimin="0" phimax="64" priority="1" thresholdval="12" type="TAU" window="0"/>
       <Cable connector="CON2" input="SLOT7" name="TAU1">
         <Signal range_begin="18" range_end="20"/>
       </Cable>
     </TriggerThreshold>
-    <TriggerThreshold active="1" bitnum="3" id="153" mapping="7" name="HA20IL" type="TAU" input="ctpin" version="1">
-      <TriggerThresholdValue em_isolation="63" etamin="-49" etamax="49" had_isolation="63" had_veto="99" isobits="00001" name="HA20ILfull" phimin="0" phimax="64" priority="1" thresholdval="20" type="TAU" window="0"/>
+    <TriggerThreshold active="1" bitnum="3" id="153" mapping="7" name="HA15" type="TAU" input="ctpin" version="1">
+      <TriggerThresholdValue em_isolation="63" etamin="-49" etamax="49" had_isolation="63" had_veto="99" isobits="00000" name="HA15full" phimin="0" phimax="64" priority="1" thresholdval="15" type="TAU" window="0"/>
       <Cable connector="CON2" input="SLOT7" name="TAU1">
         <Signal range_begin="21" range_end="23"/>
       </Cable>
     </TriggerThreshold>
-    <TriggerThreshold active="1" bitnum="3" id="154" mapping="8" name="HA20IM" type="TAU" input="ctpin" version="1">
-      <TriggerThresholdValue em_isolation="63" etamin="-49" etamax="49" had_isolation="63" had_veto="99" isobits="00010" name="HA20IMfull" phimin="0" phimax="64" priority="1" thresholdval="20" type="TAU" window="0"/>
+    <TriggerThreshold active="1" bitnum="3" id="154" mapping="8" name="HA20" type="TAU" input="ctpin" version="1">
+      <TriggerThresholdValue em_isolation="63" etamin="-49" etamax="49" had_isolation="63" had_veto="99" isobits="00000" name="HA20full" phimin="0" phimax="64" priority="1" thresholdval="20" type="TAU" window="0"/>
       <Cable connector="CON3" input="SLOT7" name="TAU2">
         <Signal range_begin="0" range_end="2"/>
       </Cable>
     </TriggerThreshold>
-    <TriggerThreshold active="1" bitnum="3" id="155" mapping="9" name="HA20IT" type="TAU" input="ctpin" version="1">
-      <TriggerThresholdValue em_isolation="63" etamin="-49" etamax="49" had_isolation="63" had_veto="99" isobits="00100" name="HA20ITfull" phimin="0" phimax="64" priority="1" thresholdval="20" type="TAU" window="0"/>
+    <TriggerThreshold active="1" bitnum="3" id="155" mapping="9" name="HA20IL" type="TAU" input="ctpin" version="1">
+      <TriggerThresholdValue em_isolation="63" etamin="-49" etamax="49" had_isolation="63" had_veto="99" isobits="00001" name="HA20ILfull" phimin="0" phimax="64" priority="1" thresholdval="20" type="TAU" window="0"/>
       <Cable connector="CON3" input="SLOT7" name="TAU2">
         <Signal range_begin="3" range_end="5"/>
       </Cable>
     </TriggerThreshold>
-    <TriggerThreshold active="1" bitnum="3" id="156" mapping="10" name="HA25" type="TAU" input="ctpin" version="1">
-      <TriggerThresholdValue em_isolation="63" etamin="-49" etamax="49" had_isolation="63" had_veto="99" isobits="00000" name="HA25full" phimin="0" phimax="64" priority="1" thresholdval="25" type="TAU" window="0"/>
+    <TriggerThreshold active="1" bitnum="3" id="156" mapping="10" name="HA20IM" type="TAU" input="ctpin" version="1">
+      <TriggerThresholdValue em_isolation="63" etamin="-49" etamax="49" had_isolation="63" had_veto="99" isobits="00010" name="HA20IMfull" phimin="0" phimax="64" priority="1" thresholdval="20" type="TAU" window="0"/>
       <Cable connector="CON3" input="SLOT7" name="TAU2">
         <Signal range_begin="6" range_end="8"/>
       </Cable>
     </TriggerThreshold>
-    <TriggerThreshold active="1" bitnum="3" id="157" mapping="11" name="HA25IT" type="TAU" input="ctpin" version="1">
-      <TriggerThresholdValue em_isolation="63" etamin="-49" etamax="49" had_isolation="63" had_veto="99" isobits="00100" name="HA25ITfull" phimin="0" phimax="64" priority="1" thresholdval="25" type="TAU" window="0"/>
+    <TriggerThreshold active="1" bitnum="3" id="157" mapping="11" name="HA20IT" type="TAU" input="ctpin" version="1">
+      <TriggerThresholdValue em_isolation="63" etamin="-49" etamax="49" had_isolation="63" had_veto="99" isobits="00100" name="HA20ITfull" phimin="0" phimax="64" priority="1" thresholdval="20" type="TAU" window="0"/>
       <Cable connector="CON3" input="SLOT7" name="TAU2">
         <Signal range_begin="9" range_end="11"/>
       </Cable>
     </TriggerThreshold>
-    <TriggerThreshold active="1" bitnum="3" id="158" mapping="12" name="HA30" type="TAU" input="ctpin" version="1">
-      <TriggerThresholdValue em_isolation="63" etamin="-49" etamax="49" had_isolation="63" had_veto="99" isobits="00000" name="HA30full" phimin="0" phimax="64" priority="1" thresholdval="30" type="TAU" window="0"/>
+    <TriggerThreshold active="1" bitnum="3" id="158" mapping="12" name="HA25IT" type="TAU" input="ctpin" version="1">
+      <TriggerThresholdValue em_isolation="63" etamin="-49" etamax="49" had_isolation="63" had_veto="99" isobits="00100" name="HA25ITfull" phimin="0" phimax="64" priority="1" thresholdval="25" type="TAU" window="0"/>
       <Cable connector="CON3" input="SLOT7" name="TAU2">
         <Signal range_begin="12" range_end="14"/>
       </Cable>
     </TriggerThreshold>
-    <TriggerThreshold active="1" bitnum="3" id="159" mapping="13" name="HA40" type="TAU" input="ctpin" version="1">
-      <TriggerThresholdValue em_isolation="63" etamin="-49" etamax="49" had_isolation="63" had_veto="99" isobits="00000" name="HA40full" phimin="0" phimax="64" priority="1" thresholdval="40" type="TAU" window="0"/>
+    <TriggerThreshold active="1" bitnum="3" id="159" mapping="13" name="HA30" type="TAU" input="ctpin" version="1">
+      <TriggerThresholdValue em_isolation="63" etamin="-49" etamax="49" had_isolation="63" had_veto="99" isobits="00000" name="HA30full" phimin="0" phimax="64" priority="1" thresholdval="30" type="TAU" window="0"/>
       <Cable connector="CON3" input="SLOT7" name="TAU2">
         <Signal range_begin="15" range_end="17"/>
       </Cable>
     </TriggerThreshold>
-    <TriggerThreshold active="1" bitnum="3" id="160" mapping="14" name="HA60" type="TAU" input="ctpin" version="1">
-      <TriggerThresholdValue em_isolation="63" etamin="-49" etamax="49" had_isolation="63" had_veto="99" isobits="00000" name="HA60full" phimin="0" phimax="64" priority="1" thresholdval="60" type="TAU" window="0"/>
+    <TriggerThreshold active="1" bitnum="3" id="160" mapping="14" name="HA40" type="TAU" input="ctpin" version="1">
+      <TriggerThresholdValue em_isolation="63" etamin="-49" etamax="49" had_isolation="63" had_veto="99" isobits="00000" name="HA40full" phimin="0" phimax="64" priority="1" thresholdval="40" type="TAU" window="0"/>
       <Cable connector="CON3" input="SLOT7" name="TAU2">
         <Signal range_begin="18" range_end="20"/>
       </Cable>
     </TriggerThreshold>
-    <TriggerThreshold active="1" bitnum="3" id="161" mapping="15" name="HA100" type="TAU" input="ctpin" version="1">
-      <TriggerThresholdValue em_isolation="63" etamin="-49" etamax="49" had_isolation="63" had_veto="99" isobits="00000" name="HA100full" phimin="0" phimax="64" priority="1" thresholdval="100" type="TAU" window="0"/>
+    <TriggerThreshold active="1" bitnum="3" id="161" mapping="15" name="HA60" type="TAU" input="ctpin" version="1">
+      <TriggerThresholdValue em_isolation="63" etamin="-49" etamax="49" had_isolation="63" had_veto="99" isobits="00000" name="HA60full" phimin="0" phimax="64" priority="1" thresholdval="60" type="TAU" window="0"/>
       <Cable connector="CON3" input="SLOT7" name="TAU2">
         <Signal range_begin="21" range_end="23"/>
       </Cable>
@@ -5741,58 +6225,58 @@
         <Signal range_begin="7" range_end="7"/>
       </Cable>
     </TriggerThreshold>
-    <TriggerThreshold active="1" bitnum="1" id="170" mapping="8" name="TE500.0ETA49" type="TE" input="ctpin" version="1">
-      <TriggerThresholdValue em_isolation="63" etamin="-49" etamax="49" had_isolation="63" had_veto="63" name="TE500.0ETA49full" phimin="0" phimax="64" priority="0" thresholdval="32767" type="TE" window="0"/>
-      <TriggerThresholdValue em_isolation="63" etamin="-49" etamax="49" had_isolation="63" had_veto="63" name="TE500.0ETA49full" phimin="0" phimax="64" priority="1" thresholdval="500" type="TE" window="0"/>
+    <TriggerThreshold active="1" bitnum="1" id="170" mapping="8" name="TE3.0ETA49" type="TE" input="ctpin" version="1">
+      <TriggerThresholdValue em_isolation="63" etamin="-49" etamax="49" had_isolation="63" had_veto="63" name="TE3.0ETA49full" phimin="0" phimax="64" priority="0" thresholdval="32767" type="TE" window="0"/>
+      <TriggerThresholdValue em_isolation="63" etamin="-49" etamax="49" had_isolation="63" had_veto="63" name="TE3.0ETA49full" phimin="0" phimax="64" priority="1" thresholdval="3" type="TE" window="0"/>
       <Cable connector="CON3" input="SLOT8" name="EN2">
         <Signal range_begin="0" range_end="0"/>
       </Cable>
     </TriggerThreshold>
-    <TriggerThreshold active="1" bitnum="1" id="171" mapping="9" name="TE1500.0ETA49" type="TE" input="ctpin" version="1">
-      <TriggerThresholdValue em_isolation="63" etamin="-49" etamax="49" had_isolation="63" had_veto="63" name="TE1500.0ETA49full" phimin="0" phimax="64" priority="0" thresholdval="32767" type="TE" window="0"/>
-      <TriggerThresholdValue em_isolation="63" etamin="-49" etamax="49" had_isolation="63" had_veto="63" name="TE1500.0ETA49full" phimin="0" phimax="64" priority="1" thresholdval="1500" type="TE" window="0"/>
+    <TriggerThreshold active="1" bitnum="1" id="171" mapping="9" name="TE7.0ETA49" type="TE" input="ctpin" version="1">
+      <TriggerThresholdValue em_isolation="63" etamin="-49" etamax="49" had_isolation="63" had_veto="63" name="TE7.0ETA49full" phimin="0" phimax="64" priority="0" thresholdval="32767" type="TE" window="0"/>
+      <TriggerThresholdValue em_isolation="63" etamin="-49" etamax="49" had_isolation="63" had_veto="63" name="TE7.0ETA49full" phimin="0" phimax="64" priority="1" thresholdval="7" type="TE" window="0"/>
       <Cable connector="CON3" input="SLOT8" name="EN2">
         <Signal range_begin="1" range_end="1"/>
       </Cable>
     </TriggerThreshold>
-    <TriggerThreshold active="1" bitnum="1" id="172" mapping="10" name="TE3000.0ETA49" type="TE" input="ctpin" version="1">
-      <TriggerThresholdValue em_isolation="63" etamin="-49" etamax="49" had_isolation="63" had_veto="63" name="TE3000.0ETA49full" phimin="0" phimax="64" priority="0" thresholdval="32767" type="TE" window="0"/>
-      <TriggerThresholdValue em_isolation="63" etamin="-49" etamax="49" had_isolation="63" had_veto="63" name="TE3000.0ETA49full" phimin="0" phimax="64" priority="1" thresholdval="3000" type="TE" window="0"/>
+    <TriggerThreshold active="1" bitnum="1" id="172" mapping="10" name="TE600.0ETA49" type="TE" input="ctpin" version="1">
+      <TriggerThresholdValue em_isolation="63" etamin="-49" etamax="49" had_isolation="63" had_veto="63" name="TE600.0ETA49full" phimin="0" phimax="64" priority="0" thresholdval="32767" type="TE" window="0"/>
+      <TriggerThresholdValue em_isolation="63" etamin="-49" etamax="49" had_isolation="63" had_veto="63" name="TE600.0ETA49full" phimin="0" phimax="64" priority="1" thresholdval="600" type="TE" window="0"/>
       <Cable connector="CON3" input="SLOT8" name="EN2">
         <Signal range_begin="2" range_end="2"/>
       </Cable>
     </TriggerThreshold>
-    <TriggerThreshold active="1" bitnum="1" id="173" mapping="11" name="TE3500.0ETA49" type="TE" input="ctpin" version="1">
-      <TriggerThresholdValue em_isolation="63" etamin="-49" etamax="49" had_isolation="63" had_veto="63" name="TE3500.0ETA49full" phimin="0" phimax="64" priority="0" thresholdval="32767" type="TE" window="0"/>
-      <TriggerThresholdValue em_isolation="63" etamin="-49" etamax="49" had_isolation="63" had_veto="63" name="TE3500.0ETA49full" phimin="0" phimax="64" priority="1" thresholdval="3500" type="TE" window="0"/>
+    <TriggerThreshold active="1" bitnum="1" id="173" mapping="11" name="TE1500.0ETA49" type="TE" input="ctpin" version="1">
+      <TriggerThresholdValue em_isolation="63" etamin="-49" etamax="49" had_isolation="63" had_veto="63" name="TE1500.0ETA49full" phimin="0" phimax="64" priority="0" thresholdval="32767" type="TE" window="0"/>
+      <TriggerThresholdValue em_isolation="63" etamin="-49" etamax="49" had_isolation="63" had_veto="63" name="TE1500.0ETA49full" phimin="0" phimax="64" priority="1" thresholdval="1500" type="TE" window="0"/>
       <Cable connector="CON3" input="SLOT8" name="EN2">
         <Signal range_begin="3" range_end="3"/>
       </Cable>
     </TriggerThreshold>
-    <TriggerThreshold active="1" bitnum="1" id="174" mapping="12" name="TE5000.0ETA49" type="TE" input="ctpin" version="1">
-      <TriggerThresholdValue em_isolation="63" etamin="-49" etamax="49" had_isolation="63" had_veto="63" name="TE5000.0ETA49full" phimin="0" phimax="64" priority="0" thresholdval="32767" type="TE" window="0"/>
-      <TriggerThresholdValue em_isolation="63" etamin="-49" etamax="49" had_isolation="63" had_veto="63" name="TE5000.0ETA49full" phimin="0" phimax="64" priority="1" thresholdval="5000" type="TE" window="0"/>
+    <TriggerThreshold active="1" bitnum="1" id="174" mapping="12" name="TE3000.0ETA49" type="TE" input="ctpin" version="1">
+      <TriggerThresholdValue em_isolation="63" etamin="-49" etamax="49" had_isolation="63" had_veto="63" name="TE3000.0ETA49full" phimin="0" phimax="64" priority="0" thresholdval="32767" type="TE" window="0"/>
+      <TriggerThresholdValue em_isolation="63" etamin="-49" etamax="49" had_isolation="63" had_veto="63" name="TE3000.0ETA49full" phimin="0" phimax="64" priority="1" thresholdval="3000" type="TE" window="0"/>
       <Cable connector="CON3" input="SLOT8" name="EN2">
         <Signal range_begin="4" range_end="4"/>
       </Cable>
     </TriggerThreshold>
-    <TriggerThreshold active="1" bitnum="1" id="175" mapping="13" name="TE6500.0ETA49" type="TE" input="ctpin" version="1">
-      <TriggerThresholdValue em_isolation="63" etamin="-49" etamax="49" had_isolation="63" had_veto="63" name="TE6500.0ETA49full" phimin="0" phimax="64" priority="0" thresholdval="32767" type="TE" window="0"/>
-      <TriggerThresholdValue em_isolation="63" etamin="-49" etamax="49" had_isolation="63" had_veto="63" name="TE6500.0ETA49full" phimin="0" phimax="64" priority="1" thresholdval="6500" type="TE" window="0"/>
+    <TriggerThreshold active="1" bitnum="1" id="175" mapping="13" name="TE3500.0ETA49" type="TE" input="ctpin" version="1">
+      <TriggerThresholdValue em_isolation="63" etamin="-49" etamax="49" had_isolation="63" had_veto="63" name="TE3500.0ETA49full" phimin="0" phimax="64" priority="0" thresholdval="32767" type="TE" window="0"/>
+      <TriggerThresholdValue em_isolation="63" etamin="-49" etamax="49" had_isolation="63" had_veto="63" name="TE3500.0ETA49full" phimin="0" phimax="64" priority="1" thresholdval="3500" type="TE" window="0"/>
       <Cable connector="CON3" input="SLOT8" name="EN2">
         <Signal range_begin="5" range_end="5"/>
       </Cable>
     </TriggerThreshold>
-    <TriggerThreshold active="1" bitnum="1" id="176" mapping="14" name="TE8000.0ETA49" type="TE" input="ctpin" version="1">
-      <TriggerThresholdValue em_isolation="63" etamin="-49" etamax="49" had_isolation="63" had_veto="63" name="TE8000.0ETA49full" phimin="0" phimax="64" priority="0" thresholdval="32767" type="TE" window="0"/>
-      <TriggerThresholdValue em_isolation="63" etamin="-49" etamax="49" had_isolation="63" had_veto="63" name="TE8000.0ETA49full" phimin="0" phimax="64" priority="1" thresholdval="8000" type="TE" window="0"/>
+    <TriggerThreshold active="1" bitnum="1" id="176" mapping="14" name="TE6500.0ETA49" type="TE" input="ctpin" version="1">
+      <TriggerThresholdValue em_isolation="63" etamin="-49" etamax="49" had_isolation="63" had_veto="63" name="TE6500.0ETA49full" phimin="0" phimax="64" priority="0" thresholdval="32767" type="TE" window="0"/>
+      <TriggerThresholdValue em_isolation="63" etamin="-49" etamax="49" had_isolation="63" had_veto="63" name="TE6500.0ETA49full" phimin="0" phimax="64" priority="1" thresholdval="6500" type="TE" window="0"/>
       <Cable connector="CON3" input="SLOT8" name="EN2">
         <Signal range_begin="6" range_end="6"/>
       </Cable>
     </TriggerThreshold>
-    <TriggerThreshold active="1" bitnum="1" id="177" mapping="15" name="TE9000.0ETA49" type="TE" input="ctpin" version="1">
-      <TriggerThresholdValue em_isolation="63" etamin="-49" etamax="49" had_isolation="63" had_veto="63" name="TE9000.0ETA49full" phimin="0" phimax="64" priority="0" thresholdval="32767" type="TE" window="0"/>
-      <TriggerThresholdValue em_isolation="63" etamin="-49" etamax="49" had_isolation="63" had_veto="63" name="TE9000.0ETA49full" phimin="0" phimax="64" priority="1" thresholdval="9000" type="TE" window="0"/>
+    <TriggerThreshold active="1" bitnum="1" id="177" mapping="15" name="TE8000.0ETA49" type="TE" input="ctpin" version="1">
+      <TriggerThresholdValue em_isolation="63" etamin="-49" etamax="49" had_isolation="63" had_veto="63" name="TE8000.0ETA49full" phimin="0" phimax="64" priority="0" thresholdval="32767" type="TE" window="0"/>
+      <TriggerThresholdValue em_isolation="63" etamin="-49" etamax="49" had_isolation="63" had_veto="63" name="TE8000.0ETA49full" phimin="0" phimax="64" priority="1" thresholdval="8000" type="TE" window="0"/>
       <Cable connector="CON3" input="SLOT8" name="EN2">
         <Signal range_begin="7" range_end="7"/>
       </Cable>
@@ -6352,106 +6836,98 @@
         <Signal range_begin="31" range_end="31" clock="1"/>
       </Cable>
     </TriggerThreshold>
-    <TriggerThreshold active="1" bitnum="1" id="289" mapping="0" name="XE35" type="XE" input="ctpin" version="1">
-      <TriggerThresholdValue em_isolation="63" etamin="-49" etamax="49" had_isolation="63" had_veto="63" name="XE35full" phimin="0" phimax="64" priority="0" thresholdval="35" type="XE" window="0"/>
+    <TriggerThreshold active="1" bitnum="1" id="289" mapping="0" name="XE10" type="XE" input="ctpin" version="1">
+      <TriggerThresholdValue em_isolation="63" etamin="-49" etamax="49" had_isolation="63" had_veto="63" name="XE10full" phimin="0" phimax="64" priority="0" thresholdval="10" type="XE" window="0"/>
       <Cable connector="CON2" input="SLOT8" name="EN1">
         <Signal range_begin="8" range_end="8"/>
       </Cable>
     </TriggerThreshold>
-    <TriggerThreshold active="1" bitnum="1" id="290" mapping="1" name="XE40" type="XE" input="ctpin" version="1">
-      <TriggerThresholdValue em_isolation="63" etamin="-49" etamax="49" had_isolation="63" had_veto="63" name="XE40full" phimin="0" phimax="64" priority="0" thresholdval="40" type="XE" window="0"/>
+    <TriggerThreshold active="1" bitnum="1" id="290" mapping="1" name="XE20" type="XE" input="ctpin" version="1">
+      <TriggerThresholdValue em_isolation="63" etamin="-49" etamax="49" had_isolation="63" had_veto="63" name="XE20full" phimin="0" phimax="64" priority="0" thresholdval="20" type="XE" window="0"/>
       <Cable connector="CON2" input="SLOT8" name="EN1">
         <Signal range_begin="9" range_end="9"/>
       </Cable>
     </TriggerThreshold>
-    <TriggerThreshold active="1" bitnum="1" id="291" mapping="2" name="XE45" type="XE" input="ctpin" version="1">
-      <TriggerThresholdValue em_isolation="63" etamin="-49" etamax="49" had_isolation="63" had_veto="63" name="XE45full" phimin="0" phimax="64" priority="0" thresholdval="45" type="XE" window="0"/>
+    <TriggerThreshold active="1" bitnum="1" id="291" mapping="2" name="XE25" type="XE" input="ctpin" version="1">
+      <TriggerThresholdValue em_isolation="63" etamin="-49" etamax="49" had_isolation="63" had_veto="63" name="XE25full" phimin="0" phimax="64" priority="0" thresholdval="25" type="XE" window="0"/>
       <Cable connector="CON2" input="SLOT8" name="EN1">
         <Signal range_begin="10" range_end="10"/>
       </Cable>
     </TriggerThreshold>
-    <TriggerThreshold active="1" bitnum="1" id="292" mapping="3" name="XE50" type="XE" input="ctpin" version="1">
-      <TriggerThresholdValue em_isolation="63" etamin="-49" etamax="49" had_isolation="63" had_veto="63" name="XE50full" phimin="0" phimax="64" priority="0" thresholdval="50" type="XE" window="0"/>
+    <TriggerThreshold active="1" bitnum="1" id="292" mapping="3" name="XE30" type="XE" input="ctpin" version="1">
+      <TriggerThresholdValue em_isolation="63" etamin="-49" etamax="49" had_isolation="63" had_veto="63" name="XE30full" phimin="0" phimax="64" priority="0" thresholdval="30" type="XE" window="0"/>
       <Cable connector="CON2" input="SLOT8" name="EN1">
         <Signal range_begin="11" range_end="11"/>
       </Cable>
     </TriggerThreshold>
-    <TriggerThreshold active="1" bitnum="1" id="293" mapping="4" name="XE55" type="XE" input="ctpin" version="1">
-      <TriggerThresholdValue em_isolation="63" etamin="-49" etamax="49" had_isolation="63" had_veto="63" name="XE55full" phimin="0" phimax="64" priority="0" thresholdval="55" type="XE" window="0"/>
+    <TriggerThreshold active="1" bitnum="1" id="293" mapping="4" name="XE35" type="XE" input="ctpin" version="1">
+      <TriggerThresholdValue em_isolation="63" etamin="-49" etamax="49" had_isolation="63" had_veto="63" name="XE35full" phimin="0" phimax="64" priority="0" thresholdval="35" type="XE" window="0"/>
       <Cable connector="CON2" input="SLOT8" name="EN1">
         <Signal range_begin="12" range_end="12"/>
       </Cable>
     </TriggerThreshold>
-    <TriggerThreshold active="1" bitnum="1" id="294" mapping="5" name="XE60" type="XE" input="ctpin" version="1">
-      <TriggerThresholdValue em_isolation="63" etamin="-49" etamax="49" had_isolation="63" had_veto="63" name="XE60full" phimin="0" phimax="64" priority="0" thresholdval="60" type="XE" window="0"/>
+    <TriggerThreshold active="1" bitnum="1" id="294" mapping="5" name="XE40" type="XE" input="ctpin" version="1">
+      <TriggerThresholdValue em_isolation="63" etamin="-49" etamax="49" had_isolation="63" had_veto="63" name="XE40full" phimin="0" phimax="64" priority="0" thresholdval="40" type="XE" window="0"/>
       <Cable connector="CON2" input="SLOT8" name="EN1">
         <Signal range_begin="13" range_end="13"/>
       </Cable>
     </TriggerThreshold>
-    <TriggerThreshold active="1" bitnum="1" id="295" mapping="6" name="XE70" type="XE" input="ctpin" version="1">
-      <TriggerThresholdValue em_isolation="63" etamin="-49" etamax="49" had_isolation="63" had_veto="63" name="XE70full" phimin="0" phimax="64" priority="0" thresholdval="70" type="XE" window="0"/>
+    <TriggerThreshold active="1" bitnum="1" id="295" mapping="6" name="XE45" type="XE" input="ctpin" version="1">
+      <TriggerThresholdValue em_isolation="63" etamin="-49" etamax="49" had_isolation="63" had_veto="63" name="XE45full" phimin="0" phimax="64" priority="0" thresholdval="45" type="XE" window="0"/>
       <Cable connector="CON2" input="SLOT8" name="EN1">
         <Signal range_begin="14" range_end="14"/>
       </Cable>
     </TriggerThreshold>
-    <TriggerThreshold active="1" bitnum="1" id="296" mapping="7" name="XE80" type="XE" input="ctpin" version="1">
-      <TriggerThresholdValue em_isolation="63" etamin="-49" etamax="49" had_isolation="63" had_veto="63" name="XE80full" phimin="0" phimax="64" priority="0" thresholdval="80" type="XE" window="0"/>
+    <TriggerThreshold active="1" bitnum="1" id="296" mapping="7" name="XE50" type="XE" input="ctpin" version="1">
+      <TriggerThresholdValue em_isolation="63" etamin="-49" etamax="49" had_isolation="63" had_veto="63" name="XE50full" phimin="0" phimax="64" priority="0" thresholdval="50" type="XE" window="0"/>
       <Cable connector="CON2" input="SLOT8" name="EN1">
         <Signal range_begin="15" range_end="15"/>
       </Cable>
     </TriggerThreshold>
-    <TriggerThreshold active="1" bitnum="1" id="297" mapping="8" name="XE35.0ETA24" type="XE" input="ctpin" version="1">
-      <TriggerThresholdValue em_isolation="63" etamin="-49" etamax="49" had_isolation="63" had_veto="63" name="XE35.0ETA24full" phimin="0" phimax="64" priority="0" thresholdval="32767" type="XE" window="0"/>
-      <TriggerThresholdValue em_isolation="63" etamin="-24" etamax="24" had_isolation="63" had_veto="63" name="XE35.0ETA24full" phimin="0" phimax="64" priority="1" thresholdval="35" type="XE" window="0"/>
+    <TriggerThreshold active="1" bitnum="1" id="297" mapping="8" name="XE55" type="XE" input="ctpin" version="1">
+      <TriggerThresholdValue em_isolation="63" etamin="-49" etamax="49" had_isolation="63" had_veto="63" name="XE55full" phimin="0" phimax="64" priority="0" thresholdval="55" type="XE" window="0"/>
       <Cable connector="CON3" input="SLOT8" name="EN2">
         <Signal range_begin="8" range_end="8"/>
       </Cable>
     </TriggerThreshold>
-    <TriggerThreshold active="1" bitnum="1" id="298" mapping="9" name="XE40.0ETA24" type="XE" input="ctpin" version="1">
-      <TriggerThresholdValue em_isolation="63" etamin="-49" etamax="49" had_isolation="63" had_veto="63" name="XE40.0ETA24full" phimin="0" phimax="64" priority="0" thresholdval="32767" type="XE" window="0"/>
-      <TriggerThresholdValue em_isolation="63" etamin="-24" etamax="24" had_isolation="63" had_veto="63" name="XE40.0ETA24full" phimin="0" phimax="64" priority="1" thresholdval="40" type="XE" window="0"/>
+    <TriggerThreshold active="1" bitnum="1" id="298" mapping="9" name="XE60" type="XE" input="ctpin" version="1">
+      <TriggerThresholdValue em_isolation="63" etamin="-49" etamax="49" had_isolation="63" had_veto="63" name="XE60full" phimin="0" phimax="64" priority="0" thresholdval="60" type="XE" window="0"/>
       <Cable connector="CON3" input="SLOT8" name="EN2">
         <Signal range_begin="9" range_end="9"/>
       </Cable>
     </TriggerThreshold>
-    <TriggerThreshold active="1" bitnum="1" id="299" mapping="10" name="XE45.0ETA24" type="XE" input="ctpin" version="1">
-      <TriggerThresholdValue em_isolation="63" etamin="-49" etamax="49" had_isolation="63" had_veto="63" name="XE45.0ETA24full" phimin="0" phimax="64" priority="0" thresholdval="32767" type="XE" window="0"/>
-      <TriggerThresholdValue em_isolation="63" etamin="-24" etamax="24" had_isolation="63" had_veto="63" name="XE45.0ETA24full" phimin="0" phimax="64" priority="1" thresholdval="45" type="XE" window="0"/>
+    <TriggerThreshold active="1" bitnum="1" id="299" mapping="10" name="XE65" type="XE" input="ctpin" version="1">
+      <TriggerThresholdValue em_isolation="63" etamin="-49" etamax="49" had_isolation="63" had_veto="63" name="XE65full" phimin="0" phimax="64" priority="0" thresholdval="65" type="XE" window="0"/>
       <Cable connector="CON3" input="SLOT8" name="EN2">
         <Signal range_begin="10" range_end="10"/>
       </Cable>
     </TriggerThreshold>
-    <TriggerThreshold active="1" bitnum="1" id="300" mapping="11" name="XE50.0ETA24" type="XE" input="ctpin" version="1">
-      <TriggerThresholdValue em_isolation="63" etamin="-49" etamax="49" had_isolation="63" had_veto="63" name="XE50.0ETA24full" phimin="0" phimax="64" priority="0" thresholdval="32767" type="XE" window="0"/>
-      <TriggerThresholdValue em_isolation="63" etamin="-24" etamax="24" had_isolation="63" had_veto="63" name="XE50.0ETA24full" phimin="0" phimax="64" priority="1" thresholdval="50" type="XE" window="0"/>
+    <TriggerThreshold active="1" bitnum="1" id="300" mapping="11" name="XE70" type="XE" input="ctpin" version="1">
+      <TriggerThresholdValue em_isolation="63" etamin="-49" etamax="49" had_isolation="63" had_veto="63" name="XE70full" phimin="0" phimax="64" priority="0" thresholdval="70" type="XE" window="0"/>
       <Cable connector="CON3" input="SLOT8" name="EN2">
         <Signal range_begin="11" range_end="11"/>
       </Cable>
     </TriggerThreshold>
-    <TriggerThreshold active="1" bitnum="1" id="301" mapping="12" name="XE55.0ETA24" type="XE" input="ctpin" version="1">
-      <TriggerThresholdValue em_isolation="63" etamin="-49" etamax="49" had_isolation="63" had_veto="63" name="XE55.0ETA24full" phimin="0" phimax="64" priority="0" thresholdval="32767" type="XE" window="0"/>
-      <TriggerThresholdValue em_isolation="63" etamin="-24" etamax="24" had_isolation="63" had_veto="63" name="XE55.0ETA24full" phimin="0" phimax="64" priority="1" thresholdval="55" type="XE" window="0"/>
+    <TriggerThreshold active="1" bitnum="1" id="301" mapping="12" name="XE75" type="XE" input="ctpin" version="1">
+      <TriggerThresholdValue em_isolation="63" etamin="-49" etamax="49" had_isolation="63" had_veto="63" name="XE75full" phimin="0" phimax="64" priority="0" thresholdval="75" type="XE" window="0"/>
       <Cable connector="CON3" input="SLOT8" name="EN2">
         <Signal range_begin="12" range_end="12"/>
       </Cable>
     </TriggerThreshold>
-    <TriggerThreshold active="1" bitnum="1" id="302" mapping="13" name="XE60.0ETA24" type="XE" input="ctpin" version="1">
-      <TriggerThresholdValue em_isolation="63" etamin="-49" etamax="49" had_isolation="63" had_veto="63" name="XE60.0ETA24full" phimin="0" phimax="64" priority="0" thresholdval="32767" type="XE" window="0"/>
-      <TriggerThresholdValue em_isolation="63" etamin="-24" etamax="24" had_isolation="63" had_veto="63" name="XE60.0ETA24full" phimin="0" phimax="64" priority="1" thresholdval="60" type="XE" window="0"/>
+    <TriggerThreshold active="1" bitnum="1" id="302" mapping="13" name="XE80" type="XE" input="ctpin" version="1">
+      <TriggerThresholdValue em_isolation="63" etamin="-49" etamax="49" had_isolation="63" had_veto="63" name="XE80full" phimin="0" phimax="64" priority="0" thresholdval="80" type="XE" window="0"/>
       <Cable connector="CON3" input="SLOT8" name="EN2">
         <Signal range_begin="13" range_end="13"/>
       </Cable>
     </TriggerThreshold>
-    <TriggerThreshold active="1" bitnum="1" id="303" mapping="14" name="XE70.0ETA24" type="XE" input="ctpin" version="1">
-      <TriggerThresholdValue em_isolation="63" etamin="-49" etamax="49" had_isolation="63" had_veto="63" name="XE70.0ETA24full" phimin="0" phimax="64" priority="0" thresholdval="32767" type="XE" window="0"/>
-      <TriggerThresholdValue em_isolation="63" etamin="-24" etamax="24" had_isolation="63" had_veto="63" name="XE70.0ETA24full" phimin="0" phimax="64" priority="1" thresholdval="70" type="XE" window="0"/>
+    <TriggerThreshold active="1" bitnum="1" id="303" mapping="14" name="XE150" type="XE" input="ctpin" version="1">
+      <TriggerThresholdValue em_isolation="63" etamin="-49" etamax="49" had_isolation="63" had_veto="63" name="XE150full" phimin="0" phimax="64" priority="0" thresholdval="150" type="XE" window="0"/>
       <Cable connector="CON3" input="SLOT8" name="EN2">
         <Signal range_begin="14" range_end="14"/>
       </Cable>
     </TriggerThreshold>
-    <TriggerThreshold active="1" bitnum="1" id="304" mapping="15" name="XE80.0ETA24" type="XE" input="ctpin" version="1">
-      <TriggerThresholdValue em_isolation="63" etamin="-49" etamax="49" had_isolation="63" had_veto="63" name="XE80.0ETA24full" phimin="0" phimax="64" priority="0" thresholdval="32767" type="XE" window="0"/>
-      <TriggerThresholdValue em_isolation="63" etamin="-24" etamax="24" had_isolation="63" had_veto="63" name="XE80.0ETA24full" phimin="0" phimax="64" priority="1" thresholdval="80" type="XE" window="0"/>
+    <TriggerThreshold active="1" bitnum="1" id="304" mapping="15" name="XE300" type="XE" input="ctpin" version="1">
+      <TriggerThresholdValue em_isolation="63" etamin="-49" etamax="49" had_isolation="63" had_veto="63" name="XE300full" phimin="0" phimax="64" priority="0" thresholdval="300" type="XE" window="0"/>
       <Cable connector="CON3" input="SLOT8" name="EN2">
         <Signal range_begin="15" range_end="15"/>
       </Cable>
@@ -6578,9 +7054,9 @@
       <Parametrization isobit="5" offset="30" slope="100" mincut="0" upperlimit="60" etamin="-49" etamax="49" priority="0"/>
     </Isolation>
     <MinimumTOBPt thrtype="EM" ptmin="7" etamin="-49" etamax="49" priority="0"/>
-    <MinimumTOBPt thrtype="TAU" ptmin="12" etamin="-49" etamax="49" priority="0"/>
-    <MinimumTOBPt thrtype="JETS" window="4" ptmin="10" etamin="-49" etamax="49" priority="0"/>
-    <MinimumTOBPt thrtype="JETL" window="8" ptmin="10" etamin="-49" etamax="49" priority="0"/>
+    <MinimumTOBPt thrtype="TAU" ptmin="2" etamin="-49" etamax="49" priority="0"/>
+    <MinimumTOBPt thrtype="JETS" window="4" ptmin="12" etamin="-49" etamax="49" priority="0"/>
+    <MinimumTOBPt thrtype="JETL" window="8" ptmin="12" etamin="-49" etamax="49" priority="0"/>
   </CaloInfo>
   <MuctpiInfo name="muctpi" low_pt="1" high_pt="1" max_cand="13"/>
 </LVL1Config>