From 8e8c4346313eb8500c0e0a6c7839dcf50fda7384 Mon Sep 17 00:00:00 2001 From: Jonathan Bossio <jonathan.bossio@cern.ch> Date: Wed, 10 Feb 2021 12:59:47 +0100 Subject: [PATCH 1/3] Support subjesgsc and subresjesgsc (i.e. w/o IS) Add EM and PF test chains with both options --- .../python/HLTMenuConfig/Jet/JetRecoConfiguration.py | 4 ++++ .../TriggerMenuMT/python/HLTMenuConfig/Menu/LS2_v1.py | 4 ++++ .../TriggerMenuMT/python/HLTMenuConfig/Menu/SignatureDicts.py | 2 +- 3 files changed, 9 insertions(+), 1 deletion(-) diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Jet/JetRecoConfiguration.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Jet/JetRecoConfiguration.py index 7f08fdc43462..983e195b9c27 100644 --- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Jet/JetRecoConfiguration.py +++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Jet/JetRecoConfiguration.py @@ -221,6 +221,8 @@ def defineCalibMods(jetRecoDict,dataSource,rhoKey="auto"): ("a4","subjesIS"): ("TrigRun2","JetArea_EtaJES_GSC"), # Calo GSC only ("a4","subjesgscIS"): ("TrigRun2GSC","JetArea_EtaJES_GSC"), # Calo+Trk GSC ("a4","subresjesgscIS"): ("TrigRun2GSC","JetArea_Residual_EtaJES_GSC"), # pu residual + calo+trk GSC + ("a4","subjesgsc"): ("TrigRun2GSC","JetArea_EtaJES_GSC"), # Calo+Trk GSC + ("a4","subresjesgsc"): ("TrigRun2GSC","JetArea_Residual_EtaJES_GSC"), # pu residual + calo+trk GSC ("a10","subjes"): ("TrigUngroomed","JetArea_EtaJES"), ("a10t","jes"): ("TrigTrimmed","EtaJES_JMS"), }[(jetRecoDict["recoAlg"],jetRecoDict["jetCalib"])] @@ -238,6 +240,8 @@ def defineCalibMods(jetRecoDict,dataSource,rhoKey="auto"): calibSeq = "EtaJES_JMS" else: calibContext,calibSeq = { + ("a4","subjesgsc"): ("TrigLS2","JetArea_EtaJES_GSC"), # w/o pu residual + calo+trk GSC + ("a4","subresjesgsc"): ("TrigLS2","JetArea_Residual_EtaJES_GSC"), # pu residual + calo+trk GSC ("a4","subjesgscIS"): ("TrigLS2","JetArea_EtaJES_GSC"), # w/o pu residual + calo+trk GSC ("a4","subresjesgscIS"): ("TrigLS2","JetArea_Residual_EtaJES_GSC"), # pu residual + calo+trk GSC }[(jetRecoDict["recoAlg"],jetRecoDict["jetCalib"])] diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/LS2_v1.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/LS2_v1.py index a94228a51ec6..527b45d597de 100644 --- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/LS2_v1.py +++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/LS2_v1.py @@ -256,7 +256,9 @@ def setupMenu(): TriggerFlags.JetSlice.signatures = TriggerFlags.JetSlice.signatures() + [ ChainProp(name='HLT_j85_L1J20', groups=['PS:Online',SingleJetGroup]), ChainProp(name='HLT_j45_L1J15', groups=['PS:Online',SingleJetGroup]), + 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), @@ -264,6 +266,7 @@ def setupMenu(): ChainProp(name='HLT_j45_ftf_L1J15', groups=SingleJetGroup), ChainProp(name='HLT_j85_ftf_L1J20', groups=SingleJetGroup), + ChainProp(name='HLT_j45_pf_subresjesgsc_ftf_L1J15', groups=SingleJetGroup), ChainProp(name='HLT_j45_pf_ftf_L1J15', groups=SingleJetGroup), ChainProp(name='HLT_j45_pf_ftf_010jvt_L1J15', groups=SingleJetGroup), ChainProp(name='HLT_j45_pf_ftf_020jvt_L1J15', groups=SingleJetGroup), @@ -271,6 +274,7 @@ def setupMenu(): 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), ChainProp(name='HLT_j45_pf_subjesgscIS_ftf_L1J15', groups=SingleJetGroup), ChainProp(name='HLT_j85_pf_ftf_L1J20', groups=SingleJetGroup), diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/SignatureDicts.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/SignatureDicts.py index 6a3b527f2a76..9cd74e565744 100644 --- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/SignatureDicts.py +++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/SignatureDicts.py @@ -123,7 +123,7 @@ JetChainParts = { 'constitMod' : # Constituent modifiers ['sk', 'cssk'], 'jetCalib' : # Jet calibration - ['jes', 'subjes', 'subjesIS', 'subjesgscIS', 'subresjesgscIS', 'nojcalib'], + ['jes', 'subjes', 'subjesIS', 'subjesgscIS', 'subresjesgscIS', 'subjesgsc', 'subresjesgsc', 'nojcalib'], 'scan' : # No longer used? ['FS',], 'trkopt' : # Tracking configuration -- GitLab From 547b7a465e5853e977bf378c1d1e496dec21f311 Mon Sep 17 00:00:00 2001 From: Jonathan Bossio <jonathan.bossio@cern.ch> Date: Fri, 12 Feb 2021 08:42:27 +0100 Subject: [PATCH 2/3] Update ef_RDOtoRDOTrig_v1Dev_build.ref --- .../share/ref_RDOtoRDOTrig_v1Dev_build.ref | 32 +++++++++++++++++++ 1 file changed, 32 insertions(+) diff --git a/Trigger/TrigValidation/TrigAnalysisTest/share/ref_RDOtoRDOTrig_v1Dev_build.ref b/Trigger/TrigValidation/TrigAnalysisTest/share/ref_RDOtoRDOTrig_v1Dev_build.ref index 0a464fa8aba5..81bfa223a77b 100644 --- a/Trigger/TrigValidation/TrigAnalysisTest/share/ref_RDOtoRDOTrig_v1Dev_build.ref +++ b/Trigger/TrigValidation/TrigAnalysisTest/share/ref_RDOtoRDOTrig_v1Dev_build.ref @@ -2208,6 +2208,22 @@ HLT_j45_pf_subjesgscIS_ftf_boffperf_split_L1J20: 0: 19 1: 48 2: 48 +HLT_j45_pf_subjesgsc_ftf_L1J15: + eventCount: 19 + stepCounts: + 0: 20 + 1: 19 + stepFeatures: + 0: 20 + 1: 51 +HLT_j45_pf_subresjesgsc_ftf_L1J15: + eventCount: 19 + stepCounts: + 0: 20 + 1: 19 + stepFeatures: + 0: 20 + 1: 57 HLT_j45_sk_nojcalib_L1J15: eventCount: 15 stepCounts: @@ -2284,6 +2300,14 @@ HLT_j45_subjesgscIS_ftf_boffperf_split_L1J20: 0: 19 1: 46 2: 46 +HLT_j45_subjesgsc_ftf_L1J15: + eventCount: 19 + stepCounts: + 0: 20 + 1: 19 + stepFeatures: + 0: 20 + 1: 47 HLT_j45_subresjesgscIS_ftf_L1J15: eventCount: 19 stepCounts: @@ -2292,6 +2316,14 @@ HLT_j45_subresjesgscIS_ftf_L1J15: stepFeatures: 0: 20 1: 54 +HLT_j45_subresjesgsc_ftf_L1J15: + eventCount: 19 + stepCounts: + 0: 20 + 1: 19 + stepFeatures: + 0: 20 + 1: 54 HLT_j460_a10_lcw_subjes_L1J100: eventCount: 0 HLT_j460_a10_lcw_subjes_L1J20: -- GitLab From 01d872356087ef94389b37e0d80b931f096f08c4 Mon Sep 17 00:00:00 2001 From: Jonathan Bossio <jonathan.bossio@cern.ch> Date: Fri, 12 Feb 2021 13:44:55 +0100 Subject: [PATCH 3/3] Update ref_data_v1Dev_build.ref --- .../share/ref_data_v1Dev_build.ref | 32 +++++++++++++++++++ 1 file changed, 32 insertions(+) diff --git a/Trigger/TrigValidation/TriggerTest/share/ref_data_v1Dev_build.ref b/Trigger/TrigValidation/TriggerTest/share/ref_data_v1Dev_build.ref index a671130a4777..e0bd31cff9b0 100644 --- a/Trigger/TrigValidation/TriggerTest/share/ref_data_v1Dev_build.ref +++ b/Trigger/TrigValidation/TriggerTest/share/ref_data_v1Dev_build.ref @@ -1212,6 +1212,22 @@ HLT_j45_pf_subjesgscIS_ftf_boffperf_split_L1J20: 0: 5 1: 5 2: 5 +HLT_j45_pf_subjesgsc_ftf_L1J15: + eventCount: 7 + stepCounts: + 0: 7 + 1: 7 + stepFeatures: + 0: 7 + 1: 7 +HLT_j45_pf_subresjesgsc_ftf_L1J15: + eventCount: 7 + stepCounts: + 0: 7 + 1: 7 + stepFeatures: + 0: 7 + 1: 7 HLT_j45_sk_nojcalib_L1J15: eventCount: 3 stepCounts: @@ -1286,6 +1302,14 @@ HLT_j45_subjesgscIS_ftf_boffperf_split_L1J20: 0: 5 1: 5 2: 5 +HLT_j45_subjesgsc_ftf_L1J15: + eventCount: 7 + stepCounts: + 0: 7 + 1: 7 + stepFeatures: + 0: 7 + 1: 7 HLT_j45_subresjesgscIS_ftf_L1J15: eventCount: 7 stepCounts: @@ -1294,6 +1318,14 @@ HLT_j45_subresjesgscIS_ftf_L1J15: stepFeatures: 0: 7 1: 7 +HLT_j45_subresjesgsc_ftf_L1J15: + eventCount: 7 + stepCounts: + 0: 7 + 1: 7 + stepFeatures: + 0: 7 + 1: 7 HLT_j460_a10_lcw_subjes_L1J100: eventCount: 0 HLT_j460_a10_lcw_subjes_L1J20: -- GitLab