diff --git a/PhysicsTools/PatAlgos/python/tools/jetTools.py b/PhysicsTools/PatAlgos/python/tools/jetTools.py index c38b2f43af7f9..46b590dc13c16 100644 --- a/PhysicsTools/PatAlgos/python/tools/jetTools.py +++ b/PhysicsTools/PatAlgos/python/tools/jetTools.py @@ -292,7 +292,7 @@ def toolCode(self, process): if 'inclusiveSecondaryVertexFinderFilteredTagInfos' in acceptedTagInfos: if not hasattr( process, 'inclusiveVertexing' ): process.load( 'RecoVertex.AdaptiveVertexFinder.inclusiveVertexing_cff' ) - if not hasattr( process, 'inclusiveVerticesFiltered' ): + if not hasattr( process, 'inclusiveSecondaryVerticesFiltered' ): process.load( 'RecoBTag.SecondaryVertex.secondaryVertex_cff' ) if not hasattr( process, 'bToCharmDecayVertexMerged' ): process.load( 'RecoBTag.SecondaryVertex.bToCharmDecayVertexMerger_cfi' ) diff --git a/RecoBTag/SecondaryVertex/python/bToCharmDecayVertexMerger_cfi.py b/RecoBTag/SecondaryVertex/python/bToCharmDecayVertexMerger_cfi.py index 69ba021e8e8b9..e399fb6431ca7 100644 --- a/RecoBTag/SecondaryVertex/python/bToCharmDecayVertexMerger_cfi.py +++ b/RecoBTag/SecondaryVertex/python/bToCharmDecayVertexMerger_cfi.py @@ -2,7 +2,7 @@ bToCharmDecayVertexMerged = cms.EDProducer("BtoCharmDecayVertexMerger", primaryVertices = cms.InputTag("offlinePrimaryVertices"), - secondaryVertices = cms.InputTag("inclusiveVerticesFiltered"), + secondaryVertices = cms.InputTag("inclusiveSecondaryVerticesFiltered"), minDRUnique = cms.untracked.double(0.4), minvecSumIMifsmallDRUnique = cms.untracked.double(5.5), minCosPAtomerge = cms.untracked.double(0.99), diff --git a/RecoBTag/SecondaryVertex/python/inclusiveSecondaryVertexFinderTagInfos_cfi.py b/RecoBTag/SecondaryVertex/python/inclusiveSecondaryVertexFinderTagInfos_cfi.py index 9a2d1e3a54768..ee48cea0a258a 100644 --- a/RecoBTag/SecondaryVertex/python/inclusiveSecondaryVertexFinderTagInfos_cfi.py +++ b/RecoBTag/SecondaryVertex/python/inclusiveSecondaryVertexFinderTagInfos_cfi.py @@ -5,7 +5,7 @@ inclusiveSecondaryVertexFinderTagInfos = secondaryVertexTagInfos.clone() # use external SV collection made from IVF -inclusiveSecondaryVertexFinderTagInfos.extSVCollection = cms.InputTag('inclusiveVertices') +inclusiveSecondaryVertexFinderTagInfos.extSVCollection = cms.InputTag('inclusiveSecondaryVertices') inclusiveSecondaryVertexFinderTagInfos.extSVDeltaRToJet = cms.double(0.3) inclusiveSecondaryVertexFinderTagInfos.useExternalSV = cms.bool(True) inclusiveSecondaryVertexFinderTagInfos.vertexCuts.fracPV = 0.79 ## 4 out of 5 is discarded diff --git a/RecoBTag/SecondaryVertex/python/secondaryVertex_cff.py b/RecoBTag/SecondaryVertex/python/secondaryVertex_cff.py index 8d52a66477cc1..2ba38c98af4da 100644 --- a/RecoBTag/SecondaryVertex/python/secondaryVertex_cff.py +++ b/RecoBTag/SecondaryVertex/python/secondaryVertex_cff.py @@ -20,9 +20,9 @@ from RecoBTag.SecondaryVertex.combinedInclusiveSecondaryVertexBJetTags_cfi import * #from RecoBTag.SecondaryVertex.combinedIVFES_cfi import * #not yet using dedicated training, share CSV ones from RecoBTag.SecondaryVertex.bVertexFilter_cfi import * -inclusiveVerticesFiltered = bVertexFilter.clone() -inclusiveVerticesFiltered.vertexFilter.multiplicityMin = 2 -inclusiveVerticesFiltered.secondaryVertices = cms.InputTag("inclusiveVertices") +inclusiveSecondaryVerticesFiltered = bVertexFilter.clone() +inclusiveSecondaryVerticesFiltered.vertexFilter.multiplicityMin = 2 +inclusiveSecondaryVerticesFiltered.secondaryVertices = cms.InputTag("inclusiveSecondaryVertices") from RecoBTag.SecondaryVertex.bToCharmDecayVertexMerger_cfi import * from RecoBTag.SecondaryVertex.simpleInclusiveSecondaryVertexBJetTags_cfi import * diff --git a/RecoVertex/AdaptiveVertexFinder/python/inclusiveVertexing_cff.py b/RecoVertex/AdaptiveVertexFinder/python/inclusiveVertexing_cff.py index 4b58580d2cde2..078025e0847e9 100644 --- a/RecoVertex/AdaptiveVertexFinder/python/inclusiveVertexing_cff.py +++ b/RecoVertex/AdaptiveVertexFinder/python/inclusiveVertexing_cff.py @@ -4,10 +4,10 @@ from RecoVertex.AdaptiveVertexFinder.vertexMerger_cfi import * from RecoVertex.AdaptiveVertexFinder.trackVertexArbitrator_cfi import * -inclusiveVertices = vertexMerger.clone() -inclusiveVertices.secondaryVertices = cms.InputTag("trackVertexArbitrator") -inclusiveVertices.maxFraction = 0.2 -inclusiveVertices.minSignificance = 10. +inclusiveSecondaryVertices = vertexMerger.clone() +inclusiveSecondaryVertices.secondaryVertices = cms.InputTag("trackVertexArbitrator") +inclusiveSecondaryVertices.maxFraction = 0.2 +inclusiveSecondaryVertices.minSignificance = 10. -inclusiveVertexing = cms.Sequence(inclusiveVertexFinder*vertexMerger*trackVertexArbitrator*inclusiveVertices) +inclusiveVertexing = cms.Sequence(inclusiveVertexFinder*vertexMerger*trackVertexArbitrator*inclusiveSecondaryVertices)