Skip to content
Snippets Groups Projects
Commit 1abc8065 authored by Davide Gerbaudo's avatar Davide Gerbaudo
Browse files

Merge branch 'TM-June1_MuonFix' into '21.1' 

ATR-16428, fixing L1_MU21 seed definition

See merge request !2420
parents 8220354c a48b8142
No related merge requests found
Expand all Hide whitespace changes
Inline Side-by-side
Showing
with 187 additions and 194 deletions
Trigger/TriggerCommon/TriggerMenu/python/l1menu/ItemDef.py
+ 3
− 3
View file @ 1abc8065
......@@ -209,7 +209,7 @@ class ItemDef:
LVL1MenuItem('L1_MU11' ).setLogic( MU11 & physcond).setTriggerType(TT.muon) # noqa: F821
LVL1MenuItem('L1_MU15' ).setLogic( MU15 & physcond).setTriggerType(TT.muon) # noqa: F821
LVL1MenuItem('L1_MU20' ).setLogic( MU20 & physcond).setTriggerType(TT.muon) # noqa: F821
LVL1MenuItem('L1_MU21' ).setLogic( (MU20 | MU21) & physcond).setTriggerType(TT.muon) # noqa: F821
LVL1MenuItem('L1_MU21' ).setLogic( MU21 & physcond).setTriggerType(TT.muon) # noqa: F821
# 2xMU, 3xMU, 4xMU
LVL1MenuItem('L1_2MU0' ).setLogic( MU0.x(2) & physcond).setTriggerType(TT.muon) # noqa: F821
......@@ -292,13 +292,13 @@ class ItemDef:
LVL1MenuItem('L1_2MU6_FIRSTEMPTY' ).setLogic(MU6.x(2) & firstempty).setTriggerType( TT.muon ) # noqa: F821
LVL1MenuItem('L1_MU20_FIRSTEMPTY' ).setLogic( MU20 & firstempty).setTriggerType(TT.muon) # noqa: F821
LVL1MenuItem('L1_MU21_FIRSTEMPTY' ).setLogic( (MU20 | MU21) & firstempty).setTriggerType(TT.muon) # noqa: F821
LVL1MenuItem('L1_MU21_FIRSTEMPTY' ).setLogic( MU21 & firstempty).setTriggerType(TT.muon) # noqa: F821
#FTK items
LVL1MenuItem('L1_MU6_FTK').setLogic( MU6 & physcond).setTriggerType(TT.ftk) # noqa: F821
LVL1MenuItem('L1_MU15_FTK').setLogic( MU15 & physcond).setTriggerType(TT.ftk) # noqa: F821
LVL1MenuItem('L1_MU20_FTK').setLogic( MU20 & physcond).setTriggerType(TT.ftk) # noqa: F821
LVL1MenuItem('L1_MU21_FTK').setLogic( (MU20 | MU21) & physcond).setTriggerType(TT.ftk) # noqa: F821
LVL1MenuItem('L1_MU21_FTK').setLogic( MU21 & physcond).setTriggerType(TT.ftk) # noqa: F821
# EM and MU
LVL1MenuItem('L1_EM6_MU10' ).setLogic( EM6 & MU10 & physcond).setTriggerType(TT.muon) # noqa: F821
......
Trigger/TriggerCommon/TriggerMenu/python/menu/L1Seeds.py
+ 9
− 0
View file @ 1abc8065
......@@ -339,6 +339,15 @@ def getSpecificL1Seeds(l1seedname, l1itemobject):
elif (l1seedname in ['L1_Muon', 'L1_Muon_EMPTY']):
L1Seed = getL1MuonSeed(l1seedname, l1itemobject)
elif (l1seedname == 'L1_MU20MU21'):
L1Seed = 'L1_MU20,L1_MU21'
elif (l1seedname == 'L1_MU20MU21_FIRSTEMPTY'):
L1Seed = 'L1_MU20_FIRSTEMPTY,L1_MU21_FIRSTEMPTY'
elif (l1seedname == 'L1_MU20MU21_FTK'):
L1Seed = 'L1_MU20_FTK,L1_MU21_FTK'
elif (l1seedname == 'L1_TAU'):
L1Seed = getL1TauSeed(l1items)
......
Trigger/TriggerCommon/TriggerMenuXML/data/LVL1config_MC_pp_v7.xml
+ 6
− 15
View file @ 1abc8065
......@@ -126,12 +126,9 @@
<InternalTrigger name="BGRP1"/>
</AND>
</TriggerItem>
<TriggerItem ctpid="17" partition="1" name="L1_MU21" complex_deadtime="0" definition="((MU20[x1]|MU21[x1])&amp;BGRP0&amp;BGRP1)" trigger_type="10001000" monitor="LF:000|HF:000">
<TriggerItem ctpid="17" partition="1" name="L1_MU21" complex_deadtime="0" definition="(MU21[x1]&amp;BGRP0&amp;BGRP1)" trigger_type="10001000" monitor="LF:000|HF:000">
<AND>
<OR>
<TriggerCondition multi="1" name="MU20_x1" triggerthreshold="MU20"/>
<TriggerCondition multi="1" name="MU21_x1" triggerthreshold="MU21"/>
</OR>
<TriggerCondition multi="1" name="MU21_x1" triggerthreshold="MU21"/>
<InternalTrigger name="BGRP0"/>
<InternalTrigger name="BGRP1"/>
</AND>
......@@ -3246,12 +3243,9 @@
<InternalTrigger name="BGRP9"/>
</AND>
</TriggerItem>
<TriggerItem ctpid="406" partition="1" name="L1_MU21_FIRSTEMPTY" complex_deadtime="0" definition="((MU20[x1]|MU21[x1])&amp;BGRP0&amp;BGRP6)" trigger_type="10001000" monitor="LF:000|HF:000">
<TriggerItem ctpid="406" partition="1" name="L1_MU21_FIRSTEMPTY" complex_deadtime="0" definition="(MU21[x1]&amp;BGRP0&amp;BGRP6)" trigger_type="10001000" monitor="LF:000|HF:000">
<AND>
<OR>
<TriggerCondition multi="1" name="MU20_x1" triggerthreshold="MU20"/>
<TriggerCondition multi="1" name="MU21_x1" triggerthreshold="MU21"/>
</OR>
<TriggerCondition multi="1" name="MU21_x1" triggerthreshold="MU21"/>
<InternalTrigger name="BGRP0"/>
<InternalTrigger name="BGRP6"/>
</AND>
......@@ -3895,12 +3889,9 @@
<InternalTrigger name="BGRP0"/>
</AND>
</TriggerItem>
<TriggerItem ctpid="497" partition="1" name="L1_MU21_FTK" complex_deadtime="0" definition="((MU20[x1]|MU21[x1])&amp;BGRP0&amp;BGRP1)" trigger_type="10100000" monitor="LF:000|HF:000">
<TriggerItem ctpid="497" partition="1" name="L1_MU21_FTK" complex_deadtime="0" definition="(MU21[x1]&amp;BGRP0&amp;BGRP1)" trigger_type="10100000" monitor="LF:000|HF:000">
<AND>
<OR>
<TriggerCondition multi="1" name="MU20_x1" triggerthreshold="MU20"/>
<TriggerCondition multi="1" name="MU21_x1" triggerthreshold="MU21"/>
</OR>
<TriggerCondition multi="1" name="MU21_x1" triggerthreshold="MU21"/>
<InternalTrigger name="BGRP0"/>
<InternalTrigger name="BGRP1"/>
</AND>
......
Trigger/TriggerCommon/TriggerMenuXML/data/LVL1config_Physics_pp_v7.xml
+ 6
− 15
View file @ 1abc8065
......@@ -126,12 +126,9 @@
<InternalTrigger name="BGRP1"/>
</AND>
</TriggerItem>
<TriggerItem ctpid="17" partition="1" name="L1_MU21" complex_deadtime="0" definition="((MU20[x1]|MU21[x1])&amp;BGRP0&amp;BGRP1)" trigger_type="10001000" monitor="LF:000|HF:000">
<TriggerItem ctpid="17" partition="1" name="L1_MU21" complex_deadtime="0" definition="(MU21[x1]&amp;BGRP0&amp;BGRP1)" trigger_type="10001000" monitor="LF:000|HF:000">
<AND>
<OR>
<TriggerCondition multi="1" name="MU20_x1" triggerthreshold="MU20"/>
<TriggerCondition multi="1" name="MU21_x1" triggerthreshold="MU21"/>
</OR>
<TriggerCondition multi="1" name="MU21_x1" triggerthreshold="MU21"/>
<InternalTrigger name="BGRP0"/>
<InternalTrigger name="BGRP1"/>
</AND>
......@@ -3246,12 +3243,9 @@
<InternalTrigger name="BGRP9"/>
</AND>
</TriggerItem>
<TriggerItem ctpid="406" partition="1" name="L1_MU21_FIRSTEMPTY" complex_deadtime="0" definition="((MU20[x1]|MU21[x1])&amp;BGRP0&amp;BGRP6)" trigger_type="10001000" monitor="LF:000|HF:000">
<TriggerItem ctpid="406" partition="1" name="L1_MU21_FIRSTEMPTY" complex_deadtime="0" definition="(MU21[x1]&amp;BGRP0&amp;BGRP6)" trigger_type="10001000" monitor="LF:000|HF:000">
<AND>
<OR>
<TriggerCondition multi="1" name="MU20_x1" triggerthreshold="MU20"/>
<TriggerCondition multi="1" name="MU21_x1" triggerthreshold="MU21"/>
</OR>
<TriggerCondition multi="1" name="MU21_x1" triggerthreshold="MU21"/>
<InternalTrigger name="BGRP0"/>
<InternalTrigger name="BGRP6"/>
</AND>
......@@ -3909,12 +3903,9 @@
<InternalTrigger name="BGRP0"/>
</AND>
</TriggerItem>
<TriggerItem ctpid="497" partition="1" name="L1_MU21_FTK" complex_deadtime="0" definition="((MU20[x1]|MU21[x1])&amp;BGRP0&amp;BGRP1)" trigger_type="10100000" monitor="LF:000|HF:000">
<TriggerItem ctpid="497" partition="1" name="L1_MU21_FTK" complex_deadtime="0" definition="(MU21[x1]&amp;BGRP0&amp;BGRP1)" trigger_type="10100000" monitor="LF:000|HF:000">
<AND>
<OR>
<TriggerCondition multi="1" name="MU20_x1" triggerthreshold="MU20"/>
<TriggerCondition multi="1" name="MU21_x1" triggerthreshold="MU21"/>
</OR>
<TriggerCondition multi="1" name="MU21_x1" triggerthreshold="MU21"/>
<InternalTrigger name="BGRP0"/>
<InternalTrigger name="BGRP1"/>
</AND>
......
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