From e372cf6c050c597cce15489bf0890a70ba884eec Mon Sep 17 00:00:00 2001
From: Teng Jian Khoo <teng.jian.khoo@cern.ch>
Date: Mon, 15 Feb 2021 16:49:50 +0100
Subject: [PATCH 1/3] Adding SC111-seeded large-R jet triggers and g+multijet
 chain

---
 .../python/HLTMenuConfig/Menu/LS2_v1.py              | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/LS2_v1.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/LS2_v1.py
index 52b0a231e2f2..3063eb1ec9eb 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/LS2_v1.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/LS2_v1.py
@@ -418,6 +418,17 @@ def setupMenu():
         ChainProp(name='HLT_j80_j55_j28_j20_L1MU10_2J15_J20', l1SeedThresholds=['FSNOSEED']*4, groups=MultiJetGroup),
         ChainProp(name='HLT_j80_pf_ftf_j55_pf_ftf_j28_pf_ftf_j20_pf_ftf_L1MU10_2J15_J20', 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),
+        # SC L1 seed
+        ChainProp(name='HLT_j460_a10r_L1SC111-CJ15',                   l1SeedThresholds=['FSNOSEED'], groups=SingleJetGroup),
+        ChainProp(name='HLT_j460_a10_lcw_subjes_L1SC111-CJ15',         l1SeedThresholds=['FSNOSEED'], groups=SingleJetGroup),
+        ChainProp(name='HLT_j460_a10t_lcw_jes_L1SC111-CJ15',           l1SeedThresholds=['FSNOSEED'], groups=SingleJetGroup),
+        ChainProp(name='HLT_j420_a10t_lcw_jes_35smcINF_L1SC111-CJ15',  l1SeedThresholds=['FSNOSEED'], groups=SingleJetGroup),
+        ChainProp(name='HLT_2j330_a10t_lcw_jes_35smcINF_L1SC111-CJ15', l1SeedThresholds=['FSNOSEED'], groups=SingleJetGroup),
+        ChainProp(name='HLT_j360_a10t_lcw_jes_60smcINF_j360_a10t_lcw_jes_L1SC111-CJ15', l1SeedThresholds=['FSNOSEED']*2, groups=MultiJetGroup),
+        ChainProp(name='HLT_j370_a10t_lcw_jes_35smcINF_j370_a10t_lcw_jes_L1SC111-CJ15', l1SeedThresholds=['FSNOSEED']*2, groups=MultiJetGroup),
     ]
 
     TriggerFlags.BjetSlice.signatures = TriggerFlags.BjetSlice.signatures() + [
@@ -614,6 +625,7 @@ def setupMenu():
 
         # photon + multijets (ATR-22594)
         ChainProp(name='HLT_g85_tight_3j50_L1EM22VHI',l1SeedThresholds=['EM22VHI','FSNOSEED'],stream=[PhysicsStream], groups=EgammaJetGroup),
+        ChainProp(name='HLT_g45_loose_tight_6j45_L14J15p0ETA25',l1SeedThresholds=['FSNOSEED']*2,stream=[PhysicsStream], groups=EgammaJetGroup),
 
         # photon + MET (ATR-22594)
         ChainProp(name='HLT_g90_loose_xe90_cell_L1EM22VHI',l1SeedThresholds=['EM22VHI','FSNOSEED'],stream=[PhysicsStream], groups=EgammaMETGroup),
-- 
GitLab


From e4299ae0ec37eeb7987ea784f78073e550a3e4ca Mon Sep 17 00:00:00 2001
From: Teng Jian Khoo <teng.jian.khoo@cern.ch>
Date: Mon, 15 Feb 2021 17:06:16 +0100
Subject: [PATCH 2/3] Explanatory comment for l1SeedThreshold on L1Topo items

---
 .../TriggerMenuMT/python/HLTMenuConfig/Menu/LS2_v1.py         | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/LS2_v1.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/LS2_v1.py
index 3063eb1ec9eb..393a4b4b604d 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/LS2_v1.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/LS2_v1.py
@@ -146,6 +146,8 @@ def setupMenu():
         ChainProp(name='HLT_2e24_lhvloose_L12EM20VH', stream=[PhysicsStream], groups=MultiElectronGroup),
         ChainProp(name='HLT_e24_lhvloose_2e12_lhvloose_L1EM20VH_3EM10VH', stream=[PhysicsStream], groups=MultiElectronGroup),
         ## ATR-22109
+        # Note: l1SeedThresholds needs to be given explicitly, as it cannot
+        # be auto-filled by DictFromChainName for L1Topo items
         ChainProp(name='HLT_e20_lhtight_ivarloose_L1ZAFB-25DPHI-EM18I', l1SeedThresholds=['EM12'], stream=[PhysicsStream], groups=MultiElectronGroup),
 
         # TnP triggers
@@ -422,6 +424,8 @@ def setupMenu():
         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),
         # SC L1 seed
