From 056c7dbcfa73ed01d7ee36e7837a0275653e71ba Mon Sep 17 00:00:00 2001 From: Dinko Ferencek Date: Sat, 12 Mar 2016 00:33:58 +0100 Subject: [PATCH] TagInfo collection names need to end with 'TagInfos' to avoid possible ambiguities in PAT --- .../PatAlgos/python/recoLayer0/bTagging_cff.py | 12 ++++++------ PhysicsTools/PatAlgos/python/tools/jetTools.py | 16 ++++++++-------- .../python/impactParameter_cff.py | 4 ++-- ...fi.py => pfImpactParameterAK8TagInfos_cfi.py} | 2 +- ...i.py => pfImpactParameterCA15TagInfos_cfi.py} | 2 +- ...oostedDoubleSecondaryVertexAK8BJetTags_cfi.py | 4 ++-- ...ostedDoubleSecondaryVertexCA15BJetTags_cfi.py | 4 ++-- ...usiveSecondaryVertexFinderAK8TagInfos_cfi.py} | 8 ++++---- ...siveSecondaryVertexFinderCA15TagInfos_cfi.py} | 8 ++++---- .../python/secondaryVertex_cff.py | 4 ++-- 10 files changed, 32 insertions(+), 32 deletions(-) rename RecoBTag/ImpactParameter/python/{pfImpactParameterTagInfosAK8_cfi.py => pfImpactParameterAK8TagInfos_cfi.py} (80%) rename RecoBTag/ImpactParameter/python/{pfImpactParameterTagInfosCA15_cfi.py => pfImpactParameterCA15TagInfos_cfi.py} (81%) rename RecoBTag/SecondaryVertex/python/{pfInclusiveSecondaryVertexFinderTagInfosAK8_cfi.py => pfInclusiveSecondaryVertexFinderAK8TagInfos_cfi.py} (52%) rename RecoBTag/SecondaryVertex/python/{pfInclusiveSecondaryVertexFinderTagInfosCA15_cfi.py => pfInclusiveSecondaryVertexFinderCA15TagInfos_cfi.py} (53%) diff --git a/PhysicsTools/PatAlgos/python/recoLayer0/bTagging_cff.py b/PhysicsTools/PatAlgos/python/recoLayer0/bTagging_cff.py index 159a4040dec10..cd106b5889a98 100644 --- a/PhysicsTools/PatAlgos/python/recoLayer0/bTagging_cff.py +++ b/PhysicsTools/PatAlgos/python/recoLayer0/bTagging_cff.py @@ -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' @@ -126,8 +126,8 @@ , 'pfCombinedMVAV2BJetTags' : ['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"] diff --git a/PhysicsTools/PatAlgos/python/tools/jetTools.py b/PhysicsTools/PatAlgos/python/tools/jetTools.py index b7c374b69dc3b..e200111375234 100644 --- a/PhysicsTools/PatAlgos/python/tools/jetTools.py +++ b/PhysicsTools/PatAlgos/python/tools/jetTools.py @@ -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) @@ -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': diff --git a/RecoBTag/ImpactParameter/python/impactParameter_cff.py b/RecoBTag/ImpactParameter/python/impactParameter_cff.py index 72519fec0aafa..a17895b180f5c 100644 --- a/RecoBTag/ImpactParameter/python/impactParameter_cff.py +++ b/RecoBTag/ImpactParameter/python/impactParameter_cff.py @@ -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 * diff --git a/RecoBTag/ImpactParameter/python/pfImpactParameterTagInfosAK8_cfi.py b/RecoBTag/ImpactParameter/python/pfImpactParameterAK8TagInfos_cfi.py similarity index 80% rename from RecoBTag/ImpactParameter/python/pfImpactParameterTagInfosAK8_cfi.py rename to RecoBTag/ImpactParameter/python/pfImpactParameterAK8TagInfos_cfi.py index 41d956abe3e12..dfd219d5a5c0d 100644 --- a/RecoBTag/ImpactParameter/python/pfImpactParameterTagInfosAK8_cfi.py +++ b/RecoBTag/ImpactParameter/python/pfImpactParameterAK8TagInfos_cfi.py @@ -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"), diff --git a/RecoBTag/ImpactParameter/python/pfImpactParameterTagInfosCA15_cfi.py b/RecoBTag/ImpactParameter/python/pfImpactParameterCA15TagInfos_cfi.py similarity index 81% rename from RecoBTag/ImpactParameter/python/pfImpactParameterTagInfosCA15_cfi.py rename to RecoBTag/ImpactParameter/python/pfImpactParameterCA15TagInfos_cfi.py index 1c27e4da1e4ab..e535e66696fbb 100644 --- a/RecoBTag/ImpactParameter/python/pfImpactParameterTagInfosCA15_cfi.py +++ b/RecoBTag/ImpactParameter/python/pfImpactParameterCA15TagInfos_cfi.py @@ -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"), diff --git a/RecoBTag/SecondaryVertex/python/pfBoostedDoubleSecondaryVertexAK8BJetTags_cfi.py b/RecoBTag/SecondaryVertex/python/pfBoostedDoubleSecondaryVertexAK8BJetTags_cfi.py index 21cb9bbb8ae42..68c4ab048260e 100644 --- a/RecoBTag/SecondaryVertex/python/pfBoostedDoubleSecondaryVertexAK8BJetTags_cfi.py +++ b/RecoBTag/SecondaryVertex/python/pfBoostedDoubleSecondaryVertexAK8BJetTags_cfi.py @@ -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")) ) diff --git a/RecoBTag/SecondaryVertex/python/pfBoostedDoubleSecondaryVertexCA15BJetTags_cfi.py b/RecoBTag/SecondaryVertex/python/pfBoostedDoubleSecondaryVertexCA15BJetTags_cfi.py index 85a93ac5443bf..5ad579cd2a2a3 100644 --- a/RecoBTag/SecondaryVertex/python/pfBoostedDoubleSecondaryVertexCA15BJetTags_cfi.py +++ b/RecoBTag/SecondaryVertex/python/pfBoostedDoubleSecondaryVertexCA15BJetTags_cfi.py @@ -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")) ) diff --git a/RecoBTag/SecondaryVertex/python/pfInclusiveSecondaryVertexFinderTagInfosAK8_cfi.py b/RecoBTag/SecondaryVertex/python/pfInclusiveSecondaryVertexFinderAK8TagInfos_cfi.py similarity index 52% rename from RecoBTag/SecondaryVertex/python/pfInclusiveSecondaryVertexFinderTagInfosAK8_cfi.py rename to RecoBTag/SecondaryVertex/python/pfInclusiveSecondaryVertexFinderAK8TagInfos_cfi.py index b3cee1da103ac..4e0226d416e66 100644 --- a/RecoBTag/SecondaryVertex/python/pfInclusiveSecondaryVertexFinderTagInfosAK8_cfi.py +++ b/RecoBTag/SecondaryVertex/python/pfInclusiveSecondaryVertexFinderAK8TagInfos_cfi.py @@ -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) diff --git a/RecoBTag/SecondaryVertex/python/pfInclusiveSecondaryVertexFinderTagInfosCA15_cfi.py b/RecoBTag/SecondaryVertex/python/pfInclusiveSecondaryVertexFinderCA15TagInfos_cfi.py similarity index 53% rename from RecoBTag/SecondaryVertex/python/pfInclusiveSecondaryVertexFinderTagInfosCA15_cfi.py rename to RecoBTag/SecondaryVertex/python/pfInclusiveSecondaryVertexFinderCA15TagInfos_cfi.py index 291277edd75ba..606f574932844 100644 --- a/RecoBTag/SecondaryVertex/python/pfInclusiveSecondaryVertexFinderTagInfosCA15_cfi.py +++ b/RecoBTag/SecondaryVertex/python/pfInclusiveSecondaryVertexFinderCA15TagInfos_cfi.py @@ -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) diff --git a/RecoBTag/SecondaryVertex/python/secondaryVertex_cff.py b/RecoBTag/SecondaryVertex/python/secondaryVertex_cff.py index fecbb013719f7..2e112f8d31958 100644 --- a/RecoBTag/SecondaryVertex/python/secondaryVertex_cff.py +++ b/RecoBTag/SecondaryVertex/python/secondaryVertex_cff.py @@ -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