Remove legacy b-taggers from the standard reco

CommonTools/ParticleFlow/python/EITopPAG_EventContent_cff.py

@@ -10,10 +10,7 @@
     # jets
     'keep recoPFJets_pfJetsEI_*_*',
     # btags
-    'keep *_pfJetTrackAssociatorEI_*_*',
-    'keep *_impactParameterTagInfosEI_*_*',
-    'keep *_secondaryVertexTagInfosEI_*_*',
-    'keep *_combinedSecondaryVertexBJetTagsEI_*_*',
+    'keep *_pfCombinedInclusiveSecondaryVertexV2BJetTagsEI_*_*',
     # taus 
     'keep recoPFTaus_pfTausEI_*_*',
     'keep recoPFTauDiscriminator_pfTausDiscrimination*_*_*',

CommonTools/ParticleFlow/python/EITopPAG_cff.py

@@ -17,10 +17,9 @@
 
 
 # b-tagging
-from RecoJets.JetAssociationProducers.ak4JTA_cff import ak4JetTracksAssociatorAtVertex
-from RecoBTag.ImpactParameter.impactParameterTagInfos_cfi import impactParameterTagInfos
-from RecoBTag.SecondaryVertex.secondaryVertexTagInfos_cfi import secondaryVertexTagInfos
-from RecoBTag.SecondaryVertex.combinedSecondaryVertexBJetTags_cfi import combinedSecondaryVertexBJetTags
+from RecoBTag.ImpactParameter.pfImpactParameterTagInfos_cfi import pfImpactParameterTagInfos
+from RecoBTag.SecondaryVertex.pfInclusiveSecondaryVertexFinderTagInfos_cfi import pfInclusiveSecondaryVertexFinderTagInfos
+from RecoBTag.SecondaryVertex.pfCombinedInclusiveSecondaryVertexV2BJetTags_cfi import pfCombinedInclusiveSecondaryVertexV2BJetTags
 
 
 #### PU Again... need to do this twice because the "linking" stage of PF reco ####
@@ -134,18 +133,15 @@
     )
 
 #### B-tagging ####
