From 9a969f18966234eb09f777ef59f4df03da444198 Mon Sep 17 00:00:00 2001 From: Danny Price Date: Wed, 6 Jun 2018 14:15:50 +1000 Subject: [PATCH] Updated waterfall.py grab_data to fix #31 #32 #33 #34 --- blimpy/waterfall.py | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/blimpy/waterfall.py b/blimpy/waterfall.py index 64a7ea63..d68bec41 100755 --- a/blimpy/waterfall.py +++ b/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