[bugfix] return value of getnoisewin and getsignalwin should be of expected type numpy.ndarray (was tuple)
This commit is contained in:
parent
dc281c6c0e
commit
8d4aaab92a
@ -323,7 +323,7 @@ def getSNR(X, TSNR, t1):
|
|||||||
return
|
return
|
||||||
|
|
||||||
# demean over entire snr window
|
# demean over entire snr window
|
||||||
x -= x[inoise[0][0]:isignal[0][-1]].mean()
|
x -= x[inoise[0]:isignal[-1]].mean()
|
||||||
|
|
||||||
# calculate ratios
|
# calculate ratios
|
||||||
noiselevel = np.sqrt(np.mean(np.square(x[inoise])))
|
noiselevel = np.sqrt(np.mean(np.square(x[inoise])))
|
||||||
@ -353,9 +353,8 @@ def getnoisewin(t, t1, tnoise, tgap):
|
|||||||
:type: float
|
:type: float
|
||||||
'''
|
'''
|
||||||
|
|
||||||
inoise = None
|
|
||||||
# get noise window
|
# 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])))
|
& (t >= max([t1 - tnoise - tgap, 0])))
|
||||||
if np.size(inoise) < 1:
|
if np.size(inoise) < 1:
|
||||||
print 'getnoisewin: Empty array inoise, check noise window!'
|
print 'getnoisewin: Empty array inoise, check noise window!'
|
||||||
@ -378,9 +377,8 @@ def getsignalwin(t, t1, tsignal):
|
|||||||
:type: float
|
:type: float
|
||||||
'''
|
'''
|
||||||
|
|
||||||
inoise = None
|
|
||||||
# get signal window
|
# get signal window
|
||||||
isignal = np.where((t <= min([t1 + tsignal, len(t)])) \
|
isignal, = np.where((t <= min([t1 + tsignal, len(t)])) \
|
||||||
& (t >= t1))
|
& (t >= t1))
|
||||||
if np.size(isignal) < 1:
|
if np.size(isignal) < 1:
|
||||||
print 'getsignalwin: Empty array isignal, check signal window!'
|
print 'getsignalwin: Empty array isignal, check signal window!'
|
||||||
|
Loading…
Reference in New Issue
Block a user