Merge pull request #13 from beaudett/master

Reading official Reco; adding information (including extrapolations) to the GenParticles ; modified the storage of layer clusters
felicepantaleo · Feb 28, 2017 · a855dcb · a855dcb
2 parents 7919171 + 6bc29aa
commit a855dcb
Show file tree

Hide file tree

Showing 4 changed files with 354 additions and 108 deletions.
diff --git a/HGCalAnalysis/interface/AObData.h b/HGCalAnalysis/interface/AObData.h
@@ -2,20 +2,27 @@
 #define aobdata_h
 
 #include "TObject.h"
+#include <vector>
 
 class AGenPart : public TObject
 {
 public:
 
-  AGenPart(): eta(-1000.),phi(-1000.),pt(-1000.),energy(-1000.),dvx(0.),dvy(0.),dvz(0.),pid(0)
+ AGenPart(): eta(-1000.),phi(-1000.),pt(-1000.),energy(-1000.),dvx(0.),dvy(0.),dvz(0.),pid(0),gen(-1),reachedEE(-1)
   {
   }
   AGenPart(float i_eta, float i_phi, float i_pt, float i_energy,
-	   float i_dvx, float i_dvy,float i_dvz, int i_pid) :
-    eta(i_eta),phi(i_phi),pt(i_pt),energy(i_energy),dvx(i_dvx),dvy(i_dvy),dvz(i_dvz),pid(i_pid)
+	   float i_dvx, float i_dvy,float i_dvz, int i_pid,int i_gen=-1,int i_reachedEE=-1) :
+  eta(i_eta),phi(i_phi),pt(i_pt),energy(i_energy),dvx(i_dvx),dvy(i_dvy),dvz(i_dvz),pid(i_pid),gen(i_gen),reachedEE(i_reachedEE)
   {
   }
 
+  inline void setExtrapolations(const std::vector<float>&x,const std::vector<float>& y,const std::vector<float>& z) 
+  {
+    posx=x;
+    posy=y;
+    posz=z;
+  }
   float eta;
   float phi;
   float pt;
@@ -24,8 +31,12 @@ class AGenPart : public TObject
   float dvy;
   float dvz;
   int pid;
-
-  ClassDef(AGenPart,1)
+  int gen;
+  int reachedEE;
+  std::vector<float> posx;
+  std::vector<float> posy;
+  std::vector<float> posz;
+  ClassDef(AGenPart,1)      
 };
 
 

diff --git a/HGCalAnalysis/plugins/BuildFile.xml b/HGCalAnalysis/plugins/BuildFile.xml
@@ -3,11 +3,13 @@
 <use   name="Geometry/HGCalGeometry"/>
 <use   name="DataFormats/CaloRecHit"/>
 <use   name="DataFormats/ParticleFlowReco"/>
-<use   name="RecoLocalCalo/HGCalRecHitDump"/>
 <use   name="RecoNtuples/HGCalAnalysis"/>
 <use   name="Geometry/Records"/>
 <use   name="SimDataFormats/CaloAnalysis"/>
 <use   name="CommonTools/UtilAlgos"/>
+<use   name="FastSimulation/Event"/>
+<use   name="hepmc"/>
+<use   name="heppdt"/>
 <library   file="*.cc" name="RecoNtuplesHGCalAnalysisPlugins">
   <flags   EDM_PLUGIN="1"/>
 </library>