httomo-backends 0.7.1__tar.gz → 0.8.0__tar.gz

{httomo_backends-0.7.1 → httomo_backends-0.8.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: httomo-backends
-Version: 0.7.1
+Version: 0.8.0
 Summary: Supplementary files for HTTomo backends.
 Author: Garry ODonnell, Jacob Williamson
 Author-email: Daniil Kazantsev <daniil.kazantsev@diamond.ac.uk>, Yousef Moazzam <yousef.moazzam@diamond.ac.uk>, Jessica Verschoyle <jessica.verschoyle@diamond.ac.uk>, Naman Gera <naman.gera@diamond.ac.uk>, scientificsoftware@diamond.ac.uk
@@ -22,7 +22,6 @@ Requires-Dist: h5py
 Requires-Dist: astra-toolbox
 Requires-Dist: tomobar
 Requires-Dist: scikit-image
-Requires-Dist: ccpi-regularisation-cupy
 Provides-Extra: dev
 Requires-Dist: pytest; extra == "dev"
 Requires-Dist: pytest-mock; extra == "dev"

{httomo_backends-0.7.1 → httomo_backends-0.8.0}/httomo_backends/methods_database/packages/backends/httomolibgpu/httomolibgpu.yaml

@@ -78,7 +78,7 @@ prep:
         multiplier: None
         method: module
   phase:
-    paganin_filter_tomopy:
+    paganin_filter:
       pattern: projection
       output_dims_change: False
       implementation: gpu_cupy

{httomo_backends-0.7.1 → httomo_backends-0.8.0}/httomo_backends/methods_database/packages/backends/httomolibgpu/supporting_funcs/prep/phase.py

@@ -20,23 +20,21 @@
 # ---------------------------------------------------------------------------
 """Modules for memory estimation for phase retrieval and phase-contrast enhancement"""
 
-import math
 from typing import Tuple
 import numpy as np
 
 from httomo_backends.cufft import CufftType, cufft_estimate_2d
 
 __all__ = [
-    "_calc_memory_bytes_paganin_filter_tomopy",
+    "_calc_memory_bytes_paganin_filter",
 ]
 
 
-def _calc_memory_bytes_paganin_filter_tomopy(
+def _calc_memory_bytes_paganin_filter(
     non_slice_dims_shape: Tuple[int, int],
     dtype: np.dtype,
     **kwargs,
 ) -> Tuple[int, int]:
-    from httomolibgpu.prep.phase import _shift_bit_length
 
     # Input (unpadded)
     unpadded_in_slice_size = np.prod(non_slice_dims_shape) * dtype.itemsize
@@ -44,7 +42,7 @@ def _calc_memory_bytes_paganin_filter_tomopy(
     # estimate padding size here based on non_slice dimensions
     pad_tup = []
     for dim_len in non_slice_dims_shape:
-        diff = _shift_bit_length(dim_len + 1) - dim_len
+        diff = __shift_bit_length(dim_len + 1) - dim_len
         if dim_len % 2 == 0:
             pad_width = diff // 2
             pad_width = (pad_width, pad_width)
@@ -107,3 +105,7 @@ def _calc_memory_bytes_paganin_filter_tomopy(
     subtract_bytes = int(filter_size + grid_size)
 
     return (tot_memory_bytes, subtract_bytes)
+
+
+def __shift_bit_length(x: int) -> int:
+    return 1 << (x - 1).bit_length()

{httomo_backends-0.7.1 → httomo_backends-0.8.0}/httomo_backends/methods_database/packages/backends/httomolibgpu/supporting_funcs/recon/algorithm.py

@@ -189,7 +189,7 @@ def _calc_memory_bytes_LPRec3d_tomobar(
     if detector_pad is True:
         detector_pad = __estimate_detectorHoriz_padding(non_slice_dims_shape[1])
     elif detector_pad is False:
-        detector_pad = 0        
+        detector_pad = 0
 
     min_mem_usage_filter = False
     if "min_mem_usage_filter" in kwargs:
@@ -197,6 +197,9 @@ def _calc_memory_bytes_LPRec3d_tomobar(
     min_mem_usage_ifft2 = False
     if "min_mem_usage_ifft2" in kwargs:
         min_mem_usage_ifft2 = kwargs["min_mem_usage_ifft2"]
+    power_of_2_cropping = False
+    if "power_of_2_cropping" in kwargs:
+        power_of_2_cropping = kwargs["power_of_2_cropping"]
 
     angles_tot = non_slice_dims_shape[0]
     DetectorsLengthH_prepad = non_slice_dims_shape[1]
@@ -205,6 +208,10 @@ def _calc_memory_bytes_LPRec3d_tomobar(
     _CENTER_SIZE_MIN = 192  # must be divisible by 8
 
     n = DetectorsLengthH
+    if power_of_2_cropping:
+        n_pow2 = 2 ** math.ceil(math.log2(n))
+        if 0.9 < n / n_pow2:
+            n = n_pow2
 
     odd_horiz = False
     if (n % 2) != 0:
@@ -302,10 +309,7 @@ def _calc_memory_bytes_LPRec3d_tomobar(
         DetectorsLengthH_prepad * DetectorsLengthH_prepad * np.float32().itemsize
     )
     ifft2_plan_slice_size = (
-        cufft_estimate_2d(
-            nx=2 * n, ny=2 * n, fft_type=CufftType.CUFFT_C2C
-        )
-        / 2
+        cufft_estimate_2d(nx=2 * n, ny=2 * n, fft_type=CufftType.CUFFT_C2C) / 2
     )
     circular_mask_size = np.prod(output_dims) / 2 * np.int64().itemsize * 4
     after_recon_swapaxis_slice = recon_output_size
@@ -344,38 +348,74 @@ def _calc_memory_bytes_LPRec3d_tomobar(
     add_to_memory_counters(tmp_p_input_slice, True)
     if min_mem_usage_filter:
         add_to_memory_counters(rfft_plan_slice_size / 4 / projection_chunk_count, False)
-        add_to_memory_counters(irfft_plan_slice_size / 4 / projection_chunk_count, False)
+        add_to_memory_counters(
+            irfft_plan_slice_size / 4 / projection_chunk_count, False
+        )
         add_to_memory_counters(padded_tmp_p_input_slice / projection_chunk_count, False)
 
         add_to_memory_counters(rfft_result_size / projection_chunk_count, False)
-        add_to_memory_counters(filtered_rfft_result_size / projection_chunk_count, False)
+        add_to_memory_counters(
+            filtered_rfft_result_size / projection_chunk_count, False
+        )
         add_to_memory_counters(-rfft_result_size / projection_chunk_count, False)
-        add_to_memory_counters(-padded_tmp_p_input_slice / projection_chunk_count, False)
+        add_to_memory_counters(
+            -padded_tmp_p_input_slice / projection_chunk_count, False
+        )
 
-        add_to_memory_counters(irfft_scratch_memory_size / projection_chunk_count, False)
-        add_to_memory_counters(-irfft_scratch_memory_size / projection_chunk_count, False)
+        add_to_memory_counters(
+            irfft_scratch_memory_size / projection_chunk_count, False
+        )
+        add_to_memory_counters(
+            -irfft_scratch_memory_size / projection_chunk_count, False
+        )
         add_to_memory_counters(irfft_result_size / projection_chunk_count, False)
-        add_to_memory_counters(-filtered_rfft_result_size / projection_chunk_count, False)
+        add_to_memory_counters(
+            -filtered_rfft_result_size / projection_chunk_count, False
+        )
 
         add_to_memory_counters(-irfft_result_size / projection_chunk_count, False)
     else:
-        add_to_memory_counters(rfft_plan_slice_size / chunk_count / projection_chunk_count * 2, True)
-        add_to_memory_counters(irfft_plan_slice_size / chunk_count / projection_chunk_count * 2, True)
+        add_to_memory_counters(
+            rfft_plan_slice_size / chunk_count / projection_chunk_count * 2, True
+        )
+        add_to_memory_counters(
+            irfft_plan_slice_size / chunk_count / projection_chunk_count * 2, True
+        )
         # add_to_memory_counters(irfft_scratch_memory_size / chunk_count / projection_chunk_count, True)
         for _ in range(0, chunk_count):
-            add_to_memory_counters(padded_tmp_p_input_slice / chunk_count / projection_chunk_count, True)
-
-            add_to_memory_counters(rfft_result_size / chunk_count / projection_chunk_count, True)
-            add_to_memory_counters(filtered_rfft_result_size / chunk_count / projection_chunk_count, True)
-            add_to_memory_counters(-rfft_result_size / chunk_count / projection_chunk_count, True)
-            add_to_memory_counters(-padded_tmp_p_input_slice / chunk_count / projection_chunk_count, True)
-
-            add_to_memory_counters(irfft_scratch_memory_size / chunk_count / projection_chunk_count, True)
-            add_to_memory_counters(-irfft_scratch_memory_size / chunk_count / projection_chunk_count, True)
-            add_to_memory_counters(irfft_result_size / chunk_count / projection_chunk_count, True)
-            add_to_memory_counters(-filtered_rfft_result_size / chunk_count / projection_chunk_count, True)
-
-            add_to_memory_counters(-irfft_result_size / chunk_count / projection_chunk_count, True)
+            add_to_memory_counters(
+                padded_tmp_p_input_slice / chunk_count / projection_chunk_count, True
+            )
+
+            add_to_memory_counters(
+                rfft_result_size / chunk_count / projection_chunk_count, True
+            )
+            add_to_memory_counters(
+                filtered_rfft_result_size / chunk_count / projection_chunk_count, True
+            )
+            add_to_memory_counters(
+                -rfft_result_size / chunk_count / projection_chunk_count, True
+            )
+            add_to_memory_counters(
+                -padded_tmp_p_input_slice / chunk_count / projection_chunk_count, True
+            )
+
+            add_to_memory_counters(
+                irfft_scratch_memory_size / chunk_count / projection_chunk_count, True
+            )
+            add_to_memory_counters(
+                -irfft_scratch_memory_size / chunk_count / projection_chunk_count, True
+            )
+            add_to_memory_counters(
+                irfft_result_size / chunk_count / projection_chunk_count, True
+            )
+            add_to_memory_counters(
+                -filtered_rfft_result_size / chunk_count / projection_chunk_count, True
+            )
+
+            add_to_memory_counters(
+                -irfft_result_size / chunk_count / projection_chunk_count, True
+            )
 
     add_to_memory_counters(-padded_in_slice_size, True)
     add_to_memory_counters(-filter_size, False)
@@ -426,7 +466,7 @@ def _calc_memory_bytes_SIRT3d_tomobar(
     if detector_pad is True:
         detector_pad = __estimate_detectorHoriz_padding(non_slice_dims_shape[1])
     elif detector_pad is False:
-        detector_pad = 0        
+        detector_pad = 0
 
     anglesnum = non_slice_dims_shape[0]
     DetectorsLengthH_padded = non_slice_dims_shape[1] + 2 * detector_pad
@@ -449,7 +489,7 @@ def _calc_memory_bytes_SIRT3d_tomobar(
     Res_times_R = Res
     C_times_res = out_data_size
 
-    astra_projection = (in_data_size + out_data_size)
+    astra_projection = in_data_size + out_data_size
 
     tot_memory_bytes = int(
         recon_data_size_original
@@ -476,7 +516,7 @@ def _calc_memory_bytes_CGLS3d_tomobar(
     if detector_pad is True:
         detector_pad = __estimate_detectorHoriz_padding(non_slice_dims_shape[1])
     elif detector_pad is False:
-        detector_pad = 0        
+        detector_pad = 0
 
     anglesnum = non_slice_dims_shape[0]
     DetectorsLengthH_padded = non_slice_dims_shape[1] + 2 * detector_pad
@@ -528,7 +568,7 @@ def _calc_memory_bytes_FISTA3d_tomobar(
     if detector_pad is True:
         detector_pad = __estimate_detectorHoriz_padding(non_slice_dims_shape[1])
     elif detector_pad is False:
-        detector_pad = 0        
+        detector_pad = 0
 
     anglesnum = non_slice_dims_shape[0]
     DetectorsLengthH_padded = non_slice_dims_shape[1] + 2 * detector_pad
@@ -567,5 +607,5 @@ def _calc_memory_bytes_FISTA3d_tomobar(
 def __estimate_detectorHoriz_padding(detX_size) -> int:
     det_half = detX_size // 2
     padded_value_exact = int(np.sqrt(2 * (det_half**2))) - det_half
-    padded_add_margin = int(0.1 * padded_value_exact)
+    padded_add_margin = padded_value_exact // 2
     return padded_value_exact + padded_add_margin

{httomo_backends-0.7.1 → httomo_backends-0.8.0}/httomo_backends/pipelines_full/deg360_paganin_FBP3d_tomobar_directive.yaml

@@ -8,7 +8,7 @@
   module_path: httomolibgpu.misc.morph
 - method: remove_stripe_based_sorting
   module_path: httomolibgpu.prep.stripe
-- method: paganin_filter_tomopy
+- method: paganin_filter
   module_path: httomolibgpu.prep.phase
 - method: FBP3d_tomobar
   module_path: httomolibgpu.recon.algorithm

{httomo_backends-0.7.1 → httomo_backends-0.8.0}/httomo_backends/pipelines_full/sweep_paganin_FBP3d_tomobar_directive.yaml

@@ -4,9 +4,9 @@
   module_path: httomolibgpu.recon.rotation  
 - method: normalize
   module_path: httomolibgpu.prep.normalize
-- method: paganin_filter_tomopy
+- method: paganin_filter
   module_path: httomolibgpu.prep.phase
-  sweep_parameter: alpha
-  sweep_values: [0.01, 0.001, 0.0001]
+  sweep_parameter: ratio_delta_beta
+  sweep_values: [10, 150, 350]
 - method: FBP3d_tomobar
-  module_path: httomolibgpu.recon.algorithm
+  module_path: httomolibgpu.recon.algorithm

{httomo_backends-0.7.1 → httomo_backends-0.8.0}/httomo_backends/scripts/yaml_pipelines_generator.py

@@ -138,7 +138,7 @@ def yaml_pipelines_generator(
 
             pipeline_full.yaml_set_start_comment(
                 "This pipeline should be supported by the latest developments of HTTomo. Use module load httomo/latest module at Diamond."
-            )            
+            )
 
             if "loaders" in module_name:
                 # should be the first method in the list
@@ -157,7 +157,7 @@ def yaml_pipelines_generator(
                 pipeline_full += yaml_template_method
                 pipeline_full[i]["parameters"].yaml_add_eol_comment(
                     key="ind",
-                    comment="A vertical slice (sinogram) index to calculate CoR, `mid` can be used for middle",
+                    comment="A vertical slice (sinogram) index to calculate CoR, 'mid' can be used for middle",
                 )
                 pipeline_full[i]["parameters"].yaml_add_eol_comment(
                     key="cor_initialisation_value",
@@ -169,7 +169,7 @@ def yaml_pipelines_generator(
                 )
                 pipeline_full[i]["parameters"].yaml_add_eol_comment(
                     key="side",
-                    comment="'None' corresponds to fully automated determination, '0' to the left side, '1' to the right side.",
+                    comment="'None' corresponds to fully automated determination, 'left' to the left side, 'right' to the right side.",
                 )
                 pipeline_full[i]["side_outputs"].yaml_add_eol_comment(
                     key="cor",
@@ -182,7 +182,7 @@ def yaml_pipelines_generator(
             elif "corr" in module_name and "remove_outlier" in method_name:
                 pipeline_full.yaml_set_comment_before_after_key(
                     i,
-                    "--- Removing unresponsive pixels in the data, aka zingers. Use if sharp streaks are present in the reconstruction. To be applied before normalisation. ---",
+                    "--- Removing unresponsive/dead pixels in the data, aka zingers. Use if sharp streaks are present in the reconstruction. To be applied before normalisation. ---",
                     indent=0,
                 )
                 pipeline_full += yaml_template_method
@@ -223,7 +223,7 @@ def yaml_pipelines_generator(
             elif "sino_360_to_180" in method_name:
                 pipeline_full.yaml_set_comment_before_after_key(
                     i,
-                    "--- Using the overlap provided, converting 360 degrees scan to 180 degrees scan. --- ",
+                    "--- Using the overlap and side provided, converting 360 degrees scan to 180 degrees scan. --- ",
                     indent=0,
                 )
                 pipeline_full += yaml_template_method
@@ -236,7 +236,7 @@ def yaml_pipelines_generator(
                 pipeline_full += yaml_template_method
                 pipeline_full[i]["parameters"].yaml_add_eol_comment(
                     key="minus_log",
-                    comment="If Paganin method is used bellow, set it to false.",
+                    comment="If Paganin method is used bellow, set it to 'false'.",
                 )
             elif "phase" in module_name:
                 pipeline_full.yaml_set_comment_before_after_key(
@@ -246,8 +246,20 @@ def yaml_pipelines_generator(
                 )
                 pipeline_full += yaml_template_method
                 pipeline_full[i]["parameters"].yaml_add_eol_comment(
-                    key="alpha",
-                    comment="Controls the balance between the strength of the filter and the amount of noise reduction. Smaller values lead to less noise and more blur.",
+                    key="ratio_delta_beta",
+                    comment="The ratio of delta/beta for filter strength control. Larger values lead to more smoothing.",
+                )
+                pipeline_full[i]["parameters"].yaml_add_eol_comment(
+                    key="pixel_size",
+                    comment="Detector pixel size (resolution) in MICRON units.",
+                )
+                pipeline_full[i]["parameters"].yaml_add_eol_comment(
+                    key="distance",
+                    comment="Propagation distance of the wavefront from sample to detector in METRE units.",
+                )
+                pipeline_full[i]["parameters"].yaml_add_eol_comment(
+                    key="energy",
+                    comment="Beam energy in keV.",
                 )
             elif "stripe" in module_name:
                 pipeline_full.yaml_set_comment_before_after_key(
@@ -269,11 +281,11 @@ def yaml_pipelines_generator(
                 )
                 pipeline_full[i]["parameters"].yaml_add_eol_comment(
                     key="detector_pad",
-                    comment="Horizontal detector padding to minimise circle/arc-type artifacts in the reconstruction. Set to true to enable automatic padding or an integer",
+                    comment="Horizontal detector padding to minimise circle/arc-type artifacts in the reconstruction. Set to 'true' to enable automatic padding or an integer",
                 )
                 pipeline_full[i]["parameters"].yaml_add_eol_comment(
                     key="recon_mask_radius",
-                    comment="Zero pixels outside the mask-circle radius.",
+                    comment="Zero pixels outside the mask-circle radius. Make radius equal to 2.0 to remove the mask effect.",
                 )
                 pipeline_full[i]["parameters"].yaml_add_eol_comment(
                     key="neglog",
@@ -284,7 +296,7 @@ def yaml_pipelines_generator(
                     pipeline_full[i]["parameters"]["algorithm"] = "gridrec"
                     pipeline_full[i]["parameters"].yaml_add_eol_comment(
                         key="algorithm",
-                        comment="Select the required algorithm, e.g. `gridrec`",
+                        comment="Select the required algorithm, e.g. 'gridrec'",
                     )
             elif "denoise" in module_name:
                 pipeline_full.yaml_set_comment_before_after_key(

httomo_backends-0.8.0/httomo_backends/yaml_templates/httomolibgpu/httomolibgpu.prep.phase/paganin_filter.yaml

@@ -0,0 +1,7 @@
+- method: paganin_filter
+  module_path: httomolibgpu.prep.phase
+  parameters:
+    pixel_size: 1.28
+    distance: 1.0
+    energy: 53.0
+    ratio_delta_beta: 250

{httomo_backends-0.7.1 → httomo_backends-0.8.0}/httomo_backends/yaml_templates/httomolibgpu/httomolibgpu.recon.algorithm/LPRec3d_tomobar.yaml

@@ -8,6 +8,7 @@
     recon_size: null
     recon_mask_radius: 0.95
     power_of_2_oversampling: true
-    min_mem_usage_filter: false
-    min_mem_usage_ifft2: false
+    power_of_2_cropping: false
+    min_mem_usage_filter: true
+    min_mem_usage_ifft2: true
     neglog: false

{httomo_backends-0.7.1 → httomo_backends-0.8.0}/httomo_backends.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: httomo-backends
-Version: 0.7.1
+Version: 0.8.0
 Summary: Supplementary files for HTTomo backends.
 Author: Garry ODonnell, Jacob Williamson
 Author-email: Daniil Kazantsev <daniil.kazantsev@diamond.ac.uk>, Yousef Moazzam <yousef.moazzam@diamond.ac.uk>, Jessica Verschoyle <jessica.verschoyle@diamond.ac.uk>, Naman Gera <naman.gera@diamond.ac.uk>, scientificsoftware@diamond.ac.uk
@@ -22,7 +22,6 @@ Requires-Dist: h5py
 Requires-Dist: astra-toolbox
 Requires-Dist: tomobar
 Requires-Dist: scikit-image
-Requires-Dist: ccpi-regularisation-cupy
 Provides-Extra: dev
 Requires-Dist: pytest; extra == "dev"
 Requires-Dist: pytest-mock; extra == "dev"

{httomo_backends-0.7.1 → httomo_backends-0.8.0}/httomo_backends.egg-info/SOURCES.txt

@@ -78,7 +78,7 @@ httomo_backends/yaml_templates/httomolibgpu/httomolibgpu.misc.morph/sino_360_to_
 httomo_backends/yaml_templates/httomolibgpu/httomolibgpu.misc.rescale/rescale_to_int.yaml
 httomo_backends/yaml_templates/httomolibgpu/httomolibgpu.prep.alignment/distortion_correction_proj_discorpy.yaml
 httomo_backends/yaml_templates/httomolibgpu/httomolibgpu.prep.normalize/normalize.yaml
-httomo_backends/yaml_templates/httomolibgpu/httomolibgpu.prep.phase/paganin_filter_tomopy.yaml
+httomo_backends/yaml_templates/httomolibgpu/httomolibgpu.prep.phase/paganin_filter.yaml
 httomo_backends/yaml_templates/httomolibgpu/httomolibgpu.prep.stripe/raven_filter.yaml
 httomo_backends/yaml_templates/httomolibgpu/httomolibgpu.prep.stripe/remove_all_stripe.yaml
 httomo_backends/yaml_templates/httomolibgpu/httomolibgpu.prep.stripe/remove_stripe_based_sorting.yaml

{httomo_backends-0.7.1 → httomo_backends-0.8.0}/httomo_backends.egg-info/requires.txt

@@ -8,7 +8,6 @@ h5py
 astra-toolbox
 tomobar
 scikit-image
-ccpi-regularisation-cupy
 
 [dev]
 pytest

{httomo_backends-0.7.1 → httomo_backends-0.8.0}/pyproject.toml

@@ -24,7 +24,7 @@ dev_template = "{tag}"
 
 [project]
 name = "httomo-backends"
-version = "0.7.1"
+version = "0.8.0"
 description = "Supplementary files for HTTomo backends."
 readme = "README.rst"
 license = {text = "BSD-3-Clause"}
@@ -55,7 +55,6 @@ dependencies = [
     "astra-toolbox",
     "tomobar",
     "scikit-image",
-    "ccpi-regularisation-cupy",
 ]
 
 [project.optional-dependencies]

{httomo_backends-0.7.1 → httomo_backends-0.8.0}/tests/test_httomolibgpu.py

@@ -15,7 +15,7 @@ from httomo_backends.methods_database.query import MethodsDatabaseQuery
 
 from httomolibgpu.misc.morph import data_resampler, sino_360_to_180
 from httomolibgpu.prep.normalize import normalize
-from httomolibgpu.prep.phase import paganin_filter_tomopy
+from httomolibgpu.prep.phase import paganin_filter
 from httomolibgpu.prep.alignment import distortion_correction_proj_discorpy
 from httomolibgpu.prep.stripe import (
     remove_stripe_based_sorting,
@@ -228,11 +228,11 @@ def test_denoiser_PD_TV_memoryhook(ensure_clean_memory, slices):
 @pytest.mark.parametrize("slices", [64, 128])
 @pytest.mark.parametrize("dim_x", [81, 260, 320])
 @pytest.mark.parametrize("dim_y", [340, 135, 96])
-def test_paganin_filter_tomopy_memoryhook(slices, dim_x, dim_y, ensure_clean_memory):
+def test_paganin_filter_memoryhook(slices, dim_x, dim_y, ensure_clean_memory):
     data = cp.random.random_sample((slices, dim_x, dim_y), dtype=np.float32)
     hook = MaxMemoryHook()
     with hook:
-        data_filtered = paganin_filter_tomopy(cp.copy(data)).get()
+        data_filtered = paganin_filter(cp.copy(data)).get()
 
     # make sure estimator function is within range (80% min, 100% max)
     max_mem = (
@@ -240,7 +240,7 @@ def test_paganin_filter_tomopy_memoryhook(slices, dim_x, dim_y, ensure_clean_mem
     )  # the amount of memory in bytes needed for the method according to memoryhook
 
     # now we estimate how much of the total memory required for this data
-    (estimated_memory_bytes, subtract_bytes) = _calc_memory_bytes_paganin_filter_tomopy(
+    (estimated_memory_bytes, subtract_bytes) = _calc_memory_bytes_paganin_filter(
         (dim_x, dim_y), dtype=np.float32()
     )
     estimated_memory_mb = round(slices * estimated_memory_bytes / (1024**2), 2)
@@ -543,7 +543,8 @@ def test_recon_FBP3d_tomobar_memoryhook(
 
 
 @pytest.mark.cupy
-@pytest.mark.parametrize("min_mem_usage_filter_ifft2", [(False, False), (True, False), (True, True)])
+@pytest.mark.parametrize("min_mem_usage_filter_ifft2", [(False, False)])
+@pytest.mark.parametrize("power_of_2_cropping", [False])
 @pytest.mark.parametrize("padding_detx", [0, 10, 50, 100])
 @pytest.mark.parametrize("projections", [1500, 1801, 2560])
 @pytest.mark.parametrize("detX_size", [2560])
@@ -556,6 +557,7 @@ def test_recon_LPRec3d_tomobar_0_pi_memoryhook(
     projection_angle_range,
     min_mem_usage_filter_ifft2,
     padding_detx,
+    power_of_2_cropping,
     ensure_clean_memory,
 ):
     __test_recon_LPRec3d_tomobar_memoryhook_common(
@@ -565,13 +567,17 @@ def test_recon_LPRec3d_tomobar_0_pi_memoryhook(
         projection_angle_range,
         padding_detx,
         min_mem_usage_filter_ifft2,
+        power_of_2_cropping,
         ensure_clean_memory,
     )
 
 
 @pytest.mark.full
 @pytest.mark.cupy
-@pytest.mark.parametrize("min_mem_usage_filter_ifft2", [(False, False), (True, False), (True, True)])
+@pytest.mark.parametrize(
+    "min_mem_usage_filter_ifft2", [(False, False), (True, False), (True, True)]
+)
+@pytest.mark.parametrize("power_of_2_cropping", [False, True])
 @pytest.mark.parametrize("padding_detx", [0, 10, 50, 100, 800])
 @pytest.mark.parametrize("projections", [1500, 1801, 2560, 3601])
 @pytest.mark.parametrize("detX_size", [2560])
@@ -584,6 +590,7 @@ def test_recon_LPRec3d_tomobar_0_pi_memoryhook_full(
     projection_angle_range,
     padding_detx,
     min_mem_usage_filter_ifft2,
+    power_of_2_cropping,
     ensure_clean_memory,
 ):
     __test_recon_LPRec3d_tomobar_memoryhook_common(
@@ -593,13 +600,17 @@ def test_recon_LPRec3d_tomobar_0_pi_memoryhook_full(
         projection_angle_range,
         padding_detx,
         min_mem_usage_filter_ifft2,
+        power_of_2_cropping,
         ensure_clean_memory,
     )
 
 
 @pytest.mark.full
 @pytest.mark.cupy
-@pytest.mark.parametrize("min_mem_usage_filter_ifft2", [(False, False), (True, False), (True, True)])
+@pytest.mark.parametrize(
+    "min_mem_usage_filter_ifft2", [(False, False), (True, False), (True, True)]
+)
+@pytest.mark.parametrize("power_of_2_cropping", [False, True])
 @pytest.mark.parametrize("padding_detx", [0, 10, 50, 100, 800])
 @pytest.mark.parametrize("projections", [1500, 1801, 2560, 3601])
 @pytest.mark.parametrize("detX_size", [2560])
@@ -614,6 +625,7 @@ def test_recon_LPRec3d_tomobar_memoryhook_full(
     projection_angle_range,
     padding_detx,
     min_mem_usage_filter_ifft2,
+    power_of_2_cropping,
     ensure_clean_memory,
 ):
     __test_recon_LPRec3d_tomobar_memoryhook_common(
@@ -623,6 +635,7 @@ def test_recon_LPRec3d_tomobar_memoryhook_full(
         projection_angle_range,
         padding_detx,
         min_mem_usage_filter_ifft2,
+        power_of_2_cropping,
         ensure_clean_memory,
     )
 
@@ -634,6 +647,7 @@ def __test_recon_LPRec3d_tomobar_memoryhook_common(
     projection_angle_range,
     padding_detx,
     min_mem_usage_filter_ifft2,
+    power_of_2_cropping,
     ensure_clean_memory,
 ):
     angles_number = projections
@@ -646,6 +660,7 @@ def __test_recon_LPRec3d_tomobar_memoryhook_common(
     kwargs["detector_pad"] = padding_detx
     kwargs["min_mem_usage_filter"] = min_mem_usage_filter_ifft2[0]
     kwargs["min_mem_usage_ifft2"] = min_mem_usage_filter_ifft2[1]
+    kwargs["power_of_2_cropping"] = power_of_2_cropping
     kwargs["recon_size"] = detX_size
     kwargs["recon_mask_radius"] = 0.8
 
@@ -731,10 +746,13 @@ def test_recon_SIRT3d_tomobar_memoryhook(slices, recon_size_it, ensure_clean_mem
     assert estimated_memory_mb >= max_mem_mb
     assert percents_relative_maxmem <= 100
 
+
 @pytest.mark.cupy
 @pytest.mark.parametrize("slices", [3])
 @pytest.mark.parametrize("recon_size_it", [2560])
-def test_recon_SIRT3d_tomobar_autopad_memoryhook(slices, recon_size_it, ensure_clean_memory):
+def test_recon_SIRT3d_tomobar_autopad_memoryhook(
+    slices, recon_size_it, ensure_clean_memory
+):
     angles_tot = 901
     det_size = 2560
     data = cp.random.random_sample((angles_tot, slices, det_size), dtype=np.float32)
@@ -747,8 +765,8 @@ def test_recon_SIRT3d_tomobar_autopad_memoryhook(slices, recon_size_it, ensure_c
         recon_data = SIRT3d_tomobar(
             cp.copy(data),
             np.linspace(0.0 * np.pi / 180.0, 180.0 * np.pi / 180.0, data.shape[0]),
-            center = 1200,
-            detector_pad = True,
+            center=1200,
+            detector_pad=True,
             recon_size=recon_size_it,
             iterations=2,
             nonnegativity=True,
@@ -792,8 +810,8 @@ def test_recon_CGLS3d_tomobar_memoryhook(slices, recon_size_it, ensure_clean_mem
         recon_data = CGLS3d_tomobar(
             cp.copy(data),
             np.linspace(0.0 * np.pi / 180.0, 180.0 * np.pi / 180.0, data.shape[0]),
-            center = 1200,
-            detector_pad = False,
+            center=1200,
+            detector_pad=False,
             recon_size=recon_size_it,
             iterations=2,
             nonnegativity=True,
@@ -824,7 +842,9 @@ def test_recon_CGLS3d_tomobar_memoryhook(slices, recon_size_it, ensure_clean_mem
 @pytest.mark.cupy
 @pytest.mark.parametrize("slices", [3])
 @pytest.mark.parametrize("recon_size_it", [2560])
-def test_recon_CGLS3d_tomobar_autopad_memoryhook(slices, recon_size_it, ensure_clean_memory):
+def test_recon_CGLS3d_tomobar_autopad_memoryhook(
+    slices, recon_size_it, ensure_clean_memory
+):
     angles_tot = 901
     det_size = 2560
     data = cp.random.random_sample((angles_tot, slices, det_size), dtype=np.float32)
@@ -837,8 +857,8 @@ def test_recon_CGLS3d_tomobar_autopad_memoryhook(slices, recon_size_it, ensure_c
         recon_data = CGLS3d_tomobar(
             cp.copy(data),
             np.linspace(0.0 * np.pi / 180.0, 180.0 * np.pi / 180.0, data.shape[0]),
-            center = 1200,
-            detector_pad = True,
+            center=1200,
+            detector_pad=True,
             recon_size=recon_size_it,
             iterations=2,
             nonnegativity=True,
@@ -865,6 +885,7 @@ def test_recon_CGLS3d_tomobar_autopad_memoryhook(slices, recon_size_it, ensure_c
     assert estimated_memory_mb >= max_mem_mb
     assert percents_relative_maxmem <= 85
 
+
 @pytest.mark.cupy
 @pytest.mark.parametrize("slices", [3, 5])
 @pytest.mark.parametrize("recon_size_it", [2560])

httomo_backends-0.7.1/httomo_backends/yaml_templates/httomolibgpu/httomolibgpu.prep.phase/paganin_filter_tomopy.yaml

@@ -1,7 +0,0 @@
-- method: paganin_filter_tomopy
-  module_path: httomolibgpu.prep.phase
-  parameters:
-    pixel_size: 0.0001
-    dist: 50.0
-    energy: 53.0
-    alpha: 0.001