Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

drop type specs in RecoBTag #31538

Merged
merged 2 commits into from Sep 24, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 2 additions & 2 deletions RecoBTag/CTagging/python/CombinedCharmTagJetTags_cff.py
Expand Up @@ -4,11 +4,11 @@
from RecoBTag.CTagging.pfPositiveCombinedCvsLJetTags_cfi import *

pfNegativeCombinedCvsBJetTags = pfNegativeCombinedCvsLJetTags.clone(
jetTagComputer = cms.string('charmTagsNegativeComputerCvsB')
jetTagComputer = 'charmTagsNegativeComputerCvsB'
)

pfPositiveCombinedCvsBJetTags = pfPositiveCombinedCvsLJetTags.clone(
jetTagComputer = cms.string('charmTagsPositiveComputerCvsB')
jetTagComputer = 'charmTagsPositiveComputerCvsB'
)

CombinedCharmTagJetTagsTask = cms.Task(
Expand Down
2 changes: 1 addition & 1 deletion RecoBTag/CTagging/python/charmTagJetTags_cfi.py
Expand Up @@ -12,5 +12,5 @@
)

pfCombinedCvsBJetTags = pfCombinedCvsLJetTags.clone(
jetTagComputer = cms.string('charmTagsComputerCvsB')
jetTagComputer = 'charmTagsComputerCvsB'
)
57 changes: 28 additions & 29 deletions RecoBTag/CTagging/python/charmTaggerProducer_cff.py
Expand Up @@ -3,49 +3,48 @@
from RecoBTag.CTagging.charmTagsComputerCvsL_cfi import *

charmTagsComputerCvsB = charmTagsComputerCvsL.clone(
weightFile = cms.FileInPath('RecoBTag/CTagging/data/c_vs_b_sklearn.weight.xml'),
weightFile = 'RecoBTag/CTagging/data/c_vs_b_sklearn.weight.xml',
variables = c_vs_b_vars_vpset
)

from Configuration.Eras.Modifier_phase1Pixel_cff import phase1Pixel
phase1Pixel.toModify(charmTagsComputerCvsB, weightFile = cms.FileInPath('RecoBTag/CTagging/data/c_vs_b_PhaseI.xml'))
phase1Pixel.toModify(charmTagsComputerCvsB, weightFile = 'RecoBTag/CTagging/data/c_vs_b_PhaseI.xml')

#
# Negative tagger
#

charmTagsNegativeComputerCvsL = charmTagsComputerCvsL.clone()

charmTagsNegativeComputerCvsL.slComputerCfg.vertexFlip = cms.bool(True)
charmTagsNegativeComputerCvsL.slComputerCfg.trackFlip = cms.bool(True)
charmTagsNegativeComputerCvsL.slComputerCfg.SoftLeptonFlip = cms.bool(True)
charmTagsNegativeComputerCvsL.slComputerCfg.trackSelection.sip3dSigMax = 0
charmTagsNegativeComputerCvsL.slComputerCfg.trackPseudoSelection.sip3dSigMax = 0
charmTagsNegativeComputerCvsL.slComputerCfg.trackPseudoSelection.sip2dSigMin = -99999.9
charmTagsNegativeComputerCvsL.slComputerCfg.trackPseudoSelection.sip2dSigMax = -2.0

charmTagsNegativeComputerCvsB = charmTagsComputerCvsB.clone()

charmTagsNegativeComputerCvsB.slComputerCfg.vertexFlip = cms.bool(True)
charmTagsNegativeComputerCvsB.slComputerCfg.trackFlip = cms.bool(True)
charmTagsNegativeComputerCvsB.slComputerCfg.SoftLeptonFlip = cms.bool(True)
charmTagsNegativeComputerCvsB.slComputerCfg.trackSelection.sip3dSigMax = 0
charmTagsNegativeComputerCvsB.slComputerCfg.trackPseudoSelection.sip3dSigMax = 0
charmTagsNegativeComputerCvsB.slComputerCfg.trackPseudoSelection.sip2dSigMin = -99999.9
charmTagsNegativeComputerCvsB.slComputerCfg.trackPseudoSelection.sip2dSigMax = -2.0

charmTagsNegativeComputerCvsL = charmTagsComputerCvsL.clone(
slComputerCfg = dict(vertexFlip = True,
trackFlip = True,
SoftLeptonFlip = True,
trackSelection = dict(sip3dSigMax = 0),
trackPseudoSelection = dict(
sip3dSigMax = 0,
sip2dSigMin = -99999.9,
sip2dSigMax = -2.0 )
)
)
charmTagsNegativeComputerCvsB = charmTagsComputerCvsB.clone(
slComputerCfg = dict(vertexFlip = True,
trackFlip = True,
SoftLeptonFlip = True,
trackSelection = dict(sip3dSigMax = 0),
trackPseudoSelection = dict(
sip3dSigMax = 0,
sip2dSigMin = -99999.9,
sip2dSigMax = -2.0 )
)
)
#
# Positive tagger
#

