From a0cf10854ccfe23463aec54be0fbddc0ce339f81 Mon Sep 17 00:00:00 2001 From: Filippo Ballerini Date: Wed, 6 Nov 2024 12:01:28 -0500 Subject: [PATCH 1/3] Fixed warning in fourigui.py code --- news/warning.rst | 23 +++++++++++++++++++++++ src/diffpy/fourigui/fourigui.py | 3 ++- 2 files changed, 25 insertions(+), 1 deletion(-) create mode 100644 news/warning.rst diff --git a/news/warning.rst b/news/warning.rst new file mode 100644 index 0000000..5337a7e --- /dev/null +++ b/news/warning.rst @@ -0,0 +1,23 @@ +**Added:** + +* + +**Changed:** + +* + +**Deprecated:** + +* + +**Removed:** + +* + +**Fixed:** + +Warning fixed in fourigui.py adding line 397 `axes = list(range(len(size)))` and modifying line 399 `fftholder = np.fft.fftn(fftholder, s=size, axes=axes, norm="ortho")` + +**Security:** + +* diff --git a/src/diffpy/fourigui/fourigui.py b/src/diffpy/fourigui/fourigui.py index 12e7db6..1fa435f 100755 --- a/src/diffpy/fourigui/fourigui.py +++ b/src/diffpy/fourigui/fourigui.py @@ -394,8 +394,9 @@ def fft(self): def perform_fft(fftholder): fftholder = np.nan_to_num(fftholder) size = list(fftholder.shape) + axes = list(range(len(size))) fftholder = np.fft.ifftshift(fftholder) - fftholder = np.fft.fftn(fftholder, s=size, norm="ortho") + fftholder = np.fft.fftn(fftholder, s=size, axes=axes, norm="ortho") fftholder = np.fft.fftshift(fftholder) fftholder = fftholder.real return fftholder From 0d8fb67beacc235ae6a7ab02d681a4c92cbcad03 Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Wed, 6 Nov 2024 17:04:06 +0000 Subject: [PATCH 2/3] [pre-commit.ci] auto fixes from pre-commit hooks --- src/diffpy/fourigui/fourigui.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/diffpy/fourigui/fourigui.py b/src/diffpy/fourigui/fourigui.py index 1fa435f..cb95683 100755 --- a/src/diffpy/fourigui/fourigui.py +++ b/src/diffpy/fourigui/fourigui.py @@ -394,7 +394,7 @@ def fft(self): def perform_fft(fftholder): fftholder = np.nan_to_num(fftholder) size = list(fftholder.shape) - axes = list(range(len(size))) + axes = list(range(len(size))) fftholder = np.fft.ifftshift(fftholder) fftholder = np.fft.fftn(fftholder, s=size, axes=axes, norm="ortho") fftholder = np.fft.fftshift(fftholder) From 7b490fe43f0a9478e35d0f11344f1663e21dd011 Mon Sep 17 00:00:00 2001 From: Filippo Ballerini Date: Wed, 6 Nov 2024 12:07:00 -0500 Subject: [PATCH 3/3] Updated news file --- news/warning.rst | 4 ++-- src/diffpy/fourigui/fourigui.py | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/news/warning.rst b/news/warning.rst index 5337a7e..e95cecd 100644 --- a/news/warning.rst +++ b/news/warning.rst @@ -8,7 +8,7 @@ **Deprecated:** -* +* Deprecation warning fixed for axes in np.fft in fourigui.py **Removed:** @@ -16,7 +16,7 @@ **Fixed:** -Warning fixed in fourigui.py adding line 397 `axes = list(range(len(size)))` and modifying line 399 `fftholder = np.fft.fftn(fftholder, s=size, axes=axes, norm="ortho")` +* **Security:** diff --git a/src/diffpy/fourigui/fourigui.py b/src/diffpy/fourigui/fourigui.py index 1fa435f..cb95683 100755 --- a/src/diffpy/fourigui/fourigui.py +++ b/src/diffpy/fourigui/fourigui.py @@ -394,7 +394,7 @@ def fft(self): def perform_fft(fftholder): fftholder = np.nan_to_num(fftholder) size = list(fftholder.shape) - axes = list(range(len(size))) + axes = list(range(len(size))) fftholder = np.fft.ifftshift(fftholder) fftholder = np.fft.fftn(fftholder, s=size, axes=axes, norm="ortho") fftholder = np.fft.fftshift(fftholder)