From 82f3279d2e2345bd73961cf1cae68734bf870930 Mon Sep 17 00:00:00 2001
From: Teng Jian Khoo <teng.jian.khoo@cern.ch>
Date: Mon, 21 Sep 2020 12:19:35 +0000
Subject: [PATCH] Adding SD CSSK (jes, and nojcalib) chains
also nojcalib LCTopo to help comparing
NOTE: Not working (some restructuring is needed)
---
.../python/JetCalibToolsConfig.py | 14 +-
.../DecisionHandling/python/jetMenuHelper.py | 5 +-
.../share/ref_RDOtoRDOTrig_v1Dev_build.ref | 156 +++++---
.../share/ref_data_v1Dev_build.ref | 144 ++++---
.../TrigEDMConfig/python/TriggerEDMRun3.py | 18 +
.../Jet/JetChainConfiguration.py | 3 +-
.../HLTMenuConfig/Jet/JetMenuSequences.py | 8 +-
.../HLTMenuConfig/Jet/JetRecoConfiguration.py | 42 +-
.../HLTMenuConfig/Jet/JetRecoSequences.py | 360 +++++++++---------
.../python/HLTMenuConfig/MET/AlgConfigs.py | 14 +-
.../python/HLTMenuConfig/Menu/LS2_v1.py | 40 +-
.../HLTMenuConfig/Menu/Physics_pp_run3_v1.py | 8 +-
12 files changed, 464 insertions(+), 348 deletions(-)
diff --git a/Reconstruction/Jet/JetCalibTools/python/JetCalibToolsConfig.py b/Reconstruction/Jet/JetCalibTools/python/JetCalibToolsConfig.py
index bbdba4c998b..8d419d0281c 100644
--- a/Reconstruction/Jet/JetCalibTools/python/JetCalibToolsConfig.py
+++ b/Reconstruction/Jet/JetCalibTools/python/JetCalibToolsConfig.py
@@ -48,6 +48,7 @@ fatjetcontexts = {
"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"),
+ "TrigSoftDrop": ("JES_MC16recommendation_R10_UFO_CSSK_SoftDrop_JMS_01April2020.config","00-04-82","EtaJES_JMS"),
}
# List AFII config files separately, to avoid needing to specify a different context
@@ -65,6 +66,8 @@ calibcontexts = {
"AntiKt10LCTopo":fatjetcontexts,
# Standard trimmed
"AntiKt10LCTopoTrimmedPtFrac5SmallR20":fatjetcontexts,
+ # Large-R PFlow Soft Drop CSSK
+ "AntiKt10EMPFlowCSSKSoftDropBeta100Zcut10":fatjetcontexts,
# R-Scan
"AntiKt2LCTopo":rscanlc2,
"AntiKt6LCTopo":rscanlc6,
@@ -77,10 +80,6 @@ hasInSitu = ["AntiKt4LCTopo", "AntiKt4EMTopo", "AntiKt4EMPFlow", "TrigAntiKt4EMT
# then forwards the configuration to defineJetCalibTool, returning the output.
# At present the interface allows for the calibseq to be chosen freely, other
# than checking that the data source is data for the in situ correction.
-# The calibarea could be made configurable as well, but then might need to be
-# added to the tool name to ensure uniqueness.
-# Due to the hackiness of DualUseConfig public tool handling, we need to pass
-# an AlgSequence...
def getJetCalibTool(jetcollection, context, data_type, calibseq = "", rhoname = "", pvname = "PrimaryVertices", gscdepth = "auto"):
# In principle we could autoconfigure
if data_type not in ['data','mc','afii']:
@@ -119,7 +118,11 @@ def getJetCalibTool(jetcollection, context, data_type, calibseq = "", rhoname =
_pvname = ""
if "Residual" in _calibseq or "GSC" in _calibseq and gscdepth!="EM3":
_pvname = pvname
- return defineJetCalibTool(jetcollection, _configfile, calibarea, _calibseq, _data_type, rhoname, _pvname, gscdepth)
+ # HACK: For testing while we don't have finalised calibrations for trigger PF jets
+ _jetcollection = jetcollection
+ if "PFlow" in jetcollection and context=="TrigSoftDrop":
+ _jetcollection = jetcollection.replace("EMPFlow","UFO")
+ return defineJetCalibTool(_jetcollection, _configfile, calibarea, _calibseq, _data_type, rhoname, _pvname, gscdepth)
except KeyError as e:
jetcaliblog.error("Context '{0}' not found for jet collection '{1}'".format(context,jetcollection))
jetcaliblog.error("Options are '{0}".format(','.join(jetcontexts.keys())))
@@ -151,6 +154,7 @@ def getJetCalibToolPrereqs(modspec,jetdef):
calibcontext, data_type, calibseq, rhoname, pvname, gscdepth = getCalibSpecsFromString(modspec)
if calibseq=="":
cfg, calibarea, calibseq = calibcontexts[jetdef.basename][calibcontext]
+
# For now, only dependent on calibseq -- can ignore Insitu, which is
# added when getting the concrete tool
prereqs = []
diff --git a/Trigger/TrigSteer/DecisionHandling/python/jetMenuHelper.py b/Trigger/TrigSteer/DecisionHandling/python/jetMenuHelper.py
index 3196b89e2a1..818527083c4 100644
--- a/Trigger/TrigSteer/DecisionHandling/python/jetMenuHelper.py
+++ b/Trigger/TrigSteer/DecisionHandling/python/jetMenuHelper.py
@@ -2,6 +2,7 @@
#
from TriggerMenuMT.HLTMenuConfig.Jet.JetMenuSequences import jetMenuSequence, jetCFSequence
+from AthenaConfiguration.AllConfigFlags import ConfigFlags
def jetDictFromString(jet_def_string):
""" Function to retrieve the jet dictionaory from string"""
@@ -36,10 +37,10 @@ def jetDictFromString(jet_def_string):
def jetCFSequenceFromString(jet_def_string):
""" Function to retrieve jet Reco sequence from string"""
jetRecoDict=jetDictFromString(jet_def_string)
- return jetCFSequence(None,**jetRecoDict)
+ return jetCFSequence(ConfigFlags,**jetRecoDict)
def jetMenuSequenceFromString(jet_def_string):
""" Function to retrieve jet menu sequence from string"""
jetRecoDict=jetDictFromString(jet_def_string)
- return jetMenuSequence(None,**jetRecoDict) # First arg dummy flags for RecoFragmentsPool
+ return jetMenuSequence(ConfigFlags,**jetRecoDict) # First arg dummy flags for RecoFragmentsPool
diff --git a/Trigger/TrigValidation/TrigAnalysisTest/share/ref_RDOtoRDOTrig_v1Dev_build.ref b/Trigger/TrigValidation/TrigAnalysisTest/share/ref_RDOtoRDOTrig_v1Dev_build.ref
index f78638aa557..c653679fa41 100644
--- a/Trigger/TrigValidation/TrigAnalysisTest/share/ref_RDOtoRDOTrig_v1Dev_build.ref
+++ b/Trigger/TrigValidation/TrigAnalysisTest/share/ref_RDOtoRDOTrig_v1Dev_build.ref
@@ -31,9 +31,18 @@ TrigSignatureMoniMT INFO -- #3965466087 Features
TrigSignatureMoniMT INFO HLT_2g50_loose_L12EM20VH #3590373854
TrigSignatureMoniMT INFO -- #3590373854 Events 2 2 0 0 0 0 - - - - - - - - 0
TrigSignatureMoniMT INFO -- #3590373854 Features 0 0 0 0 - - - - - - - -
+TrigSignatureMoniMT INFO HLT_2j330_a10sd_csskpf_jes_ftf_35smcINF_L1J100 #3495282139
+TrigSignatureMoniMT INFO -- #3495282139 Events 3 3 0 0 0 0 0 0 0 0 0 0 - - 0
+TrigSignatureMoniMT INFO -- #3495282139 Features 0 0 0 0 0 0 0 0 0 0 - -
+TrigSignatureMoniMT INFO HLT_2j330_a10sd_csskpf_nojcalib_ftf_35smcINF_L1J100 #2680976232
+TrigSignatureMoniMT INFO -- #2680976232 Events 3 3 0 0 0 0 0 0 0 0 0 0 - - 0
+TrigSignatureMoniMT INFO -- #2680976232 Features 0 0 0 0 0 0 0 0 0 0 - -
TrigSignatureMoniMT INFO HLT_2j330_a10t_lcw_jes_35smcINF_L1J100 #1295975955
TrigSignatureMoniMT INFO -- #1295975955 Events 3 3 0 0 0 0 0 0 0 0 0 0 - - 0
TrigSignatureMoniMT INFO -- #1295975955 Features 0 0 0 0 0 0 0 0 0 0 - -
+TrigSignatureMoniMT INFO HLT_2j330_a10t_lcw_nojcalib_35smcINF_L1J100 #891415013
+TrigSignatureMoniMT INFO -- #891415013 Events 3 3 0 0 0 0 0 0 0 0 0 0 - - 0
+TrigSignatureMoniMT INFO -- #891415013 Features 0 0 0 0 0 0 0 0 0 0 - -
TrigSignatureMoniMT INFO HLT_2j60_L1J15 #927735533
TrigSignatureMoniMT INFO -- #927735533 Events 20 20 0 0 0 0 0 0 0 0 0 10 - - 10
TrigSignatureMoniMT INFO -- #927735533 Features 0 0 0 0 0 0 0 0 0 28 - -
@@ -244,87 +253,87 @@ TrigSignatureMoniMT INFO -- #1341875780 Features
TrigSignatureMoniMT INFO HLT_j0_vbenfSEP30etSEP34mass35SEP50fbet_L1J20 #4034799151
TrigSignatureMoniMT INFO -- #4034799151 Events 19 19 0 0 0 0 0 0 0 0 0 15 - - 15
TrigSignatureMoniMT INFO -- #4034799151 Features 0 0 0 0 0 0 0 0 0 402 - -
-TrigSignatureMoniMT INFO HLT_j225_ftf_subjesgscIS_bmv2c1040_split_L1J100 #3992507557
-TrigSignatureMoniMT INFO -- #3992507557 Events 3 3 0 0 0 0 0 0 0 0 0 0 0 - 0
-TrigSignatureMoniMT INFO -- #3992507557 Features 0 0 0 0 0 0 0 0 0 0 0 -
+TrigSignatureMoniMT INFO HLT_j225_subjesgscIS_ftf_bmv2c1040_split_L1J100 #219711753
+TrigSignatureMoniMT INFO -- #219711753 Events 3 3 0 0 0 0 0 0 0 0 0 0 0 - 0
+TrigSignatureMoniMT INFO -- #219711753 Features 0 0 0 0 0 0 0 0 0 0 0 -
TrigSignatureMoniMT INFO HLT_j260_320eta490_L1J20 #3084792704
TrigSignatureMoniMT INFO -- #3084792704 Events 19 19 0 0 0 0 0 0 0 0 0 0 - - 0
TrigSignatureMoniMT INFO -- #3084792704 Features 0 0 0 0 0 0 0 0 0 0 - -
TrigSignatureMoniMT INFO HLT_j260_320eta490_L1J75_31ETA49 #3769257182
TrigSignatureMoniMT INFO -- #3769257182 Events 2 2 0 0 0 0 0 0 0 0 0 0 - - 0
TrigSignatureMoniMT INFO -- #3769257182 Features 0 0 0 0 0 0 0 0 0 0 - -
-TrigSignatureMoniMT INFO HLT_j275_ftf_subjesgscIS_bmv2c1060_split_L1J100 #1211559599
-TrigSignatureMoniMT INFO -- #1211559599 Events 3 3 0 0 0 0 0 0 0 0 0 0 0 - 0
-TrigSignatureMoniMT INFO -- #1211559599 Features 0 0 0 0 0 0 0 0 0 0 0 -
-TrigSignatureMoniMT INFO HLT_j275_ftf_subjesgscIS_boffperf_split_L1J100 #588317894
-TrigSignatureMoniMT INFO -- #588317894 Events 3 3 0 0 0 0 0 0 0 0 0 0 0 - 0
-TrigSignatureMoniMT INFO -- #588317894 Features 0 0 0 0 0 0 0 0 0 0 0 -
-TrigSignatureMoniMT INFO HLT_j300_ftf_subjesgscIS_bmv2c1070_split_L1J100 #3706723666
-TrigSignatureMoniMT INFO -- #3706723666 Events 3 3 0 0 0 0 0 0 0 0 0 0 0 - 0
-TrigSignatureMoniMT INFO -- #3706723666 Features 0 0 0 0 0 0 0 0 0 0 0 -
-TrigSignatureMoniMT INFO HLT_j360_ftf_subjesgscIS_bmv2c1077_split_L1J100 #1837565816
-TrigSignatureMoniMT INFO -- #1837565816 Events 3 3 0 0 0 0 0 0 0 0 0 0 0 - 0
-TrigSignatureMoniMT INFO -- #1837565816 Features 0 0 0 0 0 0 0 0 0 0 0 -
+TrigSignatureMoniMT INFO HLT_j275_subjesgscIS_ftf_bmv2c1060_split_L1J100 #710546402
+TrigSignatureMoniMT INFO -- #710546402 Events 3 3 0 0 0 0 0 0 0 0 0 0 0 - 0
+TrigSignatureMoniMT INFO -- #710546402 Features 0 0 0 0 0 0 0 0 0 0 0 -
+TrigSignatureMoniMT INFO HLT_j275_subjesgscIS_ftf_boffperf_split_L1J100 #540369970
+TrigSignatureMoniMT INFO -- #540369970 Events 3 3 0 0 0 0 0 0 0 0 0 0 0 - 0
+TrigSignatureMoniMT INFO -- #540369970 Features 0 0 0 0 0 0 0 0 0 0 0 -
+TrigSignatureMoniMT INFO HLT_j300_subjesgscIS_ftf_bmv2c1070_split_L1J100 #2074989613
+TrigSignatureMoniMT INFO -- #2074989613 Events 3 3 0 0 0 0 0 0 0 0 0 0 0 - 0
+TrigSignatureMoniMT INFO -- #2074989613 Features 0 0 0 0 0 0 0 0 0 0 0 -
+TrigSignatureMoniMT INFO HLT_j360_subjesgscIS_ftf_bmv2c1077_split_L1J100 #4176355792
+TrigSignatureMoniMT INFO -- #4176355792 Events 3 3 0 0 0 0 0 0 0 0 0 0 0 - 0
+TrigSignatureMoniMT INFO -- #4176355792 Features 0 0 0 0 0 0 0 0 0 0 0 -
TrigSignatureMoniMT INFO HLT_j420_L1J100 #2659902019
TrigSignatureMoniMT INFO -- #2659902019 Events 3 3 0 0 0 0 0 0 0 0 0 0 - - 0
TrigSignatureMoniMT INFO -- #2659902019 Features 0 0 0 0 0 0 0 0 0 0 - -
TrigSignatureMoniMT INFO HLT_j420_L1J20 #2205518067
TrigSignatureMoniMT INFO -- #2205518067 Events 19 19 0 0 0 0 0 0 0 0 0 0 - - 0
TrigSignatureMoniMT INFO -- #2205518067 Features 0 0 0 0 0 0 0 0 0 0 - -
-TrigSignatureMoniMT INFO HLT_j420_ftf_subjesgscIS_L1J20 #4179085188
-TrigSignatureMoniMT INFO -- #4179085188 Events 19 19 0 0 0 0 0 0 0 0 0 0 - - 0
-TrigSignatureMoniMT INFO -- #4179085188 Features 0 0 0 0 0 0 0 0 0 0 - -
+TrigSignatureMoniMT INFO HLT_j420_subjesgscIS_ftf_L1J20 #2116995085
+TrigSignatureMoniMT INFO -- #2116995085 Events 19 19 0 0 0 0 0 0 0 0 0 0 - - 0
+TrigSignatureMoniMT INFO -- #2116995085 Features 0 0 0 0 0 0 0 0 0 0 - -
TrigSignatureMoniMT INFO HLT_j45_L1J15 #1364976160
TrigSignatureMoniMT INFO -- #1364976160 Events 20 20 0 0 0 0 0 0 0 0 0 19 - - 19
-TrigSignatureMoniMT INFO -- #1364976160 Features 0 0 0 0 0 0 0 0 0 50 - -
+TrigSignatureMoniMT INFO -- #1364976160 Features 0 0 0 0 0 0 0 0 0 49 - -
+TrigSignatureMoniMT INFO HLT_j45_csskpf_nojcalib_ftf_L1J20 #2528888897
+TrigSignatureMoniMT INFO -- #2528888897 Events 19 19 0 0 0 0 0 0 0 0 0 16 - - 16
+TrigSignatureMoniMT INFO -- #2528888897 Features 0 0 0 0 0 0 0 0 0 30 - -
TrigSignatureMoniMT INFO HLT_j45_cssktc_nojcalib_L1J20 #3295122398
TrigSignatureMoniMT INFO -- #3295122398 Events 19 19 0 0 0 0 0 0 0 0 0 15 - - 15
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 50 - -
-TrigSignatureMoniMT INFO HLT_j45_ftf_csskpf_nojcalib_L1J20 #3533281867
-TrigSignatureMoniMT INFO -- #3533281867 Events 19 19 0 0 0 0 0 0 0 0 0 16 - - 16
-TrigSignatureMoniMT INFO -- #3533281867 Features 0 0 0 0 0 0 0 0 0 30 - -
-TrigSignatureMoniMT INFO HLT_j45_ftf_pf_L1J20 #1335156103
-TrigSignatureMoniMT INFO -- #1335156103 Events 19 19 0 0 0 0 0 0 0 0 0 18 - - 18
-TrigSignatureMoniMT INFO -- #1335156103 Features 0 0 0 0 0 0 0 0 0 39 - -
-TrigSignatureMoniMT INFO HLT_j45_ftf_pf_nojcalib_L1J20 #3658890913
-TrigSignatureMoniMT INFO -- #3658890913 Events 19 19 0 0 0 0 0 0 0 0 0 17 - - 17
-TrigSignatureMoniMT INFO -- #3658890913 Features 0 0 0 0 0 0 0 0 0 37 - -
-TrigSignatureMoniMT INFO HLT_j45_ftf_subjesgscIS_011jvt_L1J15 #2857031468
-TrigSignatureMoniMT INFO -- #2857031468 Events 20 20 0 0 0 0 0 0 0 0 0 16 - - 16
-TrigSignatureMoniMT INFO -- #2857031468 Features 0 0 0 0 0 0 0 0 0 33 - -
-TrigSignatureMoniMT INFO HLT_j45_ftf_subjesgscIS_015jvt_L1J15 #2938374624
-TrigSignatureMoniMT INFO -- #2938374624 Events 20 20 0 0 0 0 0 0 0 0 0 16 - - 16
-TrigSignatureMoniMT INFO -- #2938374624 Features 0 0 0 0 0 0 0 0 0 33 - -
-TrigSignatureMoniMT INFO HLT_j45_ftf_subjesgscIS_059jvt_L1J15 #1593009344
-TrigSignatureMoniMT INFO -- #1593009344 Events 20 20 0 0 0 0 0 0 0 0 0 16 - - 16
-TrigSignatureMoniMT INFO -- #1593009344 Features 0 0 0 0 0 0 0 0 0 33 - -
-TrigSignatureMoniMT INFO HLT_j45_ftf_subjesgscIS_L1J15 #3341539267
-TrigSignatureMoniMT INFO -- #3341539267 Events 20 20 0 0 0 0 0 0 0 0 0 19 - - 19
-TrigSignatureMoniMT INFO -- #3341539267 Features 0 0 0 0 0 0 0 0 0 50 - -
-TrigSignatureMoniMT INFO HLT_j45_ftf_subjesgscIS_bmv2c1070_split_L1J20 #991419339
-TrigSignatureMoniMT INFO -- #991419339 Events 19 19 0 0 0 0 0 0 0 0 0 19 10 - 10
-TrigSignatureMoniMT INFO -- #991419339 Features 0 0 0 0 0 0 0 0 0 49 21 -
-TrigSignatureMoniMT INFO HLT_j45_ftf_subjesgscIS_boffperf_split_L1J20 #1961149049
-TrigSignatureMoniMT INFO -- #1961149049 Events 19 19 0 0 0 0 0 0 0 0 0 19 19 - 19
-TrigSignatureMoniMT INFO -- #1961149049 Features 0 0 0 0 0 0 0 0 0 49 49 -
-TrigSignatureMoniMT INFO HLT_j45_ftf_subjesgscIS_pf_L1J20 #761060030
-TrigSignatureMoniMT INFO -- #761060030 Events 19 19 0 0 0 0 0 0 0 0 0 18 - - 18
-TrigSignatureMoniMT INFO -- #761060030 Features 0 0 0 0 0 0 0 0 0 39 - -
-TrigSignatureMoniMT INFO HLT_j45_ftf_subresjesgscIS_L1J15 #1509925407
-TrigSignatureMoniMT INFO -- #1509925407 Events 20 20 0 0 0 0 0 0 0 0 0 19 - - 19
-TrigSignatureMoniMT INFO -- #1509925407 Features 0 0 0 0 0 0 0 0 0 45 - -
-TrigSignatureMoniMT INFO HLT_j45_ftf_subresjesgscIS_pf_L1J20 #4012311417
-TrigSignatureMoniMT INFO -- #4012311417 Events 19 19 0 0 0 0 0 0 0 0 0 18 - - 18
-TrigSignatureMoniMT INFO -- #4012311417 Features 0 0 0 0 0 0 0 0 0 39 - -
+TrigSignatureMoniMT INFO -- #868405538 Features 0 0 0 0 0 0 0 0 0 49 - -
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 - -
+TrigSignatureMoniMT INFO HLT_j45_pf_ftf_L1J20 #3679554988
+TrigSignatureMoniMT INFO -- #3679554988 Events 19 19 0 0 0 0 0 0 0 0 0 18 - - 18
+TrigSignatureMoniMT INFO -- #3679554988 Features 0 0 0 0 0 0 0 0 0 38 - -
+TrigSignatureMoniMT INFO HLT_j45_pf_nojcalib_ftf_L1J20 #4202219904
+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 37 - -
+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 38 - -
+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 38 - -
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 - -
+TrigSignatureMoniMT INFO HLT_j45_subjesgscIS_ftf_011jvt_L1J15 #266323220
+TrigSignatureMoniMT INFO -- #266323220 Events 20 20 0 0 0 0 0 0 0 0 0 15 - - 15
+TrigSignatureMoniMT INFO -- #266323220 Features 0 0 0 0 0 0 0 0 0 32 - -
+TrigSignatureMoniMT INFO HLT_j45_subjesgscIS_ftf_015jvt_L1J15 #3102941497
+TrigSignatureMoniMT INFO -- #3102941497 Events 20 20 0 0 0 0 0 0 0 0 0 15 - - 15
+TrigSignatureMoniMT INFO -- #3102941497 Features 0 0 0 0 0 0 0 0 0 32 - -
+TrigSignatureMoniMT INFO HLT_j45_subjesgscIS_ftf_059jvt_L1J15 #2237035634
+TrigSignatureMoniMT INFO -- #2237035634 Events 20 20 0 0 0 0 0 0 0 0 0 15 - - 15
+TrigSignatureMoniMT INFO -- #2237035634 Features 0 0 0 0 0 0 0 0 0 32 - -
+TrigSignatureMoniMT INFO HLT_j45_subjesgscIS_ftf_L1J15 #1960278431
+TrigSignatureMoniMT INFO -- #1960278431 Events 20 20 0 0 0 0 0 0 0 0 0 19 - - 19
+TrigSignatureMoniMT INFO -- #1960278431 Features 0 0 0 0 0 0 0 0 0 50 - -
+TrigSignatureMoniMT INFO HLT_j45_subjesgscIS_ftf_bmv2c1070_split_L1J20 #980453000
+TrigSignatureMoniMT INFO -- #980453000 Events 19 19 0 0 0 0 0 0 0 0 0 19 10 - 10
+TrigSignatureMoniMT INFO -- #980453000 Features 0 0 0 0 0 0 0 0 0 49 21 -
+TrigSignatureMoniMT INFO HLT_j45_subjesgscIS_ftf_boffperf_split_L1J20 #3374916154
+TrigSignatureMoniMT INFO -- #3374916154 Events 19 19 0 0 0 0 0 0 0 0 0 19 19 - 19
+TrigSignatureMoniMT INFO -- #3374916154 Features 0 0 0 0 0 0 0 0 0 49 49 -
+TrigSignatureMoniMT INFO HLT_j45_subresjesgscIS_ftf_L1J15 #1213239619
+TrigSignatureMoniMT INFO -- #1213239619 Events 20 20 0 0 0 0 0 0 0 0 0 19 - - 19
+TrigSignatureMoniMT INFO -- #1213239619 Features 0 0 0 0 0 0 0 0 0 45 - -
TrigSignatureMoniMT INFO HLT_j460_a10_lcw_subjes_L1J100 #3327656707
TrigSignatureMoniMT INFO -- #3327656707 Events 3 3 0 0 0 0 0 0 0 0 0 0 - - 0
TrigSignatureMoniMT INFO -- #3327656707 Features 0 0 0 0 0 0 0 0 0 0 - -
@@ -337,15 +346,36 @@ TrigSignatureMoniMT INFO -- #1151767619 Features
TrigSignatureMoniMT INFO HLT_j460_a10r_L1J20 #3875082669
TrigSignatureMoniMT INFO -- #3875082669 Events 19 19 0 0 0 0 0 0 0 0 0 0 - - 0
TrigSignatureMoniMT INFO -- #3875082669 Features 0 0 0 0 0 0 0 0 0 0 - -
+TrigSignatureMoniMT INFO HLT_j460_a10sd_csskpf_jes_ftf_35smcINF_L1J100 #3781128663
+TrigSignatureMoniMT INFO -- #3781128663 Events 3 3 0 0 0 0 0 0 0 0 0 0 - - 0
+TrigSignatureMoniMT INFO -- #3781128663 Features 0 0 0 0 0 0 0 0 0 0 - -
+TrigSignatureMoniMT INFO HLT_j460_a10sd_csskpf_jes_ftf_L1J100 #1509950051
+TrigSignatureMoniMT INFO -- #1509950051 Events 3 3 0 0 0 0 0 0 0 0 0 0 - - 0
+TrigSignatureMoniMT INFO -- #1509950051 Features 0 0 0 0 0 0 0 0 0 0 - -
+TrigSignatureMoniMT INFO HLT_j460_a10sd_csskpf_nojcalib_ftf_35smcINF_L1J100 #249842682
+TrigSignatureMoniMT INFO -- #249842682 Events 3 3 0 0 0 0 0 0 0 0 0 0 - - 0
+TrigSignatureMoniMT INFO -- #249842682 Features 0 0 0 0 0 0 0 0 0 0 - -
+TrigSignatureMoniMT INFO HLT_j460_a10sd_csskpf_nojcalib_ftf_L1J100 #3452032818
+TrigSignatureMoniMT INFO -- #3452032818 Events 3 3 0 0 0 0 0 0 0 0 0 0 - - 0
+TrigSignatureMoniMT INFO -- #3452032818 Features 0 0 0 0 0 0 0 0 0 0 - -
TrigSignatureMoniMT INFO HLT_j460_a10sd_lcw_nojcalib_L1J100 #3093997295
TrigSignatureMoniMT INFO -- #3093997295 Events 3 3 0 0 0 0 0 0 0 0 0 0 - - 0
TrigSignatureMoniMT INFO -- #3093997295 Features 0 0 0 0 0 0 0 0 0 0 - -
+TrigSignatureMoniMT INFO HLT_j460_a10sd_pf_nojcalib_ftf_L1J100 #2138269254
+TrigSignatureMoniMT INFO -- #2138269254 Events 3 3 0 0 0 0 0 0 0 0 0 0 - - 0
+TrigSignatureMoniMT INFO -- #2138269254 Features 0 0 0 0 0 0 0 0 0 0 - -
TrigSignatureMoniMT INFO HLT_j460_a10t_lcw_jes_30smcINF_L1J100 #2296827117
TrigSignatureMoniMT INFO -- #2296827117 Events 3 3 0 0 0 0 0 0 0 0 0 0 - - 0
TrigSignatureMoniMT INFO -- #2296827117 Features 0 0 0 0 0 0 0 0 0 0 - -
TrigSignatureMoniMT INFO HLT_j460_a10t_lcw_jes_L1J100 #436385969
TrigSignatureMoniMT INFO -- #436385969 Events 3 3 0 0 0 0 0 0 0 0 0 0 - - 0
TrigSignatureMoniMT INFO -- #436385969 Features 0 0 0 0 0 0 0 0 0 0 - -
+TrigSignatureMoniMT INFO HLT_j460_a10t_lcw_nojcalib_35smcINF_L1J100 #3224465417
+TrigSignatureMoniMT INFO -- #3224465417 Events 3 3 0 0 0 0 0 0 0 0 0 0 - - 0
+TrigSignatureMoniMT INFO -- #3224465417 Features 0 0 0 0 0 0 0 0 0 0 - -
+TrigSignatureMoniMT INFO HLT_j460_a10t_lcw_nojcalib_L1J100 #1966129844
+TrigSignatureMoniMT INFO -- #1966129844 Events 3 3 0 0 0 0 0 0 0 0 0 0 - - 0
+TrigSignatureMoniMT INFO -- #1966129844 Features 0 0 0 0 0 0 0 0 0 0 - -
TrigSignatureMoniMT INFO HLT_j80_0eta240_2j60_320eta490_j0_dijetSEP80j1etSEP0j1eta240SEP80j2etSEP0j2eta240SEP700djmass_L1J20 #3634067472
TrigSignatureMoniMT INFO -- #3634067472 Events 19 19 0 0 0 0 0 0 0 0 0 0 - - 0
TrigSignatureMoniMT INFO -- #3634067472 Features 0 0 0 0 0 0 0 0 0 0 - -
@@ -361,9 +391,9 @@ TrigSignatureMoniMT INFO -- #510475538 Features
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 HLT_j85_ftf_pf_L1J20 #1538535401
-TrigSignatureMoniMT INFO -- #1538535401 Events 19 19 0 0 0 0 0 0 0 0 0 11 - - 11
-TrigSignatureMoniMT INFO -- #1538535401 Features 0 0 0 0 0 0 0 0 0 16 - -
+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 - -
TrigSignatureMoniMT INFO HLT_mb_sptrk_L1RD0_FILLED #4097312640
TrigSignatureMoniMT INFO -- #4097312640 Events 20 0 0 0 - - - - - - - - - - 0
TrigSignatureMoniMT INFO -- #4097312640 Features 0 0 - - - - - - - - - -
@@ -833,11 +863,11 @@ TrigSignatureMoniMT INFO HLT_xe30_mht_L1XE10 #36
TrigSignatureMoniMT INFO -- #3626903018 Events 19 19 0 0 0 0 0 0 0 0 0 19 - - 19
TrigSignatureMoniMT INFO -- #3626903018 Features 0 0 0 0 0 0 0 0 0 19 - -
TrigSignatureMoniMT INFO HLT_xe30_mhtpufit_em_subjesgscIS_L1XE10 #689201557
-TrigSignatureMoniMT INFO -- #689201557 Events 19 19 0 0 0 0 0 0 0 0 0 15 - - 15
-TrigSignatureMoniMT INFO -- #689201557 Features 0 0 0 0 0 0 0 0 0 15 - -
+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 15 - - 15
+TrigSignatureMoniMT INFO -- #1886909707 Features 0 0 0 0 0 0 0 0 0 15 - -
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 - -
diff --git a/Trigger/TrigValidation/TriggerTest/share/ref_data_v1Dev_build.ref b/Trigger/TrigValidation/TriggerTest/share/ref_data_v1Dev_build.ref
index 82dc48d1fc4..3875cbdeadc 100644
--- a/Trigger/TrigValidation/TriggerTest/share/ref_data_v1Dev_build.ref
+++ b/Trigger/TrigValidation/TriggerTest/share/ref_data_v1Dev_build.ref
@@ -31,9 +31,18 @@ TrigSignatureMoniMT INFO -- #3965466087 Features
TrigSignatureMoniMT INFO HLT_2g50_loose_L12EM20VH #3590373854
TrigSignatureMoniMT INFO -- #3590373854 Events 20 20 0 0 0 0 - - - - - - - - 0
TrigSignatureMoniMT INFO -- #3590373854 Features 0 0 0 0 - - - - - - - -
+TrigSignatureMoniMT INFO HLT_2j330_a10sd_csskpf_jes_ftf_35smcINF_L1J100 #3495282139
+TrigSignatureMoniMT INFO -- #3495282139 Events 20 20 0 0 0 0 0 0 0 0 0 0 - - 0
+TrigSignatureMoniMT INFO -- #3495282139 Features 0 0 0 0 0 0 0 0 0 0 - -
+TrigSignatureMoniMT INFO HLT_2j330_a10sd_csskpf_nojcalib_ftf_35smcINF_L1J100 #2680976232
+TrigSignatureMoniMT INFO -- #2680976232 Events 20 20 0 0 0 0 0 0 0 0 0 0 - - 0
+TrigSignatureMoniMT INFO -- #2680976232 Features 0 0 0 0 0 0 0 0 0 0 - -
TrigSignatureMoniMT INFO HLT_2j330_a10t_lcw_jes_35smcINF_L1J100 #1295975955
TrigSignatureMoniMT INFO -- #1295975955 Events 20 20 0 0 0 0 0 0 0 0 0 0 - - 0
TrigSignatureMoniMT INFO -- #1295975955 Features 0 0 0 0 0 0 0 0 0 0 - -
+TrigSignatureMoniMT INFO HLT_2j330_a10t_lcw_nojcalib_35smcINF_L1J100 #891415013
+TrigSignatureMoniMT INFO -- #891415013 Events 20 20 0 0 0 0 0 0 0 0 0 0 - - 0
+TrigSignatureMoniMT INFO -- #891415013 Features 0 0 0 0 0 0 0 0 0 0 - -
TrigSignatureMoniMT INFO HLT_2j60_L1J15 #927735533
TrigSignatureMoniMT INFO -- #927735533 Events 20 20 0 0 0 0 0 0 0 0 0 0 - - 0
TrigSignatureMoniMT INFO -- #927735533 Features 0 0 0 0 0 0 0 0 0 0 - -
@@ -244,87 +253,87 @@ TrigSignatureMoniMT INFO -- #1341875780 Features
TrigSignatureMoniMT INFO HLT_j0_vbenfSEP30etSEP34mass35SEP50fbet_L1J20 #4034799151
TrigSignatureMoniMT INFO -- #4034799151 Events 20 20 0 0 0 0 0 0 0 0 0 2 - - 2
TrigSignatureMoniMT INFO -- #4034799151 Features 0 0 0 0 0 0 0 0 0 24 - -
-TrigSignatureMoniMT INFO HLT_j225_ftf_subjesgscIS_bmv2c1040_split_L1J100 #3992507557
-TrigSignatureMoniMT INFO -- #3992507557 Events 20 20 0 0 0 0 0 0 0 0 0 0 0 - 0
-TrigSignatureMoniMT INFO -- #3992507557 Features 0 0 0 0 0 0 0 0 0 0 0 -
+TrigSignatureMoniMT INFO HLT_j225_subjesgscIS_ftf_bmv2c1040_split_L1J100 #219711753
+TrigSignatureMoniMT INFO -- #219711753 Events 20 20 0 0 0 0 0 0 0 0 0 0 0 - 0
+TrigSignatureMoniMT INFO -- #219711753 Features 0 0 0 0 0 0 0 0 0 0 0 -
TrigSignatureMoniMT INFO HLT_j260_320eta490_L1J20 #3084792704
TrigSignatureMoniMT INFO -- #3084792704 Events 20 20 0 0 0 0 0 0 0 0 0 0 - - 0
TrigSignatureMoniMT INFO -- #3084792704 Features 0 0 0 0 0 0 0 0 0 0 - -
TrigSignatureMoniMT INFO HLT_j260_320eta490_L1J75_31ETA49 #3769257182
TrigSignatureMoniMT INFO -- #3769257182 Events 20 20 0 0 0 0 0 0 0 0 0 0 - - 0
TrigSignatureMoniMT INFO -- #3769257182 Features 0 0 0 0 0 0 0 0 0 0 - -
-TrigSignatureMoniMT INFO HLT_j275_ftf_subjesgscIS_bmv2c1060_split_L1J100 #1211559599
-TrigSignatureMoniMT INFO -- #1211559599 Events 20 20 0 0 0 0 0 0 0 0 0 0 0 - 0
-TrigSignatureMoniMT INFO -- #1211559599 Features 0 0 0 0 0 0 0 0 0 0 0 -
-TrigSignatureMoniMT INFO HLT_j275_ftf_subjesgscIS_boffperf_split_L1J100 #588317894
-TrigSignatureMoniMT INFO -- #588317894 Events 20 20 0 0 0 0 0 0 0 0 0 0 0 - 0
-TrigSignatureMoniMT INFO -- #588317894 Features 0 0 0 0 0 0 0 0 0 0 0 -
-TrigSignatureMoniMT INFO HLT_j300_ftf_subjesgscIS_bmv2c1070_split_L1J100 #3706723666
-TrigSignatureMoniMT INFO -- #3706723666 Events 20 20 0 0 0 0 0 0 0 0 0 0 0 - 0
-TrigSignatureMoniMT INFO -- #3706723666 Features 0 0 0 0 0 0 0 0 0 0 0 -
-TrigSignatureMoniMT INFO HLT_j360_ftf_subjesgscIS_bmv2c1077_split_L1J100 #1837565816
-TrigSignatureMoniMT INFO -- #1837565816 Events 20 20 0 0 0 0 0 0 0 0 0 0 0 - 0
-TrigSignatureMoniMT INFO -- #1837565816 Features 0 0 0 0 0 0 0 0 0 0 0 -
+TrigSignatureMoniMT INFO HLT_j275_subjesgscIS_ftf_bmv2c1060_split_L1J100 #710546402
+TrigSignatureMoniMT INFO -- #710546402 Events 20 20 0 0 0 0 0 0 0 0 0 0 0 - 0
+TrigSignatureMoniMT INFO -- #710546402 Features 0 0 0 0 0 0 0 0 0 0 0 -
+TrigSignatureMoniMT INFO HLT_j275_subjesgscIS_ftf_boffperf_split_L1J100 #540369970
+TrigSignatureMoniMT INFO -- #540369970 Events 20 20 0 0 0 0 0 0 0 0 0 0 0 - 0
+TrigSignatureMoniMT INFO -- #540369970 Features 0 0 0 0 0 0 0 0 0 0 0 -
+TrigSignatureMoniMT INFO HLT_j300_subjesgscIS_ftf_bmv2c1070_split_L1J100 #2074989613
+TrigSignatureMoniMT INFO -- #2074989613 Events 20 20 0 0 0 0 0 0 0 0 0 0 0 - 0
+TrigSignatureMoniMT INFO -- #2074989613 Features 0 0 0 0 0 0 0 0 0 0 0 -
+TrigSignatureMoniMT INFO HLT_j360_subjesgscIS_ftf_bmv2c1077_split_L1J100 #4176355792
+TrigSignatureMoniMT INFO -- #4176355792 Events 20 20 0 0 0 0 0 0 0 0 0 0 0 - 0
+TrigSignatureMoniMT INFO -- #4176355792 Features 0 0 0 0 0 0 0 0 0 0 0 -
TrigSignatureMoniMT INFO HLT_j420_L1J100 #2659902019
TrigSignatureMoniMT INFO -- #2659902019 Events 20 20 0 0 0 0 0 0 0 0 0 0 - - 0
TrigSignatureMoniMT INFO -- #2659902019 Features 0 0 0 0 0 0 0 0 0 0 - -
TrigSignatureMoniMT INFO HLT_j420_L1J20 #2205518067
TrigSignatureMoniMT INFO -- #2205518067 Events 20 20 0 0 0 0 0 0 0 0 0 0 - - 0
TrigSignatureMoniMT INFO -- #2205518067 Features 0 0 0 0 0 0 0 0 0 0 - -
-TrigSignatureMoniMT INFO HLT_j420_ftf_subjesgscIS_L1J20 #4179085188
-TrigSignatureMoniMT INFO -- #4179085188 Events 20 20 0 0 0 0 0 0 0 0 0 0 - - 0
-TrigSignatureMoniMT INFO -- #4179085188 Features 0 0 0 0 0 0 0 0 0 0 - -
+TrigSignatureMoniMT INFO HLT_j420_subjesgscIS_ftf_L1J20 #2116995085
+TrigSignatureMoniMT INFO -- #2116995085 Events 20 20 0 0 0 0 0 0 0 0 0 0 - - 0
+TrigSignatureMoniMT INFO -- #2116995085 Features 0 0 0 0 0 0 0 0 0 0 - -
TrigSignatureMoniMT INFO HLT_j45_L1J15 #1364976160
TrigSignatureMoniMT INFO -- #1364976160 Events 20 20 0 0 0 0 0 0 0 0 0 6 - - 6
TrigSignatureMoniMT INFO -- #1364976160 Features 0 0 0 0 0 0 0 0 0 6 - -
+TrigSignatureMoniMT INFO HLT_j45_csskpf_nojcalib_ftf_L1J20 #2528888897
+TrigSignatureMoniMT INFO -- #2528888897 Events 20 20 0 0 0 0 0 0 0 0 0 3 - - 3
+TrigSignatureMoniMT INFO -- #2528888897 Features 0 0 0 0 0 0 0 0 0 3 - -
TrigSignatureMoniMT INFO HLT_j45_cssktc_nojcalib_L1J20 #3295122398
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 HLT_j45_ftf_csskpf_nojcalib_L1J20 #3533281867
-TrigSignatureMoniMT INFO -- #3533281867 Events 20 20 0 0 0 0 0 0 0 0 0 3 - - 3
-TrigSignatureMoniMT INFO -- #3533281867 Features 0 0 0 0 0 0 0 0 0 3 - -
-TrigSignatureMoniMT INFO HLT_j45_ftf_pf_L1J20 #1335156103
-TrigSignatureMoniMT INFO -- #1335156103 Events 20 20 0 0 0 0 0 0 0 0 0 3 - - 3
-TrigSignatureMoniMT INFO -- #1335156103 Features 0 0 0 0 0 0 0 0 0 3 - -
-TrigSignatureMoniMT INFO HLT_j45_ftf_pf_nojcalib_L1J20 #3658890913
-TrigSignatureMoniMT INFO -- #3658890913 Events 20 20 0 0 0 0 0 0 0 0 0 3 - - 3
-TrigSignatureMoniMT INFO -- #3658890913 Features 0 0 0 0 0 0 0 0 0 3 - -
-TrigSignatureMoniMT INFO HLT_j45_ftf_subjesgscIS_011jvt_L1J15 #2857031468
-TrigSignatureMoniMT INFO -- #2857031468 Events 20 20 0 0 0 0 0 0 0 0 0 3 - - 3
-TrigSignatureMoniMT INFO -- #2857031468 Features 0 0 0 0 0 0 0 0 0 3 - -
-TrigSignatureMoniMT INFO HLT_j45_ftf_subjesgscIS_015jvt_L1J15 #2938374624
-TrigSignatureMoniMT INFO -- #2938374624 Events 20 20 0 0 0 0 0 0 0 0 0 3 - - 3
-TrigSignatureMoniMT INFO -- #2938374624 Features 0 0 0 0 0 0 0 0 0 3 - -
-TrigSignatureMoniMT INFO HLT_j45_ftf_subjesgscIS_059jvt_L1J15 #1593009344
-TrigSignatureMoniMT INFO -- #1593009344 Events 20 20 0 0 0 0 0 0 0 0 0 3 - - 3
-TrigSignatureMoniMT INFO -- #1593009344 Features 0 0 0 0 0 0 0 0 0 3 - -
-TrigSignatureMoniMT INFO HLT_j45_ftf_subjesgscIS_L1J15 #3341539267
-TrigSignatureMoniMT INFO -- #3341539267 Events 20 20 0 0 0 0 0 0 0 0 0 7 - - 7
-TrigSignatureMoniMT INFO -- #3341539267 Features 0 0 0 0 0 0 0 0 0 7 - -
-TrigSignatureMoniMT INFO HLT_j45_ftf_subjesgscIS_bmv2c1070_split_L1J20 #991419339
-TrigSignatureMoniMT INFO -- #991419339 Events 20 20 0 0 0 0 0 0 0 0 0 5 1 - 1
-TrigSignatureMoniMT INFO -- #991419339 Features 0 0 0 0 0 0 0 0 0 5 1 -
-TrigSignatureMoniMT INFO HLT_j45_ftf_subjesgscIS_boffperf_split_L1J20 #1961149049
-TrigSignatureMoniMT INFO -- #1961149049 Events 20 20 0 0 0 0 0 0 0 0 0 5 5 - 5
-TrigSignatureMoniMT INFO -- #1961149049 Features 0 0 0 0 0 0 0 0 0 5 5 -
-TrigSignatureMoniMT INFO HLT_j45_ftf_subjesgscIS_pf_L1J20 #761060030
-TrigSignatureMoniMT INFO -- #761060030 Events 20 20 0 0 0 0 0 0 0 0 0 3 - - 3
-TrigSignatureMoniMT INFO -- #761060030 Features 0 0 0 0 0 0 0 0 0 3 - -
-TrigSignatureMoniMT INFO HLT_j45_ftf_subresjesgscIS_L1J15 #1509925407
-TrigSignatureMoniMT INFO -- #1509925407 Events 20 20 0 0 0 0 0 0 0 0 0 7 - - 7
-TrigSignatureMoniMT INFO -- #1509925407 Features 0 0 0 0 0 0 0 0 0 7 - -
-TrigSignatureMoniMT INFO HLT_j45_ftf_subresjesgscIS_pf_L1J20 #4012311417
-TrigSignatureMoniMT INFO -- #4012311417 Events 20 20 0 0 0 0 0 0 0 0 0 3 - - 3
-TrigSignatureMoniMT INFO -- #4012311417 Features 0 0 0 0 0 0 0 0 0 3 - -
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 - -
+TrigSignatureMoniMT INFO HLT_j45_pf_ftf_L1J20 #3679554988
+TrigSignatureMoniMT INFO -- #3679554988 Events 20 20 0 0 0 0 0 0 0 0 0 3 - - 3
+TrigSignatureMoniMT INFO -- #3679554988 Features 0 0 0 0 0 0 0 0 0 3 - -
+TrigSignatureMoniMT INFO HLT_j45_pf_nojcalib_ftf_L1J20 #4202219904
+TrigSignatureMoniMT INFO -- #4202219904 Events 20 20 0 0 0 0 0 0 0 0 0 3 - - 3
+TrigSignatureMoniMT INFO -- #4202219904 Features 0 0 0 0 0 0 0 0 0 3 - -
+TrigSignatureMoniMT INFO HLT_j45_pf_subjesgscIS_ftf_L1J20 #2187173741
+TrigSignatureMoniMT INFO -- #2187173741 Events 20 20 0 0 0 0 0 0 0 0 0 3 - - 3
+TrigSignatureMoniMT INFO -- #2187173741 Features 0 0 0 0 0 0 0 0 0 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 - -
+TrigSignatureMoniMT INFO HLT_j45_subjesgscIS_ftf_011jvt_L1J15 #266323220
+TrigSignatureMoniMT INFO -- #266323220 Events 20 20 0 0 0 0 0 0 0 0 0 3 - - 3
+TrigSignatureMoniMT INFO -- #266323220 Features 0 0 0 0 0 0 0 0 0 3 - -
+TrigSignatureMoniMT INFO HLT_j45_subjesgscIS_ftf_015jvt_L1J15 #3102941497
+TrigSignatureMoniMT INFO -- #3102941497 Events 20 20 0 0 0 0 0 0 0 0 0 3 - - 3
+TrigSignatureMoniMT INFO -- #3102941497 Features 0 0 0 0 0 0 0 0 0 3 - -
+TrigSignatureMoniMT INFO HLT_j45_subjesgscIS_ftf_059jvt_L1J15 #2237035634
+TrigSignatureMoniMT INFO -- #2237035634 Events 20 20 0 0 0 0 0 0 0 0 0 3 - - 3
+TrigSignatureMoniMT INFO -- #2237035634 Features 0 0 0 0 0 0 0 0 0 3 - -
+TrigSignatureMoniMT INFO HLT_j45_subjesgscIS_ftf_L1J15 #1960278431
+TrigSignatureMoniMT INFO -- #1960278431 Events 20 20 0 0 0 0 0 0 0 0 0 7 - - 7
+TrigSignatureMoniMT INFO -- #1960278431 Features 0 0 0 0 0 0 0 0 0 7 - -
+TrigSignatureMoniMT INFO HLT_j45_subjesgscIS_ftf_bmv2c1070_split_L1J20 #980453000
+TrigSignatureMoniMT INFO -- #980453000 Events 20 20 0 0 0 0 0 0 0 0 0 5 1 - 1
+TrigSignatureMoniMT INFO -- #980453000 Features 0 0 0 0 0 0 0 0 0 5 1 -
+TrigSignatureMoniMT INFO HLT_j45_subjesgscIS_ftf_boffperf_split_L1J20 #3374916154
+TrigSignatureMoniMT INFO -- #3374916154 Events 20 20 0 0 0 0 0 0 0 0 0 5 5 - 5
+TrigSignatureMoniMT INFO -- #3374916154 Features 0 0 0 0 0 0 0 0 0 5 5 -
+TrigSignatureMoniMT INFO HLT_j45_subresjesgscIS_ftf_L1J15 #1213239619
+TrigSignatureMoniMT INFO -- #1213239619 Events 20 20 0 0 0 0 0 0 0 0 0 7 - - 7
+TrigSignatureMoniMT INFO -- #1213239619 Features 0 0 0 0 0 0 0 0 0 7 - -
TrigSignatureMoniMT INFO HLT_j460_a10_lcw_subjes_L1J100 #3327656707
TrigSignatureMoniMT INFO -- #3327656707 Events 20 20 0 0 0 0 0 0 0 0 0 0 - - 0
TrigSignatureMoniMT INFO -- #3327656707 Features 0 0 0 0 0 0 0 0 0 0 - -
@@ -337,15 +346,36 @@ TrigSignatureMoniMT INFO -- #1151767619 Features
TrigSignatureMoniMT INFO HLT_j460_a10r_L1J20 #3875082669
TrigSignatureMoniMT INFO -- #3875082669 Events 20 20 0 0 0 0 0 0 0 0 0 0 - - 0
TrigSignatureMoniMT INFO -- #3875082669 Features 0 0 0 0 0 0 0 0 0 0 - -
+TrigSignatureMoniMT INFO HLT_j460_a10sd_csskpf_jes_ftf_35smcINF_L1J100 #3781128663
+TrigSignatureMoniMT INFO -- #3781128663 Events 20 20 0 0 0 0 0 0 0 0 0 0 - - 0
+TrigSignatureMoniMT INFO -- #3781128663 Features 0 0 0 0 0 0 0 0 0 0 - -
+TrigSignatureMoniMT INFO HLT_j460_a10sd_csskpf_jes_ftf_L1J100 #1509950051
+TrigSignatureMoniMT INFO -- #1509950051 Events 20 20 0 0 0 0 0 0 0 0 0 0 - - 0
+TrigSignatureMoniMT INFO -- #1509950051 Features 0 0 0 0 0 0 0 0 0 0 - -
+TrigSignatureMoniMT INFO HLT_j460_a10sd_csskpf_nojcalib_ftf_35smcINF_L1J100 #249842682
+TrigSignatureMoniMT INFO -- #249842682 Events 20 20 0 0 0 0 0 0 0 0 0 0 - - 0
+TrigSignatureMoniMT INFO -- #249842682 Features 0 0 0 0 0 0 0 0 0 0 - -
+TrigSignatureMoniMT INFO HLT_j460_a10sd_csskpf_nojcalib_ftf_L1J100 #3452032818
+TrigSignatureMoniMT INFO -- #3452032818 Events 20 20 0 0 0 0 0 0 0 0 0 0 - - 0
+TrigSignatureMoniMT INFO -- #3452032818 Features 0 0 0 0 0 0 0 0 0 0 - -
TrigSignatureMoniMT INFO HLT_j460_a10sd_lcw_nojcalib_L1J100 #3093997295
TrigSignatureMoniMT INFO -- #3093997295 Events 20 20 0 0 0 0 0 0 0 0 0 0 - - 0
TrigSignatureMoniMT INFO -- #3093997295 Features 0 0 0 0 0 0 0 0 0 0 - -
+TrigSignatureMoniMT INFO HLT_j460_a10sd_pf_nojcalib_ftf_L1J100 #2138269254
+TrigSignatureMoniMT INFO -- #2138269254 Events 20 20 0 0 0 0 0 0 0 0 0 0 - - 0
+TrigSignatureMoniMT INFO -- #2138269254 Features 0 0 0 0 0 0 0 0 0 0 - -
TrigSignatureMoniMT INFO HLT_j460_a10t_lcw_jes_30smcINF_L1J100 #2296827117
TrigSignatureMoniMT INFO -- #2296827117 Events 20 20 0 0 0 0 0 0 0 0 0 0 - - 0
TrigSignatureMoniMT INFO -- #2296827117 Features 0 0 0 0 0 0 0 0 0 0 - -
TrigSignatureMoniMT INFO HLT_j460_a10t_lcw_jes_L1J100 #436385969
TrigSignatureMoniMT INFO -- #436385969 Events 20 20 0 0 0 0 0 0 0 0 0 0 - - 0
TrigSignatureMoniMT INFO -- #436385969 Features 0 0 0 0 0 0 0 0 0 0 - -
+TrigSignatureMoniMT INFO HLT_j460_a10t_lcw_nojcalib_35smcINF_L1J100 #3224465417
+TrigSignatureMoniMT INFO -- #3224465417 Events 20 20 0 0 0 0 0 0 0 0 0 0 - - 0
+TrigSignatureMoniMT INFO -- #3224465417 Features 0 0 0 0 0 0 0 0 0 0 - -
+TrigSignatureMoniMT INFO HLT_j460_a10t_lcw_nojcalib_L1J100 #1966129844
+TrigSignatureMoniMT INFO -- #1966129844 Events 20 20 0 0 0 0 0 0 0 0 0 0 - - 0
+TrigSignatureMoniMT INFO -- #1966129844 Features 0 0 0 0 0 0 0 0 0 0 - -
TrigSignatureMoniMT INFO HLT_j80_0eta240_2j60_320eta490_j0_dijetSEP80j1etSEP0j1eta240SEP80j2etSEP0j2eta240SEP700djmass_L1J20 #3634067472
TrigSignatureMoniMT INFO -- #3634067472 Events 20 20 0 0 0 0 0 0 0 0 0 0 - - 0
TrigSignatureMoniMT INFO -- #3634067472 Features 0 0 0 0 0 0 0 0 0 0 - -
@@ -361,9 +391,9 @@ TrigSignatureMoniMT INFO -- #510475538 Features
TrigSignatureMoniMT INFO HLT_j85_ftf_L1J20 #877042532
TrigSignatureMoniMT INFO -- #877042532 Events 20 20 0 0 0 0 0 0 0 0 0 3 - - 3
TrigSignatureMoniMT INFO -- #877042532 Features 0 0 0 0 0 0 0 0 0 3 - -
-TrigSignatureMoniMT INFO HLT_j85_ftf_pf_L1J20 #1538535401
-TrigSignatureMoniMT INFO -- #1538535401 Events 20 20 0 0 0 0 0 0 0 0 0 2 - - 2
-TrigSignatureMoniMT INFO -- #1538535401 Features 0 0 0 0 0 0 0 0 0 2 - -
+TrigSignatureMoniMT INFO HLT_j85_pf_ftf_L1J20 #789444389
+TrigSignatureMoniMT INFO -- #789444389 Events 20 20 0 0 0 0 0 0 0 0 0 2 - - 2
+TrigSignatureMoniMT INFO -- #789444389 Features 0 0 0 0 0 0 0 0 0 2 - -
TrigSignatureMoniMT INFO HLT_mb_sptrk_L1RD0_FILLED #4097312640
TrigSignatureMoniMT INFO -- #4097312640 Events 20 20 20 19 - - - - - - - - - - 19
TrigSignatureMoniMT INFO -- #4097312640 Features 20 19 - - - - - - - - - -
diff --git a/Trigger/TriggerCommon/TrigEDMConfig/python/TriggerEDMRun3.py b/Trigger/TriggerCommon/TrigEDMConfig/python/TriggerEDMRun3.py
index fdfd2365cb5..a9a8edccd4e 100644
--- a/Trigger/TriggerCommon/TrigEDMConfig/python/TriggerEDMRun3.py
+++ b/Trigger/TriggerCommon/TrigEDMConfig/python/TriggerEDMRun3.py
@@ -302,9 +302,27 @@ TriggerHLTListRun3 = [
('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_AntiKt10LCTopoTrimmedPtFrac5SmallR20Jets_nojcalib', 'BS ESD AODFULL AODSLIM AODVERYSLIM', 'Jet'),
+ ('xAOD::JetAuxContainer#HLT_AntiKt10LCTopoTrimmedPtFrac5SmallR20Jets_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'),
+ ('xAOD::JetContainer#HLT_AntiKt10EMPFlowJets_nojcalib_ftf', 'BS ESD AODFULL', 'Jet'),
+ ('xAOD::JetAuxContainer#HLT_AntiKt10EMPFlowJets_nojcalib_ftfAux.'+JetVars, 'BS ESD AODFULL', 'Jet'),
+
+ ('xAOD::JetContainer#HLT_AntiKt10EMPFlowSoftDropBeta100Zcut10Jets_nojcalib_ftf', 'BS ESD AODFULL', 'Jet'),
+ ('xAOD::JetAuxContainer#HLT_AntiKt10EMPFlowSoftDropBeta100Zcut10Jets_nojcalib_ftfAux.'+JetVars, 'BS ESD AODFULL', 'Jet'),
+
+ ('xAOD::JetContainer#HLT_AntiKt10EMPFlowCSSKJets_nojcalib_ftf', 'BS ESD AODFULL', 'Jet'),
+ ('xAOD::JetAuxContainer#HLT_AntiKt10EMPFlowCSSKJets_nojcalib_ftfAux.'+JetVars, 'BS ESD AODFULL', 'Jet'),
+
+ ('xAOD::JetContainer#HLT_AntiKt10EMPFlowCSSKSoftDropBeta100Zcut10Jets_nojcalib_ftf', 'BS ESD AODFULL', 'Jet'),
+ ('xAOD::JetAuxContainer#HLT_AntiKt10EMPFlowCSSKSoftDropBeta100Zcut10Jets_nojcalib_ftfAux.'+JetVars, 'BS ESD AODFULL', 'Jet'),
+
+ ('xAOD::JetContainer#HLT_AntiKt10EMPFlowCSSKSoftDropBeta100Zcut10Jets_jes_ftf', 'BS ESD AODFULL', 'Jet'),
+ ('xAOD::JetAuxContainer#HLT_AntiKt10EMPFlowCSSKSoftDropBeta100Zcut10Jets_jes_ftfAux.'+JetVars, 'BS ESD AODFULL', 'Jet'),
+
('xAOD::JetContainer#HLT_AntiKt4EMPFlowJets_subjesIS_ftf', 'BS ESD AODFULL', 'Jet'),
('xAOD::JetAuxContainer#HLT_AntiKt4EMPFlowJets_subjesIS_ftfAux.'+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 6808b79af94..3ffa4b5744a 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Jet/JetChainConfiguration.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Jet/JetChainConfiguration.py
@@ -82,7 +82,8 @@ class JetChainConfiguration(ChainConfigurationBase):
jetDefStr = jetRecoDictToString(self.recoDict)
stepName = "Step1_jet_"+jetDefStr
- jetSeq1 = RecoFragmentsPool.retrieve( jetMenuSequence, None, **self.recoDict ) # the None will be used for flags in future
+ from AthenaConfiguration.AllConfigFlags import ConfigFlags
+ jetSeq1 = RecoFragmentsPool.retrieve( jetMenuSequence, ConfigFlags, **self.recoDict ) # the None will be used for flags in future
return ChainStep(stepName, [jetSeq1], multiplicity=[1], chainDicts=[self.dict])
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Jet/JetMenuSequences.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Jet/JetMenuSequences.py
index f3306157835..b32595769aa 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Jet/JetMenuSequences.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Jet/JetMenuSequences.py
@@ -4,15 +4,15 @@
from TriggerMenuMT.HLTMenuConfig.Menu.MenuComponents import RecoFragmentsPool, MenuSequence
from TriggerMenuMT.HLTMenuConfig.Jet.JetRecoSequences import jetAthSequence, jetRecoDictToString
-def jetCFSequence(dummyFlags,**recoDict):
+def jetCFSequence(configFlags,**recoDict):
""" Function to create the jet Menu Sequence"""
#reco sequence
- (JetAthSequence, InputMakerAlg, sequenceOut) = RecoFragmentsPool.retrieve(jetAthSequence,None,**recoDict)
+ (JetAthSequence, InputMakerAlg, sequenceOut) = RecoFragmentsPool.retrieve(jetAthSequence,configFlags,**recoDict)
return (JetAthSequence, InputMakerAlg, sequenceOut)
-def jetMenuSequence(dummyFlags,**recoDict):
- (JetAthSequence, InputMakerAlg, sequenceOut)= jetCFSequence(dummyFlags,**recoDict)
+def jetMenuSequence(configFlags,**recoDict):
+ (JetAthSequence, InputMakerAlg, sequenceOut)= jetCFSequence(configFlags,**recoDict)
#hypo
from TrigHLTJetHypo.TrigHLTJetHypoConf import TrigJetHypoAlgMT
from TrigHLTJetHypo.TrigJetHypoToolConfig import trigJetHypoToolFromDict
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Jet/JetRecoConfiguration.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Jet/JetRecoConfiguration.py
index 6c2472e4a42..7e871e53d95 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Jet/JetRecoConfiguration.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Jet/JetRecoConfiguration.py
@@ -71,19 +71,23 @@ def defineJetConstit(jetRecoDict,clustersKey=None,pfoPrefix=None):
jetConstit.inputname = clustersKey
return jetConstit
+
+def interpretRecoAlg(recoAlg):
+ import re
+ jetalg, jetradius, jetextra = re.split(r'(\d+)',recoAlg)
+ return jetalg, int(jetradius), jetextra
+
# Arbitrary min pt for fastjet, set to be low enough for MHT(?)
# Could/should adjust higher for large-R
def defineJets(jetRecoDict,clustersKey=None,pfoPrefix=None):
minpt = {
- "a4": 7000,
- "a10": 50000,
- "a10r": 50000,
- "a10t": 50000,
- "a10sd": 50000,
+ 4: 7000,
+ 10: 50000,
}
- radius = float(jetRecoDict["recoAlg"].lstrip("a").rstrip("trsd"))/10
+ jetalg, jetradius, jetextra = interpretRecoAlg(jetRecoDict["recoAlg"])
+ actualradius = float(jetradius)/10
jetConstit = defineJetConstit(jetRecoDict,clustersKey,pfoPrefix)
- jetDef = JetDefinition( "AntiKt", radius, jetConstit, ptmin=minpt[jetRecoDict["recoAlg"]])
+ jetDef = JetDefinition( "AntiKt", actualradius, jetConstit, ptmin=minpt[jetradius])
return jetDef
def defineReclusteredJets(jetRecoDict):
@@ -120,6 +124,7 @@ def defineTrackMods(trkopt):
# Translate calib specification into something understood by
# the calibration config helper
def defineCalibFilterMods(jetRecoDict,dataSource,rhoKey="auto"):
+
# Minimum modifier set for calibration w/o track GSC
# Should eventually build in more mods, depend on track info etc
jetalg = jetRecoDict["recoAlg"]
@@ -132,12 +137,12 @@ def defineCalibFilterMods(jetRecoDict,dataSource,rhoKey="auto"):
if jetRecoDict["trkopt"]=="notrk" and "subres" in jetRecoDict["jetCalib"]:
raise ValueError("Pileup residual calibration requested but no track source provided!")
- if jetRecoDict["dataType"]=="tc":
+ if jetRecoDict["dataType"].endswith("tc"):
calibContext,calibSeq = {
("a4","subjes"): ("TrigRun2","JetArea_EtaJES_GSC"), # Calo GSC only
- ("a4","subjesIS"): ("TrigRun2","JetArea_EtaJES_GSC_Insitu"), # Calo GSC only
- ("a4","subjesgscIS"): ("TrigRun2GSC","JetArea_EtaJES_GSC_Insitu"), # Calo+Trk GSC
- ("a4","subresjesgscIS"): ("TrigRun2GSC","JetArea_Residual_EtaJES_GSC_Insitu"), # pu residual + calo+trk GSC
+ ("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
("a10","subjes"): ("TrigUngroomed","JetArea_EtaJES"),
("a10t","jes"): ("TrigTrimmed","EtaJES_JMS"),
}[(jetRecoDict["recoAlg"],jetRecoDict["jetCalib"])]
@@ -148,14 +153,19 @@ def defineCalibFilterMods(jetRecoDict,dataSource,rhoKey="auto"):
gscDepth = "trackWIDTH"
pvname = "HLT_IDVertex_FS"
- elif jetRecoDict["dataType"]=="pf":
+ elif jetRecoDict["dataType"].endswith("pf"):
gscDepth = "auto"
- calibContext = "TrigLS2"
- calibSeq = "JetArea_Residual_EtaJES_GSC"
- if jetRecoDict["jetCalib"].endswith("IS"):
- calibSeq += "_Insitu"
+ if 'sd' in jetRecoDict["recoAlg"]:
+ calibContext = "TrigSoftDrop"
+ calibSeq = "EtaJES_JMS"
+ else:
+ calibContext = "TrigLS2"
+ calibSeq = "JetArea_Residual_EtaJES_GSC"
pvname = "HLT_IDVertex_FS"
+ if jetRecoDict["jetCalib"].endswith("IS") and (dataSource=="data"):
+ calibSeq += "_Insitu"
+
calibSpec = ":".join( [calibContext, dataSource, calibSeq, rhoKey, pvname, gscDepth] )
from .TriggerJetMods import ConstitFourMom_copy
if jetalg=="a4":
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Jet/JetRecoSequences.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Jet/JetRecoSequences.py
index 915086c5693..54d1b7d8202 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Jet/JetRecoSequences.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Jet/JetRecoSequences.py
@@ -6,7 +6,8 @@ from AthenaCommon.CFElements import parOR, seqAND
from TriggerMenuMT.HLTMenuConfig.Menu.ChainConfigurationBase import RecoFragmentsPool
from AthenaConfiguration.ComponentAccumulator import conf2toConfigurable
from TriggerMenuMT.HLTMenuConfig.Jet import JetRecoConfiguration
-
+from JetRecConfig.JetRecConfig import getConstitPJGAlg, getJetAlgorithm
+from TrigEDMConfig.TriggerEDMRun3 import recordable
# Translate the reco dict to a string for suffixing etc
def jetRecoDictToString(jetRecoDict):
@@ -17,200 +18,209 @@ def jetRecoDictToString(jetRecoDict):
# Configure reco from a dict of options
# Start from a FullScan inputs maker
-def jetAthSequence(dummyFlags, **jetRecoDict):
+def jetAthSequence(configFlags, **jetRecoDict):
from TrigT2CaloCommon.CaloDef import clusterFSInputMaker
InputMakerAlg= conf2toConfigurable(clusterFSInputMaker())
- # Does nothing now, but may need to use this to toggle Insitu calib step
- # in which case it should be deduced from input flags
- dataSource = "data" # or mc
-
- (recoSequence, sequenceOut) = RecoFragmentsPool.retrieve( jetRecoSequence, None, dataSource=dataSource, **jetRecoDict )
+ (recoSequence, sequenceOut, jetDef) = RecoFragmentsPool.retrieve( jetRecoSequence, configFlags, **jetRecoDict )
jetDefString = jetRecoDictToString(jetRecoDict)
JetAthSequence = seqAND("jetAthSequence_"+jetDefString,[InputMakerAlg, recoSequence ])
return (JetAthSequence, InputMakerAlg, sequenceOut)
+jetNamePrefix = "HLT_"
+
# Dummy flag arg needed so that each reco sequence is held separately
# in the RecoFragmentsPool -- only the kwargs are used to distinguish
# different sequences. New convention is just to pass "None" for flags
-def jetRecoSequence( dummyFlags, dataSource, RoIs = 'HLT_FSJETRoI', **jetRecoDict):
+def jetRecoSequence( configFlags, RoIs = 'HLT_FSJETRoI', **jetRecoDict ):
+
+ jetalg, jetradius, extra = JetRecoConfiguration.interpretRecoAlg(jetRecoDict["recoAlg"])
+ doGrooming = extra in ["t","sd"]
+ doRecluster = extra == "r"
+ dataSource = "mc" if configFlags.Input.isMC else "data"
+ if doRecluster:
+ return RecoFragmentsPool.retrieve( reclusteredJetRecoSequence, configFlags, dataSource=dataSource, RoIs=RoIs, **jetRecoDict)
+ elif doGrooming:
+ return RecoFragmentsPool.retrieve( groomedJetRecoSequence, configFlags, dataSource=dataSource, RoIs=RoIs, **jetRecoDict)
+ else:
+ return RecoFragmentsPool.retrieve( standardJetRecoSequence, configFlags, dataSource=dataSource, RoIs=RoIs, **jetRecoDict)
+
+# Normal jet reconstruction, no reclustering or grooming
+def standardJetRecoSequence( configFlags, dataSource, RoIs, **jetRecoDict ):
jetDefString = jetRecoDictToString(jetRecoDict)
recoSeq = parOR( "JetRecSeq_"+jetDefString, [])
- recoAlg = jetRecoDict["recoAlg"]
- doGrooming = recoAlg.endswith("t") or recoAlg.endswith("sd") # trimming or soft drop
- doRecluster = recoAlg.endswith("r")
- jetNamePrefix = "HLT_"
+ # Start by adding the topocluster reco sequence
+ from TriggerMenuMT.HLTMenuConfig.CommonSequences.CaloSequenceSetup import (
+ caloClusterRecoSequence, LCCaloClusterRecoSequence)
+ if jetRecoDict["calib"] == "em":
+ topoClusterSequence, clustersKey = RecoFragmentsPool.retrieve(
+ caloClusterRecoSequence, flags=None, RoIs=RoIs)
+ elif jetRecoDict["calib"] == "lcw":
+ topoClusterSequence, clustersKey = RecoFragmentsPool.retrieve(
+ LCCaloClusterRecoSequence, flags=None, RoIs=RoIs)
+ else:
+ raise ValueError("Invalid value for calib: '{}'".format(jetRecoDict["calib"]))
+ recoSeq += topoClusterSequence
- from TrigEDMConfig.TriggerEDMRun3 import recordable
- from JetRecConfig import ConfigurableCompatibility
- ConfigurableCompatibility.Convert2Configurable = True
- from JetRecConfig.JetRecConfig import getConstitPJGAlg, getJetAlgorithm
- if doRecluster:
- # Reclustering -- recursively call the basic jet reco and add this to the sequence,
- # then add another jet algorithm to run the reclustering step
- basicJetRecoDict = dict(jetRecoDict)
- basicJetRecoDict["recoAlg"] = "a4" # Standard size for reclustered
- (basicJetRecoSequence,basicJetsName) = RecoFragmentsPool.retrieve(jetRecoSequence,None,dataSource=dataSource, **basicJetRecoDict)
- recoSeq += basicJetRecoSequence
-
- rcJetPtMin = 15e3 # 15 GeV minimum pt for jets to be reclustered
- from JetRec.JetRecConf import JetViewAlg
- filteredJetsName = basicJetsName+"_pt15"
- recoSeq += JetViewAlg("jetview_"+filteredJetsName,
- InputContainer=basicJetsName,
- OutputContainer=filteredJetsName,
- PtMin=rcJetPtMin)
-
- rcJetDef = JetRecoConfiguration.defineReclusteredJets(jetRecoDict)
- rcJetDef.inputdef.inputname = filteredJetsName
- rcJetsFullName = jetNamePrefix+rcJetDef.basename+"RCJets_"+jetRecoDict["jetCalib"]
- rcModList = [] # Could set substructure mods
- rcJetDef.modifiers = rcModList
-
- rcConstitPJAlg = getConstitPJGAlg( rcJetDef.inputdef )
- rcConstitPJKey = rcConstitPJAlg.OutputContainer
- recoSeq += conf2toConfigurable( rcConstitPJAlg )
-
- # Get online monitoring tool
- from JetRec import JetOnlineMon
- monTool = JetOnlineMon.getMonTool_TrigJetAlgorithm("HLTJets/"+rcJetsFullName+"/")
-
- rcPJs = [rcConstitPJKey]
- rcJetRecAlg = getJetAlgorithm(rcJetsFullName, rcJetDef, rcPJs, rcModList, monTool)
-
- recoSeq += conf2toConfigurable( rcJetRecAlg )
-
- sequenceOut = recordable(rcJetsFullName)
+ # Set up tracking sequence -- may need to reorganise or relocate
+ # depending on how we want to handle HLT preselection
+ trkcolls = None
+ if jetRecoDict["trkopt"] != "notrk":
+ from .JetTrackingConfig import JetTrackingSequence
+ (jettrkseq, trkcolls) = RecoFragmentsPool.retrieve( JetTrackingSequence, configFlags, trkopt=jetRecoDict["trkopt"], RoIs=RoIs)
+ recoSeq += jettrkseq
+
+ # Potentially add particle flow reconstruction
+ # Work in progress
+ if "pf" in jetRecoDict["dataType"]:
+ if jetRecoDict["trkopt"] == "notrk":
+ raise RuntimeError("PFlow jet chain requested with no tracking option!")
+ from eflowRec.PFHLTSequence import PFHLTSequence
+ (pfseq, pfoPrefix) = RecoFragmentsPool.retrieve(PFHLTSequence, configFlags, clustersin=clustersKey, tracktype=jetRecoDict["trkopt"])
+ recoSeq += pfseq
+ jetDef = JetRecoConfiguration.defineJets(jetRecoDict,pfoPrefix=pfoPrefix)
+ else:
+ jetDef = JetRecoConfiguration.defineJets(jetRecoDict,clustersKey=clustersKey)
+ useConstitMods = ["sktc","cssktc", "pf", "csskpf"]
+ doConstitMods = jetRecoDict["dataType"] in useConstitMods
- elif doGrooming:
- # Grooming needs to be set up similarly to reclustering
- # --> build ungroomed jets, then add a grooming alg
- ungroomedJetRecoDict = dict(jetRecoDict)
- ungroomedJetRecoDict["recoAlg"] = ungroomedJetRecoDict["recoAlg"].rstrip("tsd") # Drop grooming spec
- ungroomedJetRecoDict["jetCalib"] = "nojcalib" # No need to calibrate
- ungroomedDef = JetRecoConfiguration.defineJets(ungroomedJetRecoDict)
+ # chosen jet collection
+ jetsFullName = jetNamePrefix+jetDef.basename+"Jets_"+jetRecoDict["jetCalib"]
+ if jetRecoDict["trkopt"] != "notrk":
+ jetsFullName += "_{}".format(jetRecoDict["trkopt"])
+ sequenceOut = recordable(jetsFullName)
- (ungroomedJetRecoSequence,ungroomedJetsName) = RecoFragmentsPool.retrieve(jetRecoSequence,None,dataSource=dataSource, **ungroomedJetRecoDict)
- recoSeq += conf2toConfigurable( ungroomedJetRecoSequence )
- # Need to forward the pseudojets of the parents to the groomer
- parentpjs = getattr(ungroomedJetRecoSequence,"jetalg_{}".format(ungroomedJetsName)).Tools[0].InputPseudoJets
+ if doConstitMods:
+ # Get online monitoring jet rec tool
+ from JetRecTools import OnlineMon
+ monJetRecTool = OnlineMon.getMonTool_Algorithm("HLTJets/"+jetsFullName+"/")
- groomDef = JetRecoConfiguration.defineGroomedJets(jetRecoDict,ungroomedDef,ungroomedJetsName)
- groomedJetsFullName = jetNamePrefix+groomDef.basename+"Jets_"+jetRecoDict["jetCalib"]
+ from JetRecConfig.ConstModHelpers import getConstitModAlg
+ if jetRecoDict["trkopt"] == "notrk":
+ recoSeq += getConstitModAlg(jetDef.inputdef,suffix="HLT",tvaKey="JetTrackVtxAssoc",vtxKey="PrimaryVertices",monTool=monJetRecTool)
+ else:
+ recoSeq += getConstitModAlg(jetDef.inputdef,suffix="HLT",tvaKey=trkcolls["TVA"],vtxKey=trkcolls["Vertices"],monTool=monJetRecTool)
+
+ # Add the PseudoJetGetter alg to the sequence
+ constitPJAlg = getConstitPJGAlg( jetDef.inputdef )
+ constitPJKey = constitPJAlg.OutputContainer
+ recoSeq += conf2toConfigurable( constitPJAlg )
+ # Basic list of PseudoJets is just the constituents
+ # Append ghosts (tracks) if desired
+ pjs = [constitPJKey]
+ if trkcolls:
+ pjs.append(trkcolls["GhostTracks"])
+
+ from JetRecConfig import JetRecConfig
+ jetModList = []
+ if jetRecoDict["trkopt"] != "notrk":
+ trkMods = JetRecoConfiguration.defineTrackMods(jetRecoDict["trkopt"])
+ jetModList += trkMods
+
+ rhoKey = "auto"
+ if "sub" in jetRecoDict["jetCalib"]:
+ # Add the event shape alg if needed for area subtraction
+ eventShapeAlg = JetRecConfig.getEventShapeAlg( jetDef.inputdef, constitPJKey, "HLT_" )
+ recoSeq += conf2toConfigurable(eventShapeAlg)
+ # Not currently written because impossible to merge
+ # across event views, which is maybe a concern in
+ # the case of regional PFlow
+ rhoKey = eventShapeAlg.EventDensityTool.OutputContainer
+
+ # Import the standard jet modifiers as defined for offline
+ # We can add/configure these differently if desired. In particular,
+ # we could define a TriggerJetMods module if settings need to
+ # diverge substantially e.g. track/vertex collections
+ calibMods = JetRecoConfiguration.defineCalibFilterMods(jetRecoDict,dataSource, rhoKey)
+ jetModList += calibMods
+
+ # Get online monitoring tool
+ from JetRec import JetOnlineMon
+ monTool = JetOnlineMon.getMonTool_TrigJetAlgorithm("HLTJets/"+jetsFullName+"/")
+
+ # Generate a JetAlgorithm to run the jet finding and modifiers
+ # (via a JetRecTool instance).
+ jetRecAlg = JetRecConfig.getJetAlgorithm(jetsFullName, jetDef, pjs, jetModList, monTool)
+ recoSeq += conf2toConfigurable( jetRecAlg )
+ # End of basic jet reco
+ return recoSeq, sequenceOut, jetDef
+
+# Grooming needs the ungroomed jets to be built first,
+# so call the basic jet reco seq, then add a grooming alg
+def groomedJetRecoSequence( configFlags, dataSource, RoIs, **jetRecoDict ):
+ jetDefString = jetRecoDictToString(jetRecoDict)
+ recoSeq = parOR( "JetGroomSeq_"+jetDefString, [])
+ ungroomedJetRecoDict = dict(jetRecoDict)
+ ungroomedJetRecoDict["recoAlg"] = ungroomedJetRecoDict["recoAlg"].rstrip("tsd") # Drop grooming spec
+ ungroomedJetRecoDict["jetCalib"] = "nojcalib" # No need to calibrate
- groomedModList = JetRecoConfiguration.defineCalibFilterMods(jetRecoDict,dataSource)
- # Can add substructure mods here
+ (ungroomedJetRecoSequence,ungroomedJetsName, ungroomedDef) = RecoFragmentsPool.retrieve(standardJetRecoSequence,configFlags,dataSource=dataSource,RoIs=RoIs,**ungroomedJetRecoDict)
+ recoSeq += conf2toConfigurable( ungroomedJetRecoSequence )
+ # Need to forward the pseudojets of the parents to the groomer
+ parentpjs = getattr(ungroomedJetRecoSequence,"jetalg_{}".format(ungroomedJetsName)).Tools[0].InputPseudoJets
- # Get online monitoring tool
- from JetRec import JetOnlineMon
- monTool = JetOnlineMon.getMonTool_TrigJetAlgorithm("HLTJets/"+groomedJetsFullName+"/")
+ groomDef = JetRecoConfiguration.defineGroomedJets(jetRecoDict,ungroomedDef,ungroomedJetsName)
+ groomedJetsFullName = jetNamePrefix+groomDef.basename+"Jets_"+jetRecoDict["jetCalib"]
+ if jetRecoDict["trkopt"]!="notrk":
+ groomedJetsFullName += "_"+jetRecoDict["trkopt"]
- from JetRecConfig.JetGroomConfig import getJetGroomAlg
- groomalg = getJetGroomAlg(groomedJetsFullName,groomDef,parentpjs,groomedModList,monTool)
- recoSeq += conf2toConfigurable( groomalg )
+ groomedModList = JetRecoConfiguration.defineCalibFilterMods(jetRecoDict,dataSource)
+ # Can add substructure mods here
- sequenceOut = recordable(groomedJetsFullName)
- else:
- # Normal jet reconstruction, no reclustering or grooming
-
- # Start by adding the topocluster reco sequence
- # This makes EM clusters!
- from TriggerMenuMT.HLTMenuConfig.CommonSequences.CaloSequenceSetup import (
- caloClusterRecoSequence, LCCaloClusterRecoSequence)
- if jetRecoDict["calib"] == "em":
- topoClusterSequence, clustersKey = RecoFragmentsPool.retrieve(
- caloClusterRecoSequence, flags=None, RoIs=RoIs)
- elif jetRecoDict["calib"] == "lcw":
- topoClusterSequence, clustersKey = RecoFragmentsPool.retrieve(
- LCCaloClusterRecoSequence, flags=None, RoIs=RoIs)
- else:
- raise ValueError("Invalid value for calib: '{}'".format(jetRecoDict["calib"]))
- recoSeq += topoClusterSequence
-
- # Set up tracking sequence -- may need to reorganise or relocate
- # depending on how we want to handle HLT preselection
- trkcolls = None
- if jetRecoDict["trkopt"] != "notrk":
- from .JetTrackingConfig import JetTrackingSequence
- (jettrkseq, trkcolls) = RecoFragmentsPool.retrieve( JetTrackingSequence, None, trkopt=jetRecoDict["trkopt"], RoIs=RoIs)
- recoSeq += jettrkseq
-
- # Potentially add particle flow reconstruction
- # Work in progress
- if "pf" in jetRecoDict["dataType"]:
- if jetRecoDict["trkopt"] == "notrk":
- raise RuntimeError("PFlow jet chain requested with no tracking option!")
- from eflowRec.PFHLTSequence import PFHLTSequence
- (pfseq, pfoPrefix) = RecoFragmentsPool.retrieve(PFHLTSequence, None, clustersin=clustersKey, tracktype=jetRecoDict["trkopt"])
- recoSeq += pfseq
- jetDef = JetRecoConfiguration.defineJets(jetRecoDict,pfoPrefix=pfoPrefix)
- else:
- jetDef = JetRecoConfiguration.defineJets(jetRecoDict,clustersKey=clustersKey)
- useConstitMods = ["sktc","cssktc", "pf", "csskpf"]
- doConstitMods = jetRecoDict["dataType"] in useConstitMods
-
- # chosen jet collection
- jetsFullName = jetNamePrefix+jetDef.basename+"Jets_"+jetRecoDict["jetCalib"]
- if jetRecoDict["trkopt"] != "notrk":
- jetsFullName += "_{}".format(jetRecoDict["trkopt"])
- sequenceOut = recordable(jetsFullName)
-
- if doConstitMods:
- # Get online monitoring jet rec tool
- from JetRecTools import OnlineMon
- monJetRecTool = OnlineMon.getMonTool_Algorithm("HLTJets/"+jetsFullName+"/")
-
- from JetRecConfig.ConstModHelpers import getConstitModAlg
- if jetRecoDict["trkopt"] == "notrk":
- recoSeq += getConstitModAlg(jetDef.inputdef,suffix="HLT",tvaKey="JetTrackVtxAssoc",vtxKey="PrimaryVertices",monTool=monJetRecTool)
- else:
- recoSeq += getConstitModAlg(jetDef.inputdef,suffix="HLT",tvaKey=trkcolls["TVA"],vtxKey=trkcolls["Vertices"],monTool=monJetRecTool)
-
- # Add the PseudoJetGetter alg to the sequence
- constitPJAlg = getConstitPJGAlg( jetDef.inputdef )
- constitPJKey = constitPJAlg.OutputContainer
- recoSeq += conf2toConfigurable( constitPJAlg )
- # Basic list of PseudoJets is just the constituents
- # Append ghosts (tracks) if desired
- pjs = [constitPJKey]
- if trkcolls:
- pjs.append(trkcolls["GhostTracks"])
-
- from JetRecConfig import JetRecConfig
- jetModList = []
- if jetRecoDict["trkopt"] != "notrk":
- trkMods = JetRecoConfiguration.defineTrackMods(jetRecoDict["trkopt"])
- jetModList += trkMods
-
- rhoKey = "auto"
- if "sub" in jetRecoDict["jetCalib"]:
- # Add the event shape alg if needed for area subtraction
- eventShapeAlg = JetRecConfig.getEventShapeAlg( jetDef.inputdef, constitPJKey, "HLT_" )
- recoSeq += conf2toConfigurable(eventShapeAlg)
- # Not currently written because impossible to merge
- # across event views, which is maybe a concern in
- # the case of regional PFlow
- rhoKey = eventShapeAlg.EventDensityTool.OutputContainer
-
- # Import the standard jet modifiers as defined for offline
- # We can add/configure these differently if desired. In particular,
- # we could define a TriggerJetMods module if settings need to
- # diverge substantially e.g. track/vertex collections
- calibMods = JetRecoConfiguration.defineCalibFilterMods(jetRecoDict,dataSource, rhoKey)
- jetModList += calibMods
-
- # Get online monitoring tool
- from JetRec import JetOnlineMon
- monTool = JetOnlineMon.getMonTool_TrigJetAlgorithm("HLTJets/"+jetsFullName+"/")
-
- # Generate a JetAlgorithm to run the jet finding and modifiers
- # (via a JetRecTool instance).
- jetRecAlg = JetRecConfig.getJetAlgorithm(jetsFullName, jetDef, pjs, jetModList, monTool)
- recoSeq += conf2toConfigurable( jetRecAlg )
- # End of basic jet reco
- pass
-
- return (recoSeq,sequenceOut)
+ # Get online monitoring tool
+ from JetRec import JetOnlineMon
+ monTool = JetOnlineMon.getMonTool_TrigJetAlgorithm("HLTJets/"+groomedJetsFullName+"/")
+
+ from JetRecConfig.JetGroomConfig import getJetGroomAlg
+ groomalg = getJetGroomAlg(groomedJetsFullName,groomDef,parentpjs,groomedModList,monTool)
+ recoSeq += conf2toConfigurable( groomalg )
+
+ sequenceOut = recordable(groomedJetsFullName)
+ jetDef = groomDef
+ return recoSeq, sequenceOut, jetDef
+
+
+# Reclustering -- call the basic jet reco and add this to the sequence,
+# then add another jet algorithm to run the reclustering step
+def reclusteredJetRecoSequence( configFlags, dataSource, RoIs, **jetRecoDict ):
+ jetDefString = jetRecoDictToString(jetRecoDict)
+ recoSeq = parOR( "JetReclusterSeq_"+jetDefString, [])
+
+ basicJetRecoDict = dict(jetRecoDict)
+ basicJetRecoDict["recoAlg"] = "a4" # Standard size for reclustered
+ (basicJetRecoSequence,basicJetsName, basicJetDef) = RecoFragmentsPool.retrieve(standardJetRecoSequence,configFlags,dataSource=dataSource,RoIs=RoIs,**basicJetRecoDict)
+ recoSeq += basicJetRecoSequence
+
+ rcJetPtMin = 15e3 # 15 GeV minimum pt for jets to be reclustered
+ from JetRec.JetRecConf import JetViewAlg
+ filteredJetsName = basicJetsName+"_pt15"
+ recoSeq += JetViewAlg("jetview_"+filteredJetsName,
+ InputContainer=basicJetsName,
+ OutputContainer=filteredJetsName,
+ PtMin=rcJetPtMin)
+
+ rcJetDef = JetRecoConfiguration.defineReclusteredJets(jetRecoDict)
+ rcJetDef.inputdef.inputname = filteredJetsName
+ rcJetsFullName = jetNamePrefix+rcJetDef.basename+"RCJets_"+jetRecoDict["jetCalib"]
+ rcModList = [] # Could set substructure mods
+ rcJetDef.modifiers = rcModList
+
+ rcConstitPJAlg = getConstitPJGAlg( rcJetDef.inputdef )
+ rcConstitPJKey = rcConstitPJAlg.OutputContainer
+ recoSeq += conf2toConfigurable( rcConstitPJAlg )
+
+ # Get online monitoring tool
+ from JetRec import JetOnlineMon
+ monTool = JetOnlineMon.getMonTool_TrigJetAlgorithm("HLTJets/"+rcJetsFullName+"/")
+
+ rcPJs = [rcConstitPJKey]
+ rcJetRecAlg = getJetAlgorithm(rcJetsFullName, rcJetDef, rcPJs, rcModList, monTool)
+
+ recoSeq += conf2toConfigurable( rcJetRecAlg )
+
+ sequenceOut = recordable(rcJetsFullName)
+ jetDef = rcJetDef
+ return recoSeq, sequenceOut, jetDef
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/MET/AlgConfigs.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/MET/AlgConfigs.py
index 7a4936428fd..0d8ee40c27a 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/MET/AlgConfigs.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/MET/AlgConfigs.py
@@ -8,6 +8,8 @@ from ..Menu.SignatureDicts import METChainParts
import GaudiKernel.SystemOfUnits as Units
import TrigEFMissingET.PUClassification as PUClassification
+from AthenaConfiguration.AllConfigFlags import ConfigFlags
+
from AthenaCommon.Logging import logging
log = logging.getLogger(__name__)
@@ -121,8 +123,8 @@ class MHTConfig(AlgConfig):
# TODO - right now jet calibration is hardcoded to EM
jetRecoDict["calib"] = "em"
jetRecoDict["jetCalib"] = "subjes"
- jetSeq, jetName = RecoFragmentsPool.retrieve(
- jetRecoSequence, None, dataSource="data", **jetRecoDict
+ jetSeq, jetName, jetDef = RecoFragmentsPool.retrieve(
+ jetRecoSequence, ConfigFlags, **jetRecoDict
)
self.inputs = [jetSeq]
@@ -142,8 +144,8 @@ class TrkMHTConfig(AlgConfig):
jetRecoDict = jetRecoDictForMET(trkopt="ftf", **recoDict)
# TODO - right now jet calibration is hardcoded to EM
jetRecoDict["calib"] = "em"
- jetSeq, jetName = RecoFragmentsPool.retrieve(
- jetRecoSequence, None, dataSource="data", **jetRecoDict
+ jetSeq, jetName, jetDef = RecoFragmentsPool.retrieve(
+ jetRecoSequence, ConfigFlags, **jetRecoDict
)
# These are the names set by the upstream algorithms. Unfortunately
@@ -281,8 +283,8 @@ class MHTPufitConfig(AlgConfig):
# If this is PFlow then set the calib type to "em"
if recoDict["jetDataType"] == "pf":
jetRecoDict["calib"] = "em"
- jetSeq, jetName = RecoFragmentsPool.retrieve(
- jetRecoSequence, flags=None, dataSource="data", **jetRecoDict
+ jetSeq, jetName, jetDef = RecoFragmentsPool.retrieve(
+ jetRecoSequence, flags=ConfigFlags, **jetRecoDict
)
# We need to get the input name that the jet sequence used
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/LS2_v1.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/LS2_v1.py
index 292ef2aad3e..ffd4855a3ee 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/LS2_v1.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/LS2_v1.py
@@ -191,33 +191,43 @@ def setupMenu():
ChainProp(name='HLT_j85_L1J20', groups=SingleJetGroup),
ChainProp(name='HLT_j45_L1J15', groups=SingleJetGroup),
ChainProp(name='HLT_j420_L1J20', groups=SingleJetGroup),
- ChainProp(name='HLT_j45_ftf_subjesgscIS_L1J15', groups=SingleJetGroup),
- ChainProp(name='HLT_j45_ftf_subresjesgscIS_L1J15', groups=SingleJetGroup),
- ChainProp(name='HLT_j45_ftf_subjesgscIS_011jvt_L1J15', groups=SingleJetGroup),
- ChainProp(name='HLT_j45_ftf_subjesgscIS_015jvt_L1J15', groups=SingleJetGroup),
- ChainProp(name='HLT_j45_ftf_subjesgscIS_059jvt_L1J15', groups=SingleJetGroup),
+ ChainProp(name='HLT_j45_subjesgscIS_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),
ChainProp(name='HLT_j45_ftf_L1J15', groups=SingleJetGroup),
ChainProp(name='HLT_j85_ftf_L1J20', groups=SingleJetGroup),
- ChainProp(name='HLT_j45_ftf_pf_L1J20', groups=SingleJetGroup),
- ChainProp(name='HLT_j45_ftf_subjesgscIS_pf_L1J20', groups=SingleJetGroup),
- ChainProp(name='HLT_j45_ftf_subresjesgscIS_pf_L1J20', groups=SingleJetGroup),
- ChainProp(name='HLT_j85_ftf_pf_L1J20', groups=SingleJetGroup),
+ 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_j420_ftf_subjesgscIS_L1J20', groups=SingleJetGroup),
+ ChainProp(name='HLT_j420_subjesgscIS_ftf_L1J20', groups=SingleJetGroup),
ChainProp(name='HLT_j45_nojcalib_L1J20', groups=SingleJetGroup),
ChainProp(name='HLT_j45_sktc_nojcalib_L1J20', groups=SingleJetGroup),
ChainProp(name='HLT_j45_cssktc_nojcalib_L1J20', groups=SingleJetGroup),
- ChainProp(name='HLT_j45_ftf_pf_nojcalib_L1J20', groups=SingleJetGroup),
- ChainProp(name='HLT_j45_ftf_csskpf_nojcalib_L1J20', groups=SingleJetGroup),
+ ChainProp(name='HLT_j45_pf_nojcalib_ftf_L1J20', groups=SingleJetGroup),
+ ChainProp(name='HLT_j45_csskpf_nojcalib_ftf_L1J20', groups=SingleJetGroup),
ChainProp(name='HLT_j260_320eta490_L1J20', groups=SingleJetGroup),
ChainProp(name='HLT_j460_a10_lcw_subjes_L1J20', groups=SingleJetGroup),
ChainProp(name='HLT_j460_a10r_L1J20', groups=SingleJetGroup),
+ ChainProp(name='HLT_j460_a10t_lcw_nojcalib_L1J100', groups=SingleJetGroup),
+ ChainProp(name='HLT_j460_a10t_lcw_nojcalib_35smcINF_L1J100', groups=SingleJetGroup),
+ ChainProp(name='HLT_2j330_a10t_lcw_nojcalib_35smcINF_L1J100', groups=SingleJetGroup),
ChainProp(name='HLT_j460_a10sd_lcw_nojcalib_L1J100', groups=SingleJetGroup),
+ ChainProp(name='HLT_j460_a10sd_pf_nojcalib_ftf_L1J100', groups=SingleJetGroup),
+ ChainProp(name='HLT_j460_a10sd_csskpf_nojcalib_ftf_L1J100', groups=SingleJetGroup),
+ ChainProp(name='HLT_j460_a10sd_csskpf_nojcalib_ftf_35smcINF_L1J100', groups=SingleJetGroup),
+ ChainProp(name='HLT_2j330_a10sd_csskpf_nojcalib_ftf_35smcINF_L1J100', groups=SingleJetGroup),
+ ChainProp(name='HLT_j460_a10sd_csskpf_jes_ftf_L1J100', groups=SingleJetGroup),
+ ChainProp(name='HLT_j460_a10sd_csskpf_jes_ftf_35smcINF_L1J100', groups=SingleJetGroup),
+ ChainProp(name='HLT_2j330_a10sd_csskpf_jes_ftf_35smcINF_L1J100', groups=SingleJetGroup),
ChainProp(name='HLT_3j200_L1J20', groups=MultiJetGroup),
ChainProp(name='HLT_j0_vbenfSEP30etSEP34mass35SEP50fbet_L1J20', groups=SingleJetGroup),
@@ -227,9 +237,9 @@ def setupMenu():
]
TriggerFlags.BjetSlice.signatures = TriggerFlags.BjetSlice.signatures() + [
- ChainProp(name="HLT_j45_ftf_subjesgscIS_boffperf_split_L1J20", groups=SingleBjetGroup),
- ChainProp(name="HLT_j275_ftf_subjesgscIS_boffperf_split_L1J100", groups=SingleBjetGroup),
- ChainProp(name="HLT_j45_ftf_subjesgscIS_bmv2c1070_split_L1J20", groups=SingleBjetGroup),
+ ChainProp(name="HLT_j45_subjesgscIS_ftf_boffperf_split_L1J20", groups=SingleBjetGroup),
+ ChainProp(name="HLT_j275_subjesgscIS_ftf_boffperf_split_L1J100", groups=SingleBjetGroup),
+ ChainProp(name="HLT_j45_subjesgscIS_ftf_bmv2c1070_split_L1J20", groups=SingleBjetGroup),
]
TriggerFlags.TauSlice.signatures = TriggerFlags.TauSlice.signatures() + [
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/Physics_pp_run3_v1.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/Physics_pp_run3_v1.py
index f084522a0b3..f00186c181c 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/Physics_pp_run3_v1.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/Physics_pp_run3_v1.py
@@ -106,10 +106,10 @@ def setupMenu():
]
TriggerFlags.BjetSlice.signatures = [
- ChainProp(name="HLT_j225_ftf_subjesgscIS_bmv2c1040_split_L1J100", groups=SingleBjetGroup),
- ChainProp(name="HLT_j275_ftf_subjesgscIS_bmv2c1060_split_L1J100", groups=SingleBjetGroup),
- ChainProp(name="HLT_j300_ftf_subjesgscIS_bmv2c1070_split_L1J100", groups=SingleBjetGroup),
- ChainProp(name="HLT_j360_ftf_subjesgscIS_bmv2c1077_split_L1J100", groups=SingleBjetGroup),
+ ChainProp(name="HLT_j225_subjesgscIS_ftf_bmv2c1040_split_L1J100", groups=SingleBjetGroup),
+ ChainProp(name="HLT_j275_subjesgscIS_ftf_bmv2c1060_split_L1J100", groups=SingleBjetGroup),
+ ChainProp(name="HLT_j300_subjesgscIS_ftf_bmv2c1070_split_L1J100", groups=SingleBjetGroup),
+ ChainProp(name="HLT_j360_subjesgscIS_ftf_bmv2c1077_split_L1J100", groups=SingleBjetGroup),
]
TriggerFlags.TauSlice.signatures = [
--
GitLab