diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/Menu/Dev_pp_run4_v1.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/Menu/Dev_pp_run4_v1.py index 8936664fe2f1de3be91107e02830eb502f0b819e..e347b7cf5c02067b24675572aa225a35bc1b3563 100644 --- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/Menu/Dev_pp_run4_v1.py +++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/Menu/Dev_pp_run4_v1.py @@ -1,53 +1,35 @@ # Copyright (C) 2002-2022 CERN for the benefit of the ATLAS collaboration #------------------------------------------------------------------------# -# Dev_pp_run4_v1.py menu for Phase-II developments +# Dev_pp_run4_v1.py menu for Phase-II developments #------------------------------------------------------------------------# # This defines the input format of the chain and it's properties with the defaults set # always required are: name, stream and groups -#['name', 'L1chainParts'=[], 'stream', 'groups', 'merging'=[], 'topoStartFrom'=False], +# ['name', 'L1chainParts'=[], 'stream', 'groups', 'merging'=[], 'topoStartFrom'=False], import TriggerMenuMT.HLT.Menu.MC_pp_run4_v1 as mc_menu -from TriggerMenuMT.HLT.Config.Utility.ChainDefInMenu import ChainProp +#from TriggerMenuMT.HLT.Config.Utility.ChainDefInMenu import ChainProp # this is not the best option, due to flake violation, this list has to be changed when some groups are removed -from TriggerMenuMT.HLT.Menu.Physics_pp_run4_v1 import (#PhysicsStream, - SingleMuonGroup, - #MultiMuonGroup, - SingleElectronGroup, - #MultiElectronGroup, - #SinglePhotonGroup, - METGroup, - #SingleJetGroup, - MultiJetGroup, - #SingleBjetGroup, - #MultiBjetGroup, - #SingleTauGroup, - #MultiTauGroup, - #BphysicsGroup, - #BphysElectronGroup, - #EgammaMETGroup, - #EgammaMuonGroup, - #EgammaBjetGroup, - #MuonJetGroup, - #MuonMETGroup, - #EgammaJetGroup, - #MinBiasGroup, - #PrimaryLegGroup, - #PrimaryPhIGroup, - #SupportGroup, - #SupportLegGroup, - #SupportPhIGroup, - #TagAndProbeLegGroup, - #UnconvTrkGroup, - #METPhaseIStreamersGroup, - #EOFTLALegGroup, - #LegacyTopoGroup, - #Topo2Group, - #Topo3Group, - #EOFL1MuGroup, -) +#from TriggerMenuMT.HLT.Menu.Physics_pp_run4_v1 import ( + #PhysicsStream, + #SingleMuonGroup,MultiMuonGroup, + #SingleElectronGroup,MultiElectronGroup, + #SinglePhotonGroup,MultiPhotonGroup, + #SingleTauGroup,MultiTauGroup, + #SingleJetGroup,MultiJetGroup,SingleBjetGroup,MultiBjetGroup, + #METGroup, + #BphysicsGroup, BphysElectronGroup, + #UnconvTrkGroup, + #MinBiasGroup, + #EgammaMETGroup,EgammaMuonGroup,EgammaBjetGroup,EgammaJetGroup, + #MuonJetGroup,MuonMETGroup, + #PrimaryLegGroup,PrimaryPhIGroup,SupportGroup, SupportLegGroup,SupportPhIGroup, + #TagAndProbeLegGroup, + #LegacyTopoGroup,Topo2Group,Topo3Group, + #EOFL1MuGroup, EOFTLALegGroup, +#) DevGroup = ['Development'] @@ -59,54 +41,18 @@ def setupMenu(): log = logging.getLogger( __name__ ) log.info('[setupMenu] going to add the Dev menu chains now') - chains['Muon'] += [ - ChainProp(name='HLT_mu6_ivarmedium_L1MU5VF', groups=DevGroup+SingleMuonGroup), - ] - - chains['Egamma'] += [ - ChainProp(name='HLT_e26_lhtight_L1EM22VHI', groups=DevGroup+SingleElectronGroup,monGroups=['egammaMon:t0_tp']), - ] - - chains['MET'] += [ - ChainProp(name='HLT_xe30_mht_L1XE30', l1SeedThresholds=['FSNOSEED'], groups=METGroup+DevGroup), - ] - - - chains['Jet'] += [ - ChainProp(name='HLT_6j25c_L14J15', l1SeedThresholds=['FSNOSEED'], groups=MultiJetGroup+DevGroup), - ] - - - chains['Bjet'] += [ - ] - - chains['Tau'] += [ - ] - - chains['Bphysics'] += [ - ] - - chains['UnconventionalTracking'] += [ - ] - - chains['Combined'] += [ - ] - - chains['Beamspot'] += [ - ] - - chains['MinBias'] += [ - - ] - - chains['Calib'] += [ - ] - - chains['Streaming'] += [ - ] - - chains['Monitor'] += [ - ] - - + chains['Muon'] += [] + chains['Egamma'] += [] + chains['Tau'] += [] + chains['Jet'] += [] + chains['Bjet'] += [] + chains['MET'] += [] + chains['Bphysics'] += [] + chains['UnconventionalTracking'] += [] + chains['Combined'] += [] + chains['Beamspot'] += [] + chains['MinBias'] += [] + chains['Calib'] += [] + chains['Streaming'] += [] + chains['Monitor'] += [] return chains diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/Menu/MC_pp_run4_v1.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/Menu/MC_pp_run4_v1.py index f01e3f24f206a7d92d0e59b8698dc1aa8e121039..566f017d400757328a7577dad59cc998060159ad 100644 --- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/Menu/MC_pp_run4_v1.py +++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/Menu/MC_pp_run4_v1.py @@ -1,28 +1,24 @@ # Copyright (C) 2002-2022 CERN for the benefit of the ATLAS collaboration #------------------------------------------------------------------------# -# MC_pp_run4_v1.py menu for Phase-II developments (to be kept empty for now) +# MC_pp_run4_v1.py menu for Phase-II developments #------------------------------------------------------------------------# # This defines the input format of the chain and it's properties with the defaults set # always required are: name, stream and groups -#['name', 'L1chainParts'=[], 'stream', 'groups', 'merging'=[], 'topoStartFrom'=False], +# ['name', 'L1chainParts'=[], 'stream', 'groups', 'merging'=[], 'topoStartFrom'=False], -#from TriggerMenuMT.HLT.Config.Utility.ChainDefInMenu import ChainProp ###temporarily commented out only +from TriggerMenuMT.HLT.Config.Utility.ChainDefInMenu import ChainProp from .SignatureDicts import ChainStore import TriggerMenuMT.HLT.Menu.Physics_pp_run4_v1 as physics_menu -###temporarily commented out only -#from TriggerMenuMT.HLT.Menu.Physics_pp_run4_v1 import ( -# SingleElectronGroup, SinglePhotonGroup, BphysicsGroup, EOFBPhysL1MuGroup, -# EOFL1MuGroup, EgammaJetGroup, EgammaMETGroup, MultiJetGroup, PrimaryLegGroup, -# PrimaryPhIGroup, PrimaryL1MuGroup, SupportGroup, SupportPhIGroup, -# SupportLegGroup, SingleBjetGroup, MultiBjetGroup, SingleJetGroup, -# SingleMuonGroup, MultiMuonGroup, BphysElectronGroup, -# Topo2Group, Topo3Group, LegacyTopoGroup, -#) - +from TriggerMenuMT.HLT.Menu.Physics_pp_run4_v1 import ( + SingleMuonGroup, MultiMuonGroup, + MultiElectronGroup,MultiPhotonGroup, + SingleElectronGroup, SinglePhotonGroup, + PrimaryLegGroup, PrimaryPhIGroup, PrimaryL1MuGroup, +) def addMCSignatures(chains): from AthenaCommon.Logging import logging @@ -31,19 +27,127 @@ def addMCSignatures(chains): chainsMC = ChainStore() - chainsMC['Muon'] = [] + chainsMC['Muon'] = [ + # Single Muon Run-3 primaries + ChainProp(name='HLT_mu24_ivarmedium_L1MU14FCH', groups=PrimaryL1MuGroup+SingleMuonGroup, monGroups=['muonMon:shifter','muonMon:online']), + ChainProp(name='HLT_mu50_L1MU14FCH', groups=PrimaryL1MuGroup+SingleMuonGroup, monGroups=['muonMon:online','muonMon:shifter']), + ChainProp(name='HLT_mu60_0eta105_msonly_L1MU14FCH', groups=PrimaryL1MuGroup+SingleMuonGroup, monGroups=['muonMon:shifter']), + ChainProp(name='HLT_mu60_L1MU14FCH', groups=PrimaryL1MuGroup+SingleMuonGroup), + ChainProp(name='HLT_mu80_L1MU14FCH', groups=PrimaryL1MuGroup+SingleMuonGroup), + ChainProp(name='HLT_mu80_msonly_3layersEC_L1MU14FCH', groups=PrimaryL1MuGroup+SingleMuonGroup), + + # Multi muon Run-3 primaries + ChainProp(name='HLT_2mu14_L12MU8F', groups=PrimaryL1MuGroup+MultiMuonGroup, monGroups=['muonMon:online','muonMon:shifter']), + ChainProp(name='HLT_2mu10_l2mt_L1MU10BOM', groups=MultiMuonGroup+PrimaryL1MuGroup), + ChainProp(name='HLT_mu22_mu8noL1_L1MU14FCH', l1SeedThresholds=['MU14FCH','FSNOSEED'], groups=PrimaryL1MuGroup+MultiMuonGroup, monGroups=['muonMon:online','muonMon:shifter']), + ChainProp(name='HLT_mu20_ivarmedium_mu8noL1_L1MU14FCH', l1SeedThresholds=['MU14FCH','FSNOSEED'], groups=PrimaryL1MuGroup+MultiMuonGroup), + ChainProp(name='HLT_mu20_2mu4noL1_L1MU14FCH', l1SeedThresholds=['MU14FCH','FSNOSEED'], groups=PrimaryL1MuGroup+MultiMuonGroup, monGroups=['muonMon:online','muonMon:shifter']), + ChainProp(name='HLT_3mu6_L13MU5VF', l1SeedThresholds=['MU5VF'], groups=PrimaryL1MuGroup+MultiMuonGroup, monGroups=['muonMon:online','muonMon:shifter']), + ChainProp(name='HLT_3mu6_msonly_L13MU5VF', l1SeedThresholds=['MU5VF'], groups=PrimaryL1MuGroup+MultiMuonGroup, monGroups=['muonMon:online','muonMon:shifter']), + ChainProp(name='HLT_4mu4_L14MU3V', l1SeedThresholds=['MU3V'], groups=PrimaryL1MuGroup+MultiMuonGroup, monGroups=['muonMon:online','muonMon:shifter']), + + # Multi muon with mass cut Run-3 primaries + ChainProp(name='HLT_mu10_ivarmedium_mu10_10invmAB70_L12MU8F', groups=PrimaryL1MuGroup+MultiMuonGroup), + ChainProp(name='HLT_mu20_ivarmedium_mu4noL1_10invmAB70_L1MU14FCH', l1SeedThresholds=['MU14FCH','FSNOSEED'], groups=PrimaryL1MuGroup+MultiMuonGroup), + + # Muon LRT chain + ChainProp(name='HLT_mu20_LRT_d0loose_L1MU14FCH', groups=PrimaryL1MuGroup+SingleMuonGroup, monGroups=['muonMon:online']), + + #From TDR studies + ChainProp(name='HLT_mu18_ivarmedium_L1MU5VF', groups=PrimaryL1MuGroup+SingleMuonGroup, monGroups=['muonMon:shifter','muonMon:online']), + ChainProp(name='HLT_mu20_ivarmedium_L1MU5VF', groups=PrimaryL1MuGroup+SingleMuonGroup, monGroups=['muonMon:shifter','muonMon:online']), + ChainProp(name='HLT_mu40_ivarmedium_L1MU8VF', groups=PrimaryL1MuGroup+SingleMuonGroup, monGroups=['muonMon:shifter','muonMon:online']), + + ChainProp(name='HLT_mu20_mu8noL1_L1MU3VF', l1SeedThresholds=['MU3VF','FSNOSEED'], groups=PrimaryL1MuGroup+MultiMuonGroup, monGroups=['muonMon:online','muonMon:shifter']), + ChainProp(name='HLT_2mu10_L12MU3VF', groups=PrimaryL1MuGroup+MultiMuonGroup, monGroups=['muonMon:online','muonMon:shifter']), + ] + + chainsMC['Egamma'] = [ + + # single electron Run-3 primaries + ChainProp(name='HLT_e26_lhtight_ivarloose_L1eEM26M', groups=PrimaryPhIGroup+SingleElectronGroup, monGroups=['egammaMon:t0_tp']), + ChainProp(name='HLT_e26_lhtight_ivarloose_L1eEM26L', groups=PrimaryPhIGroup+SingleElectronGroup, monGroups=['egammaMon:t0_tp']), + ChainProp(name='HLT_e60_lhmedium_L1eEM26M', groups=PrimaryPhIGroup+SingleElectronGroup, monGroups=['egammaMon:t0_tp']), + ChainProp(name='HLT_e140_lhloose_L1eEM26M', groups=PrimaryPhIGroup+SingleElectronGroup, monGroups=['egammaMon:t0_tp']), + ChainProp(name='HLT_e300_etcut_L1eEM26M', groups=PrimaryPhIGroup+SingleElectronGroup, monGroups=['egammaMon:t0']), + # electron LRT + ChainProp(name='HLT_e30_lhloose_nopix_lrtmedium_L1eEM26M', groups=PrimaryPhIGroup+SingleElectronGroup), + # electron ringer + ChainProp(name='HLT_e140_lhloose_noringer_L1eEM26M', groups=SingleElectronGroup,monGroups=['egammaMon:shifter_tp']), + + # multi electron + ChainProp(name='HLT_2e17_lhvloose_L12eEM18M', groups=PrimaryPhIGroup+MultiElectronGroup), + ChainProp(name='HLT_e26_lhtight_e14_etcut_probe_50invmAB130_L1eEM26M', l1SeedThresholds=['eEM26M','PROBEeEM9'], groups=PrimaryPhIGroup+MultiElectronGroup), + ChainProp(name='HLT_e24_lhvloose_2e12_lhvloose_L1eEM24L_3eEM12L',l1SeedThresholds=['eEM24L','eEM12L'], groups=PrimaryPhIGroup+MultiElectronGroup), + # single photon + ChainProp(name='HLT_g140_loose_L1eEM26M', groups=PrimaryPhIGroup+SinglePhotonGroup), + ChainProp(name='HLT_g300_etcut_L1eEM26M', groups=PrimaryPhIGroup+SinglePhotonGroup), + + # multi photon + ChainProp(name='HLT_2g20_tight_icaloloose_L12eEM18M', groups=PrimaryPhIGroup+MultiPhotonGroup), + ChainProp(name='HLT_2g22_tight_L12eEM18M', groups=PrimaryPhIGroup+MultiPhotonGroup), + ChainProp(name='HLT_g35_medium_g25_medium_L12eEM24L', l1SeedThresholds=['eEM24L','eEM24L'], groups=PrimaryPhIGroup+MultiPhotonGroup), + ChainProp(name='HLT_2g50_loose_L12eEM24L', groups=PrimaryPhIGroup+MultiPhotonGroup), + + # From TDR studies + ChainProp(name='HLT_e20_lhmedium_ivarloose_L1eEM12L', groups=PrimaryPhIGroup+SingleElectronGroup, monGroups=['egammaMon:t0_tp']), + ChainProp(name='HLT_e20_lhtight_ivarloose_L1eEM12L', groups=PrimaryPhIGroup+SingleElectronGroup, monGroups=['egammaMon:t0_tp']), + ChainProp(name='HLT_e22_lhmedium_ivarloose_L1eEM12L', groups=PrimaryPhIGroup+SingleElectronGroup, monGroups=['egammaMon:t0_tp']), + ChainProp(name='HLT_e22_lhtight_ivarloose_L1eEM12L', groups=PrimaryPhIGroup+SingleElectronGroup, monGroups=['egammaMon:t0_tp']), + ChainProp(name='HLT_e45_lhmedium_L1eEM12L', groups=PrimaryPhIGroup+SingleElectronGroup, monGroups=['egammaMon:t0_tp']), + ChainProp(name='HLT_e60_lhloose_L1eEM12L', groups=PrimaryPhIGroup+SingleElectronGroup, monGroups=['egammaMon:t0_tp']), + # ringer + ChainProp(name='HLT_e26_lhtight_ivarloose_noringer_L1eEM12L', groups=PrimaryPhIGroup+SingleElectronGroup), + ChainProp(name='HLT_e28_lhtight_ivarloose_noringer_L1eEM12L', groups=PrimaryPhIGroup+SingleElectronGroup), + ChainProp(name='HLT_e60_lhmedium_noringer_L1eEM12L', groups=PrimaryPhIGroup+SingleElectronGroup), + + ChainProp(name='HLT_2e10_lhvloose_L12EM7', groups=PrimaryLegGroup+MultiElectronGroup), ##ATTENTION: Using legacy L1 + ChainProp(name='HLT_2e11_lhvloose_L12EM7', groups=PrimaryLegGroup+MultiElectronGroup), ##ATTENTION: Using legacy L1 + ChainProp(name='HLT_2e12_lhvloose_L12EM7', groups=PrimaryLegGroup+MultiElectronGroup), ##ATTENTION: Using legacy L1 + ChainProp(name='HLT_2e13_lhvloose_L12EM7', groups=PrimaryLegGroup+MultiElectronGroup), ##ATTENTION: Using legacy L1 + ChainProp(name='HLT_2e14_lhvloose_L12EM7', groups=PrimaryLegGroup+MultiElectronGroup), ##ATTENTION: Using legacy L1 + ChainProp(name='HLT_2e15_lhvloose_L12EM7', groups=PrimaryLegGroup+MultiElectronGroup), ##ATTENTION: Using legacy L1 + + ChainProp(name='HLT_2e10_lhloose_noringer_L12EM7', groups=SingleElectronGroup),##ATTENTION: Using legacy L1 + ChainProp(name='HLT_2e12_lhloose_noringer_L12EM7', groups=SingleElectronGroup),##ATTENTION: Using legacy L1 + ChainProp(name='HLT_2e15_lhloose_noringer_L12EM7', groups=SingleElectronGroup),##ATTENTION: Using legacy L1 + + ChainProp(name='HLT_g100_loose_L1eEM12L', groups=PrimaryPhIGroup+SinglePhotonGroup), + ChainProp(name='HLT_g100_medium_L1eEM12L', groups=PrimaryPhIGroup+SinglePhotonGroup), + ChainProp(name='HLT_g120_loose_L1eEM12L', groups=PrimaryPhIGroup+SinglePhotonGroup), + ChainProp(name='HLT_g120_medium_L1eEM12L', groups=PrimaryPhIGroup+SinglePhotonGroup), + ChainProp(name='HLT_g180_loose_L1eEM12L', groups=PrimaryPhIGroup+SinglePhotonGroup), + + ChainProp(name='HLT_g25_loose_g20_loose_L12eEM18L', l1SeedThresholds=['eEM24L','eEM24L'], groups=PrimaryPhIGroup+MultiPhotonGroup), + ChainProp(name='HLT_g25_medium_g20_medium_L12eEM18L', l1SeedThresholds=['eEM24L','eEM24L'], groups=PrimaryPhIGroup+MultiPhotonGroup), + + ChainProp(name='HLT_2g20_loose_L12eEM18L', groups=PrimaryPhIGroup+MultiPhotonGroup), + ChainProp(name='HLT_2g20_medium_L12eEM18L', groups=PrimaryPhIGroup+MultiPhotonGroup), + + ChainProp(name='HLT_2g25_loose_L12eEM18L', groups=PrimaryPhIGroup+MultiPhotonGroup), + ChainProp(name='HLT_2g25_medium_L12eEM18L', groups=PrimaryPhIGroup+MultiPhotonGroup), + ChainProp(name='HLT_2g25_tight_L12eEM18L', groups=PrimaryPhIGroup+MultiPhotonGroup), + ] + + chainsMC['Tau'] = [] chainsMC['Jet'] = [] chainsMC['Bjet'] = [] - chainsMC['Egamma'] = [] + chainsMC['MET'] = [] chainsMC['Bphysics'] = [] + chainsMC['Combined'] = [] + + chainsMC['UnconventionalTracking'] = [] + + chainsMC['Combined'] = [] + chainsMC['Streaming'] += [] - chainsMC['Combined'] += [] + chains['Beamspot'] += [] # check for chains that have the 'PS:Online' group, so that they are not simulated # -- does not make sense in MC menu diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/Menu/Physics_pp_run4_v1.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/Menu/Physics_pp_run4_v1.py index 252c0d1f82ec41d557472bec4bc7b3e9c3b3aa30..9251a44338cc4b3be846be1783c870e906db80e5 100644 --- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/Menu/Physics_pp_run4_v1.py +++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/Menu/Physics_pp_run4_v1.py @@ -1,15 +1,18 @@ # Copyright (C) 2002-2022 CERN for the benefit of the ATLAS collaboration #------------------------------------------------------------------------# -# Physics_pp_run4_v1.py menu for Phase-II development (to be kept empty for now) +# Physics_pp_run4_v1.py menu for Phase-II development +# contains some for the Run-3 (2022) primaries +# as well as chain from the TDR studies +# (https://gitlab.cern.ch/atlas/athena/-/blob/21.0/Trigger/TriggerCommon/TriggerMenu/python/menu/MC_PhaseII.py) #------------------------------------------------------------------------# # This defines the input format of the chain and it's properties with the defaults set # always required are: name, stream and groups #['name', 'chainParts'=[], 'stream', 'groups', 'merging'=[], 'topoStartFrom'=False], -###temporarily commented out only -# from TriggerMenuMT.HLT.Config.Utility.ChainDefInMenu import ChainProp +## needs to be commented in once chains are moved to this menu +#from TriggerMenuMT.HLT.Config.Utility.ChainDefInMenu import ChainProp # only temporarily commented! from .SignatureDicts import ChainStore PhysicsStream='Main' @@ -93,13 +96,13 @@ def setupMenu(): chains['Egamma'] = [] - chains['MET'] = [] + chains['Tau'] = [] chains['Jet'] = [] chains['Bjet'] = [] - chains['Tau'] = [] + chains['MET'] = [] chains['Bphysics'] = []