From 8d4aaab92a15093e3698551c88dcddee4c8f0fec Mon Sep 17 00:00:00 2001 From: Sebastian Wehling-Benatelli Date: Tue, 23 Jun 2015 08:48:14 +0200 Subject: [PATCH] [bugfix] return value of getnoisewin and getsignalwin should be of expected type numpy.ndarray (was tuple) --- pylot/core/pick/utils.py | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/pylot/core/pick/utils.py b/pylot/core/pick/utils.py index d74ab2a6..0d3ed952 100644 --- a/pylot/core/pick/utils.py +++ b/pylot/core/pick/utils.py @@ -323,7 +323,7 @@ def getSNR(X, TSNR, t1): return # demean over entire snr window - x -= x[inoise[0][0]:isignal[0][-1]].mean() + x -= x[inoise[0]:isignal[-1]].mean() # calculate ratios noiselevel = np.sqrt(np.mean(np.square(x[inoise]))) @@ -353,9 +353,8 @@ def getnoisewin(t, t1, tnoise, tgap): :type: float ''' - inoise = None # get noise window - inoise = np.where((t <= max([t1 - tgap, 0])) \ + inoise, = np.where((t <= max([t1 - tgap, 0])) \ & (t >= max([t1 - tnoise - tgap, 0]))) if np.size(inoise) < 1: print 'getnoisewin: Empty array inoise, check noise window!' @@ -378,9 +377,8 @@ def getsignalwin(t, t1, tsignal): :type: float ''' - inoise = None # get signal window - isignal = np.where((t <= min([t1 + tsignal, len(t)])) \ + isignal, = np.where((t <= min([t1 + tsignal, len(t)])) \ & (t >= t1)) if np.size(isignal) < 1: print 'getsignalwin: Empty array isignal, check signal window!'