Merge pull request #5449 from cms-btv-pog/PATJetBTagDiscriminatorsUpd…

…ate_from-CMSSW_7_2_0_pre6

Added combinedMVABJetTags and removed combinedSecondaryVertexMVABJetTags from reco sequence, added bugfix for pfTagInfos, updated PAT/miniAOD configs: Forward port from 7_2_X to 7_3_X

DQMOffline/RecoB/python/bTagCommon_cff.py

@@ -88,11 +88,6 @@
             label = cms.InputTag("combinedSecondaryVertexBJetTags"),
             folder = cms.string("CSV")
         ),
-        cms.PSet(
-            bTagGenericAnalysisBlock,
-            label = cms.InputTag("combinedSecondaryVertexMVABJetTags"),
-            folder = cms.string("CSVMVA")
-        ),
         cms.PSet(
             bTagGenericAnalysisBlock,
             label = cms.InputTag("ghostTrackBJetTags"),

DQMOffline/RecoB/test/compare.C

@@ -37,7 +37,6 @@ void drawAll()
   algos.push_back("simpleSecondaryVertexHighEffBJetTags");
   algos.push_back("simpleSecondaryVertexHighPurBJetTags");
   algos.push_back("combinedSecondaryVertexBJetTags");
-  algos.push_back("combinedSecondaryVertexMVABJetTags");
   algos.push_back("ghostTrackBJetTags");
   algos.push_back("softMuonBJetTags");
   algos.push_back("softMuonNoIPBJetTags");

PhysicsTools/PatAlgos/python/recoLayer0/bTagging_cff.py

@@ -77,7 +77,7 @@
   , 'doubleSecondaryVertexHighEffBJetTags'                  : ['inclusiveSecondaryVertexFinderFilteredTagInfos']
   , 'combinedInclusiveSecondaryVertexBJetTags'              : ['impactParameterTagInfos', 'inclusiveSecondaryVertexFinderTagInfos']
   , 'combinedInclusiveSecondaryVertexPositiveBJetTags'      : ['impactParameterTagInfos', 'inclusiveSecondaryVertexFinderTagInfos']
-  #, 'combinedMVABJetTags'                                   : ['impactParameterTagInfos', 'inclusiveSecondaryVertexFinderTagInfos', 'softPFMuonsTagInfos', 'softPFElectronsTagInfos']
+  , 'combinedMVABJetTags'                                   : ['impactParameterTagInfos', 'inclusiveSecondaryVertexFinderTagInfos', 'softPFMuonsTagInfos', 'softPFElectronsTagInfos']
   , 'positiveCombinedMVABJetTags'                           : ['impactParameterTagInfos', 'inclusiveSecondaryVertexFinderTagInfos', 'softPFMuonsTagInfos', 'softPFElectronsTagInfos']
   , 'negativeCombinedMVABJetTags'                           : ['impactParameterTagInfos', 'inclusiveSecondaryVertexFinderTagInfos', 'softPFMuonsTagInfos', 'softPFElectronsTagInfos']
   #, 'combinedSecondaryVertexSoftPFLeptonV1BJetTags'         : ['impactParameterTagInfos', 'secondaryVertexTagInfos', 'softPFMuonsTagInfos', 'softPFElectronsTagInfos']

PhysicsTools/PatAlgos/test/miniAOD/example_addJet.py

@@ -33,11 +33,12 @@
    jetCorrections = ('AK5PFchs', cms.vstring(['L1FastJet', 'L2Relative', 'L3Absolute']), 'Type-2'),
    btagDiscriminators = [      'combinedSecondaryVertexBJetTags'     ]
    )
-process.patJetPartonMatchPatJetsAK5PFCHS.matched = "prunedGenParticles"
-process.patJetPartons.src = "prunedGenParticles"
-process.patJetPartons.skipFirstN = cms.uint32(0) # do not skip first 6 particles, we already pruned some!
-process.patJetPartons.acceptNoDaughters = cms.bool(True) # as we drop intermediate stuff, we need to accept quarks with no siblings
-process.patJetCorrFactorsPatJetsAK5PFCHS.primaryVertices = "offlineSlimmedPrimaryVertices"
+process.patJetPartonMatchAK5PFCHS.matched = "prunedGenParticles"
+process.patJetPartons.particles = "prunedGenParticles"
+process.patJetPartonsLegacy.src = "prunedGenParticles" # if using legacy jet flavour (not used by default)
+process.patJetPartonsLegacy.skipFirstN = cms.uint32(0) # do not skip first 6 particles, we already pruned some!
+process.patJetPartonsLegacy.acceptNoDaughters = cms.bool(True) # as we drop intermediate stuff, we need to accept quarks with no siblings
+process.patJetCorrFactorsAK5PFCHS.primaryVertices = "offlineSlimmedPrimaryVertices"
 
 #recreate tracks and pv for btagging
 process.load('PhysicsTools.PatAlgos.slimming.unpackedTracksAndVertices_cfi')