-pfJetTrackAssociatorEI = ak4JetTracksAssociatorAtVertex.clone (
-    src = cms.InputTag("pfJetsEI")
+pfImpactParameterTagInfosEI = pfImpactParameterTagInfos.clone(
+    jets = cms.InputTag( 'pfJetsEI' )
     )
-impactParameterTagInfosEI = impactParameterTagInfos.clone(
-    jetTracks = cms.InputTag( 'pfJetTrackAssociatorEI' )
+pfInclusiveSecondaryVertexFinderTagInfosEI = pfInclusiveSecondaryVertexFinderTagInfos.clone(
+    trackIPTagInfos = cms.InputTag( 'pfImpactParameterTagInfosEI' )
     )
-secondaryVertexTagInfosEI = secondaryVertexTagInfos.clone(
-    trackIPTagInfos = cms.InputTag( 'impactParameterTagInfosEI' )
-    )
-combinedSecondaryVertexBJetTagsEI = combinedSecondaryVertexBJetTags.clone(
-    tagInfos = cms.VInputTag(cms.InputTag("impactParameterTagInfosEI"),
-                             cms.InputTag("secondaryVertexTagInfosEI"))
+pfCombinedInclusiveSecondaryVertexV2BJetTagsEI = pfCombinedInclusiveSecondaryVertexV2BJetTags.clone(
+    tagInfos = cms.VInputTag(cms.InputTag("pfImpactParameterTagInfosEI"),
+                             cms.InputTag("pfInclusiveSecondaryVertexFinderTagInfosEI"))
     )
 
 
@@ -174,9 +170,8 @@
     pfTauEISequence +
     pfNoTauEI +
     pfMetEI+
-    pfJetTrackAssociatorEI+
-    impactParameterTagInfosEI+
-    secondaryVertexTagInfosEI+
-    combinedSecondaryVertexBJetTagsEI
+    pfImpactParameterTagInfosEI+
+    pfInclusiveSecondaryVertexFinderTagInfosEI+
+    pfCombinedInclusiveSecondaryVertexV2BJetTagsEI
     )
 

DQM/Physics/python/singleTopDQM_cfi.py

@@ -196,20 +196,20 @@
       ## when omitted monitor histograms for b-tagging will not be filled                                                                                                   
       jetBTaggers  = cms.PSet(
         trackCountingEff = cms.PSet(
-          label = cms.InputTag("trackCountingHighEffBJetTags" ),
+          label = cms.InputTag("pfTrackCountingHighEffBJetTags" ),
           workingPoint = cms.double(1.25)
         ),
         trackCountingPur = cms.PSet(
-         label = cms.InputTag("trackCountingHighPurBJetTags" ),
+          label = cms.InputTag("pfTrackCountingHighPurBJetTags" ),
           workingPoint = cms.double(3.41)
         ),
         secondaryVertex  = cms.PSet(
-          label = cms.InputTag("simpleSecondaryVertexHighEffBJetTags"),
+          label = cms.InputTag("pfSimpleSecondaryVertexHighEffBJetTags"),
           workingPoint = cms.double(2.05)
         ),
         combinedSecondaryVertex  = cms.PSet(
-          label = cms.InputTag("combinedSecondaryVertexBJetTags"),
-          workingPoint = cms.double(0.898)
+          label = cms.InputTag("pfCombinedInclusiveSecondaryVertexV2BJetTags"),
+          workingPoint = cms.double(0.970)
         )
      )                                                
    )
@@ -357,20 +357,20 @@
       ## when omitted monitor histograms for b-tagging will not be filled
       jetBTaggers  = cms.PSet(
         trackCountingEff = cms.PSet(
-          label = cms.InputTag("trackCountingHighEffBJetTags" ),
+          label = cms.InputTag("pfTrackCountingHighEffBJetTags" ),
           workingPoint = cms.double(1.25)
         ),
         trackCountingPur = cms.PSet(
-          label = cms.InputTag("trackCountingHighPurBJetTags" ),
+          label = cms.InputTag("pfTrackCountingHighPurBJetTags" ),
           workingPoint = cms.double(3.41)
         ),
         secondaryVertex  = cms.PSet(
-          label = cms.InputTag("simpleSecondaryVertexHighEffBJetTags"),
+          label = cms.InputTag("pfSimpleSecondaryVertexHighEffBJetTags"),
           workingPoint = cms.double(2.05)
         ),
         combinedSecondaryVertex  = cms.PSet(
-          label = cms.InputTag("combinedSecondaryVertexBJetTags"),
-          workingPoint = cms.double(0.898)
+          label = cms.InputTag("pfCombinedInclusiveSecondaryVertexV2BJetTags"),
+          workingPoint = cms.double(0.970)
         )
       )
     ),

DQM/Physics/python/topSingleLeptonDQM_PU_cfi.py

@@ -187,21 +187,21 @@
       ## when omitted monitor histograms for b-tagging will not be filled 
       jetBTaggers  = cms.PSet(
         trackCountingEff = cms.PSet(
-          label = cms.InputTag("trackCountingHighEffBJetTags" ),
+          label = cms.InputTag("pfTrackCountingHighEffBJetTags" ),
           workingPoint = cms.double(1.25)
         ),
         trackCountingPur = cms.PSet(
-          label = cms.InputTag("trackCountingHighPurBJetTags" ),
+          label = cms.InputTag("pfTrackCountingHighPurBJetTags" ),
           workingPoint = cms.double(3.00)
         ),
         secondaryVertex  = cms.PSet(
-          label = cms.InputTag("simpleSecondaryVertexHighEffBJetTags"),
+          label = cms.InputTag("pfSimpleSecondaryVertexHighEffBJetTags"),
           workingPoint = cms.double(2.05)
 	    ),
 		cvsVertex = cms.PSet(
-          label = cms.InputTag("combinedSecondaryVertexBJetTags"),
-	          workingPoint = cms.double(0.898)
-	          # CSV Tight from https://twiki.cern.ch/twiki/bin/viewauth/CMS/BTagPerformanceOP#B_tagging_Operating_Points_for_5 
+          label = cms.InputTag("pfCombinedInclusiveSecondaryVertexV2BJetTags"),
+	          workingPoint = cms.double(0.970)
+	          # CSV Tight from https://twiki.cern.ch/twiki/bin/viewauth/CMS/BtagRecommendation74X
         )
       ),
     ),
