From c28fa29164b15994f7046ae15c4ee719ef56ffe4 Mon Sep 17 00:00:00 2001
From: Tim Martin <tim.martin@cern.ch>
Date: Thu, 16 Aug 2018 17:40:28 +0000
Subject: [PATCH] Merge branch 'cherry-pick-6b767368' into '21.1-dev'
HI trigger menu preparation for 5 TeV PbPb run (ATR-18396)
See merge request atlas/athena!13449
Former-commit-id: 9763116a69d457acdc03eca1e9d6fc482306d6b5
---
.../python/heavyion/HeavyIonDef.py | 273 ++++++------
.../TriggerMenu/python/l1menu/CaloDef.py | 6 +-
.../TriggerMenu/python/l1menu/ItemDef.py | 12 +-
.../python/l1menu/Menu_Physics_HI_v5.py | 56 ++-
.../TriggerMenu/python/l1menu/ThresholdDef.py | 2 +-
.../TriggerMenu/python/menu/Physics_HI_v5.py | 62 ++-
.../TriggerMenu/python/menu/SignatureDicts.py | 2 +-
.../data/LVL1config_MC_HI_v5.xml | 397 ++++++++++--------
.../data/LVL1config_Physics_HI_v5.xml | 397 ++++++++++--------
9 files changed, 689 insertions(+), 518 deletions(-)
diff --git a/Trigger/TriggerCommon/TriggerMenu/python/heavyion/HeavyIonDef.py b/Trigger/TriggerCommon/TriggerMenu/python/heavyion/HeavyIonDef.py
index b89c2548b7e..7e5afbc7370 100644
--- a/Trigger/TriggerCommon/TriggerMenu/python/heavyion/HeavyIonDef.py
+++ b/Trigger/TriggerCommon/TriggerMenu/python/heavyion/HeavyIonDef.py
@@ -68,10 +68,7 @@ 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()
L2EFChainDef.__init__(self, self.chainName, self.L2Name, self.chainCounter, self.chainL1Item, self.EFName, self.chainCounter, self.L2InputTE)
@@ -262,142 +259,135 @@ 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']]
+ 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, 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']
+
+ # 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']]
- self.EFsequenceList += [["EF_upc_step2",
- [cellFgapA ],
- 'EF_upc_step3_A']]
+ 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']]
+
+ self.EFsequenceList += [["EF_upc_step2",
+ [cellFgapAPerf ],
+ 'EF_upc_step3_APerf']]
+ else:
+ self.EFsequenceList += [["EF_upc_step2",
+ [cellFgapC ],
+ 'EF_upc_step3_C']]
+
+ self.EFsequenceList += [["EF_upc_step2",
+ [cellFgapA ],
+ 'EF_upc_step3_A']]
+
+ 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']] ]
- 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',
@@ -409,11 +399,12 @@ class L2EFChain_HI(L2EFChainDef):
'EF_upc_step3_C': 'EF_CellGapC',
'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),
+ }
#####################################################################
#if __name__ == '__main__':
diff --git a/Trigger/TriggerCommon/TriggerMenu/python/l1menu/CaloDef.py b/Trigger/TriggerCommon/TriggerMenu/python/l1menu/CaloDef.py
index f1c7fe5a3de..97d9f4ac15c 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 9636dc0dff4..143129198f4 100755
--- a/Trigger/TriggerCommon/TriggerMenu/python/l1menu/ItemDef.py
+++ b/Trigger/TriggerCommon/TriggerMenu/python/l1menu/ItemDef.py
@@ -355,6 +355,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 +402,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
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 585b22b2f71..399359fc9ac 100644
--- a/Trigger/TriggerCommon/TriggerMenu/python/l1menu/Menu_Physics_HI_v5.py
+++ b/Trigger/TriggerCommon/TriggerMenu/python/l1menu/Menu_Physics_HI_v5.py
@@ -55,7 +55,7 @@ def defineMenu():
#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',
#----------------------
# SLOT 8 / CON 0 (JET1)
@@ -82,7 +82,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)
@@ -399,7 +399,8 @@ def defineMenu():
#'L1_JE300',
#'L1_JE500',
# forward jets
- 'L1_J10.31ETA49',
+ 'L1_J15.31ETA49',
+ 'L1_J20.31ETA49',
#'L1_FJ30',
#'L1_FJ55' ,
#'L1_FJ95',
@@ -569,7 +570,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 +644,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 +667,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',
@@ -702,7 +711,7 @@ def defineMenu():
'L1_2MU4_EMPTY' : 6,
'L1_RD0_UNPAIRED_NONISO' : 7,
'L1_BCM_AC_CA_UNPAIRED_NONISO': 8,
- 'L1_FJ10_UNPAIRED_NONISO' : 9,
+ #'L1_FJ10_UNPAIRED_NONISO' : 9,
'L1_2EM10' : 10,
#'L1_2EM5' : 11,
#'L1_MU0_VTE20' : 12,
@@ -749,8 +758,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 +811,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 +849,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 +866,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 +888,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 +906,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 +926,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 +989,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,
@@ -1035,6 +1048,13 @@ def defineMenu():
'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_ZDC_XOR_TE20_VTE200' : 481,
diff --git a/Trigger/TriggerCommon/TriggerMenu/python/l1menu/ThresholdDef.py b/Trigger/TriggerCommon/TriggerMenu/python/l1menu/ThresholdDef.py
index 803a7f8ec34..cbdd2cc5ecf 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
diff --git a/Trigger/TriggerCommon/TriggerMenu/python/menu/Physics_HI_v5.py b/Trigger/TriggerCommon/TriggerMenu/python/menu/Physics_HI_v5.py
index 75562e07944..559b6c7c51a 100644
--- a/Trigger/TriggerCommon/TriggerMenu/python/menu/Physics_HI_v5.py
+++ b/Trigger/TriggerCommon/TriggerMenu/python/menu/Physics_HI_v5.py
@@ -100,13 +100,17 @@ 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],
+ ['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 +127,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
@@ -311,6 +319,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 +332,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 +343,15 @@ 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 TODO
+ #['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_exclusive_loose1'],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_exclusive_loose2'],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_exclusive_loose1'],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_exclusive_loose2'],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],
@@ -406,6 +411,15 @@ def setupMenu():
['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_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],
['hi_gg_upc_L1TE5_VTE100', 'L1_TE5_VTE100', [], [UPCStream],["BW:UPC", "RATE:UPC"], 1],
@@ -426,30 +440,32 @@ 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_sptrk_L1ZDC_A_C_VTE50', '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],
+ #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_ion_trk15_L1ZDC_XOR_VTE200_MBTS_1', 'L1_ZDC_XOR_VTE200_MBTS_1', [], [UPCStream],["BW:UPC", "RATE:UPC"], 1],
#UPC: Other primary
+ ['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],
+ ['mb_sptrk_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],
diff --git a/Trigger/TriggerCommon/TriggerMenu/python/menu/SignatureDicts.py b/Trigger/TriggerCommon/TriggerMenu/python/menu/SignatureDicts.py
index 8dfbdacc7ee..af22b22499d 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"],
diff --git a/Trigger/TriggerCommon/TriggerMenuXML/data/LVL1config_MC_HI_v5.xml b/Trigger/TriggerCommon/TriggerMenuXML/data/LVL1config_MC_HI_v5.xml
index a5107fb63c0..e0fdb91edec 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: 299-->
<TriggerMenu name="MC_HI_v5" phase="lumi">
<TriggerItem ctpid="0" partition="1" name="L1_EM18" complex_deadtime="0" definition="(EM18[x1]&BGRP0&BGRP1)" trigger_type="10000100" monitor="LF:000|HF:000">
<AND>
@@ -103,9 +103,13 @@
<InternalTrigger name="BGRP1"/>
</AND>
</TriggerItem>
- <TriggerItem ctpid="14" partition="1" name="L1_J10.31ETA49" complex_deadtime="0" definition="(J10.31ETA49[x1]&BGRP0&BGRP1)" trigger_type="10000100" monitor="LF:000|HF:000">
+ <TriggerItem ctpid="14" partition="1" name="L1_MBTS_1_1_VTE50" complex_deadtime="0" definition="(MBTS_A[x1]&MBTS_C[x1]&!TE50[x1]&BGRP0&BGRP1)" trigger_type="10100000" monitor="LF:000|HF:000">
<AND>
- <TriggerCondition multi="1" name="J10.31ETA49_x1" triggerthreshold="J10.31ETA49"/>
+ <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>
@@ -154,18 +158,7 @@
<InternalTrigger name="BGRP4"/>
</AND>
</TriggerItem>
- <TriggerItem ctpid="21" partition="1" name="L1_MBTS_1_1_VTE50" complex_deadtime="0" definition="(MBTS_A[x1]&MBTS_C[x1]&!TE50[x1]&BGRP0&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="22" partition="1" name="L1_MBTS_2_2_VTE50" complex_deadtime="0" definition="(MBTS_A[x2]&MBTS_C[x2]&!TE50[x1]&BGRP0&BGRP1)" trigger_type="10100000" monitor="LF:000|HF:000">
+ <TriggerItem ctpid="21" partition="1" name="L1_MBTS_2_2_VTE50" complex_deadtime="0" definition="(MBTS_A[x2]&MBTS_C[x2]&!TE50[x1]&BGRP0&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"/>
@@ -176,7 +169,7 @@
<InternalTrigger name="BGRP1"/>
</AND>
</TriggerItem>
- <TriggerItem ctpid="23" partition="1" name="L1_TE5_NZ" complex_deadtime="0" definition="(TE5[x1]&!ZDC_AND[x1]&BGRP0&BGRP1)" trigger_type="10000100" monitor="LF:000|HF:000">
+ <TriggerItem ctpid="22" partition="1" name="L1_TE5_NZ" complex_deadtime="0" definition="(TE5[x1]&!ZDC_AND[x1]&BGRP0&BGRP1)" trigger_type="10000100" monitor="LF:000|HF:000">
<AND>
<TriggerCondition multi="1" name="TE5_x1" triggerthreshold="TE5"/>
<NOT>
@@ -186,45 +179,45 @@
<InternalTrigger name="BGRP1"/>
</AND>
</TriggerItem>
- <TriggerItem ctpid="24" partition="1" name="L1_TE5000.0ETA49" complex_deadtime="0" definition="(TE5000.0ETA49[x1]&BGRP0&BGRP1)" trigger_type="10000100" monitor="LF:000|HF:000">
+ <TriggerItem ctpid="23" partition="1" name="L1_TE5000.0ETA49" complex_deadtime="0" definition="(TE5000.0ETA49[x1]&BGRP0&BGRP1)" trigger_type="10000100" monitor="LF:000|HF:000">
<AND>
<TriggerCondition multi="1" name="TE5000.0ETA49_x1" triggerthreshold="TE5000.0ETA49"/>
<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]&BGRP0&BGRP1)" trigger_type="10000010" monitor="LF:000|HF:000">
+ <TriggerItem ctpid="24" partition="1" name="L1_TE5000.0ETA49_OVERLAY" complex_deadtime="0" definition="(TE5000.0ETA49[x1]&BGRP0&BGRP1)" trigger_type="10000010" monitor="LF:000|HF:000">
<AND>
<TriggerCondition multi="1" name="TE5000.0ETA49_x1" triggerthreshold="TE5000.0ETA49"/>
<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]&BGRP0&BGRP1)" trigger_type="10000010" monitor="LF:000|HF:000">
+ <TriggerItem ctpid="25" partition="1" name="L1_TE6500.0ETA49_OVERLAY" complex_deadtime="0" definition="(TE6500.0ETA49[x1]&BGRP0&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="27" partition="1" name="L1_ZDC_AND_VTE50" complex_deadtime="0" definition="(ZDC_AND[x1]&!TE50[x1]&BGRP0&BGRP1)" trigger_type="10100000" monitor="LF:000|HF:000">
+ <TriggerItem ctpid="26" partition="1" name="L1_BCM_Wide" complex_deadtime="0" definition="(BCM_Wide[x1]&BGRP0&BGRP1)" trigger_type="10100000" monitor="LF:000|HF:000">
<AND>
- <TriggerCondition multi="1" name="ZDC_AND_x1" triggerthreshold="ZDC_AND"/>
- <NOT>
- <TriggerCondition multi="1" name="TE50_x1" triggerthreshold="TE50"/>
- </NOT>
+ <TriggerCondition multi="1" name="BCM_Wide_x1" triggerthreshold="BCM_Wide"/>
<InternalTrigger name="BGRP0"/>
<InternalTrigger name="BGRP1"/>
</AND>
</TriggerItem>
- <TriggerItem ctpid="28" partition="1" name="L1_BCM_Wide" complex_deadtime="0" definition="(BCM_Wide[x1]&BGRP0&BGRP1)" trigger_type="10100000" monitor="LF:000|HF:000">
+ <TriggerItem ctpid="27" partition="1" name="L1_ZDC_AND_VTE50" complex_deadtime="0" definition="(ZDC_AND[x1]&!TE50[x1]&BGRP0&BGRP1)" trigger_type="10100000" monitor="LF:000|HF:000">
<AND>
- <TriggerCondition multi="1" name="BCM_Wide_x1" triggerthreshold="BCM_Wide"/>
+ <TriggerCondition multi="1" name="ZDC_AND_x1" triggerthreshold="ZDC_AND"/>
+ <NOT>
+ <TriggerCondition multi="1" name="TE50_x1" triggerthreshold="TE50"/>
+ </NOT>
<InternalTrigger name="BGRP0"/>
<InternalTrigger name="BGRP1"/>
</AND>
</TriggerItem>
- <TriggerItem ctpid="29" partition="1" name="L1_J15_NZ" complex_deadtime="0" definition="(J15[x1]&!ZDC_AND[x1]&BGRP0&BGRP1)" trigger_type="10000100" monitor="LF:000|HF:000">
+ <TriggerItem ctpid="28" partition="1" name="L1_J15_NZ" complex_deadtime="0" definition="(J15[x1]&!ZDC_AND[x1]&BGRP0&BGRP1)" trigger_type="10000100" monitor="LF:000|HF:000">
<AND>
<TriggerCondition multi="1" name="J15_x1" triggerthreshold="J15"/>
<NOT>
@@ -234,7 +227,7 @@
<InternalTrigger name="BGRP1"/>
</AND>
</TriggerItem>
- <TriggerItem ctpid="30" partition="1" name="L1_2J15_NZ" complex_deadtime="0" definition="(J15[x2]&!ZDC_AND[x1]&BGRP0&BGRP1)" trigger_type="10000100" monitor="LF:000|HF:000">
+ <TriggerItem ctpid="29" partition="1" name="L1_2J15_NZ" complex_deadtime="0" definition="(J15[x2]&!ZDC_AND[x1]&BGRP0&BGRP1)" trigger_type="10000100" monitor="LF:000|HF:000">
<AND>
<TriggerCondition multi="2" name="J15_x2" triggerthreshold="J15"/>
<NOT>
@@ -244,7 +237,7 @@
<InternalTrigger name="BGRP1"/>
</AND>
</TriggerItem>
- <TriggerItem ctpid="31" partition="1" name="L1_J15_NL" complex_deadtime="0" definition="(J15[x1]&!LUCID_A[x1]&!LUCID_C[x1]&BGRP0&BGRP1)" trigger_type="10000100" monitor="LF:000|HF:000">
+ <TriggerItem ctpid="30" partition="1" name="L1_J15_NL" complex_deadtime="0" definition="(J15[x1]&!LUCID_A[x1]&!LUCID_C[x1]&BGRP0&BGRP1)" trigger_type="10000100" monitor="LF:000|HF:000">
<AND>
<TriggerCondition multi="1" name="J15_x1" triggerthreshold="J15"/>
<NOT>
@@ -257,7 +250,7 @@
<InternalTrigger name="BGRP1"/>
</AND>
</TriggerItem>
- <TriggerItem ctpid="32" partition="1" name="L1_2J15_NL" complex_deadtime="0" definition="(J15[x2]&!LUCID_A[x1]&!LUCID_C[x1]&BGRP0&BGRP1)" trigger_type="10000100" monitor="LF:000|HF:000">
+ <TriggerItem ctpid="31" partition="1" name="L1_2J15_NL" complex_deadtime="0" definition="(J15[x2]&!LUCID_A[x1]&!LUCID_C[x1]&BGRP0&BGRP1)" trigger_type="10000100" monitor="LF:000|HF:000">
<AND>
<TriggerCondition multi="2" name="J15_x2" triggerthreshold="J15"/>
<NOT>
@@ -270,7 +263,7 @@
<InternalTrigger name="BGRP1"/>
</AND>
</TriggerItem>
- <TriggerItem ctpid="33" partition="1" name="L1_ZDC_A_C_BGRP7" complex_deadtime="0" definition="(ZDC_A[x1]&ZDC_C[x1]&BGRP0&BGRP7)" trigger_type="10100000" monitor="LF:000|HF:000">
+ <TriggerItem ctpid="32" partition="1" name="L1_ZDC_A_C_BGRP7" complex_deadtime="0" definition="(ZDC_A[x1]&ZDC_C[x1]&BGRP0&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"/>
@@ -278,13 +271,20 @@
<InternalTrigger name="BGRP7"/>
</AND>
</TriggerItem>
- <TriggerItem ctpid="34" partition="1" name="L1_TAU12_UNPAIRED_ISO" complex_deadtime="0" definition="(HA12[x1]&BGRP0&BGRP4)" trigger_type="10000100" monitor="LF:000|HF:000">
+ <TriggerItem ctpid="33" partition="1" name="L1_TAU12_UNPAIRED_ISO" complex_deadtime="0" definition="(HA12[x1]&BGRP0&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="34" partition="1" name="L1_TAU12_UNPAIRED_NONISO" complex_deadtime="0" definition="(HA12[x1]&BGRP0&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="35" partition="1" name="L1_2MU4_VTE50" complex_deadtime="0" definition="(MU4[x2]&!TE50[x1]&BGRP0&BGRP1)" trigger_type="10001000" monitor="LF:000|HF:000">
<AND>
<TriggerCondition multi="2" name="MU4_x2" triggerthreshold="MU4"/>
@@ -430,11 +430,11 @@
<InternalTrigger name="BGRP7"/>
</AND>
</TriggerItem>
- <TriggerItem ctpid="49" partition="1" name="L1_TAU12_UNPAIRED_NONISO" complex_deadtime="0" definition="(HA12[x1]&BGRP0&BGRP5)" trigger_type="10000100" monitor="LF:000|HF:000">
+ <TriggerItem ctpid="49" partition="1" name="L1_TAU12_EMPTY" complex_deadtime="0" definition="(HA12[x1]&BGRP0&BGRP3)" trigger_type="10000100" monitor="LF:000|HF:000">
<AND>
<TriggerCondition multi="1" name="HA12_x1" triggerthreshold="HA12"/>
<InternalTrigger name="BGRP0"/>
- <InternalTrigger name="BGRP5"/>
+ <InternalTrigger name="BGRP3"/>
</AND>
</TriggerItem>
<TriggerItem ctpid="50" partition="1" name="L1_MBTSC4" complex_deadtime="0" definition="(MBTS_C4[x1]&BGRP0&BGRP1)" trigger_type="10100000" monitor="LF:000|HF:000">
@@ -472,11 +472,11 @@
<InternalTrigger name="BGRP1"/>
</AND>
</TriggerItem>
- <TriggerItem ctpid="55" partition="1" name="L1_TAU12_EMPTY" complex_deadtime="0" definition="(HA12[x1]&BGRP0&BGRP3)" trigger_type="10000100" monitor="LF:000|HF:000">
+ <TriggerItem ctpid="55" partition="1" name="L1_TAU12_FIRSTEMPTY" complex_deadtime="0" definition="(HA12[x1]&BGRP0&BGRP6)" trigger_type="10000100" monitor="LF:000|HF:000">
<AND>
<TriggerCondition multi="1" name="HA12_x1" triggerthreshold="HA12"/>
<InternalTrigger name="BGRP0"/>
- <InternalTrigger name="BGRP3"/>
+ <InternalTrigger name="BGRP6"/>
</AND>
</TriggerItem>
<TriggerItem ctpid="56" partition="1" name="L1_MBTSC10" complex_deadtime="0" definition="(MBTS_C10[x1]&BGRP0&BGRP1)" trigger_type="10100000" monitor="LF:000|HF:000">
@@ -486,11 +486,11 @@
<InternalTrigger name="BGRP1"/>
</AND>
</TriggerItem>
- <TriggerItem ctpid="57" partition="1" name="L1_TAU12_FIRSTEMPTY" complex_deadtime="0" definition="(HA12[x1]&BGRP0&BGRP6)" trigger_type="10000100" monitor="LF:000|HF:000">
+ <TriggerItem ctpid="57" partition="1" name="L1_ZDC_AND_EMPTY" complex_deadtime="0" definition="(ZDC_AND[x1]&BGRP0&BGRP3)" trigger_type="10100000" monitor="LF:000|HF:000">
<AND>
- <TriggerCondition multi="1" name="HA12_x1" triggerthreshold="HA12"/>
+ <TriggerCondition multi="1" name="ZDC_AND_x1" triggerthreshold="ZDC_AND"/>
<InternalTrigger name="BGRP0"/>
- <InternalTrigger name="BGRP6"/>
+ <InternalTrigger name="BGRP3"/>
</AND>
</TriggerItem>
<TriggerItem ctpid="58" partition="1" name="L1_MBTSC12" complex_deadtime="0" definition="(MBTS_C12[x1]&BGRP0&BGRP1)" trigger_type="10100000" monitor="LF:000|HF:000">
@@ -500,11 +500,11 @@
<InternalTrigger name="BGRP1"/>
</AND>
</TriggerItem>
- <TriggerItem ctpid="59" partition="1" name="L1_J10.31ETA49_EMPTY" complex_deadtime="0" definition="(J10.31ETA49[x1]&BGRP0&BGRP3)" trigger_type="10000100" monitor="LF:000|HF:000">
+ <TriggerItem ctpid="59" partition="1" name="L1_ZDC_AND_UNPAIRED_ISO" complex_deadtime="0" definition="(ZDC_AND[x1]&BGRP0&BGRP4)" trigger_type="10100000" monitor="LF:000|HF:000">
<AND>
- <TriggerCondition multi="1" name="J10.31ETA49_x1" triggerthreshold="J10.31ETA49"/>
+ <TriggerCondition multi="1" name="ZDC_AND_x1" triggerthreshold="ZDC_AND"/>
<InternalTrigger name="BGRP0"/>
- <InternalTrigger name="BGRP3"/>
+ <InternalTrigger name="BGRP4"/>
</AND>
</TriggerItem>
<TriggerItem ctpid="60" partition="1" name="L1_MBTSC14" complex_deadtime="0" definition="(MBTS_C14[x1]&BGRP0&BGRP1)" trigger_type="10100000" monitor="LF:000|HF:000">
@@ -514,11 +514,11 @@
<InternalTrigger name="BGRP1"/>
</AND>
</TriggerItem>
- <TriggerItem ctpid="61" partition="1" name="L1_ZDC_AND_EMPTY" complex_deadtime="0" definition="(ZDC_AND[x1]&BGRP0&BGRP3)" trigger_type="10100000" monitor="LF:000|HF:000">
+ <TriggerItem ctpid="61" partition="1" name="L1_ZDC_AND_UNPAIRED_NONISO" complex_deadtime="0" definition="(ZDC_AND[x1]&BGRP0&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="BGRP3"/>
+ <InternalTrigger name="BGRP5"/>
</AND>
</TriggerItem>
<TriggerItem ctpid="62" partition="1" name="L1_RD0_EMPTY" complex_deadtime="0" definition="(RNDM0&BGRP0&BGRP3)" trigger_type="10000001" monitor="LF:000|HF:000">
@@ -535,11 +535,11 @@
<InternalTrigger name="BGRP1"/>
</AND>
</TriggerItem>
- <TriggerItem ctpid="64" partition="1" name="L1_ZDC_AND_UNPAIRED_ISO" complex_deadtime="0" definition="(ZDC_AND[x1]&BGRP0&BGRP4)" trigger_type="10100000" monitor="LF:000|HF:000">
+ <TriggerItem ctpid="64" partition="1" name="L1_TAU2" complex_deadtime="0" definition="(HA2[x1]&BGRP0&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]&BGRP0&BGRP1)" trigger_type="10100000" monitor="LF:000|HF:000">
@@ -549,11 +549,11 @@
<InternalTrigger name="BGRP1"/>
</AND>
</TriggerItem>
- <TriggerItem ctpid="66" partition="1" name="L1_ZDC_AND_UNPAIRED_NONISO" complex_deadtime="0" definition="(ZDC_AND[x1]&BGRP0&BGRP5)" trigger_type="10100000" monitor="LF:000|HF:000">
+ <TriggerItem ctpid="66" partition="1" name="L1_TAU3" complex_deadtime="0" definition="(HA3[x1]&BGRP0&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]&BGRP0&BGRP6)" trigger_type="10001000" monitor="LF:000|HF:000">
@@ -1094,6 +1094,20 @@
<InternalTrigger name="BGRP1"/>
</AND>
</TriggerItem>
+ <TriggerItem ctpid="158" partition="1" name="L1_J15.31ETA49" complex_deadtime="0" definition="(J15.31ETA49[x1]&BGRP0&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]&BGRP0&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="161" partition="1" name="L1_MBTSA8" complex_deadtime="0" definition="(MBTS_A8[x1]&BGRP0&BGRP1)" trigger_type="10100000" monitor="LF:000|HF:000">
<AND>
<TriggerCondition multi="1" name="MBTS_A8_x1" triggerthreshold="MBTS_A8"/>
@@ -1868,13 +1882,6 @@
<InternalTrigger name="BGRP1"/>
</AND>
</TriggerItem>
- <TriggerItem ctpid="299" partition="1" name="L1_TAU60" complex_deadtime="0" definition="(HA60[x1]&BGRP0&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]&BGRP0&BGRP6)" trigger_type="10000100" monitor="LF:000|HF:000">
<AND>
<TriggerCondition multi="1" name="EM20VH_x1" triggerthreshold="EM20VH"/>
@@ -2217,6 +2224,66 @@
<InternalTrigger name="BGRP1"/>
</AND>
</TriggerItem>
+ <TriggerItem ctpid="351" partition="1" name="L1_2TAU2_VTE50" complex_deadtime="0" definition="(HA2[x2]&!TE50[x1]&BGRP0&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]&!TE50[x1]&BGRP0&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]&!TE100[x1]&BGRP0&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]&!TE100[x1]&BGRP0&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]&!TE200[x1]&BGRP0&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]&!TE200[x1]&BGRP0&BGRP1)" trigger_type="10000100" monitor="LF:000|HF:000">
+ <AND>
+ <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="481" partition="1" name="L1_ZDC_XOR_TE20_VTE200" complex_deadtime="0" definition="(((ZDC_A[x1]&!ZDC_C[x1])|(ZDC_C[x1]&!ZDC_A[x1]))&TE20[x1]&!TE200[x1]&BGRP0&BGRP1)" trigger_type="10100000" monitor="LF:000|HF:000">
<AND>
<OR>
@@ -2689,8 +2756,8 @@
<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="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"/>
@@ -2830,7 +2897,7 @@
<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"/>
@@ -2882,12 +2949,12 @@
<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="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"/>
@@ -3474,27 +3541,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 +3646,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>
@@ -3726,6 +3793,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>
@@ -3768,27 +3856,6 @@
<TriggerCounter name="7HA40" type="CTPIN">
<TriggerCondition name="7HA40" triggerthreshold="HA40" multi="7"/>
</TriggerCounter>
- <TriggerCounter name="1HA60" type="CTPIN">
- <TriggerCondition name="1HA60" triggerthreshold="HA60" multi="1"/>
- </TriggerCounter>
- <TriggerCounter name="2HA60" type="CTPIN">
- <TriggerCondition name="2HA60" triggerthreshold="HA60" multi="2"/>
- </TriggerCounter>
- <TriggerCounter name="3HA60" type="CTPIN">
- <TriggerCondition name="3HA60" triggerthreshold="HA60" multi="3"/>
- </TriggerCounter>
- <TriggerCounter name="4HA60" type="CTPIN">
- <TriggerCondition name="4HA60" triggerthreshold="HA60" multi="4"/>
- </TriggerCounter>
- <TriggerCounter name="5HA60" type="CTPIN">
- <TriggerCondition name="5HA60" triggerthreshold="HA60" multi="5"/>
- </TriggerCounter>
- <TriggerCounter name="6HA60" type="CTPIN">
- <TriggerCondition name="6HA60" triggerthreshold="HA60" multi="6"/>
- </TriggerCounter>
- <TriggerCounter name="7HA60" type="CTPIN">
- <TriggerCondition name="7HA60" triggerthreshold="HA60" multi="7"/>
- </TriggerCounter>
<TriggerCounter name="1HA8" type="CTPIN">
<TriggerCondition name="1HA8" triggerthreshold="HA8" multi="1"/>
</TriggerCounter>
@@ -3810,15 +3877,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 +4138,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>
@@ -5189,34 +5256,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 +5664,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="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"/>
<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="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="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="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="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="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="21" range_end="23"/>
</Cable>
@@ -6578,9 +6645,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 df08db28073..65d301a42d0 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: 299-->
<TriggerMenu name="Physics_HI_v5" phase="lumi">
<TriggerItem ctpid="0" partition="1" name="L1_EM18" complex_deadtime="0" definition="(EM18[x1]&BGRP0&BGRP1)" trigger_type="10000100" monitor="LF:000|HF:000">
<AND>
@@ -103,9 +103,13 @@
<InternalTrigger name="BGRP1"/>
</AND>
</TriggerItem>
- <TriggerItem ctpid="14" partition="1" name="L1_J10.31ETA49" complex_deadtime="0" definition="(J10.31ETA49[x1]&BGRP0&BGRP1)" trigger_type="10000100" monitor="LF:000|HF:000">
+ <TriggerItem ctpid="14" partition="1" name="L1_MBTS_1_1_VTE50" complex_deadtime="0" definition="(MBTS_A[x1]&MBTS_C[x1]&!TE50[x1]&BGRP0&BGRP1)" trigger_type="10100000" monitor="LF:000|HF:000">
<AND>
- <TriggerCondition multi="1" name="J10.31ETA49_x1" triggerthreshold="J10.31ETA49"/>
+ <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>
@@ -154,18 +158,7 @@
<InternalTrigger name="BGRP4"/>
</AND>
</TriggerItem>
- <TriggerItem ctpid="21" partition="1" name="L1_MBTS_1_1_VTE50" complex_deadtime="0" definition="(MBTS_A[x1]&MBTS_C[x1]&!TE50[x1]&BGRP0&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="22" partition="1" name="L1_MBTS_2_2_VTE50" complex_deadtime="0" definition="(MBTS_A[x2]&MBTS_C[x2]&!TE50[x1]&BGRP0&BGRP1)" trigger_type="10100000" monitor="LF:000|HF:000">
+ <TriggerItem ctpid="21" partition="1" name="L1_MBTS_2_2_VTE50" complex_deadtime="0" definition="(MBTS_A[x2]&MBTS_C[x2]&!TE50[x1]&BGRP0&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"/>
@@ -176,7 +169,7 @@
<InternalTrigger name="BGRP1"/>
</AND>
</TriggerItem>
- <TriggerItem ctpid="23" partition="1" name="L1_TE5_NZ" complex_deadtime="0" definition="(TE5[x1]&!ZDC_AND[x1]&BGRP0&BGRP1)" trigger_type="10000100" monitor="LF:000|HF:000">
+ <TriggerItem ctpid="22" partition="1" name="L1_TE5_NZ" complex_deadtime="0" definition="(TE5[x1]&!ZDC_AND[x1]&BGRP0&BGRP1)" trigger_type="10000100" monitor="LF:000|HF:000">
<AND>
<TriggerCondition multi="1" name="TE5_x1" triggerthreshold="TE5"/>
<NOT>
@@ -186,45 +179,45 @@
<InternalTrigger name="BGRP1"/>
</AND>
</TriggerItem>
- <TriggerItem ctpid="24" partition="1" name="L1_TE5000.0ETA49" complex_deadtime="0" definition="(TE5000.0ETA49[x1]&BGRP0&BGRP1)" trigger_type="10000100" monitor="LF:000|HF:000">
+ <TriggerItem ctpid="23" partition="1" name="L1_TE5000.0ETA49" complex_deadtime="0" definition="(TE5000.0ETA49[x1]&BGRP0&BGRP1)" trigger_type="10000100" monitor="LF:000|HF:000">
<AND>
<TriggerCondition multi="1" name="TE5000.0ETA49_x1" triggerthreshold="TE5000.0ETA49"/>
<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]&BGRP0&BGRP1)" trigger_type="10000010" monitor="LF:000|HF:000">
+ <TriggerItem ctpid="24" partition="1" name="L1_TE5000.0ETA49_OVERLAY" complex_deadtime="0" definition="(TE5000.0ETA49[x1]&BGRP0&BGRP1)" trigger_type="10000010" monitor="LF:000|HF:000">
<AND>
<TriggerCondition multi="1" name="TE5000.0ETA49_x1" triggerthreshold="TE5000.0ETA49"/>
<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]&BGRP0&BGRP1)" trigger_type="10000010" monitor="LF:000|HF:000">
+ <TriggerItem ctpid="25" partition="1" name="L1_TE6500.0ETA49_OVERLAY" complex_deadtime="0" definition="(TE6500.0ETA49[x1]&BGRP0&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="27" partition="1" name="L1_ZDC_AND_VTE50" complex_deadtime="0" definition="(ZDC_AND[x1]&!TE50[x1]&BGRP0&BGRP1)" trigger_type="10100000" monitor="LF:000|HF:000">
+ <TriggerItem ctpid="26" partition="1" name="L1_BCM_Wide" complex_deadtime="0" definition="(BCM_Wide[x1]&BGRP0&BGRP1)" trigger_type="10100000" monitor="LF:000|HF:000">
<AND>
- <TriggerCondition multi="1" name="ZDC_AND_x1" triggerthreshold="ZDC_AND"/>
- <NOT>
- <TriggerCondition multi="1" name="TE50_x1" triggerthreshold="TE50"/>
- </NOT>
+ <TriggerCondition multi="1" name="BCM_Wide_x1" triggerthreshold="BCM_Wide"/>
<InternalTrigger name="BGRP0"/>
<InternalTrigger name="BGRP1"/>
</AND>
</TriggerItem>
- <TriggerItem ctpid="28" partition="1" name="L1_BCM_Wide" complex_deadtime="0" definition="(BCM_Wide[x1]&BGRP0&BGRP1)" trigger_type="10100000" monitor="LF:000|HF:000">
+ <TriggerItem ctpid="27" partition="1" name="L1_ZDC_AND_VTE50" complex_deadtime="0" definition="(ZDC_AND[x1]&!TE50[x1]&BGRP0&BGRP1)" trigger_type="10100000" monitor="LF:000|HF:000">
<AND>
- <TriggerCondition multi="1" name="BCM_Wide_x1" triggerthreshold="BCM_Wide"/>
+ <TriggerCondition multi="1" name="ZDC_AND_x1" triggerthreshold="ZDC_AND"/>
+ <NOT>
+ <TriggerCondition multi="1" name="TE50_x1" triggerthreshold="TE50"/>
+ </NOT>
<InternalTrigger name="BGRP0"/>
<InternalTrigger name="BGRP1"/>
</AND>
</TriggerItem>
- <TriggerItem ctpid="29" partition="1" name="L1_J15_NZ" complex_deadtime="0" definition="(J15[x1]&!ZDC_AND[x1]&BGRP0&BGRP1)" trigger_type="10000100" monitor="LF:000|HF:000">
+ <TriggerItem ctpid="28" partition="1" name="L1_J15_NZ" complex_deadtime="0" definition="(J15[x1]&!ZDC_AND[x1]&BGRP0&BGRP1)" trigger_type="10000100" monitor="LF:000|HF:000">
<AND>
<TriggerCondition multi="1" name="J15_x1" triggerthreshold="J15"/>
<NOT>
@@ -234,7 +227,7 @@
<InternalTrigger name="BGRP1"/>
</AND>
</TriggerItem>
- <TriggerItem ctpid="30" partition="1" name="L1_2J15_NZ" complex_deadtime="0" definition="(J15[x2]&!ZDC_AND[x1]&BGRP0&BGRP1)" trigger_type="10000100" monitor="LF:000|HF:000">
+ <TriggerItem ctpid="29" partition="1" name="L1_2J15_NZ" complex_deadtime="0" definition="(J15[x2]&!ZDC_AND[x1]&BGRP0&BGRP1)" trigger_type="10000100" monitor="LF:000|HF:000">
<AND>
<TriggerCondition multi="2" name="J15_x2" triggerthreshold="J15"/>
<NOT>
@@ -244,7 +237,7 @@
<InternalTrigger name="BGRP1"/>
</AND>
</TriggerItem>
- <TriggerItem ctpid="31" partition="1" name="L1_J15_NL" complex_deadtime="0" definition="(J15[x1]&!LUCID_A[x1]&!LUCID_C[x1]&BGRP0&BGRP1)" trigger_type="10000100" monitor="LF:000|HF:000">
+ <TriggerItem ctpid="30" partition="1" name="L1_J15_NL" complex_deadtime="0" definition="(J15[x1]&!LUCID_A[x1]&!LUCID_C[x1]&BGRP0&BGRP1)" trigger_type="10000100" monitor="LF:000|HF:000">
<AND>
<TriggerCondition multi="1" name="J15_x1" triggerthreshold="J15"/>
<NOT>
@@ -257,7 +250,7 @@
<InternalTrigger name="BGRP1"/>
</AND>
</TriggerItem>
- <TriggerItem ctpid="32" partition="1" name="L1_2J15_NL" complex_deadtime="0" definition="(J15[x2]&!LUCID_A[x1]&!LUCID_C[x1]&BGRP0&BGRP1)" trigger_type="10000100" monitor="LF:000|HF:000">
+ <TriggerItem ctpid="31" partition="1" name="L1_2J15_NL" complex_deadtime="0" definition="(J15[x2]&!LUCID_A[x1]&!LUCID_C[x1]&BGRP0&BGRP1)" trigger_type="10000100" monitor="LF:000|HF:000">
<AND>
<TriggerCondition multi="2" name="J15_x2" triggerthreshold="J15"/>
<NOT>
@@ -270,7 +263,7 @@
<InternalTrigger name="BGRP1"/>
</AND>
</TriggerItem>
- <TriggerItem ctpid="33" partition="1" name="L1_ZDC_A_C_BGRP7" complex_deadtime="0" definition="(ZDC_A[x1]&ZDC_C[x1]&BGRP0&BGRP7)" trigger_type="10100000" monitor="LF:000|HF:000">
+ <TriggerItem ctpid="32" partition="1" name="L1_ZDC_A_C_BGRP7" complex_deadtime="0" definition="(ZDC_A[x1]&ZDC_C[x1]&BGRP0&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"/>
@@ -278,13 +271,20 @@
<InternalTrigger name="BGRP7"/>
</AND>
</TriggerItem>
- <TriggerItem ctpid="34" partition="1" name="L1_TAU12_UNPAIRED_ISO" complex_deadtime="0" definition="(HA12[x1]&BGRP0&BGRP4)" trigger_type="10000100" monitor="LF:000|HF:000">
+ <TriggerItem ctpid="33" partition="1" name="L1_TAU12_UNPAIRED_ISO" complex_deadtime="0" definition="(HA12[x1]&BGRP0&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="34" partition="1" name="L1_TAU12_UNPAIRED_NONISO" complex_deadtime="0" definition="(HA12[x1]&BGRP0&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="35" partition="1" name="L1_2MU4_VTE50" complex_deadtime="0" definition="(MU4[x2]&!TE50[x1]&BGRP0&BGRP1)" trigger_type="10001000" monitor="LF:000|HF:000">
<AND>
<TriggerCondition multi="2" name="MU4_x2" triggerthreshold="MU4"/>
@@ -430,11 +430,11 @@
<InternalTrigger name="BGRP7"/>
</AND>
</TriggerItem>
- <TriggerItem ctpid="49" partition="1" name="L1_TAU12_UNPAIRED_NONISO" complex_deadtime="0" definition="(HA12[x1]&BGRP0&BGRP5)" trigger_type="10000100" monitor="LF:000|HF:000">
+ <TriggerItem ctpid="49" partition="1" name="L1_TAU12_EMPTY" complex_deadtime="0" definition="(HA12[x1]&BGRP0&BGRP3)" trigger_type="10000100" monitor="LF:000|HF:000">
<AND>
<TriggerCondition multi="1" name="HA12_x1" triggerthreshold="HA12"/>
<InternalTrigger name="BGRP0"/>
- <InternalTrigger name="BGRP5"/>
+ <InternalTrigger name="BGRP3"/>
</AND>
</TriggerItem>
<TriggerItem ctpid="50" partition="1" name="L1_MBTSC4" complex_deadtime="0" definition="(MBTS_C4[x1]&BGRP0&BGRP1)" trigger_type="10100000" monitor="LF:000|HF:000">
@@ -472,11 +472,11 @@
<InternalTrigger name="BGRP1"/>
</AND>
</TriggerItem>
- <TriggerItem ctpid="55" partition="1" name="L1_TAU12_EMPTY" complex_deadtime="0" definition="(HA12[x1]&BGRP0&BGRP3)" trigger_type="10000100" monitor="LF:000|HF:000">
+ <TriggerItem ctpid="55" partition="1" name="L1_TAU12_FIRSTEMPTY" complex_deadtime="0" definition="(HA12[x1]&BGRP0&BGRP6)" trigger_type="10000100" monitor="LF:000|HF:000">
<AND>
<TriggerCondition multi="1" name="HA12_x1" triggerthreshold="HA12"/>
<InternalTrigger name="BGRP0"/>
- <InternalTrigger name="BGRP3"/>
+ <InternalTrigger name="BGRP6"/>
</AND>
</TriggerItem>
<TriggerItem ctpid="56" partition="1" name="L1_MBTSC10" complex_deadtime="0" definition="(MBTS_C10[x1]&BGRP0&BGRP1)" trigger_type="10100000" monitor="LF:000|HF:000">
@@ -486,11 +486,11 @@
<InternalTrigger name="BGRP1"/>
</AND>
</TriggerItem>
- <TriggerItem ctpid="57" partition="1" name="L1_TAU12_FIRSTEMPTY" complex_deadtime="0" definition="(HA12[x1]&BGRP0&BGRP6)" trigger_type="10000100" monitor="LF:000|HF:000">
+ <TriggerItem ctpid="57" partition="1" name="L1_ZDC_AND_EMPTY" complex_deadtime="0" definition="(ZDC_AND[x1]&BGRP0&BGRP3)" trigger_type="10100000" monitor="LF:000|HF:000">
<AND>
- <TriggerCondition multi="1" name="HA12_x1" triggerthreshold="HA12"/>
+ <TriggerCondition multi="1" name="ZDC_AND_x1" triggerthreshold="ZDC_AND"/>
<InternalTrigger name="BGRP0"/>
- <InternalTrigger name="BGRP6"/>
+ <InternalTrigger name="BGRP3"/>
</AND>
</TriggerItem>
<TriggerItem ctpid="58" partition="1" name="L1_MBTSC12" complex_deadtime="0" definition="(MBTS_C12[x1]&BGRP0&BGRP1)" trigger_type="10100000" monitor="LF:000|HF:000">
@@ -500,11 +500,11 @@
<InternalTrigger name="BGRP1"/>
</AND>
</TriggerItem>
- <TriggerItem ctpid="59" partition="1" name="L1_J10.31ETA49_EMPTY" complex_deadtime="0" definition="(J10.31ETA49[x1]&BGRP0&BGRP3)" trigger_type="10000100" monitor="LF:000|HF:000">
+ <TriggerItem ctpid="59" partition="1" name="L1_ZDC_AND_UNPAIRED_ISO" complex_deadtime="0" definition="(ZDC_AND[x1]&BGRP0&BGRP4)" trigger_type="10100000" monitor="LF:000|HF:000">
<AND>
- <TriggerCondition multi="1" name="J10.31ETA49_x1" triggerthreshold="J10.31ETA49"/>
+ <TriggerCondition multi="1" name="ZDC_AND_x1" triggerthreshold="ZDC_AND"/>
<InternalTrigger name="BGRP0"/>
- <InternalTrigger name="BGRP3"/>
+ <InternalTrigger name="BGRP4"/>
</AND>
</TriggerItem>
<TriggerItem ctpid="60" partition="1" name="L1_MBTSC14" complex_deadtime="0" definition="(MBTS_C14[x1]&BGRP0&BGRP1)" trigger_type="10100000" monitor="LF:000|HF:000">
@@ -514,11 +514,11 @@
<InternalTrigger name="BGRP1"/>
</AND>
</TriggerItem>
- <TriggerItem ctpid="61" partition="1" name="L1_ZDC_AND_EMPTY" complex_deadtime="0" definition="(ZDC_AND[x1]&BGRP0&BGRP3)" trigger_type="10100000" monitor="LF:000|HF:000">
+ <TriggerItem ctpid="61" partition="1" name="L1_ZDC_AND_UNPAIRED_NONISO" complex_deadtime="0" definition="(ZDC_AND[x1]&BGRP0&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="BGRP3"/>
+ <InternalTrigger name="BGRP5"/>
</AND>
</TriggerItem>
<TriggerItem ctpid="62" partition="1" name="L1_RD0_EMPTY" complex_deadtime="0" definition="(RNDM0&BGRP0&BGRP3)" trigger_type="10000001" monitor="LF:000|HF:000">
@@ -535,11 +535,11 @@
<InternalTrigger name="BGRP1"/>
</AND>
</TriggerItem>
- <TriggerItem ctpid="64" partition="1" name="L1_ZDC_AND_UNPAIRED_ISO" complex_deadtime="0" definition="(ZDC_AND[x1]&BGRP0&BGRP4)" trigger_type="10100000" monitor="LF:000|HF:000">
+ <TriggerItem ctpid="64" partition="1" name="L1_TAU2" complex_deadtime="0" definition="(HA2[x1]&BGRP0&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]&BGRP0&BGRP1)" trigger_type="10100000" monitor="LF:000|HF:000">
@@ -549,11 +549,11 @@
<InternalTrigger name="BGRP1"/>
</AND>
</TriggerItem>
- <TriggerItem ctpid="66" partition="1" name="L1_ZDC_AND_UNPAIRED_NONISO" complex_deadtime="0" definition="(ZDC_AND[x1]&BGRP0&BGRP5)" trigger_type="10100000" monitor="LF:000|HF:000">
+ <TriggerItem ctpid="66" partition="1" name="L1_TAU3" complex_deadtime="0" definition="(HA3[x1]&BGRP0&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]&BGRP0&BGRP6)" trigger_type="10001000" monitor="LF:000|HF:000">
@@ -1094,6 +1094,20 @@
<InternalTrigger name="BGRP1"/>
</AND>
</TriggerItem>
+ <TriggerItem ctpid="158" partition="1" name="L1_J15.31ETA49" complex_deadtime="0" definition="(J15.31ETA49[x1]&BGRP0&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]&BGRP0&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="161" partition="1" name="L1_MBTSA8" complex_deadtime="0" definition="(MBTS_A8[x1]&BGRP0&BGRP1)" trigger_type="10100000" monitor="LF:000|HF:000">
<AND>
<TriggerCondition multi="1" name="MBTS_A8_x1" triggerthreshold="MBTS_A8"/>
@@ -1868,13 +1882,6 @@
<InternalTrigger name="BGRP1"/>
</AND>
</TriggerItem>
- <TriggerItem ctpid="299" partition="1" name="L1_TAU60" complex_deadtime="0" definition="(HA60[x1]&BGRP0&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]&BGRP0&BGRP6)" trigger_type="10000100" monitor="LF:000|HF:000">
<AND>
<TriggerCondition multi="1" name="EM20VH_x1" triggerthreshold="EM20VH"/>
@@ -2217,6 +2224,66 @@
<InternalTrigger name="BGRP1"/>
</AND>
</TriggerItem>
+ <TriggerItem ctpid="351" partition="1" name="L1_2TAU2_VTE50" complex_deadtime="0" definition="(HA2[x2]&!TE50[x1]&BGRP0&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]&!TE50[x1]&BGRP0&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]&!TE100[x1]&BGRP0&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]&!TE100[x1]&BGRP0&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]&!TE200[x1]&BGRP0&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]&!TE200[x1]&BGRP0&BGRP1)" trigger_type="10000100" monitor="LF:000|HF:000">
+ <AND>
+ <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="481" partition="1" name="L1_ZDC_XOR_TE20_VTE200" complex_deadtime="0" definition="(((ZDC_A[x1]&!ZDC_C[x1])|(ZDC_C[x1]&!ZDC_A[x1]))&TE20[x1]&!TE200[x1]&BGRP0&BGRP1)" trigger_type="10100000" monitor="LF:000|HF:000">
<AND>
<OR>
@@ -2689,8 +2756,8 @@
<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="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"/>
@@ -2830,7 +2897,7 @@
<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"/>
@@ -2882,12 +2949,12 @@
<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="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"/>
@@ -3474,27 +3541,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 +3646,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>
@@ -3726,6 +3793,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>
@@ -3768,27 +3856,6 @@
<TriggerCounter name="7HA40" type="CTPIN">
<TriggerCondition name="7HA40" triggerthreshold="HA40" multi="7"/>
</TriggerCounter>
- <TriggerCounter name="1HA60" type="CTPIN">
- <TriggerCondition name="1HA60" triggerthreshold="HA60" multi="1"/>
- </TriggerCounter>
- <TriggerCounter name="2HA60" type="CTPIN">
- <TriggerCondition name="2HA60" triggerthreshold="HA60" multi="2"/>
- </TriggerCounter>
- <TriggerCounter name="3HA60" type="CTPIN">
- <TriggerCondition name="3HA60" triggerthreshold="HA60" multi="3"/>
- </TriggerCounter>
- <TriggerCounter name="4HA60" type="CTPIN">
- <TriggerCondition name="4HA60" triggerthreshold="HA60" multi="4"/>
- </TriggerCounter>
- <TriggerCounter name="5HA60" type="CTPIN">
- <TriggerCondition name="5HA60" triggerthreshold="HA60" multi="5"/>
- </TriggerCounter>
- <TriggerCounter name="6HA60" type="CTPIN">
- <TriggerCondition name="6HA60" triggerthreshold="HA60" multi="6"/>
- </TriggerCounter>
- <TriggerCounter name="7HA60" type="CTPIN">
- <TriggerCondition name="7HA60" triggerthreshold="HA60" multi="7"/>
- </TriggerCounter>
<TriggerCounter name="1HA8" type="CTPIN">
<TriggerCondition name="1HA8" triggerthreshold="HA8" multi="1"/>
</TriggerCounter>
@@ -3810,15 +3877,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 +4138,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>
@@ -5189,34 +5256,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 +5664,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="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"/>
<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="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="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="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="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="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="21" range_end="23"/>
</Cable>
@@ -6578,9 +6645,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>
--
GitLab