From b787ce40c1c213d4c20652489f3a25548d80c4b7 Mon Sep 17 00:00:00 2001
From: Malik Aliev <malik.aliev@cern.ch>
Date: Tue, 4 May 2021 18:35:04 +0000
Subject: [PATCH] Modify multi-jet trigger names.
---
.../share/ref_RDOtoRDOTrig_v1Dev_build.ref | 114 +++++++-----------
.../share/ref_data_v1Dev_build.ref | 88 +++++++-------
.../HLTMenuConfig/Menu/DictFromChainName.py | 2 +-
.../python/HLTMenuConfig/Menu/LS2_v1.py | 84 ++++++-------
4 files changed, 126 insertions(+), 162 deletions(-)
diff --git a/Trigger/TrigValidation/TrigAnalysisTest/share/ref_RDOtoRDOTrig_v1Dev_build.ref b/Trigger/TrigValidation/TrigAnalysisTest/share/ref_RDOtoRDOTrig_v1Dev_build.ref
index 61899d6ef57..ebfe065a3cf 100644
--- a/Trigger/TrigValidation/TrigAnalysisTest/share/ref_RDOtoRDOTrig_v1Dev_build.ref
+++ b/Trigger/TrigValidation/TrigAnalysisTest/share/ref_RDOtoRDOTrig_v1Dev_build.ref
@@ -1,17 +1,17 @@
-HLT_10j40_pf_subresjesgscIS_ftf_L14J15:
+HLT_10j40_ftf_L14J15:
eventCount: 0
stepCounts:
0: 9
stepFeatures:
0: 9
-HLT_10j40_subjesIS_L14J15:
- eventCount: 0
-HLT_10j40_subresjesgscIS_ftf_L14J15:
+HLT_10j40_pf_ftf_L14J15:
eventCount: 0
stepCounts:
0: 9
stepFeatures:
0: 9
+HLT_10j40_subjesIS_L14J15:
+ eventCount: 0
HLT_2e12_lhloose_mu10_L12EM8VH_MU10:
eventCount: 0
HLT_2e17_etcut_L12EM15VH:
@@ -214,7 +214,13 @@ HLT_2g60_loose_L12EM20VH:
eventCount: 0
stepFeatures:
0: 2
-HLT_2j250_subresjesgscIS_ftf_0eta240_L1J100:
+HLT_2j250_ftf_0eta240_j120_ftf_0eta240_L1J100:
+ eventCount: 0
+ stepCounts:
+ 0: 3
+ stepFeatures:
+ 0: 3
+HLT_2j250_pf_ftf_0eta240_j120_pf_ftf_0eta240_L1J100:
eventCount: 0
stepCounts:
0: 3
@@ -604,13 +610,13 @@ HLT_2mu6_muonqual_L12MU6:
3: 4
HLT_3j200_L1J100:
eventCount: 0
-HLT_3j200_pf_subresjesgscIS_ftf_L1J100:
+HLT_3j200_ftf_L1J100:
eventCount: 0
stepCounts:
0: 3
stepFeatures:
0: 3
-HLT_3j200_subresjesgscIS_ftf_L1J100:
+HLT_3j200_pf_ftf_L1J100:
eventCount: 0
stepCounts:
0: 3
@@ -705,20 +711,20 @@ HLT_3mu6_msonly_L13MU6:
eventCount: 0
HLT_3mu8_msonly_L13MU6:
eventCount: 0
-HLT_4j120_pf_subresjesgscIS_ftf_L13J50:
+HLT_4j115_ftf_L13J50:
eventCount: 0
stepCounts:
0: 2
stepFeatures:
0: 2
-HLT_4j120_subjesIS_L13J50:
- eventCount: 0
-HLT_4j120_subresjesgscIS_ftf_L13J50:
+HLT_4j115_pf_ftf_L13J50:
eventCount: 0
stepCounts:
0: 2
stepFeatures:
0: 2
+HLT_4j120_subjesIS_L13J50:
+ eventCount: 0
HLT_4j20_pf_ftf_010jvt_boffperf_L1HT190-J15s5pETA21:
eventCount: 4
stepCounts:
@@ -844,7 +850,7 @@ HLT_5j70_0eta240_L14J20:
0: 1
stepFeatures:
0: 5
-HLT_5j70_pf_subresjesgscIS_ftf_0eta240_L14J15:
+HLT_5j70_ftf_0eta240_L14J15:
eventCount: 1
stepCounts:
0: 9
@@ -852,7 +858,7 @@ HLT_5j70_pf_subresjesgscIS_ftf_0eta240_L14J15:
stepFeatures:
0: 9
1: 5
-HLT_5j70_subresjesgscIS_ftf_0eta240_L14J15:
+HLT_5j70_pf_ftf_0eta240_L14J15:
eventCount: 1
stepCounts:
0: 9
@@ -860,20 +866,20 @@ HLT_5j70_subresjesgscIS_ftf_0eta240_L14J15:
stepFeatures:
0: 9
1: 5
-HLT_5j85_pf_subresjesgscIS_ftf_L14J15:
+HLT_5j85_ftf_L14J15:
eventCount: 0
stepCounts:
0: 9
stepFeatures:
0: 9
-HLT_5j85_subjesIS_L14J15:
- eventCount: 0
-HLT_5j85_subresjesgscIS_ftf_L14J15:
+HLT_5j85_pf_ftf_L14J15:
eventCount: 0
stepCounts:
0: 9
stepFeatures:
0: 9
+HLT_5j85_subjesIS_L14J15:
+ eventCount: 0
HLT_6j25_0eta240_L14J15:
eventCount: 7
stepCounts:
@@ -1064,7 +1070,13 @@ HLT_6j45_pf_ftf_0eta240_L14J15:
0: 9
stepFeatures:
0: 9
-HLT_6j55_pf_subresjesgscIS_ftf_0eta240_L14J15:
+HLT_6j55_ftf_0eta240_L14J15:
+ eventCount: 0
+ stepCounts:
+ 0: 9
+ stepFeatures:
+ 0: 9
+HLT_6j55_pf_ftf_0eta240_L14J15:
eventCount: 0
stepCounts:
0: 9
@@ -1072,13 +1084,13 @@ HLT_6j55_pf_subresjesgscIS_ftf_0eta240_L14J15:
0: 9
HLT_6j55_subjesIS_0eta240_L14J15:
eventCount: 0
-HLT_6j55_subresjesgscIS_ftf_0eta240_L14J15:
+HLT_6j70_ftf_L14J15:
eventCount: 0
stepCounts:
0: 9
stepFeatures:
0: 9
-HLT_6j70_pf_subresjesgscIS_ftf_L14J15:
+HLT_6j70_pf_ftf_L14J15:
eventCount: 0
stepCounts:
0: 9
@@ -1086,13 +1098,13 @@ HLT_6j70_pf_subresjesgscIS_ftf_L14J15:
0: 9
HLT_6j70_subjesIS_L14J15:
eventCount: 0
-HLT_6j70_subresjesgscIS_ftf_L14J15:
+HLT_7j45_ftf_L14J15:
eventCount: 0
stepCounts:
0: 9
stepFeatures:
0: 9
-HLT_7j45_pf_subresjesgscIS_ftf_L14J15:
+HLT_7j45_pf_ftf_L14J15:
eventCount: 0
stepCounts:
0: 9
@@ -1100,12 +1112,6 @@ HLT_7j45_pf_subresjesgscIS_ftf_L14J15:
0: 9
HLT_7j45_subjesIS_L14J15:
eventCount: 0
-HLT_7j45_subresjesgscIS_ftf_L14J15:
- eventCount: 0
- stepCounts:
- 0: 9
- stepFeatures:
- 0: 9
HLT_JetDS_j20_L1HT190-J15s5pETA21:
eventCount: 4
stepCounts:
@@ -2903,34 +2909,6 @@ HLT_g35_tight_3j25_pf_ftf_boffperf_L1EM30VHI:
4: 5
5: 33
6: 33
-HLT_g35_tight_3j25_pf_subresjesgscIS_ftf_L1EM22VHI:
- eventCount: 0
- stepCounts:
- 0: 6
- 1: 6
- 2: 6
- 3: 5
- stepFeatures:
- 0: 7
- 1: 7
- 2: 6
- 3: 5
- 4: 5
- 5: 37
-HLT_g35_tight_3j25_pf_subresjesgscIS_ftf_L1EM30VHI:
- eventCount: 0
- stepCounts:
- 0: 6
- 1: 6
- 2: 6
- 3: 5
- stepFeatures:
- 0: 7
- 1: 7
- 2: 6
- 3: 5
- 4: 5
- 5: 37
HLT_g35_tight_L1EM15VHI:
eventCount: 5
stepCounts:
@@ -3156,21 +3134,21 @@ HLT_j150_ftf_0eta320_2j55_ftf_bmv2c1070_split_L1J85_3J30:
0: 3
stepFeatures:
0: 3
-HLT_j150_pf_ftf_0eta320_2j55_pf_ftf_bdl1r70_split_L1J85_3J30:
+HLT_j150_ftf_2j55_ftf_L1J85_3J30:
eventCount: 0
stepCounts:
0: 3
- 1: 1
stepFeatures:
0: 3
- 1: 7
- 2: 1
-HLT_j150_subresjesgscIS_ftf_2j55_subresjesgscIS_ftf_L1J85_3J30:
+HLT_j150_pf_ftf_0eta320_2j55_pf_ftf_bdl1r70_split_L1J85_3J30:
eventCount: 0
stepCounts:
0: 3
+ 1: 1
stepFeatures:
0: 3
+ 1: 7
+ 2: 1
HLT_j15_pf_ftf_L1RD0_FILLED:
eventCount: 20
stepCounts:
@@ -3397,19 +3375,19 @@ HLT_j420_a10t_lcw_jes_35smcINF_L1J100:
eventCount: 0
HLT_j420_a10t_lcw_jes_35smcINF_L1SC111-CJ15:
eventCount: 0
-HLT_j420_pf_ftf_preselj20_L1J100:
+HLT_j420_ftf_L1J100:
eventCount: 0
stepCounts:
0: 3
stepFeatures:
0: 3
-HLT_j420_pf_subresjesgscIS_ftf_L1J100:
+HLT_j420_pf_ftf_L1J100:
eventCount: 0
stepCounts:
0: 3
stepFeatures:
0: 3
-HLT_j420_subresjesgscIS_ftf_L1J100:
+HLT_j420_pf_ftf_preselj20_L1J100:
eventCount: 0
stepCounts:
0: 3
@@ -3641,14 +3619,6 @@ HLT_j45_subjesgsc_ftf_L1J15:
stepFeatures:
0: 20
1: 50
-HLT_j45_subresjesgscIS_ftf_L1J15:
- eventCount: 19
- stepCounts:
- 0: 20
- 1: 19
- stepFeatures:
- 0: 20
- 1: 54
HLT_j45_subresjesgsc_ftf_L1J15:
eventCount: 19
stepCounts:
diff --git a/Trigger/TrigValidation/TriggerTest/share/ref_data_v1Dev_build.ref b/Trigger/TrigValidation/TriggerTest/share/ref_data_v1Dev_build.ref
index 08f9292abca..f4758f4d3cb 100644
--- a/Trigger/TrigValidation/TriggerTest/share/ref_data_v1Dev_build.ref
+++ b/Trigger/TrigValidation/TriggerTest/share/ref_data_v1Dev_build.ref
@@ -1,17 +1,17 @@
-HLT_10j40_pf_subresjesgscIS_ftf_L14J15:
+HLT_10j40_ftf_L14J15:
eventCount: 0
stepCounts:
0: 7
stepFeatures:
0: 7
-HLT_10j40_subjesIS_L14J15:
- eventCount: 0
-HLT_10j40_subresjesgscIS_ftf_L14J15:
+HLT_10j40_pf_ftf_L14J15:
eventCount: 0
stepCounts:
0: 7
stepFeatures:
0: 7
+HLT_10j40_subjesIS_L14J15:
+ eventCount: 0
HLT_2e12_lhloose_mu10_L12EM8VH_MU10:
eventCount: 0
stepFeatures:
@@ -126,8 +126,18 @@ HLT_2g50_loose_L12EM20VH:
eventCount: 0
HLT_2g60_loose_L12EM20VH:
eventCount: 0
-HLT_2j250_subresjesgscIS_ftf_0eta240_L1J100:
+HLT_2j250_ftf_0eta240_j120_ftf_0eta240_L1J100:
eventCount: 0
+ stepCounts:
+ 0: 20
+ stepFeatures:
+ 0: 20
+HLT_2j250_pf_ftf_0eta240_j120_pf_ftf_0eta240_L1J100:
+ eventCount: 0
+ stepCounts:
+ 0: 20
+ stepFeatures:
+ 0: 20
HLT_2j330_a10sd_cssk_pf_jes_ftf_35smcINF_L1J100:
eventCount: 0
HLT_2j330_a10sd_cssk_pf_nojcalib_ftf_35smcINF_L1J100:
@@ -299,9 +309,9 @@ HLT_2mu6_muonqual_L12MU6:
eventCount: 0
HLT_3j200_L1J100:
eventCount: 0
-HLT_3j200_pf_subresjesgscIS_ftf_L1J100:
+HLT_3j200_ftf_L1J100:
eventCount: 0
-HLT_3j200_subresjesgscIS_ftf_L1J100:
+HLT_3j200_pf_ftf_L1J100:
eventCount: 0
HLT_3j20_pf_ftf_010jvt_j20_pf_ftf_boffperf_L1HT190-J15s5pETA21:
eventCount: 3
@@ -375,20 +385,20 @@ HLT_3mu6_msonly_L13MU6:
eventCount: 0
HLT_3mu8_msonly_L13MU6:
eventCount: 0
-HLT_4j120_pf_subresjesgscIS_ftf_L13J50:
+HLT_4j115_ftf_L13J50:
eventCount: 0
stepCounts:
0: 2
stepFeatures:
0: 2
-HLT_4j120_subjesIS_L13J50:
- eventCount: 0
-HLT_4j120_subresjesgscIS_ftf_L13J50:
+HLT_4j115_pf_ftf_L13J50:
eventCount: 0
stepCounts:
0: 2
stepFeatures:
0: 2
+HLT_4j120_subjesIS_L13J50:
+ eventCount: 0
HLT_4j20_pf_ftf_010jvt_boffperf_L1HT190-J15s5pETA21:
eventCount: 2
stepCounts:
@@ -479,32 +489,32 @@ HLT_5j45_pf_ftf_0eta240_010jvt_j25_pf_ftf_0eta240_010jvt_bdl1r60_split_L14J15:
0: 7
HLT_5j70_0eta240_L14J20:
eventCount: 0
-HLT_5j70_pf_subresjesgscIS_ftf_0eta240_L14J15:
+HLT_5j70_ftf_0eta240_L14J15:
eventCount: 0
stepCounts:
0: 7
stepFeatures:
0: 7
-HLT_5j70_subresjesgscIS_ftf_0eta240_L14J15:
+HLT_5j70_pf_ftf_0eta240_L14J15:
eventCount: 0
stepCounts:
0: 7
stepFeatures:
0: 7
-HLT_5j85_pf_subresjesgscIS_ftf_L14J15:
+HLT_5j85_ftf_L14J15:
eventCount: 0
stepCounts:
0: 7
stepFeatures:
0: 7
-HLT_5j85_subjesIS_L14J15:
- eventCount: 0
-HLT_5j85_subresjesgscIS_ftf_L14J15:
+HLT_5j85_pf_ftf_L14J15:
eventCount: 0
stepCounts:
0: 7
stepFeatures:
0: 7
+HLT_5j85_subjesIS_L14J15:
+ eventCount: 0
HLT_6j25_0eta240_L14J15:
eventCount: 0
HLT_6j25_ftf_0eta240_010jvt_L14J15:
@@ -655,7 +665,13 @@ HLT_6j45_pf_ftf_0eta240_L14J15:
0: 7
stepFeatures:
0: 7
-HLT_6j55_pf_subresjesgscIS_ftf_0eta240_L14J15:
+HLT_6j55_ftf_0eta240_L14J15:
+ eventCount: 0
+ stepCounts:
+ 0: 7
+ stepFeatures:
+ 0: 7
+HLT_6j55_pf_ftf_0eta240_L14J15:
eventCount: 0
stepCounts:
0: 7
@@ -663,13 +679,13 @@ HLT_6j55_pf_subresjesgscIS_ftf_0eta240_L14J15:
0: 7
HLT_6j55_subjesIS_0eta240_L14J15:
eventCount: 0
-HLT_6j55_subresjesgscIS_ftf_0eta240_L14J15:
+HLT_6j70_ftf_L14J15:
eventCount: 0
stepCounts:
0: 7
stepFeatures:
0: 7
-HLT_6j70_pf_subresjesgscIS_ftf_L14J15:
+HLT_6j70_pf_ftf_L14J15:
eventCount: 0
stepCounts:
0: 7
@@ -677,13 +693,13 @@ HLT_6j70_pf_subresjesgscIS_ftf_L14J15:
0: 7
HLT_6j70_subjesIS_L14J15:
eventCount: 0
-HLT_6j70_subresjesgscIS_ftf_L14J15:
+HLT_7j45_ftf_L14J15:
eventCount: 0
stepCounts:
0: 7
stepFeatures:
0: 7
-HLT_7j45_pf_subresjesgscIS_ftf_L14J15:
+HLT_7j45_pf_ftf_L14J15:
eventCount: 0
stepCounts:
0: 7
@@ -691,12 +707,6 @@ HLT_7j45_pf_subresjesgscIS_ftf_L14J15:
0: 7
HLT_7j45_subjesIS_L14J15:
eventCount: 0
-HLT_7j45_subresjesgscIS_ftf_L14J15:
- eventCount: 0
- stepCounts:
- 0: 7
- stepFeatures:
- 0: 7
HLT_JetDS_j20_L1HT190-J15s5pETA21:
eventCount: 17
stepCounts:
@@ -1494,10 +1504,6 @@ HLT_g35_tight_3j25_pf_ftf_boffperf_L1EM22VHI:
eventCount: 0
HLT_g35_tight_3j25_pf_ftf_boffperf_L1EM30VHI:
eventCount: 0
-HLT_g35_tight_3j25_pf_subresjesgscIS_ftf_L1EM22VHI:
- eventCount: 0
-HLT_g35_tight_3j25_pf_subresjesgscIS_ftf_L1EM30VHI:
- eventCount: 0
HLT_g35_tight_L1EM15VHI:
eventCount: 0
HLT_g35_tight_icaloloose_L1EM15VHI:
@@ -1668,13 +1674,13 @@ HLT_j150_ftf_0eta320_2j55_ftf_bmv2c1070_split_L1J85_3J30:
0: 20
stepFeatures:
0: 20
-HLT_j150_pf_ftf_0eta320_2j55_pf_ftf_bdl1r70_split_L1J85_3J30:
+HLT_j150_ftf_2j55_ftf_L1J85_3J30:
eventCount: 0
stepCounts:
0: 20
stepFeatures:
0: 20
-HLT_j150_subresjesgscIS_ftf_2j55_subresjesgscIS_ftf_L1J85_3J30:
+HLT_j150_pf_ftf_0eta320_2j55_pf_ftf_bdl1r70_split_L1J85_3J30:
eventCount: 0
stepCounts:
0: 20
@@ -1826,11 +1832,11 @@ HLT_j420_a10t_lcw_jes_35smcINF_L1J100:
eventCount: 0
HLT_j420_a10t_lcw_jes_35smcINF_L1SC111-CJ15:
eventCount: 0
-HLT_j420_pf_ftf_preselj20_L1J100:
+HLT_j420_ftf_L1J100:
eventCount: 0
-HLT_j420_pf_subresjesgscIS_ftf_L1J100:
+HLT_j420_pf_ftf_L1J100:
eventCount: 0
-HLT_j420_subresjesgscIS_ftf_L1J100:
+HLT_j420_pf_ftf_preselj20_L1J100:
eventCount: 0
HLT_j440_pf_ftf_preselj20_L1J100:
eventCount: 0
@@ -2050,14 +2056,6 @@ HLT_j45_subjesgsc_ftf_L1J15:
stepFeatures:
0: 7
1: 7
-HLT_j45_subresjesgscIS_ftf_L1J15:
- eventCount: 7
- stepCounts:
- 0: 7
- 1: 7
- stepFeatures:
- 0: 7
- 1: 8
HLT_j45_subresjesgsc_ftf_L1J15:
eventCount: 7
stepCounts:
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/DictFromChainName.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/DictFromChainName.py
index 6f8ddd6777a..b71d64f0666 100755
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/DictFromChainName.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/DictFromChainName.py
@@ -330,7 +330,7 @@ def analyseChainName(chainName, L1thresholds, L1item):
# verify if all thresholds are mentioned in chain parts, if they are not then one of the indices will be -1
assert all( [i > 0 for i in indices] ), "Some thresholds are not part of the chain name name {}, {}".format(chainName, L1thresholds)
# verify that the order of threshold and order of threshold mentioned in the name (there they are prexixed by L1) is identical, else there may be mistake
- assert sorted(indices), "The order of L1 threshlds mentioned in chain name {} are not the same as threshold passed {}".format(chainName, L1thresholds)
+ assert sorted(indices), "The order of L1 thresholds mentioned in chain name {} are not the same as threshold passed {}".format(chainName, L1thresholds)
for chainindex, chainparts in enumerate(multichainparts):
chainProperties = {} #will contain properties for one part of chain if multiple parts
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/LS2_v1.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/LS2_v1.py
index e3bcf5cbd19..e8222db57ee 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/LS2_v1.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/LS2_v1.py
@@ -278,7 +278,6 @@ def setupMenu():
ChainProp(name='HLT_j45_subjesgsc_ftf_L1J15', groups=SingleJetGroup),
ChainProp(name='HLT_j45_subjesgscIS_ftf_L1J15', groups=SingleJetGroup),
ChainProp(name='HLT_j45_subresjesgsc_ftf_L1J15', groups=SingleJetGroup),
- ChainProp(name='HLT_j45_subresjesgscIS_ftf_L1J15', groups=SingleJetGroup),
ChainProp(name='HLT_j45_subjesgscIS_ftf_011jvt_L1J15', groups=SingleJetGroup),
ChainProp(name='HLT_j45_subjesgscIS_ftf_015jvt_L1J15', groups=SingleJetGroup),
ChainProp(name='HLT_j45_subjesgscIS_ftf_059jvt_L1J15', groups=SingleJetGroup),
@@ -357,38 +356,39 @@ def setupMenu():
ChainProp(name='HLT_JetDS_j20_L1HT190-J15s5pETA21', l1SeedThresholds=['FSNOSEED'], stream=['JetDS'], groups=SingleJetGroup),
# ATR-22096
- ChainProp(name='HLT_j420_subresjesgscIS_ftf_L1J100', groups=SingleJetGroup),
- ChainProp(name='HLT_j420_pf_subresjesgscIS_ftf_L1J100', groups=SingleJetGroup),
- #
- ChainProp(name='HLT_3j200_subresjesgscIS_ftf_L1J100', groups=MultiJetGroup),
- ChainProp(name='HLT_3j200_pf_subresjesgscIS_ftf_L1J100', groups=MultiJetGroup),
- #
- ChainProp(name='HLT_4j120_subjesIS_L13J50', groups=MultiJetGroup),
- ChainProp(name='HLT_4j120_subresjesgscIS_ftf_L13J50', groups=MultiJetGroup),
- ChainProp(name='HLT_4j120_pf_subresjesgscIS_ftf_L13J50', groups=MultiJetGroup),
- #
- ChainProp(name='HLT_5j70_subresjesgscIS_ftf_0eta240_L14J15', groups=MultiJetGroup),
- ChainProp(name='HLT_5j70_pf_subresjesgscIS_ftf_0eta240_L14J15', groups=MultiJetGroup),
- #
- ChainProp(name='HLT_5j85_subjesIS_L14J15', groups=MultiJetGroup),
- ChainProp(name='HLT_5j85_subresjesgscIS_ftf_L14J15', groups=MultiJetGroup),
- ChainProp(name='HLT_5j85_pf_subresjesgscIS_ftf_L14J15', groups=MultiJetGroup),
- #
- ChainProp(name='HLT_6j55_subjesIS_0eta240_L14J15', groups=MultiJetGroup),
- ChainProp(name='HLT_6j55_subresjesgscIS_ftf_0eta240_L14J15', groups=MultiJetGroup),
- ChainProp(name='HLT_6j55_pf_subresjesgscIS_ftf_0eta240_L14J15', groups=MultiJetGroup),
- #
- ChainProp(name='HLT_6j70_subjesIS_L14J15', groups=MultiJetGroup),
- ChainProp(name='HLT_6j70_subresjesgscIS_ftf_L14J15', groups=MultiJetGroup),
- ChainProp(name='HLT_6j70_pf_subresjesgscIS_ftf_L14J15', groups=MultiJetGroup),
- #
- ChainProp(name='HLT_7j45_subjesIS_L14J15', groups=MultiJetGroup),
- ChainProp(name='HLT_7j45_subresjesgscIS_ftf_L14J15', groups=MultiJetGroup),
- ChainProp(name='HLT_7j45_pf_subresjesgscIS_ftf_L14J15', groups=MultiJetGroup),
- #
- ChainProp(name='HLT_10j40_subjesIS_L14J15', groups=MultiJetGroup),
- ChainProp(name='HLT_10j40_subresjesgscIS_ftf_L14J15', groups=MultiJetGroup),
- ChainProp(name='HLT_10j40_pf_subresjesgscIS_ftf_L14J15', groups=MultiJetGroup),
+ ChainProp(name='HLT_j420_ftf_L1J100', groups=SingleJetGroup+ PrimaryLegGroup),
+ ChainProp(name='HLT_j420_pf_ftf_L1J100', groups=SingleJetGroup+ PrimaryLegGroup),
+
+ ChainProp(name='HLT_3j200_ftf_L1J100', groups=MultiJetGroup + PrimaryLegGroup),
+ ChainProp(name='HLT_3j200_pf_ftf_L1J100', groups=MultiJetGroup + PrimaryLegGroup),
+
+ ChainProp(name='HLT_4j120_subjesIS_L13J50', groups=MultiJetGroup + PrimaryLegGroup),
+ ChainProp(name='HLT_4j115_ftf_L13J50', groups=MultiJetGroup + PrimaryLegGroup),
+ ChainProp(name='HLT_4j115_pf_ftf_L13J50', groups=MultiJetGroup + PrimaryLegGroup),
+
+ ChainProp(name='HLT_5j70_ftf_0eta240_L14J15', groups=MultiJetGroup + PrimaryLegGroup),
+ ChainProp(name='HLT_5j70_pf_ftf_0eta240_L14J15', groups=MultiJetGroup + PrimaryLegGroup),
+
+ ChainProp(name='HLT_5j85_subjesIS_L14J15', groups=MultiJetGroup + PrimaryLegGroup),
+ ChainProp(name='HLT_5j85_ftf_L14J15', groups=MultiJetGroup + PrimaryLegGroup),
+ ChainProp(name='HLT_5j85_pf_ftf_L14J15', groups=MultiJetGroup + PrimaryLegGroup),
+
+ ChainProp(name='HLT_6j55_subjesIS_0eta240_L14J15',groups=MultiJetGroup + PrimaryLegGroup),
+ ChainProp(name='HLT_6j55_ftf_0eta240_L14J15', groups=MultiJetGroup + PrimaryLegGroup),
+ ChainProp(name='HLT_6j55_pf_ftf_0eta240_L14J15', groups=MultiJetGroup + PrimaryLegGroup),
+
+ ChainProp(name='HLT_6j70_subjesIS_L14J15', groups=MultiJetGroup + PrimaryLegGroup),
+ ChainProp(name='HLT_6j70_ftf_L14J15', groups=MultiJetGroup + PrimaryLegGroup),
+ ChainProp(name='HLT_6j70_pf_ftf_L14J15', groups=MultiJetGroup + PrimaryLegGroup),
+
+ ChainProp(name='HLT_7j45_subjesIS_L14J15', groups=MultiJetGroup + PrimaryLegGroup),
+ ChainProp(name='HLT_7j45_ftf_L14J15', groups=MultiJetGroup + PrimaryLegGroup),
+ ChainProp(name='HLT_7j45_pf_ftf_L14J15', groups=MultiJetGroup + PrimaryLegGroup),
+
+ ChainProp(name='HLT_10j40_subjesIS_L14J15', groups=MultiJetGroup + PrimaryLegGroup),
+ ChainProp(name='HLT_10j40_ftf_L14J15', groups=MultiJetGroup + PrimaryLegGroup),
+ ChainProp(name='HLT_10j40_pf_ftf_L14J15', groups=MultiJetGroup + PrimaryLegGroup),
+
# Chains to test JVT and PFlow effects in low-threshold 6j
ChainProp(name='HLT_6j25_0eta240_L14J15', groups=MultiJetGroup),
@@ -447,8 +447,9 @@ def setupMenu():
ChainProp(name='HLT_j80_pf_ftf_0eta240_020jvt_j55_pf_ftf_0eta240_020jvt_j28_pf_ftf_0eta240_020jvt_j20_pf_ftf_0eta240_020jvt_L14J15', l1SeedThresholds=['FSNOSEED']*4, groups=MultiJetGroup),
# ATR-22594
- ChainProp(name='HLT_2j250_subresjesgscIS_ftf_0eta240_L1J100', groups=MultiJetGroup),
- ChainProp(name='HLT_j150_subresjesgscIS_ftf_2j55_subresjesgscIS_ftf_L1J85_3J30', l1SeedThresholds=['FSNOSEED']*2, groups=MultiJetGroup),
+ ChainProp(name='HLT_2j250_ftf_0eta240_j120_ftf_0eta240_L1J100', l1SeedThresholds=['FSNOSEED']*2, groups=MultiJetGroup + PrimaryLegGroup),
+ ChainProp(name='HLT_2j250_pf_ftf_0eta240_j120_pf_ftf_0eta240_L1J100', l1SeedThresholds=['FSNOSEED']*2, groups=MultiJetGroup + PrimaryLegGroup),
+ ChainProp(name='HLT_j150_ftf_2j55_ftf_L1J85_3J30', l1SeedThresholds=['FSNOSEED']*2, groups=MultiJetGroup),
# SC L1 seed
# Note: l1SeedThresholds needs to be given explicitly, as it cannot
# be auto-filled by DictFromChainName for L1Topo items
@@ -516,11 +517,8 @@ def setupMenu():
# Test chains for ttbar and HH->4b chains
# Adding non-final b-tag selection
ChainProp(name='HLT_j80_pf_ftf_020jvt_j55_pf_ftf_020jvt_j28_pf_ftf_020jvt_bdl1r60_split_j20_pf_ftf_020jvt_bdl1r60_split_L14J15', l1SeedThresholds=['FSNOSEED']*4, groups=MultiBjetGroup),
-
ChainProp(name='HLT_j80_pf_ftf_0eta240_020jvt_j55_pf_ftf_0eta240_020jvt_j28_pf_ftf_0eta240_020jvt_bdl1r60_split_j20_pf_ftf_0eta240_020jvt_bdl1r60_split_L14J15', l1SeedThresholds=['FSNOSEED']*4, groups=MultiBjetGroup),
-
ChainProp(name='HLT_j80_pf_ftf_020jvt_j55_pf_ftf_020jvt_bdl1r70_split_j28_pf_ftf_020jvt_bdl1r70_split_j20_pf_ftf_020jvt_bdl1r70_split_L14J15', l1SeedThresholds=['FSNOSEED']*4, groups=MultiBjetGroup),
-
ChainProp(name='HLT_j80_pf_ftf_0eta240_020jvt_j55_pf_ftf_0eta240_020jvt_bdl1r70_split_j28_pf_ftf_0eta240_020jvt_bdl1r70_split_j20_pf_ftf_0eta240_020jvt_bdl1r70_split_L14J15', l1SeedThresholds=['FSNOSEED']*4, groups=MultiBjetGroup),
# Boffperf to facilitate emulation studies
@@ -744,14 +742,12 @@ def setupMenu():
# Tests of potential TLA chains for cost/rate
# ATR-19317 - dijet+ISR
- ChainProp(name='HLT_g35_loose_3j25_pf_ftf_L1EM22VHI', l1SeedThresholds=['EM22VHI','FSNOSEED'], groups=EgammaJetGroup),
- ChainProp(name='HLT_g35_medium_3j25_pf_ftf_L1EM22VHI', l1SeedThresholds=['EM22VHI','FSNOSEED'], groups=EgammaJetGroup),
- ChainProp(name='HLT_g35_tight_3j25_pf_ftf_L1EM22VHI', l1SeedThresholds=['EM22VHI','FSNOSEED'], groups=EgammaJetGroup),
+ ChainProp(name='HLT_g35_loose_3j25_pf_ftf_L1EM22VHI', l1SeedThresholds=['EM22VHI','FSNOSEED'], groups=EgammaJetGroup),
+ ChainProp(name='HLT_g35_medium_3j25_pf_ftf_L1EM22VHI', l1SeedThresholds=['EM22VHI','FSNOSEED'], groups=EgammaJetGroup),
+ ChainProp(name='HLT_g35_tight_3j25_pf_ftf_L1EM22VHI', l1SeedThresholds=['EM22VHI','FSNOSEED'], groups=EgammaJetGroup),
ChainProp(name='HLT_g35_tight_3j25_pf_ftf_boffperf_L1EM22VHI', l1SeedThresholds=['EM22VHI','FSNOSEED'], groups=EgammaJetGroup),
- ChainProp(name='HLT_g35_tight_3j25_pf_subresjesgscIS_ftf_L1EM22VHI', l1SeedThresholds=['EM22VHI','FSNOSEED'], groups=EgammaJetGroup),
- ChainProp(name='HLT_g35_tight_3j25_pf_ftf_L1EM30VHI', l1SeedThresholds=['EM22VHI','FSNOSEED'], groups=EgammaJetGroup),
+ ChainProp(name='HLT_g35_tight_3j25_pf_ftf_L1EM30VHI', l1SeedThresholds=['EM22VHI','FSNOSEED'], groups=EgammaJetGroup),
ChainProp(name='HLT_g35_tight_3j25_pf_ftf_boffperf_L1EM30VHI', l1SeedThresholds=['EM22VHI','FSNOSEED'], groups=EgammaJetGroup),
- ChainProp(name='HLT_g35_tight_3j25_pf_subresjesgscIS_ftf_L1EM30VHI', l1SeedThresholds=['EM22VHI','FSNOSEED'], groups=EgammaJetGroup),
# Tests for b-jet trigger calibration chains
ChainProp(name='HLT_e26_lhtight_ivarloose_2j20_pf_ftf_boffperf_L1EM22VHI', l1SeedThresholds=['EM22VHI','FSNOSEED'], groups=EgammaBjetGroup),
--
GitLab