Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
atlas
athena
Commits
7c0cd7ea
Commit
7c0cd7ea
authored
Jan 28, 2021
by
Malik Aliev
Committed by
Frank Winklmeier
Jan 28, 2021
Browse files
Replace '.' with 'p' in L1 items names
parent
d9606f5b
Changes
25
Expand all
Hide whitespace changes
Inline
Side-by-side
Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/CalibCosmicMon/EnhancedBiasChainConfiguration.py
View file @
7c0cd7ea
...
...
@@ -16,64 +16,39 @@ log = logging.getLogger("TriggerMenuMT.HLTMenuConfig.CalibCosmicMon.EnhancedBias
l1seeds
=
{
'low'
:
\
[
'L1_2EM7'
,
\
'L1_EM10VH'
,
\
#'L1_EM12_2EM3',\
'L1_EM12_XS20'
,
\
'L1_J15
.
31ETA49'
,
\
'L1_J15
p
31ETA49'
,
\
'L1_J30'
,
\
'L1_J30
.
0ETA49_2J20
.
0ETA49'
,
\
'L1_J30
p
0ETA49_2J20
p
0ETA49'
,
\
'L1_JPSI-1M5-EM7'
,
\
'L1_MU10'
,
\
#'L1_TAU20',\
'L1_ZB'
],
\
'medium'
:
\
[
#'L1_2EM10VH',\
[
'L1_2EM15'
,
\
#'L1_2EM8I_J50',\
'L1_2MU4'
,
\
#'L1_2TAU20IM_3J20',\
#'L1_3J15',\
#'L1_AFP_A_AND_C_SPECTOF_J50',\
#'L1_BPH-2M9-2MU6_BPH-2DR15-2MU6',\
#'L1_BPH-2M9-MU6MU4_BPH-0DR15-MU6MU4',\
#'L1_BPH-8M15-2MU6_BPH-0DR22-2MU6',\
#'L1_BPH-8M15-MU6MU4_BPH-0DR22-MU6MU4',\
#'L1_BTAG-MU4J15',\
#'L1_DR-MU10TAU12I',\
'L1_DR-TAU20ITAU12I'
,
\
#'L1_DR25-TAU20ITAU12I',\
'L1_DY-BOX-2MU6'
,
\
#'L1_DY-DR-2MU4',\
#'L1_EM15I_MU4',\
'L1_EM15VHI_2TAU12IM_J25_3J12'
,
\
#'L1_EM15VH_3EM7',\
'L1_EM15_XS30'
,
\
'L1_EM18VHI'
,
\
'L1_EM20VH'
,
\
'L1_EM7_MU10'
,
\
#'L1_HT190-J15.ETA21',\
'L1_J30.31ETA49'
,
\
#'L1_J4-MATCH',\
'L1_J40.0ETA25_2J15.31ETA49'
,
\
#'L1_J40_DPHI-J20XE50',\
'L1_J30p31ETA49'
,
\
'L1_J40p0ETA25_2J15p31ETA49'
,
\
'L1_J50'
,
\
'L1_J50_DETA20-J50J'
,
\
'L1_JPSI-1M5-EM12'
,
\
'L1_LFV-EM15I'
,
\
'L1_LFV-EM8I'
,
\
'L1_LFV-MU6'
,
\
#'L1_MJJ-400',\
'L1_MU10_TAU12IM'
,
\
'L1_MU6_J20'
,
\
'L1_MU6_J30.0ETA49_2J20.0ETA49'
,
\
#'L1_MU6_MJJ-200',\
'L1_MU6_J30p0ETA49_2J20p0ETA49'
,
\
'L1_TAU20IM_2TAU12IM_J25_2J20_3J12'
,
\
'L1_TAU20IM_2TAU12IM_XE35'
,
\
#'L1_TAU20_2TAU12',\
'L1_TAU40'
,
\
'L1_XE35'
,
#'L1_BPH-0DR3-EM7J15_2MU4',
#'L1_BPH-0DR3-EM7J15_MU6',
#'L1_BPH-0M9-EM7-EM5_MU6'
]
}
def
enhancedBiasAthSequence
(
ConfigFlags
):
...
...
Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/DictFromChainName.py
View file @
7c0cd7ea
...
...
@@ -69,7 +69,7 @@ def getL1item(chainName):
#replace the '_' left-closest-to ETA by '.' so that L1J75_31ETA49 becomes L1J75.31ETA49
if
'ETA'
in
mainL1
:
r
=
re
.
compile
(
"_(?P<eta>..ETA..)"
)
mainL1
=
r
.
sub
(
"
.
\\
g<eta>"
,
mainL1
)
mainL1
=
r
.
sub
(
"
p
\\
g<eta>"
,
mainL1
)
return
mainL1
def
getAllThresholdsFromItem
(
item
):
...
...
Trigger/TriggerCommon/TriggerMenuMT/python/L1/Base/Thresholds.py
View file @
7c0cd7ea
...
...
@@ -124,7 +124,7 @@ class Threshold( object ):
def
getVarName
(
self
):
"""returns a string that can be used as a varname"""
return
self
.
name
.
replace
(
'
.
'
,
''
)
return
self
.
name
.
replace
(
'
p
'
,
''
)
def
isLegacy
(
self
):
return
self
.
run
==
2
...
...
Trigger/TriggerCommon/TriggerMenuMT/python/L1/Config/ItemDef.py
View file @
7c0cd7ea
This diff is collapsed.
Click to expand it.
Trigger/TriggerCommon/TriggerMenuMT/python/L1/Config/MonitorDef.py
View file @
7c0cd7ea
...
...
@@ -71,9 +71,9 @@ class MonitorDef:
cThr
=
{}
cThr
[
1
]
=
[
'AFP_FSA_SIT'
,
'AFP_FSA_TOF'
,
'AFP_FSC_SIT'
,
'AFP_FSC_TOF'
,
'AFP_NSA'
,
'AFP_NSC'
,
'BPTX0'
,
'BPTX1'
,
'LUCID_C'
,
'J20'
,
'MU4'
,
'TE50'
,
'XE35'
,
'XE60'
,
'MBTS_A0'
,
'MBTS_A1'
,
'MBTS_A2'
,
'MBTS_A3'
,
'MBTS_A4'
,
'MBTS_A5'
,
'MBTS_A6'
,
'MBTS_A7'
,
'MBTS_A0'
,
'MBTS_A1'
,
'MBTS_A2'
,
'MBTS_A3'
,
'MBTS_A4'
,
'MBTS_A5'
,
'MBTS_A6'
,
'MBTS_A7'
,
'MBTS_A8'
,
'MBTS_A9'
,
'MBTS_A10'
,
'MBTS_A11'
,
'MBTS_A12'
,
'MBTS_A13'
,
'MBTS_A14'
,
'MBTS_A15'
,
'MBTS_C0'
,
'MBTS_C1'
,
'MBTS_C2'
,
'MBTS_C3'
,
'MBTS_C4'
,
'MBTS_C5'
,
'MBTS_C6'
,
'MBTS_C7'
,
'MBTS_C0'
,
'MBTS_C1'
,
'MBTS_C2'
,
'MBTS_C3'
,
'MBTS_C4'
,
'MBTS_C5'
,
'MBTS_C6'
,
'MBTS_C7'
,
'MBTS_C8'
,
'MBTS_C9'
,
'MBTS_C10'
,
'MBTS_C11'
,
'MBTS_C12'
,
'MBTS_C13'
,
'MBTS_C14'
,
'MBTS_C15'
]
for
mult
in
cThr
:
...
...
@@ -95,7 +95,7 @@ class MonitorDef:
TAP
=
2
TAV
=
4
monItems
=
{
1
:[],
2
:
[],
3
:
[],
4
:
[],
5
:
[],
6
:
[],
7
:
[]
}
monItems
=
{
1
:[],
2
:
[],
3
:
[],
4
:
[],
5
:
[],
6
:
[],
7
:
[]
}
monItemsHF
=
{
1
:[],
2
:
[],
3
:
[],
4
:
[],
5
:
[],
6
:
[],
7
:
[]
}
# definitions hardcoded at the moment
...
...
@@ -108,7 +108,7 @@ class MonitorDef:
"L1_EM3"
,
"L1_EM20VH"
,
"L1_EM22VHI"
,
"L1_MU4"
,
"L1_MU10"
,
"L1_MU20"
,
"L1_TAU12"
,
"L1_TAU12IT"
,
"L1_TAU20"
,
"L1_TAU60"
,
"L1_J12"
,
"L1_J20"
,
"L1_J100"
,
"L1_J400"
,
"L1_J20
.
31ETA49"
,
"L1_J30
.
31ETA49"
,
"L1_J12"
,
"L1_J20"
,
"L1_J100"
,
"L1_J400"
,
"L1_J20
p
31ETA49"
,
"L1_J30
p
31ETA49"
,
"L1_XE35"
,
"L1_XE80"
,
"L1_XS20"
,
"L1_MBTS_4_A"
,
"L1_MBTS_4_C"
,
"L1_MBTS_1"
,
"L1_MBTS_2"
,
"L1_MBTS_1_1"
,
"L1_LUCID"
,
"L1_LUCID_A_C_EMPTY"
,
"L1_ALFA_ANY"
,
...
...
@@ -122,7 +122,7 @@ class MonitorDef:
"L1_TGC_BURST"
,
"L1_LLP-NOMATCH"
,
"L1_DR-TAU20ITAU12I"
,
"L1_HT190-J15s5
.
ETA21"
,
"L1_HT190-J15s5
p
ETA21"
,
"L1_3J15_BTAG-MU4J15"
,
"L1_MJJ-900"
,
"L1_J40_DPHI-J20s2XE50"
,
...
...
Trigger/TriggerCommon/TriggerMenuMT/python/L1/Config/ThresholdDef.py
View file @
7c0cd7ea
...
...
@@ -43,10 +43,10 @@ class ThresholdDef:
MuonThreshold
(
'MU0'
).
setThrValue
(
thr
=
4
)
MuonThreshold
(
'MU4'
).
setThrValue
(
ba
=
4
,
ec
=
4
,
fw
=
4
)
MuonThreshold
(
'MU5'
).
setThrValue
(
ba
=
4
,
ec
=
4
,
fw
=
6
)
MuonThreshold
(
'MU5'
).
setThrValue
(
ba
=
4
,
ec
=
4
,
fw
=
6
)
MuonThreshold
(
'MU6'
).
setThrValue
(
thr
=
6
)
MuonThreshold
(
'MU6M'
).
setThrValue
(
thr
=
6
,
fw
=
8
).
setTGCFlags
(
"F & C | F & H | C & H"
)
MuonThreshold
(
'MU10'
).
setThrValue
(
thr
=
10
)
MuonThreshold
(
'MU10'
).
setThrValue
(
thr
=
10
)
MuonThreshold
(
'MU11'
).
setThrValue
(
thr
=
10
)
MuonThreshold
(
'MU15'
).
setThrValue
(
thr
=
14
,
ba
=
15
)
MuonThreshold
(
'MU20'
).
setThrValue
(
thr
=
20
)
...
...
@@ -158,20 +158,17 @@ class ThresholdDef:
for
et
in
[
12
,
20
,
25
]:
TauThreshold
(
'eTAU%iIM'
%
et
,
'eTAU'
).
setEt
(
et
)
# JET
for
thrV
in
[
12
,
15
,
20
,
25
,
30
,
40
,
50
,
85
,
100
]:
JetThreshold
(
'jJ%i'
%
thrV
,
'jJ'
).
setPt
(
thrV
).
addRange
(
etamin
=-
31
,
etamax
=
31
)
# jets are between -31 and 31 -ATR-11526
# Central jet
for
(
thrV
,
etamax
)
in
[(
12
,
23
),
(
15
,
25
),
(
25
,
23
),
(
35
,
23
),
(
40
,
25
)]:
JetThreshold
(
'jJ%i
.
0ETA%i'
%
(
thrV
,
etamax
),
'jJ'
).
setPt
(
thrV
).
addRange
(
etamin
=
-
etamax
,
etamax
=
etamax
)
JetThreshold
(
'jJ%i
p
0ETA%i'
%
(
thrV
,
etamax
),
'jJ'
).
setPt
(
thrV
).
addRange
(
etamin
=
-
etamax
,
etamax
=
etamax
)
# Standard forward jet
for
thrV
in
[
15
,
20
,
75
]:
JetThreshold
(
'jJ%i
.
31ETA49'
%
thrV
,
'jJ'
).
setPt
(
thrV
).
addRange
(
etamin
=
31
,
etamax
=
49
).
addRange
(
etamin
=-
49
,
etamax
=-
31
)
JetThreshold
(
'jJ%i
p
31ETA49'
%
thrV
,
'jJ'
).
setPt
(
thrV
).
addRange
(
etamin
=
31
,
etamax
=
49
).
addRange
(
etamin
=-
49
,
etamax
=-
31
)
# XE
for
thrV
in
[
20
,
50
]:
...
...
Trigger/TriggerCommon/TriggerMenuMT/python/L1/Config/ThresholdDefLegacy.py
View file @
7c0cd7ea
...
...
@@ -69,7 +69,7 @@ class ThresholdDefLegacy:
# VH section
ThresholdValue
.
setDefaults
(
'EM'
,
{
'isobits'
:
'00001'
,
'use_relIso'
:
True
})
ThresholdDefLegacy
.
addVaryingThrValuesRun2
(
LegacyThreshold
(
'EM8VH'
,
'EM'
),
8
,
shift_set
=
1
)
ThresholdDefLegacy
.
addVaryingThrValuesRun2
(
LegacyThreshold
(
'EM8VH'
,
'EM'
),
8
,
shift_set
=
1
)
ThresholdDefLegacy
.
addVaryingThrValuesRun2
(
LegacyThreshold
(
'EM10VH'
,
'EM'
),
10
,
shift_set
=
1
)
ThresholdDefLegacy
.
addVaryingThrValuesRun2
(
LegacyThreshold
(
'EM13VH'
,
'EM'
),
13
,
shift_set
=
2
)
ThresholdDefLegacy
.
addVaryingThrValuesRun2
(
LegacyThreshold
(
'EM15VH'
,
'EM'
),
15
,
shift_set
=
2
)
...
...
@@ -102,7 +102,7 @@ class ThresholdDefLegacy:
for
thrV
in
[
1
,
2
,
3
,
5
,
6
,
8
,
12
,
15
,
20
,
25
,
30
,
35
,
40
,
50
,
60
,
90
,
100
]:
LegacyThreshold
(
'HA%i'
%
thrV
,
'TAU'
).
addThrValue
(
thrV
)
# beam splashes
# beam splashes
for
thrV
in
[
20
]:
LegacyThreshold
(
'HA%iA'
%
thrV
,
'TAU'
).
addThrValue
(
255
,
priority
=
1
).
addThrValue
(
thrV
,
etamin
=
12
,
etamax
=
16
,
priority
=
2
)
LegacyThreshold
(
'HA%iC'
%
thrV
,
'TAU'
).
addThrValue
(
255
,
priority
=
1
).
addThrValue
(
thrV
,
etamin
=
-
16
,
etamax
=
-
12
,
priority
=
2
)
...
...
@@ -147,17 +147,17 @@ class ThresholdDefLegacy:
LegacyThreshold
(
'J%iC'
%
thrV
,
'JET'
).
addThrValue
(
CL
.
JetOff
).
addThrValue
(
thrV
,
etamin
=
-
23
,
etamax
=
-
15
,
priority
=
1
)
# Central jet
for
(
thrV
,
etamax
)
in
[(
12
,
23
),
(
12
,
28
),
(
15
,
25
),
(
17
,
22
),
(
20
,
28
),
(
25
,
23
),
(
35
,
23
),
(
20
,
49
),
(
30
,
49
),
(
40
,
25
),
(
45
,
23
)]:
LegacyThreshold
(
'J%i
.
0ETA%i'
%
(
thrV
,
etamax
),
'JET'
).
addThrValue
(
CL
.
JetOff
).
addThrValue
(
thrV
,
etamin
=
-
etamax
,
etamax
=
etamax
,
priority
=
1
)
LegacyThreshold
(
'J%i
p
0ETA%i'
%
(
thrV
,
etamax
),
'JET'
).
addThrValue
(
CL
.
JetOff
).
addThrValue
(
thrV
,
etamin
=
-
etamax
,
etamax
=
etamax
,
priority
=
1
)
# Standard forward jet
for
thrV
in
[
10
,
15
,
20
,
25
,
30
,
35
,
45
,
50
,
70
,
75
,
100
]:
LegacyThreshold
(
'J%i
.
31ETA49'
%
thrV
,
'JET'
).
addThrValue
(
CL
.
JetOff
)
\
LegacyThreshold
(
'J%i
p
31ETA49'
%
thrV
,
'JET'
).
addThrValue
(
CL
.
JetOff
)
\
.
addThrValue
(
thrV
,
etamin
=
31
,
etamax
=
49
,
priority
=
1
)
\
.
addThrValue
(
thrV
,
etamin
=-
49
,
etamax
=-
31
,
priority
=
1
)
# Custom Forward jet and VBF jets
for
(
thrV
,
etamin
,
etamax
)
in
[
(
15
,
23
,
49
),
(
15
,
24
,
49
),
(
20
,
28
,
31
)
]:
LegacyThreshold
(
'J%i
.
%iETA%i'
%
(
thrV
,
etamin
,
etamax
),
'JET'
).
addThrValue
(
CL
.
JetOff
)
\
LegacyThreshold
(
'J%i
p
%iETA%i'
%
(
thrV
,
etamin
,
etamax
),
'JET'
).
addThrValue
(
CL
.
JetOff
)
\
.
addThrValue
(
thrV
,
etamin
=
etamin
,
etamax
=
etamax
,
priority
=
1
)
\
.
addThrValue
(
thrV
,
etamin
=
-
etamax
,
etamax
=
-
etamin
,
priority
=
1
)
...
...
@@ -165,21 +165,19 @@ class ThresholdDefLegacy:
ThresholdValue
.
setDefaults
(
'JET'
,
{
'window'
:
4
})
for
thrV
in
[
15
]:
LegacyThreshold
(
'JJ%i
.
23ETA49'
%
thrV
,
'JET'
)
\
LegacyThreshold
(
'JJ%i
p
23ETA49'
%
thrV
,
'JET'
)
\
.
addThrValue
(
CL
.
JetOff
)
\
.
addThrValue
(
thrV
,
etamin
=
23
,
etamax
=
49
,
priority
=
1
)
\
.
addThrValue
(
thrV
,
etamin
=-
49
,
etamax
=-
23
,
priority
=
1
)
ThresholdValue
.
setDefaults
(
'JET'
,
{})
# ZB
ZeroBiasThreshold
(
'ZB_EM12'
).
setSeedThreshold
(
seed
=
'EM12'
,
seed_multi
=
1
,
bcdelay
=
3564
)
ZeroBiasThreshold
(
'ZB_EM15'
).
setSeedThreshold
(
seed
=
'EM15'
,
seed_multi
=
1
,
bcdelay
=
3564
)
ZeroBiasThreshold
(
'ZB_J10'
).
setSeedThreshold
(
seed
=
'J10'
,
seed_multi
=
1
,
bcdelay
=
3564
)
ZeroBiasThreshold
(
'ZB_J75'
).
setSeedThreshold
(
seed
=
'J75'
,
seed_multi
=
1
,
bcdelay
=
3564
)
# JE
ThresholdValue
.
setDefaults
(
'JE'
,
{
'etamin'
:
-
49
,
'etamax'
:
49
,
'phimin'
:
0
,
'phimax'
:
64
,
...
...
@@ -188,7 +186,6 @@ class ThresholdDefLegacy:
for
thrV
in
[
100
,
140
,
200
,
300
,
350
,
500
]:
LegacyThreshold
(
'JE%i'
%
thrV
,
'JE'
).
addThrValue
(
thrV
)
# TE
for
thrV
in
[
0
,
2
,
3
,
4
,
5
,
10
,
15
,
20
,
25
,
30
,
40
,
45
,
50
,
55
,
60
,
65
,
70
,
90
,
100
,
120
,
140
,
160
,
200
,
280
,
300
,
360
,
2000
,
4000
,
10000
,
12000
,
14000
]:
LegacyThreshold
(
'TE%i'
%
thrV
,
'TE'
).
addThrValue
(
thrV
)
...
...
@@ -204,23 +201,23 @@ class ThresholdDefLegacy:
# Restricted range TE |eta|<2.4
etamax
=
24
for
thrV
in
[
0
,
3
,
5
,
10
,
15
,
20
,
25
,
30
,
35
,
40
,
45
,
50
,
55
,
60
,
65
,
70
,
80
,
110
,
150
,
180
,
1000
,
2000
,
5000
,
6500
,
8000
,
9000
]:
LegacyThreshold
(
'TE%i
.
0ETA%i'
%
(
thrV
,
etamax
),
'TE'
).
addThrValue
(
CL
.
EtSumOff
).
addThrValue
(
thrV
,
etamin
=
-
etamax
,
etamax
=
etamax
,
priority
=
1
)
LegacyThreshold
(
'TE%i
p
0ETA%i'
%
(
thrV
,
etamax
),
'TE'
).
addThrValue
(
CL
.
EtSumOff
).
addThrValue
(
thrV
,
etamin
=
-
etamax
,
etamax
=
etamax
,
priority
=
1
)
# Restricted range TE 2.4<|eta|<4.9
etamin
=
24
etamax
=
49
for
thrV
in
[
0
,
3
,
5
,
10
,
15
,
20
,
25
,
30
,
35
,
40
,
45
,
50
,
55
,
60
,
65
,
70
,
80
,
110
,
150
,
180
,
1000
,
2000
,
5000
,
6500
,
8000
,
9000
]:
LegacyThreshold
(
'TE%i
.
%iETA%i'
%
(
thrV
,
etamin
,
etamax
),
'TE'
)
\
.
addThrValue
(
CL
.
EtSumOff
)
\
LegacyThreshold
(
'TE%i
p
%iETA%i'
%
(
thrV
,
etamin
,
etamax
),
'TE'
)
\
.
addThrValue
(
CL
.
EtSumOff
)
\
.
addThrValue
(
thrV
,
etamin
=
etamin
,
etamax
=
etamax
,
priority
=
1
)
\
.
addThrValue
(
thrV
,
etamin
=
-
etamax
,
etamax
=
-
etamin
,
priority
=
1
)
# RXE (restriced range ET miss)
etamax
=
24
for
thrV
in
[
30
,
35
,
40
,
45
,
50
,
55
,
60
,
70
,
80
]:
LegacyThreshold
(
'XE%i
.
0ETA%i'
%
(
thrV
,
etamax
),
'XE'
).
addThrValue
(
CL
.
EtMissOff
).
addThrValue
(
thrV
,
etamin
=
-
etamax
,
etamax
=
etamax
,
priority
=
1
)
LegacyThreshold
(
'XE%i
p
0ETA%i'
%
(
thrV
,
etamax
),
'XE'
).
addThrValue
(
CL
.
EtMissOff
).
addThrValue
(
thrV
,
etamin
=
-
etamax
,
etamax
=
etamax
,
priority
=
1
)
# Restricted range TE |eta|<4.9
etamax
=
49
for
thrV
in
[
3
,
7
,
500
,
600
,
1500
,
3000
,
3500
,
5000
,
6500
,
8000
,
9000
]:
LegacyThreshold
(
'TE%i
.
0ETA%i'
%
(
thrV
,
etamax
),
'TE'
).
addThrValue
(
CL
.
EtSumOff
).
addThrValue
(
thrV
,
etamin
=
-
etamax
,
etamax
=
etamax
,
priority
=
1
)
LegacyThreshold
(
'TE%i
p
0ETA%i'
%
(
thrV
,
etamax
),
'TE'
).
addThrValue
(
CL
.
EtSumOff
).
addThrValue
(
thrV
,
etamin
=
-
etamax
,
etamax
=
etamax
,
priority
=
1
)
Trigger/TriggerCommon/TriggerMenuMT/python/L1/Config/TopoAlgoDef.py
View file @
7c0cd7ea
...
...
@@ -84,7 +84,7 @@ class TopoAlgoDef:
alg
.
addgeneric
(
'DoIsoCut'
,
0
)
tm
.
registerTopoAlgo
(
alg
)
alg
=
AlgConf
.
ClusterSort
(
name
=
'EMshi'
,
inputs
=
'ClusterTobArray'
,
outputs
=
'EMshi'
)
alg
.
addgeneric
(
'InputWidth'
,
HW
.
InputWidthEM
)
alg
.
addgeneric
(
'InputWidth1stStage'
,
HW
.
InputWidth1stStageSortEM
)
...
...
@@ -263,7 +263,7 @@ class TopoAlgoDef:
alg
.
addvariable
(
'MinET'
,
4
)
alg
.
addvariable
(
'MinEta'
,
0
)
alg
.
addvariable
(
'MaxEta'
,
25
)
tm
.
registerTopoAlgo
(
alg
)
tm
.
registerTopoAlgo
(
alg
)
alg
=
AlgConf
.
MuonSort
(
name
=
'MUs'
,
inputs
=
'MuonTobArray'
,
outputs
=
'MUs'
)
...
...
@@ -365,7 +365,7 @@ class TopoAlgoDef:
# dimu DR items
listofalgos
=
[
listofalgos
=
[
{
"minDr"
:
0
,
"maxDr"
:
15
,
"mult"
:
2
,
"otype1"
:
"MU"
,
"ocut1"
:
6
,
"olist"
:
"ab"
,
"otype2"
:
""
,
"ocut2"
:
6
,
"onebarrel"
:
0
},
#0DR15-2MU6ab
]
for
x
in
listofalgos
:
...
...
@@ -1345,7 +1345,7 @@ class TopoAlgoDef:
for
k
in
x
:
setattr
(
d
,
k
,
x
[
k
])
inputList
=
[
'CJs'
]
toponames
=
[]
toponames
=
[]
for
minET
in
d
.
minETlist
:
# noqa: F821
toponames
.
append
(
"CEP-CJ%is6"
%
(
minET
))
# noqa: F821
alg
=
AlgConf
.
ExclusiveJets
(
name
=
d
.
algoname
,
inputs
=
inputList
,
outputs
=
toponames
)
# noqa: F821
...
...
Trigger/TriggerCommon/TriggerMenuMT/python/L1/Config/TopoAlgoDefLegacy.py
View file @
7c0cd7ea
...
...
@@ -23,7 +23,7 @@ class TopoAlgoDefLegacy:
alg
.
addvariable
(
'IsoMask'
,
0
)
tm
.
registerTopoAlgo
(
alg
)
alg
=
AlgConf
.
ClusterSelect
(
name
=
'TAUabi'
,
inputs
=
'ClusterTobArray'
,
outputs
=
'TAUabi'
,
algoId
=
1
)
alg
.
addgeneric
(
'InputWidth'
,
HW
.
InputWidthTAU
)
alg
.
addgeneric
(
'InputWidth1stStage'
,
HW
.
InputWidth1stStageSelectTAU
)
...
...
Trigger/TriggerCommon/TriggerMenuMT/python/L1/Config/TopoAlgoDefMuctpi.py
View file @
7c0cd7ea
...
...
@@ -46,7 +46,6 @@ class TopoAlgoDefMuctpi:
alg
.
addgeneric
(
'MaxTob1'
,
HW
.
OutputWidthSelectMU
)
alg
.
addgeneric
(
'MaxTob2'
,
HW
.
OutputWidthSelectMU
)
alg
.
addgeneric
(
'NumResultBits'
,
1
)
alg
.
addvariable
(
'MinET1'
,
d
.
ocut1
)
alg
.
addvariable
(
'MinET2'
,
d
.
ocut2
)
...
...
Trigger/TriggerCommon/TriggerMenuMT/python/L1/Config/TopoAlgoDefMultiplicity.py
View file @
7c0cd7ea
...
...
@@ -36,8 +36,8 @@ class TopoAlgoDefMultiplicity(object):
nbits
=
3
)
tm
.
registerTopoAlgo
(
alg
)
jJThresholds
=
[
"jJ12"
,
"jJ12
.
0ETA23"
,
"jJ15"
,
"jJ15
.
0ETA25"
,
"jJ20"
,
"jJ25"
,
"jJ25
.
0ETA23"
,
"jJ30"
,
"jJ35
.
0ETA23"
,
"jJ40
.
0ETA25"
,
"jJ40"
,
"jJ50"
,
"jJ85"
,
"jJ100"
,
"jJ15
.
31ETA49"
,
"jJ20
.
31ETA49"
,
"jJ75
.
31ETA49"
]
jJThresholds
=
[
"jJ12"
,
"jJ12
p
0ETA23"
,
"jJ15"
,
"jJ15
p
0ETA25"
,
"jJ20"
,
"jJ25"
,
"jJ25
p
0ETA23"
,
"jJ30"
,
"jJ35
p
0ETA23"
,
"jJ40
p
0ETA25"
,
"jJ40"
,
"jJ50"
,
"jJ85"
,
"jJ100"
,
"jJ15
p
31ETA49"
,
"jJ20
p
31ETA49"
,
"jJ75
p
31ETA49"
]
for
jJet
in
jJThresholds
:
alg
=
JetMultiplicityAlgo
(
name
=
jJet
,
...
...
Trigger/TriggerCommon/TriggerMenuMT/python/L1/Menu/MenuMapping.py
View file @
7c0cd7ea
...
...
@@ -8,19 +8,19 @@ The resolved name is also being used in the L1/Config/ItemDef.py and L1/Config/T
"""
menuMap
=
{
"Physics_pp_v7"
:
"MC_pp_v8"
,
"LS2_v1"
:
"MC_pp_v8"
,
"Physics_pp_run3_v1"
:
"MC_pp_v8"
,
"MC_pp_run3_v1"
:
"MC_pp_v8"
,
"MC_pp_v8"
:
"MC_pp_v8"
,
"Physics_pp_v8"
:
"MC_pp_v8"
,
"Cosmic_run3_v1"
:
"MC_pp_v8"
,
"Physics_HI_v4"
:
"MC_pp_v8"
,
"MC_HI_v4"
:
"MC_pp_v8"
,
"Physics_pp_v7"
:
"MC_pp_v8"
,
"LS2_v1"
:
"MC_pp_v8"
,
"Physics_pp_run3_v1"
:
"MC_pp_v8"
,
"MC_pp_run3_v1"
:
"MC_pp_v8"
,
"MC_pp_v8"
:
"MC_pp_v8"
,
"Physics_pp_v8"
:
"MC_pp_v8"
,
"Cosmic_run3_v1"
:
"MC_pp_v8"
,
"Physics_HI_v4"
:
"MC_pp_v8"
,
"MC_HI_v4"
:
"MC_pp_v8"
,
"PhysicsP1_pp_run3_v1"
:
"MC_pp_v8"
,
"PhysicsP1_HI_run3_v1"
:
"MC_pp_v8"
,
"Dev_HI_run3_v1"
:
"MC_pp_v8"
,
"Dev_HI_run3_v1"
:
"MC_pp_v8"
,
"LS2_v1_TriggerValidation_prescale"
:
"MC_pp_v8"
,
"LS2_v1_BulkMCProd_prescale"
:
"MC_pp_v8"
,
"LS2_v1_CPSampleProd_prescale"
:
"MC_pp_v8"
"LS2_v1_BulkMCProd_prescale"
:
"MC_pp_v8"
,
"LS2_v1_CPSampleProd_prescale"
:
"MC_pp_v8"
}
Trigger/TriggerCommon/TriggerMenuMT/python/L1/Menu/Menu_MC_pp_v8.py
View file @
7c0cd7ea
...
...
@@ -39,7 +39,6 @@ def defineMenu():
##
'L1_EM3'
,
'L1_EM7'
,
'L1_EM12'
,
'L1_EM8VH'
,
'L1_EM10VH'
,
'L1_EM15'
,
'L1_EM15VH'
,
'L1_EM15VHI'
,
'L1_EM18VHI'
,
'L1_EM20VH'
,
'L1_EM20VHI'
,
'L1_EM22VH'
,
'L1_EM22VHI'
,
'L1_EM24VHI'
,
'L1_EM24VHIM'
,
'L1_EM30VHI'
,
#'L1_EM22VHLIL', #'L1_EM50V',
'L1_EM3_EMPTY'
,
'L1_EM7_EMPTY'
,
'L1_EM7_UNPAIRED_ISO'
,
'L1_EM7_FIRSTEMPTY'
,
'L1_EM20VH_FIRSTEMPTY'
,
# new calo
...
...
@@ -94,12 +93,12 @@ def defineMenu():
# combined tau - jet
'L1_TAU20IM_2TAU12IM_J25_2J20_3J12'
,
'L1_TAU20IM_2TAU12IM_4J12
.
0ETA23'
,
'L1_TAU20IM_2TAU12IM_4J12
.
0ETA28'
,
'L1_TAU20IM_2TAU12IM_4J12
p
0ETA23'
,
'L1_TAU20IM_2TAU12IM_4J12
p
0ETA28'
,
'L1_TAU25IM_2TAU20IM_2J25_3J20'
,
# new calo
'L1_eTAU20IM_2jJ20_gXERHO45'
,
'L1_eTAU20IM_2eTAU12IM_4jJ12
.
0ETA23'
,
'L1_eTAU20IM_2eTAU12IM_4jJ12
p
0ETA23'
,
'L1_eTAU25IM_2eTAU20IM_2jJ25_3jJ20'
,
# combined tau - xe
...
...
@@ -131,7 +130,7 @@ def defineMenu():
'L1_EM18VHI_MJJ-300'
,
# combined mu - jet
'L1_MU6_J20'
,
'L1_MU6_J30
.
0ETA49_2J20
.
0ETA49'
,
'L1_MU6_J40'
,
'L1_MU6_J75'
,
'L1_MU6_J20'
,
'L1_MU6_J30
p
0ETA49_2J20
p
0ETA49'
,
'L1_MU6_J40'
,
'L1_MU6_J75'
,
#ATR-13743
'L1_MU10_2J20'
,
'L1_MU10_3J20'
,
'L1_MU10_2J15_J20'
,
'L1_MU20_J40'
,
...
...
@@ -144,44 +143,42 @@ def defineMenu():
# single jet
'L1_J15'
,
'L1_J20'
,
'L1_J25'
,
'L1_J30'
,
'L1_J40'
,
'L1_J50'
,
'L1_J75'
,
'L1_J85'
,
'L1_J100'
,
'L1_J400'
,
'L1_J20
.
31ETA49'
,
'L1_J30
.
31ETA49'
,
'L1_J50
.
31ETA49'
,
'L1_J75
.
31ETA49'
,
'L1_J15
.
31ETA49'
,
'L1_J20
p
31ETA49'
,
'L1_J30
p
31ETA49'
,
'L1_J50
p
31ETA49'
,
'L1_J75
p
31ETA49'
,
'L1_J15
p
31ETA49'
,
'L1_J12_EMPTY'
,
'L1_J12_FIRSTEMPTY'
,
'L1_J12_UNPAIRED_ISO'
,
'L1_J12_UNPAIRED_NONISO'
,
'L1_J12_ABORTGAPNOTCALIB'
,
'L1_J15.31ETA49_UNPAIRED_ISO'
,
'L1_J30_EMPTY'
,
'L1_J30_FIRSTEMPTY'
,
'L1_J30.31ETA49_EMPTY'
,
'L1_J30.31ETA49_UNPAIRED_ISO'
,
'L1_J30.31ETA49_UNPAIRED_NONISO'
,
'L1_J15p31ETA49_UNPAIRED_ISO'
,
'L1_J30_EMPTY'
,
'L1_J30_FIRSTEMPTY'
,
'L1_J30p31ETA49_EMPTY'
,
'L1_J30p31ETA49_UNPAIRED_ISO'
,
'L1_J30p31ETA49_UNPAIRED_NONISO'
,
'L1_J50_UNPAIRED_ISO'
,
'L1_J50_UNPAIRED_NONISO'
,
'L1_J50_ABORTGAPNOTCALIB'
,
'L1_J100_FIRSTEMPTY'
,
'L1_jJ100'
,
# multi jet
'L1_J45
.
0ETA23_3J15
.
0ETA25'
,
'L1_J50_2J40
.
0ETA25_3J15
.
0ETA25'
,
'L1_J45
p
0ETA23_3J15
p
0ETA25'
,
'L1_J50_2J40
p
0ETA25_3J15
p
0ETA25'
,
'L1_3J50'
,
'L1_4J15'
,
'L1_4J20'
,
'L1_3J15
.
0ETA25_XE40'
,
'L1_3J15
p
0ETA25_XE40'
,
'L1_6J15'
,
'L1_J85_3J30'
,
'L1_J30
.
0ETA49_2J20
.
0ETA49'
,
'L1_J30
p
0ETA49_2J20
p
0ETA49'
,
'L1_3jJ50'
,
'L1_4jJ15'
,
'L1_jJ25
.
0ETA23_2jJ15
.
31ETA49'
,
'L1_jJ40
.
0ETA25_2jJ25_jJ20
.
31ETA49'
,
'L1_jJ75
.
31ETA49'
,
'L1_jJ25
p
0ETA23_2jJ15
p
31ETA49'
,
'L1_jJ40
p
0ETA25_2jJ25_jJ20
p
31ETA49'
,
'L1_jJ75
p
31ETA49'
,
'L1_jJ85_3jJ30'
,
# multi jet forward
'L1_J25
.
0ETA23_2J15
.
31ETA49'
,
'L1_J40
.
0ETA25_2J15
.
31ETA49'
,
'L1_J40
.
0ETA25_2J25_J20
.
31ETA49'
,
'L1_J25
p
0ETA23_2J15
p
31ETA49'
,
'L1_J40
p
0ETA25_2J15
p
31ETA49'
,
'L1_J40
p
0ETA25_2J25_J20
p
31ETA49'
,
# multi jet central
'L1_3J25
.
0ETA23'
,
'L1_3J35
.
0ETA23'
,
'L1_4J15
.
0ETA25'
,
'L1_5J15
.
0ETA25'
,
'L1_3jJ15
.
0ETA25_gXERHO40'
,
'L1_3jJ35
.
0ETA23'
,
'L1_4jJ15
.
0ETA25'
,
'L1_3J25
p
0ETA23'
,
'L1_3J35
p
0ETA23'
,
'L1_4J15
p
0ETA25'
,
'L1_5J15
p
0ETA25'
,
'L1_3jJ15
p
0ETA25_gXERHO40'
,
'L1_3jJ35
p
0ETA23'
,
'L1_4jJ15
p
0ETA25'
,
# combined jet
'L1_2J15_XE55'
,
'L1_J40_XE50'
,
...
...
@@ -189,7 +186,6 @@ def defineMenu():
# new calo
'L1_2jJ50_gXERHO40'
,
# XE
'L1_XE10'
,
'L1_XE35'
,
'L1_XE40'
,
'L1_XE45'
,
'L1_XE50'
,
'L1_XE55'
,
'L1_XE60'
,
'L1_XE70'
,
'L1_XE80'
,
'L1_XE30'
,
'L1_XE300'
,
...
...
@@ -236,7 +232,6 @@ def defineMenu():
# BPTX
# BCM
#'L1_BCM_AC_CA_UNPAIRED_ISO',
'L1_BCM_AC_CA_BGRP0'
,
'L1_BCM_Wide_EMPTY'
,
'L1_BCM_Wide_UNPAIRED_ISO'
,
'L1_BCM_Wide_UNPAIRED_NONISO'
,
'L1_BCM_AC_UNPAIRED_ISO'
,
'L1_BCM_CA_UNPAIRED_ISO'
,
'L1_BCM_AC_UNPAIRED_NONISO'
,
'L1_BCM_CA_UNPAIRED_NONISO'
,
...
...
@@ -262,13 +257,13 @@ def defineMenu():
'L1_MU4_XE60'
,
# HT
'L1_HT190-J15s5
.
ETA21'
,
'L1_HT190-J15s5
p
ETA21'
,
'L1_HT150-J20s5
.
ETA31_MJJ-400-CF'
,
'L1_HT150-J20s5
p
ETA31_MJJ-400-CF'
,
# Jpsi T&P
'L1_JPSI-1M5-EM7'
,
'L1_JPSI-1M5-EM12'
,
#
'L1_DY-BOX-2MU6'
,
'L1_LFV-MU6'
,
'L1_LFV-MU11'
,
...
...
@@ -308,9 +303,6 @@ def defineMenu():
'L1_TAU60_DR-TAU20ITAU12I'
,
'L1_SC111-CJ15'
,
## # Partition 1
## 'L1_CALREQ0_P1', 'L1_CALREQ1_P1', 'L1_CALREQ2_P1',
#ATR-19355
'L1_BPH-0M10-3MU4'
,
...
...
@@ -318,10 +310,8 @@ def defineMenu():
#ATR-18824
'L1_ZAFB-04DPHI-EM15I'
,
'L1_ZAFB-25DPHI-EM15I'
,
# 'L1_ZAFB-25DPHI-EM18I',
#ATR-19302:
#'L1_DPHI-M70-2EM10I',
'L1_DPHI-M70-2EM12I'
,
#ATR-19510
...
...
@@ -330,23 +320,14 @@ def defineMenu():
#ATR-17320
'L1_CEP-CJ60'
,
'L1_CEP-CJ50'
,
#'L1_CEP-CJ50.ETA21',
#ATR-21371
'L1_ALFA_ANY'
,
'L1_ALFA_ELAST15'
,
'L1_ALFA_ELAST18'
,
'L1_ALFA_B7L1U'
,
'L1_ALFA_B7L1L'
,
'L1_ALFA_A7L1U'
,
'L1_ALFA_A7L1L'
,
'L1_ALFA_A7R1U'
,
'L1_ALFA_A7R1L'
,
'L1_ALFA_B7R1U'
,
'L1_ALFA_B7R1L'
,
# L1_ALFA_Calib
'L1_ALFA_SYST9'
,
'L1_ALFA_SYST10'
,
'L1_ALFA_SYST11'
,
'L1_ALFA_SYST12'
,
'L1_ALFA_SYST17'
,
'L1_ALFA_SYST18'
,
# L1_ALFA_SYS, L1_ALFA_SYS_Calib
'L1_ALFA_B7L1U'
,
'L1_ALFA_B7L1L'
,
'L1_ALFA_A7L1U'
,
'L1_ALFA_A7L1L'
,
'L1_ALFA_A7R1U'
,
'L1_ALFA_A7R1L'
,
'L1_ALFA_B7R1U'
,
'L1_ALFA_B7R1L'
,
'L1_ALFA_SYST9'
,
'L1_ALFA_SYST10'
,
'L1_ALFA_SYST11'
,
'L1_ALFA_SYST12'
,
'L1_ALFA_SYST17'
,
'L1_ALFA_SYST18'
,
]
#CTP IDs are taken from this mapping. Every L1 item needs a unique ctpid.
...
...
@@ -387,7 +368,6 @@ def defineMenu():
'L1_2EM15'
:
27
,
'L1_2EM15VH'
:
28
,
'L1_EM15VHI'
:
29
,
#'L1_EM7_2EM3' : 29,
'L1_EM24VHIM'
:
30
,
'L1_2EM15VHI'
:
31
,
'L1_2EM20VH'
:
400
,
...
...
@@ -402,7 +382,7 @@ def defineMenu():
'L1_MU6_2MU4'
:
39
,
'L1_3MU6'
:
40
,
'L1_4MU4'
:
46
,
'L1_4J15
.
0ETA25'
:
41
,
'L1_4J15
p
0ETA25'
:
41
,
'L1_2EM8VH_MU10'
:
43
,
'L1_EM15VH_MU10'
:
44
,
'L1_EM7_MU20'
:
483
,
...
...
@@ -439,10 +419,9 @@ def defineMenu():
'L1_TAU20IM_2TAU12IM_J25_2J20_3J12'
:
70
,
'L1_TAU20IM_2TAU12IM_4J12.0ETA23'
:
316
,
#'L1_DR-MU10TAU12I_TAU12I-J25' : 72,
'L1_TAU20IM_2TAU12IM_4J12p0ETA23'
:
316
,
'L1_TAU20IM_2J20_XE45'
:
74
,
'L1_TAU20IM_2TAU12IM_4J12
.
0ETA28'
:
77
,