From 4897cae048bd304a734a96d0baeb6173296b686b Mon Sep 17 00:00:00 2001 From: Kailiang Chen Date: Fri, 23 Feb 2018 16:11:47 -0500 Subject: [PATCH] Fix code compatibility issues. --- deltasigma/_infnorm.py | 3 ++- deltasigma/_simulateSNR.py | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/deltasigma/_infnorm.py b/deltasigma/_infnorm.py index 5539eaf..25f0158 100644 --- a/deltasigma/_infnorm.py +++ b/deltasigma/_infnorm.py @@ -57,7 +57,8 @@ def infnorm(H): dw = 2*np.pi/(N-1) Hval = evalTF(H, np.exp(1j*w)) Hinf = np.max(np.abs(Hval)) - wi = np.where(np.abs(Hval) == Hinf)[0] + wi = np.where(np.abs(Hval) == Hinf) + wi = wi[0][0] # Home in using the scipy "fminbound" function. # original MATLAB code: diff --git a/deltasigma/_simulateSNR.py b/deltasigma/_simulateSNR.py index 778fd14..5f50a1c 100644 --- a/deltasigma/_simulateSNR.py +++ b/deltasigma/_simulateSNR.py @@ -224,10 +224,10 @@ def simulateSNR(arg1, osr, amp=None, f0=0, nlev=2, f=None, k=13, np.arange(Ntransient/2))) if not quadrature: tone = M*np.sin(2*np.pi*F/N*np.arange(N + Ntransient)) - tone[:Ntransient/2] = tone[:Ntransient/2] * soft_start + tone[:Ntransient//2] = tone[:Ntransient//2] * soft_start else: tone = M*np.exp(2j*np.pi*F/N * np.arange(N + Ntransient)) - tone[:Ntransient/2] = tone[:Ntransient/2] * soft_start + tone[:Ntransient//2] = tone[:Ntransient//2] * soft_start if not quadrature_ntf: tone = tone.reshape((1, -1)) tone = np.vstack((np.real(tone), np.imag(tone)))