From b595d260193b39981834211682ff41fd1a91e398 Mon Sep 17 00:00:00 2001
From: Willem Jan Palenstijn <Willem.Jan.Palenstijn@cwi.nl>
Date: Thu, 4 Apr 2019 15:59:02 +0200
Subject: Enable all 2D projector tests
---
tests/python/test_line2d.py | 6 +++---
tests/python/test_rec_scaling.py | 7 +++++--
2 files changed, 8 insertions(+), 5 deletions(-)
diff --git a/tests/python/test_line2d.py b/tests/python/test_line2d.py
index 8b6e200..e5d8f2b 100644
--- a/tests/python/test_line2d.py
+++ b/tests/python/test_line2d.py
@@ -7,9 +7,9 @@ import pylab
# Display sinograms with mismatch on test failure
DISPLAY=False
-NONUNITDET=False
-OBLIQUE=False
-FLEXVOL=False
+NONUNITDET=True
+OBLIQUE=True
+FLEXVOL=True
NONSQUARE=False # non-square pixels not supported yet by most projectors
# Round interpolation weight to 8 bits to emulate CUDA texture unit precision
diff --git a/tests/python/test_rec_scaling.py b/tests/python/test_rec_scaling.py
index d656edc..1bd3267 100644
--- a/tests/python/test_rec_scaling.py
+++ b/tests/python/test_rec_scaling.py
@@ -43,6 +43,8 @@ def ProjectionGeometries(type):
class TestRecScale(unittest.TestCase):
def single_test(self, geom_type, proj_type, alg, iters):
+ if alg == 'FBP' and 'fanflat' in geom_type:
+ self.skipTest('CPU FBP is parallel-beam only')
is3D = (geom_type in ['parallel3d', 'cone'])
for vg in VolumeGeometries(is3D, 'FDK' not in alg):
for pg in ProjectionGeometries(geom_type):
@@ -88,7 +90,7 @@ class TestRecScale(unittest.TestCase):
else:
pylab.imshow(rec[:,32,:])
pylab.show()
- #self.assertTrue(abs(val-1.0) < TOL)
+ self.assertTrue(abs(val-1.0) < TOL)
__combinations = {
@@ -99,7 +101,8 @@ __combinations = {
}
__algs = {
- 'SIRT': 50, 'SART': 10*180, 'CGLS': 30, 'FBP': 1
+ 'SIRT': 50, 'SART': 10*180, 'CGLS': 30,
+ 'FBP': 1
}
__algs_CUDA = {
--
cgit v1.2.3