From 92218b1c6fd1891a81337769ae5e476a185ae56e Mon Sep 17 00:00:00 2001
From: Marco Valente <marco.valente@cern.ch>
Date: Tue, 21 Sep 2021 14:41:20 +0200
Subject: [PATCH 1/8] Adding test chain and removing LCW preselection for jet
 triggers

---
 .../python/HLTMenuConfig/Jet/JetChainConfiguration.py          | 3 +++
 .../TriggerMenuMT/python/HLTMenuConfig/Menu/LS2_v1.py          | 2 ++
 2 files changed, 5 insertions(+)

diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Jet/JetChainConfiguration.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Jet/JetChainConfiguration.py
index 84ae7d7c9372..e71a1217304b 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Jet/JetChainConfiguration.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Jet/JetChainConfiguration.py
@@ -174,8 +174,11 @@ class JetChainConfiguration(ChainConfigurationBase):
             'constitMod':'',
             'trkopt':'notrk',
         }
+        ''' #Here you can set custom calibrations for large-R preselections. If you set to LCW you'll get an issue though, as the trigger expects the *same* topocluster collection to be used in the preselection and in the PFlow stage with tracking. Therefore this would need to be adapted, but it might not be so easy...
+         
         if preselRecoDict['recoAlg']=='a10': #Setting LC calibrations for large-R jets
             preselRecoDict['clusterCalib']='lcw'
+        '''
         from .JetRecoConfiguration import interpretJetCalibDefault
         preselRecoDict.update({'jetCalib':interpretJetCalibDefault(preselRecoDict)}) #Adding default calibration for corresponding chain
         from ..Menu.SignatureDicts import JetChainParts_Default
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/LS2_v1.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/LS2_v1.py
index 75641a8e53be..1f3aaf3dea81 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/LS2_v1.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/LS2_v1.py
@@ -411,6 +411,8 @@ def setupMenu():
         ChainProp(name='HLT_j460_a10sd_lcw_nojcalib_L1J100', l1SeedThresholds=['FSNOSEED'], groups=SingleJetGroup),
         ChainProp(name='HLT_j460_a10sd_pf_nojcalib_ftf_L1J100', l1SeedThresholds=['FSNOSEED'], groups=SingleJetGroup),
 
+        ChainProp(name='HLT_j460_a10sd_cssk_pf_subjes_ftf_preselj225_L1J100', l1SeedThresholds=['FSNOSEED'], groups=SingleJetGroup),
+
         ChainProp(name='HLT_j460_a10sd_cssk_pf_nojcalib_ftf_L1J100', l1SeedThresholds=['FSNOSEED'], groups=SingleJetGroup),
         ChainProp(name='HLT_j460_a10sd_cssk_pf_nojcalib_ftf_35smcINF_L1J100', l1SeedThresholds=['FSNOSEED'], groups=SingleJetGroup),
         ChainProp(name='HLT_2j330_a10sd_cssk_pf_nojcalib_ftf_35smcINF_L1J100', l1SeedThresholds=['FSNOSEED'], groups=SingleJetGroup),
-- 
GitLab


From 4b97be0176268443e5afdbfdf47f81be109e0919 Mon Sep 17 00:00:00 2001
From: Marco Valente <marco.valente@cern.ch>
Date: Tue, 21 Sep 2021 16:19:39 +0200
Subject: [PATCH 2/8] Updating chain and presel config

---
 Trigger/TriggerCommon/TrigEDMConfig/python/TriggerEDMRun3.py   | 3 +++
 .../python/HLTMenuConfig/Jet/JetChainConfiguration.py          | 2 +-
 .../TriggerMenuMT/python/HLTMenuConfig/Menu/LS2_v1.py          | 2 +-
 3 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/Trigger/TriggerCommon/TrigEDMConfig/python/TriggerEDMRun3.py b/Trigger/TriggerCommon/TrigEDMConfig/python/TriggerEDMRun3.py
