From 1f73b04e2b8d2f8673beb468b1f9d5136f4fd380 Mon Sep 17 00:00:00 2001 From: Jonathan Bossio <jonathan.bossio@cern.ch> Date: Wed, 14 Apr 2021 10:41:59 +0200 Subject: [PATCH 1/6] Move LS2_v1 chains to Physics menu --- .../python/HLTMenuConfig/Menu/LS2_v1.py | 2 -- .../HLTMenuConfig/Menu/Physics_pp_run3_v1.py | 35 +++++++++++++++++++ 2 files changed, 35 insertions(+), 2 deletions(-) diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/LS2_v1.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/LS2_v1.py index 8acee3b8b398..0edd49f791d8 100644 --- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/LS2_v1.py +++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/LS2_v1.py @@ -302,7 +302,6 @@ def setupMenu(): ChainProp(name='HLT_j45_pf_ftf_010jvt_L1J15', groups=SingleJetGroup), ChainProp(name='HLT_j45_pf_ftf_020jvt_L1J15', groups=SingleJetGroup), ChainProp(name='HLT_j45_pf_ftf_050jvt_L1J15', groups=SingleJetGroup), - ChainProp(name='HLT_j45_pf_ftf_preselj20_L1J15', groups=SingleJetGroup), ChainProp(name='HLT_j45_ftf_preselj20_L1J15', groups=SingleJetGroup), ChainProp(name='HLT_j45_subjesIS_ftf_preselj20_L1J15', groups=SingleJetGroup), ChainProp(name='HLT_j45_pf_subjesgsc_ftf_L1J15', groups=SingleJetGroup), @@ -328,7 +327,6 @@ def setupMenu(): ChainProp(name='HLT_j460_a10sd_cssk_pf_nojcalib_ftf_L1J100', groups=SingleJetGroup), ChainProp(name='HLT_j460_a10sd_cssk_pf_nojcalib_ftf_35smcINF_L1J100', groups=SingleJetGroup), ChainProp(name='HLT_2j330_a10sd_cssk_pf_nojcalib_ftf_35smcINF_L1J100', groups=SingleJetGroup), - ChainProp(name='HLT_j460_a10sd_cssk_pf_jes_ftf_L1J100', groups=SingleJetGroup), ChainProp(name='HLT_j460_a10sd_cssk_pf_jes_ftf_35smcINF_L1J100', groups=SingleJetGroup), ChainProp(name='HLT_2j330_a10sd_cssk_pf_jes_ftf_35smcINF_L1J100', groups=SingleJetGroup), 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 845c7f3bd614..ce00559241da 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 @@ -121,6 +121,41 @@ def setupMenu(): ] TriggerFlags.JetSlice.signatures = [ + # Central single small-R jet chains + ChainProp(name='HLT_j15_pf_ftf_L1RD0_FILLED', l1SeedThresholds=['FSNOSEED'], groups=SingleJetGroup+SupportLegGroup), + ChainProp(name='HLT_j25_pf_ftf_L1RD0_FILLED', l1SeedThresholds=['FSNOSEED'], groups=SingleJetGroup+SupportLegGroup), + ChainProp(name='HLT_j35_pf_ftf_L1RD0_FILLED', l1SeedThresholds=['FSNOSEED'], groups=SingleJetGroup+SupportLegGroup), + ChainProp(name='HLT_j45_pf_ftf_preselj20_L1J15', groups=SingleJetGroup+SupportLegGroup), + ChainProp(name='HLT_j60_pf_ftf_preselj20_L1J20', groups=SingleJetGroup+SupportLegGroup), + ChainProp(name='HLT_j85_pf_ftf_preselj20_L1J20', groups=SingleJetGroup+SupportLegGroup), + ChainProp(name='HLT_j110_pf_ftf_preselj20_L1J30', groups=SingleJetGroup+SupportLegGroup), + ChainProp(name='HLT_j175_pf_ftf_preselj20_L1J50', groups=SingleJetGroup+SupportLegGroup), + ChainProp(name='HLT_j260_pf_ftf_preselj20_L1J75', groups=SingleJetGroup+SupportLegGroup), + ChainProp(name='HLT_j360_pf_ftf_preselj20_L1J100', groups=SingleJetGroup+SupportLegGroup), + ChainProp(name='HLT_j380_pf_ftf_preselj20_L1J100', groups=SingleJetGroup+SupportLegGroup), + ChainProp(name='HLT_j400_pf_ftf_preselj20_L1J100', groups=SingleJetGroup+SupportLegGroup), + ChainProp(name='HLT_j420_pf_ftf_preselj20_L1J100', groups=SingleJetGroup+PrimaryLegGroup), + ChainProp(name='HLT_j440_pf_ftf_preselj20_L1J100', groups=SingleJetGroup+PrimaryLegGroup), + ChainProp(name='HLT_j450_pf_ftf_preselj20_L1J100', groups=SingleJetGroup+PrimaryLegGroup), + ChainProp(name='HLT_j460_pf_ftf_preselj20_L1J100', groups=SingleJetGroup+PrimaryLegGroup), + ChainProp(name='HLT_j480_pf_ftf_preselj20_L1J100', groups=SingleJetGroup+PrimaryLegGroup), + ChainProp(name='HLT_j500_pf_ftf_preselj20_L1J100', groups=SingleJetGroup+PrimaryLegGroup), + ChainProp(name='HLT_j520_pf_ftf_preselj20_L1J100', groups=SingleJetGroup+PrimaryLegGroup), + # Central single large-R jet chains + ChainProp(name='HLT_j110_a10sd_cssk_pf_jes_ftf_L1J30', groups=SingleJetGroup+SupportLegGroup), + ChainProp(name='HLT_j175_a10sd_cssk_pf_jes_ftf_L1J50', groups=SingleJetGroup+SupportLegGroup), + ChainProp(name='HLT_j260_a10sd_cssk_pf_jes_ftf_L1J75', groups=SingleJetGroup+SupportLegGroup), + ChainProp(name='HLT_j260_a10sd_cssk_pf_jes_ftf_L1SC85-CJ15', l1SeedThresholds=['FSNOSEED'], groups=SingleJetGroup+SupportLegGroup), + ChainProp(name='HLT_j360_a10sd_cssk_pf_jes_ftf_L1J100', groups=SingleJetGroup+SupportLegGroup), + ChainProp(name='HLT_j360_a10sd_cssk_pf_jes_ftf_L1SC111-CJ15', l1SeedThresholds=['FSNOSEED'], groups=SingleJetGroup+SupportLegGroup), + ChainProp(name='HLT_j400_a10sd_cssk_pf_jes_ftf_L1J100', groups=SingleJetGroup+SupportLegGroup), + ChainProp(name='HLT_j400_a10sd_cssk_pf_jes_ftf_L1SC111-CJ15', l1SeedThresholds=['FSNOSEED'], groups=SingleJetGroup+SupportLegGroup), + ChainProp(name='HLT_j420_a10sd_cssk_pf_jes_ftf_L1J100', groups=SingleJetGroup+SupportLegGroup), + ChainProp(name='HLT_j420_a10sd_cssk_pf_jes_ftf_L1SC111-CJ15', l1SeedThresholds=['FSNOSEED'], groups=SingleJetGroup+SupportLegGroup), + ChainProp(name='HLT_j460_a10sd_cssk_pf_jes_ftf_L1J100', groups=SingleJetGroup+PrimaryLegGroup), + ChainProp(name='HLT_j460_a10sd_cssk_pf_jes_ftf_L1SC111-CJ15', l1SeedThresholds=['FSNOSEED'], groups=SingleJetGroup+PrimaryLegGroup), + ChainProp(name='HLT_j480_a10sd_cssk_pf_jes_ftf_L1J100', groups=SingleJetGroup+PrimaryLegGroup), + ChainProp(name='HLT_j480_a10sd_cssk_pf_jes_ftf_L1SC111-CJ15', l1SeedThresholds=['FSNOSEED'], groups=SingleJetGroup+PrimaryLegGroup), # ATR-20049 ChainProp(name='HLT_j420_L1J100', groups=SingleJetGroup + BCIDmonGroup), ChainProp(name='HLT_j260_320eta490_L1J75_31ETA49', groups=SingleJetGroup), -- GitLab From d66f2a9843f984b67750776f266d5a33c00aec5e Mon Sep 17 00:00:00 2001 From: Jonathan Bossio <jonathan.bossio@cern.ch> Date: Wed, 14 Apr 2021 17:13:06 +0200 Subject: [PATCH 2/6] Remove chain using a seed not in the L1 menu --- .../python/HLTMenuConfig/Menu/Physics_pp_run3_v1.py | 1 - 1 file changed, 1 deletion(-) 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 ce00559241da..7d527a9b98c3 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 @@ -145,7 +145,6 @@ def setupMenu(): ChainProp(name='HLT_j110_a10sd_cssk_pf_jes_ftf_L1J30', groups=SingleJetGroup+SupportLegGroup), ChainProp(name='HLT_j175_a10sd_cssk_pf_jes_ftf_L1J50', groups=SingleJetGroup+SupportLegGroup), ChainProp(name='HLT_j260_a10sd_cssk_pf_jes_ftf_L1J75', groups=SingleJetGroup+SupportLegGroup), - ChainProp(name='HLT_j260_a10sd_cssk_pf_jes_ftf_L1SC85-CJ15', l1SeedThresholds=['FSNOSEED'], groups=SingleJetGroup+SupportLegGroup), ChainProp(name='HLT_j360_a10sd_cssk_pf_jes_ftf_L1J100', groups=SingleJetGroup+SupportLegGroup), ChainProp(name='HLT_j360_a10sd_cssk_pf_jes_ftf_L1SC111-CJ15', l1SeedThresholds=['FSNOSEED'], groups=SingleJetGroup+SupportLegGroup), ChainProp(name='HLT_j400_a10sd_cssk_pf_jes_ftf_L1J100', groups=SingleJetGroup+SupportLegGroup), -- GitLab From 8cb9c179a30d91ac85819a93f10b56845b102fe3 Mon Sep 17 00:00:00 2001 From: Jonathan Bossio <jonathan.bossio@cern.ch> Date: Thu, 15 Apr 2021 14:04:41 +0200 Subject: [PATCH 3/6] Update one of the reference files --- .../share/ref_data_v1Dev_build.ref | 130 ++++++++++++++++++ 1 file changed, 130 insertions(+) diff --git a/Trigger/TrigValidation/TriggerTest/share/ref_data_v1Dev_build.ref b/Trigger/TrigValidation/TriggerTest/share/ref_data_v1Dev_build.ref index 139ea4ffd418..08e39b431adb 100644 --- a/Trigger/TrigValidation/TriggerTest/share/ref_data_v1Dev_build.ref +++ b/Trigger/TrigValidation/TriggerTest/share/ref_data_v1Dev_build.ref @@ -1303,6 +1303,22 @@ HLT_j100_pf_ftf_0eta320_j20_pf_ftf_boffperf_L1HT190-J15s5pETA21: 0: 20 1: 5 2: 2 +HLT_j110_a10sd_cssk_pf_jes_ftf_L1J30: + eventCount: 2 + stepCounts: + 0: 4 + 1: 2 + stepFeatures: + 0: 4 + 1: 2 +HLT_j110_pf_ftf_preselj20_L1J30: + eventCount: 1 + stepCounts: + 0: 4 + 1: 1 + stepFeatures: + 0: 4 + 1: 1 HLT_j110_subjesgscIS_ftf_bdl1r60_split_j45_subjesgscIS_ftf_bdl1r70_split_L1J50: eventCount: 0 stepCounts: @@ -1335,8 +1351,22 @@ HLT_j150_subresjesgscIS_ftf_2j55_subresjesgscIS_ftf_L1J85_3J30: 0: 20 stepFeatures: 0: 20 +HLT_j15_pf_ftf_L1RD0_FILLED: + eventCount: 18 + stepCounts: + 0: 20 + 1: 18 + stepFeatures: + 0: 20 + 1: 77 HLT_j165_LArPEBHLT_L1J100: eventCount: 0 +HLT_j175_a10sd_cssk_pf_jes_ftf_L1J50: + eventCount: 0 + stepCounts: + 0: 2 + stepFeatures: + 0: 2 HLT_j175_ftf_bmv2c1060_split_j60_ftf_bmv2c1060_L1J100: eventCount: 0 stepCounts: @@ -1349,6 +1379,12 @@ HLT_j175_pf_ftf_bdl1r60_split_j60_pf_ftf_bdl1r60_L1J100: 0: 20 stepFeatures: 0: 20 +HLT_j175_pf_ftf_preselj20_L1J50: + eventCount: 0 + stepCounts: + 0: 2 + stepFeatures: + 0: 2 HLT_j20_pf_ftf_boffperf_L1HT190-J15s5pETA21: eventCount: 15 stepCounts: @@ -1361,10 +1397,22 @@ HLT_j20_pf_ftf_boffperf_L1HT190-J15s5pETA21: 2: 40 HLT_j225_subjesgscIS_ftf_bmv2c1040_split_L1J100: eventCount: 0 +HLT_j25_pf_ftf_L1RD0_FILLED: + eventCount: 10 + stepCounts: + 0: 20 + 1: 10 + stepFeatures: + 0: 20 + 1: 27 HLT_j260_320eta490_L1J20: eventCount: 0 HLT_j260_320eta490_L1J75_31ETA49: eventCount: 0 +HLT_j260_a10sd_cssk_pf_jes_ftf_L1J75: + eventCount: 0 +HLT_j260_pf_ftf_preselj20_L1J75: + eventCount: 0 HLT_j275_pf_subjesgscIS_ftf_bdl1r60_split_L1J100: eventCount: 0 HLT_j275_pf_subjesgscIS_ftf_boffperf_split_L1J100: @@ -1381,8 +1429,26 @@ HLT_j300_subjesgscIS_ftf_bdl1r70_split_L1J100: eventCount: 0 HLT_j300_subjesgscIS_ftf_bmv2c1070_split_L1J100: eventCount: 0 +HLT_j35_pf_ftf_L1RD0_FILLED: + eventCount: 8 + stepCounts: + 0: 20 + 1: 8 + stepFeatures: + 0: 20 + 1: 14 +HLT_j360_a10sd_cssk_pf_jes_ftf_L1J100: + eventCount: 0 +HLT_j360_a10sd_cssk_pf_jes_ftf_L1SC111-CJ15: + eventCount: 0 + stepCounts: + 0: 20 + stepFeatures: + 0: 20 HLT_j360_a10t_lcw_jes_60smcINF_j360_a10t_lcw_jes_L1SC111-CJ15: eventCount: 0 +HLT_j360_pf_ftf_preselj20_L1J100: + eventCount: 0 HLT_j360_pf_subjesgscIS_ftf_bdl1r77_split_L1J100: eventCount: 0 HLT_j360_subjesgscIS_ftf_bdl1r77_split_L1J100: @@ -1391,6 +1457,18 @@ HLT_j360_subjesgscIS_ftf_bmv2c1077_split_L1J100: eventCount: 0 HLT_j370_a10t_lcw_jes_35smcINF_j370_a10t_lcw_jes_L1SC111-CJ15: eventCount: 0 +HLT_j380_pf_ftf_preselj20_L1J100: + eventCount: 0 +HLT_j400_a10sd_cssk_pf_jes_ftf_L1J100: + eventCount: 0 +HLT_j400_a10sd_cssk_pf_jes_ftf_L1SC111-CJ15: + eventCount: 0 + stepCounts: + 0: 20 + stepFeatures: + 0: 20 +HLT_j400_pf_ftf_preselj20_L1J100: + eventCount: 0 HLT_j40_LArPEBHLT_L1J20: eventCount: 5 stepCounts: @@ -1407,12 +1485,26 @@ HLT_j40_j0_aggSEP50htSEP10etSEP0eta320_L1J20: 0: 220 HLT_j420_L1J100: eventCount: 0 +HLT_j420_a10sd_cssk_pf_jes_ftf_L1J100: + eventCount: 0 +HLT_j420_a10sd_cssk_pf_jes_ftf_L1SC111-CJ15: + eventCount: 0 + stepCounts: + 0: 20 + stepFeatures: + 0: 20 HLT_j420_a10t_lcw_jes_35smcINF_L1SC111-CJ15: eventCount: 0 +HLT_j420_pf_ftf_preselj20_L1J100: + eventCount: 0 HLT_j420_pf_subresjesgscIS_ftf_L1J100: eventCount: 0 HLT_j420_subresjesgscIS_ftf_L1J100: eventCount: 0 +HLT_j440_pf_ftf_preselj20_L1J100: + eventCount: 0 +HLT_j450_pf_ftf_preselj20_L1J100: + eventCount: 0 HLT_j45_L1J15: eventCount: 6 stepCounts: @@ -1663,6 +1755,12 @@ HLT_j460_a10sd_cssk_pf_jes_ftf_35smcINF_L1J100: eventCount: 0 HLT_j460_a10sd_cssk_pf_jes_ftf_L1J100: eventCount: 0 +HLT_j460_a10sd_cssk_pf_jes_ftf_L1SC111-CJ15: + eventCount: 0 + stepCounts: + 0: 20 + stepFeatures: + 0: 20 HLT_j460_a10sd_cssk_pf_nojcalib_ftf_35smcINF_L1J100: eventCount: 0 HLT_j460_a10sd_cssk_pf_nojcalib_ftf_L1J100: @@ -1681,12 +1779,36 @@ HLT_j460_a10t_lcw_nojcalib_35smcINF_L1J100: eventCount: 0 HLT_j460_a10t_lcw_nojcalib_L1J100: eventCount: 0 +HLT_j460_pf_ftf_preselj20_L1J100: + eventCount: 0 +HLT_j480_a10sd_cssk_pf_jes_ftf_L1J100: + eventCount: 0 +HLT_j480_a10sd_cssk_pf_jes_ftf_L1SC111-CJ15: + eventCount: 0 + stepCounts: + 0: 20 + stepFeatures: + 0: 20 +HLT_j480_pf_ftf_preselj20_L1J100: + eventCount: 0 +HLT_j500_pf_ftf_preselj20_L1J100: + eventCount: 0 +HLT_j520_pf_ftf_preselj20_L1J100: + eventCount: 0 HLT_j60_j0_fbdjshared_L1J20: eventCount: 1 stepCounts: 0: 1 stepFeatures: 0: 23 +HLT_j60_pf_ftf_preselj20_L1J20: + eventCount: 3 + stepCounts: + 0: 5 + 1: 3 + stepFeatures: + 0: 5 + 1: 3 HLT_j70_0eta320_j50_0eta490_j0_dijetSEP50j12etSEP1000djmassSEPdjdphi240_xe90_tcpufit_xe50_cell_L1MJJ-500-NFF: eventCount: 0 stepFeatures: @@ -1879,6 +2001,14 @@ HLT_j85_pf_ftf_L1J20: stepFeatures: 0: 5 1: 3 +HLT_j85_pf_ftf_preselj20_L1J20: + eventCount: 3 + stepCounts: + 0: 5 + 1: 3 + stepFeatures: + 0: 5 + 1: 3 HLT_larnoiseburst_L1XE60: eventCount: 0 HLT_mb_alfaperf_L1RD0_EMPTY: -- GitLab From 15ae75299e0fc7f320a7958ea48054a56745660b Mon Sep 17 00:00:00 2001 From: Jonathan Bossio <jonathan.bossio@cern.ch> Date: Thu, 15 Apr 2021 14:15:39 +0200 Subject: [PATCH 4/6] Update another reference file --- .../share/ref_RDOtoRDOTrig_v1Dev_build.ref | 200 ++++++++++++++++++ 1 file changed, 200 insertions(+) diff --git a/Trigger/TrigValidation/TrigAnalysisTest/share/ref_RDOtoRDOTrig_v1Dev_build.ref b/Trigger/TrigValidation/TrigAnalysisTest/share/ref_RDOtoRDOTrig_v1Dev_build.ref index be4f5ee31606..d2bdf6ed3d87 100644 --- a/Trigger/TrigValidation/TrigAnalysisTest/share/ref_RDOtoRDOTrig_v1Dev_build.ref +++ b/Trigger/TrigValidation/TrigAnalysisTest/share/ref_RDOtoRDOTrig_v1Dev_build.ref @@ -2684,6 +2684,22 @@ HLT_j100_pf_ftf_0eta320_j20_pf_ftf_boffperf_L1HT190-J15s5pETA21: 0: 3 1: 63 2: 29 +HLT_j110_a10sd_cssk_pf_jes_ftf_L1J30: + eventCount: 15 + stepCounts: + 0: 17 + 1: 15 + stepFeatures: + 0: 17 + 1: 23 +HLT_j110_pf_ftf_preselj20_L1J30: + eventCount: 9 + stepCounts: + 0: 17 + 1: 9 + stepFeatures: + 0: 17 + 1: 12 HLT_j110_subjesgscIS_ftf_bdl1r60_split_j45_subjesgscIS_ftf_bdl1r70_split_L1J50: eventCount: 0 stepCounts: @@ -2724,8 +2740,24 @@ HLT_j150_subresjesgscIS_ftf_2j55_subresjesgscIS_ftf_L1J85_3J30: 0: 3 stepFeatures: 0: 3 +HLT_j15_pf_ftf_L1RD0_FILLED: + eventCount: 20 + stepCounts: + 0: 20 + 1: 20 + stepFeatures: + 0: 20 + 1: 341 HLT_j165_LArPEBHLT_L1J100: eventCount: 0 +HLT_j175_a10sd_cssk_pf_jes_ftf_L1J50: + eventCount: 5 + stepCounts: + 0: 14 + 1: 5 + stepFeatures: + 0: 14 + 1: 6 HLT_j175_ftf_bmv2c1060_split_j60_ftf_bmv2c1060_L1J100: eventCount: 0 stepCounts: @@ -2738,6 +2770,14 @@ HLT_j175_pf_ftf_bdl1r60_split_j60_pf_ftf_bdl1r60_L1J100: 0: 3 stepFeatures: 0: 3 +HLT_j175_pf_ftf_preselj20_L1J50: + eventCount: 1 + stepCounts: + 0: 14 + 1: 1 + stepFeatures: + 0: 14 + 1: 1 HLT_j20_pf_ftf_boffperf_L1HT190-J15s5pETA21: eventCount: 3 stepCounts: @@ -2754,10 +2794,32 @@ HLT_j225_subjesgscIS_ftf_bmv2c1040_split_L1J100: 0: 3 stepFeatures: 0: 3 +HLT_j25_pf_ftf_L1RD0_FILLED: + eventCount: 20 + stepCounts: + 0: 20 + 1: 20 + stepFeatures: + 0: 20 + 1: 172 HLT_j260_320eta490_L1J20: eventCount: 0 HLT_j260_320eta490_L1J75_31ETA49: eventCount: 0 +HLT_j260_a10sd_cssk_pf_jes_ftf_L1J75: + eventCount: 1 + stepCounts: + 0: 6 + 1: 1 + stepFeatures: + 0: 6 + 1: 1 +HLT_j260_pf_ftf_preselj20_L1J75: + eventCount: 0 + stepCounts: + 0: 6 + stepFeatures: + 0: 6 HLT_j275_pf_subjesgscIS_ftf_bdl1r60_split_L1J100: eventCount: 0 stepCounts: @@ -2806,8 +2868,34 @@ HLT_j300_subjesgscIS_ftf_bmv2c1070_split_L1J100: 0: 3 stepFeatures: 0: 3 +HLT_j35_pf_ftf_L1RD0_FILLED: + eventCount: 20 + stepCounts: + 0: 20 + 1: 20 + stepFeatures: + 0: 20 + 1: 79 +HLT_j360_a10sd_cssk_pf_jes_ftf_L1J100: + eventCount: 0 + stepCounts: + 0: 3 + stepFeatures: + 0: 3 +HLT_j360_a10sd_cssk_pf_jes_ftf_L1SC111-CJ15: + eventCount: 0 + stepCounts: + 0: 3 + stepFeatures: + 0: 3 HLT_j360_a10t_lcw_jes_60smcINF_j360_a10t_lcw_jes_L1SC111-CJ15: eventCount: 0 +HLT_j360_pf_ftf_preselj20_L1J100: + eventCount: 0 + stepCounts: + 0: 3 + stepFeatures: + 0: 3 HLT_j360_pf_subjesgscIS_ftf_bdl1r77_split_L1J100: eventCount: 0 stepCounts: @@ -2828,6 +2916,30 @@ HLT_j360_subjesgscIS_ftf_bmv2c1077_split_L1J100: 0: 3 HLT_j370_a10t_lcw_jes_35smcINF_j370_a10t_lcw_jes_L1SC111-CJ15: eventCount: 0 +HLT_j380_pf_ftf_preselj20_L1J100: + eventCount: 0 + stepCounts: + 0: 3 + stepFeatures: + 0: 3 +HLT_j400_a10sd_cssk_pf_jes_ftf_L1J100: + eventCount: 0 + stepCounts: + 0: 3 + stepFeatures: + 0: 3 +HLT_j400_a10sd_cssk_pf_jes_ftf_L1SC111-CJ15: + eventCount: 0 + stepCounts: + 0: 3 + stepFeatures: + 0: 3 +HLT_j400_pf_ftf_preselj20_L1J100: + eventCount: 0 + stepCounts: + 0: 3 + stepFeatures: + 0: 3 HLT_j40_LArPEBHLT_L1J20: eventCount: 0 HLT_j40_j0_aggSEP50htSEP10etSEP0eta320_L1J20: @@ -2838,8 +2950,26 @@ HLT_j40_j0_aggSEP50htSEP10etSEP0eta320_L1J20: 0: 1044 HLT_j420_L1J100: eventCount: 0 +HLT_j420_a10sd_cssk_pf_jes_ftf_L1J100: + eventCount: 0 + stepCounts: + 0: 3 + stepFeatures: + 0: 3 +HLT_j420_a10sd_cssk_pf_jes_ftf_L1SC111-CJ15: + eventCount: 0 + stepCounts: + 0: 3 + stepFeatures: + 0: 3 HLT_j420_a10t_lcw_jes_35smcINF_L1SC111-CJ15: eventCount: 0 +HLT_j420_pf_ftf_preselj20_L1J100: + eventCount: 0 + stepCounts: + 0: 3 + stepFeatures: + 0: 3 HLT_j420_pf_subresjesgscIS_ftf_L1J100: eventCount: 0 stepCounts: @@ -2852,6 +2982,18 @@ HLT_j420_subresjesgscIS_ftf_L1J100: 0: 3 stepFeatures: 0: 3 +HLT_j440_pf_ftf_preselj20_L1J100: + eventCount: 0 + stepCounts: + 0: 3 + stepFeatures: + 0: 3 +HLT_j450_pf_ftf_preselj20_L1J100: + eventCount: 0 + stepCounts: + 0: 3 + stepFeatures: + 0: 3 HLT_j45_L1J15: eventCount: 0 HLT_j45_cssk_nojcalib_L1J15: @@ -3106,6 +3248,12 @@ HLT_j460_a10sd_cssk_pf_jes_ftf_L1J100: 0: 3 stepFeatures: 0: 3 +HLT_j460_a10sd_cssk_pf_jes_ftf_L1SC111-CJ15: + eventCount: 0 + stepCounts: + 0: 3 + stepFeatures: + 0: 3 HLT_j460_a10sd_cssk_pf_nojcalib_ftf_35smcINF_L1J100: eventCount: 0 stepCounts: @@ -3136,12 +3284,56 @@ HLT_j460_a10t_lcw_nojcalib_35smcINF_L1J100: eventCount: 0 HLT_j460_a10t_lcw_nojcalib_L1J100: eventCount: 0 +HLT_j460_pf_ftf_preselj20_L1J100: + eventCount: 0 + stepCounts: + 0: 3 + stepFeatures: + 0: 3 +HLT_j480_a10sd_cssk_pf_jes_ftf_L1J100: + eventCount: 0 + stepCounts: + 0: 3 + stepFeatures: + 0: 3 +HLT_j480_a10sd_cssk_pf_jes_ftf_L1SC111-CJ15: + eventCount: 0 + stepCounts: + 0: 3 + stepFeatures: + 0: 3 +HLT_j480_pf_ftf_preselj20_L1J100: + eventCount: 0 + stepCounts: + 0: 3 + stepFeatures: + 0: 3 +HLT_j500_pf_ftf_preselj20_L1J100: + eventCount: 0 + stepCounts: + 0: 3 + stepFeatures: + 0: 3 +HLT_j520_pf_ftf_preselj20_L1J100: + eventCount: 0 + stepCounts: + 0: 3 + stepFeatures: + 0: 3 HLT_j60_j0_fbdjshared_L1J20: eventCount: 7 stepCounts: 0: 7 stepFeatures: 0: 388 +HLT_j60_pf_ftf_preselj20_L1J20: + eventCount: 18 + stepCounts: + 0: 19 + 1: 18 + stepFeatures: + 0: 19 + 1: 37 HLT_j70_0eta320_j50_0eta490_j0_dijetSEP50j12etSEP1000djmassSEPdjdphi240_xe90_tcpufit_xe50_cell_L1MJJ-500-NFF: eventCount: 0 stepFeatures: @@ -3386,6 +3578,14 @@ HLT_j85_pf_ftf_L1J20: stepFeatures: 0: 19 1: 21 +HLT_j85_pf_ftf_preselj20_L1J20: + eventCount: 12 + stepCounts: + 0: 19 + 1: 12 + stepFeatures: + 0: 19 + 1: 21 HLT_larnoiseburst_L1XE60: eventCount: 6 stepCounts: -- GitLab From 46fbdeddcb93300945e8e6831f0744a20f3ac90f Mon Sep 17 00:00:00 2001 From: Jonathan Bossio <jonathan.bossio@cern.ch> Date: Fri, 16 Apr 2021 09:28:03 +0200 Subject: [PATCH 5/6] Fix merging ref file --- .../TrigAnalysisTest/share/ref_RDOtoRDOTrig_v1Dev_build.ref | 4 ---- 1 file changed, 4 deletions(-) diff --git a/Trigger/TrigValidation/TrigAnalysisTest/share/ref_RDOtoRDOTrig_v1Dev_build.ref b/Trigger/TrigValidation/TrigAnalysisTest/share/ref_RDOtoRDOTrig_v1Dev_build.ref index df3fe17d80d7..39febd687239 100644 --- a/Trigger/TrigValidation/TrigAnalysisTest/share/ref_RDOtoRDOTrig_v1Dev_build.ref +++ b/Trigger/TrigValidation/TrigAnalysisTest/share/ref_RDOtoRDOTrig_v1Dev_build.ref @@ -2953,17 +2953,13 @@ HLT_j360_a10sd_cssk_pf_jes_ftf_L1SC111-CJ15: 0: 3 HLT_j360_a10t_lcw_jes_60smcINF_j360_a10t_lcw_jes_L1SC111-CJ15: eventCount: 0 -<<<<<<< HEAD HLT_j360_pf_ftf_preselj20_L1J100: eventCount: 0 stepCounts: 0: 3 stepFeatures: 0: 3 -HLT_j360_pf_subjesgscIS_ftf_bdl1r77_split_L1J100: -======= HLT_j360_pf_ftf_bdl1r77_split_L1J100: ->>>>>>> master eventCount: 0 stepCounts: 0: 3 -- GitLab From c0df901656eed624062beeadd6a24e1c8ce6e8eb Mon Sep 17 00:00:00 2001 From: Jonathan Bossio <jonathan.bossio@cern.ch> Date: Fri, 16 Apr 2021 09:30:04 +0200 Subject: [PATCH 6/6] Fix the other ref file --- .../TrigValidation/TriggerTest/share/ref_data_v1Dev_build.ref | 4 ---- 1 file changed, 4 deletions(-) diff --git a/Trigger/TrigValidation/TriggerTest/share/ref_data_v1Dev_build.ref b/Trigger/TrigValidation/TriggerTest/share/ref_data_v1Dev_build.ref index 5279c9b810aa..a10329f5c04b 100644 --- a/Trigger/TrigValidation/TriggerTest/share/ref_data_v1Dev_build.ref +++ b/Trigger/TrigValidation/TriggerTest/share/ref_data_v1Dev_build.ref @@ -1489,13 +1489,9 @@ HLT_j360_a10sd_cssk_pf_jes_ftf_L1SC111-CJ15: 0: 20 HLT_j360_a10t_lcw_jes_60smcINF_j360_a10t_lcw_jes_L1SC111-CJ15: eventCount: 0 -<<<<<<< HEAD HLT_j360_pf_ftf_preselj20_L1J100: eventCount: 0 -HLT_j360_pf_subjesgscIS_ftf_bdl1r77_split_L1J100: -======= HLT_j360_pf_ftf_bdl1r77_split_L1J100: ->>>>>>> master eventCount: 0 HLT_j360_subjesgscIS_ftf_bdl1r77_split_L1J100: eventCount: 0 -- GitLab