From 35658d5d406f16db72ebb0f15f5a197b1145bba0 Mon Sep 17 00:00:00 2001
From: Carlo Varni <cvarni@pc-tbed-pub-30.cern.ch>
Date: Wed, 20 Nov 2019 11:23:37 +0100
Subject: [PATCH 1/2] Removing split from b-jet chain names
---
.../TrigBjetHypo/python/TrigBjetEtHypoTool.py | 6 -----
.../TrigBjetHypo/python/TrigBjetHypoTool.py | 11 ++-------
.../TrigUpgradeTest/share/full_menu_build.ref | 24 +++++++++----------
.../TrigUpgradeTest/share/full_menu_cf.py | 5 ++--
.../TrigUpgradeTest/share/slice_bjet.ref | 24 +++++++++----------
.../HLTMenuConfig/Bjet/BjetSequenceSetup.py | 2 +-
.../python/HLTMenuConfig/Menu/LS2_v1.py | 4 ++--
.../HLTMenuConfig/Menu/Physics_pp_run3_v1.py | 8 +++----
.../HLTMenuConfig/Menu/SignatureDicts.py | 2 +-
9 files changed, 36 insertions(+), 50 deletions(-)
diff --git a/Trigger/TrigHypothesis/TrigBjetHypo/python/TrigBjetEtHypoTool.py b/Trigger/TrigHypothesis/TrigBjetHypo/python/TrigBjetEtHypoTool.py
index ad26617854b5..886f06cf15d1 100644
--- a/Trigger/TrigHypothesis/TrigBjetHypo/python/TrigBjetEtHypoTool.py
+++ b/Trigger/TrigHypothesis/TrigBjetHypo/python/TrigBjetEtHypoTool.py
@@ -101,15 +101,9 @@ if __name__ == "__main__":
from TriggerJobOpts.TriggerFlags import TriggerFlags
TriggerFlags.enableMonitoring=['Validation']
- t = TrigBjetEtHypoToolFromName_gsc( "HLT_j35_gsc45_boffperf_split","HLT_j35_gsc45_boffperf_split" )
- assert t, "can't configure gsc boffperf split"
-
t = TrigBjetEtHypoToolFromName_gsc( "HLT_j35_gsc45_boffperf","HLT_j35_gsc45_boffperf" )
assert t, "can't configure gsc boffperf"
- t = TrigBjetEtHypoToolFromName_j( "HLT_j35_boffperf_split","HLT_j35_boffperf_split" )
- assert t, "can't configure boffperf split"
-
t = TrigBjetEtHypoToolFromName_j( "HLT_j35_boffperf","HLT_j35_boffperf" )
assert t, "can't configure boffperf"
diff --git a/Trigger/TrigHypothesis/TrigBjetHypo/python/TrigBjetHypoTool.py b/Trigger/TrigHypothesis/TrigBjetHypo/python/TrigBjetHypoTool.py
index 05c71bcbcf22..267c060880af 100644
--- a/Trigger/TrigHypothesis/TrigBjetHypo/python/TrigBjetHypoTool.py
+++ b/Trigger/TrigHypothesis/TrigBjetHypo/python/TrigBjetHypoTool.py
@@ -39,7 +39,6 @@ def TrigBjetHypoToolFromDict( chainDict ):
chainPart = chainDict['chainParts'][0]
conf_dict = { 'threshold' : chainPart['threshold'],
'multiplicity' : '1' if len(chainPart['multiplicity']) == 0 else chainPart['multiplicity'],
- 'gscThreshold' : '0' if 'gscThreshold' not in chainPart else chainPart['gscThreshold'].replace('gsc',''),
'bTag' : chainPart['bTag'][1:],
'bConfig' : 'EF' if len(chainPart['bConfig']) == 0 else chainPart['bConfig'][0],
'minEta' : chainPart['etaRange'].split('eta')[0],
@@ -115,16 +114,10 @@ if __name__ == "__main__":
from TriggerJobOpts.TriggerFlags import TriggerFlags
TriggerFlags.enableMonitoring=['Validation']
- t = TrigBjetHypoToolFromName( "HLT_j35_gsc45_boffperf_split_L1J20","HLT_j35_gsc45_boffperf_split_L1J20" )
- assert t, "can't configure gsc boffperf split"
-
- t = TrigBjetHypoToolFromName( "HLT_j35_gsc45_boffperf_L1J20","HLT_j35_gsc45_boffperf_L1J20" )
+ t = TrigBjetHypoToolFromName( "HLT_j35_ftf_subjesgscIS_boffperf_L1J20","HLT_j35_ftf_subjesgscIS_boffperf_L1J20" )
assert t, "can't configure gsc boffperf"
- t = TrigBjetHypoToolFromName( "HLT_j35_boffperf_split_L1J20","HLT_j35_boffperf_split_L1J20" )
- assert t, "can't configure boffperf split"
-
- t = TrigBjetHypoToolFromName( "HLT_j35_boffperf_L1J20","HLT_j35_boffperf_L1J20" )
+ t = TrigBjetHypoToolFromName( "HLT_j35_ftf_subjesgscIS_boffperf_L1J20","HLT_j35_ftf_subjesgscIS_boffperf_L1J20" )
assert t, "can't configure boffperf"
log.info( "\n\n TrigBjetHypoToolFromName ALL OK\n\n" )
diff --git a/Trigger/TrigValidation/TrigUpgradeTest/share/full_menu_build.ref b/Trigger/TrigValidation/TrigUpgradeTest/share/full_menu_build.ref
index fc41dfb568e3..0225d4830059 100644
--- a/Trigger/TrigValidation/TrigUpgradeTest/share/full_menu_build.ref
+++ b/Trigger/TrigValidation/TrigUpgradeTest/share/full_menu_build.ref
@@ -66,18 +66,18 @@ TrigSignatureMoniMT INFO HLT_g5_tight_L1EM3
TrigSignatureMoniMT INFO HLT_g5_tight_L1EM3 decisions 20 20 37 0 0 0
TrigSignatureMoniMT INFO HLT_j0_vbenfSEP30etSEP34mass35SEP50fbet_L1J2020 20 1 0 0 0 0 0 1
TrigSignatureMoniMT INFO HLT_j0_vbenfSEP30etSEP34mass35SEP50fbet_L1J20 decisions 2 0 0 0 0 0
-TrigSignatureMoniMT INFO HLT_j225_ftf_subjesgscIS_bmv2c1040_split_L1J10020 20 0 0 0 0 0 0 0
-TrigSignatureMoniMT INFO HLT_j225_ftf_subjesgscIS_bmv2c1040_split_L1J100 decisions 0 0 0 0 0 0
+TrigSignatureMoniMT INFO HLT_j225_ftf_subjesgscIS_bmv2c1040_L1J10020 20 0 0 0 0 0 0 0
+TrigSignatureMoniMT INFO HLT_j225_ftf_subjesgscIS_bmv2c1040_L1J100 decisions 0 0 0 0 0 0
TrigSignatureMoniMT INFO HLT_j260_320eta490_L1J20 20 20 0 0 0 0 0 0 0
TrigSignatureMoniMT INFO HLT_j260_320eta490_L1J20 decisions 0 0 0 0 0 0
TrigSignatureMoniMT INFO HLT_j260_320eta490_L1J75_31ETA4920 20 0 0 0 0 0 0 0
TrigSignatureMoniMT INFO HLT_j260_320eta490_L1J75_31ETA49 decisions 0 0 0 0 0 0
-TrigSignatureMoniMT INFO HLT_j275_ftf_subjesgscIS_bmv2c1060_split_L1J10020 20 0 0 0 0 0 0 0
-TrigSignatureMoniMT INFO HLT_j275_ftf_subjesgscIS_bmv2c1060_split_L1J100 decisions 0 0 0 0 0 0
-TrigSignatureMoniMT INFO HLT_j300_ftf_subjesgscIS_bmv2c1070_split_L1J10020 20 0 0 0 0 0 0 0
-TrigSignatureMoniMT INFO HLT_j300_ftf_subjesgscIS_bmv2c1070_split_L1J100 decisions 0 0 0 0 0 0
-TrigSignatureMoniMT INFO HLT_j360_ftf_subjesgscIS_bmv2c1077_split_L1J10020 20 0 0 0 0 0 0 0
-TrigSignatureMoniMT INFO HLT_j360_ftf_subjesgscIS_bmv2c1077_split_L1J100 decisions 0 0 0 0 0 0
+TrigSignatureMoniMT INFO HLT_j275_ftf_subjesgscIS_bmv2c1060_L1J10020 20 0 0 0 0 0 0 0
+TrigSignatureMoniMT INFO HLT_j275_ftf_subjesgscIS_bmv2c1060_L1J100 decisions 0 0 0 0 0 0
+TrigSignatureMoniMT INFO HLT_j300_ftf_subjesgscIS_bmv2c1070_L1J10020 20 0 0 0 0 0 0 0
+TrigSignatureMoniMT INFO HLT_j300_ftf_subjesgscIS_bmv2c1070_L1J100 decisions 0 0 0 0 0 0
+TrigSignatureMoniMT INFO HLT_j360_ftf_subjesgscIS_bmv2c1077_L1J10020 20 0 0 0 0 0 0 0
+TrigSignatureMoniMT INFO HLT_j360_ftf_subjesgscIS_bmv2c1077_L1J100 decisions 0 0 0 0 0 0
TrigSignatureMoniMT INFO HLT_j420_L1J100 20 20 0 0 0 0 0 0 0
TrigSignatureMoniMT INFO HLT_j420_L1J100 decisions 0 0 0 0 0 0
TrigSignatureMoniMT INFO HLT_j420_L1J20 20 20 0 0 0 0 0 0 0
@@ -90,10 +90,10 @@ TrigSignatureMoniMT INFO HLT_j45_ftf_L1J15
TrigSignatureMoniMT INFO HLT_j45_ftf_L1J15 decisions 5 0 0 0 0 0
TrigSignatureMoniMT INFO HLT_j45_ftf_subjesgscIS_L1J15 20 20 5 0 0 0 0 0 5
TrigSignatureMoniMT INFO HLT_j45_ftf_subjesgscIS_L1J15 decisions 5 0 0 0 0 0
-TrigSignatureMoniMT INFO HLT_j45_ftf_subjesgscIS_bmv2c1070_split_L1J2020 20 5 5 5 5 0 0 5
-TrigSignatureMoniMT INFO HLT_j45_ftf_subjesgscIS_bmv2c1070_split_L1J20 decisions 5 5 5 5 0 0
-TrigSignatureMoniMT INFO HLT_j45_ftf_subjesgscIS_boffperf_split_L1J2020 20 5 5 5 5 0 0 5
-TrigSignatureMoniMT INFO HLT_j45_ftf_subjesgscIS_boffperf_split_L1J20 decisions 5 5 5 5 0 0
+TrigSignatureMoniMT INFO HLT_j45_ftf_subjesgscIS_bmv2c1070_L1J2020 20 5 5 5 5 0 0 5
+TrigSignatureMoniMT INFO HLT_j45_ftf_subjesgscIS_bmv2c1070_L1J20 decisions 5 5 5 5 0 0
+TrigSignatureMoniMT INFO HLT_j45_ftf_subjesgscIS_boffperf_L1J2020 20 5 5 5 5 0 0 5
+TrigSignatureMoniMT INFO HLT_j45_ftf_subjesgscIS_boffperf_L1J20 decisions 5 5 5 5 0 0
TrigSignatureMoniMT INFO HLT_j460_a10_lcw_subjes_L1J10020 20 0 0 0 0 0 0 0
TrigSignatureMoniMT INFO HLT_j460_a10_lcw_subjes_L1J100 decisions 0 0 0 0 0 0
TrigSignatureMoniMT INFO HLT_j460_a10_lcw_subjes_L1J20 20 20 0 0 0 0 0 0 0
diff --git a/Trigger/TrigValidation/TrigUpgradeTest/share/full_menu_cf.py b/Trigger/TrigValidation/TrigUpgradeTest/share/full_menu_cf.py
index 4e78cdcd2390..58432ac88067 100644
--- a/Trigger/TrigValidation/TrigUpgradeTest/share/full_menu_cf.py
+++ b/Trigger/TrigValidation/TrigUpgradeTest/share/full_menu_cf.py
@@ -175,9 +175,8 @@ if opt.doBjetSlice == True:
step2 = ChainStep("Step2_bjet", [getBJetSequence('gsc')])
bjetChains = [
- makeChain(name='HLT_j45_ftf_subjesgscIS_boffperf_split_L1J20' , L1Thresholds=["J20"], ChainSteps=[step1,step2] ),
- makeChain(name='HLT_j45_ftf_subjesgscIS_bmv2c1070_split_L1J20', L1Thresholds=["J20"], ChainSteps=[step1,step2] ),
- makeChain(name='HLT_j45_ftf_subjesgscIS_bmv2c1070_L1J20' , L1Thresholds=["J20"], ChainSteps=[step1,step2] )
+ makeChain(name='HLT_j45_ftf_subjesgscIS_boffperf_L1J20' , L1Thresholds=["J20"], ChainSteps=[step1,step2] ),
+ makeChain(name='HLT_j45_ftf_subjesgscIS_bmv2c1070_L1J20', L1Thresholds=["J20"], ChainSteps=[step1,step2] ),
]
testChains += bjetChains
diff --git a/Trigger/TrigValidation/TrigUpgradeTest/share/slice_bjet.ref b/Trigger/TrigValidation/TrigUpgradeTest/share/slice_bjet.ref
index 733267b3460c..e7424c346122 100644
--- a/Trigger/TrigValidation/TrigUpgradeTest/share/slice_bjet.ref
+++ b/Trigger/TrigValidation/TrigUpgradeTest/share/slice_bjet.ref
@@ -1,12 +1,12 @@
-TrigSignatureMoniMT INFO HLT_j175_ftf_gsc225_bmv2c1040_split_L1J100100 100 0 0 0 0 0
-TrigSignatureMoniMT INFO HLT_j175_ftf_gsc225_bmv2c1040_split_L1J100 decisions 0 0 0 0
-TrigSignatureMoniMT INFO HLT_j225_ftf_gsc275_bmv2c1060_split_L1J100100 100 0 0 0 0 0
-TrigSignatureMoniMT INFO HLT_j225_ftf_gsc275_bmv2c1060_split_L1J100 decisions 0 0 0 0
-TrigSignatureMoniMT INFO HLT_j225_ftf_gsc300_bmv2c1070_split_L1J100100 100 0 0 0 0 0
-TrigSignatureMoniMT INFO HLT_j225_ftf_gsc300_bmv2c1070_split_L1J100 decisions 0 0 0 0
-TrigSignatureMoniMT INFO HLT_j225_ftf_gsc360_bmv2c1077_split_L1J100100 100 0 0 0 0 0
-TrigSignatureMoniMT INFO HLT_j225_ftf_gsc360_bmv2c1077_split_L1J100 decisions 0 0 0 0
-TrigSignatureMoniMT INFO HLT_j35_ftf_gsc45_bmv2c1070_split_L1J20100 100 35 35 31 31 31
-TrigSignatureMoniMT INFO HLT_j35_ftf_gsc45_bmv2c1070_split_L1J20 decisions 35 90 57 57
-TrigSignatureMoniMT INFO HLT_j35_ftf_gsc45_boffperf_split_L1J20100 100 35 35 31 31 31
-TrigSignatureMoniMT INFO HLT_j35_ftf_gsc45_boffperf_split_L1J20 decisions 35 90 57 57
+TrigSignatureMoniMT INFO HLT_j225_ftf_subjesgscIS_bmv2c1040_L1J100100 100 0 0 0 0 0
+TrigSignatureMoniMT INFO HLT_j225_ftf_subjesgscIS_bmv2c1040_L1J100 decisions 0 0 0 0
+TrigSignatureMoniMT INFO HLT_j275_ftf_subjesgscIS_bmv2c1060_L1J100100 100 0 0 0 0 0
+TrigSignatureMoniMT INFO HLT_j275_ftf_subjesgscIS_bmv2c1060_L1J100 decisions 0 0 0 0
+TrigSignatureMoniMT INFO HLT_j300_ftf_subjesgscIS_bmv2c1070_L1J100100 100 0 0 0 0 0
+TrigSignatureMoniMT INFO HLT_j300_ftf_subjesgscIS_bmv2c1070_L1J100 decisions 0 0 0 0
+TrigSignatureMoniMT INFO HLT_j360_ftf_subjesgscIS_bmv2c1077_L1J100100 100 0 0 0 0 0
+TrigSignatureMoniMT INFO HLT_j360_ftf_subjesgscIS_bmv2c1077_L1J100 decisions 0 0 0 0
+TrigSignatureMoniMT INFO HLT_j45_ftf_subjesgscIS_bmv2c1070_L1J20100 100 30 30 30 30 30
+TrigSignatureMoniMT INFO HLT_j45_ftf_subjesgscIS_bmv2c1070_L1J20 decisions 30 59 59 59
+TrigSignatureMoniMT INFO HLT_j45_ftf_subjesgscIS_boffperf_L1J20100 100 30 30 30 30 30
+TrigSignatureMoniMT INFO HLT_j45_ftf_subjesgscIS_boffperf_L1J20 decisions 30 59 59 59
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Bjet/BjetSequenceSetup.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Bjet/BjetSequenceSetup.py
index 903c4b9af522..0eb3bb9cb753 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Bjet/BjetSequenceSetup.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Bjet/BjetSequenceSetup.py
@@ -31,7 +31,7 @@ def getBJetSequence( step ):
# ====================================================================================================
def bJetStep1Sequence():
- jetsKey = "HLT_AntiKt4EMTopoJets_subjesIS_ftf"
+ jetsKey = "HLT_AntiKt4EMTopoJets_subjesgscIS_ftf"
prmVtxKey = "HLT_EFHistoPrmVtx"
from DecisionHandling.DecisionHandlingConf import InputMakerForRoI
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/LS2_v1.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/LS2_v1.py
index 6f044a8271ab..75464f63668c 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/LS2_v1.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/LS2_v1.py
@@ -108,8 +108,8 @@ def setupMenu():
]
TriggerFlags.BjetSlice.signatures = TriggerFlags.BjetSlice.signatures() + [
- ChainProp(name="HLT_j45_ftf_subjesgscIS_boffperf_split_L1J20", groups=SingleBjetGroup),
- ChainProp(name="HLT_j45_ftf_subjesgscIS_bmv2c1070_split_L1J20", groups=SingleBjetGroup),
+ ChainProp(name="HLT_j45_ftf_subjesgscIS_boffperf_L1J20", groups=SingleBjetGroup),
+ ChainProp(name="HLT_j45_ftf_subjesgscIS_bmv2c1070_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 a056b5ce6269..70e8f8cfb15f 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
@@ -84,10 +84,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_ftf_subjesgscIS_bmv2c1040_L1J100", groups=SingleBjetGroup),
+ ChainProp(name="HLT_j275_ftf_subjesgscIS_bmv2c1060_L1J100", groups=SingleBjetGroup),
+ ChainProp(name="HLT_j300_ftf_subjesgscIS_bmv2c1070_L1J100", groups=SingleBjetGroup),
+ ChainProp(name="HLT_j360_ftf_subjesgscIS_bmv2c1077_L1J100", groups=SingleBjetGroup),
]
TriggerFlags.TauSlice.signatures = [
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/SignatureDicts.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/SignatureDicts.py
index d5a9d1bcb18b..23e941c63fa4 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/SignatureDicts.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/SignatureDicts.py
@@ -115,7 +115,7 @@ JetChainParts = {
'bmv2c1040' , 'bmv2c1050' , 'bmv2c1060' , 'bmv2c1070' , 'bmv2c1077' , 'bmv2c1085' ,
'bhmv2c1040', 'bhmv2c1050', 'bhmv2c1060', 'bhmv2c1070', 'bhmv2c1077', 'bhmv2c1085'],
'bTracking' : [],
- 'bConfig' : ['split',],
+ 'bConfig' : [],
'bMatching' : ['antimatchdr05mu'],
'trkopt' : ['notrk','ftk','ftkrefit','ftf'],
'hypoScenario' : ['simple', 'vbenf',
--
GitLab
From 73c3bbd3dceddfe5be61bae0174a06292ca8c8f7 Mon Sep 17 00:00:00 2001
From: Carlo Varni <cvarni@pc-tbed-pub-30.cern.ch>
Date: Thu, 21 Nov 2019 10:42:19 +0100
Subject: [PATCH 2/2] Changes to full_menu_cf.py so that b-jets do not break it
---
.../TrigHLTJetHypo/python/chainDict2jetLabel.py | 6 +++++-
.../TrigUpgradeTest/python/jetMenuHelper.py | 11 +++++++++--
.../TrigUpgradeTest/share/full_menu_cf.py | 10 +++++++---
3 files changed, 21 insertions(+), 6 deletions(-)
diff --git a/Trigger/TrigHypothesis/TrigHLTJetHypo/python/chainDict2jetLabel.py b/Trigger/TrigHypothesis/TrigHLTJetHypo/python/chainDict2jetLabel.py
index 7054bdc971fa..7da009ea2d3d 100644
--- a/Trigger/TrigHypothesis/TrigHLTJetHypo/python/chainDict2jetLabel.py
+++ b/Trigger/TrigHypothesis/TrigHLTJetHypo/python/chainDict2jetLabel.py
@@ -40,6 +40,7 @@ def _make_simple_label(chain_parts):
raise NotImplementedError(msg)
+
label = 'simple(['
for cp in chain_parts:
smcstr = str(cp['smc'])
@@ -57,6 +58,7 @@ def _make_simple_label(chain_parts):
condition_str += ')'
label += condition_str
label += '])'
+
return label
@@ -336,8 +338,10 @@ def chainDict2jetLabel(chain_dict):
cp_sorter = {}
for k in router: cp_sorter[k] = []
+
for cp in chain_dict['chainParts']:
- if cp['signature'] != 'Jet': continue
+ if cp['signature'] != 'Jet' and cp['signature'] != 'Bjet':
+ continue
for k in cp_sorter:
if cp['hypoScenario'].startswith(k):
cp_sorter[k].append(cp)
diff --git a/Trigger/TrigValidation/TrigUpgradeTest/python/jetMenuHelper.py b/Trigger/TrigValidation/TrigUpgradeTest/python/jetMenuHelper.py
index f3811e6315e9..6b3eb4b7d06b 100644
--- a/Trigger/TrigValidation/TrigUpgradeTest/python/jetMenuHelper.py
+++ b/Trigger/TrigValidation/TrigUpgradeTest/python/jetMenuHelper.py
@@ -13,7 +13,13 @@ def jetDictFromString(jet_def_string):
# Python names are more descriptive. May want to sync
# these names with the SignatureDict, needs coordination with
# menu group when they start to implement this
- jetalg, inputtype, clusterscale, jetcalib = jet_def_string.split('_')
+
+ trkopt = "notrk"
+ if "_ftf" in jet_def_string:
+ jetalg, inputtype, clusterscale, jetcalib, trkopt = jet_def_string.split('_')
+ else:
+ jetalg, inputtype, clusterscale, jetcalib = jet_def_string.split('_')
+
jetRecoDict = {
"recoAlg": jetalg,
"dataType": inputtype,
@@ -24,8 +30,9 @@ def jetDictFromString(jet_def_string):
# take the defaults from SignatureDicts for most
# purposes, but this can wait until the needs of clients
# are more clear.
- "trkopt" : "notrk"
+ "trkopt" : trkopt
}
+
return jetRecoDict
def jetCFSequenceFromString(jet_def_string):
diff --git a/Trigger/TrigValidation/TrigUpgradeTest/share/full_menu_cf.py b/Trigger/TrigValidation/TrigUpgradeTest/share/full_menu_cf.py
index 58432ac88067..3e8af11aaafe 100644
--- a/Trigger/TrigValidation/TrigUpgradeTest/share/full_menu_cf.py
+++ b/Trigger/TrigValidation/TrigUpgradeTest/share/full_menu_cf.py
@@ -169,14 +169,18 @@ if opt.doJetSlice == True:
# bjet chains
##################################################################
if opt.doBjetSlice == True:
+ from TrigUpgradeTest.jetMenuHelper import jetMenuSequenceFromString
from TriggerMenuMT.HLTMenuConfig.Bjet.BjetSequenceSetup import getBJetSequence
+ jetSequence = jetMenuSequenceFromString("a4_tc_em_subjesgscIS_ftf")
+
+ step0 = ChainStep("Step0_bjet", [jetSequence] )
step1 = ChainStep("Step1_bjet", [getBJetSequence('j')])
step2 = ChainStep("Step2_bjet", [getBJetSequence('gsc')])
- bjetChains = [
- makeChain(name='HLT_j45_ftf_subjesgscIS_boffperf_L1J20' , L1Thresholds=["J20"], ChainSteps=[step1,step2] ),
- makeChain(name='HLT_j45_ftf_subjesgscIS_bmv2c1070_L1J20', L1Thresholds=["J20"], ChainSteps=[step1,step2] ),
+ bjetChains = [
+ makeChain(name='HLT_j45_ftf_subjesgscIS_boffperf_L1J20' , L1Thresholds=["J20"], ChainSteps=[step0,step1,step2] ),
+ makeChain(name='HLT_j45_ftf_subjesgscIS_bmv2c1070_L1J20', L1Thresholds=["J20"], ChainSteps=[step0,step1,step2] ),
]
testChains += bjetChains
--
GitLab