+        # Note: l1SeedThresholds needs to be given explicitly, as it cannot
+        # be auto-filled by DictFromChainName for L1Topo items
         ChainProp(name='HLT_j460_a10r_L1SC111-CJ15',                   l1SeedThresholds=['FSNOSEED'], groups=SingleJetGroup),
         ChainProp(name='HLT_j460_a10_lcw_subjes_L1SC111-CJ15',         l1SeedThresholds=['FSNOSEED'], groups=SingleJetGroup),
         ChainProp(name='HLT_j460_a10t_lcw_jes_L1SC111-CJ15',           l1SeedThresholds=['FSNOSEED'], groups=SingleJetGroup),
-- 
GitLab


From 6978a1db9bc54cb31a7065c4507cba79977abc1b Mon Sep 17 00:00:00 2001
From: Teng Jian Khoo <teng.jian.khoo@cern.ch>
Date: Mon, 15 Feb 2021 17:28:14 +0100
Subject: [PATCH 3/3] Update refs

---
 .../share/ref_RDOtoRDOTrig_v1Dev_build.ref    | 30 +++++++++++++++++++
 .../share/ref_data_v1Dev_build.ref            | 26 ++++++++++++++++
 2 files changed, 56 insertions(+)

diff --git a/Trigger/TrigValidation/TrigAnalysisTest/share/ref_RDOtoRDOTrig_v1Dev_build.ref b/Trigger/TrigValidation/TrigAnalysisTest/share/ref_RDOtoRDOTrig_v1Dev_build.ref
index 45b6218fdbad..1da26c764466 100644
--- a/Trigger/TrigValidation/TrigAnalysisTest/share/ref_RDOtoRDOTrig_v1Dev_build.ref
+++ b/Trigger/TrigValidation/TrigAnalysisTest/share/ref_RDOtoRDOTrig_v1Dev_build.ref
@@ -112,6 +112,12 @@ HLT_2g50_loose_L12EM20VH:
   eventCount: 0
   stepFeatures:
     0: 2
+HLT_2j250_subresjesgscIS_ftf_0eta240_L1J100:
+  eventCount: 0
+  stepCounts:
+    0: 3
+  stepFeatures:
+    0: 3
 HLT_2j330_a10sd_cssk_pf_jes_ftf_35smcINF_L1J100:
   eventCount: 0
   stepCounts:
@@ -126,6 +132,8 @@ HLT_2j330_a10sd_cssk_pf_nojcalib_ftf_35smcINF_L1J100:
     0: 3
 HLT_2j330_a10t_lcw_jes_35smcINF_L1J100:
   eventCount: 0
+HLT_2j330_a10t_lcw_jes_35smcINF_L1SC111-CJ15:
+  eventCount: 0
 HLT_2j330_a10t_lcw_nojcalib_35smcINF_L1J100:
   eventCount: 0
 HLT_2j60_L1J15:
@@ -1924,6 +1932,10 @@ HLT_g3_loose_LArPEBHLT_L1EM3:
   eventCount: 0
 HLT_g40_loose_LArPEBHLT_L1EM20VHI:
   eventCount: 0
+HLT_g45_loose_tight_6j45_L14J15p0ETA25:
+  eventCount: 0
+  stepCounts:
+    0: 6
 HLT_g5_etcut_L1EM3:
   eventCount: 20
   stepCounts:
@@ -2008,6 +2020,12 @@ HLT_j0_perf_L1J12_EMPTY:
   eventCount: 0
 HLT_j140_320eta490_LArPEBHLT_L1J75_31ETA49:
   eventCount: 0
