From cdfd5bef4b9e324a3e4332bcbfd0d39edda6a25c Mon Sep 17 00:00:00 2001 From: Sangjoon Bob Lee Date: Thu, 3 Oct 2024 15:22:59 -0400 Subject: [PATCH 1/6] Remove time dep in pip, conda.txt --- requirements/conda.txt | 1 - requirements/pip.txt | 1 - src/diffpy/fourigui/fourigui.py | 3 --- 3 files changed, 5 deletions(-) diff --git a/requirements/conda.txt b/requirements/conda.txt index 9de315b..f28dfd3 100644 --- a/requirements/conda.txt +++ b/requirements/conda.txt @@ -1,5 +1,4 @@ h5py -time tk matplotlib-base numpy diff --git a/requirements/pip.txt b/requirements/pip.txt index f8febd0..3d4ebed 100644 --- a/requirements/pip.txt +++ b/requirements/pip.txt @@ -1,5 +1,4 @@ h5py -time tk matplotlib numpy diff --git a/src/diffpy/fourigui/fourigui.py b/src/diffpy/fourigui/fourigui.py index 88dd866..3ddfcae 100755 --- a/src/diffpy/fourigui/fourigui.py +++ b/src/diffpy/fourigui/fourigui.py @@ -392,15 +392,12 @@ def fft(self): """ def perform_fft(fftholder): - time0 = time.time() fftholder = np.nan_to_num(fftholder) size = list(fftholder.shape) fftholder = np.fft.ifftshift(fftholder) fftholder = np.fft.fftn(fftholder, s=size, norm="ortho") fftholder = np.fft.fftshift(fftholder) fftholder = fftholder.real - fftdur = time.time() - time0 - print("- FFT performed in {} sec.".format(round(fftdur, 4))) return fftholder if not self.transformed and not self.transcutted: # no fft at all yet From c34ea6d9f741a456a84a07fddd11950620730896 Mon Sep 17 00:00:00 2001 From: Sangjoon Bob Lee Date: Thu, 3 Oct 2024 15:24:25 -0400 Subject: [PATCH 2/6] Add remove time news --- news/time.rst | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) create mode 100644 news/time.rst diff --git a/news/time.rst b/news/time.rst new file mode 100644 index 0000000..c99de3a --- /dev/null +++ b/news/time.rst @@ -0,0 +1,23 @@ +**Added:** + +* + +**Changed:** + +* + +**Deprecated:** + +* + +**Removed:** + +* + +**Fixed:** + +* remove time dependency in pip, conda.txt + +**Security:** + +* From efb9b7c75853fbfdd9f9a95c24b9adea18f8312e Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Thu, 3 Oct 2024 19:24:45 +0000 Subject: [PATCH 3/6] [pre-commit.ci] auto fixes from pre-commit hooks --- news/time.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/news/time.rst b/news/time.rst index c99de3a..1d13116 100644 --- a/news/time.rst +++ b/news/time.rst @@ -16,7 +16,7 @@ **Fixed:** -* remove time dependency in pip, conda.txt +* remove time dependency in pip, conda.txt **Security:** From cad721bdf761541c6c847261dc6f4126bfbb5147 Mon Sep 17 00:00:00 2001 From: Sangjoon Bob Lee Date: Thu, 3 Oct 2024 15:25:00 -0400 Subject: [PATCH 4/6] remove further usage of time --- src/diffpy/fourigui/fourigui.py | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/src/diffpy/fourigui/fourigui.py b/src/diffpy/fourigui/fourigui.py index 3ddfcae..776f27d 100755 --- a/src/diffpy/fourigui/fourigui.py +++ b/src/diffpy/fourigui/fourigui.py @@ -1,4 +1,3 @@ -import time import tkinter as tk from tkinter.ttk import Button @@ -466,7 +465,6 @@ def applycutoff(self): """ if not self.cutted: - time0 = time.time() X, Y, Z = self.cube.shape sphere = np.ones((X, Y, Z)) qmin = float(self.qminentry.get()) @@ -479,8 +477,7 @@ def applycutoff(self): R2 = (XS - X // 2) ** 2 + (YS - Y // 2) ** 2 + (ZS - Z // 2) ** 2 mask = (R2 <= r2_inner) | (R2 >= r2_outer) sphere[mask] = np.nan - cutdur = time.time() - time0 - + if self.space.get(): self.cube_real = self.cube self.cube = self.cube_reci * sphere From 27b3f8e678dcfc3d330c9b192f82cd22aebca567 Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Thu, 3 Oct 2024 19:25:37 +0000 Subject: [PATCH 5/6] [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 776f27d..481e657 100755 --- a/src/diffpy/fourigui/fourigui.py +++ b/src/diffpy/fourigui/fourigui.py @@ -477,7 +477,7 @@ def applycutoff(self): R2 = (XS - X // 2) ** 2 + (YS - Y // 2) ** 2 + (ZS - Z // 2) ** 2 mask = (R2 <= r2_inner) | (R2 >= r2_outer) sphere[mask] = np.nan - + if self.space.get(): self.cube_real = self.cube self.cube = self.cube_reci * sphere From c9f5100c58a5fd69cdcb190bb7a6934e8a8fbd5b Mon Sep 17 00:00:00 2001 From: Sangjoon Bob Lee Date: Thu, 3 Oct 2024 15:26:30 -0400 Subject: [PATCH 6/6] Remove cutdur - time variable --- src/diffpy/fourigui/fourigui.py | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/diffpy/fourigui/fourigui.py b/src/diffpy/fourigui/fourigui.py index 776f27d..f0323f1 100755 --- a/src/diffpy/fourigui/fourigui.py +++ b/src/diffpy/fourigui/fourigui.py @@ -477,12 +477,11 @@ def applycutoff(self): R2 = (XS - X // 2) ** 2 + (YS - Y // 2) ** 2 + (ZS - Z // 2) ** 2 mask = (R2 <= r2_inner) | (R2 >= r2_outer) sphere[mask] = np.nan - + if self.space.get(): self.cube_real = self.cube self.cube = self.cube_reci * sphere self.cube_recicut = self.cube - print("- Cutoff below {} and beyond {} in {} sec.".format(qmin, qmax, round(cutdur, 4))) self.fft() else: self.cube_reci = self.cube @@ -490,7 +489,6 @@ def applycutoff(self): self.cube_recicut = self.cube self.plot_plane() self.intensity_upd_global() - print("- Cutoff below {} and beyond {} in {} sec.".format(qmin, qmax, round(cutdur, 4))) self.cutted = True