charmTagsPositiveComputerCvsL = charmTagsComputerCvsL.clone(
slComputerCfg = dict(trackSelection = dict(sip3dSigMin = 0),
trackPseudoSelection = dict(sip3dSigMin = 0))
)

charmTagsPositiveComputerCvsL.slComputerCfg.trackSelection.sip3dSigMin = 0
charmTagsPositiveComputerCvsL.slComputerCfg.trackPseudoSelection.sip3dSigMin = 0

charmTagsPositiveComputerCvsB = charmTagsComputerCvsB.clone(
slComputerCfg = dict(trackSelection = dict(sip3dSigMin = 0),
trackPseudoSelection = dict(sip3dSigMin = 0))
)

charmTagsPositiveComputerCvsB.slComputerCfg.trackSelection.sip3dSigMin = 0
charmTagsPositiveComputerCvsB.slComputerCfg.trackPseudoSelection.sip3dSigMin = 0
8 changes: 5 additions & 3 deletions RecoBTag/CTagging/python/charmTagsComputerCvsL_cfi.py
Expand Up @@ -34,6 +34,8 @@
charmTagsComputerCvsL.slComputerCfg.correctVertexMass = False

from Configuration.Eras.Modifier_phase1Pixel_cff import phase1Pixel
phase1Pixel.toModify(charmTagsComputerCvsL, weightFile = cms.FileInPath('RecoBTag/CTagging/data/c_vs_udsg_PhaseI.xml'))
phase1Pixel.toModify(charmTagsComputerCvsL, slComputerCfg = dict(correctVertexMass = True))
phase1Pixel.toModify(charmTagsComputerCvsL, defaultValueNoTracks = cms.bool(True))
phase1Pixel.toModify(charmTagsComputerCvsL,
weightFile = 'RecoBTag/CTagging/data/c_vs_udsg_PhaseI.xml',
slComputerCfg = dict(correctVertexMass = True),
defaultValueNoTracks = True
)
Expand Up @@ -4,11 +4,10 @@

# use external SV collection made from IVF
pfInclusiveSecondaryVertexFinderCvsLTagInfos = pfSecondaryVertexTagInfos.clone(
extSVCollection = cms.InputTag('inclusiveCandidateSecondaryVerticesCvsL'),
extSVDeltaRToJet = cms.double(0.3),
useExternalSV = cms.bool(True)
extSVCollection = 'inclusiveCandidateSecondaryVerticesCvsL',
extSVDeltaRToJet = 0.3,
useExternalSV = True,
vertexCuts = dict(fracPV = 0.79, ## 4 out of 5 is discarded
distSig2dMin = 1.5 # relaxed w.r.t taginfos used in btagger
)
)
pfInclusiveSecondaryVertexFinderCvsLTagInfos.vertexCuts.fracPV = 0.79 ## 4 out of 5 is discarded
pfInclusiveSecondaryVertexFinderCvsLTagInfos.vertexCuts.distSig2dMin = 1.5 # relaxed w.r.t taginfos used in btagger


Expand Up @@ -2,10 +2,11 @@

from RecoBTag.CTagging.pfInclusiveSecondaryVertexFinderCvsLTagInfos_cfi import *

pfInclusiveSecondaryVertexFinderNegativeCvsLTagInfos = pfInclusiveSecondaryVertexFinderCvsLTagInfos.clone()
pfInclusiveSecondaryVertexFinderNegativeCvsLTagInfos.extSVDeltaRToJet = cms.double(-0.3)
pfInclusiveSecondaryVertexFinderNegativeCvsLTagInfos.vertexCuts.distVal2dMin = -2.5
pfInclusiveSecondaryVertexFinderNegativeCvsLTagInfos.vertexCuts.distVal2dMax = -0.01
pfInclusiveSecondaryVertexFinderNegativeCvsLTagInfos.vertexCuts.distSig2dMin = -99999.9
pfInclusiveSecondaryVertexFinderNegativeCvsLTagInfos.vertexCuts.distSig2dMax = -1.5
pfInclusiveSecondaryVertexFinderNegativeCvsLTagInfos.vertexCuts.maxDeltaRToJetAxis = -0.5
pfInclusiveSecondaryVertexFinderNegativeCvsLTagInfos = pfInclusiveSecondaryVertexFinderCvsLTagInfos.clone(
extSVDeltaRToJet = -0.3,
vertexCuts = dict(distVal2dMin = -2.5,
distVal2dMax = -0.01,
distSig2dMin = -99999.9,
distSig2dMax = -1.5,
maxDeltaRToJetAxis = -0.5)
)
2 changes: 1 addition & 1 deletion RecoBTag/Combined/python/caloDeepCSVJetTags_cfi.py
@@ -1,4 +1,4 @@
import FWCore.ParameterSet.Config as cms
from RecoBTag.Combined.pfDeepCSVJetTags_cfi import pfDeepCSVJetTags