+HLT_j150_subresjesgscIS_ftf_2j55_subresjesgscIS_ftf_L1J85_3J30:
+  eventCount: 0
+  stepCounts:
+    0: 3
+  stepFeatures:
+    0: 3
 HLT_j165_LArPEBHLT_L1J100:
   eventCount: 0
 HLT_j225_subjesgscIS_ftf_bmv2c1040_split_L1J100:
@@ -2068,6 +2086,8 @@ HLT_j300_subjesgscIS_ftf_bmv2c1070_split_L1J100:
     0: 3
   stepFeatures:
     0: 3
+HLT_j360_a10t_lcw_jes_60smcINF_j360_a10t_lcw_jes_L1SC111-CJ15:
+  eventCount: 0
 HLT_j360_pf_subjesgscIS_ftf_bdl1r77_split_L1J100:
   eventCount: 0
   stepCounts:
@@ -2086,6 +2106,8 @@ HLT_j360_subjesgscIS_ftf_bmv2c1077_split_L1J100:
     0: 3
   stepFeatures:
     0: 3
+HLT_j370_a10t_lcw_jes_35smcINF_j370_a10t_lcw_jes_L1SC111-CJ15:
+  eventCount: 0
 HLT_j40_LArPEBHLT_L1J20:
   eventCount: 0
 HLT_j40_j0_aggSEP50htSEP10etSEP0eta320_L1J20:
@@ -2096,6 +2118,8 @@ HLT_j40_j0_aggSEP50htSEP10etSEP0eta320_L1J20:
     0: 1044
 HLT_j420_L1J100:
   eventCount: 0
+HLT_j420_a10t_lcw_jes_35smcINF_L1SC111-CJ15:
+  eventCount: 0
 HLT_j420_pf_subresjesgscIS_ftf_L1J100:
   eventCount: 0
   stepCounts:
@@ -2342,10 +2366,14 @@ HLT_j460_a10_lcw_subjes_L1J100:
   eventCount: 0
 HLT_j460_a10_lcw_subjes_L1J20:
   eventCount: 0
+HLT_j460_a10_lcw_subjes_L1SC111-CJ15:
+  eventCount: 0
 HLT_j460_a10r_L1J100:
   eventCount: 0
 HLT_j460_a10r_L1J20:
   eventCount: 0
+HLT_j460_a10r_L1SC111-CJ15:
+  eventCount: 0
 HLT_j460_a10sd_cssk_pf_jes_ftf_35smcINF_L1J100:
   eventCount: 0
   stepCounts:
@@ -2382,6 +2410,8 @@ HLT_j460_a10t_lcw_jes_30smcINF_L1J100:
   eventCount: 0
 HLT_j460_a10t_lcw_jes_L1J100:
   eventCount: 0
+HLT_j460_a10t_lcw_jes_L1SC111-CJ15:
+  eventCount: 0
 HLT_j460_a10t_lcw_nojcalib_35smcINF_L1J100:
   eventCount: 0
 HLT_j460_a10t_lcw_nojcalib_L1J100:
diff --git a/Trigger/TrigValidation/TriggerTest/share/ref_data_v1Dev_build.ref b/Trigger/TrigValidation/TriggerTest/share/ref_data_v1Dev_build.ref
index 23f369aec5ed..0be227752e98 100644
--- a/Trigger/TrigValidation/TriggerTest/share/ref_data_v1Dev_build.ref
+++ b/Trigger/TrigValidation/TriggerTest/share/ref_data_v1Dev_build.ref
@@ -70,12 +70,16 @@ HLT_2g35_medium_L12EM20VH:
   eventCount: 0
 HLT_2g50_loose_L12EM20VH:
   eventCount: 0
+HLT_2j250_subresjesgscIS_ftf_0eta240_L1J100:
+  eventCount: 0
 HLT_2j330_a10sd_cssk_pf_jes_ftf_35smcINF_L1J100:
   eventCount: 0
 HLT_2j330_a10sd_cssk_pf_nojcalib_ftf_35smcINF_L1J100:
   eventCount: 0
 HLT_2j330_a10t_lcw_jes_35smcINF_L1J100:
   eventCount: 0