@@ -351,21 +351,21 @@
       ## when omitted monitor histograms for b-tagging will not be filled                                                                                                   
       jetBTaggers  = cms.PSet(
         trackCountingEff = cms.PSet(
-          label = cms.InputTag("trackCountingHighEffBJetTags" ),
+          label = cms.InputTag("pfTrackCountingHighEffBJetTags" ),
           workingPoint = cms.double(1.25)
         ),
         trackCountingPur = cms.PSet(
-          label = cms.InputTag("trackCountingHighPurBJetTags" ),
+          label = cms.InputTag("pfTrackCountingHighPurBJetTags" ),
           workingPoint = cms.double(3.00)
         ),
         secondaryVertex  = cms.PSet(
-          label = cms.InputTag("simpleSecondaryVertexHighEffBJetTags"),
+          label = cms.InputTag("pfSimpleSecondaryVertexHighEffBJetTags"),
           workingPoint = cms.double(2.05)
 	    ),
 		cvsVertex = cms.PSet(
-          label = cms.InputTag("combinedSecondaryVertexBJetTags"),
-	          workingPoint = cms.double(0.898)
-	          # CSV Tight from https://twiki.cern.ch/twiki/bin/viewauth/CMS/BTagPerformanceOP#B_tagging_Operating_Points_for_5 
+          label = cms.InputTag("pfCombinedInclusiveSecondaryVertexV2BJetTags"),
+	          workingPoint = cms.double(0.970)
+	          # CSV Tight from https://twiki.cern.ch/twiki/bin/viewauth/CMS/BtagRecommendation74X
         )
       ),                                                
     ),
@@ -517,21 +517,21 @@
       ## when omitted monitor histograms for b-tagging will not be filled                                                   
       jetBTaggers  = cms.PSet(
         trackCountingEff = cms.PSet(
-          label = cms.InputTag("trackCountingHighEffBJetTags" ),
+          label = cms.InputTag("pfTrackCountingHighEffBJetTags" ),
           workingPoint = cms.double(1.25)
         ),
         trackCountingPur = cms.PSet(
-          label = cms.InputTag("trackCountingHighPurBJetTags" ),
+          label = cms.InputTag("pfTrackCountingHighPurBJetTags" ),
           workingPoint = cms.double(3.00)
         ),
         secondaryVertex  = cms.PSet(
-          label = cms.InputTag("simpleSecondaryVertexHighEffBJetTags"),
+          label = cms.InputTag("pfSimpleSecondaryVertexHighEffBJetTags"),
           workingPoint = cms.double(2.05)
 	    ),
 		cvsVertex = cms.PSet(
-          label = cms.InputTag("combinedSecondaryVertexBJetTags"),
-	          workingPoint = cms.double(0.898)
-	          # CSV Tight from https://twiki.cern.ch/twiki/bin/viewauth/CMS/BTagPerformanceOP#B_tagging_Operating_Points_for_5 
+          label = cms.InputTag("pfCombinedInclusiveSecondaryVertexV2BJetTags"),
+	          workingPoint = cms.double(0.970)
+	          # CSV Tight from https://twiki.cern.ch/twiki/bin/viewauth/CMS/BtagRecommendation74X
         )
       ),
     ),
@@ -679,21 +679,21 @@
       ## when omitted monitor histograms for b-tagging will not be filled
       jetBTaggers  = cms.PSet(
         trackCountingEff = cms.PSet(
-          label = cms.InputTag("trackCountingHighEffBJetTags" ),
+          label = cms.InputTag("pfTrackCountingHighEffBJetTags" ),
           workingPoint = cms.double(1.25)
         ),
         trackCountingPur = cms.PSet(
-          label = cms.InputTag("trackCountingHighPurBJetTags" ),
+          label = cms.InputTag("pfTrackCountingHighPurBJetTags" ),
           workingPoint = cms.double(3.00)
         ),
         secondaryVertex  = cms.PSet(
-          label = cms.InputTag("simpleSecondaryVertexHighEffBJetTags"),
+          label = cms.InputTag("pfSimpleSecondaryVertexHighEffBJetTags"),
           workingPoint = cms.double(2.05)
 	    ),
 		cvsVertex = cms.PSet(
-          label = cms.InputTag("combinedSecondaryVertexBJetTags"),
-	          workingPoint = cms.double(0.898)
-	          # CSV Tight from https://twiki.cern.ch/twiki/bin/viewauth/CMS/BTagPerformanceOP#B_tagging_Operating_Points_for_5 
+          label = cms.InputTag("pfCombinedInclusiveSecondaryVertexV2BJetTags"),
+	          workingPoint = cms.double(0.970)
+	          # CSV Tight from https://twiki.cern.ch/twiki/bin/viewauth/CMS/BtagRecommendation74X
         )
       ),
     ),