caloDeepCSVJetTags = pfDeepCSVJetTags.clone(src = cms.InputTag('caloDeepCSVTagInfos'))
caloDeepCSVJetTags = pfDeepCSVJetTags.clone(src = 'caloDeepCSVTagInfos')
14 changes: 7 additions & 7 deletions RecoBTag/Combined/python/deepFlavour_cff.py
Expand Up @@ -11,7 +11,7 @@
##

pfDeepCSVNegativeTagInfos = pfDeepCSVTagInfos.clone(
svTagInfos=cms.InputTag('pfInclusiveSecondaryVertexFinderNegativeTagInfos'),
svTagInfos='pfInclusiveSecondaryVertexFinderNegativeTagInfos',
computer = dict(
vertexFlip = True,
trackFlip = True,
Expand All @@ -27,7 +27,7 @@
)

pfNegativeDeepCSVJetTags = pfDeepCSVJetTags.clone(
src=cms.InputTag('pfDeepCSVNegativeTagInfos')
src='pfDeepCSVNegativeTagInfos'
)

pfDeepCSVPositiveTagInfos = pfDeepCSVTagInfos.clone(
Expand All @@ -43,23 +43,23 @@
)

pfPositiveDeepCSVJetTags = pfDeepCSVJetTags.clone(
src=cms.InputTag('pfDeepCSVPositiveTagInfos')
src='pfDeepCSVPositiveTagInfos'
)

# Deep CMVA
pfDeepCMVANegativeTagInfos = pfDeepCMVATagInfos.clone(
deepNNTagInfos = cms.InputTag('pfDeepCSVNegativeTagInfos')
deepNNTagInfos = 'pfDeepCSVNegativeTagInfos'
)

pfNegativeDeepCMVAJetTags = pfDeepCMVAJetTags.clone(
src=cms.InputTag('pfDeepCMVANegativeTagInfos')
src='pfDeepCMVANegativeTagInfos'
)

pfDeepCMVAPositiveTagInfos = pfDeepCMVATagInfos.clone(
deepNNTagInfos = cms.InputTag('pfDeepCSVPositiveTagInfos')
deepNNTagInfos = 'pfDeepCSVPositiveTagInfos'
)
pfPositiveDeepCMVAJetTags = pfDeepCMVAJetTags.clone(
src=cms.InputTag('pfDeepCMVAPositiveTagInfos')
src='pfDeepCMVAPositiveTagInfos'
)


Expand Down
20 changes: 12 additions & 8 deletions RecoBTag/Combined/python/pfDeepCSVJetTags_cfi.py
Expand Up @@ -12,13 +12,17 @@
)

from Configuration.Eras.Modifier_phase1Pixel_cff import phase1Pixel
phase1Pixel.toModify(pfDeepCSVJetTags, NNConfig = cms.FileInPath('RecoBTag/Combined/data/DeepCSV_PhaseI.json'))
phase1Pixel.toModify(pfDeepCSVJetTags, checkSVForDefaults = cms.bool(True))
phase1Pixel.toModify(pfDeepCSVJetTags, meanPadding = cms.bool(True))
phase1Pixel.toModify(pfDeepCSVJetTags, toAdd = cms.PSet())
phase1Pixel.toModify(pfDeepCSVJetTags,
NNConfig = cms.FileInPath('RecoBTag/Combined/data/DeepCSV_PhaseI.json'),
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

if NNConfig already exists, you can drop also cms.FileInPath

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

if NNConfig already exists, you can drop also cms.FileInPath

Indeed, thank you @silviodonato
The same at L24 below
We'll submit a quick patch as soon as this PR gets included in a IB

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Finalization in #31568 (submitted now before forgetting it)

checkSVForDefaults = True,
meanPadding = True,
toAdd = cms.PSet()
)

