added src_shift_func as an argument to geometry, created function flying_focal_spot

(cherry picked from commit a0f161c5d041fb1201fa976116cfccf2f2cb6600)

Author: JevgenijaRudzusika

odl/test/tomo/geometry/geometry_test.py

@@ -15,6 +15,7 @@
 
 import odl
 from odl.util.testutils import all_almost_equal, all_equal, simple_fixture
+from odl.tomo.util.source_detector_shifts import flying_focal_spot
 
 
 # --- pytest fixtures --- #
@@ -561,10 +562,13 @@ def test_fanbeam_flying_focal_spot():
     shift1 = np.array([2, -3])
     shift2 = np.array([-2, 3])
     init = np.array([1, 0], dtype=np.float32)
-    geom_ffs = odl.tomo.FanBeamGeometry(apart, dpart, src_rad, det_rad,
-                                        src_to_det_init=init,
-                                        flying_focal_spot=[shift1,
-                                                           shift2])
+    geom_ffs = odl.tomo.FanBeamGeometry(
+        apart, dpart,
+        src_rad, det_rad,
+        src_to_det_init=init,
+        src_shift_func=lambda angle: flying_focal_spot(
+            angle, apart=apart,
+            shifts=[shift1, shift2]))
     # angles must be shifted to match discretization of apart
     ang1 = -full_angle / 20
     apart1 = odl.uniform_partition(ang1, full_angle + ang1, 5)
@@ -583,7 +587,7 @@ def test_fanbeam_flying_focal_spot():
 
     sp1 = geom1.src_position(geom1.angles)
     sp2 = geom2.src_position(geom2.angles)
-    sp = geom_ffs.src_position(geom_ffs.angles, geom_ffs.flying_focal_spot)
+    sp = geom_ffs.src_position(geom_ffs.angles)
     assert all_almost_equal(sp[0::2], sp1)
     assert all_almost_equal(sp[1::2], sp2)
 
@@ -737,10 +741,13 @@ def test_conebeam_flying_focal_spot():
     shift1 = np.array([2, -3, 1])
     shift2 = np.array([-2, 3, -1])
     init = np.array([1, 0, 0], dtype=np.float32)
-    geom_ffs = odl.tomo.ConeBeamGeometry(apart, dpart, src_rad, det_rad,
-                                         src_to_det_init=init,
-                                         flying_focal_spot=[shift1,
-                                                            shift2])
+    geom_ffs = odl.tomo.ConeBeamGeometry(
+        apart, dpart,
+        src_rad, det_rad,
+        src_to_det_init=init,
+        src_shift_func=lambda angle: flying_focal_spot(
+            angle, apart=apart,
+            shifts=[shift1, shift2]))
     # angles must be shifted to match discretization of apart
     ang1 = -full_angle / 20
     apart1 = odl.uniform_partition(ang1, full_angle + ang1, 5)
@@ -761,7 +768,7 @@ def test_conebeam_flying_focal_spot():
 
     sp1 = geom1.src_position(geom1.angles)
     sp2 = geom2.src_position(geom2.angles)
-    sp = geom_ffs.src_position(geom_ffs.angles, geom_ffs.flying_focal_spot)
+    sp = geom_ffs.src_position(geom_ffs.angles)
     assert all_almost_equal(sp[0::2], sp1)
     assert all_almost_equal(sp[1::2], sp2)
 

odl/tomo/backends/astra_setup.py

@@ -307,10 +307,9 @@ def astra_conebeam_3d_geom_to_vec(geometry):
     """
     angles = geometry.angles
     vectors = np.zeros((angles.size, 12))
-    ffs = geometry.flying_focal_spot
 
     # Source position
-    vectors[:, 0:3] = geometry.src_position(angles, ffs)
+    vectors[:, 0:3] = geometry.src_position(angles)
 
     # Center of detector in 3D space
     mid_pt = geometry.det_params.mid_pt
@@ -379,10 +378,9 @@ def astra_conebeam_2d_geom_to_vec(geometry):
     rot_minus_90 = euler_matrix(-np.pi / 2)
     angles = geometry.angles
     vectors = np.zeros((angles.size, 6))
-    ffs = geometry.flying_focal_spot
 
     # Source position
-    src_pos = geometry.src_position(angles, ffs)
+    src_pos = geometry.src_position(angles)
     vectors[:, 0:2] = rot_minus_90.dot(src_pos.T).T  # dot along 2nd axis
 
     # Center of detector
@@ -750,7 +748,6 @@ def astra_algorithm(direction, ndim, vol_id, sino_id, proj_id, impl):
     algo_map = {'forward': {2: {'cpu': 'FP', 'cuda': 'FP_CUDA'},
                             3: {'cpu': None, 'cuda': 'FP3D_CUDA'}},
                 'backward': {2: {'cpu': 'BP', 'cuda': 'BP_CUDA'},
-                             3: {'cpu': None, 'cuda': 'BP3D_CUDA'},
                              3: {'cpu': None, 'cuda': 'BP3D_CUDA'}}}
 
     algo_cfg = {'type': algo_map[direction][ndim][impl],