Commit 56b711d1 authored by Sara Alderweireldt's avatar Sara Alderweireldt
Browse files

Merge branch 'TM-august13' into '21.1'

ATR-16442: Fix for L1_MU4_TE10  in pp_v7

See merge request !4009

Former-commit-id: 110228890d0323537fcce6f663ba7c13fa4d2688
parents 8d5adb03 708799f5
......@@ -249,7 +249,7 @@ class ItemDef:
LVL1MenuItem('L1_MU0_TE50' ).setLogic( MU0 & TE50 & physcond).setTriggerType(TT.muon) # noqa: F821
LVL1MenuItem('L1_MU4_TE10' ).setLogic( MU4 & TE50 & physcond).setTriggerType(TT.muon) # noqa: F821
LVL1MenuItem('L1_MU4_TE10' ).setLogic( MU4 & TE10 & physcond).setTriggerType(TT.muon) # noqa: F821
LVL1MenuItem('L1_MU4_TE50' ).setLogic( MU4 & TE50 & physcond).setTriggerType(TT.muon) # noqa: F821
LVL1MenuItem('L1_MU4_TE70' ).setLogic( MU4 & TE70 & physcond).setTriggerType(TT.muon) # noqa: F821
LVL1MenuItem('L1_MU4_TE90' ).setLogic( MU4 & TE90 & physcond).setTriggerType(TT.muon) # noqa: F821
......
......@@ -3789,10 +3789,10 @@
<InternalTrigger name="BGRP5"/>
</AND>
</TriggerItem>
<TriggerItem ctpid="470" partition="1" name="L1_MU4_TE10" complex_deadtime="0" definition="(MU4[x1]&amp;TE50[x1]&amp;BGRP0&amp;BGRP1)" trigger_type="10001000" monitor="LF:000|HF:000">
<TriggerItem ctpid="470" partition="1" name="L1_MU4_TE10" complex_deadtime="0" definition="(MU4[x1]&amp;TE10[x1]&amp;BGRP0&amp;BGRP1)" trigger_type="10001000" monitor="LF:000|HF:000">
<AND>
<TriggerCondition multi="1" name="MU4_x1" triggerthreshold="MU4"/>
<TriggerCondition multi="1" name="TE50_x1" triggerthreshold="TE50"/>
<TriggerCondition multi="1" name="TE10_x1" triggerthreshold="TE10"/>
<InternalTrigger name="BGRP0"/>
<InternalTrigger name="BGRP1"/>
</AND>
......
......@@ -3803,10 +3803,10 @@
<InternalTrigger name="BGRP5"/>
</AND>
</TriggerItem>
<TriggerItem ctpid="470" partition="1" name="L1_MU4_TE10" complex_deadtime="0" definition="(MU4[x1]&amp;TE50[x1]&amp;BGRP0&amp;BGRP1)" trigger_type="10001000" monitor="LF:000|HF:000">
<TriggerItem ctpid="470" partition="1" name="L1_MU4_TE10" complex_deadtime="0" definition="(MU4[x1]&amp;TE10[x1]&amp;BGRP0&amp;BGRP1)" trigger_type="10001000" monitor="LF:000|HF:000">
<AND>
<TriggerCondition multi="1" name="MU4_x1" triggerthreshold="MU4"/>
<TriggerCondition multi="1" name="TE50_x1" triggerthreshold="TE50"/>
<TriggerCondition multi="1" name="TE10_x1" triggerthreshold="TE10"/>
<InternalTrigger name="BGRP0"/>
<InternalTrigger name="BGRP1"/>
</AND>
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment