diff --git a/Reconstruction/Jet/JetCalibTools/python/JetCalibToolsConfig.py b/Reconstruction/Jet/JetCalibTools/python/JetCalibToolsConfig.py
index eecaa96de3b5304889fab734672e53056199464d..61e9cca8e9c9379fae01e097ddb246637950a087 100644
--- a/Reconstruction/Jet/JetCalibTools/python/JetCalibToolsConfig.py
+++ b/Reconstruction/Jet/JetCalibTools/python/JetCalibToolsConfig.py
@@ -47,7 +47,7 @@ fatjetcontexts = {
"CaloMass": ("JES_MC16recommendation_FatJet_JMS_calo_29Nov2017.config","00-04-81","EtaJES_JMS"),
"TAMass": ("JES_MC16recommendation_FatJet_JMS_TA_29Nov2017.config","00-04-81","EtaJES_JMS"),
"TrigUngroomed": ("JES_Full2012dataset_Rscan_June2014.config","00-04-77","JetArea_EtaJES"),
- "TrigTrimmed": ("JES_MC15recommendation_FatJet_June2015.config","00-04-77","EtaJES_JMS"),
+ "TrigTrimmed": ("JES_MC15recommendation_FatJet_June2015_PtFrac4.config","00-04-82","EtaJES_JMS"),
"TrigSoftDrop": ("JES_MC16recommendation_R10_UFO_CSSK_SoftDrop_JMS_01April2020.config","00-04-82","EtaJES_JMS"),
}
@@ -66,6 +66,7 @@ calibcontexts = {
"AntiKt10LCTopo":fatjetcontexts,
# Standard trimmed
"AntiKt10LCTopoTrimmedPtFrac5SmallR20":fatjetcontexts,
+ "AntiKt10LCTopoTrimmedPtFrac4SmallR20":fatjetcontexts,
# Large-R PFlow Soft Drop CSSK
"AntiKt10EMPFlowCSSKSoftDropBeta100Zcut10":fatjetcontexts,
# R-Scan
diff --git a/Trigger/TrigMonitoring/TrigJetMonitoring/python/JetCollRemapping.py b/Trigger/TrigMonitoring/TrigJetMonitoring/python/JetCollRemapping.py
index 31a4414b7ebb9e5df13f6749af4b5e5484df361c..a4a06b5ef735381404c3ed2c9552f1084a4950d8 100644
--- a/Trigger/TrigMonitoring/TrigJetMonitoring/python/JetCollRemapping.py
+++ b/Trigger/TrigMonitoring/TrigJetMonitoring/python/JetCollRemapping.py
@@ -5,5 +5,5 @@ JetCollRun2ToRun3 = {
'HLT_xAOD__JetContainer_a4tcemsubjesISFS' : 'HLT_AntiKt4EMTopoJets_subjesIS', # default small-R
'HLT_xAOD__JetContainer_a10r_tcemsubjesISFS': 'HLT_AntiKt10JetRCJets_subjesIS', # a10r
'HLT_xAOD__JetContainer_a10tclcwsubjesFS' : 'HLT_AntiKt10LCTopoJets_subjes', # a10
- 'HLT_xAOD__JetContainer_a10ttclcwjesFS' : 'HLT_AntiKt10LCTopoTrimmedPtFrac5SmallR20Jets_jes', # a10t
+ 'HLT_xAOD__JetContainer_a10ttclcwjesFS' : 'HLT_AntiKt10LCTopoTrimmedPtFrac4SmallR20Jets_jes', # a10t
}
diff --git a/Trigger/TrigMonitoring/TrigJetMonitoring/python/TrigJetMonitorAlgorithm.py b/Trigger/TrigMonitoring/TrigJetMonitoring/python/TrigJetMonitorAlgorithm.py
index 6dab07fb71e7586bbd1fee6ebfeae6e92e7c1459..5fb4fcedad7af553929b967f6a1d0eb0dcd6e1e9 100644
--- a/Trigger/TrigMonitoring/TrigJetMonitoring/python/TrigJetMonitorAlgorithm.py
+++ b/Trigger/TrigMonitoring/TrigJetMonitoring/python/TrigJetMonitorAlgorithm.py
@@ -44,7 +44,7 @@ JetCollections['MT'] = [
'HLT_AntiKt4EMTopoJets_subjesIS', # default small-R EM
'HLT_AntiKt10JetRCJets_subjesIS', # a10r
'HLT_AntiKt10LCTopoJets_subjes', # a10
- 'HLT_AntiKt10LCTopoTrimmedPtFrac5SmallR20Jets_jes', # a10t
+ 'HLT_AntiKt10LCTopoTrimmedPtFrac4SmallR20Jets_jes', # a10t
'HLT_AntiKt4EMPFlowJets_subjesIS_ftf', # pflow w/o calo+track GSC
'HLT_AntiKt4EMPFlowJets_subjesgscIS_ftf', # pflow w/ calo+track GSC
'HLT_AntiKt4EMPFlowJets_subresjesgscIS_ftf', # pflow w/ residual + calo+track GSC
@@ -58,11 +58,10 @@ Chain2JetCollDict['MT'] = {
'HLT_3j200_L1J100' : 'HLT_AntiKt4EMTopoJets_subjesIS',
'HLT_j460_a10r_L1J100' : 'HLT_AntiKt10JetRCJets_subjesIS',
'HLT_j460_a10_lcw_subjes_L1J100' : 'HLT_AntiKt10LCTopoJets_subjes',
- 'HLT_j460_a10t_lcw_jes_L1J100' : 'HLT_AntiKt10LCTopoTrimmedPtFrac5SmallR20Jets_jes',
- 'HLT_2j330_a10t_lcw_jes_35smcINF_L1J100' : 'HLT_AntiKt10LCTopoTrimmedPtFrac5SmallR20Jets_jes',
+ 'HLT_j460_a10t_lcw_jes_L1J100' : 'HLT_AntiKt10LCTopoTrimmedPtFrac4SmallR20Jets_jes',
+ 'HLT_2j330_a10t_lcw_jes_35smcINF_L1J100' : 'HLT_AntiKt10LCTopoTrimmedPtFrac4SmallR20Jets_jes',
'HLT_j45_pf_ftf_L1J20' : 'HLT_AntiKt4EMPFlowJets_subjesIS_ftf',
'HLT_j45_pf_subjesgscIS_ftf_L1J20' : 'HLT_AntiKt4EMPFlowJets_subjesgscIS_ftf',
- 'HLT_j45_pf_subresjesgscIS_ftf_L1J20' : 'HLT_AntiKt4EMPFlowJets_subresjesgscIS_ftf',
'HLT_j85_pf_ftf_L1J20' : 'HLT_AntiKt4EMPFlowJets_subjesIS_ftf',
'HLT_j45_pf_nojcalib_ftf_L1J20' : 'HLT_AntiKt4EMPFlowJets_nojcalib_ftf',
'HLT_j45_csskpf_nojcalib_ftf_L1J20' : 'HLT_AntiKt4EMPFlowCSSKJets_nojcalib_ftf',
diff --git a/Trigger/TrigValidation/TrigAnalysisTest/share/ref_RDOtoRDOTrig_v1Dev_build.ref b/Trigger/TrigValidation/TrigAnalysisTest/share/ref_RDOtoRDOTrig_v1Dev_build.ref
index ac3964f7c33d5cfe86fe51f2ca758ee905a55d15..cf863f4b1c5dc373ab882e07f22f09c1cd7981bd 100644
--- a/Trigger/TrigValidation/TrigAnalysisTest/share/ref_RDOtoRDOTrig_v1Dev_build.ref
+++ b/Trigger/TrigValidation/TrigAnalysisTest/share/ref_RDOtoRDOTrig_v1Dev_build.ref
@@ -435,7 +435,7 @@ TrigSignatureMoniMT INFO -- #3295122398 Events
TrigSignatureMoniMT INFO -- #3295122398 Features 0 0 0 0 0 0 0 0 0 27 - - -
TrigSignatureMoniMT INFO HLT_j45_ftf_L1J15 #868405538
TrigSignatureMoniMT INFO -- #868405538 Events 20 20 0 0 0 0 0 0 0 0 0 19 - - - 19
-TrigSignatureMoniMT INFO -- #868405538 Features 0 0 0 0 0 0 0 0 0 49 - - -
+TrigSignatureMoniMT INFO -- #868405538 Features 0 0 0 0 0 0 0 0 0 45 - - -
TrigSignatureMoniMT INFO HLT_j45_nojcalib_L1J20 #2042444294
TrigSignatureMoniMT INFO -- #2042444294 Events 19 19 0 0 0 0 0 0 0 0 0 17 - - - 17
TrigSignatureMoniMT INFO -- #2042444294 Features 0 0 0 0 0 0 0 0 0 39 - - -
@@ -446,17 +446,14 @@ TrigSignatureMoniMT INFO HLT_j45_pf_nojcalib_ftf
TrigSignatureMoniMT INFO -- #4202219904 Events 19 19 0 0 0 0 0 0 0 0 0 17 - - - 17
TrigSignatureMoniMT INFO -- #4202219904 Features 0 0 0 0 0 0 0 0 0 38 - - -
TrigSignatureMoniMT INFO HLT_j45_pf_subjesgscIS_ftf_L1J20 #2187173741
-TrigSignatureMoniMT INFO -- #2187173741 Events 19 19 0 0 0 0 0 0 0 0 0 18 - - - 18
-TrigSignatureMoniMT INFO -- #2187173741 Features 0 0 0 0 0 0 0 0 0 39 - - -
+TrigSignatureMoniMT INFO -- #2187173741 Events 19 19 0 0 0 0 0 0 0 0 0 19 - - - 19
+TrigSignatureMoniMT INFO -- #2187173741 Features 0 0 0 0 0 0 0 0 0 42 - - -
TrigSignatureMoniMT INFO HLT_j45_pf_subjesgscIS_ftf_bdl1r70_split_L1J20 #4239752847
-TrigSignatureMoniMT INFO -- #4239752847 Events 19 19 0 0 0 0 0 0 0 0 0 18 - - - 18
-TrigSignatureMoniMT INFO -- #4239752847 Features 0 0 0 0 0 0 0 0 0 39 - - -
+TrigSignatureMoniMT INFO -- #4239752847 Events 19 19 0 0 0 0 0 0 0 0 0 19 - - - 19
+TrigSignatureMoniMT INFO -- #4239752847 Features 0 0 0 0 0 0 0 0 0 42 - - -
TrigSignatureMoniMT INFO HLT_j45_pf_subjesgscIS_ftf_boffperf_split_L1J20 #2546763674
TrigSignatureMoniMT INFO -- #2546763674 Events 19 19 0 0 0 0 0 0 0 0 0 18 18 - - 18
TrigSignatureMoniMT INFO -- #2546763674 Features 0 0 0 0 0 0 0 0 0 39 39 - -
-TrigSignatureMoniMT INFO HLT_j45_pf_subresjesgscIS_ftf_L1J20 #3567642453
-TrigSignatureMoniMT INFO -- #3567642453 Events 19 19 0 0 0 0 0 0 0 0 0 18 - - - 18
-TrigSignatureMoniMT INFO -- #3567642453 Features 0 0 0 0 0 0 0 0 0 39 - - -
TrigSignatureMoniMT INFO HLT_j45_sktc_nojcalib_L1J20 #1542468090
TrigSignatureMoniMT INFO -- #1542468090 Events 19 19 0 0 0 0 0 0 0 0 0 15 - - - 15
TrigSignatureMoniMT INFO -- #1542468090 Features 0 0 0 0 0 0 0 0 0 26 - - -
@@ -539,8 +536,8 @@ TrigSignatureMoniMT INFO HLT_j85_L1J20 #51047553
TrigSignatureMoniMT INFO -- #510475538 Events 19 19 0 0 0 0 0 0 0 0 0 13 - - - 13
TrigSignatureMoniMT INFO -- #510475538 Features 0 0 0 0 0 0 0 0 0 21 - - -
TrigSignatureMoniMT INFO HLT_j85_ftf_L1J20 #877042532
-TrigSignatureMoniMT INFO -- #877042532 Events 19 19 0 0 0 0 0 0 0 0 0 13 - - - 13
-TrigSignatureMoniMT INFO -- #877042532 Features 0 0 0 0 0 0 0 0 0 21 - - -
+TrigSignatureMoniMT INFO -- #877042532 Events 19 19 0 0 0 0 0 0 0 0 0 12 - - - 12
+TrigSignatureMoniMT INFO -- #877042532 Features 0 0 0 0 0 0 0 0 0 18 - - -
TrigSignatureMoniMT INFO HLT_j85_pf_ftf_L1J20 #789444389
TrigSignatureMoniMT INFO -- #789444389 Events 19 19 0 0 0 0 0 0 0 0 0 10 - - - 10
TrigSignatureMoniMT INFO -- #789444389 Features 0 0 0 0 0 0 0 0 0 14 - - -
@@ -1022,8 +1019,8 @@ TrigSignatureMoniMT INFO HLT_xe30_mhtpufit_em_su
TrigSignatureMoniMT INFO -- #689201557 Events 19 19 0 0 0 0 0 0 0 0 0 14 - - - 14
TrigSignatureMoniMT INFO -- #689201557 Features 0 0 0 0 0 0 0 0 0 14 - - -
TrigSignatureMoniMT INFO HLT_xe30_mhtpufit_pf_subjesgscIS_L1XE10 #1886909707
-TrigSignatureMoniMT INFO -- #1886909707 Events 19 19 0 0 0 0 0 0 0 0 0 14 - - - 14
-TrigSignatureMoniMT INFO -- #1886909707 Features 0 0 0 0 0 0 0 0 0 14 - - -
+TrigSignatureMoniMT INFO -- #1886909707 Events 19 19 0 0 0 0 0 0 0 0 0 16 - - - 16
+TrigSignatureMoniMT INFO -- #1886909707 Features 0 0 0 0 0 0 0 0 0 16 - - -
TrigSignatureMoniMT INFO HLT_xe30_pfopufit_L1XE10 #2252641537
TrigSignatureMoniMT INFO -- #2252641537 Events 19 19 0 0 0 0 0 0 0 0 0 14 - - - 14
TrigSignatureMoniMT INFO -- #2252641537 Features 0 0 0 0 0 0 0 0 0 14 - - -
@@ -1034,8 +1031,8 @@ TrigSignatureMoniMT INFO HLT_xe30_tcpufit_L1XE10
TrigSignatureMoniMT INFO -- #1583719916 Events 19 19 0 0 0 0 0 0 0 0 0 14 - - - 14
TrigSignatureMoniMT INFO -- #1583719916 Features 0 0 0 0 0 0 0 0 0 14 - - -
TrigSignatureMoniMT INFO HLT_xe30_trkmht_L1XE10 #2468872349
-TrigSignatureMoniMT INFO -- #2468872349 Events 19 19 0 0 0 0 0 0 0 0 0 17 - - - 17
-TrigSignatureMoniMT INFO -- #2468872349 Features 0 0 0 0 0 0 0 0 0 17 - - -
+TrigSignatureMoniMT INFO -- #2468872349 Events 19 19 0 0 0 0 0 0 0 0 0 16 - - - 16
+TrigSignatureMoniMT INFO -- #2468872349 Features 0 0 0 0 0 0 0 0 0 16 - - -
TrigSignatureMoniMT INFO HLT_xe65_cell_L1XE50 #531141817
TrigSignatureMoniMT INFO -- #531141817 Events 10 10 0 0 0 0 0 0 0 0 0 7 - - - 7
TrigSignatureMoniMT INFO -- #531141817 Features 0 0 0 0 0 0 0 0 0 7 - - -
diff --git a/Trigger/TrigValidation/TriggerTest/share/ref_data_v1Dev_build.ref b/Trigger/TrigValidation/TriggerTest/share/ref_data_v1Dev_build.ref
index b9de0aa08ad96df680bc61ef71851246457ab0c9..27926f5731f93b7225a5227ec43622348334f1f3 100644
--- a/Trigger/TrigValidation/TriggerTest/share/ref_data_v1Dev_build.ref
+++ b/Trigger/TrigValidation/TriggerTest/share/ref_data_v1Dev_build.ref
@@ -434,8 +434,8 @@ TrigSignatureMoniMT INFO HLT_j45_cssktc_nojcalib
TrigSignatureMoniMT INFO -- #3295122398 Events 20 20 0 0 0 0 0 0 0 0 0 3 - - - 3
TrigSignatureMoniMT INFO -- #3295122398 Features 0 0 0 0 0 0 0 0 0 3 - - -
TrigSignatureMoniMT INFO HLT_j45_ftf_L1J15 #868405538
-TrigSignatureMoniMT INFO -- #868405538 Events 20 20 0 0 0 0 0 0 0 0 0 6 - - - 6
-TrigSignatureMoniMT INFO -- #868405538 Features 0 0 0 0 0 0 0 0 0 6 - - -
+TrigSignatureMoniMT INFO -- #868405538 Events 20 20 0 0 0 0 0 0 0 0 0 7 - - - 7
+TrigSignatureMoniMT INFO -- #868405538 Features 0 0 0 0 0 0 0 0 0 7 - - -
TrigSignatureMoniMT INFO HLT_j45_nojcalib_L1J20 #2042444294
TrigSignatureMoniMT INFO -- #2042444294 Events 20 20 0 0 0 0 0 0 0 0 0 3 - - - 3
TrigSignatureMoniMT INFO -- #2042444294 Features 0 0 0 0 0 0 0 0 0 3 - - -
@@ -454,9 +454,6 @@ TrigSignatureMoniMT INFO -- #4239752847 Features
TrigSignatureMoniMT INFO HLT_j45_pf_subjesgscIS_ftf_boffperf_split_L1J20 #2546763674
TrigSignatureMoniMT INFO -- #2546763674 Events 20 20 0 0 0 0 0 0 0 0 0 3 3 - - 3
TrigSignatureMoniMT INFO -- #2546763674 Features 0 0 0 0 0 0 0 0 0 3 3 - -
-TrigSignatureMoniMT INFO HLT_j45_pf_subresjesgscIS_ftf_L1J20 #3567642453
-TrigSignatureMoniMT INFO -- #3567642453 Events 20 20 0 0 0 0 0 0 0 0 0 3 - - - 3
-TrigSignatureMoniMT INFO -- #3567642453 Features 0 0 0 0 0 0 0 0 0 3 - - -
TrigSignatureMoniMT INFO HLT_j45_sktc_nojcalib_L1J20 #1542468090
TrigSignatureMoniMT INFO -- #1542468090 Events 20 20 0 0 0 0 0 0 0 0 0 3 - - - 3
TrigSignatureMoniMT INFO -- #1542468090 Features 0 0 0 0 0 0 0 0 0 3 - - -
@@ -1022,8 +1019,8 @@ TrigSignatureMoniMT INFO HLT_xe30_mhtpufit_em_su
TrigSignatureMoniMT INFO -- #689201557 Events 20 20 0 0 0 0 0 0 0 0 0 5 - - - 5
TrigSignatureMoniMT INFO -- #689201557 Features 0 0 0 0 0 0 0 0 0 5 - - -
TrigSignatureMoniMT INFO HLT_xe30_mhtpufit_pf_subjesgscIS_L1XE10 #1886909707
-TrigSignatureMoniMT INFO -- #1886909707 Events 20 20 0 0 0 0 0 0 0 0 0 4 - - - 4
-TrigSignatureMoniMT INFO -- #1886909707 Features 0 0 0 0 0 0 0 0 0 4 - - -
+TrigSignatureMoniMT INFO -- #1886909707 Events 20 20 0 0 0 0 0 0 0 0 0 3 - - - 3
+TrigSignatureMoniMT INFO -- #1886909707 Features 0 0 0 0 0 0 0 0 0 3 - - -
TrigSignatureMoniMT INFO HLT_xe30_pfopufit_L1XE10 #2252641537
TrigSignatureMoniMT INFO -- #2252641537 Events 20 20 0 0 0 0 0 0 0 0 0 4 - - - 4
TrigSignatureMoniMT INFO -- #2252641537 Features 0 0 0 0 0 0 0 0 0 4 - - -
@@ -1034,8 +1031,8 @@ TrigSignatureMoniMT INFO HLT_xe30_tcpufit_L1XE10
TrigSignatureMoniMT INFO -- #1583719916 Events 20 20 0 0 0 0 0 0 0 0 0 6 - - - 6
TrigSignatureMoniMT INFO -- #1583719916 Features 0 0 0 0 0 0 0 0 0 6 - - -
TrigSignatureMoniMT INFO HLT_xe30_trkmht_L1XE10 #2468872349
-TrigSignatureMoniMT INFO -- #2468872349 Events 20 20 0 0 0 0 0 0 0 0 0 4 - - - 4
-TrigSignatureMoniMT INFO -- #2468872349 Features 0 0 0 0 0 0 0 0 0 4 - - -
+TrigSignatureMoniMT INFO -- #2468872349 Events 20 20 0 0 0 0 0 0 0 0 0 9 - - - 9
+TrigSignatureMoniMT INFO -- #2468872349 Features 0 0 0 0 0 0 0 0 0 9 - - -
TrigSignatureMoniMT INFO HLT_xe65_cell_L1XE50 #531141817
TrigSignatureMoniMT INFO -- #531141817 Events 20 20 0 0 0 0 0 0 0 0 0 0 - - - 0
TrigSignatureMoniMT INFO -- #531141817 Features 0 0 0 0 0 0 0 0 0 0 - - -
diff --git a/Trigger/TriggerCommon/TrigEDMConfig/python/TriggerEDMRun3.py b/Trigger/TriggerCommon/TrigEDMConfig/python/TriggerEDMRun3.py
index f50ac967409aa0571b53d2369d90c17cbd9c6b2b..fcd5a22a62d2fb4e06f3fcd55f5fec33375f4804 100644
--- a/Trigger/TriggerCommon/TrigEDMConfig/python/TriggerEDMRun3.py
+++ b/Trigger/TriggerCommon/TrigEDMConfig/python/TriggerEDMRun3.py
@@ -299,11 +299,11 @@ TriggerHLTListRun3 = [
('xAOD::JetContainer#HLT_AntiKt10JetRCJets_subjesIS', 'BS ESD AODFULL', 'Jet'),
('xAOD::JetAuxContainer#HLT_AntiKt10JetRCJets_subjesISAux.'+JetVars, 'BS ESD AODFULL', 'Jet'),
- ('xAOD::JetContainer#HLT_AntiKt10LCTopoTrimmedPtFrac5SmallR20Jets_jes', 'BS ESD AODFULL AODSLIM AODVERYSLIM', 'Jet'),
- ('xAOD::JetAuxContainer#HLT_AntiKt10LCTopoTrimmedPtFrac5SmallR20Jets_jesAux.'+JetVars, 'BS ESD AODFULL AODSLIM AODVERYSLIM', 'Jet'),
+ ('xAOD::JetContainer#HLT_AntiKt10LCTopoTrimmedPtFrac4SmallR20Jets_jes', 'BS ESD AODFULL AODSLIM AODVERYSLIM', 'Jet'),
+ ('xAOD::JetAuxContainer#HLT_AntiKt10LCTopoTrimmedPtFrac4SmallR20Jets_jesAux.'+JetVars, 'BS ESD AODFULL AODSLIM AODVERYSLIM', 'Jet'),
- ('xAOD::JetContainer#HLT_AntiKt10LCTopoTrimmedPtFrac5SmallR20Jets_nojcalib', 'BS ESD AODFULL AODSLIM AODVERYSLIM', 'Jet'),
- ('xAOD::JetAuxContainer#HLT_AntiKt10LCTopoTrimmedPtFrac5SmallR20Jets_nojcalibAux.'+JetVars, 'BS ESD AODFULL AODSLIM AODVERYSLIM', 'Jet'),
+ ('xAOD::JetContainer#HLT_AntiKt10LCTopoTrimmedPtFrac4SmallR20Jets_nojcalib', 'BS ESD AODFULL AODSLIM AODVERYSLIM', 'Jet'),
+ ('xAOD::JetAuxContainer#HLT_AntiKt10LCTopoTrimmedPtFrac4SmallR20Jets_nojcalibAux.'+JetVars, 'BS ESD AODFULL AODSLIM AODVERYSLIM', 'Jet'),
('xAOD::JetContainer#HLT_AntiKt10LCTopoSoftDropBeta100Zcut10Jets_nojcalib', 'BS ESD AODFULL', 'Jet'),
('xAOD::JetAuxContainer#HLT_AntiKt10LCTopoSoftDropBeta100Zcut10Jets_nojcalibAux.'+JetVars, 'BS ESD AODFULL', 'Jet'),
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Jet/JetRecoConfiguration.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Jet/JetRecoConfiguration.py
index c12e27287296daa56c9fbbb33f0273a65166f1bc..7adb1f6efa51c3908339e4fb862788cad68aef58 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Jet/JetRecoConfiguration.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Jet/JetRecoConfiguration.py
@@ -13,6 +13,12 @@ TriggerJetMods.ConstitFourMom_copy
from AthenaCommon.Logging import logging
log = logging.getLogger("TriggerMenuMT.HLTMenuConfig.Jet.JetRecoConfiguration")
+def interpretJetCalibDefault(recoDict):
+ if recoDict['dataType'].endswith('tc'):
+ return 'subresjesgscIS' if recoDict['trkopt'] == 'ftf' else 'subjesIS'
+ elif recoDict['dataType'].endswith('pf'):
+ return 'subresjesgscIS'
+
# Extract the jet reco dict from the chainDict
def extractRecoDict(chainParts):
# interpret the reco configuration only
@@ -31,6 +37,10 @@ def extractRecoDict(chainParts):
# copy this entry to the reco dictionary
recoDict[k] = p[k]
+ # set proper jetCalib key in default case
+ if recoDict['jetCalib'] == "default":
+ recoDict['jetCalib'] = interpretJetCalibDefault(recoDict)
+
return recoDict
# Define the jet constituents to be interpreted by JetRecConfig
@@ -129,7 +139,7 @@ def defineGroomedJets(jetRecoDict,ungroomedDef):#,ungroomedJetsName):
groomAlg = jetRecoDict["recoAlg"][3:] if 'sd' in jetRecoDict["recoAlg"] else jetRecoDict["recoAlg"][-1]
groomDef = {
"sd":JetSoftDrop(ungroomedDef,zcut=0.1,beta=1.0),
- "t" :JetTrimming(ungroomedDef,smallR=0.2,ptfrac=0.05),
+ "t" :JetTrimming(ungroomedDef,smallR=0.2,ptfrac=0.04),
}[groomAlg]
return groomDef
@@ -188,8 +198,10 @@ def defineCalibFilterMods(jetRecoDict,dataSource,rhoKey="auto"):
calibContext = "TrigSoftDrop"
calibSeq = "EtaJES_JMS"
else:
- calibContext = "TrigLS2"
- calibSeq = "JetArea_Residual_EtaJES_GSC"
+ calibContext,calibSeq = {
+ ("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"])]
pvname = "HLT_IDVertex_FS"
if jetRecoDict["jetCalib"].endswith("IS") and (dataSource=="data"):
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/MET/ConfigHelpers.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/MET/ConfigHelpers.py
index 34aeda2206399e3d59528cd88cdcec43345babf1..418791db019e1d8206f12af9089ce8b25aa263e8 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/MET/ConfigHelpers.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/MET/ConfigHelpers.py
@@ -44,6 +44,9 @@ def jetRecoDictForMET(**recoDict):
if "jetDataType" in recoDict:
# Allow for the renaming dataType -> jetDataType
jrd["dataType"] = recoDict["jetDataType"]
+ from TriggerMenuMT.HLTMenuConfig.Jet import JetRecoConfiguration
+ if jrd["jetCalib"] == "default":
+ jrd["jetCalib"] = JetRecoConfiguration.interpretJetCalibDefault(jrd)
return jrd
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/LS2_v1.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/LS2_v1.py
index 9e390776d6b9bcd2a32290f50bb702aba7f60ced..ad6202d4780ee61a6ca9b869ef0047b76fb37575 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/LS2_v1.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/LS2_v1.py
@@ -213,7 +213,6 @@ def setupMenu():
ChainProp(name='HLT_j45_pf_ftf_L1J20', groups=SingleJetGroup),
ChainProp(name='HLT_j45_pf_subjesgscIS_ftf_L1J20', groups=SingleJetGroup),
- ChainProp(name='HLT_j45_pf_subresjesgscIS_ftf_L1J20', groups=SingleJetGroup),
ChainProp(name='HLT_j85_pf_ftf_L1J20', groups=SingleJetGroup),
ChainProp(name='HLT_j45_nojcalib_L1J20', groups=SingleJetGroup),
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/SignatureDicts.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/SignatureDicts.py
index 3140cc69c7890bc49f1c0c15244e7ba0280a8c71..5e4ddc2d06603eb97cfbe822ff835ee601eeeb07 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/SignatureDicts.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/SignatureDicts.py
@@ -152,7 +152,7 @@ JetChainParts_Default = {
'recoAlg' :'a4',
'dataType' :'tc',
'calib' :'em',
- 'jetCalib' :'subjesIS',
+ 'jetCalib' :'default',
'scan' :'FS',
'addInfo' : [],
'TLA' : '',