Skip to content

Commit

Permalink
Merge pull request #12054 from jbrands/from-CMSSW_7_6_0_pre7-jbrands
Browse files Browse the repository at this point in the history 
fixing bug for cut-based jet pu ID
  • Loading branch information
@cmsbuild
cmsbuild committed Oct 28, 2015
2 parents 35de49e + 832c2c0 commit d7d8b2b
Show file tree
Hide file tree
Showing 8 changed files with 176 additions and 208 deletions.
8 changes: 5 additions & 3 deletions DataFormats/JetReco/interface/PileupJetIdentifier.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,9 @@ class StoredPileupJetIdentifier {

DECLARE_VARIABLE(dRMean ,float);

DECLARE_VARIABLE(majW ,float);
DECLARE_VARIABLE(minW ,float);

DECLARE_VARIABLE(frac01 ,float);
DECLARE_VARIABLE(frac02 ,float);
DECLARE_VARIABLE(frac03 ,float);
Expand All @@ -63,7 +66,6 @@ class StoredPileupJetIdentifier {
DECLARE_VARIABLE(nTrueInt ,float);

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

Expand Down Expand Up @@ -155,8 +157,8 @@ class PileupJetIdentifier : public StoredPileupJetIdentifier {
DECLARE_VARIABLE(etaW ,float);
DECLARE_VARIABLE(phiW ,float);

DECLARE_VARIABLE(majW ,float);
DECLARE_VARIABLE(minW ,float);
//DECLARE_VARIABLE(majW ,float);
//DECLARE_VARIABLE(minW ,float);

DECLARE_VARIABLE(chFrac01 ,float);
DECLARE_VARIABLE(chFrac02 ,float);
Expand Down
18 changes: 9 additions & 9 deletions RecoJets/JetProducers/plugins/MVAJetPuIdProducer.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -223,18 +223,18 @@ MVAJetPuIdProducer::MVAJetPuIdProducer(const edm::ParameterSet& iConfig)
edm::ParameterSetDescription vpsd1;
vpsd1.add<std::vector<std::string>>("tmvaVariables", {
"rho",
"nTot",
"nCh",
"axisMajor",
"axisMinor",
"fRing0",
"fRing1",
"fRing2",
"fRing3",
"nParticles",
"nCharged",
"majW",
"minW",
"frac01",
"frac02",
"frac03",
"frac04",
"ptD",
"beta",
"betaStar",
"DR_weighted",
"dR2Mean",
"pull",
"jetR",
"jetRchg",
Expand Down
4 changes: 4 additions & 0 deletions RecoJets/JetProducers/plugins/PileupJetIdProducer.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,10 @@ PileupJetIdProducer::PileupJetIdProducer(const edm::ParameterSet& iConfig)
// ------------------------------------------------------------------------------------------
PileupJetIdProducer::~PileupJetIdProducer()
{
for(std::vector<std::pair<std::string,PileupJetIdAlgo *> >::iterator
ialgo = algos_.begin(); ialgo!=algos_.end(); ++ialgo) {
delete ialgo->second;
}
}


Expand Down
50 changes: 25 additions & 25 deletions RecoJets/JetProducers/python/PileupJetIDParams_cfi.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,47 +6,47 @@
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(
"DRweighted" ,
"dR2Mean" ,
"rho" ,
"nTot" ,
"nCh" ,
"axisMajor" ,
"axisMinor",
"fRing0" ,
"fRing1" ,
"fRing2" ,
"fRing3" ,
"nParticles" ,
"nCharged" ,
"majW" ,
"minW",
"frac01" ,
"frac02" ,
"frac03" ,
"frac04" ,
"ptD" ,
"beta" ,
"betaStar" ,
"min(pull,0.1)" ,
"pull" ,
"jetR" ,
"jetRchg" ,
),
tmvaVariables_jteta_3_5 = cms.vstring(
"DRweighted" ,
"dR2Mean" ,
"rho" ,
"nTot" ,
"axisMajor" ,
"axisMinor",
"fRing0" ,
"fRing1" ,
"fRing2" ,
"fRing3" ,
"nParticles" ,
"majW" ,
"minW",
"frac01" ,
"frac02" ,
"frac03" ,
"frac04" ,
"ptD" ,
"min(pull,0.1)" ,
"pull" ,
"jetR" ,
),
tmvaSpectators = cms.vstring(
"p4.fCoordinates.fPt" ,
"p4.fCoordinates.fEta" ,
"jetPt" ,
"jetEta" ,
"nTrueInt" ,
"dRMatch" ,
),
Expand Down
66 changes: 34 additions & 32 deletions RecoJets/JetProducers/python/hltPUIdAlgo_cff.py
View file
Original file line number Diff line number Diff line change
@@ -1,26 +1,50 @@
import FWCore.ParameterSet.Config as cms

####################################################################################################################
full_74x_wp = cms.PSet(
#4 Eta Categories 0-2.5 2.5-2.75 2.75-3.0 3.0-5.0

#Tight Id
Pt010_Tight = cms.vdouble(-0.83,-0.81,-0.74,-0.81),
Pt1020_Tight = cms.vdouble(-0.83,-0.81,-0.74,-0.81),
Pt2030_Tight = cms.vdouble( 0.73, 0.05,-0.26,-0.42),
Pt3050_Tight = cms.vdouble( 0.73, 0.05,-0.26,-0.42),

#Medium Id
Pt010_Medium = cms.vdouble(-0.83,-0.92,-0.90,-0.92),
Pt1020_Medium = cms.vdouble(-0.83,-0.92,-0.90,-0.92),
Pt2030_Medium = cms.vdouble( 0.10,-0.36,-0.54,-0.54),
Pt3050_Medium = cms.vdouble( 0.10,-0.36,-0.54,-0.54),

#Loose Id
Pt010_Loose = cms.vdouble(-0.95,-0.96,-0.94,-0.95),
Pt1020_Loose = cms.vdouble(-0.95,-0.96,-0.94,-0.95),
Pt2030_Loose = cms.vdouble(-0.63,-0.60,-0.55,-0.45),
Pt3050_Loose = cms.vdouble(-0.63,-0.60,-0.55,-0.45),

)


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(
"rho" ,
"nTot" ,
"nCh" ,
"axisMajor" ,
"axisMinor",
"fRing0",
"fRing1",
"fRing2",
"fRing3",
"nParticles" ,
"nCharged" ,
"majW" ,
"minW",
"frac01",
"frac02",
"frac03",
"frac04",
"ptD" ,
"beta" ,
"betaStar" ,
"DR_weighted" ,
"dR2Mean" ,
"pull" ,
"jetR" ,
"jetRchg"
Expand All @@ -34,27 +58,5 @@
)


full_74x_wp = cms.PSet(
#4 Eta Categories 0-2.5 2.5-2.75 2.75-3.0 3.0-5.0

#Tight Id
Pt010_Tight = cms.vdouble(-0.83,-0.81,-0.74,-0.81),
Pt1020_Tight = cms.vdouble(-0.83,-0.81,-0.74,-0.81),
Pt2030_Tight = cms.vdouble( 0.73, 0.05,-0.26,-0.42),
Pt3050_Tight = cms.vdouble( 0.73, 0.05,-0.26,-0.42),

#Medium Id
Pt010_Medium = cms.vdouble(-0.83,-0.92,-0.90,-0.92),
Pt1020_Medium = cms.vdouble(-0.83,-0.92,-0.90,-0.92),
Pt2030_Medium = cms.vdouble( 0.10,-0.36,-0.54,-0.54),
Pt3050_Medium = cms.vdouble( 0.10,-0.36,-0.54,-0.54),

#Loose Id
Pt010_Loose = cms.vdouble(-0.95,-0.96,-0.94,-0.95),
Pt1020_Loose = cms.vdouble(-0.95,-0.96,-0.94,-0.95),
Pt2030_Loose = cms.vdouble(-0.63,-0.60,-0.55,-0.45),
Pt3050_Loose = cms.vdouble(-0.63,-0.60,-0.55,-0.45),

)


60 changes: 30 additions & 30 deletions RecoJets/JetProducers/src/MVAJetPuId.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -75,35 +75,35 @@ void MVAJetPuId::setup()

tmvaVariables_.clear();
tmvaVariables_.push_back( "rho" );
tmvaVariables_.push_back( "nTot" );
tmvaVariables_.push_back( "nCh" );
tmvaVariables_.push_back( "axisMajor" );
tmvaVariables_.push_back( "axisMinor" );
tmvaVariables_.push_back( "fRing0" );
tmvaVariables_.push_back( "fRing1" );
tmvaVariables_.push_back( "fRing2" );
tmvaVariables_.push_back( "fRing3" );
tmvaVariables_.push_back( "nParticles" );
tmvaVariables_.push_back( "nCharged" );
tmvaVariables_.push_back( "majW" );
tmvaVariables_.push_back( "minW" );
tmvaVariables_.push_back( "frac01" );
tmvaVariables_.push_back( "frac02" );
tmvaVariables_.push_back( "frac03" );
tmvaVariables_.push_back( "frac04" );
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");

tmvaNames_["rho"] = "rho";
tmvaNames_["nTot"] = "nParticles";
tmvaNames_["nCh"] = "nCharged";
tmvaNames_["axisMajor"] = "majW";
tmvaNames_["axisMinor"] = "minW";
tmvaNames_["fRing0"] = "frac01";
tmvaNames_["fRing1"] = "frac02";
tmvaNames_["fRing2"] = "frac03";
tmvaNames_["fRing3"] = "frac04";
tmvaNames_["nParticles"] = "nParticles";
tmvaNames_["nCharged"] = "nCharged";
tmvaNames_["majW"] = "majW";
tmvaNames_["minW"] = "minW";
tmvaNames_["frac01"] = "frac01";
tmvaNames_["frac02"] = "frac02";
tmvaNames_["frac03"] = "frac03";
tmvaNames_["frac04"] = "frac04";
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 @@ -165,7 +165,7 @@ void MVAJetPuId::set(const PileupJetIdentifier & id)

void MVAJetPuId::runMva()
{
if( ! reader_ ) { bookReader();}
if( ! reader_ ) { bookReader();}
if(fabs(internalId_.jetEta_) < 5.0) internalId_.mva_ = reader_->EvaluateMVA( tmvaMethod_.c_str() );
if(fabs(internalId_.jetEta_) >= 5.0) internalId_.mva_ = -2.;
internalId_.idFlag_ = computeIDflag(internalId_.mva_,internalId_.jetPt_,internalId_.jetEta_);
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 @@ -496,7 +496,7 @@ void MVAJetPuId::initVariables()
INIT_VARIABLE(jetEta , "jetEta", large_val);
INIT_VARIABLE(jetPhi , "", large_val);
INIT_VARIABLE(jetM , "", 0.);
INIT_VARIABLE(nCharged , "nCh", 0.);
INIT_VARIABLE(nCharged , "nCharged", 0.);
INIT_VARIABLE(nNeutrals , "", 0.);

INIT_VARIABLE(chgEMfrac , "", 0.);
Expand All @@ -506,7 +506,7 @@ void MVAJetPuId::initVariables()

INIT_VARIABLE(d0 , "" , -1000.);
INIT_VARIABLE(dZ , "" , -1000.);
INIT_VARIABLE(nParticles , "nTot" , 0.);
INIT_VARIABLE(nParticles , "nParticles" , 0.);

INIT_VARIABLE(leadPt , "" , 0.);
INIT_VARIABLE(leadEta , "" , large_val);
Expand All @@ -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 Expand Up @@ -549,12 +549,12 @@ void MVAJetPuId::initVariables()
INIT_VARIABLE(jetW ,"" ,1.);
INIT_VARIABLE(etaW ,"" ,1.);
INIT_VARIABLE(phiW ,"" ,1.);
INIT_VARIABLE(majW ,"axisMajor" ,1.);
INIT_VARIABLE(minW ,"axisMinor" ,1.);
INIT_VARIABLE(frac01 ,"fRing0" ,0.);
INIT_VARIABLE(frac02 ,"fRing1" ,0.);
INIT_VARIABLE(frac03 ,"fRing2" ,0.);
INIT_VARIABLE(frac04 ,"fRing3" ,0.);
INIT_VARIABLE(majW ,"majW" ,1.);
INIT_VARIABLE(minW ,"minW" ,1.);
INIT_VARIABLE(frac01 ,"frac01" ,0.);
INIT_VARIABLE(frac02 ,"frac02" ,0.);
INIT_VARIABLE(frac03 ,"frac03" ,0.);
INIT_VARIABLE(frac04 ,"frac04" ,0.);

INIT_VARIABLE(beta ,"beta" ,0.);
INIT_VARIABLE(betaStar ,"betaStar" ,0.);
Expand Down
Loading

0 comments on commit d7d8b2b

Please sign in to comment.