from Configuration.Eras.Modifier_phase2_common_cff import phase2_common
phase2_common.toModify(pfDeepCSVJetTags, NNConfig = cms.FileInPath('RecoBTag/Combined/data/DeepCSV_PhaseII.json'))
phase2_common.toModify(pfDeepCSVJetTags, checkSVForDefaults = cms.bool(True))
phase2_common.toModify(pfDeepCSVJetTags, meanPadding = cms.bool(True))
phase2_common.toModify(pfDeepCSVJetTags, toAdd = cms.PSet())
phase2_common.toModify(pfDeepCSVJetTags,
NNConfig = cms.FileInPath('RecoBTag/Combined/data/DeepCSV_PhaseII.json'),
checkSVForDefaults = True,
meanPadding = True,
toAdd = cms.PSet()
)
Expand Up @@ -4,5 +4,5 @@

# negativeOnlyJetBProbability btag computer
candidateNegativeOnlyJetBProbabilityComputer = candidateJetBProbabilityComputer.clone(
trackIpSign = cms.int32(-1) ## 0 = use both, 1 = positive only, -1 = negative only
trackIpSign = -1 ## 0 = use both, 1 = positive only, -1 = negative only
)
Expand Up @@ -4,7 +4,7 @@

# negativeOnlyJetProbability btag computer
candidateNegativeOnlyJetProbabilityComputer = candidateJetProbabilityComputer.clone(
trackIpSign = cms.int32(-1) ## 0 = use both, 1 = positive only, -1 = negative only
trackIpSign = -1 ## 0 = use both, 1 = positive only, -1 = negative only
)


Expand Up @@ -4,5 +4,5 @@

# negativeTrackCounting3D3rd btag computer
candidateNegativeTrackCounting3D3rdComputer = candidateNegativeTrackCounting3D2ndComputer.clone(
nthTrack = cms.int32(3)
nthTrack = 3
)
Expand Up @@ -4,5 +4,5 @@

# positiveOnlyJetBProbability btag computer
candidatePositiveOnlyJetBProbabilityComputer = candidateJetBProbabilityComputer.clone(
trackIpSign = cms.int32(1) ## 0 = use both, 1 = positive only, -1 = negative only
trackIpSign = 1 ## 0 = use both, 1 = positive only, -1 = negative only
)
Expand Up @@ -4,5 +4,5 @@

# positiveOnlyJetProbability btag computer
candidatePositiveOnlyJetProbabilityComputer = candidateJetProbabilityComputer.clone(
trackIpSign = cms.int32(1) ## 0 = use both, 1 = positive only, -1 = negative only
trackIpSign = 1 ## 0 = use both, 1 = positive only, -1 = negative only
)
Expand Up @@ -4,5 +4,5 @@

# trackCounting3D3rd btag computer
candidateTrackCounting3D3rdComputer = candidateTrackCounting3D2ndComputer.clone(
nthTrack = cms.int32(3)
nthTrack = 3
)
Expand Up @@ -4,5 +4,5 @@

# negativeOnlyJetBProbability btag computer
negativeOnlyJetBProbabilityComputer = jetBProbabilityComputer.clone(
trackIpSign = cms.int32(-1) ## 0 = use both, 1 = positive only, -1 = negative only
trackIpSign = -1 ## 0 = use both, 1 = positive only, -1 = negative only
)
Expand Up @@ -4,5 +4,5 @@

# negativeOnlyJetProbability btag computer
negativeOnlyJetProbabilityComputer = jetProbabilityComputer.clone(
trackIpSign = cms.int32(-1) ## 0 = use both, 1 = positive only, -1 = negative only
trackIpSign = -1 ## 0 = use both, 1 = positive only, -1 = negative only
)
Expand Up @@ -4,7 +4,7 @@

# negativeTrackCounting3D3rd btag computer
negativeTrackCounting3D3rdComputer = negativeTrackCounting3D2ndComputer.clone(
nthTrack = cms.int32(3)
nthTrack = 3
)


Expand Up @@ -3,8 +3,8 @@
from RecoBTag.ImpactParameter.pfImpactParameterTagInfos_cfi import *

pfImpactParameterAK8TagInfos = pfImpactParameterTagInfos.clone(
computeProbabilities = cms.bool(False),
computeGhostTrack = cms.bool(False),
jets = cms.InputTag("ak8PFJetsPuppi"),
maxDeltaR = cms.double(0.8)
computeProbabilities = False,
computeGhostTrack = False,
jets = "ak8PFJetsPuppi",
maxDeltaR = 0.8
)
Expand Up @@ -3,8 +3,8 @@
from RecoBTag.ImpactParameter.pfImpactParameterTagInfos_cfi import *

