From 5b8ab89e46f50616f8921b23c53a0fe9fa632146 Mon Sep 17 00:00:00 2001 From: Dinko Ferencek Date: Wed, 9 Sep 2015 00:47:24 -0500 Subject: [PATCH 01/10] removing legacy b-taggers from the standard reco --- DQMOffline/RecoB/python/bTagCommon_cff.py | 10 +- .../python/RecoBTag_EventContent_cff.py | 104 +++++++++--------- RecoBTag/Configuration/python/RecoBTag_cff.py | 2 +- 3 files changed, 58 insertions(+), 58 deletions(-) diff --git a/DQMOffline/RecoB/python/bTagCommon_cff.py b/DQMOffline/RecoB/python/bTagCommon_cff.py index 81d456227d780..e1c90309569f1 100644 --- a/DQMOffline/RecoB/python/bTagCommon_cff.py +++ b/DQMOffline/RecoB/python/bTagCommon_cff.py @@ -86,11 +86,11 @@ 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("combinedSecondaryVertexBJetTags"), + #folder = cms.string("CSV_tkOnly") + #), cms.PSet( bTagGenericAnalysisBlock, label = cms.InputTag("pfCombinedSecondaryVertexBJetTags"), diff --git a/RecoBTag/Configuration/python/RecoBTag_EventContent_cff.py b/RecoBTag/Configuration/python/RecoBTag_EventContent_cff.py index c63466d2f551e..fab2a8b4b1dd0 100644 --- a/RecoBTag/Configuration/python/RecoBTag_EventContent_cff.py +++ b/RecoBTag/Configuration/python/RecoBTag_EventContent_cff.py @@ -3,29 +3,29 @@ #Full Event content RecoBTagFEVT = cms.PSet( outputCommands = cms.untracked.vstring( - 'keep *_impactParameterTagInfos_*_*', - 'keep *_trackCountingHighEffBJetTags_*_*', - 'keep *_trackCountingHighPurBJetTags_*_*', - 'keep *_jetProbabilityBJetTags_*_*', - 'keep *_jetBProbabilityBJetTags_*_*', - 'keep *_secondaryVertexTagInfos_*_*', - 'keep *_inclusiveSecondaryVertexFinderTagInfos_*_*', - 'keep *_ghostTrackVertexTagInfos_*_*', - 'keep *_simpleSecondaryVertexHighEffBJetTags_*_*', - 'keep *_simpleSecondaryVertexHighPurBJetTags_*_*', - 'keep *_combinedSecondaryVertexBJetTags_*_*', - 'keep *_combinedInclusiveSecondaryVertexV2BJetTags_*_*', - 'keep *_ghostTrackBJetTags_*_*', + #'keep *_impactParameterTagInfos_*_*', + #'keep *_trackCountingHighEffBJetTags_*_*', + #'keep *_trackCountingHighPurBJetTags_*_*', + #'keep *_jetProbabilityBJetTags_*_*', + #'keep *_jetBProbabilityBJetTags_*_*', + #'keep *_secondaryVertexTagInfos_*_*', + #'keep *_inclusiveSecondaryVertexFinderTagInfos_*_*', + #'keep *_ghostTrackVertexTagInfos_*_*', + #'keep *_simpleSecondaryVertexHighEffBJetTags_*_*', + #'keep *_simpleSecondaryVertexHighPurBJetTags_*_*', + #'keep *_combinedSecondaryVertexBJetTags_*_*', + #'keep *_combinedInclusiveSecondaryVertexV2BJetTags_*_*', + #'keep *_ghostTrackBJetTags_*_*', 'keep *_softPFMuonsTagInfos_*_*', 'keep *_softPFElectronsTagInfos_*_*', 'keep *_softPFElectronBJetTags_*_*', 'keep *_softPFMuonBJetTags_*_*', - 'keep *_softMuonTagInfos_*_*', - 'keep *_softMuonBJetTags_*_*', - 'keep *_softMuonByIP3dBJetTags_*_*', - 'keep *_softMuonByPtBJetTags_*_*', - 'keep *_combinedMVABJetTags_*_*', - 'keep *_combinedMVAV2BJetTags_*_*', + #'keep *_softMuonTagInfos_*_*', + #'keep *_softMuonBJetTags_*_*', + #'keep *_softMuonByIP3dBJetTags_*_*', + #'keep *_softMuonByPtBJetTags_*_*', + #'keep *_combinedMVABJetTags_*_*', + #'keep *_combinedMVAV2BJetTags_*_*', 'keep *_pfImpactParameterTagInfos_*_*', 'keep *_pfTrackCountingHighEffBJetTags_*_*', 'keep *_pfTrackCountingHighPurBJetTags_*_*', @@ -49,29 +49,29 @@ #RECO content RecoBTagRECO = cms.PSet( outputCommands = cms.untracked.vstring( - 'keep *_impactParameterTagInfos_*_*', - 'keep *_trackCountingHighEffBJetTags_*_*', - 'keep *_trackCountingHighPurBJetTags_*_*', - 'keep *_jetProbabilityBJetTags_*_*', - 'keep *_jetBProbabilityBJetTags_*_*', - 'keep *_secondaryVertexTagInfos_*_*', - 'keep *_inclusiveSecondaryVertexFinderTagInfos_*_*', - 'keep *_ghostTrackVertexTagInfos_*_*', - 'keep *_simpleSecondaryVertexHighEffBJetTags_*_*', - 'keep *_simpleSecondaryVertexHighPurBJetTags_*_*', - 'keep *_combinedSecondaryVertexBJetTags_*_*', - 'keep *_combinedInclusiveSecondaryVertexV2BJetTags_*_*', - 'keep *_ghostTrackBJetTags_*_*', + #'keep *_impactParameterTagInfos_*_*', + #'keep *_trackCountingHighEffBJetTags_*_*', + #'keep *_trackCountingHighPurBJetTags_*_*', + #'keep *_jetProbabilityBJetTags_*_*', + #'keep *_jetBProbabilityBJetTags_*_*', + #'keep *_secondaryVertexTagInfos_*_*', + #'keep *_inclusiveSecondaryVertexFinderTagInfos_*_*', + #'keep *_ghostTrackVertexTagInfos_*_*', + #'keep *_simpleSecondaryVertexHighEffBJetTags_*_*', + #'keep *_simpleSecondaryVertexHighPurBJetTags_*_*', + #'keep *_combinedSecondaryVertexBJetTags_*_*', + #'keep *_combinedInclusiveSecondaryVertexV2BJetTags_*_*', + #'keep *_ghostTrackBJetTags_*_*', 'keep *_softPFMuonsTagInfos_*_*', 'keep *_softPFElectronsTagInfos_*_*', 'keep *_softPFElectronBJetTags_*_*', 'keep *_softPFMuonBJetTags_*_*', - 'keep *_softMuonTagInfos_*_*', - 'keep *_softMuonBJetTags_*_*', - 'keep *_softMuonByIP3dBJetTags_*_*', - 'keep *_softMuonByPtBJetTags_*_*', - 'keep *_combinedMVABJetTags_*_*', - 'keep *_combinedMVAV2BJetTags_*_*', + #'keep *_softMuonTagInfos_*_*', + #'keep *_softMuonBJetTags_*_*', + #'keep *_softMuonByIP3dBJetTags_*_*', + #'keep *_softMuonByPtBJetTags_*_*', + #'keep *_combinedMVABJetTags_*_*', + #'keep *_combinedMVAV2BJetTags_*_*', 'keep *_pfImpactParameterTagInfos_*_*', 'keep *_pfTrackCountingHighEffBJetTags_*_*', 'keep *_pfTrackCountingHighPurBJetTags_*_*', @@ -96,28 +96,28 @@ RecoBTagAOD = cms.PSet( outputCommands = cms.untracked.vstring( # 'keep *_impactParameterTagInfos_*_*', - 'keep *_trackCountingHighEffBJetTags_*_*', - 'keep *_trackCountingHighPurBJetTags_*_*', - 'keep *_jetProbabilityBJetTags_*_*', - 'keep *_jetBProbabilityBJetTags_*_*', + #'keep *_trackCountingHighEffBJetTags_*_*', + #'keep *_trackCountingHighPurBJetTags_*_*', + #'keep *_jetProbabilityBJetTags_*_*', + #'keep *_jetBProbabilityBJetTags_*_*', # 'keep *_secondaryVertexTagInfos_*_*', # 'keep *_inclusiveSecondaryVertexFinderTagInfos_*_*', # 'keep *_ghostTrackVertexTagInfos_*_*', - 'keep *_simpleSecondaryVertexHighEffBJetTags_*_*', - 'keep *_simpleSecondaryVertexHighPurBJetTags_*_*', - 'keep *_combinedSecondaryVertexBJetTags_*_*', - 'keep *_combinedInclusiveSecondaryVertexV2BJetTags_*_*', - 'keep *_ghostTrackBJetTags_*_*', + #'keep *_simpleSecondaryVertexHighEffBJetTags_*_*', + #'keep *_simpleSecondaryVertexHighPurBJetTags_*_*', + #'keep *_combinedSecondaryVertexBJetTags_*_*', + #'keep *_combinedInclusiveSecondaryVertexV2BJetTags_*_*', + #'keep *_ghostTrackBJetTags_*_*', # 'keep *_softPFMuonsTagInfos_*_*', # 'keep *_softPFElectronsTagInfos_*_*', 'keep *_softPFElectronBJetTags_*_*', 'keep *_softPFMuonBJetTags_*_*', # 'keep *_softMuonTagInfos_*_*', - 'keep *_softMuonBJetTags_*_*', - 'keep *_softMuonByIP3dBJetTags_*_*', - 'keep *_softMuonByPtBJetTags_*_*', - 'keep *_combinedMVABJetTags_*_*', - 'keep *_combinedMVAV2BJetTags_*_*', + #'keep *_softMuonBJetTags_*_*', + #'keep *_softMuonByIP3dBJetTags_*_*', + #'keep *_softMuonByPtBJetTags_*_*', + #'keep *_combinedMVABJetTags_*_*', + #'keep *_combinedMVAV2BJetTags_*_*', # 'keep *_pfImpactParameterTagInfos_*_*', 'keep *_pfTrackCountingHighEffBJetTags_*_*', 'keep *_pfTrackCountingHighPurBJetTags_*_*', diff --git a/RecoBTag/Configuration/python/RecoBTag_cff.py b/RecoBTag/Configuration/python/RecoBTag_cff.py index de7446ab14cb3..394d15c247e1d 100644 --- a/RecoBTag/Configuration/python/RecoBTag_cff.py +++ b/RecoBTag/Configuration/python/RecoBTag_cff.py @@ -93,6 +93,6 @@ ) btagging = cms.Sequence( - legacyBTagging + + #legacyBTagging + pfBTagging #* pfCTagging ) From 1d15946d3947fe417e850218d829014de9798bba Mon Sep 17 00:00:00 2001 From: Dinko Ferencek Date: Wed, 9 Sep 2015 00:48:36 -0500 Subject: [PATCH 02/10] removing the legacy CSV tagger from the PAT jet configuration --- PhysicsTools/PatAlgos/python/producersLayer1/jetProducer_cfi.py | 1 - 1 file changed, 1 deletion(-) diff --git a/PhysicsTools/PatAlgos/python/producersLayer1/jetProducer_cfi.py b/PhysicsTools/PatAlgos/python/producersLayer1/jetProducer_cfi.py index 3c8f0d230276d..b11a99d8f7c79 100644 --- a/PhysicsTools/PatAlgos/python/producersLayer1/jetProducer_cfi.py +++ b/PhysicsTools/PatAlgos/python/producersLayer1/jetProducer_cfi.py @@ -36,7 +36,6 @@ 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"), From ae2cd93fa2f642bb7c42997b71ed4cf7bbeeff55 Mon Sep 17 00:00:00 2001 From: Dinko Ferencek Date: Wed, 9 Sep 2015 00:49:18 -0500 Subject: [PATCH 03/10] removed legacy b-taggers from the Higgs HLT DQM --- .../Higgs/python/hltHiggsValidator_cfi.py | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/HLTriggerOffline/Higgs/python/hltHiggsValidator_cfi.py b/HLTriggerOffline/Higgs/python/hltHiggsValidator_cfi.py index 252d0df87ba83..4e06b81fbe1f2 100644 --- a/HLTriggerOffline/Higgs/python/hltHiggsValidator_cfi.py +++ b/HLTriggerOffline/Higgs/python/hltHiggsValidator_cfi.py @@ -265,7 +265,7 @@ "HLT_L1_TripleJet_VBF_v" ), recJetLabel = cms.string("ak4PFJetsCHS"), - jetTagLabel = cms.string("pfCombinedSecondaryVertexBJetTags"), + jetTagLabel = cms.string("pfCombinedSecondaryVertexV2BJetTags"), # -- Analysis specific cuts minCandidates = cms.uint32(4), NminOneCuts = cms.untracked.vdouble(2.5, 240, 2.1, 0, 0, 0, 0, 0, 0, 95, 85, 70, 40), #dEtaqq, mqq, dPhibb, CSV1, CSV2, CSV3, maxCSV_jets, maxCSV_E, MET, pt1, pt2, pt3, pt4 @@ -276,7 +276,7 @@ "HLT_QuadPFJet_DoubleBTagCSV_VBF_Mqq240_v", ), recJetLabel = cms.string("ak4PFJetsCHS"), - jetTagLabel = cms.string("pfCombinedSecondaryVertexBJetTags"), + jetTagLabel = cms.string("pfCombinedSecondaryVertexV2BJetTags"), # -- Analysis specific cuts minCandidates = cms.uint32(4), NminOneCuts = cms.untracked.vdouble(2.5, 240, 2.1, 0.8, 0.5, 0, 0, 0, 0, 95, 85, 70, 40), #dEtaqq, mqq, dPhibb, CSV1, CSV2, CSV3, maxCSV_jets, maxCSV_E, MET, pt1, pt2, pt3, pt4 @@ -287,7 +287,7 @@ "HLT_QuadPFJet_SingleBTagCSV_VBF_Mqq500_v", ), recJetLabel = cms.string("ak4PFJetsCHS"), - jetTagLabel = cms.string("pfCombinedSecondaryVertexBJetTags"), + jetTagLabel = cms.string("pfCombinedSecondaryVertexV2BJetTags"), # -- Analysis specific cuts minCandidates = cms.uint32(4), NminOneCuts = cms.untracked.vdouble(5, 550, 1.0, 0.8, 0, 0, 0, 0, 0, 95, 85, 70, 40), #dEtaqq, mqq, dPhibb, CSV1, CSV2, CSV3, maxCSV_jets, maxCSV_E, MET, pt1, pt2, pt3, pt4 @@ -303,7 +303,7 @@ ), Jet_recCut = cms.string("pt > 10 && abs(eta) < 2.6"), recJetLabel = cms.string("ak4PFJetsCHS"), - jetTagLabel = cms.string("pfCombinedSecondaryVertexBJetTags"), + jetTagLabel = cms.string("pfCombinedSecondaryVertexV2BJetTags"), recPFMETLabel = cms.string("pfMet"), # -- Analysis specific cuts minCandidates = cms.uint32(1), @@ -317,7 +317,7 @@ "HLT_QuadJet45_DoubleBTagCSV0p67_v", ), recJetLabel = cms.string("ak4PFJetsCHS"), - jetTagLabel = cms.string("pfCombinedSecondaryVertexBJetTags"), + jetTagLabel = cms.string("pfCombinedSecondaryVertexV2BJetTags"), # -- Analysis specific cuts minCandidates = cms.uint32(4), NminOneCuts = cms.untracked.vdouble(0, 0, 0, 0.5, 0.5 , 0.5, 0, 0, 0, 0, 90, 0, 45), #dEtaqq, mqq, dPhibb, CSV1, CSV2, CSV3, maxCSV_jets, maxCSV_E, MET, pt1, pt2, pt3, pt4 @@ -331,7 +331,7 @@ ), recElecLabel = cms.string("gedGsfElectrons"), #recJetLabel = cms.string("ak4PFJetsCHS"), - #jetTagLabel = cms.string("pfCombinedSecondaryVertexBJetTags"), + #jetTagLabel = cms.string("pfCombinedSecondaryVertexV2BJetTags"), ## -- Analysis specific cuts minCandidates = cms.uint32(1), HtJetPtMin = cms.untracked.double(30), @@ -346,7 +346,7 @@ ), #recElecLabel = cms.string("gedGsfElectrons"), recJetLabel = cms.string("ak4PFJetsCHS"), - jetTagLabel = cms.string("pfCombinedSecondaryVertexBJetTags"), + jetTagLabel = cms.string("pfCombinedSecondaryVertexV2BJetTags"), ## -- Analysis specific cuts minCandidates = cms.uint32(6), ), @@ -367,7 +367,7 @@ "HLT_DoubleJetsC112_DoubleBTagCSV0p9_DoublePFJetsC112MaxDeta1p6_v", ), recJetLabel = cms.string("ak4PFJetsCHS"), - jetTagLabel = cms.string("combinedInclusiveSecondaryVertexV2BJetTags"), + jetTagLabel = cms.string("pfCombinedInclusiveSecondaryVertexV2BJetTags"), # -- Analysis specific cuts minCandidates = cms.uint32(3), NminOneCuts = cms.untracked.vdouble(0, 0, 0, 0.941, 0.941 , 0.00, 0, 0, 0, 100, 100, 0.0, 0.0), From 839ee561e6e1af10be46a9c4a486ff8ff8cc15a3 Mon Sep 17 00:00:00 2001 From: Dinko Ferencek Date: Thu, 10 Sep 2015 16:03:06 -0500 Subject: [PATCH 04/10] removing legacy b-taggers code from config files instead of commenting it out --- DQMOffline/RecoB/python/bTagCommon_cff.py | 5 -- .../python/RecoBTag_EventContent_cff.py | 57 ------------------- RecoBTag/Configuration/python/RecoBTag_cff.py | 1 - 3 files changed, 63 deletions(-) diff --git a/DQMOffline/RecoB/python/bTagCommon_cff.py b/DQMOffline/RecoB/python/bTagCommon_cff.py index e1c90309569f1..23911c58dabfb 100644 --- a/DQMOffline/RecoB/python/bTagCommon_cff.py +++ b/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"), diff --git a/RecoBTag/Configuration/python/RecoBTag_EventContent_cff.py b/RecoBTag/Configuration/python/RecoBTag_EventContent_cff.py index fab2a8b4b1dd0..88326ae3e8ddb 100644 --- a/RecoBTag/Configuration/python/RecoBTag_EventContent_cff.py +++ b/RecoBTag/Configuration/python/RecoBTag_EventContent_cff.py @@ -3,29 +3,10 @@ #Full Event content RecoBTagFEVT = cms.PSet( outputCommands = cms.untracked.vstring( - #'keep *_impactParameterTagInfos_*_*', - #'keep *_trackCountingHighEffBJetTags_*_*', - #'keep *_trackCountingHighPurBJetTags_*_*', - #'keep *_jetProbabilityBJetTags_*_*', - #'keep *_jetBProbabilityBJetTags_*_*', - #'keep *_secondaryVertexTagInfos_*_*', - #'keep *_inclusiveSecondaryVertexFinderTagInfos_*_*', - #'keep *_ghostTrackVertexTagInfos_*_*', - #'keep *_simpleSecondaryVertexHighEffBJetTags_*_*', - #'keep *_simpleSecondaryVertexHighPurBJetTags_*_*', - #'keep *_combinedSecondaryVertexBJetTags_*_*', - #'keep *_combinedInclusiveSecondaryVertexV2BJetTags_*_*', - #'keep *_ghostTrackBJetTags_*_*', 'keep *_softPFMuonsTagInfos_*_*', 'keep *_softPFElectronsTagInfos_*_*', 'keep *_softPFElectronBJetTags_*_*', 'keep *_softPFMuonBJetTags_*_*', - #'keep *_softMuonTagInfos_*_*', - #'keep *_softMuonBJetTags_*_*', - #'keep *_softMuonByIP3dBJetTags_*_*', - #'keep *_softMuonByPtBJetTags_*_*', - #'keep *_combinedMVABJetTags_*_*', - #'keep *_combinedMVAV2BJetTags_*_*', 'keep *_pfImpactParameterTagInfos_*_*', 'keep *_pfTrackCountingHighEffBJetTags_*_*', 'keep *_pfTrackCountingHighPurBJetTags_*_*', @@ -49,29 +30,10 @@ #RECO content RecoBTagRECO = cms.PSet( outputCommands = cms.untracked.vstring( - #'keep *_impactParameterTagInfos_*_*', - #'keep *_trackCountingHighEffBJetTags_*_*', - #'keep *_trackCountingHighPurBJetTags_*_*', - #'keep *_jetProbabilityBJetTags_*_*', - #'keep *_jetBProbabilityBJetTags_*_*', - #'keep *_secondaryVertexTagInfos_*_*', - #'keep *_inclusiveSecondaryVertexFinderTagInfos_*_*', - #'keep *_ghostTrackVertexTagInfos_*_*', - #'keep *_simpleSecondaryVertexHighEffBJetTags_*_*', - #'keep *_simpleSecondaryVertexHighPurBJetTags_*_*', - #'keep *_combinedSecondaryVertexBJetTags_*_*', - #'keep *_combinedInclusiveSecondaryVertexV2BJetTags_*_*', - #'keep *_ghostTrackBJetTags_*_*', 'keep *_softPFMuonsTagInfos_*_*', 'keep *_softPFElectronsTagInfos_*_*', 'keep *_softPFElectronBJetTags_*_*', 'keep *_softPFMuonBJetTags_*_*', - #'keep *_softMuonTagInfos_*_*', - #'keep *_softMuonBJetTags_*_*', - #'keep *_softMuonByIP3dBJetTags_*_*', - #'keep *_softMuonByPtBJetTags_*_*', - #'keep *_combinedMVABJetTags_*_*', - #'keep *_combinedMVAV2BJetTags_*_*', 'keep *_pfImpactParameterTagInfos_*_*', 'keep *_pfTrackCountingHighEffBJetTags_*_*', 'keep *_pfTrackCountingHighPurBJetTags_*_*', @@ -95,29 +57,10 @@ #AOD content RecoBTagAOD = cms.PSet( outputCommands = cms.untracked.vstring( -# 'keep *_impactParameterTagInfos_*_*', - #'keep *_trackCountingHighEffBJetTags_*_*', - #'keep *_trackCountingHighPurBJetTags_*_*', - #'keep *_jetProbabilityBJetTags_*_*', - #'keep *_jetBProbabilityBJetTags_*_*', -# 'keep *_secondaryVertexTagInfos_*_*', -# 'keep *_inclusiveSecondaryVertexFinderTagInfos_*_*', -# 'keep *_ghostTrackVertexTagInfos_*_*', - #'keep *_simpleSecondaryVertexHighEffBJetTags_*_*', - #'keep *_simpleSecondaryVertexHighPurBJetTags_*_*', - #'keep *_combinedSecondaryVertexBJetTags_*_*', - #'keep *_combinedInclusiveSecondaryVertexV2BJetTags_*_*', - #'keep *_ghostTrackBJetTags_*_*', # 'keep *_softPFMuonsTagInfos_*_*', # 'keep *_softPFElectronsTagInfos_*_*', 'keep *_softPFElectronBJetTags_*_*', 'keep *_softPFMuonBJetTags_*_*', -# 'keep *_softMuonTagInfos_*_*', - #'keep *_softMuonBJetTags_*_*', - #'keep *_softMuonByIP3dBJetTags_*_*', - #'keep *_softMuonByPtBJetTags_*_*', - #'keep *_combinedMVABJetTags_*_*', - #'keep *_combinedMVAV2BJetTags_*_*', # 'keep *_pfImpactParameterTagInfos_*_*', 'keep *_pfTrackCountingHighEffBJetTags_*_*', 'keep *_pfTrackCountingHighPurBJetTags_*_*', diff --git a/RecoBTag/Configuration/python/RecoBTag_cff.py b/RecoBTag/Configuration/python/RecoBTag_cff.py index 394d15c247e1d..d424c69abd238 100644 --- a/RecoBTag/Configuration/python/RecoBTag_cff.py +++ b/RecoBTag/Configuration/python/RecoBTag_cff.py @@ -93,6 +93,5 @@ ) btagging = cms.Sequence( - #legacyBTagging + pfBTagging #* pfCTagging ) From 87471ac35a81a89a85b841ecbb87803c720a11e4 Mon Sep 17 00:00:00 2001 From: Dinko Ferencek Date: Fri, 11 Sep 2015 13:14:22 -0500 Subject: [PATCH 05/10] updated legacy b-taggers in EITopPAG --- .../python/EITopPAG_EventContent_cff.py | 7 ++--- .../ParticleFlow/python/EITopPAG_cff.py | 31 ++++++++----------- 2 files changed, 16 insertions(+), 22 deletions(-) diff --git a/CommonTools/ParticleFlow/python/EITopPAG_EventContent_cff.py b/CommonTools/ParticleFlow/python/EITopPAG_EventContent_cff.py index ddbedd830c50a..cec063060f51c 100644 --- a/CommonTools/ParticleFlow/python/EITopPAG_EventContent_cff.py +++ b/CommonTools/ParticleFlow/python/EITopPAG_EventContent_cff.py @@ -10,10 +10,9 @@ # jets 'keep recoPFJets_pfJetsEI_*_*', # btags - 'keep *_pfJetTrackAssociatorEI_*_*', - 'keep *_impactParameterTagInfosEI_*_*', - 'keep *_secondaryVertexTagInfosEI_*_*', - 'keep *_combinedSecondaryVertexBJetTagsEI_*_*', + 'keep *_pfImpactParameterTagInfosEI_*_*', + 'keep *_pfInclusiveSecondaryVertexFinderTagInfosEI_*_*', + 'keep *_pfCombinedInclusiveSecondaryVertexV2BJetTagsEI_*_*', # taus 'keep recoPFTaus_pfTausEI_*_*', 'keep recoPFTauDiscriminator_pfTausDiscrimination*_*_*', diff --git a/CommonTools/ParticleFlow/python/EITopPAG_cff.py b/CommonTools/ParticleFlow/python/EITopPAG_cff.py index 0c9be5f07c1c2..e1e8821ab17e8 100644 --- a/CommonTools/ParticleFlow/python/EITopPAG_cff.py +++ b/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 ) From 804b6bb64bd5b56f21d38086ad1a2a04784e2acf Mon Sep 17 00:00:00 2001 From: Dinko Ferencek Date: Fri, 11 Sep 2015 13:14:45 -0500 Subject: [PATCH 06/10] updated legacy b-taggers in top DQM --- DQM/Physics/python/singleTopDQM_cfi.py | 20 ++++---- .../python/topSingleLeptonDQM_PU_cfi.py | 48 +++++++++---------- DQM/Physics/python/topSingleLeptonDQM_cfi.py | 48 +++++++++---------- .../python/singletopHLTEventDQM_cfi.py | 16 +++---- .../python/topSingleLeptonHLTEventDQM_cfi.py | 16 +++---- 5 files changed, 74 insertions(+), 74 deletions(-) diff --git a/DQM/Physics/python/singleTopDQM_cfi.py b/DQM/Physics/python/singleTopDQM_cfi.py index 87dca84762d79..64ec114614b3b 100644 --- a/DQM/Physics/python/singleTopDQM_cfi.py +++ b/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) ) ) ), diff --git a/DQM/Physics/python/topSingleLeptonDQM_PU_cfi.py b/DQM/Physics/python/topSingleLeptonDQM_PU_cfi.py index b25126704388b..4f739f892ccdf 100644 --- a/DQM/Physics/python/topSingleLeptonDQM_PU_cfi.py +++ b/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 ) ), ), diff --git a/DQM/Physics/python/topSingleLeptonDQM_cfi.py b/DQM/Physics/python/topSingleLeptonDQM_cfi.py index b464ca0288904..2b1fabfe6a7d0 100644 --- a/DQM/Physics/python/topSingleLeptonDQM_cfi.py +++ b/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 ) ), ), diff --git a/DQMOffline/Trigger/python/singletopHLTEventDQM_cfi.py b/DQMOffline/Trigger/python/singletopHLTEventDQM_cfi.py index 4c43e41473ef2..2b9a6d3875cff 100644 --- a/DQMOffline/Trigger/python/singletopHLTEventDQM_cfi.py +++ b/DQMOffline/Trigger/python/singletopHLTEventDQM_cfi.py @@ -51,16 +51,16 @@ ## when omitted monitor histograms for b-tagging will not be filled jetBTaggers = cms.PSet( trackCountingEff = cms.PSet( - label = cms.InputTag("jetProbabilityBJetTags" ), + label = cms.InputTag("pfJetProbabilityBJetTags" ), workingPoint = cms.double(0.275) ), trackCountingPur = cms.PSet( - label = cms.InputTag("trackCountingHighPurBJetTags" ), + label = cms.InputTag("pfTrackCountingHighPurBJetTags" ), workingPoint = cms.double(3.41) ), secondaryVertex = cms.PSet( - label = cms.InputTag("combinedSecondaryVertexBJetTags"), - workingPoint = cms.double(0.679) + label = cms.InputTag("pfCombinedInclusiveSecondaryVertexV2BJetTags"), + workingPoint = cms.double(0.890) ) ), ), @@ -188,16 +188,16 @@ ## when omitted monitor histograms for b-tagging will not be filled jetBTaggers = cms.PSet( trackCountingEff = cms.PSet( - label = cms.InputTag("jetProbabilityBJetTags" ), + label = cms.InputTag("pfJetProbabilityBJetTags" ), workingPoint = cms.double(0.275) ), trackCountingPur = cms.PSet( - label = cms.InputTag("trackCountingHighPurBJetTags" ), + label = cms.InputTag("pfTrackCountingHighPurBJetTags" ), workingPoint = cms.double(3.41) ), secondaryVertex = cms.PSet( - label = cms.InputTag("combinedSecondaryVertexBJetTags"), - workingPoint = cms.double(0.679) + label = cms.InputTag("pfCombinedInclusiveSecondaryVertexV2BJetTags"), + workingPoint = cms.double(0.890) ) ), ), diff --git a/DQMOffline/Trigger/python/topSingleLeptonHLTEventDQM_cfi.py b/DQMOffline/Trigger/python/topSingleLeptonHLTEventDQM_cfi.py index 5077d0cf58736..05a31b64d8bc4 100644 --- a/DQMOffline/Trigger/python/topSingleLeptonHLTEventDQM_cfi.py +++ b/DQMOffline/Trigger/python/topSingleLeptonHLTEventDQM_cfi.py @@ -171,16 +171,16 @@ ## when omitted monitor histograms for b-tagging will not be filled jetBTaggers = cms.PSet( trackCountingEff = cms.PSet( - label = cms.InputTag("jetProbabilityBJetTags" ), + label = cms.InputTag("pfJetProbabilityBJetTags" ), workingPoint = cms.double(0.275) ), trackCountingPur = cms.PSet( - label = cms.InputTag("trackCountingHighPurBJetTags" ), + label = cms.InputTag("pfJTrackCountingHighPurBJetTags" ), workingPoint = cms.double(3.41) ), secondaryVertex = cms.PSet( - label = cms.InputTag("combinedSecondaryVertexBJetTags"), - workingPoint = cms.double(0.679) + label = cms.InputTag("pfCombinedInclusiveSecondaryVertexV2BJetTags"), + workingPoint = cms.double(0.890) ) ), ), @@ -323,16 +323,16 @@ ## when omitted monitor histograms for b-tagging will not be filled jetBTaggers = cms.PSet( trackCountingEff = cms.PSet( - label = cms.InputTag("jetProbabilityBJetTags" ), + label = cms.InputTag("pfJetProbabilityBJetTags" ), workingPoint = cms.double(0.275) ), trackCountingPur = cms.PSet( - label = cms.InputTag("trackCountingHighPurBJetTags" ), + label = cms.InputTag("pfTrackCountingHighPurBJetTags" ), workingPoint = cms.double(3.41) ), secondaryVertex = cms.PSet( - label = cms.InputTag("combinedSecondaryVertexBJetTags"), - workingPoint = cms.double(0.679) + label = cms.InputTag("pfCombinedInclusiveSecondaryVertexV2BJetTags"), + workingPoint = cms.double(0.890) ) ), ), From a30bd26934e1ec65e90e723fd38a4e4f5c023852 Mon Sep 17 00:00:00 2001 From: Dinko Ferencek Date: Fri, 11 Sep 2015 14:13:00 -0500 Subject: [PATCH 07/10] updated legacy b-taggers in HWW DQM --- DQM/PhysicsHWW/python/hwwDQM_cfi.py | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/DQM/PhysicsHWW/python/hwwDQM_cfi.py b/DQM/PhysicsHWW/python/hwwDQM_cfi.py index 14ffbab35604c..ae03f93ed2da2 100644 --- a/DQM/PhysicsHWW/python/hwwDQM_cfi.py +++ b/DQM/PhysicsHWW/python/hwwDQM_cfi.py @@ -1,13 +1,9 @@ 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') From 1bfbf0c232abc8e70de87d73865106db42c43ea1 Mon Sep 17 00:00:00 2001 From: Dinko Ferencek Date: Fri, 11 Sep 2015 18:22:08 -0500 Subject: [PATCH 08/10] updated the sequence --- DQM/PhysicsHWW/python/hwwDQM_cfi.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/DQM/PhysicsHWW/python/hwwDQM_cfi.py b/DQM/PhysicsHWW/python/hwwDQM_cfi.py index ae03f93ed2da2..e78afe12c6890 100644 --- a/DQM/PhysicsHWW/python/hwwDQM_cfi.py +++ b/DQM/PhysicsHWW/python/hwwDQM_cfi.py @@ -8,7 +8,7 @@ SkipEvent = cms.untracked.vstring('ProductNotFound') -hwwDQM = cms.Sequence(PFJetTracksAssociatorAtVertex*PFImpactParameterTagInfos* +hwwDQM = cms.Sequence(PFImpactParameterTagInfos* PFTrackCountingHighEffBJetTags* hwwAnalyzer ) From 21256da873e14f9d8e986847729d7cc214f9595d Mon Sep 17 00:00:00 2001 From: Dinko Ferencek Date: Mon, 14 Sep 2015 15:01:36 -0500 Subject: [PATCH 09/10] removing TagInfos from the EI EventContent --- CommonTools/ParticleFlow/python/EITopPAG_EventContent_cff.py | 2 -- 1 file changed, 2 deletions(-) diff --git a/CommonTools/ParticleFlow/python/EITopPAG_EventContent_cff.py b/CommonTools/ParticleFlow/python/EITopPAG_EventContent_cff.py index cec063060f51c..55ac61cbaee49 100644 --- a/CommonTools/ParticleFlow/python/EITopPAG_EventContent_cff.py +++ b/CommonTools/ParticleFlow/python/EITopPAG_EventContent_cff.py @@ -10,8 +10,6 @@ # jets 'keep recoPFJets_pfJetsEI_*_*', # btags - 'keep *_pfImpactParameterTagInfosEI_*_*', - 'keep *_pfInclusiveSecondaryVertexFinderTagInfosEI_*_*', 'keep *_pfCombinedInclusiveSecondaryVertexV2BJetTagsEI_*_*', # taus 'keep recoPFTaus_pfTausEI_*_*', From 8d171b516e29ceded3411b5bc1ca659220686565 Mon Sep 17 00:00:00 2001 From: Dinko Ferencek Date: Mon, 14 Sep 2015 23:18:14 -0500 Subject: [PATCH 10/10] fixed a typo in the tagger name --- DQMOffline/Trigger/python/topSingleLeptonHLTEventDQM_cfi.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/DQMOffline/Trigger/python/topSingleLeptonHLTEventDQM_cfi.py b/DQMOffline/Trigger/python/topSingleLeptonHLTEventDQM_cfi.py index 05a31b64d8bc4..168fe84b1addb 100644 --- a/DQMOffline/Trigger/python/topSingleLeptonHLTEventDQM_cfi.py +++ b/DQMOffline/Trigger/python/topSingleLeptonHLTEventDQM_cfi.py @@ -175,7 +175,7 @@ workingPoint = cms.double(0.275) ), trackCountingPur = cms.PSet( - label = cms.InputTag("pfJTrackCountingHighPurBJetTags" ), + label = cms.InputTag("pfTrackCountingHighPurBJetTags" ), workingPoint = cms.double(3.41) ), secondaryVertex = cms.PSet(