AVR-based CSVv2 taggers, updated SV TagInfos in MiniAOD

PhysicsTools/PatAlgos/python/producersLayer1/jetProducer_cfi.py

@@ -36,6 +36,7 @@
     addBTagInfo          = cms.bool(True),   ## master switch
     addDiscriminators    = cms.bool(True),   ## addition btag discriminators
     discriminatorSources = cms.VInputTag(
+        cms.InputTag("combinedSecondaryVertexBJetTags"),
         cms.InputTag("pfJetBProbabilityBJetTags"),
         cms.InputTag("pfJetProbabilityBJetTags"),
         cms.InputTag("pfTrackCountingHighPurBJetTags"),

PhysicsTools/PatAlgos/python/recoLayer0/bTagging_cff.py

@@ -46,6 +46,9 @@
   , 'combinedSecondaryVertexBJetTags'                       : ['impactParameterTagInfos', 'secondaryVertexTagInfos']
   , 'positiveCombinedSecondaryVertexBJetTags'               : ['impactParameterTagInfos', 'secondaryVertexTagInfos']
   , 'negativeCombinedSecondaryVertexBJetTags'               : ['impactParameterTagInfos', 'secondaryVertexNegativeTagInfos']
+  , 'combinedSecondaryVertexV2BJetTags'                     : ['impactParameterTagInfos', 'secondaryVertexTagInfos']
+  , 'positiveCombinedSecondaryVertexV2BJetTags'             : ['impactParameterTagInfos', 'secondaryVertexTagInfos']
+  , 'negativeCombinedSecondaryVertexV2BJetTags'             : ['impactParameterTagInfos', 'secondaryVertexNegativeTagInfos']
   , 'simpleInclusiveSecondaryVertexHighEffBJetTags'         : ['inclusiveSecondaryVertexFinderFilteredTagInfos']
   , 'simpleInclusiveSecondaryVertexHighPurBJetTags'         : ['inclusiveSecondaryVertexFinderFilteredTagInfos']
   , 'negativeSimpleInclusiveSecondaryVertexHighEffBJetTags' : ['inclusiveSecondaryVertexFinderFilteredNegativeTagInfos']
@@ -102,6 +105,9 @@
   , 'pfCombinedSecondaryVertexBJetTags'                     : ['pfImpactParameterTagInfos', 'pfSecondaryVertexTagInfos']
   , 'pfPositiveCombinedSecondaryVertexBJetTags'             : ['pfImpactParameterTagInfos', 'pfSecondaryVertexTagInfos']
   , 'pfNegativeCombinedSecondaryVertexBJetTags'             : ['pfImpactParameterTagInfos', 'pfSecondaryVertexNegativeTagInfos']
+  , 'pfCombinedSecondaryVertexV2BJetTags'                   : ['pfImpactParameterTagInfos', 'pfSecondaryVertexTagInfos']
+  , 'pfPositiveCombinedSecondaryVertexV2BJetTags'           : ['pfImpactParameterTagInfos', 'pfSecondaryVertexTagInfos']
+  , 'pfNegativeCombinedSecondaryVertexV2BJetTags'           : ['pfImpactParameterTagInfos', 'pfSecondaryVertexNegativeTagInfos']
   , 'pfCombinedInclusiveSecondaryVertexBJetTags'            : ['pfImpactParameterTagInfos', 'pfInclusiveSecondaryVertexFinderTagInfos']
   , 'pfPositiveCombinedInclusiveSecondaryVertexBJetTags'    : ['pfImpactParameterTagInfos', 'pfInclusiveSecondaryVertexFinderTagInfos']
   , 'pfNegativeCombinedInclusiveSecondaryVertexBJetTags'    : ['pfImpactParameterTagInfos', 'pfInclusiveSecondaryVertexFinderNegativeTagInfos']

PhysicsTools/PatAlgos/python/slimming/miniAOD_tools.py

@@ -136,19 +136,19 @@ def miniAOD_customizeCommon(process):
     #keep this after all addJetCollections otherwise it will attempt computing them also for stuf with no taginfos
     #Some useful BTAG vars
     process.patJets.userData.userFunctions = cms.vstring(
-    '?(tagInfoSecondaryVertex().nVertices()>0)?(tagInfoSecondaryVertex().secondaryVertex(0).p4.M):(0)',
-    '?(tagInfoSecondaryVertex().nVertices()>0)?(tagInfoSecondaryVertex().secondaryVertex(0).nTracks):(0)',
-    '?(tagInfoSecondaryVertex().nVertices()>0)?(tagInfoSecondaryVertex().flightDistance(0).value):(0)',
-    '?(tagInfoSecondaryVertex().nVertices()>0)?(tagInfoSecondaryVertex().flightDistance(0).significance):(0)',
-    '?(tagInfoSecondaryVertex().nVertices()>0)?(tagInfoSecondaryVertex().secondaryVertex(0).p4.x):(0)',
-    '?(tagInfoSecondaryVertex().nVertices()>0)?(tagInfoSecondaryVertex().secondaryVertex(0).p4.y):(0)',
-    '?(tagInfoSecondaryVertex().nVertices()>0)?(tagInfoSecondaryVertex().secondaryVertex(0).p4.z):(0)',
-    '?(tagInfoSecondaryVertex().nVertices()>0)?(tagInfoSecondaryVertex().secondaryVertex(0).position.x):(0)',
-    '?(tagInfoSecondaryVertex().nVertices()>0)?(tagInfoSecondaryVertex().secondaryVertex(0).position.y):(0)',
-    '?(tagInfoSecondaryVertex().nVertices()>0)?(tagInfoSecondaryVertex().secondaryVertex(0).position.z):(0)',
+    '?(tagInfoCandSecondaryVertex("pfSecondaryVertex").nVertices()>0)?(tagInfoCandSecondaryVertex("pfSecondaryVertex").secondaryVertex(0).p4.M):(0)',
+    '?(tagInfoCandSecondaryVertex("pfSecondaryVertex").nVertices()>0)?(tagInfoCandSecondaryVertex("pfSecondaryVertex").secondaryVertex(0).numberOfSourceCandidatePtrs):(0)',
+    '?(tagInfoCandSecondaryVertex("pfSecondaryVertex").nVertices()>0)?(tagInfoCandSecondaryVertex("pfSecondaryVertex").flightDistance(0).value):(0)',
+    '?(tagInfoCandSecondaryVertex("pfSecondaryVertex").nVertices()>0)?(tagInfoCandSecondaryVertex("pfSecondaryVertex").flightDistance(0).significance):(0)',
+    '?(tagInfoCandSecondaryVertex("pfSecondaryVertex").nVertices()>0)?(tagInfoCandSecondaryVertex("pfSecondaryVertex").secondaryVertex(0).p4.x):(0)',
+    '?(tagInfoCandSecondaryVertex("pfSecondaryVertex").nVertices()>0)?(tagInfoCandSecondaryVertex("pfSecondaryVertex").secondaryVertex(0).p4.y):(0)',
+    '?(tagInfoCandSecondaryVertex("pfSecondaryVertex").nVertices()>0)?(tagInfoCandSecondaryVertex("pfSecondaryVertex").secondaryVertex(0).p4.z):(0)',
+    '?(tagInfoCandSecondaryVertex("pfSecondaryVertex").nVertices()>0)?(tagInfoCandSecondaryVertex("pfSecondaryVertex").secondaryVertex(0).vertex.x):(0)',
+    '?(tagInfoCandSecondaryVertex("pfSecondaryVertex").nVertices()>0)?(tagInfoCandSecondaryVertex("pfSecondaryVertex").secondaryVertex(0).vertex.y):(0)',
+    '?(tagInfoCandSecondaryVertex("pfSecondaryVertex").nVertices()>0)?(tagInfoCandSecondaryVertex("pfSecondaryVertex").secondaryVertex(0).vertex.z):(0)',
     )
     process.patJets.userData.userFunctionLabels = cms.vstring('vtxMass','vtxNtracks','vtx3DVal','vtx3DSig','vtxPx','vtxPy','vtxPz','vtxPosX','vtxPosY','vtxPosZ')
-    process.patJets.tagInfoSources = cms.VInputTag(cms.InputTag("secondaryVertexTagInfos"))
+    process.patJets.tagInfoSources = cms.VInputTag(cms.InputTag("pfSecondaryVertexTagInfos"))
     process.patJets.addTagInfos = cms.bool(True)
     #
     ## PU JetID

PhysicsTools/PatAlgos/test/patTuple_addBTagging_cfg.py

@@ -31,6 +31,9 @@
     ,'combinedSecondaryVertexBJetTags'
     ,'positiveCombinedSecondaryVertexBJetTags'
     ,'negativeCombinedSecondaryVertexBJetTags'
+    ,'combinedSecondaryVertexV2BJetTags'
+    ,'positiveCombinedSecondaryVertexV2BJetTags'
+    ,'negativeCombinedSecondaryVertexV2BJetTags'
     ,'simpleInclusiveSecondaryVertexHighEffBJetTags'
     ,'simpleInclusiveSecondaryVertexHighPurBJetTags'
     ,'negativeSimpleInclusiveSecondaryVertexHighEffBJetTags'
@@ -87,6 +90,9 @@
     ,'pfCombinedSecondaryVertexBJetTags'
     ,'pfPositiveCombinedSecondaryVertexBJetTags'
     ,'pfNegativeCombinedSecondaryVertexBJetTags'
+    ,'pfCombinedSecondaryVertexV2BJetTags'
+    ,'pfPositiveCombinedSecondaryVertexV2BJetTags'
+    ,'pfNegativeCombinedSecondaryVertexV2BJetTags'
     ,'pfCombinedInclusiveSecondaryVertexBJetTags'
     ,'pfPositiveCombinedInclusiveSecondaryVertexBJetTags'
     ,'pfNegativeCombinedInclusiveSecondaryVertexBJetTags'

RecoBTag/Configuration/python/RecoBTag_EventContent_cff.py

@@ -36,6 +36,7 @@
         'keep *_pfSimpleSecondaryVertexHighEffBJetTags_*_*',
         'keep *_pfSimpleSecondaryVertexHighPurBJetTags_*_*',
         'keep *_pfCombinedSecondaryVertexBJetTags_*_*',
+        'keep *_pfCombinedSecondaryVertexV2BJetTags_*_*',
         'keep *_pfCombinedInclusiveSecondaryVertexV2BJetTags_*_*',
         'keep *_pfCombinedMVABJetTags_*_*',
 ##	'keep *_pfCombinedSecondaryVertexSoftLeptonBJetTags_*_*',
@@ -79,6 +80,7 @@
         'keep *_pfSimpleSecondaryVertexHighEffBJetTags_*_*',
         'keep *_pfSimpleSecondaryVertexHighPurBJetTags_*_*',
         'keep *_pfCombinedSecondaryVertexBJetTags_*_*',
+        'keep *_pfCombinedSecondaryVertexV2BJetTags_*_*',
         'keep *_pfCombinedInclusiveSecondaryVertexV2BJetTags_*_*',
         'keep *_pfCombinedMVABJetTags_*_*',
 ##	'keep *_pfCombinedSecondaryVertexSoftLeptonBJetTags_*_*',
@@ -122,6 +124,7 @@
         'keep *_pfSimpleSecondaryVertexHighEffBJetTags_*_*',
         'keep *_pfSimpleSecondaryVertexHighPurBJetTags_*_*',
         'keep *_pfCombinedSecondaryVertexBJetTags_*_*',
+        'keep *_pfCombinedSecondaryVertexV2BJetTags_*_*',
         'keep *_pfCombinedInclusiveSecondaryVertexV2BJetTags_*_*',
         'keep *_pfCombinedMVABJetTags_*_*',
 ##	'keep *_pfCombinedSecondaryVertexSoftLeptonBJetTags_*_*',

RecoBTag/Configuration/python/RecoBTag_cff.py

@@ -54,7 +54,8 @@
         pfSecondaryVertexTagInfos *
         ( pfSimpleSecondaryVertexHighEffBJetTags +
           pfSimpleSecondaryVertexHighPurBJetTags +
-          pfCombinedSecondaryVertexBJetTags
+          pfCombinedSecondaryVertexBJetTags +
+          pfCombinedSecondaryVertexV2BJetTags
         )
         + inclusiveCandidateVertexing *
         pfInclusiveSecondaryVertexFinderTagInfos *

RecoBTag/SecondaryVertex/python/combinedSecondaryVertexV2BJetTags_cfi.py

@@ -0,0 +1,7 @@
+import FWCore.ParameterSet.Config as cms
+
+combinedSecondaryVertexV2BJetTags = cms.EDProducer("JetTagProducer",
+	jetTagComputer = cms.string('combinedSecondaryVertexV2Computer'),
+	tagInfos = cms.VInputTag(cms.InputTag("impactParameterTagInfos"),
+	                         cms.InputTag("secondaryVertexTagInfos"))
+)

RecoBTag/SecondaryVertex/python/negativeCombinedSecondaryVertexV2BJetTags_cfi.py

@@ -0,0 +1,8 @@
+import FWCore.ParameterSet.Config as cms
+
+negativeCombinedSecondaryVertexV2BJetTags = cms.EDProducer("JetTagProducer",
+	jetTagComputer = cms.string('negativeCombinedSecondaryVertexV2Computer'),
+	tagInfos = cms.VInputTag(cms.InputTag("impactParameterTagInfos"),
+	                         cms.InputTag("secondaryVertexNegativeTagInfos"))
+)
+

RecoBTag/SecondaryVertex/python/pfCombinedSecondaryVertexV2BJetTags_cfi.py

@@ -0,0 +1,7 @@
+import FWCore.ParameterSet.Config as cms
+
+pfCombinedSecondaryVertexV2BJetTags = cms.EDProducer("JetTagProducer",
+    jetTagComputer = cms.string('candidateCombinedSecondaryVertexV2Computer'),
+    tagInfos = cms.VInputTag(cms.InputTag("pfImpactParameterTagInfos"), 
+			     cms.InputTag("pfSecondaryVertexTagInfos"))
+)

RecoBTag/SecondaryVertex/python/pfNegativeCombinedSecondaryVertexV2BJetTags_cfi.py

@@ -0,0 +1,7 @@
+import FWCore.ParameterSet.Config as cms
+
+pfNegativeCombinedSecondaryVertexV2BJetTags = cms.EDProducer("JetTagProducer",
+	jetTagComputer = cms.string('candidateNegativeCombinedSecondaryVertexV2Computer'),
+	tagInfos = cms.VInputTag(cms.InputTag("pfImpactParameterTagInfos"),
+	                         cms.InputTag("pfSecondaryVertexNegativeTagInfos"))
+)

RecoBTag/SecondaryVertex/python/pfPositiveCombinedSecondaryVertexV2BJetTags_cfi.py

@@ -0,0 +1,7 @@
+import FWCore.ParameterSet.Config as cms
+
+pfPositiveCombinedSecondaryVertexV2BJetTags = cms.EDProducer("JetTagProducer",
+	jetTagComputer = cms.string('candidatePositiveCombinedSecondaryVertexV2Computer'),
+	tagInfos = cms.VInputTag(cms.InputTag("pfImpactParameterTagInfos"),
+	                         cms.InputTag("pfSecondaryVertexTagInfos"))
+)

RecoBTag/SecondaryVertex/python/positiveCombinedSecondaryVertexV2BJetTags_cfi.py

@@ -0,0 +1,7 @@
+import FWCore.ParameterSet.Config as cms
+
+positiveCombinedSecondaryVertexV2BJetTags = cms.EDProducer("JetTagProducer",
+	jetTagComputer = cms.string('positiveCombinedSecondaryVertexV2Computer'),
+	tagInfos = cms.VInputTag(cms.InputTag("impactParameterTagInfos"),
+	                         cms.InputTag("secondaryVertexTagInfos"))
+)

RecoBTag/SecondaryVertex/python/secondaryVertex_cff.py

@@ -10,6 +10,7 @@
 from RecoBTag.SecondaryVertex.combinedSecondaryVertexComputer_cfi import *
 from RecoBTag.SecondaryVertex.combinedSecondaryVertexV2Computer_cfi import *
 from RecoBTag.SecondaryVertex.combinedSecondaryVertexBJetTags_cfi import *
+from RecoBTag.SecondaryVertex.combinedSecondaryVertexV2BJetTags_cfi import *
 from RecoBTag.SecondaryVertex.ghostTrackVertexTagInfos_cfi import *
 from RecoBTag.SecondaryVertex.ghostTrackComputer_cfi import *
 from RecoBTag.SecondaryVertex.ghostTrackBJetTags_cfi import *
@@ -42,13 +43,15 @@
 from RecoBTag.SecondaryVertex.negativeCombinedSecondaryVertexComputer_cfi import *
 from RecoBTag.SecondaryVertex.negativeCombinedSecondaryVertexV2Computer_cfi import *
 from RecoBTag.SecondaryVertex.negativeCombinedSecondaryVertexBJetTags_cfi import *
+from RecoBTag.SecondaryVertex.negativeCombinedSecondaryVertexV2BJetTags_cfi import *
 from RecoBTag.SecondaryVertex.negativeCombinedInclusiveSecondaryVertexBJetTags_cfi import *
 from RecoBTag.SecondaryVertex.negativeCombinedInclusiveSecondaryVertexV2BJetTags_cfi import *
 
 # Positive taggers
 from RecoBTag.SecondaryVertex.positiveCombinedSecondaryVertexComputer_cfi import *
 from RecoBTag.SecondaryVertex.positiveCombinedSecondaryVertexV2Computer_cfi import *
 from RecoBTag.SecondaryVertex.positiveCombinedSecondaryVertexBJetTags_cfi import *
+from RecoBTag.SecondaryVertex.positiveCombinedSecondaryVertexV2BJetTags_cfi import *
 from RecoBTag.SecondaryVertex.positiveCombinedInclusiveSecondaryVertexBJetTags_cfi import *
 from RecoBTag.SecondaryVertex.positiveCombinedInclusiveSecondaryVertexV2BJetTags_cfi import *
 
@@ -63,6 +66,7 @@
 from RecoBTag.SecondaryVertex.pfSimpleSecondaryVertexHighEffBJetTags_cfi import *
 from RecoBTag.SecondaryVertex.pfSimpleSecondaryVertexHighPurBJetTags_cfi import *
 from RecoBTag.SecondaryVertex.pfCombinedSecondaryVertexBJetTags_cfi import *
+from RecoBTag.SecondaryVertex.pfCombinedSecondaryVertexV2BJetTags_cfi import *
 from RecoBTag.SecondaryVertex.pfInclusiveSecondaryVertexFinderTagInfos_cfi import *
 from RecoBTag.SecondaryVertex.pfCombinedInclusiveSecondaryVertexBJetTags_cfi import *
 from RecoBTag.SecondaryVertex.pfCombinedInclusiveSecondaryVertexV2BJetTags_cfi import *
@@ -81,6 +85,7 @@
 from RecoBTag.SecondaryVertex.candidateNegativeCombinedSecondaryVertexSoftLeptonCtagLComputer_cfi import *
 from RecoBTag.SecondaryVertex.pfNegativeCombinedSecondaryVertexSoftLeptonCtagLJetTags_cfi import *
 from RecoBTag.SecondaryVertex.pfNegativeCombinedSecondaryVertexBJetTags_cfi import *
+from RecoBTag.SecondaryVertex.pfNegativeCombinedSecondaryVertexV2BJetTags_cfi import *
 from RecoBTag.SecondaryVertex.pfNegativeCombinedInclusiveSecondaryVertexBJetTags_cfi import *
 from RecoBTag.SecondaryVertex.pfNegativeCombinedInclusiveSecondaryVertexV2BJetTags_cfi import *
 from RecoBTag.SecondaryVertex.pfNegativeCombinedSecondaryVertexSoftLeptonBJetTags_cfi import *
@@ -92,6 +97,7 @@
 from RecoBTag.SecondaryVertex.candidatePositiveCombinedSecondaryVertexSoftLeptonComputer_cfi import *
 from RecoBTag.SecondaryVertex.candidatePositiveCombinedSecondaryVertexSoftLeptonCtagLComputer_cfi import *
 from RecoBTag.SecondaryVertex.pfPositiveCombinedSecondaryVertexBJetTags_cfi import *
+from RecoBTag.SecondaryVertex.pfPositiveCombinedSecondaryVertexV2BJetTags_cfi import *
 from RecoBTag.SecondaryVertex.pfPositiveCombinedInclusiveSecondaryVertexBJetTags_cfi import *
 from RecoBTag.SecondaryVertex.pfPositiveCombinedInclusiveSecondaryVertexV2BJetTags_cfi import *
 from RecoBTag.SecondaryVertex.pfPositiveCombinedSecondaryVertexSoftLeptonBJetTags_cfi import *