DQM/Physics/python/topSingleLeptonDQM_cfi.py

@@ -197,21 +197,21 @@
       ## when omitted monitor histograms for b-tagging will not be filled 
       jetBTaggers  = cms.PSet(
         trackCountingEff = cms.PSet(
-          label = cms.InputTag("trackCountingHighEffBJetTags" ),
+          label = cms.InputTag("pfTrackCountingHighEffBJetTags" ),
           workingPoint = cms.double(1.25)
         ),
         trackCountingPur = cms.PSet(
-          label = cms.InputTag("trackCountingHighPurBJetTags" ),
+          label = cms.InputTag("pfTrackCountingHighPurBJetTags" ),
           workingPoint = cms.double(3.00)
         ),
         secondaryVertex  = cms.PSet(
-          label = cms.InputTag("simpleSecondaryVertexHighEffBJetTags"),
+          label = cms.InputTag("pfSimpleSecondaryVertexHighEffBJetTags"),
           workingPoint = cms.double(2.05)
         ),
         cvsVertex = cms.PSet(
-          label = cms.InputTag("combinedSecondaryVertexBJetTags"),
-          workingPoint = cms.double(0.898) 
-          # CSV Tight from https://twiki.cern.ch/twiki/bin/viewauth/CMS/BTagPerformanceOP#B_tagging_Operating_Points_for_5
+          label = cms.InputTag("pfCombinedInclusiveSecondaryVertexV2BJetTags"),
+          workingPoint = cms.double(0.970) 
+          # CSV Tight from https://twiki.cern.ch/twiki/bin/viewauth/CMS/BtagRecommendation74X
         )
       ),
     ),
@@ -374,21 +374,21 @@
       ## when omitted monitor histograms for b-tagging will not be filled                                                                                                   
       jetBTaggers  = cms.PSet(
         trackCountingEff = cms.PSet(
-          label = cms.InputTag("trackCountingHighEffBJetTags" ),
+          label = cms.InputTag("pfTrackCountingHighEffBJetTags" ),
           workingPoint = cms.double(1.25)
         ),
         trackCountingPur = cms.PSet(
-          label = cms.InputTag("trackCountingHighPurBJetTags" ),
+          label = cms.InputTag("pfTrackCountingHighPurBJetTags" ),
           workingPoint = cms.double(3.00)
         ),
         secondaryVertex  = cms.PSet(
-          label = cms.InputTag("simpleSecondaryVertexHighEffBJetTags"),
+          label = cms.InputTag("pfSimpleSecondaryVertexHighEffBJetTags"),
           workingPoint = cms.double(2.05)
         ),
         cvsVertex = cms.PSet(
-          label = cms.InputTag("combinedSecondaryVertexBJetTags"),
-          workingPoint = cms.double(0.898) 
-          # CSV Tight from https://twiki.cern.ch/twiki/bin/viewauth/CMS/BTagPerformanceOP#B_tagging_Operating_Points_for_5
+          label = cms.InputTag("pfCombinedInclusiveSecondaryVertexV2BJetTags"),
+          workingPoint = cms.double(0.970) 
+          # CSV Tight from https://twiki.cern.ch/twiki/bin/viewauth/CMS/BtagRecommendation74X
         )
       ),                                                
     ),
@@ -558,21 +558,21 @@
       ## when omitted monitor histograms for b-tagging will not be filled                                                   
       jetBTaggers  = cms.PSet(
         trackCountingEff = cms.PSet(
-          label = cms.InputTag("trackCountingHighEffBJetTags" ),
+          label = cms.InputTag("pfTrackCountingHighEffBJetTags" ),
           workingPoint = cms.double(1.25)
         ),
         trackCountingPur = cms.PSet(
-          label = cms.InputTag("trackCountingHighPurBJetTags" ),
+          label = cms.InputTag("pfTrackCountingHighPurBJetTags" ),
           workingPoint = cms.double(3.00)
         ),
         secondaryVertex  = cms.PSet(
-          label = cms.InputTag("simpleSecondaryVertexHighEffBJetTags"),
+          label = cms.InputTag("pfSimpleSecondaryVertexHighEffBJetTags"),
           workingPoint = cms.double(2.05)
         ),
         cvsVertex = cms.PSet(
-          label = cms.InputTag("combinedSecondaryVertexBJetTags"),
-          workingPoint = cms.double(0.898) 
-          # CSV Tight from https://twiki.cern.ch/twiki/bin/viewauth/CMS/BTagPerformanceOP#B_tagging_Operating_Points_for_5
+          label = cms.InputTag("pfCombinedInclusiveSecondaryVertexV2BJetTags"),
+          workingPoint = cms.double(0.970) 
+          # CSV Tight from https://twiki.cern.ch/twiki/bin/viewauth/CMS/BtagRecommendation74X
         )
       ),
     ),
