Commit fc67b833 authored by Julia Lynne Gonski's avatar Julia Lynne Gonski Committed by Oana Vickey Boeriu
Browse files

Remove deprecated XbbScore variables from HbbCommon

parent ca4641d4
......@@ -632,15 +632,12 @@ def addHbbTagger(
tagger_alg_name, jet_collection))
def addRecommendedXbbTaggers(sequence, ToolSvc, logger=None):
addHbbTagger(sequence, ToolSvc, logger)
addHbbTagger(
sequence, ToolSvc,
nn_file_name="BoostedJetTaggers/HbbTagger/Summer2018/MulticlassNetwork.json",
nn_config_file="BoostedJetTaggers/HbbTaggerDNN/MulticlassConfigJune2018.json")
xbbTaggerExtraVariables = [
"AntiKt10LCTopoTrimmedPtFrac5SmallR20Jets.HbbScore",
"AntiKt10LCTopoTrimmedPtFrac5SmallR20Jets.XbbScoreHiggs.XbbScoreTop.XbbScoreQCD"]
if logger is None:
logger = Logging.logging.getLogger('addRecXbbLog')
logger.warning('addRecommendedXbbTaggers decorates a deprecated XbbScore variable. This decoration will be skipped.')
return
xbbTaggerExtraVariables = []
#====================================================================
# Large-R RC jets w/ ExKt 2 & 3 subjets
......
......@@ -219,12 +219,6 @@ addExKtDoubleTaggerRCJets(FTAG1Seq, ToolSvc)
addVRJets(FTAG1Seq)
addVRJets(FTAG1Seq, do_ghost=True)
addVRJets(FTAG1Seq, training='201903') #new trackjet training!
# Also add Hbb Tagger(s)
addHbbTagger(FTAG1Seq, ToolSvc)
addHbbTagger(
FTAG1Seq, ToolSvc,
nn_file_name="BoostedJetTaggers/HbbTagger/Summer2018/MulticlassNetwork.json",
nn_config_file="BoostedJetTaggers/HbbTaggerDNN/MulticlassConfigJune2018.json")
# alias for VR
BTaggingFlags.CalibrationChannelAliases += ["AntiKtVR30Rmax4Rmin02Track->AntiKtVR30Rmax4Rmin02Track,AntiKt4EMTopo",
......
......@@ -113,9 +113,6 @@ addVRJets(FTAG2Seq, doFlipTagger=True)
addVRJets(FTAG2Seq, doFlipTagger=True, training='201903')
addVRJets(FTAG2Seq, do_ghost=True, doFlipTagger=True)
# Also add Hbb Tagger
addHbbTagger(FTAG2Seq, ToolSvc)
# alias for VR
BTaggingFlags.CalibrationChannelAliases += ["AntiKtVR30Rmax4Rmin02Track->AntiKtVR30Rmax4Rmin02Track,AntiKt4EMTopo"]
......
......@@ -12,7 +12,7 @@ from DerivationFrameworkJetEtMiss.ExtendedJetCommon import replaceAODReducedJets
from DerivationFrameworkEGamma.EGammaCommon import *
from DerivationFrameworkMuons.MuonsCommon import *
from DerivationFrameworkFlavourTag.FlavourTagCommon import FlavorTagInit
from DerivationFrameworkFlavourTag.HbbCommon import addVRJets, addExKtCoM, addHbbTagger
from DerivationFrameworkFlavourTag.HbbCommon import addVRJets, addExKtCoM
from DerivationFrameworkFlavourTag.SoftBtagCommon import applySoftBtagging
from DerivationFrameworkCore.ThinningHelper import ThinningHelper
......@@ -165,10 +165,6 @@ applySoftBtagging("softBtag", FTAG4Seq ) # SV tagger in VrtSecInclusive
# Create variable-R trackjets and dress AntiKt10LCTopo with ghost VR-trkjet
addVRJets(FTAG4Seq, doFlipTagger=True)
addVRJets(FTAG4Seq, doFlipTagger=True, training='201903')
addHbbTagger(
FTAG4Seq, ToolSvc,
nn_file_name="BoostedJetTaggers/HbbTagger/Summer2018/MulticlassNetwork.json",
nn_config_file="BoostedJetTaggers/HbbTaggerDNN/MulticlassConfigJune2018.json")
# alias for VR
BTaggingFlags.CalibrationChannelAliases += ["AntiKtVR30Rmax4Rmin02Track->AntiKtVR30Rmax4Rmin02Track,AntiKt4EMTopo"]
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment