Skip to content

Commit

Permalink
Merge pull request #13700 from cms-btv-pog/TagInfoNameUpdate_from-CMS…
Browse files Browse the repository at this point in the history 
…SW_7_6_4

TagInfo collection name update
  • Loading branch information
@davidlange6
davidlange6 committed Apr 12, 2016
2 parents 937c088 + 056c7db commit 10f92d6
Show file tree
Hide file tree
Showing 10 changed files with 32 additions and 32 deletions.
12 changes: 6 additions & 6 deletions PhysicsTools/PatAlgos/python/recoLayer0/bTagging_cff.py
View file
Expand Up @@ -12,13 +12,13 @@
, 'inclusiveSecondaryVertexFinderFilteredNegativeTagInfos'
# new candidate-based framework (supported with RECO/AOD/MiniAOD)
, 'pfImpactParameterTagInfos'
, 'pfImpactParameterTagInfosAK8'
, 'pfImpactParameterTagInfosCA15'
, 'pfImpactParameterAK8TagInfos'
, 'pfImpactParameterCA15TagInfos'
, 'pfSecondaryVertexTagInfos'
, 'pfSecondaryVertexNegativeTagInfos'
, 'pfInclusiveSecondaryVertexFinderTagInfos'
, 'pfInclusiveSecondaryVertexFinderTagInfosAK8'
, 'pfInclusiveSecondaryVertexFinderTagInfosCA15'
, 'pfInclusiveSecondaryVertexFinderAK8TagInfos'
, 'pfInclusiveSecondaryVertexFinderCA15TagInfos'
, 'pfInclusiveSecondaryVertexFinderNegativeTagInfos'
, 'softPFMuonsTagInfos'
, 'softPFElectronsTagInfos'
Expand Down Expand Up @@ -130,8 +130,8 @@
, 'pfPositiveCombinedMVAV2BJetTags' : ['pfImpactParameterTagInfos', 'pfSecondaryVertexTagInfos', 'pfInclusiveSecondaryVertexFinderTagInfos', 'softPFMuonsTagInfos', 'softPFElectronsTagInfos']
, 'pfCombinedSecondaryVertexSoftLeptonBJetTags' : ['pfImpactParameterTagInfos', 'pfInclusiveSecondaryVertexFinderTagInfos', 'softPFMuonsTagInfos', 'softPFElectronsTagInfos']
, 'pfNegativeCombinedSecondaryVertexSoftLeptonBJetTags' : ['pfImpactParameterTagInfos', 'pfInclusiveSecondaryVertexFinderNegativeTagInfos', 'softPFMuonsTagInfos', 'softPFElectronsTagInfos']
, 'pfBoostedDoubleSecondaryVertexAK8BJetTags' : ['pfImpactParameterTagInfosAK8', 'pfInclusiveSecondaryVertexFinderTagInfosAK8']
, 'pfBoostedDoubleSecondaryVertexCA15BJetTags' : ['pfImpactParameterTagInfosCA15', 'pfInclusiveSecondaryVertexFinderTagInfosCA15']
, 'pfBoostedDoubleSecondaryVertexAK8BJetTags' : ['pfImpactParameterAK8TagInfos', 'pfInclusiveSecondaryVertexFinderAK8TagInfos']
, 'pfBoostedDoubleSecondaryVertexCA15BJetTags' : ['pfImpactParameterCA15TagInfos', 'pfInclusiveSecondaryVertexFinderCA15TagInfos']
# C-Tagging
, 'pfCombinedCvsLJetTags' : ["pfImpactParameterTagInfos", "pfInclusiveSecondaryVertexFinderCvsLTagInfos", "softPFMuonsTagInfos", "softPFElectronsTagInfos"]
, 'pfCombinedCvsBJetTags' : ["pfImpactParameterTagInfos", "pfInclusiveSecondaryVertexFinderCvsLTagInfos", "softPFMuonsTagInfos", "softPFElectronsTagInfos"]
Expand Down
16 changes: 8 additions & 8 deletions PhysicsTools/PatAlgos/python/tools/jetTools.py
View file
Expand Up @@ -207,13 +207,13 @@ def setupBTagging(process, jetSource, pfCandidates, explicitJTA, pvSource, svSou
if explicitJTA:
_btagInfo = getattr(process, btagInfo+labelName+postfix)
_btagInfo.explicitJTA = cms.bool(explicitJTA)
if btagInfo == 'pfImpactParameterTagInfosAK8':
setattr(process, btagInfo+labelName+postfix, btag.pfImpactParameterTagInfosAK8.clone(jets = jetSource,primaryVertex=pvSource,candidates=pfCandidates))
if btagInfo == 'pfImpactParameterAK8TagInfos':
setattr(process, btagInfo+labelName+postfix, btag.pfImpactParameterAK8TagInfos.clone(jets = jetSource,primaryVertex=pvSource,candidates=pfCandidates))
if explicitJTA:
_btagInfo = getattr(process, btagInfo+labelName+postfix)
_btagInfo.explicitJTA = cms.bool(explicitJTA)
if btagInfo == 'pfImpactParameterTagInfosCA15':
setattr(process, btagInfo+labelName+postfix, btag.pfImpactParameterTagInfosCA15.clone(jets = jetSource,primaryVertex=pvSource,candidates=pfCandidates))
if btagInfo == 'pfImpactParameterCA15TagInfos':
setattr(process, btagInfo+labelName+postfix, btag.pfImpactParameterCA15TagInfos.clone(jets = jetSource,primaryVertex=pvSource,candidates=pfCandidates))
if explicitJTA:
_btagInfo = getattr(process, btagInfo+labelName+postfix)
_btagInfo.explicitJTA = cms.bool(explicitJTA)
Expand All @@ -223,12 +223,12 @@ def setupBTagging(process, jetSource, pfCandidates, explicitJTA, pvSource, svSou
setattr(process, btagInfo+labelName+postfix, btag.pfInclusiveSecondaryVertexFinderTagInfos.clone(trackIPTagInfos = cms.InputTag('pfImpactParameterTagInfos'+labelName+postfix), extSVCollection=svSource))
if svClustering:
setupSVClustering(getattr(process, btagInfo+labelName+postfix), algo, rParam, fatJets, groomedFatJets)
if btagInfo == 'pfInclusiveSecondaryVertexFinderTagInfosAK8':
setattr(process, btagInfo+labelName+postfix, btag.pfInclusiveSecondaryVertexFinderTagInfosAK8.clone(trackIPTagInfos = cms.InputTag('pfImpactParameterTagInfosAK8'+labelName+postfix), extSVCollection=svSource))
if btagInfo == 'pfInclusiveSecondaryVertexFinderAK8TagInfos':
setattr(process, btagInfo+labelName+postfix, btag.pfInclusiveSecondaryVertexFinderAK8TagInfos.clone(trackIPTagInfos = cms.InputTag('pfImpactParameterAK8TagInfos'+labelName+postfix), extSVCollection=svSource))
if svClustering:
setupSVClustering(getattr(process, btagInfo+labelName+postfix), algo, rParam, fatJets, groomedFatJets)
if btagInfo == 'pfInclusiveSecondaryVertexFinderTagInfosCA15':
setattr(process, btagInfo+labelName+postfix, btag.pfInclusiveSecondaryVertexFinderTagInfosCA15.clone(trackIPTagInfos = cms.InputTag('pfImpactParameterTagInfosCA15'+labelName+postfix), extSVCollection=svSource))
if btagInfo == 'pfInclusiveSecondaryVertexFinderCA15TagInfos':
setattr(process, btagInfo+labelName+postfix, btag.pfInclusiveSecondaryVertexFinderCA15TagInfos.clone(trackIPTagInfos = cms.InputTag('pfImpactParameterCA15TagInfos'+labelName+postfix), extSVCollection=svSource))
if svClustering:
setupSVClustering(getattr(process, btagInfo+labelName+postfix), algo, rParam, fatJets, groomedFatJets)
if btagInfo == 'pfInclusiveSecondaryVertexFinderCvsLTagInfos':
Expand Down
4 changes: 2 additions & 2 deletions RecoBTag/ImpactParameter/python/impactParameter_cff.py
View file
Expand Up @@ -3,8 +3,8 @@
from TrackingTools.TransientTrack.TransientTrackBuilder_cfi import *
from RecoBTag.ImpactParameter.impactParameterTagInfos_cfi import *
from RecoBTag.ImpactParameter.pfImpactParameterTagInfos_cfi import *
from RecoBTag.ImpactParameter.pfImpactParameterTagInfosAK8_cfi import *
from RecoBTag.ImpactParameter.pfImpactParameterTagInfosCA15_cfi import *
from RecoBTag.ImpactParameter.pfImpactParameterAK8TagInfos_cfi import *
from RecoBTag.ImpactParameter.pfImpactParameterCA15TagInfos_cfi import *
from RecoBTau.JetTagComputer.jetTagRecord_cfi import *
# MVA
from RecoBTag.ImpactParameter.impactParameterMVAComputer_cfi import *
Expand Down
2 changes: 1 addition & 1 deletion ...ython/pfImpactParameterTagInfosAK8_cfi.py → ...ython/pfImpactParameterAK8TagInfos_cfi.py
View file
Expand Up @@ -2,7 +2,7 @@

from RecoBTag.ImpactParameter.pfImpactParameterTagInfos_cfi import *

pfImpactParameterTagInfosAK8 = pfImpactParameterTagInfos.clone(
pfImpactParameterAK8TagInfos = pfImpactParameterTagInfos.clone(
computeProbabilities = cms.bool(False),
computeGhostTrack = cms.bool(False),
jets = cms.InputTag("ak8PFJetsCHS"),
Expand Down
2 changes: 1 addition & 1 deletion ...thon/pfImpactParameterTagInfosCA15_cfi.py → ...thon/pfImpactParameterCA15TagInfos_cfi.py
View file
Expand Up @@ -2,7 +2,7 @@

from RecoBTag.ImpactParameter.pfImpactParameterTagInfos_cfi import *

pfImpactParameterTagInfosCA15 = pfImpactParameterTagInfos.clone(
pfImpactParameterCA15TagInfos = pfImpactParameterTagInfos.clone(
computeProbabilities = cms.bool(False),
computeGhostTrack = cms.bool(False),
jets = cms.InputTag("ca15PFJetsCHS"),
Expand Down
4 changes: 2 additions & 2 deletions RecoBTag/SecondaryVertex/python/pfBoostedDoubleSecondaryVertexAK8BJetTags_cfi.py
View file
Expand Up @@ -2,6 +2,6 @@

pfBoostedDoubleSecondaryVertexAK8BJetTags = cms.EDProducer("JetTagProducer",
jetTagComputer = cms.string('candidateBoostedDoubleSecondaryVertexAK8Computer'),
tagInfos = cms.VInputTag(cms.InputTag("pfImpactParameterTagInfosAK8"),
cms.InputTag("pfInclusiveSecondaryVertexFinderTagInfosAK8"))
tagInfos = cms.VInputTag(cms.InputTag("pfImpactParameterAK8TagInfos"),
cms.InputTag("pfInclusiveSecondaryVertexFinderAK8TagInfos"))
)
4 changes: 2 additions & 2 deletions RecoBTag/SecondaryVertex/python/pfBoostedDoubleSecondaryVertexCA15BJetTags_cfi.py
View file
Expand Up @@ -2,6 +2,6 @@

pfBoostedDoubleSecondaryVertexCA15BJetTags = cms.EDProducer("JetTagProducer",
jetTagComputer = cms.string('candidateBoostedDoubleSecondaryVertexCA15Computer'),
tagInfos = cms.VInputTag(cms.InputTag("pfImpactParameterTagInfosCA15"),
cms.InputTag("pfInclusiveSecondaryVertexFinderTagInfosCA15"))
tagInfos = cms.VInputTag(cms.InputTag("pfImpactParameterCA15TagInfos"),
cms.InputTag("pfInclusiveSecondaryVertexFinderCA15TagInfos"))
)
8 changes: 4 additions & 4 deletions ...veSecondaryVertexFinderTagInfosAK8_cfi.py → ...veSecondaryVertexFinderAK8TagInfos_cfi.py
View file
Expand Up @@ -2,9 +2,9 @@

from RecoBTag.SecondaryVertex.pfInclusiveSecondaryVertexFinderTagInfos_cfi import *

pfInclusiveSecondaryVertexFinderTagInfosAK8 = pfInclusiveSecondaryVertexFinderTagInfos.clone(
trackIPTagInfos = cms.InputTag("pfImpactParameterTagInfosAK8"),
pfInclusiveSecondaryVertexFinderAK8TagInfos = pfInclusiveSecondaryVertexFinderTagInfos.clone(
trackIPTagInfos = cms.InputTag("pfImpactParameterAK8TagInfos"),
extSVDeltaRToJet = cms.double(0.8)
)
pfInclusiveSecondaryVertexFinderTagInfosAK8.trackSelection.jetDeltaRMax = cms.double(0.8) # plays no role since using IVF vertices
pfInclusiveSecondaryVertexFinderTagInfosAK8.vertexCuts.maxDeltaRToJetAxis = cms.double(0.8)
pfInclusiveSecondaryVertexFinderAK8TagInfos.trackSelection.jetDeltaRMax = cms.double(0.8) # plays no role since using IVF vertices
pfInclusiveSecondaryVertexFinderAK8TagInfos.vertexCuts.maxDeltaRToJetAxis = cms.double(0.8)
8 changes: 4 additions & 4 deletions ...eSecondaryVertexFinderTagInfosCA15_cfi.py → ...eSecondaryVertexFinderCA15TagInfos_cfi.py
View file
Expand Up @@ -2,9 +2,9 @@

from RecoBTag.SecondaryVertex.pfInclusiveSecondaryVertexFinderTagInfos_cfi import *

pfInclusiveSecondaryVertexFinderTagInfosCA15 = pfInclusiveSecondaryVertexFinderTagInfos.clone(
trackIPTagInfos = cms.InputTag("pfImpactParameterTagInfosCA15"),
pfInclusiveSecondaryVertexFinderCA15TagInfos = pfInclusiveSecondaryVertexFinderTagInfos.clone(
trackIPTagInfos = cms.InputTag("pfImpactParameterCA15TagInfos"),
extSVDeltaRToJet = cms.double(1.5)
)
pfInclusiveSecondaryVertexFinderTagInfosCA15.trackSelection.jetDeltaRMax = cms.double(1.5) # plays no role since using IVF vertices
pfInclusiveSecondaryVertexFinderTagInfosCA15.vertexCuts.maxDeltaRToJetAxis = cms.double(1.5)
pfInclusiveSecondaryVertexFinderCA15TagInfos.trackSelection.jetDeltaRMax = cms.double(1.5) # plays no role since using IVF vertices
pfInclusiveSecondaryVertexFinderCA15TagInfos.vertexCuts.maxDeltaRToJetAxis = cms.double(1.5)
4 changes: 2 additions & 2 deletions RecoBTag/SecondaryVertex/python/secondaryVertex_cff.py
View file
Expand Up @@ -74,9 +74,9 @@
from RecoBTag.SecondaryVertex.pfCombinedInclusiveSecondaryVertexBJetTags_cfi import *
from RecoBTag.SecondaryVertex.pfCombinedInclusiveSecondaryVertexV2BJetTags_cfi import *
from RecoBTag.SecondaryVertex.pfCombinedSecondaryVertexSoftLeptonBJetTags_cfi import *
from RecoBTag.SecondaryVertex.pfInclusiveSecondaryVertexFinderTagInfosAK8_cfi import *
from RecoBTag.SecondaryVertex.pfInclusiveSecondaryVertexFinderAK8TagInfos_cfi import *
from RecoBTag.SecondaryVertex.pfBoostedDoubleSecondaryVertexAK8BJetTags_cfi import *
from RecoBTag.SecondaryVertex.pfInclusiveSecondaryVertexFinderTagInfosCA15_cfi import *
from RecoBTag.SecondaryVertex.pfInclusiveSecondaryVertexFinderCA15TagInfos_cfi import *
from RecoBTag.SecondaryVertex.pfBoostedDoubleSecondaryVertexCA15BJetTags_cfi import *

# Negative taggers
Expand Down

0 comments on commit 10f92d6

Please sign in to comment.