From da655c663b0a1e74ce4a95f4c7cda226aef69352 Mon Sep 17 00:00:00 2001
From: Jing <jing.li@cern.ch>
Date: Mon, 13 Jul 2015 12:08:01 -0500
Subject: [PATCH 1/3] add d0 to jet tree

---
 interface/JMEJetAnalyzer.h | 1 +
 src/JMEJetAnalyzer.cc      | 4 +++-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/interface/JMEJetAnalyzer.h b/interface/JMEJetAnalyzer.h
index e42291b..9c024de 100644
--- a/interface/JMEJetAnalyzer.h
+++ b/interface/JMEJetAnalyzer.h
@@ -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>>();
diff --git a/src/JMEJetAnalyzer.cc b/src/JMEJetAnalyzer.cc
index 57eeed5..0126b97 100644
--- a/src/JMEJetAnalyzer.cc
+++ b/src/JMEJetAnalyzer.cc
@@ -278,7 +278,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);
@@ -335,6 +335,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();
@@ -438,6 +439,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);

From b455853f7f621cec5b428abed9e5df68be9f85ef Mon Sep 17 00:00:00 2001
From: Jing <jing.li@cern.ch>
Date: Mon, 13 Jul 2015 12:11:39 -0500
Subject: [PATCH 2/3] add d0 to jet tree

---
 interface/JMEJetAnalyzer.h | 2 +-
 src/JMEJetAnalyzer.cc      | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/interface/JMEJetAnalyzer.h b/interface/JMEJetAnalyzer.h
index 9c024de..d2fb9f4 100644
--- a/interface/JMEJetAnalyzer.h
+++ b/interface/JMEJetAnalyzer.h
@@ -51,7 +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>& 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>>();
diff --git a/src/JMEJetAnalyzer.cc b/src/JMEJetAnalyzer.cc
index 0126b97..1facbff 100644
--- a/src/JMEJetAnalyzer.cc
+++ b/src/JMEJetAnalyzer.cc
@@ -335,7 +335,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();
+                    d02 = lPack->dxy();
                 }
 
                 float tkpt = lPack->pt();
@@ -439,7 +439,7 @@ void JMEJetAnalyzer::computeBetaStar(const pat::Jet& jet, const std::vector<reco
     }
 
     dZ.push_back(dZ2);
-	d0.push_back(d02);
+    d0.push_back(d02);
     nCh.push_back(nCh_tmp);
     nNeutrals.push_back(nNeutrals_tmp);
     axisMajor.push_back(axis1);

From 424499e21e46bac8f72d8198b7151d650a71aa02 Mon Sep 17 00:00:00 2001
From: Jing <jing.li@cern.ch>
Date: Tue, 28 Jul 2015 23:14:11 -0500
Subject: [PATCH 3/3] float charge

---
 interface/PhysicsObjectAnalyzer.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/interface/PhysicsObjectAnalyzer.h b/interface/PhysicsObjectAnalyzer.h
index 5d64d2b..ab21517 100644
--- a/interface/PhysicsObjectAnalyzer.h
+++ b/interface/PhysicsObjectAnalyzer.h
@@ -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>>();
     };
 }