Updated waterfall.py grab_data to fix UCBerkeleySETI#31 UCBerkeleySET…

…I#32 UCBerkeleySETI#33 UCBerkeleySETI#34

blimpy/waterfall.py

@@ -517,8 +517,20 @@ def grab_data(self, f_start=None, f_stop=None,t_start=None, t_stop=None, if_id=0
  self.freqs = self.populate_freqs()
  self.timestamps = self.populate_timestamps()
 
- plot_f = self.freqs
- plot_data = np.squeeze(self.data)
+ if f_start is None:
+ f_start = self.freqs[0]
+ if f_stop is None:
+ f_stop = self.freqs[-1]
+
+ i0 = np.argmin(np.abs(self.freqs - f_start))
+ i1 = np.argmin(np.abs(self.freqs - f_stop))
+
+ if i0 < i1:
+ plot_f = self.freqs[i0:i1 + 1]
+ plot_data = np.squeeze(self.data[t_start:t_stop, ..., i0:i1 + 1])
+ else:
+ plot_f = self.freqs[i1:i0 + 1]
+ plot_data = np.squeeze(self.data[t_start:t_stop, ..., i1:i0 + 1])
 
  return plot_f, plot_data