API: move 'interp' out of spaces

examples/deform/linearized_fixed_template.py

@@ -16,16 +16,15 @@
 """
 
 import numpy as np
-import odl
 
+import odl
 
 # --- Create template and displacement field --- #
 
 
 # Template space: discretized functions on the rectangle [-1, 1]^2 with
-# 100 samples per dimension. Usage of 'linear' interpolation ensures that
-# the template gradient is well-defined.
-templ_space = odl.uniform_discr([-1, -1], [1, 1], (100, 100), interp='linear')
+# 100 samples per dimension.
+templ_space = odl.uniform_discr([-1, -1], [1, 1], (100, 100))
 
 # The template is a rectangle of size 1.0 x 0.5
 template = odl.phantom.cuboid(templ_space, [-0.5, -0.25], [0.5, 0.25])

odl/contrib/datasets/ct/mayo.py

@@ -1,4 +1,4 @@
-# Copyright 2014-2018 The ODL contributors
+# Copyright 2014-2020 The ODL contributors
 #
 # This file is part of ODL.
 #
@@ -24,6 +24,7 @@
 import tqdm
 
 from dicom.datadict import DicomDictionary, NameDict, CleanName
+from odl.discr.discr_utils import linear_interpolator
 from odl.contrib.datasets.ct.mayo_dicom_dict import new_dict_items
 
 # Update the DICOM dictionary with the extra Mayo tags
@@ -187,9 +188,8 @@ def load_projections(folder, indices=None):
 
     # Calculate projection data in rectangular coordinates since we have no
     # backend that supports cylindrical
-    proj_data_cylinder = ray_trafo.range.element(data_array)
-    interpolated_values = proj_data_cylinder.interpolation((theta, u, v))
-    proj_data = ray_trafo.range.element(interpolated_values)
+    interpolator = linear_interpolator(data_array, (theta, u, v))
+    proj_data = ray_trafo.range.element(interpolator)
 
     return geometry, proj_data.asarray()