From bb60a3b284796abfcdb990f0d1677f7286b38952 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rimbaud=20S=C3=A9bastien?= Date: Wed, 17 May 2017 11:36:49 +0200 Subject: [PATCH 1/5] Fix python 3.6 Type error in timefrequency.QSTFT.plotStokes and timefrequency.QSTFT.extractRidges --- bispy/.timefrequency.py.swp | Bin 0 -> 40960 bytes bispy/timefrequency.py | 12 ++++++------ 2 files changed, 6 insertions(+), 6 deletions(-) create mode 100644 bispy/.timefrequency.py.swp diff --git a/bispy/.timefrequency.py.swp b/bispy/.timefrequency.py.swp new file mode 100644 index 0000000000000000000000000000000000000000..947c02ff9f70e54dca3d8f35017e4e0d0e6d66f1 GIT binary patch literal 40960 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 Date: Wed, 17 May 2017 11:46:46 +0200 Subject: [PATCH 2/5] Updating .gitignore for vim text editor --- .gitignore | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/.gitignore b/.gitignore index fd20fdd..7aee8be 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,9 @@ *.pyc + +# Vim ignoring swap files + +*~ +*.swp +*.swo + From 96322a817b369af9fbb4bed71ae50ccd08b09bea Mon Sep 17 00:00:00 2001 From: SRimbaud Date: Wed, 17 May 2017 11:59:40 +0200 Subject: [PATCH 3/5] Delete .timefrequency.py.swp Vim temporary file, no need. --- bispy/.timefrequency.py.swp | Bin 40960 -> 0 bytes 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100644 bispy/.timefrequency.py.swp diff --git a/bispy/.timefrequency.py.swp b/bispy/.timefrequency.py.swp deleted file mode 100644 index 947c02ff9f70e54dca3d8f35017e4e0d0e6d66f1..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 40960 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 Date: Thu, 18 May 2017 10:24:52 +0200 Subject: [PATCH 4/5] Correction bug in utils.py line 303 Stokes2geo return 4 param not 3, phi added to get phi return param --- bispy/timefrequency.py | 2 ++ bispy/utils.py | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/bispy/timefrequency.py b/bispy/timefrequency.py index 31242c7..befcea8 100644 --- a/bispy/timefrequency.py +++ b/bispy/timefrequency.py @@ -371,6 +371,7 @@ def plotRidges(self, quivertdecim=10, cmocean=False): cbar1.ax.xaxis.set_ticks_position('top') cbarax2 = fig.add_axes([0.686, 0.83, 0.303, 0.03]) + print("-----Bug line im2-----\n{0}".format(im2)) cbar2 = fig.colorbar(im2, cax=cbarax2, ticks=[-np.pi/4, 0, np.pi/4], orientation='horizontal') cbar2.ax.set_xticklabels([r'$-\frac{\pi}{4}$', r'$0$', r'$\frac{\pi}{4}$']) cbar2.ax.xaxis.set_ticks_position('top') @@ -736,6 +737,7 @@ def _extractRidges(density, parThresh, parMinD): freqMask, timeMask = np.where(locMax) + FLAG = False #Avoid undifined FLAG if condition is false. if len(timeMask) > 1: FLAG = True while FLAG: diff --git a/bispy/utils.py b/bispy/utils.py index b698161..62ff5d8 100644 --- a/bispy/utils.py +++ b/bispy/utils.py @@ -300,7 +300,7 @@ def quat2euler(q): S2 = qqj_float[..., 1] S3 = - qqj_float[..., 3] - a, theta, chi = Stokes2geo(S0, S1, S2, S3) + a, theta, chi, phi = Stokes2geo(S0, S1, S2, S3) qi = quaternion.x qk = quaternion.z From 1dac60eb7ef188421120f7329696fe745ddf84df Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rimbaud=20S=C3=A9bastien?= Date: Thu, 18 May 2017 10:34:43 +0200 Subject: [PATCH 5/5] Changing int by int division // --- bispy/timefrequency.py | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/bispy/timefrequency.py b/bispy/timefrequency.py index befcea8..3191598 100644 --- a/bispy/timefrequency.py +++ b/bispy/timefrequency.py @@ -233,7 +233,7 @@ def extractRidges(self, parThresh=4, parMinD=3): # Extract ridges print('Extracting ridges') - self.ridges = _extractRidges(self.S0[:int(self.Nfft / 2), :], parThresh, parMinD) + self.ridges = _extractRidges(self.S0[:self.Nfft // 2, :], parThresh, parMinD) def plotStokes(self, cmocean=False): @@ -259,10 +259,10 @@ def plotStokes(self, cmocean=False): N = np.size(self.t) fig, ax = plt.subplots(ncols=3, figsize=(12, 5), sharey=True) - im0 = ax[0].imshow(self.S1n[:int(self.Nfft / 2), :], origin='lower', interpolation='none', aspect='auto',cmap=cmap, extent=[int(self.t.min()), int(self.t.max()), 0, self.f[int(self.Nfft / 2-1)]], vmin=-1, vmax=+1) + im0 = ax[0].imshow(self.S1n[:self.Nfft // 2, :], origin='lower', interpolation='none', aspect='auto',cmap=cmap, extent=[int(self.t.min()), int(self.t.max()), 0, self.f[self.Nfft // 2-1]], vmin=-1, vmax=+1) - im1 = ax[1].imshow(self.S2n[:int(self.Nfft / 2), :], origin='lower', interpolation='none', aspect='auto',cmap=cmap, extent=[int(self.t.min()), int(self.t.max()), 0, self.f[int(self.Nfft / 2-1)]], vmin=-1, vmax=+1) - im2 = ax[2].imshow(self.S3n[:int(self.Nfft / 2), :], origin='lower', interpolation='none', aspect='auto',cmap=cmap, extent=[int(self.t.min()), int(self.t.max()), 0, self.f[int(self.Nfft / 2-1)]], vmin=-1, vmax=+1) + im1 = ax[1].imshow(self.S2n[:self.Nfft // 2, :], origin='lower', interpolation='none', aspect='auto',cmap=cmap, extent=[int(self.t.min()), int(self.t.max()), 0, self.f[self.Nfft // 2-1]], vmin=-1, vmax=+1) + im2 = ax[2].imshow(self.S3n[:self.Nfft // 2, :], origin='lower', interpolation='none', aspect='auto',cmap=cmap, extent=[int(self.t.min()), int(self.t.max()), 0, self.f[self.Nfft // 2-1]], vmin=-1, vmax=+1) # adjust figure fig.subplots_adjust(left=0.05, top=0.8, right=0.99, wspace=0.05) @@ -340,10 +340,10 @@ def plotRidges(self, quivertdecim=10, cmocean=False): N = np.size(self.t) fig, ax = plt.subplots(ncols=3, figsize=(12, 5), sharey=True) - im0 = ax[0].imshow(self.S0[:int(self.Nfft / 2), :], interpolation='none', origin='lower', aspect='auto',cmap=cmap_S0, extent=[int(self.t.min()), int(self.t.max()), 0, self.f[int(self.Nfft / 2-1)]]) + im0 = ax[0].imshow(self.S0[:self.Nfft // 2, :], interpolation='none', origin='lower', aspect='auto',cmap=cmap_S0, extent=[int(self.t.min()), int(self.t.max()), 0, self.f[self.Nfft // 2-1]]) - im1 = ax[1].quiver(self.t[::int(self.spacing)][::quivertdecim], self.f[:int(self.Nfft / 2)], np.real(ori[:int(self.Nfft / 2), ::quivertdecim]), (np.imag(ori[:int(self.Nfft / 2), ::quivertdecim])), theta[:int(self.Nfft / 2), ::quivertdecim], clim=[-np.pi/2, np.pi/2], cmap=cmap_theta, headaxislength=0,headlength=0.001, pivot='middle',width=0.005, scale=15) + im1 = ax[1].quiver(self.t[::int(self.spacing)][::quivertdecim], self.f[:int(self.Nfft / 2)], np.real(ori[:self.Nfft // 2, ::quivertdecim]), (np.imag(ori[:self.Nfft // 2, ::quivertdecim])), theta[:self.Nfft // 2, ::quivertdecim], clim=[-np.pi/2, np.pi/2], cmap=cmap_theta, headaxislength=0,headlength=0.001, pivot='middle',width=0.005, scale=15) for r in self.ridges: points = np.array([self.t[::self.spacing][r[1]], self.f[r[0]]]).T.reshape(-1, 1, 2) @@ -371,7 +371,6 @@ def plotRidges(self, quivertdecim=10, cmocean=False): cbar1.ax.xaxis.set_ticks_position('top') cbarax2 = fig.add_axes([0.686, 0.83, 0.303, 0.03]) - print("-----Bug line im2-----\n{0}".format(im2)) cbar2 = fig.colorbar(im2, cax=cbarax2, ticks=[-np.pi/4, 0, np.pi/4], orientation='horizontal') cbar2.ax.set_xticklabels([r'$-\frac{\pi}{4}$', r'$0$', r'$\frac{\pi}{4}$']) cbar2.ax.xaxis.set_ticks_position('top') @@ -384,7 +383,7 @@ def plotRidges(self, quivertdecim=10, cmocean=False): ax[0].set_ylabel('Frequency [Hz]') ax[0].set_title('Time-Frequency energy density', y=1.14) - + ax[1].set_title('Instantaneous orientation', y=1.14) ax[2].set_title('Instantaneous ellipticity', y=1.14)