diff --git a/Trigger/TriggerCommon/TriggerMenu/python/l1menu/ItemDef.py b/Trigger/TriggerCommon/TriggerMenu/python/l1menu/ItemDef.py
index f0ed3e0f9fec253c0947194f5d9d4534d47a9bc7..4819cadf9b86be22a109922166ecbcaba7c50133 100755
--- a/Trigger/TriggerCommon/TriggerMenu/python/l1menu/ItemDef.py
+++ b/Trigger/TriggerCommon/TriggerMenu/python/l1menu/ItemDef.py
@@ -126,6 +126,7 @@ class ItemDef:
LVL1MenuItem('L1_2EM18VH' ).setLogic( EM18VH.x(2) & physcond).setTriggerType( TT.calo ) # noqa: F821
LVL1MenuItem('L1_2EM12' ).setLogic( EM12.x(2) & physcond).setTriggerType( TT.calo ) # noqa: F821
LVL1MenuItem('L1_2EM15' ).setLogic( EM15.x(2) & physcond).setTriggerType( TT.calo ) # noqa: F821
+ LVL1MenuItem('L1_2EM16' ).setLogic( EM16.x(2) & physcond).setTriggerType( TT.calo ) # noqa: F821
LVL1MenuItem('L1_2EM15VH' ).setLogic( EM15VH.x(2) & physcond).setTriggerType( TT.calo ) # noqa: F821
if not '_v6' in TriggerFlags.triggerMenuSetup() and not '_HI' in TriggerFlags.triggerMenuSetup():
LVL1MenuItem('L1_2EM15VHI' ).setLogic( EM15VHI.x(2) & physcond).setTriggerType( TT.calo ) # noqa: F821
@@ -835,6 +836,8 @@ class ItemDef:
LVL1MenuItem('L1_TE9000.0ETA49_OVERLAY').setLogic( TE90000ETA49 & physcond).setTriggerType(TT.zerobs) # noqa: F821
LVL1MenuItem('L1_TE50_VTE600.0ETA49').setLogic( TE50 & Not(TE6000ETA49) & physcond).setTriggerType(TT.calo) # noqa: F821
+ LVL1MenuItem('L1_TE50_VTE600.0ETA49_PEB').setLogic( TE50 & Not(TE6000ETA49) & physcond).setTriggerType(TT.calo) # noqa: F821
+ LVL1MenuItem('L1_TE600.0ETA49_PEB').setLogic( TE6000ETA49 & physcond).setTriggerType(TT.calo) # noqa: F821
LVL1MenuItem('L1_VTE2' ).setLogic( Not(TE2) & physcond).setTriggerType(TT.calo) # noqa: F821
LVL1MenuItem('L1_VTE3' ).setLogic( Not(TE3) & physcond).setTriggerType(TT.calo) # noqa: F821
@@ -975,12 +978,15 @@ class ItemDef:
LVL1MenuItem('L1_ZDC_A_C_VTE50' ).setLogic( ZDC_A_C & Not(TE50) & physcond).setTriggerType(TT.minb) # noqa: F821
LVL1MenuItem('L1_ZDC_A_C_TE50' ).setLogic( ZDC_A_C & TE50 & physcond).setTriggerType(TT.minb) # noqa: F821
+ LVL1MenuItem('L1_ZDC_A_C_VTE50_PEB' ).setLogic( ZDC_A_C & Not(TE50) & physcond).setTriggerType(TT.minb) # noqa: F821
+
LVL1MenuItem('L1_ZDC_A_VTE20' ).setLogic( ZDC_A & Not(TE20) & physcond).setTriggerType(TT.minb) # noqa: F821
LVL1MenuItem('L1_ZDC_C_VTE20' ).setLogic( ZDC_C & Not(TE20) & physcond).setTriggerType(TT.minb) # noqa: F821
LVL1MenuItem('L1_ZDC_A_C_VTE200' ).setLogic( ZDC_A_C & Not(TE200) & physcond).setTriggerType(TT.minb) # noqa: F821
LVL1MenuItem('L1_ZDC_A_C_TE5_VTE200' ).setLogic( ZDC_A_C & TE5 & Not(TE200) & physcond).setTriggerType(TT.minb) # noqa: F821
+ LVL1MenuItem('L1_VZDC_A_C_VTE50' ).setLogic( VZDC_A_C & Not(TE50) & physcond).setTriggerType(TT.minb) # noqa: F821
LVL1MenuItem('L1_VZDC_A_C_TE5_VTE200' ).setLogic( VZDC_A_C & TE5 & Not(TE200) & physcond).setTriggerType(TT.minb) # noqa: F821
LVL1MenuItem('L1_VZDC_A_C_TE20_VTE200' ).setLogic( VZDC_A_C & TE20 & Not(TE200) & physcond).setTriggerType(TT.minb) # noqa: F821
LVL1MenuItem('L1_VZDC_AORC_TE5_VTE200' ).setLogic( VZDC_AORC & TE5 & Not(TE200) & physcond).setTriggerType(TT.minb) # noqa: F821
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 26a6ec40b9a8aecdd1433d36ddfdb7845a2b5676..2edb16b1603e8be746dead9bc8e8e1b0456effc5 100644
--- a/Trigger/TriggerCommon/TriggerMenu/python/l1menu/Menu_Physics_HI_v5.py
+++ b/Trigger/TriggerCommon/TriggerMenu/python/l1menu/Menu_Physics_HI_v5.py
@@ -363,7 +363,7 @@ def defineMenu():
'L1_EM20',
'L1_EM22',
'L1_2EM10',
- #'L1_2EM5',
+ 'L1_2EM16',
'L1_2EM7',
# tau beam items
#'L1_TAU8',
@@ -455,6 +455,7 @@ def defineMenu():
'L1_TE4_VTE100',
'L1_TE4_VTE50',
# restricted TE
+ 'L1_TE600.0ETA49_PEB',
'L1_TE600.0ETA49',
'L1_TE1500.0ETA49',
'L1_TE3000.0ETA49',
@@ -464,6 +465,7 @@ def defineMenu():
'L1_TE8000.0ETA49',
'L1_TE9000.0ETA49',
'L1_TE50_VTE600.0ETA49',
+ 'L1_TE50_VTE600.0ETA49_PEB',
# restricted TE for overlay
'L1_TE600.0ETA49_OVERLAY',
'L1_TE1500.0ETA49_OVERLAY',
@@ -485,6 +487,7 @@ def defineMenu():
'L1_ZDC_A_C_VTE50_OVERLAY',
'L1_TE50_OVERLAY',
'L1_ZDC_A_C_VTE50',
+ 'L1_ZDC_A_C_VTE50_PEB',
'L1_ZDC_A_C_TE50',
'L1_BCM_Wide',
'L1_BCM_HT_BGRP0','L1_BCM_Wide_BGRP0','L1_BCM_AC_CA_BGRP0',
@@ -503,6 +506,7 @@ def defineMenu():
'L1_ZDC_XOR_TE20_VTE200',
'L1_ZDC_XOR_TRT_VTE200',
'L1_ZDC_XOR_VTE200_MBTS_1',
+ 'L1_VZDC_A_C_VTE50',
'L1_VZDC_A_C_TE5_VTE200',
'L1_VZDC_A_C_TE20_VTE200',
'L1_VZDC_AORC_TE5_VTE200',
@@ -709,9 +713,8 @@ def defineMenu():
'L1_2MU4_EMPTY' : 6,
'L1_RD0_UNPAIRED_NONISO' : 7,
'L1_BCM_AC_CA_UNPAIRED_NONISO': 8,
- #'L1_FJ10_UNPAIRED_NONISO' : 9,
+ 'L1_2EM16' : 9,
'L1_2EM10' : 10,
- #'L1_2EM5' : 11,
#'L1_MU0_VTE20' : 12,
'L1_LAR-EM' : 11,
'L1_LAR-J' : 12,
@@ -726,7 +729,8 @@ def defineMenu():
'L1_ZDC_AND_VTE50' : 27,
#'L1_EM3_VTE20': 28,
-
+
+ 'L1_ZDC_A_C_VTE50_PEB' : 34,
'L1_2MU4_VTE50' : 35,
'L1_ZDC_A_C_VTE50' : 36,
'L1_ZDC_A_C_UNPAIRED_NONISO' : 37,
@@ -1016,6 +1020,7 @@ def defineMenu():
'L1_EM15HI_TAU40_2TAU15': 325,
# restricted TE
+ 'L1_TE600.0ETA49_PEB': 306,
'L1_TE600.0ETA49': 326,
'L1_TE1500.0ETA49': 327,
'L1_TE3000.0ETA49': 328,
@@ -1033,6 +1038,7 @@ def defineMenu():
'L1_TE4_VTE100': 349,
'L1_TE4_VTE50': 350,
+ 'L1_TE50_VTE600.0ETA49_PEB': 305,
'L1_TE50_VTE600.0ETA49': 334,
# restricted TE for overlay
'L1_TE600.0ETA49_OVERLAY': 336,
@@ -1055,7 +1061,7 @@ def defineMenu():
'L1_2TAU2_VTE200' : 355,
'L1_2TAU3_VTE200' : 356,
-
+ 'L1_VZDC_A_C_VTE50' : 480,
'L1_ZDC_XOR_TE20_VTE200' : 481,
'L1_TRT_FILLED' : 482,
'L1_TRT_EMPTY' : 483,
diff --git a/Trigger/TriggerCommon/TriggerMenu/python/menu/MC_HI_v5.py b/Trigger/TriggerCommon/TriggerMenu/python/menu/MC_HI_v5.py
index f3b7d2d49abdadca3910b6453caa89a4809b4a32..fa89136645aa854ca173df623429fffad963a4eb 100755
--- a/Trigger/TriggerCommon/TriggerMenu/python/menu/MC_HI_v5.py
+++ b/Trigger/TriggerCommon/TriggerMenu/python/menu/MC_HI_v5.py
@@ -74,7 +74,17 @@ Prescales = physics_menu.Prescales
# # DEFAULT MC prescales
# ######################################################
Prescales.L1Prescales = dict([(ctpid,1) for ctpid in Prescales.L1Prescales]) # setting all L1 prescales to 1
-Prescales.HLTPrescales.update({})
+ps_exclusion_list=[
+ 'mb_sptrk_L1ZDC_XOR_TE5_VTE200',
+ 'mb_sptrk_L1ZDC_XOR_VTE200',
+ 'mb_sptrk_L1ZDC_XOR_VTE200_MBTS_1',
+ 'mb_idperf_ion_L1MBTS_1_1',
+ 'mb_perf_L1RD1_FILLED',
+ 'mb_sptrk_L1MBTS_1_1_VTE50',
+ 'timeburner',
+]
+chain_list=ps_exclusion_list
+Prescales.HLTPrescales.update(dict(map(None,chain_list,len(chain_list)*[ [-1, 0, -1] ])))
# ######################################################
# ######################################################
diff --git a/Trigger/TriggerCommon/TriggerMenu/python/menu/Physics_HI_v5.py b/Trigger/TriggerCommon/TriggerMenu/python/menu/Physics_HI_v5.py
index c617015b5c5664d707d5fd747ee70f669718e0b1..ffd1864fd11aa727b2de73d2aa6323abbf9146cf 100644
--- a/Trigger/TriggerCommon/TriggerMenu/python/menu/Physics_HI_v5.py
+++ b/Trigger/TriggerCommon/TriggerMenu/python/menu/Physics_HI_v5.py
@@ -21,6 +21,8 @@ def setupMenu():
UCCStream="UCC"
PCStream="PC"
CCStream="CC"
+ PCpebStream="PCPEB"
+ CCpebStream="CCPEB"
# Disable Calo offset correction for HI menus (ATR-13323)
from CaloTools.CaloNoiseFlags import jobproperties
@@ -270,6 +272,9 @@ def setupMenu():
['e20_lhloose_ion', 'L1_EM16', [], [HardProbesStream], ['RATE:SingleElectron', 'BW:Egamma'], -1],
['e20_lhmedium_ion', 'L1_EM16', [], [HardProbesStream], ['RATE:SingleElectron', 'BW:Egamma'], -1],
+ #monitoring
+ ['2e20_loose_ion', 'L1_2EM16', [], [HardProbesStream], ['RATE:SingleElectron', 'BW:Egamma'], -1],
+
#idperf
['e15_loose_ion_idperf', 'L1_EM12', [], [HardProbesStream, 'express'], ['RATE:IDMonitoring', 'BW:Egamma', 'BW:ID'],-1],
['e18_loose_ion_idperf', 'L1_EM14', [], [HardProbesStream, 'express'], ['RATE:IDMonitoring', 'BW:Egamma', 'BW:ID'],-1],
@@ -349,7 +354,10 @@ def setupMenu():
['hi_upc_FgapAC_mb_sptrk_exclusiveloose2_L1ZDC_XOR_VTE50', 'L1_ZDC_XOR_VTE50', ['', ''], [UPCStream],["BW:UPC", "RATE:UPC"], 1, ['serial', -1, ['hi_upc_FgapAC','mb_sptrk_exclusiveloose2'],False]],
['hi_upc_FgapAC_mb_sptrk_exclusiveloose1_L1MU4_VTE50', 'L1_MU4_VTE50', ['', ''], [UPCStream],["BW:UPC", "RATE:UPC"], 1, ['serial', -1, ['hi_upc_FgapAC','mb_sptrk_exclusiveloose1'],False]],
['hi_upc_FgapAC_mb_sptrk_exclusiveloose2_L1MU4_VTE50', 'L1_MU4_VTE50', ['', ''], [UPCStream],["BW:UPC", "RATE:UPC"], 1, ['serial', -1, ['hi_upc_FgapAC','mb_sptrk_exclusiveloose2'],False]],
-
+
+ ['hi_upc_FgapAC_mb_sptrk_exclusiveloose2_L1ZDC_A_C_VTE50', 'L1_ZDC_A_C_VTE50', ['', ''], [UPCStream],["BW:UPC", "RATE:UPC"], 1, ['serial', -1, ['hi_upc_FgapAC','mb_sptrk_exclusiveloose2'],False]],
+ ['hi_upc_FgapAC_mb_sptrk_exclusiveloose2_L1VZDC_A_C_VTE50', 'L1_VZDC_A_C_VTE50', ['', ''], [UPCStream],["BW:UPC", "RATE:UPC"], 1, ['serial', -1, ['hi_upc_FgapAC','mb_sptrk_exclusiveloose2'],False]],
+
]
TriggerFlags.HeavyIonSlice.signatures = [
@@ -410,9 +418,7 @@ def setupMenu():
['hi_gg_upc_FgapAC_L1TE4_VTE100', 'L1_TE4_VTE100', [], [UPCStream],["BW:UPC", "RATE:UPC"], 1],
['hi_gg_upc_FgapAC_L1TE5_VTE50', 'L1_TE5_VTE50', [], [UPCStream],["BW:UPC", "RATE:UPC"], 1],
['hi_gg_upc_FgapAC_L1TE4_VTE50', 'L1_TE4_VTE50', [], [UPCStream],["BW:UPC", "RATE:UPC"], 1],
-
- ['hi_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],
@@ -427,10 +433,10 @@ def setupMenu():
['hi_gg_upc_L1TE5_VTE50', 'L1_TE5_VTE50', [], [UPCStream],["BW:UPC", "RATE:UPC"], 1],
['hi_gg_upc_L1TE4_VTE50', 'L1_TE4_VTE50', [], [UPCStream],["BW:UPC", "RATE:UPC"], 1],
- #PC
- ['hi_hipeb_L1TE50_VTE600', 'L1_TE50_VTE600.0ETA49', [], [PCStream], ["BW:MinBias", "RATE:MinBias"], 1],
- #CC
- ['hi_hipeb_L1TE600', 'L1_TE600.0ETA49', [], [CCStream], ["BW:MinBias", "RATE:MinBias"], 1],
+ #PCpeb
+ ['hi_hipeb_L1TE50_VTE600', 'L1_TE50_VTE600.0ETA49_PEB', [], [PCpebStream], ["BW:MinBias", "RATE:MinBias"], 1],
+ #CCpeb
+ ['hi_hipeb_L1TE600', 'L1_TE600.0ETA49_PEB', [], [CCpebStream], ["BW:MinBias", "RATE:MinBias"], 1],
#['hi_gg_upc_L1All', '', [], [UPCStream],["BW:UPC", "RATE:UPC"], 1],
# validation trigger
@@ -447,7 +453,7 @@ def setupMenu():
#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_L1ZDC_A_C_VTE50', 'L1_ZDC_A_C_VTE50', [], [MinBiasStream, 'express'],["BW:MinBias", "RATE:MinBias"], 1],
+ ['mb_sptrk', 'L1_ZDC_A_C_VTE50', [], [MinBiasStream, 'express'],["BW:MinBias", "RATE:MinBias"], 1],
['mb_sptrk_L1MBTS_1_1_VTE50', 'L1_MBTS_1_1_VTE50', [], [MinBiasStream, 'express'],["BW:MinBias", "RATE:MinBias"], 1],
['mb_idperf_ion_L1MBTS_1', 'L1_MBTS_1', [], [MinBiasStream],["BW:MinBias", "RATE:MinBias"], 1],
['mb_idperf_ion_L1MBTS_1_1', 'L1_MBTS_1_1', [], [MinBiasStream, 'express'],["BW:MinBias", "RATE:MinBias"], 1],
@@ -455,12 +461,22 @@ def setupMenu():
['mb_perf_L1RD1_FILLED', 'L1_RD1_FILLED', [], [MinBiasStream],["BW:MinBias", "RATE:MinBias"], 1],
['mb_perf_L1RD1_EMPTY', 'L1_RD1_EMPTY', [], [MinBiasStream],["BW:MinBias", "RATE:MinBias"], 1],
+ #PCpeb
+ ['mb_sptrk_hipeb_L1ZDC_A_C_VTE50', 'L1_ZDC_A_C_VTE50_PEB', [], [PCpebStream],["BW:MinBias", "RATE:MinBias"], 1],
#PC
- ['mb_sptrk_hipeb_L1ZDC_A_C_VTE50', 'L1_ZDC_A_C_VTE50', [], [PCStream],["BW:MinBias", "RATE:MinBias"], 1],
+ ['mb_sptrk_L1ZDC_A_C_VTE50', 'L1_ZDC_A_C_VTE50', [], [PCStream],["BW:MinBias", "RATE:MinBias"], 1],
+
#MB UPC:
['mb_sptrk_L1ZDC_XOR_VTE200', 'L1_ZDC_XOR_VTE200', [], [UPCStream],["BW:UPC", "RATE:UPC"], 1],
['mb_sptrk_L1ZDC_XOR_VTE200_MBTS_1', 'L1_ZDC_XOR_VTE200_MBTS_1', [], [UPCStream],["BW:UPC", "RATE:UPC"], 1],
+
+ ['mb_sptrk_exclusiveloose2_L12TAU2_VTE50', 'L1_2TAU2_VTE50', [], [UPCStream],["BW:UPC", "RATE:UPC"], 1],
+ ['mb_sptrk_exclusiveloose2_L12TAU2_VTE100', 'L1_2TAU2_VTE100', [], [UPCStream],["BW:UPC", "RATE:UPC"], 1],
+ ['mb_sptrk_exclusiveloose2_L12TAU2_VTE200', 'L1_2TAU2_VTE100', [], [UPCStream],["BW:UPC", "RATE:UPC"], 1],
+ ['mb_sptrk_vetombts2in_exclusiveloose2_L12TAU2_VTE50', 'L1_2TAU2_VTE50', [], [UPCStream],["BW:UPC", "RATE:UPC"], 1],
+ ['mb_sptrk_vetombts2in_exclusiveloose2_L12TAU2_VTE100', 'L1_2TAU2_VTE100', [], [UPCStream],["BW:UPC", "RATE:UPC"], 1],
+ ['mb_sptrk_vetombts2in_exclusiveloose2_L12TAU2_VTE200', 'L1_2TAU2_VTE200', [], [UPCStream],["BW:UPC", "RATE:UPC"], 1],
#['mb_sptrk_ion_trk15_L1ZDC_XOR_VTE200_MBTS_1', 'L1_ZDC_XOR_VTE200_MBTS_1', [], [UPCStream],["BW:UPC", "RATE:UPC"], 1],
#UPC: Other primary
@@ -614,7 +630,12 @@ def setupMenu():
['noalg_mb_L1TE6500.0ETA49', 'L1_TE6500.0ETA49', [], [MinBiasStream], ["BW:MinBias", "RATE:MinBias"], 1],
['noalg_mb_L1TE8000.0ETA49', 'L1_TE8000.0ETA49', [], [MinBiasStream], ["BW:MinBias", "RATE:MinBias"], 1],
['noalg_mb_L1TE9000.0ETA49', 'L1_TE9000.0ETA49', [], [MinBiasStream], ["BW:MinBias", "RATE:MinBias"], 1],
-
+
+ #PC
+ ['noalg_pc_L1TE50_VTE600', 'L1_TE50_VTE600.0ETA49', [], [PCStream], ["BW:MinBias", "RATE:MinBias"], 1],
+ #CC
+ ['noalg_cc_L1TE600', 'L1_TE600.0ETA49', [], [CCStream], ["BW:MinBias", "RATE:MinBias"], 1],
+
#min bias
['noalg_mb_L1MBTS_2', 'L1_MBTS_2', [], [MinBiasStream], ["BW:MinBias", "RATE:MinBias"], 1],
['noalg_mb_L1MBTS_1_1', 'L1_MBTS_1_1', [], [MinBiasStream, 'express'], ["BW:MinBias", "RATE:MinBias"], 1],
diff --git a/Trigger/TriggerCommon/TriggerMenu/python/menu/SignatureDicts.py b/Trigger/TriggerCommon/TriggerMenu/python/menu/SignatureDicts.py
index 2e13d7b772e2fd49c3d6692d4ddc365927598860..056b7372706394b8f833381f621d8c80ed525434 100644
--- a/Trigger/TriggerCommon/TriggerMenu/python/menu/SignatureDicts.py
+++ b/Trigger/TriggerCommon/TriggerMenu/python/menu/SignatureDicts.py
@@ -700,7 +700,7 @@ StreamingChainParts = {
'multiplicity' : '',
'streamingInfo' : ['bkg', 'idmon', 'mb', 'eb', 'zb','to','standby',
'hltpassthrough', 'jettauetmiss', 'larcells',
- 'cosmiccalo', 'cosmicmuons','idcosmic', 'dcmmon','zb', 'l1calo', 'l1topo','ftk'],
+ 'cosmiccalo', 'cosmicmuons','idcosmic', 'dcmmon','zb', 'l1calo', 'l1topo','ftk','cc','pc'],
'trigType' : 'streamer',
'extra' : '',
'streamType' : AllowedStreamingChainIdentifiers,
diff --git a/Trigger/TriggerCommon/TriggerMenu/python/menu/StreamInfo.py b/Trigger/TriggerCommon/TriggerMenu/python/menu/StreamInfo.py
index 0e8ddb35f690c39fdec8c4559b447e8253b2b7a0..8046be2f6c7172acf3bcea88227c7f4ad8be6e6e 100644
--- a/Trigger/TriggerCommon/TriggerMenu/python/menu/StreamInfo.py
+++ b/Trigger/TriggerCommon/TriggerMenu/python/menu/StreamInfo.py
@@ -32,6 +32,8 @@ physicsStreams = ['Main',
'Mistimed',
'ExoDelayed',
'FTK',
+ 'PC',
+ 'CC',
]
calibStreams = [
@@ -60,8 +62,8 @@ calibStreams = [
'IDprescaledL1',
'LArPEB',
'L1TopoMismatches',
- 'PC',
- 'CC',
+ 'PCPEB',
+ 'CCPEB',
]
##NOTE: DataScouting_xx_NAME:
diff --git a/Trigger/TriggerCommon/TriggerMenuXML/data/LVL1config_MC_HI_v5.xml b/Trigger/TriggerCommon/TriggerMenuXML/data/LVL1config_MC_HI_v5.xml
index 1b7640beae1eb705d84bd89a4cf5bc142e4fd232..faa8d0ccc127dd82797105363573509274e4d236 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: 300-->
+ <!--No. L1 items defined: 305-->
<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>
@@ -68,9 +68,9 @@
<InternalTrigger name="BGRP1"/>
</AND>
</TriggerItem>
- <TriggerItem ctpid="9" partition="1" name="L1_J175" complex_deadtime="0" definition="(J175[x1]&BGRP0&BGRP1)" trigger_type="10000100" monitor="LF:000|HF:000">
+ <TriggerItem ctpid="9" partition="1" name="L1_2EM16" complex_deadtime="0" definition="(EM16[x2]&BGRP0&BGRP1)" trigger_type="10000100" monitor="LF:000|HF:000">
<AND>
- <TriggerCondition multi="1" name="J175_x1" triggerthreshold="J175"/>
+ <TriggerCondition multi="2" name="EM16_x2" triggerthreshold="EM16"/>
<InternalTrigger name="BGRP0"/>
<InternalTrigger name="BGRP1"/>
</AND>
@@ -96,20 +96,16 @@
<InternalTrigger name="BGRP1"/>
</AND>
</TriggerItem>
- <TriggerItem ctpid="13" partition="1" name="L1_2J15" complex_deadtime="0" definition="(J15[x2]&BGRP0&BGRP1)" trigger_type="10000100" monitor="LF:000|HF:000">
+ <TriggerItem ctpid="13" partition="1" name="L1_J175" complex_deadtime="0" definition="(J175[x1]&BGRP0&BGRP1)" trigger_type="10000100" monitor="LF:000|HF:000">
<AND>
- <TriggerCondition multi="2" name="J15_x2" triggerthreshold="J15"/>
+ <TriggerCondition multi="1" name="J175_x1" triggerthreshold="J175"/>
<InternalTrigger name="BGRP0"/>
<InternalTrigger name="BGRP1"/>
</AND>
</TriggerItem>
- <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">
+ <TriggerItem ctpid="14" partition="1" name="L1_2J15" complex_deadtime="0" definition="(J15[x2]&BGRP0&BGRP1)" trigger_type="10000100" 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>
+ <TriggerCondition multi="2" name="J15_x2" triggerthreshold="J15"/>
<InternalTrigger name="BGRP0"/>
<InternalTrigger name="BGRP1"/>
</AND>
@@ -158,7 +154,18 @@
<InternalTrigger name="BGRP4"/>
</AND>
</TriggerItem>
- <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">
+ <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">
<AND>
<TriggerCondition multi="2" name="MBTS_A_x2" triggerthreshold="MBTS_A"/>
<TriggerCondition multi="2" name="MBTS_C_x2" triggerthreshold="MBTS_C"/>
@@ -169,7 +176,7 @@
<InternalTrigger name="BGRP1"/>
</AND>
</TriggerItem>
- <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">
+ <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">
<AND>
<TriggerCondition multi="1" name="TE5_x1" triggerthreshold="TE5"/>
<NOT>
@@ -179,34 +186,27 @@
<InternalTrigger name="BGRP1"/>
</AND>
</TriggerItem>
- <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">
+ <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">
<AND>
<TriggerCondition multi="1" name="TE5000.0ETA49_x1" triggerthreshold="TE5000.0ETA49"/>
<InternalTrigger name="BGRP0"/>
<InternalTrigger name="BGRP1"/>
</AND>
</TriggerItem>
- <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">
+ <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">
<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_TE6500.0ETA49_OVERLAY" complex_deadtime="0" definition="(TE6500.0ETA49[x1]&BGRP0&BGRP1)" trigger_type="10000010" monitor="LF:000|HF:000">
+ <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">
<AND>
<TriggerCondition multi="1" name="TE6500.0ETA49_x1" triggerthreshold="TE6500.0ETA49"/>
<InternalTrigger name="BGRP0"/>
<InternalTrigger name="BGRP1"/>
</AND>
</TriggerItem>
- <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="BCM_Wide_x1" triggerthreshold="BCM_Wide"/>
- <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">
<AND>
<TriggerCondition multi="1" name="ZDC_AND_x1" triggerthreshold="ZDC_AND"/>
@@ -217,7 +217,14 @@
<InternalTrigger name="BGRP1"/>
</AND>
</TriggerItem>
- <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">
+ <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">
+ <AND>
+ <TriggerCondition multi="1" name="BCM_Wide_x1" triggerthreshold="BCM_Wide"/>
+ <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">
<AND>
<TriggerCondition multi="1" name="J15_x1" triggerthreshold="J15"/>
<NOT>
@@ -227,7 +234,7 @@
<InternalTrigger name="BGRP1"/>
</AND>
</TriggerItem>
- <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">
+ <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">
<AND>
<TriggerCondition multi="2" name="J15_x2" triggerthreshold="J15"/>
<NOT>
@@ -237,7 +244,7 @@
<InternalTrigger name="BGRP1"/>
</AND>
</TriggerItem>
- <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">
+ <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">
<AND>
<TriggerCondition multi="1" name="J15_x1" triggerthreshold="J15"/>
<NOT>
@@ -250,7 +257,7 @@
<InternalTrigger name="BGRP1"/>
</AND>
</TriggerItem>
- <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">
+ <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">
<AND>
<TriggerCondition multi="2" name="J15_x2" triggerthreshold="J15"/>
<NOT>
@@ -263,7 +270,7 @@
<InternalTrigger name="BGRP1"/>
</AND>
</TriggerItem>
- <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">
+ <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">
<AND>
<TriggerCondition multi="1" name="ZDC_A_x1" triggerthreshold="ZDC_A"/>
<TriggerCondition multi="1" name="ZDC_C_x1" triggerthreshold="ZDC_C"/>
@@ -271,18 +278,15 @@
<InternalTrigger name="BGRP7"/>
</AND>
</TriggerItem>
- <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">
+ <TriggerItem ctpid="34" partition="1" name="L1_ZDC_A_C_VTE50_PEB" complex_deadtime="0" definition="(ZDC_A[x1]&ZDC_C[x1]&!TE50[x1]&BGRP0&BGRP1)" trigger_type="10100000" monitor="LF:000|HF:000">
<AND>
- <TriggerCondition multi="1" name="HA12_x1" triggerthreshold="HA12"/>
+ <TriggerCondition multi="1" name="ZDC_A_x1" triggerthreshold="ZDC_A"/>
+ <TriggerCondition multi="1" name="ZDC_C_x1" triggerthreshold="ZDC_C"/>
+ <NOT>
+ <TriggerCondition multi="1" name="TE50_x1" triggerthreshold="TE50"/>
+ </NOT>
<InternalTrigger name="BGRP0"/>
- <InternalTrigger name="BGRP5"/>
+ <InternalTrigger name="BGRP1"/>
</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">
@@ -430,11 +434,11 @@
<InternalTrigger name="BGRP7"/>
</AND>
</TriggerItem>
- <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">
+ <TriggerItem ctpid="49" 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="BGRP3"/>
+ <InternalTrigger name="BGRP4"/>
</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 +476,11 @@
<InternalTrigger name="BGRP1"/>
</AND>
</TriggerItem>
- <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">
+ <TriggerItem ctpid="55" 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="BGRP6"/>
+ <InternalTrigger name="BGRP5"/>
</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,9 +490,9 @@
<InternalTrigger name="BGRP1"/>
</AND>
</TriggerItem>
- <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">
+ <TriggerItem ctpid="57" 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="ZDC_AND_x1" triggerthreshold="ZDC_AND"/>
+ <TriggerCondition multi="1" name="HA12_x1" triggerthreshold="HA12"/>
<InternalTrigger name="BGRP0"/>
<InternalTrigger name="BGRP3"/>
</AND>
@@ -500,11 +504,11 @@
<InternalTrigger name="BGRP1"/>
</AND>
</TriggerItem>
- <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">
+ <TriggerItem ctpid="59" 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="ZDC_AND_x1" triggerthreshold="ZDC_AND"/>
+ <TriggerCondition multi="1" name="HA12_x1" triggerthreshold="HA12"/>
<InternalTrigger name="BGRP0"/>
- <InternalTrigger name="BGRP4"/>
+ <InternalTrigger name="BGRP6"/>
</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 +518,11 @@
<InternalTrigger name="BGRP1"/>
</AND>
</TriggerItem>
- <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">
+ <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">
<AND>
<TriggerCondition multi="1" name="ZDC_AND_x1" triggerthreshold="ZDC_AND"/>
<InternalTrigger name="BGRP0"/>
- <InternalTrigger name="BGRP5"/>
+ <InternalTrigger name="BGRP3"/>
</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">
@@ -570,26 +574,18 @@
<InternalTrigger name="BGRP6"/>
</AND>
</TriggerItem>
- <TriggerItem ctpid="69" partition="1" name="L1_MLZ_A" complex_deadtime="0" definition="((MBTS_A[x1]|ZDC_A[x1]|LUCID_A[x1])&BGRP0&BGRP1)" trigger_type="10100000" monitor="LF:000|HF:000">
+ <TriggerItem ctpid="69" 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>
- <OR>
- <TriggerCondition multi="1" name="MBTS_A_x1" triggerthreshold="MBTS_A"/>
- <TriggerCondition multi="1" name="ZDC_A_x1" triggerthreshold="ZDC_A"/>
- <TriggerCondition multi="1" name="LUCID_A_x1" triggerthreshold="LUCID_A"/>
- </OR>
+ <TriggerCondition multi="1" name="ZDC_AND_x1" triggerthreshold="ZDC_AND"/>
<InternalTrigger name="BGRP0"/>
- <InternalTrigger name="BGRP1"/>
+ <InternalTrigger name="BGRP4"/>
</AND>
</TriggerItem>
- <TriggerItem ctpid="70" partition="1" name="L1_MLZ_C" complex_deadtime="0" definition="((MBTS_C[x1]|ZDC_C[x1]|LUCID_C[x1])&BGRP0&BGRP1)" trigger_type="10100000" monitor="LF:000|HF:000">
+ <TriggerItem ctpid="70" 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>
- <OR>
- <TriggerCondition multi="1" name="MBTS_C_x1" triggerthreshold="MBTS_C"/>
- <TriggerCondition multi="1" name="ZDC_C_x1" triggerthreshold="ZDC_C"/>
- <TriggerCondition multi="1" name="LUCID_C_x1" triggerthreshold="LUCID_C"/>
- </OR>
+ <TriggerCondition multi="1" name="ZDC_AND_x1" triggerthreshold="ZDC_AND"/>
<InternalTrigger name="BGRP0"/>
- <InternalTrigger name="BGRP1"/>
+ <InternalTrigger name="BGRP5"/>
</AND>
</TriggerItem>
<TriggerItem ctpid="71" partition="1" name="L1_2MU6" complex_deadtime="0" definition="(MU6[x2]&BGRP0&BGRP1)" trigger_type="10001000" monitor="LF:000|HF:000">
@@ -613,22 +609,12 @@
<InternalTrigger name="BGRP1"/>
</AND>
</TriggerItem>
- <TriggerItem ctpid="74" partition="1" name="L1_MBLZ" complex_deadtime="0" definition="((((MBTS_A[x1]|ZDC_A[x1]|LUCID_A[x1])&(MBTS_C[x1]|ZDC_C[x1]|LUCID_C[x1]))|BCM_Wide[x1])&BGRP0&BGRP1)" trigger_type="10100000" monitor="LF:000|HF:000">
+ <TriggerItem ctpid="74" partition="1" name="L1_MLZ_A" complex_deadtime="0" definition="((MBTS_A[x1]|ZDC_A[x1]|LUCID_A[x1])&BGRP0&BGRP1)" trigger_type="10100000" monitor="LF:000|HF:000">
<AND>
<OR>
- <AND>
- <OR>
- <TriggerCondition multi="1" name="MBTS_A_x1" triggerthreshold="MBTS_A"/>
- <TriggerCondition multi="1" name="ZDC_A_x1" triggerthreshold="ZDC_A"/>
- <TriggerCondition multi="1" name="LUCID_A_x1" triggerthreshold="LUCID_A"/>
- </OR>
- <OR>
- <TriggerCondition multi="1" name="MBTS_C_x1" triggerthreshold="MBTS_C"/>
- <TriggerCondition multi="1" name="ZDC_C_x1" triggerthreshold="ZDC_C"/>
- <TriggerCondition multi="1" name="LUCID_C_x1" triggerthreshold="LUCID_C"/>
- </OR>
- </AND>
- <TriggerCondition multi="1" name="BCM_Wide_x1" triggerthreshold="BCM_Wide"/>
+ <TriggerCondition multi="1" name="MBTS_A_x1" triggerthreshold="MBTS_A"/>
+ <TriggerCondition multi="1" name="ZDC_A_x1" triggerthreshold="ZDC_A"/>
+ <TriggerCondition multi="1" name="LUCID_A_x1" triggerthreshold="LUCID_A"/>
</OR>
<InternalTrigger name="BGRP0"/>
<InternalTrigger name="BGRP1"/>
@@ -648,7 +634,39 @@
<InternalTrigger name="BGRP1"/>
</AND>
</TriggerItem>
- <TriggerItem ctpid="77" partition="1" name="L1_BGRP0" complex_deadtime="0" definition="(RNDM0&BGRP0)" trigger_type="10000001" monitor="LF:000|HF:000">
+ <TriggerItem ctpid="77" partition="1" name="L1_MLZ_C" complex_deadtime="0" definition="((MBTS_C[x1]|ZDC_C[x1]|LUCID_C[x1])&BGRP0&BGRP1)" trigger_type="10100000" monitor="LF:000|HF:000">
+ <AND>
+ <OR>
+ <TriggerCondition multi="1" name="MBTS_C_x1" triggerthreshold="MBTS_C"/>
+ <TriggerCondition multi="1" name="ZDC_C_x1" triggerthreshold="ZDC_C"/>
+ <TriggerCondition multi="1" name="LUCID_C_x1" triggerthreshold="LUCID_C"/>
+ </OR>
+ <InternalTrigger name="BGRP0"/>
+ <InternalTrigger name="BGRP1"/>
+ </AND>
+ </TriggerItem>
+ <TriggerItem ctpid="78" partition="1" name="L1_MBLZ" complex_deadtime="0" definition="((((MBTS_A[x1]|ZDC_A[x1]|LUCID_A[x1])&(MBTS_C[x1]|ZDC_C[x1]|LUCID_C[x1]))|BCM_Wide[x1])&BGRP0&BGRP1)" trigger_type="10100000" monitor="LF:000|HF:000">
+ <AND>
+ <OR>
+ <AND>
+ <OR>
+ <TriggerCondition multi="1" name="MBTS_A_x1" triggerthreshold="MBTS_A"/>
+ <TriggerCondition multi="1" name="ZDC_A_x1" triggerthreshold="ZDC_A"/>
+ <TriggerCondition multi="1" name="LUCID_A_x1" triggerthreshold="LUCID_A"/>
+ </OR>
+ <OR>
+ <TriggerCondition multi="1" name="MBTS_C_x1" triggerthreshold="MBTS_C"/>
+ <TriggerCondition multi="1" name="ZDC_C_x1" triggerthreshold="ZDC_C"/>
+ <TriggerCondition multi="1" name="LUCID_C_x1" triggerthreshold="LUCID_C"/>
+ </OR>
+ </AND>
+ <TriggerCondition multi="1" name="BCM_Wide_x1" triggerthreshold="BCM_Wide"/>
+ </OR>
+ <InternalTrigger name="BGRP0"/>
+ <InternalTrigger name="BGRP1"/>
+ </AND>
+ </TriggerItem>
+ <TriggerItem ctpid="79" partition="1" name="L1_BGRP0" complex_deadtime="0" definition="(RNDM0&BGRP0)" trigger_type="10000001" monitor="LF:000|HF:000">
<AND>
<InternalTrigger name="RNDM0"/>
<InternalTrigger name="BGRP0"/>
@@ -1917,6 +1935,23 @@
<InternalTrigger name="BGRP1"/>
</AND>
</TriggerItem>
+ <TriggerItem ctpid="305" partition="1" name="L1_TE50_VTE600.0ETA49_PEB" complex_deadtime="0" definition="(TE50[x1]&!TE600.0ETA49[x1]&BGRP0&BGRP1)" trigger_type="10000100" monitor="LF:000|HF:000">
+ <AND>
+ <TriggerCondition multi="1" name="TE50_x1" triggerthreshold="TE50"/>
+ <NOT>
+ <TriggerCondition multi="1" name="TE600.0ETA49_x1" triggerthreshold="TE600.0ETA49"/>
+ </NOT>
+ <InternalTrigger name="BGRP0"/>
+ <InternalTrigger name="BGRP1"/>
+ </AND>
+ </TriggerItem>
+ <TriggerItem ctpid="306" partition="1" name="L1_TE600.0ETA49_PEB" complex_deadtime="0" definition="(TE600.0ETA49[x1]&BGRP0&BGRP1)" trigger_type="10000100" monitor="LF:000|HF:000">
+ <AND>
+ <TriggerCondition multi="1" name="TE600.0ETA49_x1" triggerthreshold="TE600.0ETA49"/>
+ <InternalTrigger name="BGRP0"/>
+ <InternalTrigger name="BGRP1"/>
+ </AND>
+ </TriggerItem>
<TriggerItem ctpid="307" partition="1" name="L1_J100_FIRSTEMPTY" complex_deadtime="0" definition="(J100[x1]&BGRP0&BGRP6)" trigger_type="10000100" monitor="LF:000|HF:000">
<AND>
<TriggerCondition multi="1" name="J100_x1" triggerthreshold="J100"/>
@@ -2294,6 +2329,21 @@
<InternalTrigger name="BGRP1"/>
</AND>
</TriggerItem>
+ <TriggerItem ctpid="480" partition="1" name="L1_VZDC_A_C_VTE50" complex_deadtime="0" definition="(!ZDC_A[x1]&!ZDC_C[x1]&!TE50[x1]&BGRP0&BGRP1)" trigger_type="10100000" monitor="LF:000|HF:000">
+ <AND>
+ <NOT>
+ <TriggerCondition multi="1" name="ZDC_A_x1" triggerthreshold="ZDC_A"/>
+ </NOT>
+ <NOT>
+ <TriggerCondition multi="1" name="ZDC_C_x1" triggerthreshold="ZDC_C"/>
+ </NOT>
+ <NOT>
+ <TriggerCondition multi="1" name="TE50_x1" triggerthreshold="TE50"/>
+ </NOT>
+ <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>
@@ -2686,8 +2736,8 @@
<Prescale ctpid="75" cut="000001" value="1"/>
<Prescale ctpid="76" cut="000001" value="1"/>
<Prescale ctpid="77" cut="000001" value="1"/>
- <Prescale ctpid="78" cut="-000001" value="-1"/>
- <Prescale ctpid="79" cut="-000001" value="-1"/>
+ <Prescale ctpid="78" cut="000001" value="1"/>
+ <Prescale ctpid="79" cut="000001" value="1"/>
<Prescale ctpid="80" cut="000001" value="1"/>
<Prescale ctpid="81" cut="000001" value="1"/>
<Prescale ctpid="82" cut="000001" value="1"/>
@@ -2913,8 +2963,8 @@
<Prescale ctpid="302" cut="000001" value="1"/>
<Prescale ctpid="303" cut="000001" value="1"/>
<Prescale ctpid="304" cut="000001" value="1"/>
- <Prescale ctpid="305" cut="-000001" value="-1"/>
- <Prescale ctpid="306" cut="-000001" value="-1"/>
+ <Prescale ctpid="305" cut="000001" value="1"/>
+ <Prescale ctpid="306" cut="000001" value="1"/>
<Prescale ctpid="307" cut="000001" value="1"/>
<Prescale ctpid="308" cut="000001" value="1"/>
<Prescale ctpid="309" cut="000001" value="1"/>
@@ -3088,7 +3138,7 @@
<Prescale ctpid="477" cut="-000001" value="-1"/>
<Prescale ctpid="478" cut="-000001" value="-1"/>
<Prescale ctpid="479" cut="-000001" value="-1"/>
- <Prescale ctpid="480" cut="-000001" value="-1"/>
+ <Prescale ctpid="480" cut="000001" value="1"/>
<Prescale ctpid="481" cut="000001" value="1"/>
<Prescale ctpid="482" cut="000001" value="1"/>
<Prescale ctpid="483" cut="000001" value="1"/>
diff --git a/Trigger/TriggerCommon/TriggerMenuXML/data/LVL1config_Physics_HI_v5.xml b/Trigger/TriggerCommon/TriggerMenuXML/data/LVL1config_Physics_HI_v5.xml
index 2d181aacf470bcfaab9a3461a5418425c25313df..35667f0cda00592da018b625906b784dbff5ebf6 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: 300-->
+ <!--No. L1 items defined: 305-->
<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>
@@ -68,9 +68,9 @@
<InternalTrigger name="BGRP1"/>
</AND>
</TriggerItem>
- <TriggerItem ctpid="9" partition="1" name="L1_J175" complex_deadtime="0" definition="(J175[x1]&BGRP0&BGRP1)" trigger_type="10000100" monitor="LF:000|HF:000">
+ <TriggerItem ctpid="9" partition="1" name="L1_2EM16" complex_deadtime="0" definition="(EM16[x2]&BGRP0&BGRP1)" trigger_type="10000100" monitor="LF:000|HF:000">
<AND>
- <TriggerCondition multi="1" name="J175_x1" triggerthreshold="J175"/>
+ <TriggerCondition multi="2" name="EM16_x2" triggerthreshold="EM16"/>
<InternalTrigger name="BGRP0"/>
<InternalTrigger name="BGRP1"/>
</AND>
@@ -96,20 +96,16 @@
<InternalTrigger name="BGRP1"/>
</AND>
</TriggerItem>
- <TriggerItem ctpid="13" partition="1" name="L1_2J15" complex_deadtime="0" definition="(J15[x2]&BGRP0&BGRP1)" trigger_type="10000100" monitor="LF:000|HF:000">
+ <TriggerItem ctpid="13" partition="1" name="L1_J175" complex_deadtime="0" definition="(J175[x1]&BGRP0&BGRP1)" trigger_type="10000100" monitor="LF:000|HF:000">
<AND>
- <TriggerCondition multi="2" name="J15_x2" triggerthreshold="J15"/>
+ <TriggerCondition multi="1" name="J175_x1" triggerthreshold="J175"/>
<InternalTrigger name="BGRP0"/>
<InternalTrigger name="BGRP1"/>
</AND>
</TriggerItem>
- <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">
+ <TriggerItem ctpid="14" partition="1" name="L1_2J15" complex_deadtime="0" definition="(J15[x2]&BGRP0&BGRP1)" trigger_type="10000100" 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>
+ <TriggerCondition multi="2" name="J15_x2" triggerthreshold="J15"/>
<InternalTrigger name="BGRP0"/>
<InternalTrigger name="BGRP1"/>
</AND>
@@ -158,7 +154,18 @@
<InternalTrigger name="BGRP4"/>
</AND>
</TriggerItem>
- <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">
+ <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">
<AND>
<TriggerCondition multi="2" name="MBTS_A_x2" triggerthreshold="MBTS_A"/>
<TriggerCondition multi="2" name="MBTS_C_x2" triggerthreshold="MBTS_C"/>
@@ -169,7 +176,7 @@
<InternalTrigger name="BGRP1"/>
</AND>
</TriggerItem>
- <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">
+ <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">
<AND>
<TriggerCondition multi="1" name="TE5_x1" triggerthreshold="TE5"/>
<NOT>
@@ -179,34 +186,27 @@
<InternalTrigger name="BGRP1"/>
</AND>
</TriggerItem>
- <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">
+ <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">
<AND>
<TriggerCondition multi="1" name="TE5000.0ETA49_x1" triggerthreshold="TE5000.0ETA49"/>
<InternalTrigger name="BGRP0"/>
<InternalTrigger name="BGRP1"/>
</AND>
</TriggerItem>
- <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">
+ <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">
<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_TE6500.0ETA49_OVERLAY" complex_deadtime="0" definition="(TE6500.0ETA49[x1]&BGRP0&BGRP1)" trigger_type="10000010" monitor="LF:000|HF:000">
+ <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">
<AND>
<TriggerCondition multi="1" name="TE6500.0ETA49_x1" triggerthreshold="TE6500.0ETA49"/>
<InternalTrigger name="BGRP0"/>
<InternalTrigger name="BGRP1"/>
</AND>
</TriggerItem>
- <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="BCM_Wide_x1" triggerthreshold="BCM_Wide"/>
- <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">
<AND>
<TriggerCondition multi="1" name="ZDC_AND_x1" triggerthreshold="ZDC_AND"/>
@@ -217,7 +217,14 @@
<InternalTrigger name="BGRP1"/>
</AND>
</TriggerItem>
- <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">
+ <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">
+ <AND>
+ <TriggerCondition multi="1" name="BCM_Wide_x1" triggerthreshold="BCM_Wide"/>
+ <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">
<AND>
<TriggerCondition multi="1" name="J15_x1" triggerthreshold="J15"/>
<NOT>
@@ -227,7 +234,7 @@
<InternalTrigger name="BGRP1"/>
</AND>
</TriggerItem>
- <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">
+ <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">
<AND>
<TriggerCondition multi="2" name="J15_x2" triggerthreshold="J15"/>
<NOT>
@@ -237,7 +244,7 @@
<InternalTrigger name="BGRP1"/>
</AND>
</TriggerItem>
- <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">
+ <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">
<AND>
<TriggerCondition multi="1" name="J15_x1" triggerthreshold="J15"/>
<NOT>
@@ -250,7 +257,7 @@
<InternalTrigger name="BGRP1"/>
</AND>
</TriggerItem>
- <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">
+ <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">
<AND>
<TriggerCondition multi="2" name="J15_x2" triggerthreshold="J15"/>
<NOT>
@@ -263,7 +270,7 @@
<InternalTrigger name="BGRP1"/>
</AND>
</TriggerItem>
- <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">
+ <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">
<AND>
<TriggerCondition multi="1" name="ZDC_A_x1" triggerthreshold="ZDC_A"/>
<TriggerCondition multi="1" name="ZDC_C_x1" triggerthreshold="ZDC_C"/>
@@ -271,18 +278,15 @@
<InternalTrigger name="BGRP7"/>
</AND>
</TriggerItem>
- <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">
+ <TriggerItem ctpid="34" partition="1" name="L1_ZDC_A_C_VTE50_PEB" complex_deadtime="0" definition="(ZDC_A[x1]&ZDC_C[x1]&!TE50[x1]&BGRP0&BGRP1)" trigger_type="10100000" monitor="LF:000|HF:000">
<AND>
- <TriggerCondition multi="1" name="HA12_x1" triggerthreshold="HA12"/>
+ <TriggerCondition multi="1" name="ZDC_A_x1" triggerthreshold="ZDC_A"/>
+ <TriggerCondition multi="1" name="ZDC_C_x1" triggerthreshold="ZDC_C"/>
+ <NOT>
+ <TriggerCondition multi="1" name="TE50_x1" triggerthreshold="TE50"/>
+ </NOT>
<InternalTrigger name="BGRP0"/>
- <InternalTrigger name="BGRP5"/>
+ <InternalTrigger name="BGRP1"/>
</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">
@@ -430,11 +434,11 @@
<InternalTrigger name="BGRP7"/>
</AND>
</TriggerItem>
- <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">
+ <TriggerItem ctpid="49" 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="BGRP3"/>
+ <InternalTrigger name="BGRP4"/>
</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 +476,11 @@
<InternalTrigger name="BGRP1"/>
</AND>
</TriggerItem>
- <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">
+ <TriggerItem ctpid="55" 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="BGRP6"/>
+ <InternalTrigger name="BGRP5"/>
</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,9 +490,9 @@
<InternalTrigger name="BGRP1"/>
</AND>
</TriggerItem>
- <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">
+ <TriggerItem ctpid="57" 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="ZDC_AND_x1" triggerthreshold="ZDC_AND"/>
+ <TriggerCondition multi="1" name="HA12_x1" triggerthreshold="HA12"/>
<InternalTrigger name="BGRP0"/>
<InternalTrigger name="BGRP3"/>
</AND>
@@ -500,11 +504,11 @@
<InternalTrigger name="BGRP1"/>
</AND>
</TriggerItem>
- <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">
+ <TriggerItem ctpid="59" 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="ZDC_AND_x1" triggerthreshold="ZDC_AND"/>
+ <TriggerCondition multi="1" name="HA12_x1" triggerthreshold="HA12"/>
<InternalTrigger name="BGRP0"/>
- <InternalTrigger name="BGRP4"/>
+ <InternalTrigger name="BGRP6"/>
</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 +518,11 @@
<InternalTrigger name="BGRP1"/>
</AND>
</TriggerItem>
- <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">
+ <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">
<AND>
<TriggerCondition multi="1" name="ZDC_AND_x1" triggerthreshold="ZDC_AND"/>
<InternalTrigger name="BGRP0"/>
- <InternalTrigger name="BGRP5"/>
+ <InternalTrigger name="BGRP3"/>
</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">
@@ -570,26 +574,18 @@
<InternalTrigger name="BGRP6"/>
</AND>
</TriggerItem>
- <TriggerItem ctpid="69" partition="1" name="L1_MLZ_A" complex_deadtime="0" definition="((MBTS_A[x1]|ZDC_A[x1]|LUCID_A[x1])&BGRP0&BGRP1)" trigger_type="10100000" monitor="LF:000|HF:000">
+ <TriggerItem ctpid="69" 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>
- <OR>
- <TriggerCondition multi="1" name="MBTS_A_x1" triggerthreshold="MBTS_A"/>
- <TriggerCondition multi="1" name="ZDC_A_x1" triggerthreshold="ZDC_A"/>
- <TriggerCondition multi="1" name="LUCID_A_x1" triggerthreshold="LUCID_A"/>
- </OR>
+ <TriggerCondition multi="1" name="ZDC_AND_x1" triggerthreshold="ZDC_AND"/>
<InternalTrigger name="BGRP0"/>
- <InternalTrigger name="BGRP1"/>
+ <InternalTrigger name="BGRP4"/>
</AND>
</TriggerItem>
- <TriggerItem ctpid="70" partition="1" name="L1_MLZ_C" complex_deadtime="0" definition="((MBTS_C[x1]|ZDC_C[x1]|LUCID_C[x1])&BGRP0&BGRP1)" trigger_type="10100000" monitor="LF:000|HF:000">
+ <TriggerItem ctpid="70" 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>
- <OR>
- <TriggerCondition multi="1" name="MBTS_C_x1" triggerthreshold="MBTS_C"/>
- <TriggerCondition multi="1" name="ZDC_C_x1" triggerthreshold="ZDC_C"/>
- <TriggerCondition multi="1" name="LUCID_C_x1" triggerthreshold="LUCID_C"/>
- </OR>
+ <TriggerCondition multi="1" name="ZDC_AND_x1" triggerthreshold="ZDC_AND"/>
<InternalTrigger name="BGRP0"/>
- <InternalTrigger name="BGRP1"/>
+ <InternalTrigger name="BGRP5"/>
</AND>
</TriggerItem>
<TriggerItem ctpid="71" partition="1" name="L1_2MU6" complex_deadtime="0" definition="(MU6[x2]&BGRP0&BGRP1)" trigger_type="10001000" monitor="LF:000|HF:000">
@@ -613,22 +609,12 @@
<InternalTrigger name="BGRP1"/>
</AND>
</TriggerItem>
- <TriggerItem ctpid="74" partition="1" name="L1_MBLZ" complex_deadtime="0" definition="((((MBTS_A[x1]|ZDC_A[x1]|LUCID_A[x1])&(MBTS_C[x1]|ZDC_C[x1]|LUCID_C[x1]))|BCM_Wide[x1])&BGRP0&BGRP1)" trigger_type="10100000" monitor="LF:000|HF:000">
+ <TriggerItem ctpid="74" partition="1" name="L1_MLZ_A" complex_deadtime="0" definition="((MBTS_A[x1]|ZDC_A[x1]|LUCID_A[x1])&BGRP0&BGRP1)" trigger_type="10100000" monitor="LF:000|HF:000">
<AND>
<OR>
- <AND>
- <OR>
- <TriggerCondition multi="1" name="MBTS_A_x1" triggerthreshold="MBTS_A"/>
- <TriggerCondition multi="1" name="ZDC_A_x1" triggerthreshold="ZDC_A"/>
- <TriggerCondition multi="1" name="LUCID_A_x1" triggerthreshold="LUCID_A"/>
- </OR>
- <OR>
- <TriggerCondition multi="1" name="MBTS_C_x1" triggerthreshold="MBTS_C"/>
- <TriggerCondition multi="1" name="ZDC_C_x1" triggerthreshold="ZDC_C"/>
- <TriggerCondition multi="1" name="LUCID_C_x1" triggerthreshold="LUCID_C"/>
- </OR>
- </AND>
- <TriggerCondition multi="1" name="BCM_Wide_x1" triggerthreshold="BCM_Wide"/>
+ <TriggerCondition multi="1" name="MBTS_A_x1" triggerthreshold="MBTS_A"/>
+ <TriggerCondition multi="1" name="ZDC_A_x1" triggerthreshold="ZDC_A"/>
+ <TriggerCondition multi="1" name="LUCID_A_x1" triggerthreshold="LUCID_A"/>
</OR>
<InternalTrigger name="BGRP0"/>
<InternalTrigger name="BGRP1"/>
@@ -648,7 +634,39 @@
<InternalTrigger name="BGRP1"/>
</AND>
</TriggerItem>
- <TriggerItem ctpid="77" partition="1" name="L1_BGRP0" complex_deadtime="0" definition="(RNDM0&BGRP0)" trigger_type="10000001" monitor="LF:000|HF:000">
+ <TriggerItem ctpid="77" partition="1" name="L1_MLZ_C" complex_deadtime="0" definition="((MBTS_C[x1]|ZDC_C[x1]|LUCID_C[x1])&BGRP0&BGRP1)" trigger_type="10100000" monitor="LF:000|HF:000">
+ <AND>
+ <OR>
+ <TriggerCondition multi="1" name="MBTS_C_x1" triggerthreshold="MBTS_C"/>
+ <TriggerCondition multi="1" name="ZDC_C_x1" triggerthreshold="ZDC_C"/>
+ <TriggerCondition multi="1" name="LUCID_C_x1" triggerthreshold="LUCID_C"/>
+ </OR>
+ <InternalTrigger name="BGRP0"/>
+ <InternalTrigger name="BGRP1"/>
+ </AND>
+ </TriggerItem>
+ <TriggerItem ctpid="78" partition="1" name="L1_MBLZ" complex_deadtime="0" definition="((((MBTS_A[x1]|ZDC_A[x1]|LUCID_A[x1])&(MBTS_C[x1]|ZDC_C[x1]|LUCID_C[x1]))|BCM_Wide[x1])&BGRP0&BGRP1)" trigger_type="10100000" monitor="LF:000|HF:000">
+ <AND>
+ <OR>
+ <AND>
+ <OR>
+ <TriggerCondition multi="1" name="MBTS_A_x1" triggerthreshold="MBTS_A"/>
+ <TriggerCondition multi="1" name="ZDC_A_x1" triggerthreshold="ZDC_A"/>
+ <TriggerCondition multi="1" name="LUCID_A_x1" triggerthreshold="LUCID_A"/>
+ </OR>
+ <OR>
+ <TriggerCondition multi="1" name="MBTS_C_x1" triggerthreshold="MBTS_C"/>
+ <TriggerCondition multi="1" name="ZDC_C_x1" triggerthreshold="ZDC_C"/>
+ <TriggerCondition multi="1" name="LUCID_C_x1" triggerthreshold="LUCID_C"/>
+ </OR>
+ </AND>
+ <TriggerCondition multi="1" name="BCM_Wide_x1" triggerthreshold="BCM_Wide"/>
+ </OR>
+ <InternalTrigger name="BGRP0"/>
+ <InternalTrigger name="BGRP1"/>
+ </AND>
+ </TriggerItem>
+ <TriggerItem ctpid="79" partition="1" name="L1_BGRP0" complex_deadtime="0" definition="(RNDM0&BGRP0)" trigger_type="10000001" monitor="LF:000|HF:000">
<AND>
<InternalTrigger name="RNDM0"/>
<InternalTrigger name="BGRP0"/>
@@ -1917,6 +1935,23 @@
<InternalTrigger name="BGRP1"/>
</AND>
</TriggerItem>
+ <TriggerItem ctpid="305" partition="1" name="L1_TE50_VTE600.0ETA49_PEB" complex_deadtime="0" definition="(TE50[x1]&!TE600.0ETA49[x1]&BGRP0&BGRP1)" trigger_type="10000100" monitor="LF:000|HF:000">
+ <AND>
+ <TriggerCondition multi="1" name="TE50_x1" triggerthreshold="TE50"/>
+ <NOT>
+ <TriggerCondition multi="1" name="TE600.0ETA49_x1" triggerthreshold="TE600.0ETA49"/>
+ </NOT>
+ <InternalTrigger name="BGRP0"/>
+ <InternalTrigger name="BGRP1"/>
+ </AND>
+ </TriggerItem>
+ <TriggerItem ctpid="306" partition="1" name="L1_TE600.0ETA49_PEB" complex_deadtime="0" definition="(TE600.0ETA49[x1]&BGRP0&BGRP1)" trigger_type="10000100" monitor="LF:000|HF:000">
+ <AND>
+ <TriggerCondition multi="1" name="TE600.0ETA49_x1" triggerthreshold="TE600.0ETA49"/>
+ <InternalTrigger name="BGRP0"/>
+ <InternalTrigger name="BGRP1"/>
+ </AND>
+ </TriggerItem>
<TriggerItem ctpid="307" partition="1" name="L1_J100_FIRSTEMPTY" complex_deadtime="0" definition="(J100[x1]&BGRP0&BGRP6)" trigger_type="10000100" monitor="LF:000|HF:000">
<AND>
<TriggerCondition multi="1" name="J100_x1" triggerthreshold="J100"/>
@@ -2294,6 +2329,21 @@
<InternalTrigger name="BGRP1"/>
</AND>
</TriggerItem>
+ <TriggerItem ctpid="480" partition="1" name="L1_VZDC_A_C_VTE50" complex_deadtime="0" definition="(!ZDC_A[x1]&!ZDC_C[x1]&!TE50[x1]&BGRP0&BGRP1)" trigger_type="10100000" monitor="LF:000|HF:000">
+ <AND>
+ <NOT>
+ <TriggerCondition multi="1" name="ZDC_A_x1" triggerthreshold="ZDC_A"/>
+ </NOT>
+ <NOT>
+ <TriggerCondition multi="1" name="ZDC_C_x1" triggerthreshold="ZDC_C"/>
+ </NOT>
+ <NOT>
+ <TriggerCondition multi="1" name="TE50_x1" triggerthreshold="TE50"/>
+ </NOT>
+ <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>
@@ -2686,8 +2736,8 @@
<Prescale ctpid="75" cut="000001" value="1"/>
<Prescale ctpid="76" cut="000001" value="1"/>
<Prescale ctpid="77" cut="000001" value="1"/>
- <Prescale ctpid="78" cut="-000001" value="-1"/>
- <Prescale ctpid="79" cut="-000001" value="-1"/>
+ <Prescale ctpid="78" cut="000001" value="1"/>
+ <Prescale ctpid="79" cut="000001" value="1"/>
<Prescale ctpid="80" cut="000001" value="1"/>
<Prescale ctpid="81" cut="000001" value="1"/>
<Prescale ctpid="82" cut="000001" value="1"/>
@@ -2913,8 +2963,8 @@
<Prescale ctpid="302" cut="000001" value="1"/>
<Prescale ctpid="303" cut="000001" value="1"/>
<Prescale ctpid="304" cut="000001" value="1"/>
- <Prescale ctpid="305" cut="-000001" value="-1"/>
- <Prescale ctpid="306" cut="-000001" value="-1"/>
+ <Prescale ctpid="305" cut="000001" value="1"/>
+ <Prescale ctpid="306" cut="000001" value="1"/>
<Prescale ctpid="307" cut="000001" value="1"/>
<Prescale ctpid="308" cut="000001" value="1"/>
<Prescale ctpid="309" cut="000001" value="1"/>
@@ -3088,7 +3138,7 @@
<Prescale ctpid="477" cut="-000001" value="-1"/>
<Prescale ctpid="478" cut="-000001" value="-1"/>
<Prescale ctpid="479" cut="-000001" value="-1"/>
- <Prescale ctpid="480" cut="-000001" value="-1"/>
+ <Prescale ctpid="480" cut="000001" value="1"/>
<Prescale ctpid="481" cut="000001" value="1"/>
<Prescale ctpid="482" cut="000001" value="1"/>
<Prescale ctpid="483" cut="000001" value="1"/>