httomolibgpu 2.3.1__tar.gz → 2.4.0__tar.gz

{httomolibgpu-2.3.1/httomolibgpu.egg-info → httomolibgpu-2.4.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: httomolibgpu
-Version: 2.3.1
+Version: 2.4.0
 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.1 → httomolibgpu-2.4.0}/httomolibgpu/recon/algorithm.py

@@ -54,9 +54,10 @@ def FBP(
     data: cp.ndarray,
     angles: np.ndarray,
     center: Optional[float] = None,
-    filter_freq_cutoff: Optional[float] = 0.35,
+    filter_freq_cutoff: float = 0.35,
     recon_size: Optional[int] = None,
-    recon_mask_radius: Optional[float] = 0.95,
+    recon_mask_radius: float = 0.95,
+    neglog: bool = False,
     gpu_id: int = 0,
 ) -> cp.ndarray:
     """
@@ -81,6 +82,9 @@ def FBP(
         The radius of the circular mask that applies to the reconstructed slice in order to crop
         out some undesirable artifacts. The values outside the given diameter will be set to zero.
         It is recommended to keep the value in the range [0.7-1.0].
+    neglog: bool
+        Take negative logarithm on input data to convert to attenuation coefficient or a density of the scanned object. Defaults to False, 
+        assuming that the negative log is taken either in normalisation procedure on with Paganin filter application. 
     gpu_id : int
         A GPU device index to perform operation on.
 
@@ -94,7 +98,7 @@ def FBP(
     )
 
     reconstruction = RecToolsCP.FBP(
-        data,
+        _take_neg_log(data) if neglog else data,
         cutoff_freq=filter_freq_cutoff,
         recon_mask_radius=recon_mask_radius,
         data_axes_labels_order=input_data_axis_labels,
@@ -110,6 +114,7 @@ def LPRec(
     center: Optional[float] = None,
     recon_size: Optional[int] = None,
     recon_mask_radius: Optional[float] = 0.95,
+    neglog: bool = False,
 ) -> cp.ndarray:
     """
     Fourier direct inversion in 3D on unequally spaced (also called as Log-Polar) grids using
