1 files changed, 36 insertions, 22 deletions

diff --git a/io/root.C b/io/root.C
index dfcb3c0..43f4e73 100644
--- a/io/root.C
+++ b/io/root.C
@@ -9,23 +9,19 @@ struct Photon {
   TVector3 dir;
   TVector3 pol;
   double wavelength; // nm
-  int state;
-  int last_triangle;
-  int last_solid;
+  int history;
+  int last_hit_triangle;
 };
 
 struct MC {
   std::string particle;
   TVector3 gen_pos;
   TVector3 gen_dir;
-  double gen_ke;
+  double gen_total_e;
 
-  std::vector<Photon> photon;
+  std::vector<Photon> photon_start;
+  std::vector<Photon> photon_stop;
 
-  void clear() {
-    particle = "none";
-    photon.clear();
-  }
 };
 
 struct Channel {
@@ -41,23 +37,42 @@ struct Event {
   int nhit;
   std::vector<Channel> channel;
 
-  void clear() {
-    mc.clear();
-    channel.clear();
-  }
 };
 
-void fill_event(TTree *T,
-		Event *ev, int event_id, double *gen_pos, int nchannels, 
-		float *channel_times)
+void fill_photons(Event *ev, bool start, 
+		  unsigned int nphotons, float *pos, float *dir,
+		  float *pol, float *wavelength, float *t0,
+		  int *histories=0, int *last_hit_triangle=0)
+{
+  std::vector<Photon> &photons = start ? ev->mc.photon_start : ev->mc.photon_stop;
+  photons.resize(nphotons);
+  
+  for (unsigned int i=0; i < nphotons; i++) {
+    Photon &photon = photons[i];
+    photon.t = t0[i];
+    photon.pos.SetXYZ(pos[3*i], pos[3*i + 1], pos[3*i + 2]);
+    photon.dir.SetXYZ(dir[3*i], dir[3*i + 1], dir[3*i + 2]);
+    photon.pol.SetXYZ(pol[3*i], pol[3*i + 1], pol[3*i + 2]);
+    photon.wavelength = wavelength[i];
+    if (histories)
+      photon.history = histories[i];
+    else
+      photon.history = 0;
+
+    if (last_hit_triangle)
+      photon.last_hit_triangle = last_hit_triangle[i];
+    else
+      photon.last_hit_triangle = -1;
+  }
+}
+		  
+
+void fill_hits(Event *ev, unsigned int nchannels, float *channel_times)
 {
-  ev->clear();
-  ev->event_id = event_id;
-  MC &mc = ev->mc;
-  mc.gen_pos.SetXYZ(gen_pos[0], gen_pos[1], gen_pos[2]);
+  ev->channel.resize(0);
   ev->nhit = 0;
   Channel ch;
-  for (int i=0; i < nchannels; i++) {
+  for (unsigned int i=0; i < nchannels; i++) {
     if (channel_times[i] < 1e8) {
       ev->nhit++;
       ch.channel_id = i;
@@ -66,7 +81,6 @@ void fill_event(TTree *T,
       ev->channel.push_back(ch);
     }
   }
-  T->Fill();
 }