diff --git a/Trigger/TrigHypothesis/TrigBjetHypo/CMakeLists.txt b/Trigger/TrigHypothesis/TrigBjetHypo/CMakeLists.txt
index f27f7ab4eb2bd904a4c647fa1f1f86ebc56a1248..4bc31289818b7b3a5d99b01d3c11ec9877baa72c 100644
--- a/Trigger/TrigHypothesis/TrigBjetHypo/CMakeLists.txt
+++ b/Trigger/TrigHypothesis/TrigBjetHypo/CMakeLists.txt
@@ -57,7 +57,7 @@ atlas_install_headers( TrigBjetHypo )
atlas_install_python_modules( python/*.py )
# Unit tests:
-atlas_add_test( TrigBjetHypoTool SCRIPT python -m TrigBjetHypo.TrigBjetHypoTool
+atlas_add_test( TrigBjetBtagHypoTool SCRIPT python -m TrigBjetHypo.TrigBjetBtagHypoTool
PROPERTIES TIMEOUT 300
POST_EXEC_SCRIPT nopost.sh )
diff --git a/Trigger/TrigHypothesis/TrigBjetHypo/python/TrigBjetHypoTool.py b/Trigger/TrigHypothesis/TrigBjetHypo/python/TrigBjetBtagHypoTool.py
similarity index 80%
rename from Trigger/TrigHypothesis/TrigBjetHypo/python/TrigBjetHypoTool.py
rename to Trigger/TrigHypothesis/TrigBjetHypo/python/TrigBjetBtagHypoTool.py
index 05c71bcbcf22c71036d3a33a5f07c3e93ed25166..91b4c5d824f962c35dd4116763e6033a0782ce70 100644
--- a/Trigger/TrigHypothesis/TrigBjetHypo/python/TrigBjetHypoTool.py
+++ b/Trigger/TrigHypothesis/TrigBjetHypo/python/TrigBjetBtagHypoTool.py
@@ -5,7 +5,7 @@ re_Bjet = re.compile(r'^HLT_(?P<multiplicity>\d+)?j(?P<threshold>\d+)(?:_gsc(?P<
from AthenaCommon.Logging import logging
-log = logging.getLogger('TrigBjetHypoTool')
+log = logging.getLogger('TrigBjetBtagHypoTool')
####################################################################################################
@@ -34,7 +34,7 @@ bTaggingWP = {
}
####################################################################################################
-def TrigBjetHypoToolFromDict( chainDict ):
+def TrigBjetBtagHypoToolFromDict( chainDict ):
chainPart = chainDict['chainParts'][0]
conf_dict = { 'threshold' : chainPart['threshold'],
@@ -46,19 +46,19 @@ def TrigBjetHypoToolFromDict( chainDict ):
'maxEta' : chainPart['etaRange'].split('eta')[1]}
name = chainDict['chainName']
# TODO the chain dict can be probably passed over down the line here
- tool = getBjetHypoConfiguration( name,conf_dict )
+ tool = getBjetBtagHypoConfiguration( name,conf_dict )
log.debug("name = %s, tagger = %s, threshold = %s ", name, tool.MethodTag, tool.BTaggingCut)
return tool
-def TrigBjetHypoToolFromName( name, conf ):
+def TrigBjetBtagHypoToolFromName( name, conf ):
""" Configure a b-jet hypo tool from chain name. """
from TriggerMenuMT.HLTMenuConfig.Menu.DictFromChainName import dictFromChainName
decodedDict = dictFromChainName( conf )
decodedDict['chainName'] = name # override
- return TrigBjetHypoToolFromDict( decodedDict )
+ return TrigBjetBtagHypoToolFromDict( decodedDict )
####################################################################################################
@@ -66,7 +66,7 @@ def TrigBjetHypoToolFromName( name, conf ):
def decodeThreshold( threshold_btag ):
""" decodes the b-tagging thresholds """
- log.debug("TrigBjetHypoToolFromName: decoding threshold b%s", threshold_btag)
+ log.debug("TrigBjetBtagHypoToolFromName: decoding threshold b%s", threshold_btag)
tagger = "MV2c10"
if "mv2c20" in threshold_btag :
@@ -79,7 +79,7 @@ def decodeThreshold( threshold_btag ):
####################################################################################################
-def getBjetHypoConfiguration( name,conf_dict ):
+def getBjetBtagHypoConfiguration( name,conf_dict ):
# Common for both split and non-split configurations
from TrigBjetHypo.TrigBjetHypoConf import TrigBjetBtagHypoTool
tool = TrigBjetBtagHypoTool( name )
@@ -115,16 +115,7 @@ 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" )
- assert t, "can't configure gsc boffperf"
-
- t = TrigBjetHypoToolFromName( "HLT_j35_boffperf_split_L1J20","HLT_j35_boffperf_split_L1J20" )
+ t = TrigBjetBtagHypoToolFromName( "HLT_j45_ftf_subjesgscIS_boffperf_split_L1J20","HLT_j45_ftf_subjesgscIS_boffperf_split_L1J20" )
assert t, "can't configure boffperf split"
- t = TrigBjetHypoToolFromName( "HLT_j35_boffperf_L1J20","HLT_j35_boffperf_L1J20" )
- assert t, "can't configure boffperf"
-
- log.info( "\n\n TrigBjetHypoToolFromName ALL OK\n\n" )
+ log.info( "\n\n TrigBjetBtagHypoToolFromName ALL OK\n\n" )
diff --git a/Trigger/TrigHypothesis/TrigBjetHypo/python/TrigBjetEtHypoTool.py b/Trigger/TrigHypothesis/TrigBjetHypo/python/TrigBjetEtHypoTool.py
index ad26617854b5d4a1a7c33a468f378bb3801e9710..0bf8cdf68464cf98e82515cd3c4f0593f1578c6c 100644
--- a/Trigger/TrigHypothesis/TrigBjetHypo/python/TrigBjetEtHypoTool.py
+++ b/Trigger/TrigHypothesis/TrigBjetHypo/python/TrigBjetEtHypoTool.py
@@ -10,7 +10,7 @@ log = logging.getLogger('TrigBjetEtHypoTool')
####################################################################################################
-def TrigBjetEtHypoToolFromDict_j( chainDict ):
+def TrigBjetEtHypoToolFromDict( chainDict ):
""" set the name of the EtHypoTool (name=chain) and figure out the threshold and selection from conf """
name = chainDict['chainName']
@@ -18,7 +18,6 @@ def TrigBjetEtHypoToolFromDict_j( chainDict ):
conf_dict = { 'threshold' : chainPart['threshold'],
'multiplicity' : '1',
- 'gscThreshold' : '0',
'bTag' : 'offperf',
'bConfig' : 'EF',
'minEta' : chainPart['etaRange'].split('eta')[0],
@@ -43,57 +42,13 @@ def TrigBjetEtHypoToolFromDict_j( chainDict ):
log.debug("name = %s, cut_j = %s ", name, tool.EtThreshold)
return tool
-def TrigBjetEtHypoToolFromName_j( name, conf ):
+def TrigBjetEtHypoToolFromName( name, conf ):
from TriggerMenuMT.HLTMenuConfig.Menu.DictFromChainName import dictFromChainName
decodedDict = dictFromChainName(conf)
decodedDict['chainName'] = name # override
- return TrigBjetEtHypoToolFromDict_j( decodedDict )
-
-
-def TrigBjetEtHypoToolFromDict_gsc( chainDict ):
- """ set the name of the EtHypoTool (name=chain) and figure out the threshold and selection from conf """
-
- name = chainDict['chainName']
- chainPart = chainDict['chainParts'][0]
-
-
- conf_dict = { 'threshold' : '0',
- 'multiplicity' : '1',
- 'gscThreshold' : '0' if 'gscThreshold' not in chainPart else chainPart['gscThreshold'].replace('gsc',''),
- 'bTag' : 'offperf',
- 'bConfig' : 'EF',
- 'minEta' : chainPart['etaRange'].split('eta')[0],
- 'maxEta' : chainPart['etaRange'].split('eta')[1],
- 'L1' : None }
-
- # chain = conf
- # match = re_Bjet.match( chain )
- # conf_dict = match.groupdict()
-
- # for k, v in default_conf.items():
- # if k not in conf_dict: conf_dict[k] = v
- # if conf_dict[k] == None: conf_dict[k] = v
-
- from TrigBjetHypo.TrigBjetHypoConf import TrigBjetEtHypoTool
- tool = TrigBjetEtHypoTool( name )
- tool.AcceptAll = False
- tool.EtThreshold = float(conf_dict['gscThreshold']) * GeV
- tool.MinEtaThreshold = float(conf_dict['minEta']) / 100
- tool.MaxEtaThreshold = float(conf_dict['maxEta']) / 100
-
- log.debug("gsc: name = %s, cut_j = %s ", name, tool.EtThreshold)
- return tool
-
-def TrigBjetEtHypoToolFromName_gsc( name, conf ):
- from TriggerMenuMT.HLTMenuConfig.Menu.DictFromChainName import dictFromChainName
-
- decodedDict = dictFromChainName( conf )
- decodedDict['chainName'] = name # override
-
- return TrigBjetEtHypoToolFromDict_gsc( decodedDict )
-
+ return TrigBjetEtHypoToolFromDict( decodedDict )
####################################################################################################
@@ -101,16 +56,7 @@ 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" )
+ t = TrigBjetEtHypoToolFromName( "HLT_j45_ftf_subjesgscIS_boffperf_split","HLT_j45_ftf_subjesgscIS_boffperf_split" )
assert t, "can't configure boffperf split"
- t = TrigBjetEtHypoToolFromName_j( "HLT_j35_boffperf","HLT_j35_boffperf" )
- assert t, "can't configure boffperf"
-
log.info( "\n\n TrigBjetEtHypoToolFromName ALL OK\n\n" )
diff --git a/Trigger/TrigHypothesis/TrigHLTJetHypo/python/chainDict2jetLabel.py b/Trigger/TrigHypothesis/TrigHLTJetHypo/python/chainDict2jetLabel.py
index 7054bdc971fabbde7c561a6d31faa5c6083c68b4..334eaea87230ba7a73763231fc2b4541226f2cc8 100644
--- a/Trigger/TrigHypothesis/TrigHLTJetHypo/python/chainDict2jetLabel.py
+++ b/Trigger/TrigHypothesis/TrigHLTJetHypo/python/chainDict2jetLabel.py
@@ -337,7 +337,8 @@ def chainDict2jetLabel(chain_dict):
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/TrigAnalysisTest/share/q221_RDOtoRDOTrig_mt1_build.ref b/Trigger/TrigValidation/TrigAnalysisTest/share/q221_RDOtoRDOTrig_mt1_build.ref
index e96f0af15b1b1725e94ccd0ebf632de5d312676c..0fff34ec9054bff3d842eddcdd7f271a2dce2b95 100644
--- a/Trigger/TrigValidation/TrigAnalysisTest/share/q221_RDOtoRDOTrig_mt1_build.ref
+++ b/Trigger/TrigValidation/TrigAnalysisTest/share/q221_RDOtoRDOTrig_mt1_build.ref
@@ -87,9 +87,9 @@ TrigSignatureMoniMT INFO HLT_j45_ftf_L1J15 decisi
TrigSignatureMoniMT INFO HLT_j45_ftf_subjesgscIS_L1J15 20 20 18 0 0 0 0 0 18
TrigSignatureMoniMT INFO HLT_j45_ftf_subjesgscIS_L1J15 decisions 18 0 0 0 0 0
TrigSignatureMoniMT INFO HLT_j45_ftf_subjesgscIS_bmv2c1070_split_L1J2019 19 18 18 18 18 0 0 18
-TrigSignatureMoniMT INFO HLT_j45_ftf_subjesgscIS_bmv2c1070_split_L1J20 decisions 18 46 46 46 0 0
+TrigSignatureMoniMT INFO HLT_j45_ftf_subjesgscIS_bmv2c1070_split_L1J20 decisions 18 49 49 49 0 0
TrigSignatureMoniMT INFO HLT_j45_ftf_subjesgscIS_boffperf_split_L1J2019 19 18 18 18 18 0 0 18
-TrigSignatureMoniMT INFO HLT_j45_ftf_subjesgscIS_boffperf_split_L1J20 decisions 18 46 46 46 0 0
+TrigSignatureMoniMT INFO HLT_j45_ftf_subjesgscIS_boffperf_split_L1J20 decisions 18 49 49 49 0 0
TrigSignatureMoniMT INFO HLT_j460_a10_lcw_subjes_L1J1004 4 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 19 19 0 0 0 0 0 0 0
diff --git a/Trigger/TrigValidation/TrigUpgradeTest/python/jetMenuHelper.py b/Trigger/TrigValidation/TrigUpgradeTest/python/jetMenuHelper.py
index f3811e6315e987591b6b87215a1b2c48750b97e6..3196b89e2a16b158108006f81b18c97028bd2a99 100644
--- a/Trigger/TrigValidation/TrigUpgradeTest/python/jetMenuHelper.py
+++ b/Trigger/TrigValidation/TrigUpgradeTest/python/jetMenuHelper.py
@@ -13,7 +13,12 @@ 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,7 +29,7 @@ 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
diff --git a/Trigger/TrigValidation/TrigUpgradeTest/share/full_menu_cf.py b/Trigger/TrigValidation/TrigUpgradeTest/share/full_menu_cf.py
index 4e78cdcd2390ae5e39fe85c0f7ae822e55aee4d5..f650e333dd8d1227d5e2af31278481fc61cc9803 100644
--- a/Trigger/TrigValidation/TrigUpgradeTest/share/full_menu_cf.py
+++ b/Trigger/TrigValidation/TrigUpgradeTest/share/full_menu_cf.py
@@ -169,15 +169,19 @@ 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_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_split_L1J20' , L1Thresholds=["J20"], ChainSteps=[step0,step1,step2] ),
+ makeChain(name='HLT_j45_ftf_subjesgscIS_bmv2c1070_split_L1J20', L1Thresholds=["J20"], ChainSteps=[step0,step1,step2] ),
+ makeChain(name='HLT_j45_ftf_subjesgscIS_bmv2c1070_L1J20' , L1Thresholds=["J20"], ChainSteps=[step0,step1,step2] )
]
testChains += bjetChains
diff --git a/Trigger/TrigValidation/TrigUpgradeTest/share/slice_bjet.ref b/Trigger/TrigValidation/TrigUpgradeTest/share/slice_bjet.ref
index 733267b3460cd21ea2b5d8c551604438662fe6f8..d58d3edb63e22104aa88ce4c4d6e1eb7aa958012 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_split_L1J100100 100 0 0 0 0 0
+TrigSignatureMoniMT INFO HLT_j225_ftf_subjesgscIS_bmv2c1040_split_L1J100 decisions 0 0 0 0
+TrigSignatureMoniMT INFO HLT_j275_ftf_subjesgscIS_bmv2c1060_split_L1J100100 100 0 0 0 0 0
+TrigSignatureMoniMT INFO HLT_j275_ftf_subjesgscIS_bmv2c1060_split_L1J100 decisions 0 0 0 0
+TrigSignatureMoniMT INFO HLT_j300_ftf_subjesgscIS_bmv2c1070_split_L1J100100 100 0 0 0 0 0
+TrigSignatureMoniMT INFO HLT_j300_ftf_subjesgscIS_bmv2c1070_split_L1J100 decisions 0 0 0 0
+TrigSignatureMoniMT INFO HLT_j360_ftf_subjesgscIS_bmv2c1077_split_L1J100100 100 0 0 0 0 0
+TrigSignatureMoniMT INFO HLT_j360_ftf_subjesgscIS_bmv2c1077_split_L1J100 decisions 0 0 0 0
+TrigSignatureMoniMT INFO HLT_j45_ftf_subjesgscIS_bmv2c1070_split_L1J20100 100 30 30 30 30 30
+TrigSignatureMoniMT INFO HLT_j45_ftf_subjesgscIS_bmv2c1070_split_L1J20 decisions 30 59 59 59
+TrigSignatureMoniMT INFO HLT_j45_ftf_subjesgscIS_boffperf_split_L1J20100 100 30 30 30 30 30
+TrigSignatureMoniMT INFO HLT_j45_ftf_subjesgscIS_boffperf_split_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 903c4b9af522a8c3d9e2f88f145cedca9119ba95..fd2b1c2aa4c9e4de70806e1d2ec47d300790d18e 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
@@ -51,7 +51,7 @@ def bJetStep1Sequence():
# hypo
from TrigBjetHypo.TrigBjetHypoConf import TrigBjetEtHypoAlgMT
- from TrigBjetHypo.TrigBjetEtHypoTool import TrigBjetEtHypoToolFromDict_j
+ from TrigBjetHypo.TrigBjetEtHypoTool import TrigBjetEtHypoToolFromDict
hypo = TrigBjetEtHypoAlgMT("TrigBjetEtHypoAlgMT_step1")
hypo.RoILink = "step1RoI" # To be used in following step EventView
hypo.PrmVtxLink = "xPrimVx"
@@ -65,7 +65,7 @@ def bJetStep1Sequence():
return MenuSequence( Sequence = BjetAthSequence,
Maker = InputMakerAlg,
Hypo = hypo,
- HypoToolGen = TrigBjetEtHypoToolFromDict_j )
+ HypoToolGen = TrigBjetEtHypoToolFromDict )
def bJetStep1SequenceALLTE():
@@ -107,7 +107,7 @@ def bJetStep1SequenceALLTE():
# hypo
from TrigBjetHypo.TrigBjetHypoConf import TrigBjetEtHypoAlgMT
- from TrigBjetHypo.TrigBjetEtHypoTool import TrigBjetEtHypoToolFromDict_j
+ from TrigBjetHypo.TrigBjetEtHypoTool import TrigBjetEtHypoToolFromDict
hypo = TrigBjetEtHypoAlgMT("TrigBjetEtHypoAlgMT_step1_ALLTE")
hypo.RoILink = "step1RoI" # To be used in following step EventView
hypo.PrmVtxLink = "xPrimVx"
@@ -121,7 +121,7 @@ def bJetStep1SequenceALLTE():
return MenuSequence( Sequence = BjetAthSequence,
Maker = InputMakerAlg,
Hypo = hypo,
- HypoToolGen = TrigBjetEtHypoToolFromDict_j )
+ HypoToolGen = TrigBjetEtHypoToolFromDict )
@@ -166,7 +166,7 @@ def bJetStep2Sequence():
# hypo
from TrigBjetHypo.TrigBjetHypoConf import TrigBjetEtHypoAlgEVMT
- from TrigBjetHypo.TrigBjetEtHypoTool import TrigBjetEtHypoToolFromDict_gsc
+ from TrigBjetHypo.TrigBjetEtHypoTool import TrigBjetEtHypoToolFromDict
hypo = TrigBjetEtHypoAlgEVMT("TrigBjetEtHypoAlg_step2")
# no links this time, only for tracks
hypo.TracksLink = "tracks"
@@ -181,7 +181,7 @@ def bJetStep2Sequence():
return MenuSequence( Sequence = BjetAthSequence,
Maker = InputMakerAlg,
Hypo = hypo,
- HypoToolGen = TrigBjetEtHypoToolFromDict_gsc )
+ HypoToolGen = TrigBjetEtHypoToolFromDict )
def bJetStep2SequenceALLTE():
@@ -202,7 +202,7 @@ def bJetStep2SequenceALLTE():
# hypo
from TrigBjetHypo.TrigBjetHypoConf import TrigBjetEtHypoAlgMT
- from TrigBjetHypo.TrigBjetEtHypoTool import TrigBjetEtHypoToolFromDict_gsc
+ from TrigBjetHypo.TrigBjetEtHypoTool import TrigBjetEtHypoToolFromDict
hypo = TrigBjetEtHypoAlgMT("TrigBjetEtHypoAlg_step2ALLTE")
hypo.RoIs = "step1RoI"
hypo.Jets = theGSC.JetOutputKey
@@ -217,7 +217,7 @@ def bJetStep2SequenceALLTE():
return MenuSequence( Sequence = BjetAthSequence,
Maker = InputMakerAlg,
Hypo = hypo,
- HypoToolGen = TrigBjetEtHypoToolFromDict_gsc )
+ HypoToolGen = TrigBjetEtHypoToolFromDict )
# ====================================================================================================
# step 3: secondary vertex and b-tagging
@@ -250,7 +250,7 @@ def bJetStep3Sequence():
# Hypo
from TrigBjetHypo.TrigBjetHypoConf import TrigBjetBtagHypoAlgMT
- from TrigBjetHypo.TrigBjetHypoTool import TrigBjetHypoToolFromDict
+ from TrigBjetHypo.TrigBjetBtagHypoTool import TrigBjetBtagHypoToolFromDict
hypo = TrigBjetBtagHypoAlgMT("TrigBjetBtagHypoAlg_step3")
hypo.BTagging = bTagFex.OutputBTagging
@@ -260,5 +260,5 @@ def bJetStep3Sequence():
return MenuSequence( Sequence = BjetAthSequence,
Maker = InputMakerAlg,
Hypo = hypo,
- HypoToolGen = TrigBjetHypoToolFromDict )
+ HypoToolGen = TrigBjetBtagHypoToolFromDict )