Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Cmssw 7 4 x #18

Open
wants to merge 4 commits into
base: CMSSW_7_4_X
Choose a base branch
from
Open

Cmssw 7 4 x #18

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
da655c6
add d0 to jet tree
Jul 13, 2015
b455853
add d0 to jet tree
Jul 13, 2015
e799daf
Merge remote branch 'upstream/CMSSW_7_4_X' into CMSSW_7_4_X
Jul 20, 2015
424499e
float charge
Jul 29, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions interface/JMEJetAnalyzer.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,7 @@ class JMEJetAnalyzer : public JME::PhysicsObjectAnalyzer
std::vector<float>& betaClassic = tree["betaClassic"].write<std::vector<float>>();
std::vector<float>& betaStarClassic = tree["betaStarClassic"].write<std::vector<float>>();
std::vector<float>& dZ = tree["dZ"].write<std::vector<float>>();
std::vector<float>& d0 = tree["d0"].write<std::vector<float>>();
std::vector<float>& DRweighted = tree["DRweighted"].write<std::vector<float>>();
std::vector<float>& fRing0 = tree["fRing0"].write<std::vector<float>>();
std::vector<float>& fRing1 = tree["fRing1"].write<std::vector<float>>();
Expand Down
4 changes: 2 additions & 2 deletions interface/PhysicsObjectAnalyzer.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,11 +58,11 @@ namespace JME {
protected:
std::vector<PtEtaPhiEVector>& p4 = tree["p4"].write<std::vector<PtEtaPhiEVector>>();
std::vector<float>& y = tree["y"].write<std::vector<float>>();
std::vector<int8_t>& charge = tree["charge"].write<std::vector<int8_t>>();
std::vector<float>& charge = tree["charge"].write<std::vector<float>>();

std::vector<bool>& is_matched = tree["has_gen_particle"].write<std::vector<bool>>();
std::vector<PtEtaPhiEVector>& gen_p4 = tree["gen_p4"].write<std::vector<PtEtaPhiEVector>>();
std::vector<float>& gen_y = tree["gen_y"].write<std::vector<float>>();
std::vector<int8_t>& gen_charge = tree["gen_charge"].write<std::vector<int8_t>>();
std::vector<float>& gen_charge = tree["gen_charge"].write<std::vector<float>>();
};
}
4 changes: 3 additions & 1 deletion src/JMEJetAnalyzer.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -294,7 +294,7 @@ void JMEJetAnalyzer::computeBetaStar(const pat::Jet& jet, const std::vector<reco
int nCh_tmp(0), nNeutrals_tmp(0);
float sumTkPt(0.0);
float beta_tmp(0.0), betaStar_tmp(0.0), betaStarClassic_tmp(0.0), betaClassic_tmp(0.0);
float pTMax(0.0), pTMaxChg(0.0),pTMaxNeutral(0.0), dZ2(-999);
float pTMax(0.0), pTMaxChg(0.0),pTMaxNeutral(0.0), dZ2(-999),d02(-999);
float sumW(0.0), sumW2(0.0), sumWdR2(0.0);
float sum_deta(0.0),sum_dphi(0.0),sum_deta2(0.0),sum_dphi2(0.0),sum_detadphi(0.0),Teta(0.0),Tphi(0.0);
float ave_deta(0.0), ave_dphi(0.0);
Expand Down Expand Up @@ -351,6 +351,7 @@ void JMEJetAnalyzer::computeBetaStar(const pat::Jet& jet, const std::vector<reco
if (lPack->pt() > pTMaxChg) {
pTMaxChg = lPack->pt();
dZ2 = lPack->dz();
d02 = lPack->dxy();
}

float tkpt = lPack->pt();
Expand Down Expand Up @@ -454,6 +455,7 @@ void JMEJetAnalyzer::computeBetaStar(const pat::Jet& jet, const std::vector<reco
}

dZ.push_back(dZ2);
d0.push_back(d02);
nCh.push_back(nCh_tmp);
nNeutrals.push_back(nNeutrals_tmp);
axisMajor.push_back(axis1);
Expand Down