From b08fa02f37819996931ac8a3ce6ff0d63d29890e Mon Sep 17 00:00:00 2001 From: Teng Jian Khoo Date: Sat, 14 May 2022 13:47:27 +0200 Subject: [PATCH 01/12] Strip prescale sets from menu for L1 mapping --- .../TriggerCommon/TriggerMenuMT/python/L1/L1MenuConfig.py | 4 ++++ .../TriggerMenuMT/python/L1/Menu/MenuMapping.py | 8 +++----- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/L1/L1MenuConfig.py b/Trigger/TriggerCommon/TriggerMenuMT/python/L1/L1MenuConfig.py index c845da31c58..4089c76377e 100644 --- a/Trigger/TriggerCommon/TriggerMenuMT/python/L1/L1MenuConfig.py +++ b/Trigger/TriggerCommon/TriggerMenuMT/python/L1/L1MenuConfig.py @@ -231,6 +231,10 @@ class L1MenuConfig(object): def _menuToLoad(self, silent=False): """ resolve the menu name to the menu files to load""" menuToLoadReq = self.menuFullName + # Extract the menu name, independent of menu prescale sets + if menuToLoadReq.endswith('prescale'): + menuToLoadReq = re.match('\w*_v\d*',self.menuFullName).group(0) + log.info(f'Base menu name {menuToLoadReq} extracted from {self.menuFullName}') from .Menu.MenuMapping import menuMap if menuToLoadReq in menuMap: menuToLoad = menuMap[menuToLoadReq] diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/L1/Menu/MenuMapping.py b/Trigger/TriggerCommon/TriggerMenuMT/python/L1/Menu/MenuMapping.py index c587f8db377..587d9c0e780 100644 --- a/Trigger/TriggerCommon/TriggerMenuMT/python/L1/Menu/MenuMapping.py +++ b/Trigger/TriggerCommon/TriggerMenuMT/python/L1/Menu/MenuMapping.py @@ -4,7 +4,9 @@ This map specifies with menu to load from TriggerMenuMT/python/L1/Menu The mapping takes precedence over the existence of the menu definition file in the above directory -The resolved name is also being used in the L1/Config/ItemDef.py and L1/Config/ThresholdDef*.py files +The resolved name is also being used in the L1/Config/ItemDef.py and L1/Config/ThresholdDef*.py files + +Prescale sets will be stripped from the menu name """ menuMap = { @@ -13,10 +15,6 @@ menuMap = { "PhysicsP1_pp_run3_v1" : ["Physics_pp_run3_v1","Physics_pp_run3_v1_inputs","MC_pp_run3_v1_inputs_legacy"], "MC_pp_run3_v1" : ["MC_pp_run3_v1", "MC_pp_run3_v1_inputs", "MC_pp_run3_v1_inputs_legacy"], "Dev_pp_run3_v1" : ["MC_pp_run3_v1", "MC_pp_run3_v1_inputs", "MC_pp_run3_v1_inputs_legacy"], - "Dev_pp_run3_v1_Primary_prescale" : ["MC_pp_run3_v1", "MC_pp_run3_v1_inputs", "MC_pp_run3_v1_inputs_legacy"], - "Dev_pp_run3_v1_TriggerValidation_prescale" : ["MC_pp_run3_v1", "MC_pp_run3_v1_inputs", "MC_pp_run3_v1_inputs_legacy"], - "Dev_pp_run3_v1_BulkMCProd_prescale" : ["MC_pp_run3_v1", "MC_pp_run3_v1_inputs", "MC_pp_run3_v1_inputs_legacy"], - "Dev_pp_run3_v1_CPSampleProd_prescale" : ["MC_pp_run3_v1", "MC_pp_run3_v1_inputs", "MC_pp_run3_v1_inputs_legacy"], # low mu "PhysicsP1_pp_lowMu_run3_v1" : ["MC_HI_run3_v1", "Physics_pp_run3_v1_inputs","MC_HI_run3_v1_inputs_legacy"], -- GitLab From 2d380aa2cf9db5d5521032f8e68c77f84553f70c Mon Sep 17 00:00:00 2001 From: Teng Jian Khoo Date: Sat, 14 May 2022 13:47:44 +0200 Subject: [PATCH 02/12] Define PS set for HLT reprocessings --- .../python/HLT/Menu/MenuPrescaleConfig.py | 35 +++++++++++++++++++ 1 file changed, 35 insertions(+) diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/Menu/MenuPrescaleConfig.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/Menu/MenuPrescaleConfig.py index cbcc317c096..215824f59b5 100644 --- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/Menu/MenuPrescaleConfig.py +++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/Menu/MenuPrescaleConfig.py @@ -48,6 +48,10 @@ def MenuPrescaleConfig(hltMenuConfig, flags): filterChains(chains, Prescales.HLTPrescales_cpsampleprod_prescale, ["PS:Online"]) L1Prescales = Prescales.L1Prescales_cpsampleprod_prescale HLTPrescales = Prescales.HLTPrescales_cpsampleprod_prescale + elif 'HLTReprocessing_prescale' in menu_name: + filterChains(chains, Prescales.HLTPrescales_HLTRepro_prescale, ["PS:NoRepro"]) + L1Prescales = Prescales.L1Prescales_HLTRepro_prescale + HLTPrescales = Prescales.HLTPrescales_HLTRepro_prescale else: L1Prescales = Prescales.L1Prescales HLTPrescales = Prescales.HLTPrescales @@ -63,6 +67,10 @@ def MenuPrescaleConfig(hltMenuConfig, flags): chains = setupMenu() L1Prescales = Prescales.L1Prescales HLTPrescales = Prescales.HLTPrescales + if 'HLTReprocessing_prescale' in menu_name: + filterChains(chains, Prescales.HLTPrescales_trigvalid_prescale, ["PS:NoRepro"]) + L1Prescales = Prescales.L1Prescales_HLTRepro_prescale + HLTPrescales = Prescales.HLTPrescales_HLTRepro_prescale elif menu_name.startswith('PhysicsP1_pp_lowMu_run3_v1'): from TriggerMenuMT.HLT.Menu.PhysicsP1_pp_lowMu_run3_v1 import setupMenu @@ -170,4 +178,31 @@ class PrescaleClass(object): L1Prescales_cpsampleprod_prescale = {} HLTPrescales_cpsampleprod_prescale = {} + # PS for reprocessing and related ART tests + # Avoid high CPU usage for low-mu triggers + # mainly to be used for 900 GeV, or other triggers + # that should normally run with prescales in standard pp + L1Prescales_HLTRepro_prescale = {} + HLTPrescales_HLTRepro_prescale = { + 'HLT_cosmic_id_L1MU3V_EMPTY': 10, + 'HLT_cosmic_id_L1MU8VF_EMPTY': 10, + 'HLT_mb_sp_L1RD0_FILLED': 10, + 'HLT_mb_sptrk_L1RD0_FILLED': 10, + 'HLT_mb_sptrk_L1MBTS_1': 10, + 'HLT_mb_sptrk_L1MBTS_2': 10, + 'HLT_mb_sptrk_L1MBTS_2_UNPAIRED_ISO': 10, + 'HLT_mb_sptrk_L1MBTS_2_EMPTY': 10, + 'HLT_mb_sptrk_pt2_L1RD0_FILLED': 10, + 'HLT_mb_sptrk_pt2_L1MBTS_2': 10, + 'HLT_mb_sptrk_pt2_L1AFP_A_OR_C': 10, + 'HLT_mb_sptrk_pt4_L1MBTS_1': 10, + 'HLT_mb_sptrk_pt6_L1MBTS_1': 10, + 'HLT_mb_sptrk_pt8_L1MBTS_1': 10, + 'HLT_mb_sp900_trk60_hmt_L1MBTS_1_1': 10, + 'HLT_mb_sp500_trk40_hmt_L1RD0_FILLED': 10, + 'HLT_mb_sp500_trk40_hmt_L1MBTS_2': 10, + 'HLT_mb_sp800_trk60_hmt_L1RD0_FILLED': 10, + 'HLT_mb_sp800_trk60_hmt_L1MBTS_2': 10, + } + chain_list=[] -- GitLab From 96e500584ea38b9fc18bd8af690f164c39001a22 Mon Sep 17 00:00:00 2001 From: Teng Jian Khoo Date: Sat, 14 May 2022 13:48:03 +0200 Subject: [PATCH 03/12] Label to disable chains in HLT repro --- .../TriggerMenuMT/python/HLT/Menu/PhysicsP1_pp_run3_v1.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/Menu/PhysicsP1_pp_run3_v1.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/Menu/PhysicsP1_pp_run3_v1.py index c17246c97da..dbdc45b8c53 100644 --- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/Menu/PhysicsP1_pp_run3_v1.py +++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/Menu/PhysicsP1_pp_run3_v1.py @@ -294,7 +294,7 @@ def addP1Signatures(chains): ] chainsP1['Monitor'] = [ - ChainProp(name='HLT_timeburner_L1All', l1SeedThresholds=['FSNOSEED'], stream=['DISCARD'], groups=['PS:Online','RATE:DISCARD','BW:DISCARD']), + ChainProp(name='HLT_timeburner_L1All', l1SeedThresholds=['FSNOSEED'], stream=['DISCARD'], groups=['PS:Online','PS:NoRepro','RATE:DISCARD','BW:DISCARD']), ] -- GitLab From 34cce1927805e188f73cf156aa93c3002393c5c4 Mon Sep 17 00:00:00 2001 From: Teng Jian Khoo Date: Sat, 14 May 2022 13:48:25 +0200 Subject: [PATCH 04/12] Prescale set for PhysicsP1 ART tests --- .../TrigP1Test/test/test_trigP1_v1PhysP1_T0MonTrf_build.py | 2 +- .../TrigP1Test/test/test_trigP1_v1PhysP1_T0Mon_build.py | 2 +- .../TrigP1Test/test/test_trigP1_v1PhysP1_T0Mon_grid.py | 2 +- .../TrigP1Test/test/test_trigP1_v1PhysP1_build.py | 2 +- .../TrigValidation/TrigP1Test/test/test_trigP1_v1PhysP1_grid.py | 2 +- .../TrigP1Test/test/test_trigP1_v1PhysP1_noL1Sim_build.py | 2 +- .../test/test_trigP1_v1PhysP1_noL1Sim_dumpConfig_build.py | 2 +- .../TrigP1Test/test/test_trigP1_v1PhysP1_noL1Sim_grid.py | 2 +- .../test/test_trigP1_v1PhysP1_noL1Sim_runStopRun_build.py | 2 +- .../TrigP1Test/test/test_trigP1_v1PhysP1_trfDbgStream_build.py | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-) diff --git a/Trigger/TrigValidation/TrigP1Test/test/test_trigP1_v1PhysP1_T0MonTrf_build.py b/Trigger/TrigValidation/TrigP1Test/test/test_trigP1_v1PhysP1_T0MonTrf_build.py index 096260b5435..5cd998ca3c9 100755 --- a/Trigger/TrigValidation/TrigP1Test/test/test_trigP1_v1PhysP1_T0MonTrf_build.py +++ b/Trigger/TrigValidation/TrigP1Test/test/test_trigP1_v1PhysP1_T0MonTrf_build.py @@ -16,7 +16,7 @@ hlt.forks = 1 hlt.threads = 4 hlt.concurrent_events = 4 hlt.max_events = 50 -hlt.args = '--precommand=\\\"setMenu=\\\'PhysicsP1_pp_run3_v1\\\'\\;doL1Sim=True\\;rewriteLVL1=True\\;\\\"' +hlt.args = '--precommand=\\\"setMenu=\\\'PhysicsP1_pp_run3_v1_HLT_Reprocessing_prescale\\\'\\;doL1Sim=True\\;rewriteLVL1=True\\;\\\"' hlt.args += ' --prodSysBSRDO True' hlt.args += ' --outputBSFile=RAW.pool.root' hlt.args += ' --outputHIST_HLTMONFile=hltmon.root' diff --git a/Trigger/TrigValidation/TrigP1Test/test/test_trigP1_v1PhysP1_T0Mon_build.py b/Trigger/TrigValidation/TrigP1Test/test/test_trigP1_v1PhysP1_T0Mon_build.py index 7e3aa1f1944..807eba4fca7 100755 --- a/Trigger/TrigValidation/TrigP1Test/test/test_trigP1_v1PhysP1_T0Mon_build.py +++ b/Trigger/TrigValidation/TrigP1Test/test/test_trigP1_v1PhysP1_T0Mon_build.py @@ -19,7 +19,7 @@ hlt.threads = 4 hlt.concurrent_events = 4 hlt.input = 'data' hlt.max_events = 50 -hlt.args = '-c "setMenu=\'PhysicsP1_pp_run3_v1\';doL1Sim=True;rewriteLVL1=True;"' +hlt.args = '-c "setMenu=\'PhysicsP1_pp_run3_v1_HLT_Reprocessing_prescale\';doL1Sim=True;rewriteLVL1=True;"' hlt.args += ' -o output' # Extract the physics_Main stream out of the BS file with many streams diff --git a/Trigger/TrigValidation/TrigP1Test/test/test_trigP1_v1PhysP1_T0Mon_grid.py b/Trigger/TrigValidation/TrigP1Test/test/test_trigP1_v1PhysP1_T0Mon_grid.py index 903471dccd7..e2d76b7aaee 100755 --- a/Trigger/TrigValidation/TrigP1Test/test/test_trigP1_v1PhysP1_T0Mon_grid.py +++ b/Trigger/TrigValidation/TrigP1Test/test/test_trigP1_v1PhysP1_T0Mon_grid.py @@ -30,7 +30,7 @@ hlt.forks = 1 hlt.threads = 4 hlt.concurrent_events = 4 hlt.input = 'data' -hlt.args = '-c "setMenu=\'PhysicsP1_pp_run3_v1\';doL1Sim=True;rewriteLVL1=True;"' +hlt.args = '-c "setMenu=\'PhysicsP1_pp_run3_v1_HLT_Reprocessing_prescale\';doL1Sim=True;rewriteLVL1=True;"' hlt.args += ' -o output' hlt.args += ' --dump-config-reload' diff --git a/Trigger/TrigValidation/TrigP1Test/test/test_trigP1_v1PhysP1_build.py b/Trigger/TrigValidation/TrigP1Test/test/test_trigP1_v1PhysP1_build.py index f5460d4be96..b1e68fe7efa 100755 --- a/Trigger/TrigValidation/TrigP1Test/test/test_trigP1_v1PhysP1_build.py +++ b/Trigger/TrigValidation/TrigP1Test/test/test_trigP1_v1PhysP1_build.py @@ -21,7 +21,7 @@ ex = ExecStep.ExecStep() ex.type = 'athenaHLT' ex.job_options = 'TriggerJobOpts/runHLT_standalone.py' ex.input = 'data' -ex.args = '-c "setMenu=\'PhysicsP1_pp_run3_v1\';doL1Sim=True;rewriteLVL1=True;"' +ex.args = '-c "setMenu=\'PhysicsP1_pp_run3_v1_HLT_Reprocessing_prescale\';doL1Sim=True;rewriteLVL1=True;"' ex.args += ' -o output' ex.args += ' --dump-config-reload' diff --git a/Trigger/TrigValidation/TrigP1Test/test/test_trigP1_v1PhysP1_grid.py b/Trigger/TrigValidation/TrigP1Test/test/test_trigP1_v1PhysP1_grid.py index a0d1e583118..cb96bbc01f3 100755 --- a/Trigger/TrigValidation/TrigP1Test/test/test_trigP1_v1PhysP1_grid.py +++ b/Trigger/TrigValidation/TrigP1Test/test/test_trigP1_v1PhysP1_grid.py @@ -29,7 +29,7 @@ ex.job_options = 'TriggerJobOpts/runHLT_standalone.py' ex.input = 'data' ex.threads = 4 ex.concurrent_events = 4 -ex.args = '-c "setMenu=\'PhysicsP1_pp_run3_v1\';doL1Sim=True;"' +ex.args = '-c "setMenu=\'PhysicsP1_pp_run3_v1_HLT_Reprocessing_prescale\';doL1Sim=True;"' ex.args += ' --dump-config-reload' test = Test.Test() diff --git a/Trigger/TrigValidation/TrigP1Test/test/test_trigP1_v1PhysP1_noL1Sim_build.py b/Trigger/TrigValidation/TrigP1Test/test/test_trigP1_v1PhysP1_noL1Sim_build.py index 2766325eb37..7e704b16bcb 100755 --- a/Trigger/TrigValidation/TrigP1Test/test/test_trigP1_v1PhysP1_noL1Sim_build.py +++ b/Trigger/TrigValidation/TrigP1Test/test/test_trigP1_v1PhysP1_noL1Sim_build.py @@ -13,7 +13,7 @@ ex.type = 'athenaHLT' ex.job_options = 'TriggerJobOpts/runHLT_standalone.py' ex.input = 'data' precommand = ''.join([ - "setMenu='PhysicsP1_pp_run3_v1';", + "setMenu='PhysicsP1_pp_run3_v1_HLT_Reprocessing_prescale';", "doL1Sim=False;", "enableL1MuonPhase1=False;", "forceEnableAllChains=True;", diff --git a/Trigger/TrigValidation/TrigP1Test/test/test_trigP1_v1PhysP1_noL1Sim_dumpConfig_build.py b/Trigger/TrigValidation/TrigP1Test/test/test_trigP1_v1PhysP1_noL1Sim_dumpConfig_build.py index d81528ac1a9..4e00e06044b 100755 --- a/Trigger/TrigValidation/TrigP1Test/test/test_trigP1_v1PhysP1_noL1Sim_dumpConfig_build.py +++ b/Trigger/TrigValidation/TrigP1Test/test/test_trigP1_v1PhysP1_noL1Sim_dumpConfig_build.py @@ -12,7 +12,7 @@ ex = ExecStep.ExecStep() ex.type = 'athenaHLT' ex.job_options = 'TriggerJobOpts/runHLT_standalone.py' ex.input = '' # No input file needed to generate config -ex.args = '-c "setMenu=\'PhysicsP1_pp_run3_v1\';"' +ex.args = '-c "setMenu=\'PhysicsP1_pp_run3_v1_HLT_Reprocessing_prescale\';"' ex.args += ' -M --dump-config-exit' ex.perfmon = False # Cannot use PerfMon with -M ex.fpe_auditor = False # Don't want FPEAuditor in SMK for P1 diff --git a/Trigger/TrigValidation/TrigP1Test/test/test_trigP1_v1PhysP1_noL1Sim_grid.py b/Trigger/TrigValidation/TrigP1Test/test/test_trigP1_v1PhysP1_noL1Sim_grid.py index 85b386fecfe..4228866fe8c 100755 --- a/Trigger/TrigValidation/TrigP1Test/test/test_trigP1_v1PhysP1_noL1Sim_grid.py +++ b/Trigger/TrigValidation/TrigP1Test/test/test_trigP1_v1PhysP1_noL1Sim_grid.py @@ -30,7 +30,7 @@ ex.input = 'data' ex.threads = 4 ex.concurrent_events = 4 precommand = ''.join([ - "setMenu='PhysicsP1_pp_run3_v1';", + "setMenu='PhysicsP1_pp_run3_v1_HLT_Reprocessing_prescale';", "doL1Sim=False;", "enableL1MuonPhase1=False;", "forceEnableAllChains=True;", diff --git a/Trigger/TrigValidation/TrigP1Test/test/test_trigP1_v1PhysP1_noL1Sim_runStopRun_build.py b/Trigger/TrigValidation/TrigP1Test/test/test_trigP1_v1PhysP1_noL1Sim_runStopRun_build.py index 2cceaebf982..c7263739857 100755 --- a/Trigger/TrigValidation/TrigP1Test/test/test_trigP1_v1PhysP1_noL1Sim_runStopRun_build.py +++ b/Trigger/TrigValidation/TrigP1Test/test/test_trigP1_v1PhysP1_noL1Sim_runStopRun_build.py @@ -16,7 +16,7 @@ ex.type = 'athenaHLT' ex.job_options = 'TriggerJobOpts/runHLT_standalone.py' ex.input = 'data' precommand = ''.join([ - "setMenu='PhysicsP1_pp_run3_v1';", + "setMenu='PhysicsP1_pp_run3_v1_HLT_Reprocessing_prescale';", "enableL1MuonPhase1=False;", "forceEnableAllChains=True;", "enableCostMonitoring=False;", diff --git a/Trigger/TrigValidation/TrigP1Test/test/test_trigP1_v1PhysP1_trfDbgStream_build.py b/Trigger/TrigValidation/TrigP1Test/test/test_trigP1_v1PhysP1_trfDbgStream_build.py index e11a5e219e8..a3cd1bfbc47 100755 --- a/Trigger/TrigValidation/TrigP1Test/test/test_trigP1_v1PhysP1_trfDbgStream_build.py +++ b/Trigger/TrigValidation/TrigP1Test/test/test_trigP1_v1PhysP1_trfDbgStream_build.py @@ -17,7 +17,7 @@ hlt.forks = 1 hlt.threads = 1 hlt.concurrent_events = 1 hlt.max_events = 50 -hlt.args = '--precommand=\\\"setMenu=\\\'PhysicsP1_pp_run3_v1\\\'\\\"' +hlt.args = '--precommand=\\\"setMenu=\\\'PhysicsP1_pp_run3_v1_HLT_Reprocessing_prescale\\\'\\\"' hlt.args += ' --streamSelection=All' hlt.args += ' --prodSysBSRDO True' hlt.args += ' --outputBSFile=RAW.pool.root' -- GitLab From b8bd62a1536a8c3e44c19901f3d07b4c2bce85cb Mon Sep 17 00:00:00 2001 From: Teng Jian Khoo Date: Sat, 14 May 2022 16:28:38 +0200 Subject: [PATCH 05/12] Change to r-string to avoid flake8 complaint about invalid escapes --- Trigger/TriggerCommon/TriggerMenuMT/python/L1/L1MenuConfig.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/L1/L1MenuConfig.py b/Trigger/TriggerCommon/TriggerMenuMT/python/L1/L1MenuConfig.py index 4089c76377e..c489098eb6f 100644 --- a/Trigger/TriggerCommon/TriggerMenuMT/python/L1/L1MenuConfig.py +++ b/Trigger/TriggerCommon/TriggerMenuMT/python/L1/L1MenuConfig.py @@ -233,7 +233,7 @@ class L1MenuConfig(object): menuToLoadReq = self.menuFullName # Extract the menu name, independent of menu prescale sets if menuToLoadReq.endswith('prescale'): - menuToLoadReq = re.match('\w*_v\d*',self.menuFullName).group(0) + menuToLoadReq = re.match(r'\w*_v\d*',self.menuFullName).group(0) log.info(f'Base menu name {menuToLoadReq} extracted from {self.menuFullName}') from .Menu.MenuMapping import menuMap if menuToLoadReq in menuMap: -- GitLab From 4684958203bf155d53033cda78bb1588d9d72e1e Mon Sep 17 00:00:00 2001 From: Teng Jian Khoo Date: Mon, 16 May 2022 17:35:43 +0200 Subject: [PATCH 06/12] PS:NoRepro --> PS:DISCARD Clean up MenuPrescaleConfig --- .../python/HLT/Menu/MenuPrescaleConfig.py | 141 ++++-------------- .../python/HLT/Menu/PhysicsP1_pp_run3_v1.py | 4 +- 2 files changed, 33 insertions(+), 112 deletions(-) diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/Menu/MenuPrescaleConfig.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/Menu/MenuPrescaleConfig.py index 215824f59b5..2f82e0a24f4 100644 --- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/Menu/MenuPrescaleConfig.py +++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/Menu/MenuPrescaleConfig.py @@ -1,6 +1,6 @@ # Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration -import itertools +import itertools, importlib from AthenaCommon.Logging import logging log = logging.getLogger( __name__ ) @@ -14,116 +14,40 @@ def MenuPrescaleConfig(hltMenuConfig, flags): menu_name = flags.Trigger.triggerMenuSetup - ## Do some aliasing here - if menu_name == 'Physics_default': - menu_name = 'Dev_pp_run3_v1' - elif menu_name == 'MC_loose_default': - menu_name = 'Dev_pp_run3_v1' - elif menu_name == 'MC_tight_default': - menu_name = 'Dev_pp_run3_v1' - log.info('Menu name: %s', menu_name) - if menu_name.startswith('Dev_pp_run3_v1'): - from TriggerMenuMT.HLT.Menu.Dev_pp_run3_v1 import setupMenu - chains = setupMenu() - if 'tight_mc_prescale' in menu_name: - L1Prescales = Prescales.L1Prescales_tight_mc_prescale - HLTPrescales = Prescales.HLTPrescales_tight_mc_prescale - elif 'Primary_prescale' in menu_name: - filterChains(chains, Prescales.HLTPrescales_primary_prescale, - ['Primary:L1Muon','Primary:Legacy','Primary:PhaseI','Primary:CostAndRate'], - invert = True) # enable these groups - L1Prescales = Prescales.L1Prescales_trigvalid_prescale - HLTPrescales = Prescales.HLTPrescales_primary_prescale - elif 'TriggerValidation_prescale' in menu_name: - filterChains(chains, Prescales.HLTPrescales_trigvalid_prescale, ["PS:Online"]) - L1Prescales = Prescales.L1Prescales_trigvalid_prescale - HLTPrescales = Prescales.HLTPrescales_trigvalid_prescale - elif 'BulkMCProd_prescale' in menu_name: - filterChains(chains, Prescales.HLTPrescales_bulkmcprod_prescale, ["PS:Online"]) - L1Prescales = Prescales.L1Prescales_bulkmcprod_prescale - HLTPrescales = Prescales.HLTPrescales_bulkmcprod_prescale - elif 'CPSampleProd_prescale' in menu_name: - filterChains(chains, Prescales.HLTPrescales_cpsampleprod_prescale, ["PS:Online"]) - L1Prescales = Prescales.L1Prescales_cpsampleprod_prescale - HLTPrescales = Prescales.HLTPrescales_cpsampleprod_prescale - elif 'HLTReprocessing_prescale' in menu_name: - filterChains(chains, Prescales.HLTPrescales_HLTRepro_prescale, ["PS:NoRepro"]) - L1Prescales = Prescales.L1Prescales_HLTRepro_prescale - HLTPrescales = Prescales.HLTPrescales_HLTRepro_prescale - else: - L1Prescales = Prescales.L1Prescales - HLTPrescales = Prescales.HLTPrescales - - elif menu_name.startswith('Physics_pp_run3_v1'): - from TriggerMenuMT.HLT.Menu.Physics_pp_run3_v1 import setupMenu - chains = setupMenu() - L1Prescales = Prescales.L1Prescales - HLTPrescales = Prescales.HLTPrescales - - elif menu_name.startswith('PhysicsP1_pp_run3_v1'): - from TriggerMenuMT.HLT.Menu.PhysicsP1_pp_run3_v1 import setupMenu - chains = setupMenu() - L1Prescales = Prescales.L1Prescales - HLTPrescales = Prescales.HLTPrescales - if 'HLTReprocessing_prescale' in menu_name: - filterChains(chains, Prescales.HLTPrescales_trigvalid_prescale, ["PS:NoRepro"]) - L1Prescales = Prescales.L1Prescales_HLTRepro_prescale - HLTPrescales = Prescales.HLTPrescales_HLTRepro_prescale - - elif menu_name.startswith('PhysicsP1_pp_lowMu_run3_v1'): - from TriggerMenuMT.HLT.Menu.PhysicsP1_pp_lowMu_run3_v1 import setupMenu - chains = setupMenu() - L1Prescales = Prescales.L1Prescales - HLTPrescales = Prescales.HLTPrescales - - elif menu_name.startswith('MC_pp_run3_v1'): - from TriggerMenuMT.HLT.Menu.MC_pp_run3_v1 import setupMenu - chains = setupMenu() - if 'tight_mc_prescale' in menu_name: - L1Prescales = Prescales.L1Prescales_tight_mc_prescale - HLTPrescales = Prescales.HLTPrescales_tight_mc_prescale - else: - L1Prescales = Prescales.L1Prescales - HLTPrescales = Prescales.HLTPrescales - - elif menu_name.startswith('PhysicsP1_HI_run3_v1'): - from TriggerMenuMT.HLT.Menu.PhysicsP1_HI_run3_v1 import setupMenu - chains = setupMenu() - L1Prescales = Prescales.L1Prescales - HLTPrescales = Prescales.HLTPrescales - - elif menu_name.startswith('Dev_HI_run3_v1'): - from TriggerMenuMT.HLT.Menu.Dev_HI_run3_v1 import setupMenu - chains = setupMenu() - if 'tight_mc_prescale' in menu_name: - L1Prescales = Prescales.L1Prescales_tight_mc_prescale - HLTPrescales = Prescales.HLTPrescales_tight_mc_prescale - else: - L1Prescales = Prescales.L1Prescales - HLTPrescales = Prescales.HLTPrescales - - elif menu_name.startswith('Dev_pp_run3_emu_v1'): - from TriggerMenuMT.HLT.Menu.Dev_pp_run3_v1 import setupMenu - - chains = setupMenu() - if 'tight_mc_prescale' in menu_name: - L1Prescales = Prescales.L1Prescales_tight_mc_prescale - HLTPrescales = Prescales.HLTPrescales_tight_mc_prescale - else: - L1Prescales = Prescales.L1Prescales - HLTPrescales = Prescales.HLTPrescales - - elif menu_name.startswith('Cosmic_run3_v1'): - from TriggerMenuMT.HLT.Menu.Cosmic_run3_v1 import setupMenu - chains = setupMenu() + # Generate the list of chains from the basic menu (terminates in a version number) + base_menu_name = re.match(r'\w*_v\d*',self.menuFullName).group(0) + try: + menu_module = importlib.import_module(f'TriggerMenuMT.HLT.Menu.{base_menu_name}') + except Exception as e: + log.fatal(f'Failed to import menu module "{base_menu_name}" inferred from menu "{menu_name}"!') + raise e + chains = menu_module.setupMenu() + + # Determine prescale sets from the remainder of the menu name + if 'Primary_prescale' in menu_name: + filterChains(chains, Prescales.HLTPrescales_primary_prescale, + ['Primary:L1Muon','Primary:Legacy','Primary:PhaseI','Primary:CostAndRate'], + invert = True) # enable these groups + L1Prescales = Prescales.L1Prescales_trigvalid_prescale + HLTPrescales = Prescales.HLTPrescales_primary_prescale + elif 'TriggerValidation_prescale' in menu_name: + filterChains(chains, Prescales.HLTPrescales_trigvalid_prescale, ["PS:Online", "PS:DISCARD"]) + L1Prescales = Prescales.L1Prescales_trigvalid_prescale + HLTPrescales = Prescales.HLTPrescales_trigvalid_prescale + elif 'BulkMCProd_prescale' in menu_name: + assert(menu_name.startswith('Dev') or menu_name.startswith('MC')) + filterChains(chains, Prescales.HLTPrescales_bulkmcprod_prescale, ["PS:Online", "PS:DISCARD"]) + L1Prescales = Prescales.L1Prescales_bulkmcprod_prescale + HLTPrescales = Prescales.HLTPrescales_bulkmcprod_prescale + elif 'HLTReprocessing_prescale' in menu_name: + filterChains(chains, Prescales.HLTPrescales_HLTRepro_prescale, ["PS:DISCARD"]) + L1Prescales = Prescales.L1Prescales_HLTRepro_prescale + HLTPrescales = Prescales.HLTPrescales_HLTRepro_prescale + else: L1Prescales = Prescales.L1Prescales HLTPrescales = Prescales.HLTPrescales - - else: - log.fatal('Menu with name %s is not known in this version of TriggerMenu! ', menu_name) - return return (L1Prescales, HLTPrescales, chains) @@ -175,9 +99,6 @@ class PrescaleClass(object): L1Prescales_bulkmcprod_prescale = {} HLTPrescales_bulkmcprod_prescale = {} - L1Prescales_cpsampleprod_prescale = {} - HLTPrescales_cpsampleprod_prescale = {} - # PS for reprocessing and related ART tests # Avoid high CPU usage for low-mu triggers # mainly to be used for 900 GeV, or other triggers diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/Menu/PhysicsP1_pp_run3_v1.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/Menu/PhysicsP1_pp_run3_v1.py index dbdc45b8c53..c10204f8250 100644 --- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/Menu/PhysicsP1_pp_run3_v1.py +++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/Menu/PhysicsP1_pp_run3_v1.py @@ -106,7 +106,7 @@ def addP1Signatures(chains): ChainProp(name='HLT_larnoiseburst_L1J40_XE50', l1SeedThresholds=['FSNOSEED'], stream=['LArNoiseBurst'], groups=['PS:Online','RATE:Calibration','BW:Detector']+SupportLegGroup), ChainProp(name='HLT_larnoiseburst_L1J40_XE60', l1SeedThresholds=['FSNOSEED'], stream=['LArNoiseBurst'], groups=['PS:Online','RATE:Calibration','BW:Detector']+SupportLegGroup), ChainProp(name='HLT_larnoiseburst_L1All', l1SeedThresholds=['FSNOSEED'], stream=['LArNoiseBurst'], groups=['PS:Online','RATE:Calibration','BW:Detector']), - ChainProp(name='HLT_acceptedevts_larnoiseburst_L1All', l1SeedThresholds=['FSNOSEED'], stream=['DISCARD'], groups=['PS:Online','RATE:DISCARD','BW:DISCARD']), + ChainProp(name='HLT_acceptedevts_larnoiseburst_L1All', l1SeedThresholds=['FSNOSEED'], stream=['DISCARD'], groups=['PS:Online','PS:DISCARD','RATE:DISCARD','BW:DISCARD']), ## larpsall/em*FIRSTEMPTY ChainProp(name='HLT_larpsallem_L1EM7_FIRSTEMPTY', l1SeedThresholds=['EM7'], stream=['LArNoiseBurst'], groups=['PS:Online','RATE:Calibration','BW:Detector']+SupportLegGroup), @@ -294,7 +294,7 @@ def addP1Signatures(chains): ] chainsP1['Monitor'] = [ - ChainProp(name='HLT_timeburner_L1All', l1SeedThresholds=['FSNOSEED'], stream=['DISCARD'], groups=['PS:Online','PS:NoRepro','RATE:DISCARD','BW:DISCARD']), + ChainProp(name='HLT_timeburner_L1All', l1SeedThresholds=['FSNOSEED'], stream=['DISCARD'], groups=['PS:Online','PS:DISCARD','RATE:DISCARD','BW:DISCARD']), ] -- GitLab From cd37c6c834969fcbbe8e7aeaa305f85360ca9306 Mon Sep 17 00:00:00 2001 From: Teng Jian Khoo Date: Mon, 16 May 2022 17:36:15 +0200 Subject: [PATCH 07/12] Fix variable name --- .../TriggerMenuMT/python/HLT/Menu/MenuPrescaleConfig.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/Menu/MenuPrescaleConfig.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/Menu/MenuPrescaleConfig.py index 2f82e0a24f4..110eeb05a4f 100644 --- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/Menu/MenuPrescaleConfig.py +++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/Menu/MenuPrescaleConfig.py @@ -17,7 +17,7 @@ def MenuPrescaleConfig(hltMenuConfig, flags): log.info('Menu name: %s', menu_name) # Generate the list of chains from the basic menu (terminates in a version number) - base_menu_name = re.match(r'\w*_v\d*',self.menuFullName).group(0) + base_menu_name = re.match(r'\w*_v\d*',menu_name).group(0) try: menu_module = importlib.import_module(f'TriggerMenuMT.HLT.Menu.{base_menu_name}') except Exception as e: -- GitLab From 054c010d23e083412c7f5b028302c6f2e198996b Mon Sep 17 00:00:00 2001 From: Teng Jian Khoo Date: Mon, 16 May 2022 19:01:38 +0200 Subject: [PATCH 08/12] Import regex --- .../TriggerMenuMT/python/HLT/Menu/MenuPrescaleConfig.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/Menu/MenuPrescaleConfig.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/Menu/MenuPrescaleConfig.py index 110eeb05a4f..2f85d3bf287 100644 --- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/Menu/MenuPrescaleConfig.py +++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/Menu/MenuPrescaleConfig.py @@ -1,6 +1,6 @@ # Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration -import itertools, importlib +import itertools, importlib, re from AthenaCommon.Logging import logging log = logging.getLogger( __name__ ) -- GitLab From d6d9db9aec8fd75316bf9f59b1186c06d5ff9b14 Mon Sep 17 00:00:00 2001 From: Teng Jian Khoo Date: Tue, 17 May 2022 18:34:14 +0200 Subject: [PATCH 09/12] Further reorganisation of labels for menu prescale sets --- .../python/HLT/Menu/MenuPrescaleConfig.py | 20 +++++++++++++------ .../python/HLT/Menu/PhysicsP1_pp_run3_v1.py | 6 +++--- 2 files changed, 17 insertions(+), 9 deletions(-) diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/Menu/MenuPrescaleConfig.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/Menu/MenuPrescaleConfig.py index 2f85d3bf287..2f4d95d00b4 100644 --- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/Menu/MenuPrescaleConfig.py +++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/Menu/MenuPrescaleConfig.py @@ -26,23 +26,31 @@ def MenuPrescaleConfig(hltMenuConfig, flags): chains = menu_module.setupMenu() # Determine prescale sets from the remainder of the menu name + # These filters become progressively less inclusive: + # - Primary: primary (always unprescaled) triggers only + # - BulkMCProd: triggers for generic CP and physics analysis work (veto label PS:NoBulkMCProd) + # - TriggerValidation: adds more specialised triggers for trigger performance + # and/or CP studies, possibly run heavily prescaled in data (veto label PS:NoTrigVal) + # - HLTReprocessing: excludes a handful of triggers not to be + # used in reprocessing jobs, mostly due to CPU cost (veto label PS:NoHLTRepro) + # if 'Primary_prescale' in menu_name: filterChains(chains, Prescales.HLTPrescales_primary_prescale, ['Primary:L1Muon','Primary:Legacy','Primary:PhaseI','Primary:CostAndRate'], invert = True) # enable these groups L1Prescales = Prescales.L1Prescales_trigvalid_prescale HLTPrescales = Prescales.HLTPrescales_primary_prescale - elif 'TriggerValidation_prescale' in menu_name: - filterChains(chains, Prescales.HLTPrescales_trigvalid_prescale, ["PS:Online", "PS:DISCARD"]) - L1Prescales = Prescales.L1Prescales_trigvalid_prescale - HLTPrescales = Prescales.HLTPrescales_trigvalid_prescale elif 'BulkMCProd_prescale' in menu_name: assert(menu_name.startswith('Dev') or menu_name.startswith('MC')) - filterChains(chains, Prescales.HLTPrescales_bulkmcprod_prescale, ["PS:Online", "PS:DISCARD"]) + filterChains(chains, Prescales.HLTPrescales_bulkmcprod_prescale, ["PS:NoHLTRepro","PS:NoTrigVal","PS:NoBulkMCProd","PS:Online"]) L1Prescales = Prescales.L1Prescales_bulkmcprod_prescale HLTPrescales = Prescales.HLTPrescales_bulkmcprod_prescale + elif 'TriggerValidation_prescale' in menu_name: + filterChains(chains, Prescales.HLTPrescales_trigvalid_prescale, ["PS:NoHLTRepro","PS:NoTrigVal","PS:Online"]) + L1Prescales = Prescales.L1Prescales_trigvalid_prescale + HLTPrescales = Prescales.HLTPrescales_trigvalid_prescale elif 'HLTReprocessing_prescale' in menu_name: - filterChains(chains, Prescales.HLTPrescales_HLTRepro_prescale, ["PS:DISCARD"]) + filterChains(chains, Prescales.HLTPrescales_HLTRepro_prescale, ["PS:NoHLTRepro"]) L1Prescales = Prescales.L1Prescales_HLTRepro_prescale HLTPrescales = Prescales.HLTPrescales_HLTRepro_prescale else: diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/Menu/PhysicsP1_pp_run3_v1.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/Menu/PhysicsP1_pp_run3_v1.py index c10204f8250..1b69767bbbd 100644 --- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/Menu/PhysicsP1_pp_run3_v1.py +++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/Menu/PhysicsP1_pp_run3_v1.py @@ -105,8 +105,8 @@ def addP1Signatures(chains): ChainProp(name='HLT_larnoiseburst_L1J100', l1SeedThresholds=['FSNOSEED'], stream=['LArNoiseBurst'], groups=['PS:Online','RATE:Calibration','BW:Detector']+SupportLegGroup), ChainProp(name='HLT_larnoiseburst_L1J40_XE50', l1SeedThresholds=['FSNOSEED'], stream=['LArNoiseBurst'], groups=['PS:Online','RATE:Calibration','BW:Detector']+SupportLegGroup), ChainProp(name='HLT_larnoiseburst_L1J40_XE60', l1SeedThresholds=['FSNOSEED'], stream=['LArNoiseBurst'], groups=['PS:Online','RATE:Calibration','BW:Detector']+SupportLegGroup), - ChainProp(name='HLT_larnoiseburst_L1All', l1SeedThresholds=['FSNOSEED'], stream=['LArNoiseBurst'], groups=['PS:Online','RATE:Calibration','BW:Detector']), - ChainProp(name='HLT_acceptedevts_larnoiseburst_L1All', l1SeedThresholds=['FSNOSEED'], stream=['DISCARD'], groups=['PS:Online','PS:DISCARD','RATE:DISCARD','BW:DISCARD']), + ChainProp(name='HLT_larnoiseburst_L1All', l1SeedThresholds=['FSNOSEED'], stream=['LArNoiseBurst'], groups=['PS:Online','PS:NoHLTRepro','RATE:Calibration','BW:Detector']), # Temporary for testing, high CPU cost + ChainProp(name='HLT_acceptedevts_larnoiseburst_L1All', l1SeedThresholds=['FSNOSEED'], stream=['DISCARD'], groups=['PS:Online','RATE:DISCARD','BW:DISCARD']), ## larpsall/em*FIRSTEMPTY ChainProp(name='HLT_larpsallem_L1EM7_FIRSTEMPTY', l1SeedThresholds=['EM7'], stream=['LArNoiseBurst'], groups=['PS:Online','RATE:Calibration','BW:Detector']+SupportLegGroup), @@ -294,7 +294,7 @@ def addP1Signatures(chains): ] chainsP1['Monitor'] = [ - ChainProp(name='HLT_timeburner_L1All', l1SeedThresholds=['FSNOSEED'], stream=['DISCARD'], groups=['PS:Online','PS:DISCARD','RATE:DISCARD','BW:DISCARD']), + ChainProp(name='HLT_timeburner_L1All', l1SeedThresholds=['FSNOSEED'], stream=['DISCARD'], groups=['PS:Online','PS:NoHLTRepro','RATE:DISCARD','BW:DISCARD']), ] -- GitLab From dc4aebeb191973b752e047151e15e8fa760b906a Mon Sep 17 00:00:00 2001 From: Teng Jian Khoo Date: Wed, 18 May 2022 14:08:50 +0200 Subject: [PATCH 10/12] Disable FS lrt test chain in HLT reprocessing --- .../TriggerMenuMT/python/HLT/Menu/Dev_pp_run3_v1.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/Menu/Dev_pp_run3_v1.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/Menu/Dev_pp_run3_v1.py index 1a510c443b9..8eed625d99c 100644 --- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/Menu/Dev_pp_run3_v1.py +++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/Menu/Dev_pp_run3_v1.py @@ -762,15 +762,15 @@ def setupMenu(): chains['UnconventionalTracking'] += [ #Isolated High Pt Trigger Test chain for optimisation studies - ChainProp(name='HLT_unconvtrk50_isohpttrack_L1XE50', groups=SingleMETGroup, l1SeedThresholds=['FSNOSEED']), + ChainProp(name='HLT_unconvtrk50_isohpttrack_L1XE50', groups=SingleMETGroup+DevGroup, l1SeedThresholds=['FSNOSEED']), - ChainProp(name='HLT_unconvtrk0_fslrt_L1J100', groups=SingleJetGroup, l1SeedThresholds=['FSNOSEED']), - ChainProp(name='HLT_unconvtrk0_fslrt_L14J15', groups=MultiJetGroup, l1SeedThresholds=['FSNOSEED']), - ChainProp(name='HLT_unconvtrk0_fslrt_L1XE50', groups=SingleMETGroup, l1SeedThresholds=['FSNOSEED']), + ChainProp(name='HLT_unconvtrk0_fslrt_L1J100', groups=SingleJetGroup+DevGroup+['PS:NoHLTRepro'], l1SeedThresholds=['FSNOSEED']), + ChainProp(name='HLT_unconvtrk0_fslrt_L14J15', groups=MultiJetGroup+DevGroup+['PS:NoHLTRepro'], l1SeedThresholds=['FSNOSEED']), + ChainProp(name='HLT_unconvtrk0_fslrt_L1XE50', groups=SingleMETGroup+DevGroup+['PS:NoHLTRepro'], l1SeedThresholds=['FSNOSEED']), # TrigVSI - ChainProp(name='HLT_unconvtrk0_fsvsi_L1XE50', groups=PrimaryLegGroup+UnconvTrkGroup, l1SeedThresholds=['FSNOSEED']), + ChainProp(name='HLT_unconvtrk0_fsvsi_L1XE50', groups=PrimaryLegGroup+UnconvTrkGroup+DevGroup, l1SeedThresholds=['FSNOSEED']), # disappearing track trigger ChainProp(name='HLT_unconvtrk20_distrk_tight_L1XE50', groups=SupportLegGroup+UnconvTrkGroup+['RATE:CPS_XE50'], l1SeedThresholds=['FSNOSEED']), -- GitLab From 208487be86706d554d14ea97e06efda072bf16a1 Mon Sep 17 00:00:00 2001 From: Teng Jian Khoo Date: Wed, 18 May 2022 14:25:47 +0200 Subject: [PATCH 11/12] Clarify application of prescales from menu prescale sets --- .../TriggerMenuMT/python/HLT/Menu/MenuPrescaleConfig.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/Menu/MenuPrescaleConfig.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/Menu/MenuPrescaleConfig.py index 2f4d95d00b4..0514652e7f9 100644 --- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/Menu/MenuPrescaleConfig.py +++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/Menu/MenuPrescaleConfig.py @@ -34,11 +34,14 @@ def MenuPrescaleConfig(hltMenuConfig, flags): # - HLTReprocessing: excludes a handful of triggers not to be # used in reprocessing jobs, mostly due to CPU cost (veto label PS:NoHLTRepro) # + # Besides the filter, explicit prescale values may also be set for specific triggers + # -- see the end of the file for these mappings, which should not overlap with the + # disabled triggers (else they will be overwritten) if 'Primary_prescale' in menu_name: filterChains(chains, Prescales.HLTPrescales_primary_prescale, ['Primary:L1Muon','Primary:Legacy','Primary:PhaseI','Primary:CostAndRate'], invert = True) # enable these groups - L1Prescales = Prescales.L1Prescales_trigvalid_prescale + L1Prescales = Prescales.L1Prescales_primary_prescale HLTPrescales = Prescales.HLTPrescales_primary_prescale elif 'BulkMCProd_prescale' in menu_name: assert(menu_name.startswith('Dev') or menu_name.startswith('MC')) -- GitLab From 1e381a4e8f0acc9ec3a49af2cd57b7f41ab97bdb Mon Sep 17 00:00:00 2001 From: Teng Jian Khoo Date: Thu, 19 May 2022 11:50:09 +0200 Subject: [PATCH 12/12] Update references --- .../share/ref_RDOtoRDOTrig_v1Dev_build.ref | 18 +++--------------- .../share/ref_v1Dev_decodeBS_build.ref | 6 +----- 2 files changed, 4 insertions(+), 20 deletions(-) diff --git a/Trigger/TrigValidation/TrigAnalysisTest/share/ref_RDOtoRDOTrig_v1Dev_build.ref b/Trigger/TrigValidation/TrigAnalysisTest/share/ref_RDOtoRDOTrig_v1Dev_build.ref index 79060246778..9688decc007 100644 --- a/Trigger/TrigValidation/TrigAnalysisTest/share/ref_RDOtoRDOTrig_v1Dev_build.ref +++ b/Trigger/TrigValidation/TrigAnalysisTest/share/ref_RDOtoRDOTrig_v1Dev_build.ref @@ -16480,23 +16480,11 @@ HLT_tau80_tightRNN_tracktwoLLP_tau60_tightRNN_tracktwoLLP_03dRAB_L1eTAU80_2eTAU6 2: 10 3: 10 HLT_unconvtrk0_fslrt_L14J15: - eventCount: 11 - stepCounts: - 0: 11 - stepFeatures: - 0: 11 + eventCount: 0 HLT_unconvtrk0_fslrt_L1J100: - eventCount: 3 - stepCounts: - 0: 3 - stepFeatures: - 0: 3 + eventCount: 0 HLT_unconvtrk0_fslrt_L1XE50: - eventCount: 6 - stepCounts: - 0: 6 - stepFeatures: - 0: 6 + eventCount: 0 HLT_unconvtrk0_fsvsi_L1XE50: eventCount: 0 HLT_unconvtrk200_hitdv_medium_L1XE50: diff --git a/Trigger/TrigValidation/TrigP1Test/share/ref_v1Dev_decodeBS_build.ref b/Trigger/TrigValidation/TrigP1Test/share/ref_v1Dev_decodeBS_build.ref index 64544f43085..a76942b513c 100644 --- a/Trigger/TrigValidation/TrigP1Test/share/ref_v1Dev_decodeBS_build.ref +++ b/Trigger/TrigValidation/TrigP1Test/share/ref_v1Dev_decodeBS_build.ref @@ -7054,11 +7054,7 @@ HLT_unconvtrk0_fslrt_L14J15: HLT_unconvtrk0_fslrt_L1J100: eventCount: 0 HLT_unconvtrk0_fslrt_L1XE50: - eventCount: 1 - stepCounts: - 0: 1 - stepFeatures: - 0: 1 + eventCount: 0 HLT_unconvtrk0_fsvsi_L1XE50: eventCount: 0 HLT_unconvtrk200_hitdv_medium_L1XE50: -- GitLab