+HLT_2j330_a10t_lcw_jes_35smcINF_L1SC111-CJ15:
+  eventCount: 0
 HLT_2j330_a10t_lcw_nojcalib_35smcINF_L1J100:
   eventCount: 0
 HLT_2j60_L1J15:
@@ -964,6 +968,10 @@ HLT_g3_loose_LArPEBHLT_L1EM3:
     4: 3
 HLT_g40_loose_LArPEBHLT_L1EM20VHI:
   eventCount: 0
+HLT_g45_loose_tight_6j45_L14J15p0ETA25:
+  eventCount: 0
+  stepCounts:
+    0: 20
 HLT_g5_etcut_L1EM3:
   eventCount: 13
   stepCounts:
@@ -1048,6 +1056,12 @@ HLT_j0_perf_L1J12_EMPTY:
     0: 129
 HLT_j140_320eta490_LArPEBHLT_L1J75_31ETA49:
   eventCount: 0
+HLT_j150_subresjesgscIS_ftf_2j55_subresjesgscIS_ftf_L1J85_3J30:
+  eventCount: 0
+  stepCounts:
+    0: 20
+  stepFeatures:
+    0: 20
 HLT_j165_LArPEBHLT_L1J100:
   eventCount: 0
 HLT_j225_subjesgscIS_ftf_bmv2c1040_split_L1J100:
@@ -1072,12 +1086,16 @@ HLT_j300_subjesgscIS_ftf_bdl1r70_split_L1J100:
   eventCount: 0
 HLT_j300_subjesgscIS_ftf_bmv2c1070_split_L1J100:
   eventCount: 0
+HLT_j360_a10t_lcw_jes_60smcINF_j360_a10t_lcw_jes_L1SC111-CJ15:
+  eventCount: 0
 HLT_j360_pf_subjesgscIS_ftf_bdl1r77_split_L1J100:
   eventCount: 0
 HLT_j360_subjesgscIS_ftf_bdl1r77_split_L1J100:
   eventCount: 0
 HLT_j360_subjesgscIS_ftf_bmv2c1077_split_L1J100:
   eventCount: 0
+HLT_j370_a10t_lcw_jes_35smcINF_j370_a10t_lcw_jes_L1SC111-CJ15:
+  eventCount: 0
 HLT_j40_LArPEBHLT_L1J20:
   eventCount: 5
   stepCounts:
@@ -1094,6 +1112,8 @@ HLT_j40_j0_aggSEP50htSEP10etSEP0eta320_L1J20:
     0: 220
 HLT_j420_L1J100:
   eventCount: 0
+HLT_j420_a10t_lcw_jes_35smcINF_L1SC111-CJ15:
+  eventCount: 0
 HLT_j420_pf_subresjesgscIS_ftf_L1J100:
   eventCount: 0
 HLT_j420_subresjesgscIS_ftf_L1J100:
@@ -1332,10 +1352,14 @@ HLT_j460_a10_lcw_subjes_L1J100:
   eventCount: 0
 HLT_j460_a10_lcw_subjes_L1J20:
   eventCount: 0
+HLT_j460_a10_lcw_subjes_L1SC111-CJ15:
+  eventCount: 0
 HLT_j460_a10r_L1J100:
   eventCount: 0
 HLT_j460_a10r_L1J20:
   eventCount: 0
+HLT_j460_a10r_L1SC111-CJ15:
+  eventCount: 0
 HLT_j460_a10sd_cssk_pf_jes_ftf_35smcINF_L1J100:
   eventCount: 0
 HLT_j460_a10sd_cssk_pf_jes_ftf_L1J100:
@@ -1352,6 +1376,8 @@ HLT_j460_a10t_lcw_jes_30smcINF_L1J100:
   eventCount: 0
 HLT_j460_a10t_lcw_jes_L1J100:
   eventCount: 0
+HLT_j460_a10t_lcw_jes_L1SC111-CJ15:
+  eventCount: 0
 HLT_j460_a10t_lcw_nojcalib_35smcINF_L1J100:
   eventCount: 0
 HLT_j460_a10t_lcw_nojcalib_L1J100:
-- 
GitLab