diff --git a/Trigger/TriggerCommon/TriggerMenu/python/l1menu/ItemDef.py b/Trigger/TriggerCommon/TriggerMenu/python/l1menu/ItemDef.py index 917062c23b852421ec3762aa5fd60255501c2445..acffc7f3d2a745f31d002c1f09371434cfc323b4 100755 --- a/Trigger/TriggerCommon/TriggerMenu/python/l1menu/ItemDef.py +++ b/Trigger/TriggerCommon/TriggerMenu/python/l1menu/ItemDef.py @@ -1014,6 +1014,7 @@ class ItemDef: LVL1MenuItem('L1_RD0_UNPAIRED_ISO' ).setLogic( RNDM0 & unpaired_isocond ).setTriggerType(TT.rand) # noqa: F821 LVL1MenuItem('L1_RD0_FIRSTEMPTY' ).setLogic( RNDM0 & firstempty ).setTriggerType(TT.rand) # noqa: F821 LVL1MenuItem('L1_RD0_BGRP9' ).setLogic( RNDM0 & bgrp9cond ).setTriggerType(TT.rand) # noqa: F821 + LVL1MenuItem('L1_RD0_BGRP10' ).setLogic( RNDM0 & alfacalib ).setTriggerType(TT.rand) # noqa: F821 LVL1MenuItem('L1_RD0_BGRP11' ).setLogic( RNDM0 & bgrp11cond ).setTriggerType(TT.rand) # noqa: F821 LVL1MenuItem('L1_RD0_ABORTGAPNOTCALIB').setLogic( RNDM0 & abortgap ).setTriggerType(TT.rand) # noqa: F821 diff --git a/Trigger/TriggerCommon/TriggerMenu/python/l1menu/Menu_MC_pp_v7.py b/Trigger/TriggerCommon/TriggerMenu/python/l1menu/Menu_MC_pp_v7.py index ae407d14853f176d91f712ed47270ca67873bfb0..98b11b7eeae02307e925281c860d4a1aff520315 100644 --- a/Trigger/TriggerCommon/TriggerMenu/python/l1menu/Menu_MC_pp_v7.py +++ b/Trigger/TriggerCommon/TriggerMenu/python/l1menu/Menu_MC_pp_v7.py @@ -559,7 +559,7 @@ def defineMenu(): "L1_RD2_FILLED","L1_RD2_EMPTY","L1_RD2_BGRP12", "L1_RD3_FILLED","L1_RD3_EMPTY", 'L1_RD0_FIRSTEMPTY', - 'L1_RD0_BGRP9', 'L1_RD0_BGRP11', 'L1_RD0_ABORTGAPNOTCALIB', + 'L1_RD0_BGRP9', 'L1_RD0_BGRP10', 'L1_RD0_BGRP11', 'L1_RD0_ABORTGAPNOTCALIB', #LUCID 'L1_LUCID', 'L1_LUCID_EMPTY', 'L1_LUCID_UNPAIRED_ISO', @@ -916,7 +916,7 @@ def defineMenu(): #CTP IDs are taken from this mapping. Every L1 item needs a unique ctpid. -#Free CTP IDs (2017-08-18) are: 473-478, +#Free CTP IDs (2017-08-27) are: 474-478, # 463-464 are reserved for L1_RD2_BGRP14 and L1_RD3_BGRP15 (in MC_Physics_pp_v7) # 509-511 are reserved for CALREQ @@ -1256,6 +1256,7 @@ def defineMenu(): 'L1_RD3_EMPTY' : 208, 'L1_RD0_FIRSTEMPTY' : 209, 'L1_RD0_BGRP9' : 210, + 'L1_RD0_BGRP10' : 473, 'L1_RD0_BGRP11' : 211, 'L1_LUCID' : 212, 'L1_LUCID_EMPTY' : 213, diff --git a/Trigger/TriggerCommon/TriggerMenu/python/menu/Physics_pp_v7.py b/Trigger/TriggerCommon/TriggerMenu/python/menu/Physics_pp_v7.py index 5c8194e80202cb9f367bf00411e3cc60b48629cb..13d3eba42373c60f228b6b250302ce9f1edc9628 100644 --- a/Trigger/TriggerCommon/TriggerMenu/python/menu/Physics_pp_v7.py +++ b/Trigger/TriggerCommon/TriggerMenu/python/menu/Physics_pp_v7.py @@ -3523,11 +3523,11 @@ def setupMenu(): ['lumipeb_vdm_L1MBTS_2_UNPAIRED_ISO', 'L1_MBTS_2_UNPAIRED_ISO', [], ['VdM'], ["RATE:Calibration", "BW:Detector"], -1], ['lumipeb_vdm_L1RD0_UNPAIRED_ISO', 'L1_RD0_UNPAIRED_ISO', [], ['VdM'], ["RATE:Calibration", "BW:Detector"], -1], ['lumipeb_vdm_L1RD2_BGRP12', 'L1_RD2_BGRP12', [], ['VdM'], ["RATE:Calibration", "BW:Detector"], -1], + ['lumipeb_vdm_L1RD0_BGRP10', 'L1_RD0_BGRP10', [], ['VdM'], ["RATE:Calibration", "BW:Detector"], -1], ['lumipeb_vdm_L1MBTS_1', 'L1_MBTS_1', [], ['VdM'], ["RATE:Calibration", "BW:Detector"], -1], ['lumipeb_vdm_L1MBTS_2', 'L1_MBTS_2', [], ['VdM'], ["RATE:Calibration", "BW:Detector"], -1], ['lumipeb_vdm_L1RD0_FILLED', 'L1_RD0_FILLED', [], ['VdM'], ["RATE:Calibration", "BW:Detector"], -1], - ['lumipeb_vdm_L1RD0_FIRSTEMPTY', 'L1_RD0_FIRSTEMPTY', [], ['VdM'], ["RATE:Calibration", "BW:Detector"], -1], ['lumipeb_vdm_L1MBTS_2_LUCID', 'L1_MBTS_2,L1_LUCID', [], ['VdM'], ["RATE:Calibration", "BW:Detector"], -1], diff --git a/Trigger/TriggerCommon/TriggerMenuXML/data/LVL1config_MC_pp_v7.xml b/Trigger/TriggerCommon/TriggerMenuXML/data/LVL1config_MC_pp_v7.xml index 482e21dc7b94e52a7cae141bf7d948122c27e63f..f5b92c8044654aa8c69dd9258e1cdbeb5d77502a 100644 --- a/Trigger/TriggerCommon/TriggerMenuXML/data/LVL1config_MC_pp_v7.xml +++ b/Trigger/TriggerCommon/TriggerMenuXML/data/LVL1config_MC_pp_v7.xml @@ -3,7 +3,7 @@ <LVL1Config name="MC_pp_v7" ctpVersion="4" l1Version="1"> <!--File is generated by TriggerMenu--> <!--No. L1 thresholds defined: 287--> - <!--No. L1 items defined: 502--> + <!--No. L1 items defined: 503--> <TriggerMenu name="MC_pp_v7" phase="lumi"> <TriggerItem ctpid="0" partition="1" name="L1_EM3" complex_deadtime="0" definition="(EM3[x1]&BGRP0&BGRP1)" trigger_type="10000100" monitor="LF:000|HF:000"> <AND> @@ -3817,6 +3817,13 @@ <InternalTrigger name="BGRP11"/> </AND> </TriggerItem> + <TriggerItem ctpid="473" partition="1" name="L1_RD0_BGRP10" complex_deadtime="0" definition="(RNDM0&BGRP0&BGRP10)" trigger_type="10000001" monitor="LF:000|HF:000"> + <AND> + <InternalTrigger name="RNDM0"/> + <InternalTrigger name="BGRP0"/> + <InternalTrigger name="BGRP10"/> + </AND> + </TriggerItem> <TriggerItem ctpid="479" partition="1" name="L1_2TAU20IM_J25_3J20" complex_deadtime="0" definition="(HA20IM[x2]&J25[x1]&J20[x3]&BGRP0&BGRP1)" trigger_type="10000100" monitor="LF:000|HF:000"> <AND> <TriggerCondition multi="2" name="HA20IM_x2" triggerthreshold="HA20IM"/> @@ -4523,7 +4530,7 @@ <Prescale ctpid="470" cut="000001" value="1"/> <Prescale ctpid="471" cut="000001" value="1"/> <Prescale ctpid="472" cut="000001" value="1"/> - <Prescale ctpid="473" cut="-000001" value="-1"/> + <Prescale ctpid="473" cut="000001" value="1"/> <Prescale ctpid="474" cut="-000001" value="-1"/> <Prescale ctpid="475" cut="-000001" value="-1"/> <Prescale ctpid="476" cut="-000001" value="-1"/> diff --git a/Trigger/TriggerCommon/TriggerMenuXML/data/LVL1config_Physics_pp_v7.xml b/Trigger/TriggerCommon/TriggerMenuXML/data/LVL1config_Physics_pp_v7.xml index 722bf6879ae560f519180dd7fbd254e08fb8c953..4eae530d0ba48ad5cbe04f57b90f9113765bbc02 100644 --- a/Trigger/TriggerCommon/TriggerMenuXML/data/LVL1config_Physics_pp_v7.xml +++ b/Trigger/TriggerCommon/TriggerMenuXML/data/LVL1config_Physics_pp_v7.xml @@ -3,7 +3,7 @@ <LVL1Config name="Physics_pp_v7" ctpVersion="4" l1Version="1"> <!--File is generated by TriggerMenu--> <!--No. L1 thresholds defined: 287--> - <!--No. L1 items defined: 504--> + <!--No. L1 items defined: 505--> <TriggerMenu name="Physics_pp_v7" phase="lumi"> <TriggerItem ctpid="0" partition="1" name="L1_EM3" complex_deadtime="0" definition="(EM3[x1]&BGRP0&BGRP1)" trigger_type="10000100" monitor="LF:000|HF:000"> <AND> @@ -3831,6 +3831,13 @@ <InternalTrigger name="BGRP11"/> </AND> </TriggerItem> + <TriggerItem ctpid="473" partition="1" name="L1_RD0_BGRP10" complex_deadtime="0" definition="(RNDM0&BGRP0&BGRP10)" trigger_type="10000001" monitor="LF:000|HF:000"> + <AND> + <InternalTrigger name="RNDM0"/> + <InternalTrigger name="BGRP0"/> + <InternalTrigger name="BGRP10"/> + </AND> + </TriggerItem> <TriggerItem ctpid="479" partition="1" name="L1_2TAU20IM_J25_3J20" complex_deadtime="0" definition="(HA20IM[x2]&J25[x1]&J20[x3]&BGRP0&BGRP1)" trigger_type="10000100" monitor="LF:000|HF:000"> <AND> <TriggerCondition multi="2" name="HA20IM_x2" triggerthreshold="HA20IM"/> @@ -4537,7 +4544,7 @@ <Prescale ctpid="470" cut="000001" value="1"/> <Prescale ctpid="471" cut="000001" value="1"/> <Prescale ctpid="472" cut="000001" value="1"/> - <Prescale ctpid="473" cut="-000001" value="-1"/> + <Prescale ctpid="473" cut="000001" value="1"/> <Prescale ctpid="474" cut="-000001" value="-1"/> <Prescale ctpid="475" cut="-000001" value="-1"/> <Prescale ctpid="476" cut="-000001" value="-1"/>