PhysicsTools/PatAlgos/test/miniAOD/example_ei.py

@@ -80,9 +80,10 @@
 process.patJetGenJetMatchAK4PFCHS.matched = "slimmedGenJets"
 process.patJetPartonMatchAK4PFCHS.matched = "prunedGenParticles"
 process.patJetPartonMatchAK4PF.matched = "prunedGenParticles"
-process.patJetPartons.particles  = "prunedGenParticles"
-process.patJetPartons.skipFirstN = cms.uint32(0) # do not skip first 6 particles, we already pruned some!
-process.patJetPartons.acceptNoDaughters = cms.bool(True) # as we drop intermediate stuff, we need to accept quarks with no siblings
+process.patJetPartons.particles = "prunedGenParticles"
+process.patJetPartonsLegacy.src = "prunedGenParticles" # if using legacy jet flavour (not used by default)
+process.patJetPartonsLegacy.skipFirstN = cms.uint32(0) # do not skip first 6 particles, we already pruned some!
+process.patJetPartonsLegacy.acceptNoDaughters = cms.bool(True) # as we drop intermediate stuff, we need to accept quarks with no siblings
 
 #adjust PV
 process.patJetCorrFactorsAK4PFCHS.primaryVertices = "offlineSlimmedPrimaryVertices"

PhysicsTools/PatAlgos/test/patTuple_addBTagging_cfg.py

@@ -32,6 +32,7 @@
       ,'simpleSecondaryVertexHighPurBJetTags'
       ,'simpleSecondaryVertexNegativeHighEffBJetTags'
       ,'simpleSecondaryVertexNegativeHighPurBJetTags'
+      ,'pfCombinedSecondaryVertexBJetTags'
       ,'combinedSecondaryVertexBJetTags'
       ,'combinedSecondaryVertexPositiveBJetTags'
       ,'combinedInclusiveSecondaryVertexV2BJetTags'
@@ -68,7 +69,7 @@
       ,'doubleSecondaryVertexHighEffBJetTags'
       ,'combinedInclusiveSecondaryVertexBJetTags'
       ,'combinedInclusiveSecondaryVertexPositiveBJetTags'
-      #,'combinedMVABJetTags'
+      ,'combinedMVABJetTags'
       ,'positiveCombinedMVABJetTags'
       ,'negativeCombinedMVABJetTags'
     ],

RecoBTag/Configuration/python/RecoBTag_EventContent_cff.py

@@ -15,7 +15,6 @@
         'keep *_simpleSecondaryVertexHighEffBJetTags_*_*',
         'keep *_simpleSecondaryVertexHighPurBJetTags_*_*',
         'keep *_combinedSecondaryVertexBJetTags_*_*',
-        'keep *_combinedSecondaryVertexMVABJetTags_*_*',
         'keep *_combinedInclusiveSecondaryVertexV2BJetTags_*_*',
         'keep *_ghostTrackBJetTags_*_*',
         'keep *_softPFMuonsTagInfos_*_*',
@@ -26,9 +25,10 @@
         'keep *_softMuonBJetTags_*_*',
         'keep *_softMuonByIP3dBJetTags_*_*',
         'keep *_softMuonByPtBJetTags_*_*',
-	'keep *_pfImpactParameterTagInfos_*_*',
-	'keep *_pfSecondaryVertexTagInfos_*_*',
-	'keep *_pfCombinedSecondaryVertexBJetTags_*_*'
+        'keep *_combinedMVABJetTags_*_*',
+        'keep *_pfImpactParameterTagInfos_*_*',
+        'keep *_pfSecondaryVertexTagInfos_*_*',
+        'keep *_pfCombinedSecondaryVertexBJetTags_*_*'
     )
 )
 #RECO content
@@ -46,7 +46,6 @@
         'keep *_simpleSecondaryVertexHighEffBJetTags_*_*',
         'keep *_simpleSecondaryVertexHighPurBJetTags_*_*',
         'keep *_combinedSecondaryVertexBJetTags_*_*',
-        'keep *_combinedSecondaryVertexMVABJetTags_*_*',
         'keep *_combinedInclusiveSecondaryVertexV2BJetTags_*_*',
         'keep *_ghostTrackBJetTags_*_*',
         'keep *_softPFMuonsTagInfos_*_*',
@@ -57,9 +56,10 @@
         'keep *_softMuonBJetTags_*_*',
         'keep *_softMuonByIP3dBJetTags_*_*',
         'keep *_softMuonByPtBJetTags_*_*',
-	'keep *_pfImpactParameterTagInfos_*_*',
-	'keep *_pfSecondaryVertexTagInfos_*_*',
-	'keep *_pfCombinedSecondaryVertexBJetTags_*_*'
+        'keep *_combinedMVABJetTags_*_*',
+        'keep *_pfImpactParameterTagInfos_*_*',
+        'keep *_pfSecondaryVertexTagInfos_*_*',
+        'keep *_pfCombinedSecondaryVertexBJetTags_*_*'
     )
 )
 #AOD content
