Skip to content

Commit

Permalink
changing DR_weightd to dRMean
Browse files Browse the repository at this point in the history
  • Loading branch information
@jbrands
jbrands committed Oct 22, 2015
1 parent 87fde89 commit 699ddc3
Show file tree
Hide file tree
Showing 7 changed files with 25 additions and 52 deletions.
1 change: 0 additions & 1 deletion DataFormats/JetReco/interface/PileupJetIdentifier.h
View file
Expand Up @@ -66,7 +66,6 @@ class StoredPileupJetIdentifier {
DECLARE_VARIABLE(nTrueInt ,float);

DECLARE_VARIABLE(nvtx ,float);
DECLARE_VARIABLE(DR_weighted,float);
DECLARE_VARIABLE(pull,float);
};

Expand Down
2 changes: 1 addition & 1 deletion RecoJets/JetProducers/plugins/MVAJetPuIdProducer.cc
View file
Expand Up @@ -234,7 +234,7 @@ MVAJetPuIdProducer::MVAJetPuIdProducer(const edm::ParameterSet& iConfig)
"ptD",
"beta",
"betaStar",
"DR_weighted",
"dR2Mean",
"pull",
"jetR",
"jetRchg",
Expand Down
12 changes: 6 additions & 6 deletions RecoJets/JetProducers/python/PileupJetIDParams_cfi.py
View file
Expand Up @@ -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" ,
Expand All @@ -31,7 +31,7 @@
"jetRchg" ,
),
tmvaVariables_jteta_3_5 = cms.vstring(
"DR_weighted" ,
"dR2Mean" ,
"rho" ,
"nParticles" ,
"majW" ,
Expand Down
4 changes: 2 additions & 2 deletions RecoJets/JetProducers/python/hltPUIdAlgo_cff.py
View file
Expand Up @@ -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(
Expand All @@ -44,7 +44,7 @@
"ptD" ,
"beta" ,
"betaStar" ,
"DR_weighted" ,
"dR2Mean" ,
"pull" ,
"jetR" ,
"jetRchg"
Expand Down
10 changes: 5 additions & 5 deletions RecoJets/JetProducers/src/MVAJetPuId.cc
View file
Expand Up @@ -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");
Expand All @@ -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";
Expand Down Expand Up @@ -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;
Expand Down Expand Up @@ -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<ncones; ++ic){
*coneFracs[ic] /= jetPt;
}
Expand Down Expand Up @@ -520,7 +520,7 @@ void MVAJetPuId::initVariables()
INIT_VARIABLE(jetR , "jetR" , 0.);
INIT_VARIABLE(pull , "pull" , 0.);
INIT_VARIABLE(jetRchg , "jetRchg" , 0.);
INIT_VARIABLE(DR_weighted , "DR_weighted" , 0.);
INIT_VARIABLE(dR2Mean , "dR2Mean" , 0.);

INIT_VARIABLE(ptD , "ptD", 0.);
INIT_VARIABLE(ptMean , "", 0.);
Expand Down
40 changes: 9 additions & 31 deletions RecoJets/JetProducers/src/PileupJetIdAlgo.cc
View file
Expand Up @@ -205,28 +205,9 @@ void PileupJetIdAlgo::set(const PileupJetIdentifier & id)
void PileupJetIdAlgo::runMva()
{
if( cutBased_ ) {
internalId_.idFlag_ = computeCutIDflag(internalId_.betaStarClassic_,internalId_.DR_weighted_,internalId_.nvtx_,internalId_.jetPt_,internalId_.jetEta_);
internalId_.idFlag_ = computeCutIDflag(internalId_.betaStarClassic_,internalId_.dR2Mean_,internalId_.nvtx_,internalId_.jetPt_,internalId_.jetEta_);
} else {
std::cout << "jetPt " << internalId_.jetPt_ << std::endl;
std::cout << "jetEta " << internalId_.jetEta_ << std::endl;
std::cout << "DR_weightd " << internalId_.DR_weighted_ << std::endl;
std::cout << "rho " << internalId_.rho_ << std::endl;
std::cout << "nParticles " << internalId_.nParticles_ << std::endl;
std::cout << "nCharged " << internalId_.nCharged_ << std::endl;
std::cout << "majW " << internalId_.majW_ << std::endl;
std::cout << "minW " << internalId_.minW_ << std::endl;
std::cout << "frac01 " << internalId_.frac01_ << std::endl;
std::cout << "frac02 " << internalId_.frac02_ << std::endl;
std::cout << "frac03 " << internalId_.frac03_ << std::endl;
std::cout << "frac04 " << internalId_.frac04_ << std::endl;
std::cout << "ptD " << internalId_.ptD_ << std::endl;
std::cout << "beta " << internalId_.beta_ << std::endl;
std::cout << "betaStar " << internalId_.betaStar_ << std::endl;
std::cout << "pull " << internalId_.pull_ << std::endl;
std::cout << "jetR " << internalId_.pull_ << std::endl;
std::cout << "jetRchg " << internalId_.pull_ << std::endl;

if(std::abs(internalId_.jetEta_) >= 5.0) {
if(std::abs(internalId_.jetEta_) >= 5.0) {
internalId_.mva_ = -2.;
} else {
if(etaBinnedWeights_){
Expand Down Expand Up @@ -258,21 +239,21 @@ std::pair<int,int> PileupJetIdAlgo::getJetIdKey(float jetPt, float jetEta)
return std::pair<int,int>(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<int,int> 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;
}
Expand Down Expand Up @@ -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;
Expand Down Expand Up @@ -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<ncones; ++ic){
*coneFracs[ic] /= jetPt;
*coneEmFracs[ic] /= jetPt;
Expand Down Expand Up @@ -730,9 +709,8 @@ void PileupJetIdAlgo::initVariables()
INIT_VARIABLE(dRMeanNeut , "drmne_1" , 0.);
INIT_VARIABLE(dRMeanEm , "drem_1" , 0.);
INIT_VARIABLE(dRMeanCh , "drch_1" , 0.);
//INIT_VARIABLE(dR2Mean , "" , 0.);
INIT_VARIABLE(DR_weighted , "DR_weighted" , 0.);

INIT_VARIABLE(dR2Mean , "" , 0.);

INIT_VARIABLE(ptD , "", 0.);
INIT_VARIABLE(ptMean , "", 0.);
INIT_VARIABLE(ptRMS , "", 0.);
Expand Down
8 changes: 2 additions & 6 deletions RecoJets/JetProducers/test/testJetTools_cfg.py
View file
Expand Up @@ -197,11 +197,7 @@
#from Configuration.AlCa.GlobalTag import GlobalTag
#process.GlobalTag = GlobalTag(process.GlobalTag, 'auto:run2_mc')
# ##
#from PhysicsTools.PatAlgos.patInputFiles_cff import filesRelValProdTTbarAODSIM
filesRelValProdTTbarAODSIM = cms.untracked.vstring(
'file:RelValProdTTbar.root'
)

from PhysicsTools.PatAlgos.patInputFiles_cff import filesRelValProdTTbarAODSIM
process.source.fileNames = filesRelValProdTTbarAODSIM
# ##
process.maxEvents.input = 5
Expand All @@ -210,4 +206,4 @@
# ##
process.out.fileName = 'testJetTools.root'
# ##
# process.options.wantSummary = False ## (to suppress the long output at the end of the job)
# process.options.wantSummary = False ## (to suppress the long output at the end of the job)

0 comments on commit 699ddc3

Please sign in to comment.