diff --git a/[refs] b/[refs] index 56db7cd71ef6a..63f57feca6e1f 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/vhbbHeppy74X: 985977830e8a10ce5697523e40274fd284cd3e85 +refs/heads/vhbbHeppy74X: 04c08d4a9400727e241e7d581e30c2850750cb12 diff --git a/trunk/RecoBTag/SecondaryVertex/python/secondaryVertex_cff.py b/trunk/RecoBTag/SecondaryVertex/python/secondaryVertex_cff.py index adb8f0e090ba3..4d24bc1c7b6fe 100644 --- a/trunk/RecoBTag/SecondaryVertex/python/secondaryVertex_cff.py +++ b/trunk/RecoBTag/SecondaryVertex/python/secondaryVertex_cff.py @@ -5,8 +5,6 @@ from RecoBTag.SecondaryVertex.secondaryVertexTagInfos_cfi import * from RecoBTag.SecondaryVertex.simpleSecondaryVertex2TrkES_cfi import * from RecoBTag.SecondaryVertex.simpleSecondaryVertex3TrkES_cfi import * -from RecoBTag.SecondaryVertex.doubleVertex2TrkES_cfi import * -from RecoBTag.SecondaryVertex.doubleSecondaryVertexHighEffBJetTags_cfi import * from RecoBTag.SecondaryVertex.simpleSecondaryVertexHighEffBJetTags_cfi import * from RecoBTag.SecondaryVertex.simpleSecondaryVertexHighPurBJetTags_cfi import * from RecoBTag.SecondaryVertex.combinedSecondaryVertexES_cfi import * @@ -17,7 +15,7 @@ from RecoBTag.SecondaryVertex.ghostTrackES_cfi import * from RecoBTag.SecondaryVertex.ghostTrackBJetTags_cfi import * -#IVF +# IVF from RecoBTag.SecondaryVertex.inclusiveSecondaryVertexFinderTagInfos_cfi import * from RecoBTag.SecondaryVertex.combinedInclusiveSecondaryVertexBJetTags_cfi import * #from RecoBTag.SecondaryVertex.combinedIVFES_cfi import * #not yet using dedicated training, share CSV ones @@ -27,14 +25,22 @@ inclusiveMergedVerticesFiltered.secondaryVertices = cms.InputTag("inclusiveMergedVertices") from RecoBTag.SecondaryVertex.bToCharmDecayVertexMerger_cfi import * - from RecoBTag.SecondaryVertex.simpleInclusiveSecondaryVertexBJetTags_cfi import * +from RecoBTag.SecondaryVertex.doubleVertex2TrkES_cfi import * +from RecoBTag.SecondaryVertex.doubleSecondaryVertexHighEffBJetTags_cfi import * -#negative taggers +# Negative taggers from RecoBTag.SecondaryVertex.secondaryVertexNegativeTagInfos_cfi import * from RecoBTag.SecondaryVertex.simpleSecondaryVertexNegativeHighEffBJetTags_cfi import * from RecoBTag.SecondaryVertex.simpleSecondaryVertexNegativeHighPurBJetTags_cfi import * +from RecoBTag.SecondaryVertex.combinedSecondaryVertexNegativeES_cfi import * +from RecoBTag.SecondaryVertex.combinedSecondaryVertexNegativeBJetTags_cfi import * + +# Positive taggers +from RecoBTag.SecondaryVertex.combinedSecondaryVertexPositiveES_cfi import * +from RecoBTag.SecondaryVertex.combinedSecondaryVertexPositiveBJetTags_cfi import * +from RecoBTag.SecondaryVertex.combinedInclusiveSecondaryVertexPositiveBJetTags_cfi import * -# backwards compatibility +# Backwards compatibility simpleSecondaryVertexBJetTags = simpleSecondaryVertexHighEffBJetTags.clone()