Skip to content

Commit b896e49

Browse files
committed
work on tests started
1 parent 5250ba5 commit b896e49

File tree

5 files changed

+5
-228
lines changed

5 files changed

+5
-228
lines changed

tests/test_recon/rotation_cpu_reference.py

Lines changed: 0 additions & 199 deletions
This file was deleted.

tests/test_recon/test_algorithm.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,7 @@ def test_reconstruct_LPRec3d_tomobar_1(data, flats, darks, ensure_clean_memory):
119119
)
120120
assert recon_data.flags.c_contiguous
121121
recon_data = recon_data.get()
122-
assert_allclose(np.mean(recon_data), 0.0070, atol=1e-4)
122+
assert_allclose(np.mean(recon_data), 0.007, atol=1e-3)
123123
assert recon_data.dtype == np.float32
124124
assert recon_data.shape == (130, 128, 130)
125125

tests/test_recon/test_rotation.py

Lines changed: 1 addition & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@
1515
find_center_pc,
1616
)
1717
from numpy.testing import assert_allclose
18-
from .rotation_cpu_reference import find_center_360_numpy
1918

2019

2120
def test_find_center_vo(data, flats, darks):
@@ -99,7 +98,7 @@ def test_find_center_360_data(data):
9998

10099
assert_allclose(cor, 132.45317, rtol=eps)
101100
assert_allclose(overlap, 53.093666, rtol=eps)
102-
assert side == 1
101+
assert side == 'right'
103102
assert_allclose(overlap_pos, 111.906334, rtol=eps)
104103

105104

@@ -123,29 +122,6 @@ def test_find_center_360_NaN_infs_raises(data, flats, darks):
123122
find_center_360(data)
124123

125124

126-
@pytest.mark.parametrize("norm", [False, True], ids=["no_normalise", "normalise"])
127-
@pytest.mark.parametrize("overlap", [False, True], ids=["no_overlap", "overlap"])
128-
@pytest.mark.parametrize("denoise", [False, True], ids=["no_denoise", "denoise"])
129-
@pytest.mark.parametrize("side", ["right", "left"])
130-
@cp.testing.numpy_cupy_allclose(rtol=1e-5, atol=1e-6)
131-
def test_find_center_360_unity(ensure_clean_memory, xp, norm, overlap, denoise, side):
132-
# because it's random, we explicitly seed and use numpy only, to match the data
133-
np.random.seed(12345)
134-
data = np.random.random_sample(size=(128, 1, 512)).astype(np.float32) * 2.0 + 0.001
135-
data = xp.asarray(data)
136-
137-
if xp.__name__ == "numpy":
138-
(cor, overlap, side, overlap_pos) = find_center_360_numpy(
139-
data, use_overlap=overlap, norm=norm, denoise=denoise, side=side
140-
)
141-
else:
142-
(cor, overlap, side, overlap_pos) = find_center_360(
143-
data, use_overlap=overlap, norm=norm, denoise=denoise, side=side
144-
)
145-
146-
return xp.asarray([cor, overlap, side, overlap_pos])
147-
148-
149125
@pytest.mark.perf
150126
def test_find_center_360_performance(ensure_clean_memory):
151127
data = (

zenodo-tests/test_recon/test_algorithm.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -271,12 +271,12 @@ def test_reconstruct_FBP3d_tomobar_i13_dataset3(i13_dataset3):
271271
recon_data = FBP3d_tomobar(
272272
stiched_data_180degrees,
273273
np.deg2rad(angles[0:3000]),
274-
center=2341,
274+
center=2339,
275275
filter_freq_cutoff=0.35,
276276
)
277277

278278
assert recon_data.flags.c_contiguous
279279
recon_data = recon_data.get()
280-
280+
281281
assert recon_data.dtype == np.float32
282282
assert recon_data.shape == (4682, 3, 4682)

zenodo-tests/test_recon/test_rotation.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -184,7 +184,7 @@ def test_center_360_i13_dataset3(i13_dataset3, ensure_clean_memory):
184184
data_normalised,
185185
ind=1,
186186
win_width=50,
187-
side="left",
187+
side=None,
188188
denoise=True,
189189
norm=True,
190190
use_overlap=True,

0 commit comments

Comments
 (0)