@@ -733,21 +733,21 @@
       ## when omitted monitor histograms for b-tagging will not be filled
       jetBTaggers  = cms.PSet(
         trackCountingEff = cms.PSet(
-          label = cms.InputTag("trackCountingHighEffBJetTags" ),
+          label = cms.InputTag("pfTrackCountingHighEffBJetTags" ),
           workingPoint = cms.double(1.25)
         ),
         trackCountingPur = cms.PSet(
-          label = cms.InputTag("trackCountingHighPurBJetTags" ),
+          label = cms.InputTag("pfTrackCountingHighPurBJetTags" ),
           workingPoint = cms.double(3.00)
         ),
         secondaryVertex  = cms.PSet(
-          label = cms.InputTag("simpleSecondaryVertexHighEffBJetTags"),
+          label = cms.InputTag("pfSimpleSecondaryVertexHighEffBJetTags"),
           workingPoint = cms.double(2.05)
         ),
         cvsVertex = cms.PSet(
-          label = cms.InputTag("combinedSecondaryVertexBJetTags"),
-          workingPoint = cms.double(0.898) 
-          # CSV Tight from https://twiki.cern.ch/twiki/bin/viewauth/CMS/BTagPerformanceOP#B_tagging_Operating_Points_for_5
+          label = cms.InputTag("pfCombinedInclusiveSecondaryVertexV2BJetTags"),
+          workingPoint = cms.double(0.970) 
+          # CSV Tight from https://twiki.cern.ch/twiki/bin/viewauth/CMS/BtagRecommendation74X
         )
       ),
     ),

DQM/PhysicsHWW/python/hwwDQM_cfi.py

@@ -1,18 +1,14 @@
 from DQM.PhysicsHWW.hwwAnalyzer_cfi import *
-from RecoJets.JetAssociationProducers.ic5PFJetTracksAssociatorAtVertex_cfi import *
 from RecoBTag.Configuration.RecoBTag_cff import *
 
-PFJetTracksAssociatorAtVertex = ic5PFJetTracksAssociatorAtVertex.clone()
-PFJetTracksAssociatorAtVertex.jets = "ak4PFJets"
-PFJetTracksAssociatorAtVertex.tracks = "generalTracks"
-PFImpactParameterTagInfos = impactParameterTagInfos.clone()
-PFImpactParameterTagInfos.jetTracks = "PFJetTracksAssociatorAtVertex"
-PFTrackCountingHighEffBJetTags = trackCountingHighEffBJetTags.clone()
+PFImpactParameterTagInfos = pfImpactParameterTagInfos.clone()
+PFImpactParameterTagInfos.jets = "ak4PFJets"
+PFTrackCountingHighEffBJetTags = pfTrackCountingHighEffBJetTags.clone()
 PFTrackCountingHighEffBJetTags.tagInfos = cms.VInputTag( cms.InputTag("PFImpactParameterTagInfos") )
 
 SkipEvent = cms.untracked.vstring('ProductNotFound')
 
-hwwDQM = cms.Sequence(PFJetTracksAssociatorAtVertex*PFImpactParameterTagInfos*
+hwwDQM = cms.Sequence(PFImpactParameterTagInfos*
                       PFTrackCountingHighEffBJetTags*
                       hwwAnalyzer
                      )

DQMOffline/RecoB/python/bTagCommon_cff.py

@@ -86,11 +86,6 @@
             label = cms.InputTag("pfSimpleSecondaryVertexHighPurBJetTags"),
             folder = cms.string("SSVHP")
         ),
-        cms.PSet(
-            bTagGenericAnalysisBlock,
-            label = cms.InputTag("combinedSecondaryVertexBJetTags"),
-            folder = cms.string("CSV_tkOnly")
-        ),
         cms.PSet(
             bTagGenericAnalysisBlock,
             label = cms.InputTag("pfCombinedSecondaryVertexBJetTags"),