diff --git a/Trigger/TrigAlgorithms/TrigDetCalib/src/TrigSubDetListWriter.cxx b/Trigger/TrigAlgorithms/TrigDetCalib/src/TrigSubDetListWriter.cxx
index 28320761eb5f9a217522bbd7c0583638e3aec33b..98c67cc53ca386b42b2c187f4a76a36e2651e793 100755
--- a/Trigger/TrigAlgorithms/TrigDetCalib/src/TrigSubDetListWriter.cxx
+++ b/Trigger/TrigAlgorithms/TrigDetCalib/src/TrigSubDetListWriter.cxx
@@ -176,6 +176,9 @@ HLT::ErrorCode TrigSubDetListWriter::hltInitialize()
m_sourceid.push_back(eformat::LAR_FCAL_C_SIDE);
m_sourceid.push_back(eformat::LAR_HAD_ENDCAP_A_SIDE);
m_sourceid.push_back(eformat::LAR_HAD_ENDCAP_C_SIDE);
+ } else if (*detit=="FCal") {
+ m_sourceid.push_back(eformat::LAR_FCAL_A_SIDE);
+ m_sourceid.push_back(eformat::LAR_FCAL_C_SIDE);
} else if (*detit=="FORWARD_BCM") {
m_sourceid.push_back(eformat::FORWARD_BCM);
} else if (*detit=="FORWARD_LUCID") {
diff --git a/Trigger/TriggerCommon/TriggerMenu/python/heavyion/HeavyIonDef.py b/Trigger/TriggerCommon/TriggerMenu/python/heavyion/HeavyIonDef.py
index 7e5afbc73702c62f9996c41c04e5887fb0203714..bf8fc9ad406cc391f555e34c8a3292e9d1f20632 100644
--- a/Trigger/TriggerCommon/TriggerMenu/python/heavyion/HeavyIonDef.py
+++ b/Trigger/TriggerCommon/TriggerMenu/python/heavyion/HeavyIonDef.py
@@ -69,6 +69,8 @@ class L2EFChain_HI(L2EFChainDef):
self.setup_hi_ultracentral()
elif "upc" in self.chainPart['recoAlg']:
self.setup_hi_ultraperipheral()
+ elif "hipeb" in self.chainPart['addInfo']:
+ self.setup_hi_PEB()
L2EFChainDef.__init__(self, self.chainName, self.L2Name, self.chainCounter, self.chainL1Item, self.EFName, self.chainCounter, self.L2InputTE)
@@ -404,7 +406,16 @@ class L2EFChain_HI(L2EFChainDef):
'L2_hi_mbtsveto': mergeRemovingOverlap('EF_hi_mbtsveto_', chainSuffix),
'L2_hi_iddataprep': mergeRemovingOverlap('EF_hi_iddataprep_', chainSuffix),
'L2_hi_pixel': mergeRemovingOverlap('EF_hi_pixel_', chainSuffix),
- }
+ }
+ def setup_hi_PEB(self):
+ from TrigDetCalib.TrigDetCalibConfig import TrigSubDetListWriter
+ HISubDetListWriter = TrigSubDetListWriter("HISubDetListWriter")
+ HISubDetListWriter.SubdetId = ['TDAQ_CTP','InnerDetector','FCal','FORWARD_ZDC']
+ HISubDetListWriter.MaxRoIsPerEvent=1
+
+ self.robWriter = [HISubDetListWriter]
+ self.L2sequenceList += [['', self.robWriter, 'L2_hipeb']]
+ self.L2signatureList += [[['L2_hipeb']]]
#####################################################################
#if __name__ == '__main__':
diff --git a/Trigger/TriggerCommon/TriggerMenu/python/l1menu/ItemDef.py b/Trigger/TriggerCommon/TriggerMenu/python/l1menu/ItemDef.py
index 143129198f4164bbdb7d7adf87e5127dc8cecdfa..f0ed3e0f9fec253c0947194f5d9d4534d47a9bc7 100755
--- a/Trigger/TriggerCommon/TriggerMenu/python/l1menu/ItemDef.py
+++ b/Trigger/TriggerCommon/TriggerMenu/python/l1menu/ItemDef.py
@@ -815,6 +815,7 @@ class ItemDef:
# HI items
LVL1MenuItem('L1_TE500.0ETA49').setLogic( TE5000ETA49 & physcond).setTriggerType(TT.calo) # noqa: F821
+ LVL1MenuItem('L1_TE600.0ETA49').setLogic( TE6000ETA49 & physcond).setTriggerType(TT.calo) # noqa: F821
LVL1MenuItem('L1_TE1500.0ETA49').setLogic( TE15000ETA49 & physcond).setTriggerType(TT.calo) # noqa: F821
LVL1MenuItem('L1_TE3000.0ETA49').setLogic( TE30000ETA49 & physcond).setTriggerType(TT.calo) # noqa: F821
LVL1MenuItem('L1_TE3500.0ETA49').setLogic( TE35000ETA49 & physcond).setTriggerType(TT.calo) # noqa: F821
@@ -824,6 +825,7 @@ class ItemDef:
LVL1MenuItem('L1_TE9000.0ETA49').setLogic( TE90000ETA49 & physcond).setTriggerType(TT.calo) # noqa: F821
LVL1MenuItem('L1_TE500.0ETA49_OVERLAY').setLogic( TE5000ETA49 & physcond).setTriggerType(TT.zerobs) # noqa: F821
+ LVL1MenuItem('L1_TE600.0ETA49_OVERLAY').setLogic( TE6000ETA49 & physcond).setTriggerType(TT.zerobs) # noqa: F821
LVL1MenuItem('L1_TE1500.0ETA49_OVERLAY').setLogic( TE15000ETA49 & physcond).setTriggerType(TT.zerobs) # noqa: F821
LVL1MenuItem('L1_TE3000.0ETA49_OVERLAY').setLogic( TE30000ETA49 & physcond).setTriggerType(TT.zerobs) # noqa: F821
LVL1MenuItem('L1_TE3500.0ETA49_OVERLAY').setLogic( TE35000ETA49 & physcond).setTriggerType(TT.zerobs) # noqa: F821
@@ -832,6 +834,8 @@ class ItemDef:
LVL1MenuItem('L1_TE8000.0ETA49_OVERLAY').setLogic( TE80000ETA49 & physcond).setTriggerType(TT.zerobs) # noqa: F821
LVL1MenuItem('L1_TE9000.0ETA49_OVERLAY').setLogic( TE90000ETA49 & physcond).setTriggerType(TT.zerobs) # noqa: F821
+ LVL1MenuItem('L1_TE50_VTE600.0ETA49').setLogic( TE50 & Not(TE6000ETA49) & physcond).setTriggerType(TT.calo) # noqa: F821
+
LVL1MenuItem('L1_VTE2' ).setLogic( Not(TE2) & physcond).setTriggerType(TT.calo) # noqa: F821
LVL1MenuItem('L1_VTE3' ).setLogic( Not(TE3) & physcond).setTriggerType(TT.calo) # noqa: F821
LVL1MenuItem('L1_VTE4' ).setLogic( Not(TE4) & physcond).setTriggerType(TT.calo) # noqa: F821
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 307a98f06e6de5da9526aa189a5bddb8c96a6687..26a6ec40b9a8aecdd1433d36ddfdb7845a2b5676 100644
--- a/Trigger/TriggerCommon/TriggerMenu/python/l1menu/Menu_Physics_HI_v5.py
+++ b/Trigger/TriggerCommon/TriggerMenu/python/l1menu/Menu_Physics_HI_v5.py
@@ -53,7 +53,6 @@ def defineMenu():
# SLOT 7 / CON 2,3 (TAU1,2)
#--------------------------
- #TODO TAU trigger behaving like EM items, lowere thresholds
# 16 x TAU
'HA2', 'HA3','HA8', 'HA12', 'HA12IL', 'HA12IM', 'HA12IT', 'HA15', 'HA20', 'HA20IL', 'HA20IM', 'HA20IT', 'HA25', 'HA25IT', 'HA30', 'HA40',
@@ -62,7 +61,6 @@ def defineMenu():
#----------------------
# 10 x 3-bit JET (can have multiplicity 4 or more)
- #TODO shall we start at higher pT to reduce overflows?
# 8 x JETs and central jets
'J12', 'J12.0ETA23', 'J15', 'J15.0ETA25','J20', 'J25','J25.0ETA23','J30',
@@ -110,7 +108,7 @@ def defineMenu():
#'RXE35', 'RXE40', 'RXE45', 'RXE50', 'RXE55', 'RXE60', 'RXE70', 'RXE80', # FTHR
# 8 x restricted eta range in |eta|<4.9
- 'TE500.0ETA49', 'TE1500.0ETA49', 'TE3000.0ETA49', 'TE3500.0ETA49',
+ 'TE600.0ETA49', 'TE1500.0ETA49', 'TE3000.0ETA49', 'TE3500.0ETA49',
'TE5000.0ETA49', 'TE6500.0ETA49', 'TE8000.0ETA49', 'TE9000.0ETA49',
#------------------------
@@ -457,7 +455,7 @@ def defineMenu():
'L1_TE4_VTE100',
'L1_TE4_VTE50',
# restricted TE
- 'L1_TE500.0ETA49',
+ 'L1_TE600.0ETA49',
'L1_TE1500.0ETA49',
'L1_TE3000.0ETA49',
'L1_TE3500.0ETA49',
@@ -465,8 +463,9 @@ def defineMenu():
'L1_TE6500.0ETA49',
'L1_TE8000.0ETA49',
'L1_TE9000.0ETA49',
+ 'L1_TE50_VTE600.0ETA49',
# restricted TE for overlay
- 'L1_TE500.0ETA49_OVERLAY',
+ 'L1_TE600.0ETA49_OVERLAY',
'L1_TE1500.0ETA49_OVERLAY',
'L1_TE3000.0ETA49_OVERLAY',
'L1_TE3500.0ETA49_OVERLAY',
@@ -1017,7 +1016,7 @@ def defineMenu():
'L1_EM15HI_TAU40_2TAU15': 325,
# restricted TE
- 'L1_TE500.0ETA49': 326,
+ 'L1_TE600.0ETA49': 326,
'L1_TE1500.0ETA49': 327,
'L1_TE3000.0ETA49': 328,
'L1_TE3500.0ETA49': 329,
@@ -1034,8 +1033,9 @@ def defineMenu():
'L1_TE4_VTE100': 349,
'L1_TE4_VTE50': 350,
+ 'L1_TE50_VTE600.0ETA49': 334,
# restricted TE for overlay
- 'L1_TE500.0ETA49_OVERLAY': 336,
+ 'L1_TE600.0ETA49_OVERLAY': 336,
'L1_TE1500.0ETA49_OVERLAY': 337,
'L1_TE3000.0ETA49_OVERLAY': 338,
'L1_TE3500.0ETA49_OVERLAY': 339,
diff --git a/Trigger/TriggerCommon/TriggerMenu/python/l1menu/ThresholdDef.py b/Trigger/TriggerCommon/TriggerMenu/python/l1menu/ThresholdDef.py
index cbdd2cc5ecf3dead6b4d973748b4bcc48b5e5778..fce30a2ce50acab2b7e5c90ad789c4ec66b33f1b 100644
--- a/Trigger/TriggerCommon/TriggerMenu/python/l1menu/ThresholdDef.py
+++ b/Trigger/TriggerCommon/TriggerMenu/python/l1menu/ThresholdDef.py
@@ -368,7 +368,7 @@ class ThresholdDef:
# Restricted range TE |eta|<4.9
etamax = 49
- for thrV in [500, 1500, 3000, 3500, 5000, 6500, 8000, 9000]:
+ for thrV in [500, 600, 1500, 3000, 3500, 5000, 6500, 8000, 9000]:
tc.registerThr('TE%i.0ETA%i' % (thrV, etamax), 'TE').addThrValue(EtSumOff).addThrValue( thrV, etamin = -etamax, etamax = etamax, priority=1)
diff --git a/Trigger/TriggerCommon/TriggerMenu/python/menu/Physics_HI_v5.py b/Trigger/TriggerCommon/TriggerMenu/python/menu/Physics_HI_v5.py
index c676e1b2dc24f432a35ac6566b1fa9119a30ad4d..c617015b5c5664d707d5fd747ee70f669718e0b1 100644
--- a/Trigger/TriggerCommon/TriggerMenu/python/menu/Physics_HI_v5.py
+++ b/Trigger/TriggerCommon/TriggerMenu/python/menu/Physics_HI_v5.py
@@ -19,7 +19,8 @@ def setupMenu():
MinBiasStream="MinBias"
UPCStream="UPC"
UCCStream="UCC"
- #PCStream="PC"
+ PCStream="PC"
+ CCStream="CC"
# Disable Calo offset correction for HI menus (ATR-13323)
from CaloTools.CaloNoiseFlags import jobproperties
@@ -425,6 +426,11 @@ def setupMenu():
['hi_gg_upc_L1TE4_VTE100', 'L1_TE4_VTE100', [], [UPCStream],["BW:UPC", "RATE:UPC"], 1],
['hi_gg_upc_L1TE5_VTE50', 'L1_TE5_VTE50', [], [UPCStream],["BW:UPC", "RATE:UPC"], 1],
['hi_gg_upc_L1TE4_VTE50', 'L1_TE4_VTE50', [], [UPCStream],["BW:UPC", "RATE:UPC"], 1],
+
+ #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],
#['hi_gg_upc_L1All', '', [], [UPCStream],["BW:UPC", "RATE:UPC"], 1],
# validation trigger
@@ -449,6 +455,9 @@ 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],
+ #PC
+ ['mb_sptrk_hipeb_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],
@@ -595,9 +604,9 @@ def setupMenu():
['noalg_mb_L1TE10000', 'L1_TE10000', [], [MinBiasStream], ["BW:MinBias", "RATE:MinBias"], 1],
['noalg_mb_L1TE12000', 'L1_TE12000', [], [MinBiasStream], ["BW:MinBias", "RATE:MinBias"], 1],
#['noalg_mb_L1TE14000', 'L1_TE14000', [], [MinBiasStream], ["BW:MinBias", "RATE:MinBias"], 1],
-
+
#TE restricted calo
- ['noalg_mb_L1TE500.0ETA49', 'L1_TE500.0ETA49', [], [MinBiasStream], ["BW:MinBias", "RATE:MinBias"], 1],
+ ['noalg_mb_L1TE600.0ETA49', 'L1_TE600.0ETA49', [], [MinBiasStream], ["BW:MinBias", "RATE:MinBias"], 1],
['noalg_mb_L1TE1500.0ETA49', 'L1_TE1500.0ETA49', [], [MinBiasStream], ["BW:MinBias", "RATE:MinBias"], 1],
['noalg_mb_L1TE3000.0ETA49', 'L1_TE3000.0ETA49', [], [MinBiasStream], ["BW:MinBias", "RATE:MinBias"], 1],
['noalg_mb_L1TE3500.0ETA49', 'L1_TE3500.0ETA49', [], [MinBiasStream], ["BW:MinBias", "RATE:MinBias"], 1],
@@ -670,7 +679,7 @@ def setupMenu():
['noalg_L1TE50_OVERLAY', 'L1_TE50_OVERLAY', [], ['MinBiasOverlay'], ["BW:MinBiasOverlay", "RATE:MinBiasOverlay"], 1],
#TE restricted calo in |eta|<4.9
- ['noalg_mb_L1TE500.0ETA49_OVERLAY', 'L1_TE500.0ETA49_OVERLAY', [], ['MinBiasOverlay'], ["BW:MinBiasOverlay", "RATE:MinBiasOverlay"], 1],
+ ['noalg_mb_L1TE600.0ETA49_OVERLAY', 'L1_TE600.0ETA49_OVERLAY', [], ['MinBiasOverlay'], ["BW:MinBiasOverlay", "RATE:MinBiasOverlay"], 1],
['noalg_mb_L1TE1500.0ETA49_OVERLAY', 'L1_TE1500.0ETA49_OVERLAY', [], ['MinBiasOverlay'], ["BW:MinBiasOverlay", "RATE:MinBiasOverlay"], 1],
['noalg_mb_L1TE3000.0ETA49_OVERLAY', 'L1_TE3000.0ETA49_OVERLAY', [], ['MinBiasOverlay'], ["BW:MinBiasOverlay", "RATE:MinBiasOverlay"], 1],
['noalg_mb_L1TE3500.0ETA49_OVERLAY', 'L1_TE3500.0ETA49_OVERLAY', [], ['MinBiasOverlay'], ["BW:MinBiasOverlay", "RATE:MinBiasOverlay"], 1],
diff --git a/Trigger/TriggerCommon/TriggerMenu/python/menu/SignatureDicts.py b/Trigger/TriggerCommon/TriggerMenu/python/menu/SignatureDicts.py
index e0ca91bae1cbd97826d56d4d578b7992ae529463..2e13d7b772e2fd49c3d6692d4ddc365927598860 100644
--- a/Trigger/TriggerCommon/TriggerMenu/python/menu/SignatureDicts.py
+++ b/Trigger/TriggerCommon/TriggerMenu/python/menu/SignatureDicts.py
@@ -573,7 +573,7 @@ MinBiasChainParts = {
'pt2', 'pt4', 'pt6', 'pt8', ],
'hypoEFsumEtInfo': ['sumet40', 'sumet50', 'sumet60', 'sumet70', 'sumet80', 'sumet90', 'sumet110', 'sumet150',],
'recoAlg' : ['mbts', 'sptrk', 'sp', 'noalg', 'perf', 'hmt', 'hmtperf', 'idperf', 'zdcperf'],
- 'addInfo' : ['peb'],
+ 'addInfo' : ['peb','hipeb'],
}
# ---- MinBiasDictinary of default Values ----
MinBiasChainParts_Default = {
@@ -618,7 +618,7 @@ HeavyIonChainParts = {
'hypoEFInfo' : [],
'hypoEFsumEtInfo': ['fcalet3000', 'fcalet3306', 'fcalet3391', 'fcalet3516',],
'recoAlg' : ['ucc', 'upc'],
- 'addInfo' : [ ],
+ 'addInfo' : ['hipeb'],
'gap' : [ 'FgapA', 'FgapC', 'FgapAC', 'L2FgapA', 'L2FgapC', 'L2FgapAC', 'EFFgapA', 'EFFgapC', 'EFFgapAC' ],
}
diff --git a/Trigger/TriggerCommon/TriggerMenu/python/menu/StreamInfo.py b/Trigger/TriggerCommon/TriggerMenu/python/menu/StreamInfo.py
index d99e4b018c24d9b58dd48e13a0db1846269f99a0..0e8ddb35f690c39fdec8c4559b447e8253b2b7a0 100644
--- a/Trigger/TriggerCommon/TriggerMenu/python/menu/StreamInfo.py
+++ b/Trigger/TriggerCommon/TriggerMenu/python/menu/StreamInfo.py
@@ -29,7 +29,6 @@ physicsStreams = ['Main',
'MinBiasOverlay',
'UPC',
'UCC',
- 'PC',
'Mistimed',
'ExoDelayed',
'FTK',
@@ -60,7 +59,9 @@ calibStreams = [
'RPCsecondaryreadout',
'IDprescaledL1',
'LArPEB',
- 'L1TopoMismatches'
+ 'L1TopoMismatches',
+ 'PC',
+ 'CC',
]
##NOTE: DataScouting_xx_NAME:
diff --git a/Trigger/TriggerCommon/TriggerMenu/python/minbias/MinBiasDef.py b/Trigger/TriggerCommon/TriggerMenu/python/minbias/MinBiasDef.py
index 222f057a503869f118f66c210b493c44dbff443e..69b3df2e7f9c9c926a79d32e8eeb48b79fb4cbf3 100644
--- a/Trigger/TriggerCommon/TriggerMenu/python/minbias/MinBiasDef.py
+++ b/Trigger/TriggerCommon/TriggerMenu/python/minbias/MinBiasDef.py
@@ -200,7 +200,6 @@ class L2EFChain_MB(L2EFChainDef):
if doVetoSpN:
l2hypo2 = self.chainPart['hypoL2Info']
l2th=l2hypo2.lstrip('vetosp')
- theL2Hypo2 = L2MbSpHypo_veto
theL2Hypo2 = L2MbSpMhNoPixHypo_veto("L2MbSpMhNoPixHypo_veto_"+l2th,float(l2th))
#chainSuffix = chainSuffix+'_vetosp'+l2th
########## EF algos ##################
@@ -303,14 +302,22 @@ class L2EFChain_MB(L2EFChainDef):
self.EFsequenceList += [[['EF_mb_step1'],
[theEFHypo2],
'EF_mb_step2']]
- if 'peb' in self.chainPart['addInfo']:
+ if 'hipeb' in self.chainPart['addInfo']:
+ from TrigDetCalib.TrigDetCalibConfig import TrigSubDetListWriter
+ HISubDetListWriter = TrigSubDetListWriter("HISubDetListWriter")
+ HISubDetListWriter.SubdetId = ['TDAQ_CTP','InnerDetector','FCal','FORWARD_ZDC']
+ HISubDetListWriter.MaxRoIsPerEvent=1
+ self.EFsequenceList += [[['EF_mb_step1'],
+ [ HISubDetListWriter ],
+ 'EF_mb_step2']]
+ elif 'peb' in self.chainPart['addInfo']:
from TrigDetCalib.TrigDetCalibConfig import TrigSubDetListWriter
ALFASubDetListWriter = TrigSubDetListWriter("ALFASubDetListWriter")
ALFASubDetListWriter.SubdetId = ['TDAQ_HLT','TDAQ_CTP','InnerDetector','DBM','FORWARD_ALPHA','FORWARD_LUCID','FORWARD_ZDC','FORWARD_BCM']
ALFASubDetListWriter.MaxRoIsPerEvent=1
self.EFsequenceList += [[['EF_mb_step1'],
[ ALFASubDetListWriter ],
- 'EF_mb_step2']]
+ 'EF_mb_step2']]
########### Signatures ###########
@@ -325,7 +332,7 @@ class L2EFChain_MB(L2EFChainDef):
self.EFsignatureList += [ [['EF_mb_step1']] ]
if doexclusivelooseN:
self.EFsignatureList += [ [['EF_mb_step2']] ]
- if 'peb' in self.chainPart['addInfo']:
+ if 'peb' in self.chainPart['addInfo'] or 'hipeb' in self.chainPart['addInfo']:
self.EFsignatureList += [ [['EF_mb_step2']] ]
self.TErenamingDict = {
@@ -338,7 +345,7 @@ class L2EFChain_MB(L2EFChainDef):
if doVetoSpN:
self.TErenamingDict ['L2_mb_spveto'] = mergeRemovingOverlap('L2_', chainSuffix + '_vetosp')
- if 'peb' in self.chainPart['addInfo']:
+ if 'peb' in self.chainPart['addInfo'] or 'hipeb' in self.chainPart['addInfo']:
self.TErenamingDict ['EF_mb_step2'] = mergeRemovingOverlap('EF_', chainSuffixEF+'_peb')
if doexclusivelooseN:
self.TErenamingDict ['EF_mb_step2'] = mergeRemovingOverlap('EF_', chainSuffixEF+efthX)
diff --git a/Trigger/TriggerCommon/TriggerMenuXML/data/LVL1config_MC_HI_v5.xml b/Trigger/TriggerCommon/TriggerMenuXML/data/LVL1config_MC_HI_v5.xml
index e0fdb91edec7d3c9785c695df14fdaaa32652937..1b7640beae1eb705d84bd89a4cf5bc142e4fd232 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: 299-->
+ <!--No. L1 items defined: 300-->
<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>
@@ -2059,9 +2059,9 @@
<InternalTrigger name="BGRP1"/>
</AND>
</TriggerItem>
- <TriggerItem ctpid="326" partition="1" name="L1_TE500.0ETA49" complex_deadtime="0" definition="(TE500.0ETA49[x1]&BGRP0&BGRP1)" trigger_type="10000100" monitor="LF:000|HF:000">
+ <TriggerItem ctpid="326" partition="1" name="L1_TE600.0ETA49" complex_deadtime="0" definition="(TE600.0ETA49[x1]&BGRP0&BGRP1)" trigger_type="10000100" monitor="LF:000|HF:000">
<AND>
- <TriggerCondition multi="1" name="TE500.0ETA49_x1" triggerthreshold="TE500.0ETA49"/>
+ <TriggerCondition multi="1" name="TE600.0ETA49_x1" triggerthreshold="TE600.0ETA49"/>
<InternalTrigger name="BGRP0"/>
<InternalTrigger name="BGRP1"/>
</AND>
@@ -2108,6 +2108,16 @@
<InternalTrigger name="BGRP1"/>
</AND>
</TriggerItem>
+ <TriggerItem ctpid="334" partition="1" name="L1_TE50_VTE600.0ETA49" 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="335" partition="1" name="L1_TE5_VTE200" complex_deadtime="0" definition="(TE5[x1]&!TE200[x1]&BGRP0&BGRP1)" trigger_type="10000100" monitor="LF:000|HF:000">
<AND>
<TriggerCondition multi="1" name="TE5_x1" triggerthreshold="TE5"/>
@@ -2118,9 +2128,9 @@
<InternalTrigger name="BGRP1"/>
</AND>
</TriggerItem>
- <TriggerItem ctpid="336" partition="1" name="L1_TE500.0ETA49_OVERLAY" complex_deadtime="0" definition="(TE500.0ETA49[x1]&BGRP0&BGRP1)" trigger_type="10000010" monitor="LF:000|HF:000">
+ <TriggerItem ctpid="336" partition="1" name="L1_TE600.0ETA49_OVERLAY" complex_deadtime="0" definition="(TE600.0ETA49[x1]&BGRP0&BGRP1)" trigger_type="10000010" monitor="LF:000|HF:000">
<AND>
- <TriggerCondition multi="1" name="TE500.0ETA49_x1" triggerthreshold="TE500.0ETA49"/>
+ <TriggerCondition multi="1" name="TE600.0ETA49_x1" triggerthreshold="TE600.0ETA49"/>
<InternalTrigger name="BGRP0"/>
<InternalTrigger name="BGRP1"/>
</AND>
@@ -2932,7 +2942,7 @@
<Prescale ctpid="331" cut="000001" value="1"/>
<Prescale ctpid="332" cut="000001" value="1"/>
<Prescale ctpid="333" cut="000001" value="1"/>
- <Prescale ctpid="334" cut="-000001" value="-1"/>
+ <Prescale ctpid="334" cut="000001" value="1"/>
<Prescale ctpid="335" cut="000001" value="1"/>
<Prescale ctpid="336" cut="000001" value="1"/>
<Prescale ctpid="337" cut="000001" value="1"/>
@@ -4606,12 +4616,12 @@
<TriggerCounter name="1TE50" type="CTPMON">
<TriggerCondition name="1TE50" triggerthreshold="TE50" multi="1"/>
</TriggerCounter>
- <TriggerCounter name="1TE500.0ETA49" type="CTPIN">
- <TriggerCondition name="1TE500.0ETA49" triggerthreshold="TE500.0ETA49" multi="1"/>
- </TriggerCounter>
<TriggerCounter name="1TE5000.0ETA49" type="CTPIN">
<TriggerCondition name="1TE5000.0ETA49" triggerthreshold="TE5000.0ETA49" multi="1"/>
</TriggerCounter>
+ <TriggerCounter name="1TE600.0ETA49" type="CTPIN">
+ <TriggerCondition name="1TE600.0ETA49" triggerthreshold="TE600.0ETA49" multi="1"/>
+ </TriggerCounter>
<TriggerCounter name="1TE6500.0ETA49" type="CTPIN">
<TriggerCondition name="1TE6500.0ETA49" triggerthreshold="TE6500.0ETA49" multi="1"/>
</TriggerCounter>
@@ -5808,9 +5818,9 @@
<Signal range_begin="7" range_end="7"/>
</Cable>
</TriggerThreshold>
- <TriggerThreshold active="1" bitnum="1" id="170" mapping="8" name="TE500.0ETA49" type="TE" input="ctpin" version="1">
- <TriggerThresholdValue em_isolation="63" etamin="-49" etamax="49" had_isolation="63" had_veto="63" name="TE500.0ETA49full" phimin="0" phimax="64" priority="0" thresholdval="32767" type="TE" window="0"/>
- <TriggerThresholdValue em_isolation="63" etamin="-49" etamax="49" had_isolation="63" had_veto="63" name="TE500.0ETA49full" phimin="0" phimax="64" priority="1" thresholdval="500" type="TE" window="0"/>
+ <TriggerThreshold active="1" bitnum="1" id="170" mapping="8" name="TE600.0ETA49" type="TE" input="ctpin" version="1">
+ <TriggerThresholdValue em_isolation="63" etamin="-49" etamax="49" had_isolation="63" had_veto="63" name="TE600.0ETA49full" phimin="0" phimax="64" priority="0" thresholdval="32767" type="TE" window="0"/>
+ <TriggerThresholdValue em_isolation="63" etamin="-49" etamax="49" had_isolation="63" had_veto="63" name="TE600.0ETA49full" phimin="0" phimax="64" priority="1" thresholdval="600" type="TE" window="0"/>
<Cable connector="CON3" input="SLOT8" name="EN2">
<Signal range_begin="0" range_end="0"/>
</Cable>
diff --git a/Trigger/TriggerCommon/TriggerMenuXML/data/LVL1config_Physics_HI_v5.xml b/Trigger/TriggerCommon/TriggerMenuXML/data/LVL1config_Physics_HI_v5.xml
index 65d301a42d0dcfca5033bd93ca5ed5073899be66..2d181aacf470bcfaab9a3461a5418425c25313df 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: 299-->
+ <!--No. L1 items defined: 300-->
<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>
@@ -2059,9 +2059,9 @@
<InternalTrigger name="BGRP1"/>
</AND>
</TriggerItem>
- <TriggerItem ctpid="326" partition="1" name="L1_TE500.0ETA49" complex_deadtime="0" definition="(TE500.0ETA49[x1]&BGRP0&BGRP1)" trigger_type="10000100" monitor="LF:000|HF:000">
+ <TriggerItem ctpid="326" partition="1" name="L1_TE600.0ETA49" complex_deadtime="0" definition="(TE600.0ETA49[x1]&BGRP0&BGRP1)" trigger_type="10000100" monitor="LF:000|HF:000">
<AND>
- <TriggerCondition multi="1" name="TE500.0ETA49_x1" triggerthreshold="TE500.0ETA49"/>
+ <TriggerCondition multi="1" name="TE600.0ETA49_x1" triggerthreshold="TE600.0ETA49"/>
<InternalTrigger name="BGRP0"/>
<InternalTrigger name="BGRP1"/>
</AND>
@@ -2108,6 +2108,16 @@
<InternalTrigger name="BGRP1"/>
</AND>
</TriggerItem>
+ <TriggerItem ctpid="334" partition="1" name="L1_TE50_VTE600.0ETA49" 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="335" partition="1" name="L1_TE5_VTE200" complex_deadtime="0" definition="(TE5[x1]&!TE200[x1]&BGRP0&BGRP1)" trigger_type="10000100" monitor="LF:000|HF:000">
<AND>
<TriggerCondition multi="1" name="TE5_x1" triggerthreshold="TE5"/>
@@ -2118,9 +2128,9 @@
<InternalTrigger name="BGRP1"/>
</AND>
</TriggerItem>
- <TriggerItem ctpid="336" partition="1" name="L1_TE500.0ETA49_OVERLAY" complex_deadtime="0" definition="(TE500.0ETA49[x1]&BGRP0&BGRP1)" trigger_type="10000010" monitor="LF:000|HF:000">
+ <TriggerItem ctpid="336" partition="1" name="L1_TE600.0ETA49_OVERLAY" complex_deadtime="0" definition="(TE600.0ETA49[x1]&BGRP0&BGRP1)" trigger_type="10000010" monitor="LF:000|HF:000">
<AND>
- <TriggerCondition multi="1" name="TE500.0ETA49_x1" triggerthreshold="TE500.0ETA49"/>
+ <TriggerCondition multi="1" name="TE600.0ETA49_x1" triggerthreshold="TE600.0ETA49"/>
<InternalTrigger name="BGRP0"/>
<InternalTrigger name="BGRP1"/>
</AND>
@@ -2932,7 +2942,7 @@
<Prescale ctpid="331" cut="000001" value="1"/>
<Prescale ctpid="332" cut="000001" value="1"/>
<Prescale ctpid="333" cut="000001" value="1"/>
- <Prescale ctpid="334" cut="-000001" value="-1"/>
+ <Prescale ctpid="334" cut="000001" value="1"/>
<Prescale ctpid="335" cut="000001" value="1"/>
<Prescale ctpid="336" cut="000001" value="1"/>
<Prescale ctpid="337" cut="000001" value="1"/>
@@ -4606,12 +4616,12 @@
<TriggerCounter name="1TE50" type="CTPMON">
<TriggerCondition name="1TE50" triggerthreshold="TE50" multi="1"/>
</TriggerCounter>
- <TriggerCounter name="1TE500.0ETA49" type="CTPIN">
- <TriggerCondition name="1TE500.0ETA49" triggerthreshold="TE500.0ETA49" multi="1"/>
- </TriggerCounter>
<TriggerCounter name="1TE5000.0ETA49" type="CTPIN">
<TriggerCondition name="1TE5000.0ETA49" triggerthreshold="TE5000.0ETA49" multi="1"/>
</TriggerCounter>
+ <TriggerCounter name="1TE600.0ETA49" type="CTPIN">
+ <TriggerCondition name="1TE600.0ETA49" triggerthreshold="TE600.0ETA49" multi="1"/>
+ </TriggerCounter>
<TriggerCounter name="1TE6500.0ETA49" type="CTPIN">
<TriggerCondition name="1TE6500.0ETA49" triggerthreshold="TE6500.0ETA49" multi="1"/>
</TriggerCounter>
@@ -5808,9 +5818,9 @@
<Signal range_begin="7" range_end="7"/>
</Cable>
</TriggerThreshold>
- <TriggerThreshold active="1" bitnum="1" id="170" mapping="8" name="TE500.0ETA49" type="TE" input="ctpin" version="1">
- <TriggerThresholdValue em_isolation="63" etamin="-49" etamax="49" had_isolation="63" had_veto="63" name="TE500.0ETA49full" phimin="0" phimax="64" priority="0" thresholdval="32767" type="TE" window="0"/>
- <TriggerThresholdValue em_isolation="63" etamin="-49" etamax="49" had_isolation="63" had_veto="63" name="TE500.0ETA49full" phimin="0" phimax="64" priority="1" thresholdval="500" type="TE" window="0"/>
+ <TriggerThreshold active="1" bitnum="1" id="170" mapping="8" name="TE600.0ETA49" type="TE" input="ctpin" version="1">
+ <TriggerThresholdValue em_isolation="63" etamin="-49" etamax="49" had_isolation="63" had_veto="63" name="TE600.0ETA49full" phimin="0" phimax="64" priority="0" thresholdval="32767" type="TE" window="0"/>
+ <TriggerThresholdValue em_isolation="63" etamin="-49" etamax="49" had_isolation="63" had_veto="63" name="TE600.0ETA49full" phimin="0" phimax="64" priority="1" thresholdval="600" type="TE" window="0"/>
<Cable connector="CON3" input="SLOT8" name="EN2">
<Signal range_begin="0" range_end="0"/>
</Cable>