Commit bd096dff authored by Adam Edward Barton's avatar Adam Edward Barton
Browse files

Merge branch 'ATR-23797_labelsCorrectionPrimChains' into 'master'

Relabelled chains, defined new group for Unconventional Tracking chains, moved...

Closes ATR-23797

See merge request atlas/athena!45280
parents 6297e3ca fb211c59
......@@ -3994,7 +3994,7 @@ HLT_g40_loose_L1EM20VH:
3: 4
HLT_g40_loose_LArPEBHLT_L1EM20VHI:
eventCount: 0
HLT_g40_loose_mu40_msonly_L1EM20VH_MU20:
HLT_g40_loose_mu40_msonly_L1MU20:
eventCount: 1
stepCounts:
0: 2
......
......@@ -1264,7 +1264,7 @@ HLT_g40_loose_L1EM20VH:
eventCount: 0
HLT_g40_loose_LArPEBHLT_L1EM20VHI:
eventCount: 0
HLT_g40_loose_mu40_msonly_L1EM20VH_MU20:
HLT_g40_loose_mu40_msonly_L1MU20:
eventCount: 0
HLT_g45_loose_6j45_L14J15p0ETA25:
eventCount: 0
......
......@@ -47,7 +47,8 @@ from TriggerMenuMT.HLTMenuConfig.Menu.Physics_pp_run3_v1 import (PhysicsStream,
SupportPhIGroup,
LowMuGroup,
EOFBPhysL1MuGroup,
EOFTLALegGroup
EOFTLALegGroup,
UnconvTrkGroup
)
def setupMenu():
......@@ -117,9 +118,9 @@ def setupMenu():
ChainProp(name='HLT_mu26_ivarperf_L1MU20', groups=SingleMuonGroup),
#-- nscan ATR-19376
ChainProp(name='HLT_mu20_msonly_iloosems_mu6noL1_msonly_nscan_L1MU20_J40', l1SeedThresholds=['MU20','FSNOSEED'], groups=MultiMuonGroup),
ChainProp(name='HLT_mu20_msonly_iloosems_mu6noL1_msonly_nscan_L1MU20_XE30', l1SeedThresholds=['MU20','FSNOSEED'], groups=MultiMuonGroup),
ChainProp(name='HLT_mu20_msonly_iloosems_mu6noL1_msonly_nscan_L110DR-MU20-MU6', l1SeedThresholds=['MU20','MU6'], groups=MultiMuonGroup),
ChainProp(name='HLT_mu20_msonly_iloosems_mu6noL1_msonly_nscan_L1MU20_J40', l1SeedThresholds=['MU20','FSNOSEED'], groups=PrimaryLegGroup+MultiMuonGroup),
ChainProp(name='HLT_mu20_msonly_iloosems_mu6noL1_msonly_nscan_L1MU20_XE30', l1SeedThresholds=['MU20','FSNOSEED'], groups=PrimaryLegGroup+MultiMuonGroup),
ChainProp(name='HLT_mu20_msonly_iloosems_mu6noL1_msonly_nscan_L110DR-MU20-MU6', l1SeedThresholds=['MU20','MU6'], groups=PrimaryL1MuGroup+MultiMuonGroup),
#ATR-20505
......@@ -134,8 +135,8 @@ def setupMenu():
ChainProp(name='HLT_mu20_L1MU6', l1SeedThresholds=['MU6'], groups=SingleMuonGroup+LowMuGroup),
# Late stream for LLP
ChainProp(name='HLT_3mu6_msonly_L1MU6_EMPTY', l1SeedThresholds=['MU6'], stream=['Late'], groups=PrimaryLegGroup+MultiMuonGroup),
ChainProp(name='HLT_3mu6_msonly_L1MU4_UNPAIRED_ISO', l1SeedThresholds=['MU4'], stream=['Late'], groups=PrimaryLegGroup+MultiMuonGroup),
ChainProp(name='HLT_3mu6_msonly_L1MU6_EMPTY', l1SeedThresholds=['MU6'], stream=['Late'], groups=PrimaryL1MuGroup+MultiMuonGroup),
ChainProp(name='HLT_3mu6_msonly_L1MU4_UNPAIRED_ISO', l1SeedThresholds=['MU4'], stream=['Late'], groups=PrimaryL1MuGroup+MultiMuonGroup),
]
TriggerFlags.EgammaSlice.signatures = TriggerFlags.EgammaSlice.signatures() + [
......@@ -602,9 +603,9 @@ def setupMenu():
# Candidates for allhad ttbar delayed stream
ChainProp(name='HLT_5j25_pf_ftf_0eta240_020jvt_j25_pf_ftf_0eta240_020jvt_bdl1r60_L14J15', l1SeedThresholds=['FSNOSEED']*2, groups=PrimaryLegGroup+MultiBjetGroup),
ChainProp(name='HLT_5j25_pf_ftf_0eta240_020jvt_j25_pf_ftf_0eta240_020jvt_bdl1r60_L14J15', l1SeedThresholds=['FSNOSEED']*2, groups=MultiBjetGroup),
ChainProp(name='HLT_5j35_pf_ftf_0eta240_020jvt_j25_pf_ftf_0eta240_020jvt_bdl1r60_L14J15', l1SeedThresholds=['FSNOSEED']*2, stream=['VBFDelayed'], groups=PrimaryLegGroup+MultiBjetGroup),
ChainProp(name='HLT_5j45_pf_ftf_0eta240_020jvt_j25_pf_ftf_0eta240_020jvt_bdl1r60_L14J15', l1SeedThresholds=['FSNOSEED']*2, groups=PrimaryLegGroup+MultiBjetGroup),
ChainProp(name='HLT_5j45_pf_ftf_0eta240_020jvt_j25_pf_ftf_0eta240_020jvt_bdl1r60_L14J15', l1SeedThresholds=['FSNOSEED']*2, stream=['VBFDelayed'], groups=PrimaryLegGroup+MultiBjetGroup),
# Boffperf copy to facilitate emulation studies
ChainProp(name='HLT_5j25_pf_ftf_0eta240_j25_pf_ftf_0eta240_boffperf_L14J15', l1SeedThresholds=['FSNOSEED']*2, groups=MultiBjetGroup),
......@@ -620,8 +621,8 @@ def setupMenu():
# TODO
### Are these VBF chains?
ChainProp(name="HLT_j55_pf_ftf_0eta320_bdl1r70_2j45_pf_ftf_320eta490_L1J25p0ETA23_2J15p31ETA49",l1SeedThresholds=['FSNOSEED']*2, stream=[PhysicsStream], groups=MultiBjetGroup),
ChainProp(name="HLT_j80_pf_ftf_0eta320_bdl1r70_j60_pf_ftf_0eta320_bdl1r85_j45_pf_ftf_320eta490_L1J40p0ETA25_2J25_J20p31ETA49", l1SeedThresholds=['FSNOSEED']*3,stream=[PhysicsStream], groups=MultiBjetGroup),
ChainProp(name="HLT_j55_pf_ftf_0eta320_bdl1r70_2j45_pf_ftf_320eta490_L1J25p0ETA23_2J15p31ETA49",l1SeedThresholds=['FSNOSEED']*2, stream=[PhysicsStream], groups=PrimaryLegGroup+MultiBjetGroup),
ChainProp(name="HLT_j80_pf_ftf_0eta320_bdl1r70_j60_pf_ftf_0eta320_bdl1r85_j45_pf_ftf_320eta490_L1J40p0ETA25_2J25_J20p31ETA49", l1SeedThresholds=['FSNOSEED']*3,stream=[PhysicsStream], groups=PrimaryLegGroup+MultiBjetGroup),
# Chris doesn't know which of these are for what signature
......@@ -816,7 +817,7 @@ def setupMenu():
ChainProp(name='HLT_2g10_loose_mu20_L1MU20', l1SeedThresholds=['EM7','MU20'], stream=[PhysicsStream], groups=PrimaryLegGroup+EgammaMuonGroup), # unsure what EM seed should be
#LLP
ChainProp(name='HLT_g15_loose_2mu10_msonly_L12MU10', l1SeedThresholds=['EM8VH','MU10'], stream=[PhysicsStream], groups=PrimaryLegGroup+EgammaMuonGroup),
ChainProp(name='HLT_g40_loose_mu40_msonly_L1EM20VH_MU20', l1SeedThresholds=['EM20VH','MU20'], stream=[PhysicsStream], groups=PrimaryLegGroup+EgammaMuonGroup), #ATR-20505
ChainProp(name='HLT_g40_loose_mu40_msonly_L1MU20', l1SeedThresholds=['EM20VH','MU20'], stream=[PhysicsStream], groups=PrimaryLegGroup+EgammaMuonGroup), #ATR-20505
# Test chains for muon + jet/MET merging/aligning
ChainProp(name='HLT_mu6_xe30_mht_L1XE30', l1SeedThresholds=['MU6','FSNOSEED'], stream=[PhysicsStream], groups=MuonMETGroup),
......@@ -928,7 +929,22 @@ def setupMenu():
ChainProp(name="HLT_j100_pf_ftf_bdl1r60_xe50_cell_xe85_pfopufit_L1XE55", l1SeedThresholds=['FSNOSEED','FSNOSEED','FSNOSEED'], stream=[PhysicsStream], groups=PrimaryLegGroup+BjetMETGroup),
ChainProp(name="HLT_2j45_pf_ftf_bdl1r60_xe50_cell_xe85_pfopufit_L12J15_XE55", l1SeedThresholds=['FSNOSEED','FSNOSEED','FSNOSEED'], stream=[PhysicsStream], groups=PrimaryLegGroup+BjetMETGroup),
ChainProp(name="HLT_3j35_pf_ftf_bdl1r60_xe50_cell_xe70_pfopufit_L13J15p0ETA25_XE40", l1SeedThresholds=['FSNOSEED','FSNOSEED','FSNOSEED'], stream=[PhysicsStream], groups=PrimaryLegGroup+BjetMETGroup),
]
## Unconventional tracking ATR-23797
# hit-based DV
ChainProp(name='HLT_xe80_tcpufit_unconvtrk200_hitdv_tight_L1XE50', groups=PrimaryLegGroup+UnconvTrkGroup, l1SeedThresholds=['FSNOSEED']*2),
ChainProp(name='HLT_xe80_tcpufit_unconvtrk200_hitdv_medium_L1XE50', groups=PrimaryLegGroup+UnconvTrkGroup, l1SeedThresholds=['FSNOSEED']*2),
# disappearing track trigger
ChainProp(name='HLT_xe80_tcpufit_unconvtrk20_distrk_tight_L1XE50', groups=PrimaryLegGroup+UnconvTrkGroup, l1SeedThresholds=['FSNOSEED']*2),
ChainProp(name='HLT_xe80_tcpufit_unconvtrk20_distrk_medium_L1XE50', groups=PrimaryLegGroup+UnconvTrkGroup, l1SeedThresholds=['FSNOSEED']*2),
# dEdx triggers
ChainProp(name='HLT_xe80_tcpufit_unconvtrk25_dedx_medium_L1XE50', groups=SupportLegGroup+UnconvTrkGroup, l1SeedThresholds=['FSNOSEED']*2),
ChainProp(name='HLT_xe80_tcpufit_unconvtrk50_dedx_medium_L1XE50', groups=PrimaryLegGroup+UnconvTrkGroup, l1SeedThresholds=['FSNOSEED']*2),
]
TriggerFlags.HeavyIonSlice.signatures = TriggerFlags.HeavyIonSlice.signatures() + []
TriggerFlags.BeamspotSlice.signatures = TriggerFlags.BeamspotSlice.signatures() + [
ChainProp(name='HLT_beamspot_allTE_trkfast_BeamSpotPEB_L1J15', l1SeedThresholds=['FSNOSEED'], stream=['BeamSpot'], groups=['PS:Online', 'RATE:BeamSpot', 'BW:BeamSpot']),
......@@ -1055,19 +1071,12 @@ def setupMenu():
ChainProp(name='HLT_unconvtrk0_fslrt_L1XE50', groups=SingleMETGroup, l1SeedThresholds=['FSNOSEED']),
# hit-based DV
ChainProp(name='HLT_xe80_tcpufit_unconvtrk200_hitdv_tight_L1XE50', groups=SingleMETGroup, l1SeedThresholds=['FSNOSEED']*2),
ChainProp(name='HLT_xe80_tcpufit_unconvtrk200_hitdv_medium_L1XE50', groups=SingleMETGroup, l1SeedThresholds=['FSNOSEED']*2),
ChainProp(name='HLT_unconvtrk260_hitdv_tight_L1J100', groups=SingleJetGroup, l1SeedThresholds=['FSNOSEED']),
ChainProp(name='HLT_unconvtrk260_hitdv_medium_L1J100', groups=SingleJetGroup, l1SeedThresholds=['FSNOSEED']),
ChainProp(name='HLT_unconvtrk260_hitdv_tight_L1J100', groups=PrimaryLegGroup+UnconvTrkGroup, l1SeedThresholds=['FSNOSEED']),
ChainProp(name='HLT_unconvtrk260_hitdv_medium_L1J100', groups=PrimaryLegGroup+UnconvTrkGroup, l1SeedThresholds=['FSNOSEED']),
# disappearing track trigger
ChainProp(name='HLT_xe80_tcpufit_unconvtrk20_distrk_tight_L1XE50', groups=SingleMETGroup, l1SeedThresholds=['FSNOSEED']*2),
ChainProp(name='HLT_xe80_tcpufit_unconvtrk20_distrk_medium_L1XE50', groups=SingleMETGroup, l1SeedThresholds=['FSNOSEED']*2),
ChainProp(name='HLT_unconvtrk20_distrk_tight_L1XE50', groups=SingleMETGroup, l1SeedThresholds=['FSNOSEED']),
ChainProp(name='HLT_unconvtrk20_distrk_medium_L1XE50', groups=SingleMETGroup, l1SeedThresholds=['FSNOSEED']),
ChainProp(name='HLT_unconvtrk20_distrk_tight_L1XE50', groups=SupportLegGroup+UnconvTrkGroup, l1SeedThresholds=['FSNOSEED']),
ChainProp(name='HLT_unconvtrk20_distrk_medium_L1XE50', groups=SupportLegGroup+UnconvTrkGroup, l1SeedThresholds=['FSNOSEED']),
# dEdx triggers
ChainProp(name='HLT_xe80_tcpufit_unconvtrk25_dedx_medium_L1XE50', groups=SingleMETGroup, l1SeedThresholds=['FSNOSEED']*2),
ChainProp(name='HLT_xe80_tcpufit_unconvtrk50_dedx_medium_L1XE50', groups=SingleMETGroup, l1SeedThresholds=['FSNOSEED']*2),
]
......@@ -62,6 +62,8 @@ TagAndProbePhIGroup = ['Support:PhaseITagAndProbe']
LowMuGroup = ['Primary:LowMu']
EOFBPhysL1MuGroup = ['EOF:BPhysL1Muon']
EOFTLALegGroup = ['EOF:TLALegacy']
# For unconventional tracking chains (ATR-23797)
UnconvTrkGroup = ['RATE:UnconvTrk', 'BW:UnconvTrk']
def setupMenu():
......@@ -585,10 +587,10 @@ def setupMenu():
TriggerFlags.UnconventionalTrackingSlice.signatures = [
#Isolated High pt Track Trigger
#Primary
ChainProp(name='HLT_xe80_tcpufit_unconvtrk120_isohpttrack_medium_iaggrmedium_L1XE50', l1SeedThresholds=['FSNOSEED']*2, stream=[PhysicsStream], groups=SingleMETGroup+PrimaryLegGroup),
ChainProp(name='HLT_xe80_tcpufit_unconvtrk120_isohpttrack_medium_iaggrmedium_L1XE50', l1SeedThresholds=['FSNOSEED']*2, stream=[PhysicsStream], groups=UnconvTrkGroup+PrimaryLegGroup),
#Backup for Primary Triggers
ChainProp(name='HLT_xe80_tcpufit_unconvtrk140_isohpttrack_medium_iaggrmedium_L1XE50', l1SeedThresholds=['FSNOSEED']*2, stream=[PhysicsStream], groups=SingleMETGroup+PrimaryLegGroup),
ChainProp(name='HLT_xe80_tcpufit_unconvtrk140_isohpttrack_medium_iaggrmedium_L1XE50', l1SeedThresholds=['FSNOSEED']*2, stream=[PhysicsStream], groups=UnconvTrkGroup+PrimaryLegGroup),
#Support
ChainProp(name='HLT_xe80_tcpufit_unconvtrk100_isohpttrack_medium_iaggrmedium_L1XE50', l1SeedThresholds=['FSNOSEED']*2, stream=[PhysicsStream], groups=SingleMETGroup+SupportLegGroup),
ChainProp(name='HLT_xe80_tcpufit_unconvtrk120_isohpttrack_medium_iaggrloose_L1XE50', l1SeedThresholds=['FSNOSEED']*2, stream=[PhysicsStream], groups=SingleMETGroup+SupportLegGroup),
ChainProp(name='HLT_xe80_tcpufit_unconvtrk100_isohpttrack_medium_iaggrmedium_L1XE50', l1SeedThresholds=['FSNOSEED']*2, stream=[PhysicsStream], groups=UnconvTrkGroup+SupportLegGroup),
ChainProp(name='HLT_xe80_tcpufit_unconvtrk120_isohpttrack_medium_iaggrloose_L1XE50', l1SeedThresholds=['FSNOSEED']*2, stream=[PhysicsStream], groups=UnconvTrkGroup+SupportLegGroup),
]
......@@ -61,7 +61,7 @@ def defineMenu():
'L1_EM7_MU10',
'L1_2MU4', 'L1_2MU6', 'L1_2MU10', 'L1_2MU20_OVERLAY', 'L1_MU11_2MU6',
'L1_3MU4', 'L1_MU6_2MU4', 'L1_3MU6', 'L1_4MU4', 'L1_MU6_3MU4', 'L1_2MU6_3MU4', 'L1_2MU11', 'L1_MU11_2MU10',
'L1_2EM8VH_MU10', 'L1_EM15VH_MU10', 'L1_EM7_MU20', 'L1_EM20VH_MU20',
'L1_2EM8VH_MU10', 'L1_EM15VH_MU10', 'L1_EM7_MU20',
# new calo
'L1_2eEM15VHI', 'L1_2eEM20VH', 'L1_2eEM8VH_MU10',
'L1_eEM20VH_3eEM10VH',
......@@ -316,7 +316,6 @@ def defineMenu():
'L1_2EM8VH_MU10' : 43,
'L1_EM15VH_MU10' : 44,
'L1_EM7_MU20' : 483,
'L1_EM20VH_MU20' : 484,
'L1_TAU12' : 45,
'L1_TAU12IM' : 47,
'L1_MU11_2MU10' : 49,
......
......@@ -61,7 +61,7 @@ def defineMenu():
'L1_EM7_MU10',
'L1_2MU4', 'L1_2MU6', 'L1_2MU10', 'L1_2MU20_OVERLAY', 'L1_MU11_2MU6',
'L1_3MU4', 'L1_MU6_2MU4', 'L1_3MU6', 'L1_4MU4', 'L1_MU6_3MU4', 'L1_2MU6_3MU4', 'L1_2MU11', 'L1_MU11_2MU10',
'L1_2EM8VH_MU10', 'L1_EM15VH_MU10', 'L1_EM7_MU20', 'L1_EM20VH_MU20',
'L1_2EM8VH_MU10', 'L1_EM15VH_MU10', 'L1_EM7_MU20',
# new calo
'L1_2eEM15VHI', 'L1_2eEM20VH', 'L1_2eEM8VH_MU10',
'L1_eEM20VH_3eEM10VH',
......@@ -551,7 +551,6 @@ def defineMenu():
'L1_2EM8VH_MU10' : 43,
'L1_EM15VH_MU10' : 44,
'L1_EM7_MU20' : 483,
'L1_EM20VH_MU20' : 484,
# TAU
#'L1_TAU5' : 50,
......
......@@ -273,7 +273,7 @@ class ItemDef(object):
LVL1MenuItem('L1_EM7_MU15' ).setLogic( d.EM7 & d.MU15 & physcond).setTriggerType(TT.muon)
LVL1MenuItem('L1_EM7_MU20' ).setLogic( d.EM7 & d.MU20 & physcond).setTriggerType(TT.muon)
LVL1MenuItem('L1_EM8VH_MU15' ).setLogic( d.EM8VH & d.MU15 & physcond).setTriggerType(TT.muon)
LVL1MenuItem('L1_EM20VH_MU20').setLogic( d.EM20VH & d.MU20 & physcond).setTriggerType(TT.muon)
LVL1MenuItem('L1_EM20VH_MU20').setLogic( d.EM20VH & d.MU20 & physcond).setTriggerType(TT.muon)
LVL1MenuItem('L1_EM8_MU10' ).setLogic( d.EM8 & d.MU10 & physcond).setTriggerType(TT.muon)
LVL1MenuItem('L1_EM15VH_MU10').setLogic( d.EM15VH & d.MU10 & physcond).setTriggerType(TT.muon)
LVL1MenuItem('L1_EM3_MU20' ).setLogic( d.EM3 & d.MU20 & physcond).setTriggerType(TT.muon)
......
......@@ -325,7 +325,7 @@ def defineMenu():
"L1_EM20VH_3EM10VH",
"L1_EM7_MU10",
"L1_2MU4", "L1_2MU6", "L1_2MU10", "L1_2MU20_OVERLAY", "L1_MU11_2MU6", "L1_3MU4", "L1_MU6_2MU4", "L1_3MU6", "L1_4MU4", "L1_MU6_3MU4", "L1_2MU6_3MU4", "L1_2MU11", "L1_MU11_2MU10",
"L1_2EM8VH_MU10", "L1_EM15VH_MU10", "L1_EM7_MU20", "L1_EM20VH_MU20",
"L1_2EM8VH_MU10", "L1_EM15VH_MU10", "L1_EM7_MU20",
# single tau
"L1_TAU12IM", "L1_TAU20IM",
......@@ -744,7 +744,6 @@ def defineMenu():
'L1_2EM8VH_MU10' : 43,
'L1_EM15VH_MU10' : 44,
'L1_EM7_MU20' : 483,
'L1_EM20VH_MU20' : 484,
#'L1_TAU5' : 50,
#'L1_TAU12' : 45,
'L1_TAU12IM' : 47,
......
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