index cf796e7a24bc..cf49288dd621 100644
--- a/Trigger/TriggerCommon/TrigEDMConfig/python/TriggerEDMRun3.py
+++ b/Trigger/TriggerCommon/TrigEDMConfig/python/TriggerEDMRun3.py
@@ -540,6 +540,9 @@ TriggerHLTListRun3 = [
     ('xAOD::JetContainer#HLT_AntiKt10LCTopoJets_nojcalib',                     'BS ESD AODFULL', 'Jet'),
     ('xAOD::JetAuxContainer#HLT_AntiKt10LCTopoJets_nojcalibAux.'+JetVars,      'BS ESD AODFULL', 'Jet'),
 
+    ('xAOD::JetContainer#HLT_AntiKt10EMTopoJets_nojcalib',                      'BS ESD AODFULL', 'Jet'),
+    ('xAOD::JetAuxContainer#HLT_AntiKt10EMTopoJets_nojcalibAux.'+JetVars,       'BS ESD AODFULL', 'Jet'),
+
     ('xAOD::JetContainer#HLT_AntiKt10EMTopoRCJets_subjesIS',                      'BS ESD AODFULL', 'Jet'),
     ('xAOD::JetAuxContainer#HLT_AntiKt10EMTopoRCJets_subjesISAux.'+JetVars,       'BS ESD AODFULL', 'Jet'),
 
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Jet/JetChainConfiguration.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Jet/JetChainConfiguration.py
index e71a1217304b..090fbcf86eed 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Jet/JetChainConfiguration.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Jet/JetChainConfiguration.py
@@ -180,7 +180,7 @@ class JetChainConfiguration(ChainConfigurationBase):
             preselRecoDict['clusterCalib']='lcw'
         '''
         from .JetRecoConfiguration import interpretJetCalibDefault
-        preselRecoDict.update({'jetCalib':interpretJetCalibDefault(preselRecoDict)}) #Adding default calibration for corresponding chain
+        preselRecoDict.update({'jetCalib':interpretJetCalibDefault(preselRecoDict) if preselRecoDict['recoAlg']=='a4' else 'nojcalib'}) #Adding default calibration for corresponding chain
         from ..Menu.SignatureDicts import JetChainParts_Default
         preselCommonJetParts = dict(JetChainParts_Default)
         preselCommonJetParts.update(preselRecoDict)
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/LS2_v1.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/LS2_v1.py
index 1f3aaf3dea81..bfcb6130a4a7 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/LS2_v1.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/LS2_v1.py
@@ -411,7 +411,7 @@ def setupMenu():
         ChainProp(name='HLT_j460_a10sd_lcw_nojcalib_L1J100', l1SeedThresholds=['FSNOSEED'], groups=SingleJetGroup),
         ChainProp(name='HLT_j460_a10sd_pf_nojcalib_ftf_L1J100', l1SeedThresholds=['FSNOSEED'], groups=SingleJetGroup),
 
-        ChainProp(name='HLT_j460_a10sd_cssk_pf_subjes_ftf_preselj225_L1J100', l1SeedThresholds=['FSNOSEED'], groups=SingleJetGroup),
+        ChainProp(name='HLT_j460_a10sd_cssk_pf_jes_ftf_preselj225_L1J100', l1SeedThresholds=['FSNOSEED'], groups=SingleJetGroup),
 
         ChainProp(name='HLT_j460_a10sd_cssk_pf_nojcalib_ftf_L1J100', l1SeedThresholds=['FSNOSEED'], groups=SingleJetGroup),
         ChainProp(name='HLT_j460_a10sd_cssk_pf_nojcalib_ftf_35smcINF_L1J100', l1SeedThresholds=['FSNOSEED'], groups=SingleJetGroup),
-- 
GitLab


From 808bd6a7e5242b9f84804b8acb22e694f52bf4f6 Mon Sep 17 00:00:00 2001
From: Marco Valente <marco.valente@cern.ch>
Date: Wed, 22 Sep 2021 12:22:44 +0200
Subject: [PATCH 3/8] Updating reference for presel largeR chain

---
 .../share/ref_RDOtoRDOTrig_v1Dev_build.ref                | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/Trigger/TrigValidation/TrigAnalysisTest/share/ref_RDOtoRDOTrig_v1Dev_build.ref b/Trigger/TrigValidation/TrigAnalysisTest/share/ref_RDOtoRDOTrig_v1Dev_build.ref
index 281632ff5015..15bdcef33c99 100644
--- a/Trigger/TrigValidation/TrigAnalysisTest/share/ref_RDOtoRDOTrig_v1Dev_build.ref
+++ b/Trigger/TrigValidation/TrigAnalysisTest/share/ref_RDOtoRDOTrig_v1Dev_build.ref
@@ -6600,6 +6600,14 @@ HLT_j460_a10sd_cssk_pf_jes_ftf_L1SC111-CJ15:
   stepFeatures:
     0: 5
     1: 2
+HLT_j460_a10sd_cssk_pf_jes_ftf_preselj225_L1J100:
+  eventCount: 1
+  stepCounts:
+    0: 5
+    1: 1
+  stepFeatures:
+    0: 5
+    1: 2
 HLT_j460_a10sd_cssk_pf_nojcalib_ftf_35smcINF_L1J100:
   eventCount: 1
   stepCounts:
-- 
GitLab


From 54f193347419cac6cce1337eadc3091f20f5eb10 Mon Sep 17 00:00:00 2001
From: Marco Valente <marco.valente@cern.ch>
Date: Thu, 30 Sep 2021 18:40:33 +0200
Subject: [PATCH 4/8] Adding large-R jet triggers with preselections

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

diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/LS2_v1.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/LS2_v1.py
index cd3909677918..f15e70525432 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/LS2_v1.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/LS2_v1.py
@@ -418,7 +418,27 @@ def setupMenu():
         ChainProp(name='HLT_j460_a10sd_lcw_nojcalib_L1J100', l1SeedThresholds=['FSNOSEED'], groups=SingleJetGroup),
         ChainProp(name='HLT_j460_a10sd_pf_nojcalib_ftf_L1J100', l1SeedThresholds=['FSNOSEED'], groups=SingleJetGroup),
 
+        #Large-R jets with preselections
+        ChainProp(name='HLT_j460_a10sd_cssk_pf_jes_ftf_preselj135_L1J100', l1SeedThresholds=['FSNOSEED'], groups=SingleJetGroup),
+        ChainProp(name='HLT_j460_a10sd_cssk_pf_jes_ftf_preselj180_L1J100', l1SeedThresholds=['FSNOSEED'], groups=SingleJetGroup),
         ChainProp(name='HLT_j460_a10sd_cssk_pf_jes_ftf_preselj225_L1J100', l1SeedThresholds=['FSNOSEED'], groups=SingleJetGroup),
+        ChainProp(name='HLT_j460_a10sd_cssk_pf_jes_ftf_preselj135_L1SC111-CJ15', l1SeedThresholds=['FSNOSEED'], groups=SingleJetGroup+PrimaryLegGroup),
+        ChainProp(name='HLT_j460_a10sd_cssk_pf_jes_ftf_preselj180_L1SC111-CJ15', l1SeedThresholds=['FSNOSEED'], groups=SingleJetGroup+PrimaryLegGroup),
+        ChainProp(name='HLT_j460_a10sd_cssk_pf_jes_ftf_preselj225_L1SC111-CJ15', l1SeedThresholds=['FSNOSEED'], groups=SingleJetGroup+PrimaryLegGroup),
+
+        ChainProp(name='HLT_j420_a10sd_cssk_pf_jes_ftf_35smcINF_preselj135_L1J100', l1SeedThresholds=['FSNOSEED'], groups=SingleJetGroup+PrimaryLegGroup),
+        ChainProp(name='HLT_j420_a10sd_cssk_pf_jes_ftf_35smcINF_preselj180_L1J100', l1SeedThresholds=['FSNOSEED'], groups=SingleJetGroup+PrimaryLegGroup),
+        ChainProp(name='HLT_j420_a10sd_cssk_pf_jes_ftf_35smcINF_preselj225_L1J100', l1SeedThresholds=['FSNOSEED'], groups=SingleJetGroup+PrimaryLegGroup),
+        ChainProp(name='HLT_2j330_a10sd_cssk_pf_jes_ftf_35smcINF_preselj135_L1J100', l1SeedThresholds=['FSNOSEED'], groups=SingleJetGroup+PrimaryLegGroup),
+        ChainProp(name='HLT_2j330_a10sd_cssk_pf_jes_ftf_35smcINF_preselj180_L1J100', l1SeedThresholds=['FSNOSEED'], groups=SingleJetGroup+PrimaryLegGroup),
+        ChainProp(name='HLT_2j330_a10sd_cssk_pf_jes_ftf_35smcINF_preselj225_L1J100', l1SeedThresholds=['FSNOSEED'], groups=SingleJetGroup+PrimaryLegGroup),
+        ChainProp(name='HLT_j420_a10sd_cssk_pf_jes_ftf_35smcINF_preselj135_L1SC111-CJ15', l1SeedThresholds=['FSNOSEED'], groups=SingleJetGroup+PrimaryLegGroup),
+        ChainProp(name='HLT_j420_a10sd_cssk_pf_jes_ftf_35smcINF_preselj180_L1SC111-CJ15', l1SeedThresholds=['FSNOSEED'], groups=SingleJetGroup+PrimaryLegGroup),
+        ChainProp(name='HLT_j420_a10sd_cssk_pf_jes_ftf_35smcINF_preselj225_L1SC111-CJ15', l1SeedThresholds=['FSNOSEED'], groups=SingleJetGroup+PrimaryLegGroup),
+        ChainProp(name='HLT_2j330_a10sd_cssk_pf_jes_ftf_35smcINF_preselj135_L1SC111-CJ15', l1SeedThresholds=['FSNOSEED'], groups=SingleJetGroup+PrimaryLegGroup),
+        ChainProp(name='HLT_2j330_a10sd_cssk_pf_jes_ftf_35smcINF_preselj180_L1SC111-CJ15', l1SeedThresholds=['FSNOSEED'], groups=SingleJetGroup+PrimaryLegGroup),
+        ChainProp(name='HLT_2j330_a10sd_cssk_pf_jes_ftf_35smcINF_preselj225_L1SC111-CJ15', l1SeedThresholds=['FSNOSEED'], groups=SingleJetGroup+PrimaryLegGroup),
+
 
         ChainProp(name='HLT_j460_a10sd_cssk_pf_nojcalib_ftf_L1J100', l1SeedThresholds=['FSNOSEED'], groups=SingleJetGroup),
         ChainProp(name='HLT_j460_a10sd_cssk_pf_nojcalib_ftf_35smcINF_L1J100', l1SeedThresholds=['FSNOSEED'], groups=SingleJetGroup),
-- 
GitLab


From 7eaa4fa15d0a7a892b346fb81bf5e47394ebc48e Mon Sep 17 00:00:00 2001
From: Marco Valente <marco.valente@cern.ch>
Date: Thu, 30 Sep 2021 19:49:21 +0200
Subject: [PATCH 5/8] Updating reference file

---
 .../share/ref_RDOtoRDOTrig_v1Dev_build.ref    | 124 ++++++++++++++++++
 1 file changed, 124 insertions(+)

diff --git a/Trigger/TrigValidation/TrigAnalysisTest/share/ref_RDOtoRDOTrig_v1Dev_build.ref b/Trigger/TrigValidation/TrigAnalysisTest/share/ref_RDOtoRDOTrig_v1Dev_build.ref
index 0a849f7e7424..8068bc6dcd27 100644
--- a/Trigger/TrigValidation/TrigAnalysisTest/share/ref_RDOtoRDOTrig_v1Dev_build.ref
+++ b/Trigger/TrigValidation/TrigAnalysisTest/share/ref_RDOtoRDOTrig_v1Dev_build.ref
@@ -386,6 +386,42 @@ HLT_2j330_a10sd_cssk_pf_jes_ftf_35smcINF_L1SC111-CJ15:
     0: 5
   stepFeatures:
     0: 5
+HLT_2j330_a10sd_cssk_pf_jes_ftf_35smcINF_preselj135_L1J100:
+  eventCount: 0
+  stepCounts:
+    0: 5
+  stepFeatures:
+    0: 5
+HLT_2j330_a10sd_cssk_pf_jes_ftf_35smcINF_preselj135_L1SC111-CJ15:
+  eventCount: 0
+  stepCounts:
+    0: 5
+  stepFeatures:
+    0: 5
+HLT_2j330_a10sd_cssk_pf_jes_ftf_35smcINF_preselj180_L1J100:
+  eventCount: 0
+  stepCounts:
+    0: 5
+  stepFeatures:
+    0: 5
+HLT_2j330_a10sd_cssk_pf_jes_ftf_35smcINF_preselj180_L1SC111-CJ15:
+  eventCount: 0
+  stepCounts:
+    0: 5
+  stepFeatures:
+    0: 5
+HLT_2j330_a10sd_cssk_pf_jes_ftf_35smcINF_preselj225_L1J100:
+  eventCount: 0
+  stepCounts:
+    0: 5
+  stepFeatures:
+    0: 5
+HLT_2j330_a10sd_cssk_pf_jes_ftf_35smcINF_preselj225_L1SC111-CJ15:
+  eventCount: 0
+  stepCounts:
+    0: 5
+  stepFeatures:
+    0: 5
 HLT_2j330_a10sd_cssk_pf_nojcalib_ftf_35smcINF_L1J100:
   eventCount: 1
   stepCounts:
@@ -6495,6 +6531,54 @@ HLT_j420_a10sd_cssk_pf_jes_ftf_35smcINF_L1SC111-CJ15:
   stepFeatures:
     0: 5
     1: 1
+HLT_j420_a10sd_cssk_pf_jes_ftf_35smcINF_preselj135_L1J100:
+  eventCount: 1
+  stepCounts:
+    0: 5
+    1: 1
+  stepFeatures:
+    0: 5
+    1: 1
+HLT_j420_a10sd_cssk_pf_jes_ftf_35smcINF_preselj135_L1SC111-CJ15:
+  eventCount: 1
+  stepCounts:
+    0: 5
+    1: 1
+  stepFeatures:
+    0: 5
+    1: 1
+HLT_j420_a10sd_cssk_pf_jes_ftf_35smcINF_preselj180_L1J100:
+  eventCount: 1
+  stepCounts:
+    0: 5
+    1: 1
+  stepFeatures:
+    0: 5
+    1: 1
+HLT_j420_a10sd_cssk_pf_jes_ftf_35smcINF_preselj180_L1SC111-CJ15:
+  eventCount: 1
+  stepCounts:
+    0: 5
+    1: 1
+  stepFeatures:
+    0: 5
+    1: 1
+HLT_j420_a10sd_cssk_pf_jes_ftf_35smcINF_preselj225_L1J100:
+  eventCount: 1
+  stepCounts:
+    0: 5
+    1: 1
+  stepFeatures:
+    0: 5
+    1: 1
+HLT_j420_a10sd_cssk_pf_jes_ftf_35smcINF_preselj225_L1SC111-CJ15:
+  eventCount: 1
+  stepCounts:
+    0: 5
+    1: 1
+  stepFeatures:
+    0: 5
+    1: 1
 HLT_j420_a10sd_cssk_pf_jes_ftf_L1J100:
   eventCount: 1
   stepCounts:
@@ -6857,6 +6941,38 @@ HLT_j460_a10sd_cssk_pf_jes_ftf_L1SC111-CJ15:
   stepFeatures:
     0: 5
     1: 2
+HLT_j460_a10sd_cssk_pf_jes_ftf_preselj135_L1J100:
+  eventCount: 1
+  stepCounts:
+    0: 5
+    1: 1
+  stepFeatures:
+    0: 5
+    1: 2
+HLT_j460_a10sd_cssk_pf_jes_ftf_preselj135_L1SC111-CJ15:
+  eventCount: 1
+  stepCounts:
+    0: 5
+    1: 1
+  stepFeatures:
+    0: 5
+    1: 2
+HLT_j460_a10sd_cssk_pf_jes_ftf_preselj180_L1J100:
+  eventCount: 1
+  stepCounts:
+    0: 5
+    1: 1
+  stepFeatures:
+    0: 5
+    1: 2
+HLT_j460_a10sd_cssk_pf_jes_ftf_preselj180_L1SC111-CJ15:
+  eventCount: 1
+  stepCounts:
+    0: 5
+    1: 1
+  stepFeatures:
+    0: 5
+    1: 2
 HLT_j460_a10sd_cssk_pf_jes_ftf_preselj225_L1J100:
   eventCount: 1
   stepCounts:
@@ -6865,6 +6981,14 @@ HLT_j460_a10sd_cssk_pf_jes_ftf_preselj225_L1J100:
   stepFeatures:
     0: 5
     1: 2
+HLT_j460_a10sd_cssk_pf_jes_ftf_preselj225_L1SC111-CJ15:
+  eventCount: 1
+  stepCounts:
+    0: 5
+    1: 1
+  stepFeatures:
+    0: 5
+    1: 2
 HLT_j460_a10sd_cssk_pf_nojcalib_ftf_35smcINF_L1J100:
   eventCount: 1
   stepCounts:
-- 
GitLab


From b80d3ce685ae9658f1fc95979bf38712a2c93ec0 Mon Sep 17 00:00:00 2001
From: Marco Valente <marco.valente@cern.ch>
Date: Mon, 4 Oct 2021 14:21:44 +0200
Subject: [PATCH 6/8] Adding new preselection

---
 .../python/HLTMenuConfig/Menu/LS2_v1.py       | 22 ++++++++++++++++---
 .../HLTMenuConfig/Menu/SignatureDicts.py      |  3 +++
 2 files changed, 22 insertions(+), 3 deletions(-)

diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/LS2_v1.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/LS2_v1.py
index 4fd0fb4fe09a..a852367d7a98 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/LS2_v1.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/LS2_v1.py
@@ -433,9 +433,15 @@ def setupMenu():
         ChainProp(name='HLT_j460_a10sd_cssk_pf_jes_ftf_preselj135_L1J100', l1SeedThresholds=['FSNOSEED'], groups=SingleJetGroup),
         ChainProp(name='HLT_j460_a10sd_cssk_pf_jes_ftf_preselj180_L1J100', l1SeedThresholds=['FSNOSEED'], groups=SingleJetGroup),
         ChainProp(name='HLT_j460_a10sd_cssk_pf_jes_ftf_preselj225_L1J100', l1SeedThresholds=['FSNOSEED'], groups=SingleJetGroup),
+        ChainProp(name='HLT_j135_a10_tc_em_nojcalib_L1J100', l1SeedThresholds=['FSNOSEED'], groups=SingleJetGroup),
+        ChainProp(name='HLT_j180_a10_tc_em_nojcalib_L1J100', l1SeedThresholds=['FSNOSEED'], groups=SingleJetGroup),
+        ChainProp(name='HLT_j225_a10_tc_em_nojcalib_L1J100', l1SeedThresholds=['FSNOSEED'], groups=SingleJetGroup),
         ChainProp(name='HLT_j460_a10sd_cssk_pf_jes_ftf_preselj135_L1SC111-CJ15', l1SeedThresholds=['FSNOSEED'], groups=SingleJetGroup+PrimaryLegGroup),
         ChainProp(name='HLT_j460_a10sd_cssk_pf_jes_ftf_preselj180_L1SC111-CJ15', l1SeedThresholds=['FSNOSEED'], groups=SingleJetGroup+PrimaryLegGroup),
         ChainProp(name='HLT_j460_a10sd_cssk_pf_jes_ftf_preselj225_L1SC111-CJ15', l1SeedThresholds=['FSNOSEED'], groups=SingleJetGroup+PrimaryLegGroup),
+        ChainProp(name='HLT_j135_a10_tc_em_nojcalib_L1SC111-CJ15', l1SeedThresholds=['FSNOSEED'], groups=SingleJetGroup),
+        ChainProp(name='HLT_j180_a10_tc_em_nojcalib_L1SC111-CJ15', l1SeedThresholds=['FSNOSEED'], groups=SingleJetGroup),
+        ChainProp(name='HLT_j225_a10_tc_em_nojcalib_L1SC111-CJ15', l1SeedThresholds=['FSNOSEED'], groups=SingleJetGroup),
 
         ChainProp(name='HLT_j420_a10sd_cssk_pf_jes_ftf_35smcINF_preselj135_L1J100', l1SeedThresholds=['FSNOSEED'], groups=SingleJetGroup+PrimaryLegGroup),
         ChainProp(name='HLT_j420_a10sd_cssk_pf_jes_ftf_35smcINF_preselj180_L1J100', l1SeedThresholds=['FSNOSEED'], groups=SingleJetGroup+PrimaryLegGroup),
@@ -450,6 +456,13 @@ def setupMenu():
         ChainProp(name='HLT_2j330_a10sd_cssk_pf_jes_ftf_35smcINF_preselj180_L1SC111-CJ15', l1SeedThresholds=['FSNOSEED'], groups=SingleJetGroup+PrimaryLegGroup),
         ChainProp(name='HLT_2j330_a10sd_cssk_pf_jes_ftf_35smcINF_preselj225_L1SC111-CJ15', l1SeedThresholds=['FSNOSEED'], groups=SingleJetGroup+PrimaryLegGroup),
 
+        #Other preselection chains
+        ChainProp(name='HLT_3j200_pf_ftf_presel3j100_L1J100', l1SeedThresholds=['FSNOSEED'],            groups=MultiJetGroup+PrimaryLegGroup),
+        ChainProp(name='HLT_3j200_pf_ftf_presel3j125_L1J100', l1SeedThresholds=['FSNOSEED'],            groups=MultiJetGroup+PrimaryLegGroup),
+        ChainProp(name='HLT_3j200_pf_ftf_presel3j150_L1J100', l1SeedThresholds=['FSNOSEED'],            groups=MultiJetGroup+PrimaryLegGroup),
+        ChainProp(name='HLT_3j100_L1J100', l1SeedThresholds=['FSNOSEED'],            groups=MultiJetGroup+SupportLegGroup),
+        ChainProp(name='HLT_3j125_L1J100', l1SeedThresholds=['FSNOSEED'],            groups=MultiJetGroup+SupportLegGroup),
+        ChainProp(name='HLT_3j150_L1J100', l1SeedThresholds=['FSNOSEED'],            groups=MultiJetGroup+SupportLegGroup),
 
         ChainProp(name='HLT_j460_a10sd_cssk_pf_nojcalib_ftf_L1J100', l1SeedThresholds=['FSNOSEED'], groups=SingleJetGroup),
         ChainProp(name='HLT_j460_a10sd_cssk_pf_nojcalib_ftf_35smcINF_L1J100', l1SeedThresholds=['FSNOSEED'], groups=SingleJetGroup),
@@ -590,9 +603,12 @@ def setupMenu():
 
         ChainProp(name='HLT_5j70_ftf_0eta240_L14J15', l1SeedThresholds=['FSNOSEED'],     groups=MultiJetGroup+SupportLegGroup),
 
-        ChainProp(name='HLT_2j250_pf_ftf_0eta240_j120_pf_ftf_0eta240_presel2j135XXj60_L1J100', l1SeedThresholds=['FSNOSEED']*2, groups=MultiJetGroup + PrimaryLegGroup),
-        ChainProp(name='HLT_2j250_pf_ftf_0eta240_j120_pf_ftf_0eta240_presel2j180XXj80_L1J100', l1SeedThresholds=['FSNOSEED']*2, groups=MultiJetGroup + PrimaryLegGroup),
-        ChainProp(name='HLT_2j250_pf_ftf_0eta240_j120_pf_ftf_0eta240_presel2j225XXj100_L1J100', l1SeedThresholds=['FSNOSEED']*2, groups=MultiJetGroup + PrimaryLegGroup),
+        ChainProp(name='HLT_2j250_pf_ftf_0eta240_j120_pf_ftf_0eta240_presel2j135XXj60_L1J100', l1SeedThresholds=['FSNOSEED']*2, groups=MultiJetGroup ),
+        ChainProp(name='HLT_2j250_pf_ftf_0eta240_j120_pf_ftf_0eta240_presel2j180XXj80_L1J100', l1SeedThresholds=['FSNOSEED']*2, groups=MultiJetGroup ),
+        ChainProp(name='HLT_2j250_pf_ftf_0eta240_j120_pf_ftf_0eta240_presel2j225XXj100_L1J100', l1SeedThresholds=['FSNOSEED']*2, groups=MultiJetGroup),
+        ChainProp(name='HLT_2j135_0eta240_j60_0eta240_L1J100', l1SeedThresholds=['FSNOSEED']*2, groups=MultiJetGroup ),
+        ChainProp(name='HLT_2j180_0eta240_j80_0eta240_L1J100', l1SeedThresholds=['FSNOSEED']*2, groups=MultiJetGroup ),
+        ChainProp(name='HLT_2j225_0eta240_j100_0eta240_L1J100', l1SeedThresholds=['FSNOSEED']*2, groups=MultiJetGroup ),
 
         #Adding testing chains for Tight,Medium,Loose preselections (ATR-23547) and also corresponding emtopo chain
         ChainProp(name='HLT_4j115_pf_ftf_presel4j55_L13J50', l1SeedThresholds=['FSNOSEED'], groups=MultiJetGroup+SupportLegGroup),
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/SignatureDicts.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/SignatureDicts.py
index fca230c20997..de8ed7efb8c5 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/SignatureDicts.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/SignatureDicts.py
@@ -145,6 +145,7 @@ JetChainParts = {
        'preselj135',       #L1J50, #L1J100
        'presel2j135',      #L1J50, L1J100
        'presel2j135XXj60', #L1J50, L1J100
+       'presel3j100',      #L1J100
        'presel4j33',       #L13J50
        'presel5j24',       #L14J15
        'presel6j36',       #L14J15
@@ -153,6 +154,7 @@ JetChainParts = {
        'preselj180',       #L1J100
        'presel2j180',      #L1J100
        'presel2j180XXj80', #L1J100
+       'presel3j125',      #L1J100
        'presel4j55',       #L13J50
        'presel5j35',       #L14J15
        'presel6j40',       #L14J15
@@ -161,6 +163,7 @@ JetChainParts = {
        'preselj225',        #L1J100
        'presel2j225',       #L1J100
        'presel2j225XXj100', #L1J100
+       'presel3j150',       #L1J100
        'presel4j85',        #L13J50
        'presel5j50',        #L14J15
        'presel6j45',        #L14J15
-- 
GitLab


From 75434a6a22980ffd91696d9373b1300aa3676c88 Mon Sep 17 00:00:00 2001
From: Marco Valente <marco.valente@cern.ch>
Date: Mon, 4 Oct 2021 18:20:52 +0200
Subject: [PATCH 7/8] Updating references

---
 .../share/ref_v1Dev_decodeBS_build.ref        | 36 +++++++++++++++++++
 1 file changed, 36 insertions(+)

diff --git a/Trigger/TrigValidation/TrigP1Test/share/ref_v1Dev_decodeBS_build.ref b/Trigger/TrigValidation/TrigP1Test/share/ref_v1Dev_decodeBS_build.ref
index bf81dd553759..05c286cc0e1d 100644
--- a/Trigger/TrigValidation/TrigP1Test/share/ref_v1Dev_decodeBS_build.ref
+++ b/Trigger/TrigValidation/TrigP1Test/share/ref_v1Dev_decodeBS_build.ref
@@ -147,6 +147,18 @@ HLT_2j330_a10sd_cssk_pf_jes_ftf_35smcINF_L1J100:
   eventCount: 0
 HLT_2j330_a10sd_cssk_pf_jes_ftf_35smcINF_L1SC111-CJ15:
   eventCount: 0
+HLT_2j330_a10sd_cssk_pf_jes_ftf_35smcINF_preselj135_L1J100:
+  eventCount: 0
+HLT_2j330_a10sd_cssk_pf_jes_ftf_35smcINF_preselj135_L1SC111-CJ15:
+  eventCount: 0
+HLT_2j330_a10sd_cssk_pf_jes_ftf_35smcINF_preselj180_L1J100:
+  eventCount: 0
+HLT_2j330_a10sd_cssk_pf_jes_ftf_35smcINF_preselj180_L1SC111-CJ15:
+  eventCount: 0
+HLT_2j330_a10sd_cssk_pf_jes_ftf_35smcINF_preselj225_L1J100:
+  eventCount: 0
+HLT_2j330_a10sd_cssk_pf_jes_ftf_35smcINF_preselj225_L1SC111-CJ15:
+  eventCount: 0
 HLT_2j330_a10sd_cssk_pf_nojcalib_ftf_35smcINF_L1J100:
   eventCount: 0
 HLT_2j330_a10t_lcw_jes_35smcINF_L1J100:
@@ -2199,6 +2211,18 @@ HLT_j420_a10sd_cssk_pf_jes_ftf_35smcINF_L1J100:
   eventCount: 0
 HLT_j420_a10sd_cssk_pf_jes_ftf_35smcINF_L1SC111-CJ15:
   eventCount: 0
+HLT_j420_a10sd_cssk_pf_jes_ftf_35smcINF_preselj135_L1J100:
+  eventCount: 0
+HLT_j420_a10sd_cssk_pf_jes_ftf_35smcINF_preselj135_L1SC111-CJ15:
+  eventCount: 0
+HLT_j420_a10sd_cssk_pf_jes_ftf_35smcINF_preselj180_L1J100:
+  eventCount: 0
+HLT_j420_a10sd_cssk_pf_jes_ftf_35smcINF_preselj180_L1SC111-CJ15:
+  eventCount: 0
+HLT_j420_a10sd_cssk_pf_jes_ftf_35smcINF_preselj225_L1J100:
+  eventCount: 0
+HLT_j420_a10sd_cssk_pf_jes_ftf_35smcINF_preselj225_L1SC111-CJ15:
+  eventCount: 0
 HLT_j420_a10sd_cssk_pf_jes_ftf_L1J100:
   eventCount: 0
 HLT_j420_a10sd_cssk_pf_jes_ftf_L1SC111-CJ15:
@@ -2465,6 +2489,18 @@ HLT_j460_a10sd_cssk_pf_jes_ftf_L1J100:
   eventCount: 0
 HLT_j460_a10sd_cssk_pf_jes_ftf_L1SC111-CJ15:
   eventCount: 0
+HLT_j460_a10sd_cssk_pf_jes_ftf_preselj135_L1J100:
+  eventCount: 0
+HLT_j460_a10sd_cssk_pf_jes_ftf_preselj135_L1SC111-CJ15:
+  eventCount: 0
+HLT_j460_a10sd_cssk_pf_jes_ftf_preselj180_L1J100:
+  eventCount: 0
+HLT_j460_a10sd_cssk_pf_jes_ftf_preselj180_L1SC111-CJ15:
+  eventCount: 0
+HLT_j460_a10sd_cssk_pf_jes_ftf_preselj225_L1J100:
+  eventCount: 0
+HLT_j460_a10sd_cssk_pf_jes_ftf_preselj225_L1SC111-CJ15:
+  eventCount: 0
 HLT_j460_a10sd_cssk_pf_nojcalib_ftf_35smcINF_L1J100:
   eventCount: 0
 HLT_j460_a10sd_cssk_pf_nojcalib_ftf_L1J100:
-- 
GitLab


From 06d2b50a3cd5f4948f653f3e25a0fd05d2c927a3 Mon Sep 17 00:00:00 2001
From: Marco Valente <marco.valente@cern.ch>
Date: Mon, 4 Oct 2021 19:04:22 +0200
Subject: [PATCH 8/8] Updating reference

---
 .../share/ref_RDOtoRDOTrig_v1Dev_build.ref    | 96 +++++++++++++++++++
 .../share/ref_v1Dev_decodeBS_build.ref        | 30 ++++++
 2 files changed, 126 insertions(+)

diff --git a/Trigger/TrigValidation/TrigAnalysisTest/share/ref_RDOtoRDOTrig_v1Dev_build.ref b/Trigger/TrigValidation/TrigAnalysisTest/share/ref_RDOtoRDOTrig_v1Dev_build.ref
index 777a0ee51f5f..596bcbc1612f 100644
--- a/Trigger/TrigValidation/TrigAnalysisTest/share/ref_RDOtoRDOTrig_v1Dev_build.ref
+++ b/Trigger/TrigValidation/TrigAnalysisTest/share/ref_RDOtoRDOTrig_v1Dev_build.ref
@@ -256,6 +256,12 @@ HLT_2j110_a10sd_pf_nojcalib_ftf_0eta200_TracklessdR1p2_L1J50:
     1: 18
 HLT_2j120_mb_afprec_afpdijet_L1CEP-CjJ50:
   eventCount: 0
+HLT_2j135_0eta240_j60_0eta240_L1J100:
+  eventCount: 2
+  stepCounts:
+    0: 2
+  stepFeatures:
+    0: 12
 HLT_2j135_mb_afprec_afpdijet_L1CEP-CjJ60:
   eventCount: 0
 HLT_2j175_a10sd_pf_nojcalib_ftf_0eta200_ExoticPTF0p0dR1p2_L1J100:
@@ -292,8 +298,20 @@ HLT_2j175_a10sd_pf_nojcalib_ftf_0eta200_TracklessdR1p2_L1J100:
   stepFeatures:
     0: 5
     1: 6
+HLT_2j180_0eta240_j80_0eta240_L1J100:
+  eventCount: 2
+  stepCounts:
+    0: 2
+  stepFeatures:
+    0: 12
 HLT_2j20_mb_afprec_afpdijet_L1RD0_FILLED:
   eventCount: 0
+HLT_2j225_0eta240_j100_0eta240_L1J100:
+  eventCount: 1
+  stepCounts:
+    0: 1
+  stepFeatures:
+    0: 7
 HLT_2j250_ftf_0eta240_j120_ftf_0eta240_L1J100:
   eventCount: 1
   stepCounts:
@@ -1014,6 +1032,24 @@ HLT_2mu6_noL2Comb_bJpsimumu_L12MU5VF:
     2: 8
     3: 5
     4: 5
+HLT_3j100_L1J100:
+  eventCount: 1
+  stepCounts:
+    0: 1
+  stepFeatures:
+    0: 4
+HLT_3j125_L1J100:
+  eventCount: 1
+  stepCounts:
+    0: 1
+  stepFeatures:
+    0: 4
+HLT_3j150_L1J100:
+  eventCount: 1
+  stepCounts:
+    0: 1
+  stepFeatures:
+    0: 3
 HLT_3j200_L1J100:
   eventCount: 1
   stepCounts:
@@ -1036,6 +1072,30 @@ HLT_3j200_pf_ftf_L1J100:
   stepFeatures:
     0: 5
     1: 3
+HLT_3j200_pf_ftf_presel3j100_L1J100:
+  eventCount: 1
+  stepCounts:
+    0: 1
+    1: 1
+  stepFeatures:
+    0: 1
+    1: 3
+HLT_3j200_pf_ftf_presel3j125_L1J100:
+  eventCount: 1
+  stepCounts:
+    0: 1
+    1: 1
+  stepFeatures:
+    0: 1
+    1: 3
+HLT_3j200_pf_ftf_presel3j150_L1J100:
+  eventCount: 1
+  stepCounts:
+    0: 1
+    1: 1
+  stepFeatures:
+    0: 1
+    1: 3
 HLT_3j20_pf_ftf_020jvt_j20_0eta290_pf_ftf_boffperf_L1HT190-J15s5pETA21:
   eventCount: 5
   stepCounts:
@@ -5638,6 +5698,18 @@ HLT_j135_L1J100:
     0: 5
   stepFeatures:
     0: 9
+HLT_j135_a10_tc_em_nojcalib_L1J100:
+  eventCount: 5
+  stepCounts:
+    0: 5
+  stepFeatures:
+    0: 10
+HLT_j135_a10_tc_em_nojcalib_L1SC111-CJ15:
+  eventCount: 5
+  stepCounts:
+    0: 5
+  stepFeatures:
+    0: 10
 HLT_j140_320eta490_LArPEBHLT_L1J75p31ETA49:
   eventCount: 0
 HLT_j150_0eta290_020jvt_pf_ftf_boffperf_L1J100:
@@ -5833,6 +5905,18 @@ HLT_j180_L1J100:
     0: 5
   stepFeatures:
     0: 8
+HLT_j180_a10_tc_em_nojcalib_L1J100:
+  eventCount: 5
+  stepCounts:
+    0: 5
+  stepFeatures:
+    0: 9
+HLT_j180_a10_tc_em_nojcalib_L1SC111-CJ15:
+  eventCount: 5
+  stepCounts:
+    0: 5
+  stepFeatures:
+    0: 9
 HLT_j200_0eta290_020jvt_pf_ftf_boffperf_L1J100:
   eventCount: 4
   stepCounts:
@@ -5949,6 +6033,18 @@ HLT_j225_L1J100:
     0: 1
   stepFeatures:
     0: 3
+HLT_j225_a10_tc_em_nojcalib_L1J100:
+  eventCount: 5
+  stepCounts:
+    0: 5
+  stepFeatures:
+    0: 8
+HLT_j225_a10_tc_em_nojcalib_L1SC111-CJ15:
+  eventCount: 5
+  stepCounts:
+    0: 5
+  stepFeatures:
+    0: 8
 HLT_j25_320eta490_L1RD0_FILLED:
   eventCount: 2
   stepCounts:
diff --git a/Trigger/TrigValidation/TrigP1Test/share/ref_v1Dev_decodeBS_build.ref b/Trigger/TrigValidation/TrigP1Test/share/ref_v1Dev_decodeBS_build.ref
index 05c286cc0e1d..766be50cfd29 100644
--- a/Trigger/TrigValidation/TrigP1Test/share/ref_v1Dev_decodeBS_build.ref
+++ b/Trigger/TrigValidation/TrigP1Test/share/ref_v1Dev_decodeBS_build.ref
@@ -121,6 +121,8 @@ HLT_2j110_a10sd_pf_nojcalib_ftf_0eta200_TracklessdR1p2_L1J50:
     0: 4
 HLT_2j120_mb_afprec_afpdijet_L1CEP-CjJ50:
   eventCount: 0
+HLT_2j135_0eta240_j60_0eta240_L1J100:
+  eventCount: 0
 HLT_2j135_mb_afprec_afpdijet_L1CEP-CjJ60:
   eventCount: 0
 HLT_2j175_a10sd_pf_nojcalib_ftf_0eta200_ExoticPTF0p0dR1p2_L1J100:
@@ -131,8 +133,12 @@ HLT_2j175_a10sd_pf_nojcalib_ftf_0eta200_ExoticPTF0p2dR1p2_L1J100:
   eventCount: 0
 HLT_2j175_a10sd_pf_nojcalib_ftf_0eta200_TracklessdR1p2_L1J100:
   eventCount: 0
+HLT_2j180_0eta240_j80_0eta240_L1J100:
+  eventCount: 0
 HLT_2j20_mb_afprec_afpdijet_L1RD0_FILLED:
   eventCount: 0
+HLT_2j225_0eta240_j100_0eta240_L1J100:
+  eventCount: 0
 HLT_2j250_ftf_0eta240_j120_ftf_0eta240_L1J100:
   eventCount: 0
 HLT_2j250_pf_ftf_0eta240_j120_pf_ftf_0eta240_L1J100:
@@ -430,12 +436,24 @@ HLT_2mu6_noL2Comb_bJpsimumu_L12MU5VF:
   stepFeatures:
     0: 2
     1: 2
+HLT_3j100_L1J100:
+  eventCount: 0
+HLT_3j125_L1J100:
+  eventCount: 0
+HLT_3j150_L1J100:
+  eventCount: 0
 HLT_3j200_L1J100:
   eventCount: 0
 HLT_3j200_ftf_L1J100:
   eventCount: 0
 HLT_3j200_pf_ftf_L1J100:
   eventCount: 0
+HLT_3j200_pf_ftf_presel3j100_L1J100:
+  eventCount: 0
+HLT_3j200_pf_ftf_presel3j125_L1J100:
+  eventCount: 0
+HLT_3j200_pf_ftf_presel3j150_L1J100:
+  eventCount: 0
 HLT_3j20_pf_ftf_020jvt_j20_0eta290_pf_ftf_boffperf_L1HT190-J15s5pETA21:
   eventCount: 0
 HLT_3j35_0eta290_020jvt_pf_ftf_bdl1r70_j35_pf_ftf_0eta320_L14J15p0ETA25:
@@ -1947,6 +1965,10 @@ HLT_j120_mb_afprec_afpdijet_L1AFP_A_AND_C_TOF_J50:
   eventCount: 0
 HLT_j135_L1J100:
   eventCount: 0
+HLT_j135_a10_tc_em_nojcalib_L1J100:
+  eventCount: 0
+HLT_j135_a10_tc_em_nojcalib_L1SC111-CJ15:
+  eventCount: 0
 HLT_j140_320eta490_LArPEBHLT_L1J75p31ETA49:
   eventCount: 0
 HLT_j150_0eta290_020jvt_pf_ftf_boffperf_L1J100:
@@ -2017,6 +2039,10 @@ HLT_j175_pf_ftf_preselj20_L1J50:
     0: 4
 HLT_j180_L1J100:
   eventCount: 0
+HLT_j180_a10_tc_em_nojcalib_L1J100:
+  eventCount: 0
+HLT_j180_a10_tc_em_nojcalib_L1SC111-CJ15:
+  eventCount: 0
 HLT_j200_0eta290_020jvt_pf_ftf_boffperf_L1J100:
   eventCount: 0
 HLT_j20_0eta290_020jvt_pf_ftf_boffperf_L1J15:
@@ -2057,6 +2083,10 @@ HLT_j225_0eta290_pf_ftf_bdl1r85_L1J100:
   eventCount: 0
 HLT_j225_L1J100:
   eventCount: 0
+HLT_j225_a10_tc_em_nojcalib_L1J100:
+  eventCount: 0
+HLT_j225_a10_tc_em_nojcalib_L1SC111-CJ15:
+  eventCount: 0
 HLT_j25_320eta490_L1RD0_FILLED:
   eventCount: 3
   stepCounts:
-- 
GitLab