@@ -77,19 +77,19 @@
         'keep *_simpleSecondaryVertexHighEffBJetTags_*_*',
         'keep *_simpleSecondaryVertexHighPurBJetTags_*_*',
         'keep *_combinedSecondaryVertexBJetTags_*_*',
-        'keep *_combinedSecondaryVertexMVABJetTags_*_*',
         'keep *_combinedInclusiveSecondaryVertexV2BJetTags_*_*',
         'keep *_ghostTrackBJetTags_*_*',
 #        'keep *_btagSoftElectrons_*_*',
-##        'keep *_softElectronCands_*_*',
-##        'keep *_softPFElectrons_*_*',
+#        'keep *_softElectronCands_*_*',
+#        'keep *_softPFElectrons_*_*',
 #       'keep *_softElectronTagInfos_*_*',
         'keep *_softPFElectronBJetTags_*_*',
         'keep *_softPFMuonBJetTags_*_*',
 #        'keep *_softMuonTagInfos_*_*',
         'keep *_softMuonBJetTags_*_*',
         'keep *_softMuonByIP3dBJetTags_*_*',
         'keep *_softMuonByPtBJetTags_*_*',
-	'keep *_pfCombinedSecondaryVertexBJetTags_*_*'
+        'keep *_combinedMVABJetTags_*_*',
+        'keep *_pfCombinedSecondaryVertexBJetTags_*_*'
     )
 )

RecoBTag/Configuration/python/RecoBTag_cff.py

@@ -19,29 +19,27 @@
         secondaryVertexTagInfos *
         ( simpleSecondaryVertexHighEffBJetTags +
           simpleSecondaryVertexHighPurBJetTags +
-          combinedSecondaryVertexBJetTags  
-          + combinedSecondaryVertexMVABJetTags
+          combinedSecondaryVertexBJetTags
         )
-	+ inclusiveSecondaryVertexFinderTagInfos *
-	combinedInclusiveSecondaryVertexV2BJetTags
-
-	+ ghostTrackVertexTagInfos *
-          ghostTrackBJetTags
-      ) +
+        + inclusiveSecondaryVertexFinderTagInfos *
+        combinedInclusiveSecondaryVertexV2BJetTags
 
-
-	softPFMuonsTagInfos*
-	softPFMuonBJetTags *
-	softPFElectronsTagInfos*
-	softPFElectronBJetTags *
+        + ghostTrackVertexTagInfos *
+        ghostTrackBJetTags
+      ) +
 
-#new candidate model, with PF inputs	
-	pfImpactParameterTagInfos *
-	pfSecondaryVertexTagInfos *
-	pfCombinedSecondaryVertexBJetTags
-	
+      # soft lepton tag infos and algos
+      softPFMuonsTagInfos *
+      softPFMuonBJetTags
+      + softPFElectronsTagInfos *
+      softPFElectronBJetTags
     )
 
     # overall combined taggers
-    # * combinedMVABJetTags
+    * combinedMVABJetTags
+
+    # new candidate model, with PF inputs	
+    + pfImpactParameterTagInfos *
+    pfSecondaryVertexTagInfos *
+    pfCombinedSecondaryVertexBJetTags
 )

RecoBTag/ImpactParameter/python/pfImpactParameter_cfi.py

@@ -14,7 +14,7 @@
     useTrackQuality = cms.bool(False),
     maximumChiSquared = cms.double(5.0),
 #this is candidate specific
-    jets = cms.InputTag("ak4PFJets"),
+    jets = cms.InputTag("ak4PFJetsCHS"),
     candidates = cms.InputTag("particleFlow"),
     maxDeltaR= cms.double(0.4),
 

Validation/RecoB/test/GridValidation/compare.C

@@ -70,7 +70,6 @@ TGraphErrors *  drawAll()
   algos.push_back("jetBProbabilityBJetTags");
   algos.push_back("simpleSecondaryVertexBJetTags");
   algos.push_back("combinedSecondaryVertexBJetTags");
-  algos.push_back("combinedSecondaryVertexMVABJetTags");
   algos.push_back("softMuonBJetTags");
   algos.push_back("softMuonByIP3dBJetTags");
   algos.push_back("softMuonByPtBJetTags");

Validation/RecoB/test/compare.C

@@ -70,7 +70,6 @@ TGraphErrors *  drawAll()
   algos.push_back("jetBProbabilityBJetTags");
   algos.push_back("simpleSecondaryVertexBJetTags");
   algos.push_back("combinedSecondaryVertexBJetTags");
-  algos.push_back("combinedSecondaryVertexMVABJetTags");
   algos.push_back("softMuonBJetTags");
   algos.push_back("softMuonByIP3dBJetTags");
   algos.push_back("softMuonByPtBJetTags");