pfImpactParameterCA15TagInfos = pfImpactParameterTagInfos.clone(
computeProbabilities = cms.bool(False),
computeGhostTrack = cms.bool(False),
jets = cms.InputTag("ca15PFJetsCHS"),
maxDeltaR = cms.double(1.5)
computeProbabilities = False,
computeGhostTrack = False,
jets = "ca15PFJetsCHS",
maxDeltaR = 1.5
)
Expand Up @@ -4,5 +4,5 @@

# positiveOnlyJetBProbability btag computer
positiveOnlyJetBProbabilityComputer = jetBProbabilityComputer.clone(
trackIpSign = cms.int32(1) ## 0 = use both, 1 = positive only, -1 = negative only
trackIpSign = 1 ## 0 = use both, 1 = positive only, -1 = negative only
)
Expand Up @@ -4,5 +4,5 @@

# positiveOnlyJetProbability btag computer
positiveOnlyJetProbabilityComputer = jetProbabilityComputer.clone(
trackIpSign = cms.int32(1) ## 0 = use both, 1 = positive only, -1 = negative only
trackIpSign = 1 ## 0 = use both, 1 = positive only, -1 = negative only
)
Expand Up @@ -4,5 +4,5 @@

# trackCounting3D1st btag computer
trackCounting3D1stComputer = trackCounting3D2ndComputer.clone(
nthTrack = cms.int32(1)
nthTrack = 1
)
Expand Up @@ -4,5 +4,5 @@

# trackCounting3D3rd btag computer
trackCounting3D3rdComputer = trackCounting3D2ndComputer.clone(
nthTrack = cms.int32(3)
nthTrack = 3
)
Expand Up @@ -3,5 +3,5 @@
from RecoBTag.ONNXRuntime.pfDeepFlavourJetTags_cfi import pfDeepFlavourJetTags

pfNegativeDeepFlavourJetTags = pfDeepFlavourJetTags.clone(
src = cms.InputTag('pfNegativeDeepFlavourTagInfos')
src = 'pfNegativeDeepFlavourTagInfos'
)
Expand Up @@ -10,4 +10,4 @@
)

from Configuration.Eras.Modifier_phase1Pixel_cff import phase1Pixel
phase1Pixel.toModify(candidateBoostedDoubleSecondaryVertexAK8Computer, weightFile = cms.FileInPath('RecoBTag/SecondaryVertex/data/BoostedDoubleSV_AK8_BDT_PhaseI_v1.weights.xml.gz'))
phase1Pixel.toModify(candidateBoostedDoubleSecondaryVertexAK8Computer, weightFile = 'RecoBTag/SecondaryVertex/data/BoostedDoubleSV_AK8_BDT_PhaseI_v1.weights.xml.gz')
Expand Up @@ -2,10 +2,11 @@

from RecoBTag.SecondaryVertex.candidateCombinedSecondaryVertexV2Computer_cfi import *

candidateNegativeCombinedSecondaryVertexV2Computer = candidateCombinedSecondaryVertexV2Computer.clone()
candidateNegativeCombinedSecondaryVertexV2Computer.vertexFlip = True
candidateNegativeCombinedSecondaryVertexV2Computer.trackFlip = True
candidateNegativeCombinedSecondaryVertexV2Computer.trackSelection.sip3dSigMax = 0
candidateNegativeCombinedSecondaryVertexV2Computer.trackPseudoSelection.sip3dSigMax = 0
candidateNegativeCombinedSecondaryVertexV2Computer.trackPseudoSelection.sip2dSigMin = -99999.9
candidateNegativeCombinedSecondaryVertexV2Computer.trackPseudoSelection.sip2dSigMax = -2.0
candidateNegativeCombinedSecondaryVertexV2Computer = candidateCombinedSecondaryVertexV2Computer.clone(
vertexFlip = True,
trackFlip = True,
trackSelection = dict(sip3dSigMax = 0),
trackPseudoSelection = dict(sip3dSigMax = 0,
sip2dSigMin = -99999.9,
sip2dSigMax = -2.0)
)
Expand Up @@ -2,6 +2,7 @@

from RecoBTag.SecondaryVertex.candidateCombinedSecondaryVertexV2Computer_cfi import *

candidatePositiveCombinedSecondaryVertexV2Computer = candidateCombinedSecondaryVertexV2Computer.clone()
candidatePositiveCombinedSecondaryVertexV2Computer.trackSelection.sip3dSigMin = 0
candidatePositiveCombinedSecondaryVertexV2Computer.trackPseudoSelection.sip3dSigMin = 0
candidatePositiveCombinedSecondaryVertexV2Computer = candidateCombinedSecondaryVertexV2Computer.clone(
trackSelection = dict(sip3dSigMin = 0),
trackPseudoSelection = dict(sip3dSigMin = 0)
)