PMT Waveform Simulation

DataModel/ADCPulse.cpp

@@ -7,9 +7,9 @@
 ADCPulse::ADCPulse(int TubeId, double start_time, double peak_time,
   double baseline, double sigma_baseline, unsigned long area,
   unsigned short raw_amplitude, double calibrated_amplitude,
-  double charge) : Hit(TubeId, start_time, charge),
+  double charge, double stop_time) : Hit(TubeId, start_time, charge),
   start_time_(start_time), peak_time_(peak_time),
   baseline_(baseline), sigma_baseline_(sigma_baseline), raw_area_(area),
-  raw_amplitude_(raw_amplitude), calibrated_amplitude_(calibrated_amplitude)
+  raw_amplitude_(raw_amplitude), calibrated_amplitude_(calibrated_amplitude), stop_time_(stop_time)
 {
 }

DataModel/ADCPulse.h

@@ -23,7 +23,7 @@ class ADCPulse : public Hit {
     ADCPulse(int TubeId, double start_time, double peak_time,
       double baseline, double sigma_baseline, unsigned long raw_area,
       unsigned short raw_amplitude, double calibrated_amplitude,
-      double charge);
+      double charge, double stop_time = 0);
 
     // @brief Returns the start time (ns) of the pulse relative to the
     // start of its minibuffer
@@ -33,6 +33,10 @@ class ADCPulse : public Hit {
     // start of its minibuffer
     inline double peak_time() const { return peak_time_; }
 
+    // @brief Returns the stop time (ns) of the pulse relative to the
+    // start of its minibuffer
+    inline double stop_time() const { return stop_time_; }
+
     // @brief Returns the approximate baseline (ADC) used to calibrate the
     // pulse
     inline double baseline() const { return baseline_; }
@@ -71,16 +75,24 @@ class ADCPulse : public Hit {
       ar & raw_area_;
       ar & raw_amplitude_;
       ar & calibrated_amplitude_;
+      if (version > 0)
+	ar & stop_time_;
     }
 
   protected:
 
     double start_time_; // ns since beginning of minibuffer
     double peak_time_; // ns since beginning of minibuffer
+    double stop_time_; // ns since beginning of minibuffer
     double baseline_; // mean (ADC)
     double sigma_baseline_; // standard deviation (ADC)
     unsigned long raw_area_; // (ADC * samples)
 
     unsigned short raw_amplitude_; // ADC
     double calibrated_amplitude_; // V
+
 };
+
+// Need to increment the class version since we added time as a new variable
+// the version number ensures backward compatibility when serializing 
+BOOST_CLASS_VERSION(ADCPulse, 1)