From 699ddc3e8ee2b70e14d6f0be2c45269c098b723b Mon Sep 17 00:00:00 2001 From: Johannes Date: Thu, 22 Oct 2015 16:55:43 +0200 Subject: [PATCH] changing DR_weightd to dRMean --- .../JetReco/interface/PileupJetIdentifier.h | 1 - .../plugins/MVAJetPuIdProducer.cc | 2 +- .../python/PileupJetIDParams_cfi.py | 12 +++--- .../JetProducers/python/hltPUIdAlgo_cff.py | 4 +- RecoJets/JetProducers/src/MVAJetPuId.cc | 10 ++--- RecoJets/JetProducers/src/PileupJetIdAlgo.cc | 40 +++++-------------- .../JetProducers/test/testJetTools_cfg.py | 8 +--- 7 files changed, 25 insertions(+), 52 deletions(-) diff --git a/DataFormats/JetReco/interface/PileupJetIdentifier.h b/DataFormats/JetReco/interface/PileupJetIdentifier.h index 6c0489caf0183..3c68cd42599d2 100644 --- a/DataFormats/JetReco/interface/PileupJetIdentifier.h +++ b/DataFormats/JetReco/interface/PileupJetIdentifier.h @@ -66,7 +66,6 @@ class StoredPileupJetIdentifier { DECLARE_VARIABLE(nTrueInt ,float); DECLARE_VARIABLE(nvtx ,float); - DECLARE_VARIABLE(DR_weighted,float); DECLARE_VARIABLE(pull,float); }; diff --git a/RecoJets/JetProducers/plugins/MVAJetPuIdProducer.cc b/RecoJets/JetProducers/plugins/MVAJetPuIdProducer.cc index 746d9412fc78d..8e121f0a33184 100644 --- a/RecoJets/JetProducers/plugins/MVAJetPuIdProducer.cc +++ b/RecoJets/JetProducers/plugins/MVAJetPuIdProducer.cc @@ -234,7 +234,7 @@ MVAJetPuIdProducer::MVAJetPuIdProducer(const edm::ParameterSet& iConfig) "ptD", "beta", "betaStar", - "DR_weighted", + "dR2Mean", "pull", "jetR", "jetRchg", diff --git a/RecoJets/JetProducers/python/PileupJetIDParams_cfi.py b/RecoJets/JetProducers/python/PileupJetIDParams_cfi.py index 05425201d275a..dda2318de89aa 100644 --- a/RecoJets/JetProducers/python/PileupJetIDParams_cfi.py +++ b/RecoJets/JetProducers/python/PileupJetIDParams_cfi.py @@ -6,14 +6,14 @@ impactParTkThreshold = cms.double(1.) , cutBased = cms.bool(False), etaBinnedWeights = cms.bool(True), - tmvaWeights_jteta_0_2 = cms.string("RecoJets/JetProducers/data/TMVAClassificationCategory_BDTG.weights_jteta_0_2.xml.gz"), - tmvaWeights_jteta_2_2p5 = cms.string("RecoJets/JetProducers/data/TMVAClassificationCategory_BDTG.weights_jteta_2_2p5.xml.gz"), - tmvaWeights_jteta_2p5_3 = cms.string("RecoJets/JetProducers/data/TMVAClassificationCategory_BDTG.weights_jteta_2p5_3.xml.gz"), - tmvaWeights_jteta_3_5 = cms.string("RecoJets/JetProducers/data/TMVAClassificationCategory_BDTG.weights_jteta_3_5.xml.gz"), + tmvaWeights_jteta_0_2 = cms.string("RecoJets/JetProducers/data/TMVAClassificationCategory_BDTG.weights_jteta_0_2_newNames.xml.gz"), + tmvaWeights_jteta_2_2p5 = cms.string("RecoJets/JetProducers/data/TMVAClassificationCategory_BDTG.weights_jteta_2_2p5_newNames.xml.gz"), + tmvaWeights_jteta_2p5_3 = cms.string("RecoJets/JetProducers/data/TMVAClassificationCategory_BDTG.weights_jteta_2p5_3_newNames.xml.gz"), + tmvaWeights_jteta_3_5 = cms.string("RecoJets/JetProducers/data/TMVAClassificationCategory_BDTG.weights_jteta_3_5_newNames.xml.gz"), tmvaMethod = cms.string("JetIDMVAHighPt"), version = cms.int32(-1), tmvaVariables_jteta_0_3 = cms.vstring( - "DR_weighted" , + "dR2Mean" , "rho" , "nParticles" , "nCharged" , @@ -31,7 +31,7 @@ "jetRchg" , ), tmvaVariables_jteta_3_5 = cms.vstring( - "DR_weighted" , + "dR2Mean" , "rho" , "nParticles" , "majW" , diff --git a/RecoJets/JetProducers/python/hltPUIdAlgo_cff.py b/RecoJets/JetProducers/python/hltPUIdAlgo_cff.py index dd13d393cc636..2d6a66ad75d70 100644 --- a/RecoJets/JetProducers/python/hltPUIdAlgo_cff.py +++ b/RecoJets/JetProducers/python/hltPUIdAlgo_cff.py @@ -28,7 +28,7 @@ full_74x = cms.PSet( impactParTkThreshold = cms.double(1.) , cutBased = cms.bool(False), - tmvaWeights = cms.string("RecoJets/JetProducers/data/MVAJetPuID.weights.xml.gz"), + tmvaWeights = cms.string("RecoJets/JetProducers/data/MVAJetPuID.weights_newNames.xml.gz"), tmvaMethod = cms.string("BDTG"), version = cms.int32(-1), tmvaVariables = cms.vstring( @@ -44,7 +44,7 @@ "ptD" , "beta" , "betaStar" , - "DR_weighted" , + "dR2Mean" , "pull" , "jetR" , "jetRchg" diff --git a/RecoJets/JetProducers/src/MVAJetPuId.cc b/RecoJets/JetProducers/src/MVAJetPuId.cc index 26279f045b601..c374e8f0ebe9f 100644 --- a/RecoJets/JetProducers/src/MVAJetPuId.cc +++ b/RecoJets/JetProducers/src/MVAJetPuId.cc @@ -86,7 +86,7 @@ void MVAJetPuId::setup() tmvaVariables_.push_back( "ptD" ); tmvaVariables_.push_back( "beta" ); tmvaVariables_.push_back( "betaStar" ); - tmvaVariables_.push_back( "DR_weighted" ); + tmvaVariables_.push_back( "dR2Mean" ); tmvaVariables_.push_back( "pull" ); tmvaVariables_.push_back( "jetR"); tmvaVariables_.push_back( "jetRchg"); @@ -103,7 +103,7 @@ void MVAJetPuId::setup() tmvaNames_["ptD"] = "ptD"; tmvaNames_["beta"] = "beta"; tmvaNames_["betaStar"] = "betaStar"; - tmvaNames_["DR_weighted"] = "DR_weighted"; + tmvaNames_["dR2Mean"] = "dR2Mean"; tmvaNames_["pull"] = "pull"; tmvaNames_["jetR"] = "jetR"; tmvaNames_["jetRchg"] = "jetRchg"; @@ -258,7 +258,7 @@ PileupJetIdentifier MVAJetPuId::computeIdVariables(const reco::Jet * jet, float } //internalId_.dRMean_ += candPtDr; - internalId_.DR_weighted_ += candPtDr*candPtDr; + internalId_.dR2Mean_ += candPtDr*candPtDr; internalId_.ptD_ += candPt*candPt; sumPt += candPt; @@ -382,7 +382,7 @@ PileupJetIdentifier MVAJetPuId::computeIdVariables(const reco::Jet * jet, float internalId_.dRMeanNeut_ /= jetPt; internalId_.dRMeanEm_ /= jetPt; //internalId_.jetRchg_ /= jetPt; - internalId_.DR_weighted_ /= sumPt2; + internalId_.dR2Mean_ /= sumPt2; for(size_t ic=0; ic= 5.0) { + if(std::abs(internalId_.jetEta_) >= 5.0) { internalId_.mva_ = -2.; } else { if(etaBinnedWeights_){ @@ -258,21 +239,21 @@ std::pair PileupJetIdAlgo::getJetIdKey(float jetPt, float jetEta) return std::pair(ptId,etaId); } // ------------------------------------------------------------------------------------------ -int PileupJetIdAlgo::computeCutIDflag(float betaStarClassic,float DR_weighted,float nvtx, float jetPt, float jetEta) +int PileupJetIdAlgo::computeCutIDflag(float betaStarClassic,float dR2Mean,float nvtx, float jetPt, float jetEta) { std::pair jetIdKey = getJetIdKey(jetPt,jetEta); float betaStarModified = betaStarClassic/log(nvtx-0.64); int idFlag(0); if(betaStarModified < betaStarCut_[PileupJetIdentifier::kTight ][jetIdKey.first][jetIdKey.second] && - DR_weighted < rmsCut_ [PileupJetIdentifier::kTight ][jetIdKey.first][jetIdKey.second] + dR2Mean < rmsCut_ [PileupJetIdentifier::kTight ][jetIdKey.first][jetIdKey.second] ) idFlag += 1 << PileupJetIdentifier::kTight; if(betaStarModified < betaStarCut_[PileupJetIdentifier::kMedium ][jetIdKey.first][jetIdKey.second] && - DR_weighted < rmsCut_ [PileupJetIdentifier::kMedium ][jetIdKey.first][jetIdKey.second] + dR2Mean < rmsCut_ [PileupJetIdentifier::kMedium ][jetIdKey.first][jetIdKey.second] ) idFlag += 1 << PileupJetIdentifier::kMedium; if(betaStarModified < betaStarCut_[PileupJetIdentifier::kLoose ][jetIdKey.first][jetIdKey.second] && - DR_weighted < rmsCut_ [PileupJetIdentifier::kLoose ][jetIdKey.first][jetIdKey.second] + dR2Mean < rmsCut_ [PileupJetIdentifier::kLoose ][jetIdKey.first][jetIdKey.second] ) idFlag += 1 << PileupJetIdentifier::kLoose; return idFlag; } @@ -376,7 +357,6 @@ PileupJetIdentifier PileupJetIdAlgo::computeIdVariables(const reco::Jet * jet, f // // average shapes internalId_.dRMean_ += candPtDr; internalId_.dR2Mean_ += candPtDr*candPtDr; - internalId_.DR_weighted_ += candPtDr*candPtDr; covMatrix(0,0) += candPt*candPt*candDeta*candDeta; covMatrix(0,1) += candPt*candPt*candDeta*candDphi; covMatrix(1,1) += candPt*candPt*candDphi*candDphi; @@ -605,8 +585,7 @@ PileupJetIdentifier PileupJetIdAlgo::computeIdVariables(const reco::Jet * jet, f internalId_.dRMeanEm_ /= jetPt; internalId_.dRMeanCh_ /= jetPt; internalId_.dR2Mean_ /= sumPt2; - internalId_.DR_weighted_ /= sumPt2; - + for(size_t ic=0; ic