Merge pull request #210 from jvmead/feature/sum_hits_fprompt

Feature/sum hits fprompt

Author: mjkramer

src/proto_nd_flow/reco/light/hit_finder.py

@@ -115,7 +115,9 @@ def hits_dtype(self, near_samples):
                 ('ns_spline', 'f4'),
                 ('rising_spline', 'f4'),
                 ('rising_err_spline', 'f4'),
-                ('fwhm_spline', 'f4')
+                ('fwhm_spline', 'f4'),
+                ('integral', 'f4'),
+                ('fprompt', 'f4')
             ])
         elif self.hit_level=="sipm":
             return np.dtype([
@@ -354,7 +356,7 @@ def run(self, source_name, source_slice, cache):
 
         threshold_mask = peak_max >=self.threshold[peaks[1:-1]].ravel()
 
-        if self.hit_level=="sum_tpc":
+        if self.hit_level=="sum_tpc" or self.hit_level=="sum":
             integrals, fprompts = self.calculate_fprompt(wvfms, peaks_found,
                                                          self.prompt_window,
                                                          self.long_window,
@@ -436,6 +438,8 @@ def run(self, source_name, source_slice, cache):
                 hit_data['tpc'] = peaks[1].ravel()
                 hit_data['det'] = wvfm_det[peaks[:3]].ravel()
                 hit_data['boundary'] = [np.array(resources['Geometry'].det_bounds[(tpc,det)][0]) for tpc, det in zip(peaks[1].ravel(),wvfm_det[peaks[:3]].ravel())]
+                hit_data['integral'] = integrals.ravel()
+                hit_data['fprompt'] = fprompts.ravel()
 
             elif self.hit_level=="sipm":
                 hit_data['adc'] = peaks[1].ravel()

yamls/proto_nd_flow/reco/light/SumHitFinder.yaml

@@ -13,7 +13,7 @@ params:
   hits_dset_name: 'light/sum_hits' # new dataset to produce
 
   #threshold: !include yamls/proto_nd_flow/reco/light/sipm_threshold.yaml
-  # threshold: 
+  # threshold:
   threshold: 4
 
   # configuration parameters
@@ -25,4 +25,7 @@ params:
   rt_sqrt_factor: 5.0
   pe_weight: 1.0
   rising_edge: False
-  local_maxima: True
+  local_maxima: True
+  prompt_window: 200.0
+  long_window: 3200.0
+  tick_duration: 16.0