diff --git a/Trigger/TrigValidation/TrigAnalysisTest/share/ref_RDOtoRDOTrig_v1Dev_build.ref b/Trigger/TrigValidation/TrigAnalysisTest/share/ref_RDOtoRDOTrig_v1Dev_build.ref index 7295a10007bf03b2854a6f1ccf069849a7bb43b2..ced3e1d349dd22bf2be292a43ce1adaf7c13ec6e 100644 --- a/Trigger/TrigValidation/TrigAnalysisTest/share/ref_RDOtoRDOTrig_v1Dev_build.ref +++ b/Trigger/TrigValidation/TrigAnalysisTest/share/ref_RDOtoRDOTrig_v1Dev_build.ref @@ -334,11 +334,6 @@ HLT_2j175_a10sd_pf_nojcalib_ftf_0eta200_TracklessdR1p2_L1J100: 1: 6 HLT_2j20_mb_afprec_afpdijet_L1RD0_FILLED: eventCount: 0 - stepCounts: - 0: 20 - stepFeatures: - 0: 213 - 1: 20 HLT_2j250_ftf_0eta240_j120_ftf_0eta240_L1J100: eventCount: 1 stepCounts: @@ -2005,19 +2000,7 @@ HLT_e17_lhmedium_tau25_mediumRNN_tracktwoMVA_xe50_cell_03dRAB_L1EM15VHI_2TAU12IM 9: 1 10: 1 HLT_e20_lhloose_L1EM7: - eventCount: 6 - stepCounts: - 0: 7 - 1: 7 - 2: 6 - 3: 6 - 4: 6 - stepFeatures: - 0: 7 - 1: 11 - 2: 6 - 3: 9 - 4: 6 + eventCount: 0 HLT_e20_lhloose_L1EM7_AFP_A_AND_C: eventCount: 0 HLT_e20_lhloose_L1EM7_AFP_A_OR_C: @@ -8296,17 +8279,7 @@ HLT_mu20_2mu4noL1_L1MU14FCH: 2: 4 3: 4 HLT_mu20_L1MU5VF: - eventCount: 4 - stepCounts: - 0: 11 - 1: 4 - 2: 4 - 3: 4 - stepFeatures: - 0: 14 - 1: 4 - 2: 4 - 3: 4 + eventCount: 0 HLT_mu20_L1MU5VF_AFP_A_AND_C: eventCount: 0 HLT_mu20_L1MU5VF_AFP_A_OR_C: @@ -9806,7 +9779,7 @@ HLT_noalg_L1EM3: HLT_noalg_L1EM3_EMPTY: eventCount: 0 HLT_noalg_L1EM7: - eventCount: 19 + eventCount: 0 HLT_noalg_L1EM7_AFP_A_AND_C: eventCount: 0 HLT_noalg_L1EM7_AFP_A_OR_C: @@ -9932,7 +9905,7 @@ HLT_noalg_L1MBTS_2_EMPTY: HLT_noalg_L1MBTS_2_UNPAIRED_ISO: eventCount: 0 HLT_noalg_L1MU5VF: - eventCount: 11 + eventCount: 0 HLT_noalg_L1MU5VF_AFP_A_AND_C: eventCount: 0 HLT_noalg_L1MU5VF_AFP_A_OR_C: diff --git a/Trigger/TrigValidation/TrigP1Test/share/ref_v1Dev_decodeBS_build.ref b/Trigger/TrigValidation/TrigP1Test/share/ref_v1Dev_decodeBS_build.ref index 324c97e84a5f02002699154808e4229ccf87afea..952f68ba51adc1a5e7a408416c28ab5dc89ab355 100644 --- a/Trigger/TrigValidation/TrigP1Test/share/ref_v1Dev_decodeBS_build.ref +++ b/Trigger/TrigValidation/TrigP1Test/share/ref_v1Dev_decodeBS_build.ref @@ -145,11 +145,6 @@ HLT_2j175_a10sd_pf_nojcalib_ftf_0eta200_TracklessdR1p2_L1J100: eventCount: 0 HLT_2j20_mb_afprec_afpdijet_L1RD0_FILLED: eventCount: 0 - stepCounts: - 0: 40 - stepFeatures: - 0: 172 - 1: 40 HLT_2j250_ftf_0eta240_j120_ftf_0eta240_L1J100: eventCount: 0 HLT_2j250_pf_ftf_0eta240_j120_pf_ftf_0eta240_L1J100: @@ -739,10 +734,6 @@ HLT_e17_lhmedium_tau25_mediumRNN_tracktwoMVA_xe50_cell_03dRAB_L1EM15VHI_2TAU12IM eventCount: 0 HLT_e20_lhloose_L1EM7: eventCount: 0 - stepCounts: - 0: 2 - stepFeatures: - 0: 2 HLT_e20_lhloose_L1EM7_AFP_A_AND_C: eventCount: 0 HLT_e20_lhloose_L1EM7_AFP_A_OR_C: @@ -3146,10 +3137,6 @@ HLT_mu20_2mu4noL1_L1MU14FCH: 0: 1 HLT_mu20_L1MU5VF: eventCount: 0 - stepCounts: - 0: 5 - stepFeatures: - 0: 6 HLT_mu20_L1MU5VF_AFP_A_AND_C: eventCount: 0 HLT_mu20_L1MU5VF_AFP_A_OR_C: @@ -3776,7 +3763,7 @@ HLT_noalg_L1EM3: HLT_noalg_L1EM3_EMPTY: eventCount: 0 HLT_noalg_L1EM7: - eventCount: 25 + eventCount: 0 HLT_noalg_L1EM7_AFP_A_AND_C: eventCount: 0 HLT_noalg_L1EM7_AFP_A_OR_C: @@ -3902,7 +3889,7 @@ HLT_noalg_L1MBTS_2_EMPTY: HLT_noalg_L1MBTS_2_UNPAIRED_ISO: eventCount: 0 HLT_noalg_L1MU5VF: - eventCount: 6 + eventCount: 0 HLT_noalg_L1MU5VF_AFP_A_AND_C: eventCount: 0 HLT_noalg_L1MU5VF_AFP_A_OR_C: diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/HLTPrescaleJSON.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/HLTPrescaleJSON.py index ca03f5a7ac1a562ac8dc4ddd45492a183de944ed..427322a11dc2608de11bb34cc72fe759f585b8ef 100644 --- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/HLTPrescaleJSON.py +++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/HLTPrescaleJSON.py @@ -6,8 +6,7 @@ from TrigConfigSvc.TrigConfigSvcCfg import getHLTPrescalesSetFileName from AthenaCommon.Logging import logging __log = logging.getLogger( __name__ ) - -def __generateJSON( chainDicts, chainConfigs, menuName, fileName ): +def __generateJSON( chainDicts, chainConfigs, menuName, fileName): """ Generates JSON given the ChainProps and sequences """ # Prescale dictionary that is used to create the JSON content @@ -57,7 +56,7 @@ def generateJSON(): return __generateJSON( TriggerConfigHLT.dictsList(), TriggerConfigHLT.configsList(), ConfigFlags.Trigger.triggerMenuSetup, - getHLTPrescalesSetFileName(ConfigFlags) ) + getHLTPrescalesSetFileName(ConfigFlags)) def generateJSON_newJO( chainDicts, chainConfigs ): __log.info("Generating HLT Prescale JSON in the new JO") diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/MenuPrescaleConfig.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/MenuPrescaleConfig.py index f22afde43ccc39415e400d24fd8c5e7afd3448d6..25d45bda256ee542638b370775931f04ace300db 100755 --- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/MenuPrescaleConfig.py +++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/MenuPrescaleConfig.py @@ -7,7 +7,6 @@ log = logging.getLogger( __name__ ) def MenuPrescaleConfig(triggerConfigHLT): - L1Prescales = {} HLTPrescales = {} Prescales = PrescaleClass() @@ -35,8 +34,12 @@ def MenuPrescaleConfig(triggerConfigHLT): enableChains(TriggerFlags, Prescales.HLTPrescales_primary_prescale, ['Primary:L1Muon','Primary:Legacy','Primary:PhaseI','Primary:CostAndRate']) L1Prescales = Prescales.L1Prescales_trigvalid_prescale HLTPrescales = Prescales.HLTPrescales_primary_prescale + elif 'TriggerValidation_prescale_lowMu' in menu_name: + disableChains(TriggerFlags, Prescales.HLTPrescales_trigvalid_prescale_lowMu, ["PS:Online"]) + L1Prescales = Prescales.L1Prescales_trigvalid_prescale_lowMu + HLTPrescales = Prescales.HLTPrescales_trigvalid_prescale_lowMu elif 'TriggerValidation_prescale' in menu_name: - disableChains(TriggerFlags, Prescales.HLTPrescales_trigvalid_prescale, ["PS:Online"]) + disableChains(TriggerFlags, Prescales.HLTPrescales_trigvalid_prescale, ["PS:Online","LowMu"]) L1Prescales = Prescales.L1Prescales_trigvalid_prescale HLTPrescales = Prescales.HLTPrescales_trigvalid_prescale elif 'BulkMCProd_prescale' in menu_name: @@ -140,6 +143,10 @@ def disableChains(flags, type_prescales, type_groups): for group in type_groups: if group in chain.groups: toKeep = False + else: #check also the presence of a group that contains one of the labels from type_groups + for ch_group in chain.groups: + if group in ch_group: + toKeep = False if not toKeep: chain_disable_list.append(chain.name) @@ -199,6 +206,9 @@ class PrescaleClass(object): L1Prescales_trigvalid_prescale = {} HLTPrescales_trigvalid_prescale = {} + L1Prescales_trigvalid_prescale_lowMu = {} + HLTPrescales_trigvalid_prescale_lowMu = {} + L1Prescales_bulkmcprod_prescale = {} HLTPrescales_bulkmcprod_prescale = {} diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/PhysicsP1_pp_run3_v1.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/PhysicsP1_pp_run3_v1.py index 432ed6f3a1417d3b42560a7488aa93c2cf31a232..f3f421e144462e637a5e7743382a4ca785e1dba7 100644 --- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/PhysicsP1_pp_run3_v1.py +++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/PhysicsP1_pp_run3_v1.py @@ -54,12 +54,6 @@ def addP1Signatures(): #ChainProp(name='HLT_beamspot_activeTE_trkfast_L1J15', l1SeedThresholds=['FSNOSEED'], stream=['BeamSpot'], groups=['RATE:BeamSpot', 'BW:BeamSpot']), #ChainProp(name='HLT_beamspot_trkFS_trkfast_L1J15', l1SeedThresholds=['FSNOSEED'], stream=['BeamSpot'], groups=['RATE:BeamSpot', 'BW:BeamSpot']), ] - TriggerFlags.MinBiasSlice.signatures = TriggerFlags.MinBiasSlice.signatures() + [ - ChainProp(name='HLT_mb_sptrk_L1RD0_FILLED', l1SeedThresholds=['FSNOSEED'], stream=[PhysicsStream], groups=['PS:Online',MinBiasGroup]), - ChainProp(name='HLT_mb_sp_L1RD0_FILLED', l1SeedThresholds=['FSNOSEED'], stream=[PhysicsStream], groups=['PS:Online',MinBiasGroup]), - ChainProp(name='HLT_mb_alfaperf_L1RD0_FILLED', l1SeedThresholds=['FSNOSEED'], stream=['DISCARD'], groups=MinBiasGroup+['PS:Online']), - ChainProp(name='HLT_mb_alfaperf_L1RD0_EMPTY', l1SeedThresholds=['FSNOSEED'], stream=['DISCARD'], groups=MinBiasGroup+['PS:Online']), - ] TriggerFlags.CalibSlice.signatures = TriggerFlags.CalibSlice.signatures() + [ ChainProp(name='HLT_noalg_LArPEBCalib_L1RD0_EMPTY', l1SeedThresholds=['FSNOSEED'], stream=['LArPEB'], groups=['RATE:Calibration','BW:Detector']), ChainProp(name='HLT_noalg_LArPEBCalib_L1RD0_BGRP11', l1SeedThresholds=['FSNOSEED'], stream=['LArPEB'], groups=['RATE:Calibration','BW:Detector']), diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/Physics_pp_run3_v1.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/Physics_pp_run3_v1.py index d0d66e88bca1a9c1bdb2586fb0e65e8688c06e84..71499ae0b943957fb36e5370fe741f952c55cf0d 100644 --- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/Physics_pp_run3_v1.py +++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/Physics_pp_run3_v1.py @@ -566,7 +566,13 @@ def setupMenu(): ] TriggerFlags.HeavyIonSlice.signatures = [] TriggerFlags.BeamspotSlice.signatures = [] - TriggerFlags.MinBiasSlice.signatures = [] + # TriggerFlags.MinBiasSlice.signatures = [] + TriggerFlags.MinBiasSlice.signatures = [ + ChainProp(name='HLT_mb_sptrk_L1RD0_FILLED', l1SeedThresholds=['FSNOSEED'], stream=[PhysicsStream], groups=LowMuGroup+MinBiasGroup), + ChainProp(name='HLT_mb_sp_L1RD0_FILLED', l1SeedThresholds=['FSNOSEED'], stream=[PhysicsStream], groups=LowMuGroup+MinBiasGroup), + ChainProp(name='HLT_mb_alfaperf_L1RD0_FILLED', l1SeedThresholds=['FSNOSEED'], stream=['DISCARD'], groups=['PS:Online']+LowMuGroup+MinBiasGroup), + ChainProp(name='HLT_mb_alfaperf_L1RD0_EMPTY', l1SeedThresholds=['FSNOSEED'], stream=['DISCARD'], groups=['PS:Online']+LowMuGroup+MinBiasGroup), + ] TriggerFlags.CalibSlice.signatures = [] TriggerFlags.CosmicSlice.signatures = [] TriggerFlags.StreamingSlice.signatures = [] diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/L1/Menu/MenuMapping.py b/Trigger/TriggerCommon/TriggerMenuMT/python/L1/Menu/MenuMapping.py index 163616bbdc9dcfaf2e5dc3d924b29199db97cd11..f21336d1591162931ec1befa80f575d95e6890b7 100644 --- a/Trigger/TriggerCommon/TriggerMenuMT/python/L1/Menu/MenuMapping.py +++ b/Trigger/TriggerCommon/TriggerMenuMT/python/L1/Menu/MenuMapping.py @@ -23,4 +23,8 @@ menuMap = { "LS2_v1_TriggerValidation_prescale" : ["MC_pp_v8","MC_pp_v8_inputs","MC_pp_v8_inputs_legacy"], "LS2_v1_BulkMCProd_prescale" : ["MC_pp_v8","MC_pp_v8_inputs","MC_pp_v8_inputs_legacy"], "LS2_v1_CPSampleProd_prescale" : ["MC_pp_v8","MC_pp_v8_inputs","MC_pp_v8_inputs_legacy"], + "LS2_v1_TriggerValidation_prescale_lowMu" : ["MC_pp_v8","MC_pp_v8_inputs","MC_pp_v8_inputs_legacy"], + "Physics_pp_run3_v1_lowMu" : ["Physics_pp_v8","MC_pp_v8_inputs","MC_pp_v8_inputs_legacy"], + "PhysicsP1_pp_run3_v1_lowMu" : ["Physics_pp_v8","MC_pp_v8_inputs","MC_pp_v8_inputs_legacy"], + }