@@ -131,6 +136,9 @@ def LPRec(
         The radius of the circular mask that applies to the reconstructed slice in order to crop
         out some undesirable artifacts. The values outside the given diameter will be set to zero.
         It is recommended to keep the value in the range [0.7-1.0].
+    neglog: bool
+        Take negative logarithm on input data to convert to attenuation coefficient or a density of the scanned object. Defaults to False, 
+        assuming that the negative log is taken either in normalisation procedure on with Paganin filter application.         
 
     Returns
     -------
@@ -140,7 +148,7 @@ def LPRec(
     RecToolsCP = _instantiate_direct_recon_class(data, angles, center, recon_size, 0)
 
     reconstruction = RecToolsCP.FOURIER_INV(
-        data,
+        _take_neg_log(data) if neglog else data,
         recon_mask_radius=recon_mask_radius,
         data_axes_labels_order=input_data_axis_labels,
     )
@@ -156,12 +164,14 @@ def SIRT(
     recon_size: Optional[int] = None,
     iterations: Optional[int] = 300,
     nonnegativity: Optional[bool] = True,
+    neglog: bool = False,
     gpu_id: int = 0,
 ) -> cp.ndarray:
     """
     Perform Simultaneous Iterative Recostruction Technique (SIRT) using ASTRA toolbox :cite:`van2016fast` and
     ToMoBAR :cite:`kazantsev2020tomographic` wrappers.
-    This is 3D recon directly from a CuPy array while using ASTRA GPUlink capability.
+    This is 3D recon directly from a CuPy array while using ASTRA GPUlink capability to avoid host-device
+    transactions for projection and backprojection.
 
     Parameters
     ----------
@@ -178,6 +188,9 @@ def SIRT(
         The number of SIRT iterations.
     nonnegativity : bool, optional
         Impose nonnegativity constraint on reconstructed image.
+    neglog: bool
+        Take negative logarithm on input data to convert to attenuation coefficient or a density of the scanned object. Defaults to False, 
+        assuming that the negative log is taken either in normalisation procedure on with Paganin filter application.              
     gpu_id : int, optional
         A GPU device index to perform operation on.
 
@@ -187,11 +200,16 @@ def SIRT(
         The SIRT reconstructed volume as a CuPy array.
     """
     RecToolsCP = _instantiate_iterative_recon_class(
-        data, angles, center, recon_size, gpu_id, datafidelity="LS"
+        data,
+        angles,
+        center,
+        recon_size,
+        gpu_id,
+        datafidelity="LS",
     )
 
     _data_ = {
-        "projection_norm_data": data,
+        "projection_norm_data": _take_neg_log(data) if neglog else data,
         "data_axes_labels_order": input_data_axis_labels,
     }  # data dictionary
     _algorithm_ = {
@@ -211,12 +229,14 @@ def CGLS(
     recon_size: Optional[int] = None,
     iterations: Optional[int] = 20,
     nonnegativity: Optional[bool] = True,
+    neglog: bool = False,
     gpu_id: int = 0,
 ) -> cp.ndarray:
     """
-    Perform Congugate Gradient Least Squares (CGLS) using ASTRA toolbox :cite:`van2016fast` and
+    Perform Conjugate Gradient Least Squares (CGLS) using ASTRA toolbox :cite:`van2016fast` and
     ToMoBAR :cite:`kazantsev2020tomographic` wrappers.
-    This is 3D recon directly from a CuPy array while using ASTRA GPUlink capability.
+    This is 3D recon directly from a CuPy array while using ASTRA GPUlink capability to avoid host-device
+    transactions for projection and backprojection.
 
     Parameters
     ----------
@@ -233,6 +253,9 @@ def CGLS(
         The number of CGLS iterations.
     nonnegativity : bool, optional
         Impose nonnegativity constraint on reconstructed image.
+    neglog: bool
+        Take negative logarithm on input data to convert to attenuation coefficient or a density of the scanned object. Defaults to False, 
+        assuming that the negative log is taken either in normalisation procedure on with Paganin filter application.              
     gpu_id : int, optional
         A GPU device index to perform operation on.
 
@@ -246,7 +269,7 @@ def CGLS(
     )
 
     _data_ = {
-        "projection_norm_data": data,
+        "projection_norm_data": _take_neg_log(data) if neglog else data,
         "data_axes_labels_order": input_data_axis_labels,
     }  # data dictionary
     _algorithm_ = {"iterations": iterations, "nonnegativity": nonnegativity}
@@ -254,7 +277,6 @@ def CGLS(
     cp._default_memory_pool.free_all_blocks()
     return cp.require(cp.swapaxes(reconstruction, 0, 1), requirements="C")
 
-
 ## %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%  ##
 def _instantiate_direct_recon_class(
     data: cp.ndarray,
@@ -329,3 +351,11 @@ def _instantiate_iterative_recon_class(
         device_projector=gpu_id,
     )
     return RecToolsCP
+
+def _take_neg_log(data: cp.ndarray) -> cp.ndarray:
+    """Taking negative log"""
+    data[data<=0] = 1
+    data = -cp.log(data)
+    data[cp.isnan(data)] = 6.0
+    data[cp.isinf(data)] = 0
+    return data

{httomolibgpu-2.3.1 → httomolibgpu-2.4.0}/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.1 → httomolibgpu-2.4.0/httomolibgpu.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: httomolibgpu
-Version: 2.3.1
+Version: 2.4.0
 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.1 → httomolibgpu-2.4.0}/httomolibgpu.egg-info/requires.txt

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

{httomolibgpu-2.3.1 → httomolibgpu-2.4.0}/pyproject.toml

@@ -44,7 +44,6 @@ dependencies = [
     "pillow",
     "scikit-image",
     "tomobar",
-    "ccpi-regularisation-cupy"
 ]
 
 [project.optional-dependencies]
@@ -73,8 +72,6 @@ addopts = [
    "-vv",
    "-ra",
    "-q",
-   "--benchmark-sort=mean",
-   "--benchmark-columns=mean",
    "--tb=native",
    "--cov-report=term",
    "--cov-report=xml:cov.xml",