httomolibgpu 2.3__tar.gz → 2.3.2__tar.gz

{httomolibgpu-2.3/httomolibgpu.egg-info → httomolibgpu-2.3.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: httomolibgpu
-Version: 2.3
+Version: 2.3.2
 Summary: Commonly used tomography data processing methods at DLS.
 Author-email: Daniil Kazantsev <daniil.kazantsev@diamond.ac.uk>, Yousef Moazzam <yousef.moazzam@diamond.ac.uk>, Naman Gera <naman.gera@diamond.ac.uk>
 License: BSD-3-Clause
@@ -19,7 +19,6 @@ Requires-Dist: scipy
 Requires-Dist: pillow
 Requires-Dist: scikit-image
 Requires-Dist: tomobar
-Requires-Dist: ccpi-regularisation-cupy
 Provides-Extra: dev
 Requires-Dist: pytest; extra == "dev"
 Requires-Dist: pytest-cov; extra == "dev"

{httomolibgpu-2.3 → httomolibgpu-2.3.2}/httomolibgpu/misc/denoise.py

@@ -32,7 +32,12 @@ cupy_run = cupywrapper.cupy_run
 from numpy import float32
 from unittest.mock import Mock
 
-from ccpi.filters.regularisersCuPy import ROF_TV, PD_TV
+if cupy_run:
+    from ccpi.filters.regularisersCuPy import ROF_TV, PD_TV
+else:
+    ROF_TV = Mock()
+    PD_TV = Mock()
+
 
 __all__ = [
     "total_variation_ROF",

{httomolibgpu-2.3 → httomolibgpu-2.3.2}/httomolibgpu/recon/rotation.py

@@ -60,10 +60,10 @@ def find_center_vo(
     ind: Optional[int] = None,
     average_radius: int = 0,
     cor_initialisation_value: Optional[float] = None,
-    smin: int = -100,
-    smax: int = 100,
+    smin: int = -50,
+    smax: int = 50,
     srad: float = 6.0,
-    step: float = 0.25,
+    step: float = 0.5,
     ratio: float = 0.5,
     drop: int = 20,
 ) -> np.float32:
@@ -117,7 +117,7 @@ def find_center_vo(
             average_radius = ind
         if ind > 0:
             _sino = cp.mean(
-                data[:, ind - average_radius : ind + average_radius, :], axis=1
+                data[:, ind - average_radius : ind + average_radius + 1, :], axis=1
             )
         else:
             _sino = data[:, ind, :]

{httomolibgpu-2.3 → httomolibgpu-2.3.2/httomolibgpu.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: httomolibgpu
-Version: 2.3
+Version: 2.3.2
 Summary: Commonly used tomography data processing methods at DLS.
 Author-email: Daniil Kazantsev <daniil.kazantsev@diamond.ac.uk>, Yousef Moazzam <yousef.moazzam@diamond.ac.uk>, Naman Gera <naman.gera@diamond.ac.uk>
 License: BSD-3-Clause
@@ -19,7 +19,6 @@ Requires-Dist: scipy
 Requires-Dist: pillow
 Requires-Dist: scikit-image
 Requires-Dist: tomobar
-Requires-Dist: ccpi-regularisation-cupy
 Provides-Extra: dev
 Requires-Dist: pytest; extra == "dev"
 Requires-Dist: pytest-cov; extra == "dev"

{httomolibgpu-2.3 → httomolibgpu-2.3.2}/httomolibgpu.egg-info/requires.txt

@@ -5,7 +5,6 @@ scipy
 pillow
 scikit-image
 tomobar
-ccpi-regularisation-cupy
 
 [dev]
 pytest

{httomolibgpu-2.3 → httomolibgpu-2.3.2}/pyproject.toml

@@ -44,7 +44,6 @@ dependencies = [
     "pillow",
     "scikit-image",
     "tomobar",
-    "ccpi-regularisation-cupy"
 ]
 
 [project.optional-dependencies]