fix: make algorithm source files private

RI-imaging · May 18, 2018 · 481b283 · 481b283
1 parent b173d5d
commit 481b283
Show file tree

Hide file tree

Showing 11 changed files with 33 additions and 32 deletions.
diff --git a/CHANGELOG b/CHANGELOG
@@ -1,3 +1,5 @@
+0.3.1
+ - Convenience fix: Make algorithm source files private
 0.3.0
  - BREAKING CHANGES:
    - Renamed several functions

diff --git a/radontea/__init__.py b/radontea/__init__.py
@@ -1,17 +1,16 @@
-from .alg_bpj import backproject, backproject_3d  # noqa F401
-from .alg_fmp import fourier_map, fourier_map_3d  # noqa F401
-from .alg_int import integrate  # noqa F401
-from .alg_art import art  # noqa F401
-from .alg_sart import sart  # noqa F401
+from ._alg_bpj import backproject, backproject_3d  # noqa F401
+from ._alg_fmp import fourier_map, fourier_map_3d  # noqa F401
+from ._alg_int import integrate  # noqa F401
+from ._alg_art import art  # noqa F401
+from ._alg_sart import sart  # noqa F401
 
-from . import fan  # noqa F401
-
-from .rdn_prl import radon_parallel  # noqa F401
-
-from .threed import volume_recon  # noqa F401
+from ._rdn_prl import radon_parallel  # noqa F401
+from ._threed import volume_recon  # noqa F401
 
 from ._version import version as __version__  # noqa F401
 
+from . import fan  # noqa F401
+
 
-__author__ = u"Paul Müller"
+__author__ = "Paul Müller"
 __license__ = "BSD (3-Clause)"
diff --git a/radontea/alg_art.py → radontea/_alg_art.py b/radontea/alg_art.py → radontea/_alg_art.py
diff --git a/radontea/alg_bpj.py → radontea/_alg_bpj.py b/radontea/alg_bpj.py → radontea/_alg_bpj.py
@@ -1,7 +1,7 @@
 import numpy as np
 import scipy.interpolate as intp
 
-from . import threed, util
+from . import _threed, util
 
 
 def backproject(sinogram, angles, filtering="ramp", weight_angles=True,
@@ -194,13 +194,13 @@ def backproject_3d(sinogram, angles, filtering="ramp", weight_angles=True,
     See :func:`backproject` for parameter definitions. The additional
     parameter `ncpus` sets the number of CPUs used.
     """
-    return threed.volume_recon(func2d=backproject,
-                               sinogram=sinogram,
-                               filtering=filtering,
-                               weight_angles=weight_angles,
-                               padding=padding,
-                               padval=padval,
-                               angles=angles,
-                               count=count,
-                               max_count=max_count,
-                               ncpus=ncpus)
+    return _threed.volume_recon(func2d=backproject,
+                                sinogram=sinogram,
+                                filtering=filtering,
+                                weight_angles=weight_angles,
+                                padding=padding,
+                                padval=padval,
+                                angles=angles,
+                                count=count,
+                                max_count=max_count,
+                                ncpus=ncpus)
diff --git a/radontea/alg_fmp.py → radontea/_alg_fmp.py b/radontea/alg_fmp.py → radontea/_alg_fmp.py
@@ -3,7 +3,7 @@
 import numpy as np
 import scipy.interpolate as intp
 
-from . import threed
+from . import _threed
 
 
 def fourier_map(sinogram, angles, intp_method="cubic",
@@ -186,10 +186,10 @@ def fourier_map_3d(sinogram, angles, intp_method="cubic",
     See :func:`fourier_map` for parameter definitions. The additional
     parameter `ncpus` sets the number of CPUs used.
     """
-    return threed.volume_recon(func2d=fourier_map,
-                               sinogram=sinogram,
-                               angles=angles,
-                               intp_method=intp_method,
-                               count=count,
-                               max_count=max_count,
-                               ncpus=ncpus)
+    return _threed.volume_recon(func2d=fourier_map,
+                                sinogram=sinogram,
+                                angles=angles,
+                                intp_method=intp_method,
+                                count=count,
+                                max_count=max_count,
+                                ncpus=ncpus)
diff --git a/radontea/alg_int.py → radontea/_alg_int.py b/radontea/alg_int.py → radontea/_alg_int.py
diff --git a/radontea/alg_sart.py → radontea/_alg_sart.py b/radontea/alg_sart.py → radontea/_alg_sart.py
diff --git a/radontea/rdn_fan.py → radontea/_rdn_fan.py b/radontea/rdn_fan.py → radontea/_rdn_fan.py
diff --git a/radontea/rdn_prl.py → radontea/_rdn_prl.py b/radontea/rdn_prl.py → radontea/_rdn_prl.py
diff --git a/radontea/threed.py → radontea/_threed.py b/radontea/threed.py → radontea/_threed.py
diff --git a/radontea/fan.py b/radontea/fan.py
@@ -1,8 +1,8 @@
 import numpy as np
 import scipy.interpolate
 
-from .rdn_fan import get_fan_coords
-from .rdn_fan import get_det_coords, radon_fan  # noqa F401
+from ._rdn_fan import get_fan_coords
+from ._rdn_fan import get_det_coords, radon_fan  # noqa F401
 
 
 def fan_rec(linogram, lds, method, stepsize=1, det_spacing=1,