Skip to content

Commit 7327e24

Browse files
committed
small refactor of the code to make it more readable
1 parent b0e3dce commit 7327e24

File tree

2 files changed

+9
-8
lines changed

2 files changed

+9
-8
lines changed

src/diffpy/fourigui/fourigui.py

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -371,18 +371,18 @@ def intensity_upd_local(self):
371371
elif self.axis.get() == 2:
372372
plane = self.cube[:, :, self.plane_num.get()]
373373
nan_ratio = np.count_nonzero(np.isnan(plane)) / plane.size
374-
self.localmax["text"] = "{}".format(np.format_float_scientific(np.nanmax(plane), 1))
375-
self.localmin["text"] = "{}".format(np.format_float_scientific(np.nanmin(plane), 1))
376-
self.localsum["text"] = "{}".format(np.format_float_scientific(np.nansum(plane), 1))
377-
self.localnanratio["text"] = "{}".format(round(nan_ratio, 2))
374+
self.localmax["text"] = f"{np.format_float_scientific(np.nanmax(plane), 1)}"
375+
self.localmin["text"] = f"{np.format_float_scientific(np.nanmin(plane), 1)}"
376+
self.localsum["text"] = f"{np.format_float_scientific(np.nansum(plane), 1)}"
377+
self.localnanratio["text"] = f"{round(nan_ratio, 2)}"
378378

379379
def intensity_upd_global(self):
380-
"""show global intensity minimum, maximum and sum of 3D array"""
380+
"""Load global intensity minimum, maximum and sum of 3D array"""
381381
self.intensity_upd_local()
382382
nan_ratio = np.count_nonzero(np.isnan(self.cube)) / self.cube.size
383-
self.globalmax["text"] = "{}".format(np.format_float_scientific(np.nanmax(self.cube), 1))
384-
self.globalmin["text"] = "{}".format(np.format_float_scientific(np.nanmin(self.cube), 1))
385-
self.globalsum["text"] = "{}".format(np.format_float_scientific(np.nansum(self.cube), 1))
383+
self.globalmax["text"] = f"{np.format_float_scientific(np.nanmax(self.cube), 1)}"
384+
self.globalmin["text"] = f"{np.format_float_scientific(np.nanmin(self.cube), 1)}"
385+
self.globalsum["text"] = f"{np.format_float_scientific(np.nansum(self.cube), 1)}"
386386
self.globalnanratio["text"] = "{}".format(round(nan_ratio, 2))
387387

388388
def fft(self):

tests/integration_test.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -123,6 +123,7 @@ def test_applycutoff_range2(self):
123123
result = self.test_gui.cube
124124

125125
# then
126+
# with self.assertWarns(RuntimeWarning):
126127
self.assertTrue(np.allclose(np.nan_to_num(result), np.nan_to_num(self.test_sofq_cut_15to35px)))
127128

128129

0 commit comments

Comments
 (0)