BUG: fix error in parallel_beam_geometry overestimating number of points

odlgroup · Jan 2, 2017 · 444e6e5 · 444e6e5
1 parent 93497c7
commit 444e6e5
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/odl/test/tomo/geometry/geometry_test.py b/odl/test/tomo/geometry/geometry_test.py
@@ -123,14 +123,14 @@ def test_parallel_3d_single_axis_geometry():
     assert repr(geom)
 
 
-def test_parallel_beam_helper():
+def test_parallel_beam_geometry_helper():
     """Test that parallel_beam_geometry satisfies the sampling conditions."""
     # --- 2d case ---
     space = odl.uniform_discr([-1, -1], [1, 1], [20, 20])
     geometry = odl.tomo.parallel_beam_geometry(space)
 
     rho = np.sqrt(2)
-    omega = 2 * np.pi * 10.0
+    omega = np.pi * 10.0
 
     # Validate angles
     assert geometry.motion_partition.is_uniform
@@ -168,7 +168,7 @@ def test_parallel_beam_helper():
     geometry = odl.tomo.parallel_beam_geometry(space)
 
     rho = np.sqrt(2) * 2
-    omega = 2 * np.pi * 10.0
+    omega = np.pi * 10.0
 
     # Validate angles
     assert geometry.motion_partition.is_uniform

diff --git a/odl/tomo/geometry/parallel.py b/odl/tomo/geometry/parallel.py
@@ -462,9 +462,9 @@ def parallel_beam_geometry(space, angles=None, det_shape=None):
     >>> space = odl.uniform_discr([-1, -1], [1, 1], [20, 20])
     >>> geometry = parallel_beam_geometry(space)
     >>> geometry.angles.size
-    89
+    45
     >>> geometry.detector.size
-    57
+    29
 
     Notes
     -----
@@ -509,7 +509,7 @@ def parallel_beam_geometry(space, angles=None, det_shape=None):
 
     # Find default values according to Nyquist criterion
     min_side = min(space.partition.cell_sides[:2])
-    omega = 2 * np.pi / min_side
+    omega = np.pi / min_side
 
     if det_shape is None:
         if space.ndim == 2: