Merge branch 'fix_peaklet_merging_bias' of https://github.com/XENONnT…

…/straxen into fix_peaklet_merging_bias
JoranAngevaare · Aug 5, 2021 · 06d668a · 06d668a
2 parents 450687c + 0b0dbb1
commit 06d668a
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 15 deletions.
diff --git a/straxen/analyses/bokeh_waveform_plot.py b/straxen/analyses/bokeh_waveform_plot.py
@@ -16,7 +16,7 @@
 straxen._BOKEH_CONFIGURED_NOTEBOOK = False
 
 
-@straxen.mini_analysis(requires=('events', 'event_basics', 'peaks', 'peak_basics', 'peak_positions'),
+@straxen.mini_analysis(requires=('event_basics', 'peaks', 'peak_basics', 'peak_positions'),
                        warn_beyond_sec=0.05)
 def event_display_interactive(events,
                               peaks,

diff --git a/straxen/plugins/acqmon_processing.py b/straxen/plugins/acqmon_processing.py
@@ -145,8 +145,8 @@ class VetoProximity(strax.OverlapWindowPlugin):
         - hev_x:  high energy veto on/off signal
     """
 
-    __version__ = '0.1.1'
-    depends_on = ('events', 'aqmon_hits')
+    __version__ = '0.1.2'
+    depends_on = ('event_basics', 'aqmon_hits')
     provides = ('veto_proximity')
     data_kind = ('events')
     save_when = strax.SaveWhen.TARGET

diff --git a/straxen/plugins/event_info.py b/straxen/plugins/event_info.py
@@ -16,16 +16,15 @@ class EventInfo(strax.MergeOnlyPlugin):
     Plugin which merges the information of all event data_kinds into a
     single data_type.
     """
-    depends_on = ['events',
-                  'event_basics',
+    depends_on = ['event_basics',
                   'event_positions',
                   'corrected_areas',
                   'energy_estimates',
                   # 'event_pattern_fit', <- this will be added soon
                   ]
     save_when = strax.SaveWhen.ALWAYS
     provides = 'event_info'
-    __version__ = '0.0.1'
+    __version__ = '0.0.2'
 
     def compute(self, **kwargs):
         event_info_function = self.config['event_info_function']
@@ -47,11 +46,11 @@ class EventInfo1T(strax.MergeOnlyPlugin):
 
     This only uses 1T data-types as several event-plugins are nT only
     """
-    depends_on = ['events',
-                  'event_basics',
+    depends_on = ['event_basics',
                   'event_positions',
                   'corrected_areas',
-                  'energy_estimates']
+                  'energy_estimates',
+                  ]
     provides = 'event_info'
     save_when = strax.SaveWhen.ALWAYS
-    __version__ = '0.0.0'
+    __version__ = '0.0.1'
diff --git a/straxen/plugins/event_processing.py b/straxen/plugins/event_processing.py
@@ -57,6 +57,8 @@ class Events(strax.OverlapWindowPlugin):
     provides = 'events'
     data_kind = 'events'
     __version__ = '0.0.1'
+    save_when = strax.SaveWhen.NEVER
+
     dtype = [
         ('event_number', np.int64, 'Event number in this dataset'),
         ('time', np.int64, 'Event start time in ns since the unix epoch'),
@@ -133,7 +135,7 @@ class EventBasics(strax.Plugin):
     The main S2 and alternative S2 are given by the largest two S2-Peaks
     within the event. By default this is also true for S1.
     """
-    __version__ = '1.1.0'
+    __version__ = '1.1.1'
 
     depends_on = ('events',
                   'peak_basics',
@@ -152,7 +154,10 @@ def infer_dtype(self):
         dtype += [('n_peaks', np.int32,
                    'Number of peaks in the event'),
                   ('drift_time', np.int32,
-                   'Drift time between main S1 and S2 in ns')]
+                   'Drift time between main S1 and S2 in ns'),
+                  ('event_number', np.int64,
+                   'Event number in this dataset'),
+                  ]
 
         dtype += self._get_si_dtypes(self.peak_properties)
 
@@ -267,6 +272,11 @@ def compute(self, events, peaks):
         self.set_nan_defaults(result)
 
         split_peaks = strax.split_by_containment(peaks, events)
+
+        result['time'] = events['time']
+        result['endtime'] = events['endtime']
+        result['event_number'] = events['event_number']
+
         self.fill_events(result, events, split_peaks)
         return result
 
@@ -276,9 +286,6 @@ def fill_events(self, result_buffer, events, split_peaks):
         for event_i, _ in enumerate(events):
             peaks_in_event_i = split_peaks[event_i]
             n_peaks = len(peaks_in_event_i)
-
-            result_buffer[event_i]['time'] = events[event_i]['time']
-            result_buffer[event_i]['endtime'] = events[event_i]['endtime']
             result_buffer[event_i]['n_peaks'] = n_peaks
 
             if not n_peaks: