nabu 2024.1.6__py3-none-any.whl → 2024.1.8__py3-none-any.whl

doc/doc_config.py

@@ -0,0 +1,32 @@
+#!/usr/bin/env python
+
+from nabu.resources.nabu_config import nabu_config
+
+
+def generate(file_):
+    def write(content):
+        print(content, file=file_)
+    for section, values in nabu_config.items():
+        if section == "about":
+            continue
+        write("## %s\n" % section)
+        for key, val in values.items():
+            if val["type"] == "unsupported":
+                continue
+            write(val["help"] + "\n")
+            write(
+                "```ini\n%s = %s\n```"
+                % (key, val["default"])
+            )
+
+
+
+if __name__ == "__main__":
+
+    import sys, os
+    print(os.path.abspath(__file__))
+    exit(0)
+
+    fname = "/tmp/test.md"
+    with open(fname, "w") as f:
+        generate(f)

nabu/__init__.py

@@ -1,4 +1,4 @@
-__version__ = "2024.1.6"
+__version__ = "2024.1.8"
 __nabu_modules__ = [
     "app",
     "cuda",

nabu/pipeline/fullfield/chunked.py

@@ -548,7 +548,6 @@ class ChunkedPipeline:
 
         if options["method"] == "FBP":
             n_slices = self.n_slices
-            radios_shape_for_sino_builder = self.radios_cropped_shape
             self.reconstruction = self.FBPClass(
                 self.sinos_shape[1:],
                 angles=options["angles"],
@@ -567,7 +566,6 @@ class ChunkedPipeline:
             )
 
         if options["method"] == "cone":
-            radios_shape_for_sino_builder = self.radios_shape
             n_slices = self.n_slices + sum(self.margin[0])
             # For numerical stability, normalize all lengths with respect to detector pixel size
             pixel_size_m = self.dataset_info.pixel_size * 1e-6
@@ -577,17 +575,16 @@ class ChunkedPipeline:
                 (self.radios_shape[1],) + self.sino_shape,
                 source_sample_dist,
                 sample_detector_dist,
-                angles=options["angles"],
-                # TODO one center for each angle to handle "x translations"
+                angles=-options["angles"],
                 rot_center=options["rotation_axis_position"],
+                axis_correction=-options["axis_correction"],
                 pixel_size=1,
+                scale_factor=1.0 / options["voxel_size_cm"][0],
             )
 
         self._allocate_recs(*self.process_config.rec_shape, n_slices=n_slices)
         n_a, _, n_x = self.radios_cropped_shape
         self._tmp_sino = self._allocate_array((n_a, n_x), "f", name="tmp_sino")
-        if options["method"] == "cone":
-            self.sinos = self._allocate_array(self.sino_builder.output_shape, "f", name="sinos")
 
     @use_options("histogram", "histogram")
     def _init_histogram(self):
@@ -734,14 +731,25 @@ class ChunkedPipeline:
         """
         This reconstructs the entire sinograms stack at once
         """
-        self.sino_builder.get_sinos(self.radios, output=self.sinos)
+
+        n_angles, n_z, n_x = self.radios.shape
+
+        # FIXME
+        # can't do a discontiguous single copy...
+        sinos_contig = self._allocate_array((n_z, n_angles, n_x), np.float32, "sinos_cone")
+        for i in range(n_z):
+            sinos_contig[i] = self.radios[:, i, :]
+        # ---
+
+        # In principle radios are not cropped at this stage,
+        # so self.sub_region[2][0] can be used instead of self.get_slice_start_index() instead of self.sub_region[2][0]
         z_min, z_max = self.sub_region_xz[2:]
-        n_z = self.process_config.radio_shape(binning=True)[0]
+        n_z_tot = self.process_config.radio_shape(binning=True)[0]
 
         self.reconstruction.reconstruct(  # pylint: disable=E1101
-            self.sinos,
+            sinos_contig,
             output=self.recs,
-            relative_z_position=((z_min + z_max) / self.process_config.binning_z / 2) - n_z / 2,
+            relative_z_position=((z_min + z_max) / self.process_config.binning_z / 2) - n_z_tot / 2,
         )
 
     @pipeline_step("histogram", "Computing histogram")

nabu/pipeline/fullfield/dataset_validator.py

@@ -29,7 +29,7 @@ class FullFieldDatasetValidator(DatasetValidatorBase):
     def _check_slice_indices(self):
         nx, nz = self.dataset_info.radio_dims
         rec_params = self.rec_params
-        if rec_params["enable_halftomo"]:
+        if self.is_halftomo:
             ny, nx = self._get_nx_ny()
         what = (("start_x", "end_x", nx), ("start_y", "end_y", nx), ("start_z", "end_z", nz))
         for start_name, end_name, numels in what:
@@ -61,3 +61,7 @@ class FullFieldDatasetValidator(DatasetValidatorBase):
                 self.logger.warning(
                     "Cone-beam reconstruction: 'sample_detector_dist' not provided, will use the one in dataset metadata"
                 )
+            if self.is_halftomo:
+                err_msg = "Cone-beam reconstruction with half-acquisition is not supported yet"
+                self.logger.fatal(err_msg)
+                raise NotImplementedError(err_msg)

nabu/pipeline/fullfield/processconfig.py

@@ -517,10 +517,15 @@ class ProcessConfig(ProcessConfigBase):
         #
         # Translation movements
         #
+
         translations = dataset_info.translations
         if translations is not None:
-            tasks.append("radios_movements")
-            options["radios_movements"] = {"translation_movements": dataset_info.translations}
+            if np.max(np.abs(translations[:, 1])) < 1e-5:
+                self.logger.warning("No vertical translation greater than 1e-5 - disabling vertical shifts")
+                # horizontal movements are handled in backprojector
+            else:
+                tasks.append("radios_movements")
+                options["radios_movements"] = {"translation_movements": dataset_info.translations}
         #
         # Sinogram normalization (before half-tomo)
         #
@@ -600,7 +605,7 @@ class ProcessConfig(ProcessConfigBase):
             )
             if all([m is not None for m in mean_positions_xyz]):
                 rec_options["position"] = mean_positions_xyz
-            if rec_options["sample_detector_dist"] is None:
+            if rec_options["method"] == "cone" and rec_options["sample_detector_dist"] is None:
                 rec_options["sample_detector_dist"] = self.dataset_info.distance  # was checked to be not None earlier
 
             # New key

nabu/pipeline/fullfield/reconstruction.py

@@ -359,6 +359,16 @@ class FullFieldReconstructor:
 
         return (max_overlap, 0)
 
+    def _compute_rotation_margin(self):
+        if "rotate_projections" in self.process_config.processing_steps:
+            # Partial radios rotation yields too much error in single-slice mode
+            # Forcing a big margin circumvents the problem
+            # This is likely to trigger the 'grouped mode', but perhaps grouped mode should always be used when rotating radios
+            nz, nx = self.process_config.radio_shape(binning=True)
+            return nz // 3, nx // 3
+        else:
+            return 0, 0
+
     def _ensure_good_chunk_size_and_margin(self):
         """
         Check that "chunk_size" and "margin" (if any) are a multiple of binning factor.

nabu/pipeline/helical/tests/test_accumulator.py

@@ -1,5 +1,5 @@
 from nabu.pipeline.helical import gridded_accumulator, span_strategy
-from nabu.testutils import get_data
+from nabu.testutils import get_data, __do_long_tests__
 
 import pytest
 import numpy as np
@@ -49,6 +49,7 @@ def bootstrap(request):
     cls.rtol_regridded = 1.0e-6
 
 
+@pytest.mark.skipif(not (__do_long_tests__), reason="need environment variable NABU_LONG_TESTS=1")
 @pytest.mark.usefixtures("bootstrap")
 class TestGriddedAccumulator:
     """

nabu/pipeline/processconfig.py

@@ -181,7 +181,10 @@ class ProcessConfigBase:
         #
         if isinstance(tilt, str):  # auto-tilt
             self.tilt_estimator = DetectorTiltEstimator(
-                self.dataset_info, logger=self.logger, autotilt_options=self.nabu_config["preproc"]["autotilt_options"]
+                self.dataset_info,
+                do_flatfield=self.nabu_config["preproc"]["flatfield"],
+                logger=self.logger,
+                autotilt_options=self.nabu_config["preproc"]["autotilt_options"],
             )
             tilt = self.tilt_estimator.find_tilt(tilt_method=tilt)
         self.dataset_info.detector_tilt = tilt

nabu/processing/tests/test_fftshift.py

@@ -31,6 +31,7 @@ def bootstrap(request):
         cls.cu_ctx.pop()
 
 
+@pytest.mark.skip(reason="OpenCL fftshift is a prototype")
 @pytest.mark.usefixtures("bootstrap")
 class TestFFTshift:
     def _do_test_fftshift(self, config, fftshift_cls):

nabu/reconstruction/cone.py

@@ -23,7 +23,9 @@ class ConebeamReconstructor:
         volume_shape=None,
         rot_center=None,
         relative_z_position=None,
+        axis_correction=None,
         pixel_size=None,
+        scale_factor=None,
         cuda_options=None,
     ):
         """
@@ -88,6 +90,7 @@ class ConebeamReconstructor:
         Optics Express. 24. 25129-25147. 10.1364/OE.24.025129.
         """
         self._init_cuda(cuda_options)
+        self.scale_factor = scale_factor
         self._init_geometry(
             sinos_shape,
             source_origin_dist,
@@ -97,6 +100,7 @@ class ConebeamReconstructor:
             volume_shape,
             rot_center,
             relative_z_position,
+            axis_correction,
         )
         self._alg_id = None
         self._vol_id = None
@@ -133,6 +137,7 @@ class ConebeamReconstructor:
         volume_shape,
         rot_center,
         relative_z_position,
+        axis_correction,
     ):
         self._set_sino_shape(sinos_shape)
         if angles is None:
@@ -153,6 +158,7 @@ class ConebeamReconstructor:
         if rot_center is not None:
             self._cor_shift = (self.prj_width - 1) / 2.0 - rot_center
         self._set_pixel_size(pixel_size)
+        self._axis_corrections = axis_correction
         self._create_astra_proj_geometry(relative_z_position)
 
     def _create_astra_proj_geometry(self, relative_z_position):
@@ -170,13 +176,26 @@ class ConebeamReconstructor:
             self.origin_detector_dist,
         )
         self.relative_z_position = relative_z_position or 0.0
+        # This will turn the geometry of type "cone" into a geometry of type "cone_vec"
         self.proj_geom = astra.geom_postalignment(self.proj_geom, (self._cor_shift, 0))
+        # (src, detector_center, u, v) = (srcX, srcY, srcZ, dX, dY, dZ, uX, uY, uZ, vX, vY, vZ)
+        vecs = self.proj_geom["Vectors"]
+
+        # To adapt the center of rotation:
+        # dX = cor_shift * cos(theta) - origin_detector_dist * sin(theta)
+        # dY = origin_detector_dist * cos(theta) + cor_shift * sin(theta)
+        if self._axis_corrections is not None:
+            # should we check that dX and dY match the above formulas ?
+            cor_shifts = self._cor_shift + self._axis_corrections
+            vecs[:, 3] = cor_shifts * np.cos(self.angles) - self.origin_detector_dist * np.sin(self.angles)
+            vecs[:, 4] = self.origin_detector_dist * np.cos(self.angles) + cor_shifts * np.sin(self.angles)
+
+        # To adapt the z position:
         # Component 2 of vecs is the z coordinate of the source, component 5 is the z component of the detector position
         # We need to re-create the same inclination of the cone beam, thus we need to keep the inclination of the two z positions.
         # The detector is centered on the rotation axis, thus moving it up or down, just moves it out of the reconstruction volume.
         # We can bring back the detector in the correct volume position, by applying a rigid translation of both the detector and the source.
         # The translation is exactly the amount that brought the detector up or down, but in the opposite direction.
-        vecs = self.proj_geom["Vectors"]
         vecs[:, 2] = -self.relative_z_position
 
     def _set_output(self, volume):
@@ -229,6 +248,8 @@ class ConebeamReconstructor:
         result = self.cuda.get_array("output")
         if output is None:
             result = result.get()
+        if self.scale_factor is not None:
+            result *= np.float32(self.scale_factor)  # in-place for pycuda
         self.cuda.recover_arrays_references(["sinos", "output"])
         return result
 

nabu/reconstruction/tests/test_cone.py

@@ -1,7 +1,7 @@
 import pytest
 import numpy as np
-from scipy.ndimage import gaussian_filter
-from nabu.utils import subdivide_into_overlapping_segment
+from scipy.ndimage import gaussian_filter, shift
+from nabu.utils import subdivide_into_overlapping_segment, clip_circle
 
 try:
     import astra
@@ -238,6 +238,65 @@ class TestCone:
         assert np.max(err_max_profile) < 2e-3
         assert np.max(err_median_profile) < 5e-6
 
+    def test_reconstruction_horizontal_translations(self):
+        n_z = n_y = n_x = 256
+        n_a = 500
+        src_orig_dist = 1000
+        orig_det_dist = 50
+
+        volume, cone_data = generate_hollow_cube_cone_sinograms(
+            vol_shape=(n_z, n_y, n_x),
+            n_angles=n_a,
+            src_orig_dist=src_orig_dist,
+            orig_det_dist=orig_det_dist,
+            apply_filter=False,
+        )
+
+        # Apply horizontal translations on projections. This could have been done directly with astra
+        shift_min, shift_max = -2, 5
+        shifts_float = (shift_max - shift_min) * np.random.rand(n_a) - shift_min
+        shifts_int = np.random.randint(shift_min, high=shift_max + 1, size=n_a)
+
+        reconstructor_args = [
+            cone_data.shape,
+            src_orig_dist,
+            orig_det_dist,
+        ]
+        reconstructor_kwargs = {
+            "volume_shape": volume.shape,
+            "cuda_options": {"ctx": self.ctx},
+        }
+        cone_reconstructor = ConebeamReconstructor(*reconstructor_args, **reconstructor_kwargs)
+        rec = cone_reconstructor.reconstruct(cone_data)
+
+        # Translations done with floating-point shift values give a blurring of the image that cannot be recovered.
+        # Error tolerance has to be higher for these shifts.
+        for shift_type, shifts, err_tol in [
+            ("integer shifts", shifts_int, 5e-3),
+            ("float shifts", shifts_float, 1.4e-1),
+        ]:
+            cone_data_shifted = np.zeros_like(cone_data)
+            [shift(cone_data[:, i, :], (0, shifts[i]), output=cone_data_shifted[:, i, :]) for i in range(n_a)]
+
+            # Reconstruct with horizontal shifts
+            cone_reconstructor_with_correction = ConebeamReconstructor(
+                *reconstructor_args,
+                axis_corrections=shifts,
+                **reconstructor_kwargs,
+            )
+
+            rec_with_correction = cone_reconstructor_with_correction.reconstruct(cone_data_shifted)
+
+            metric = lambda img: np.max(np.abs(clip_circle(img, radius=int(0.85 * img.shape[1] // 2))))
+            error_profile = np.array([metric(rec[i] - rec_with_correction[i]) for i in range(n_z)])
+            assert error_profile.max() < err_tol, "Max error with %s is too high" % shift_type
+
+            # import matplotlib.pyplot as plt
+            # plt.figure()
+            # plt.plot(np.arange(n_z), error_profile)
+            # plt.legend([shift_type])
+            # plt.show()
+
 
 def generate_hollow_cube_cone_sinograms(
     vol_shape, n_angles, src_orig_dist, orig_det_dist, prj_width=None, apply_filter=True

nabu/reconstruction/tests/test_deringer.py

@@ -1,7 +1,7 @@
 import numpy as np
 import pytest
 from nabu.reconstruction.rings_cuda import CudaSinoMeanDeringer
-from nabu.testutils import compare_arrays, get_data, generate_tests_scenarios, __do_long_tests__
+from nabu.testutils import compare_arrays, get_data, generate_tests_scenarios, __do_long_tests__, __do_large_mem_tests__
 from nabu.reconstruction.rings import MunchDeringer, SinoMeanDeringer, VoDeringer, __has_algotom__
 from nabu.thirdparty.pore3d_deringer_munch import munchetal_filter
 from nabu.cuda.utils import __has_pycuda__, get_cuda_context
@@ -144,8 +144,8 @@ class TestMunchDeringer:
         # TODO check result. The generated test sinogram is "too synthetic" for this kind of deringer
 
     @pytest.mark.skipif(
-        not (__have_tomocupy_deringer__),
-        reason="Need cupy for this test",
+        not (__have_tomocupy_deringer__ and __do_large_mem_tests__),
+        reason="Need cupy for this test, and use NABU_LARGE_MEM_TESTS",
     )
     def test_cuda_vo_deringer(self):
         # Beware, this deringer seems to be buggy for "too-small" sinograms

nabu/reconstruction/tests/test_halftomo.py

@@ -3,10 +3,11 @@ import pytest
 from nabu.testutils import get_data, generate_tests_scenarios, compare_shifted_images
 from nabu.cuda.utils import get_cuda_context, __has_pycuda__, __has_cufft__
 from nabu.opencl.utils import get_opencl_context, __has_pyopencl__
+from nabu.processing.fft_opencl import has_vkfft as has_vkfft_cl
 from nabu.thirdparty.algotom_convert_sino import extend_sinogram
 
 __has_pycuda__ = __has_pycuda__ and __has_cufft__  # need both for using Cuda backprojector
-
+__has_pyopencl__ = __has_pyopencl__ and has_vkfft_cl()
 
 if __has_pycuda__:
     from nabu.reconstruction.fbp import CudaBackprojector

nabu/stitching/tests/test_z_stitching.py

@@ -695,11 +695,6 @@ def test_DistributePostProcessZStitcher(tmp_path, configuration_dist, flip_ud):
     if complete:
         concatenate_volumes(output_volume=final_vol, volumes=tuple(reconstructed_sub_volumes), axis=1)
         final_vol.load_data(store=True)
-        with h5py.File("debug.hdf5", mode="w") as h5f:
-            h5f["raw_volume"] = raw_volume
-            h5f["final_vol"] = final_vol.data
-            h5f["volume1"] = volume_1.data
-            h5f["volume2"] = volume_2.data
         numpy.testing.assert_almost_equal(
             raw_volume,
             final_vol.data,
@@ -925,14 +920,6 @@ def test_vol_z_stitching_with_alignment_axis_2(tmp_path, alignment_axis_2):
 
     assert output_volume.data.shape == (120, 4, 120)
 
-    import h5py
-
-    with h5py.File("input.h5", mode="w") as h5f:
-        h5f["data"] = raw_volume
-
-    with h5py.File("output.h5", mode="w") as h5f:
-        h5f["data"] = output_volume.data
-
     if alignment_axis_2 == "center":
         numpy.testing.assert_array_almost_equal(raw_volume[:, :, 10:-10], output_volume.data[:, :, 10:-10])
     elif alignment_axis_2 == "left":

nabu/stitching/z_stitching.py

@@ -1975,7 +1975,7 @@ def stitch_vertically_raw_frames(
       |    |  Frame 2   |                         --------------
       |    |            |
       |    --------------
-      \/
+      |
 
     returns stitched_projection, raw_img_1, raw_img_2, computed_overlap
     proj_0 and pro_1 are already expected to be in a row. Having stitching_height_in_px in common. At top of proj_0

{nabu-2024.1.6.dist-info → nabu-2024.1.8.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: nabu
-Version: 2024.1.6
+Version: 2024.1.8
 Summary: Nabu - Tomography software
 Author-email: Pierre Paleo <pierre.paleo@esrf.fr>, Henri Payno <henri.payno@esrf.fr>, Alessandro Mirone <mirone@esrf.fr>, Jérôme Lesaint <jerome.lesaint@esrf.fr>
 Maintainer-email: Pierre Paleo <pierre.paleo@esrf.fr>
@@ -49,7 +49,7 @@ Classifier: Topic :: Scientific/Engineering :: Medical Science Apps.
 Requires-Python: >=3.7
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: numpy >1.9.0
+Requires-Dist: numpy <2,>1.9.0
 Requires-Dist: scipy
 Requires-Dist: h5py >=3.0
 Requires-Dist: silx >=0.15.0
@@ -66,7 +66,7 @@ Provides-Extra: full
 Requires-Dist: scikit-image ; extra == 'full'
 Requires-Dist: PyWavelets ; extra == 'full'
 Requires-Dist: glymur ; extra == 'full'
-Requires-Dist: pycuda ; extra == 'full'
+Requires-Dist: pycuda <2024.1.1 ; extra == 'full'
 Requires-Dist: scikit-cuda ; extra == 'full'
 Requires-Dist: pycudwt ; extra == 'full'
 Requires-Dist: sluurp >=0.3 ; extra == 'full'

{nabu-2024.1.6.dist-info → nabu-2024.1.8.dist-info}/RECORD

@@ -1,7 +1,8 @@
 doc/conf.py,sha256=3xtCarCHrXPr50GbeRDuH-o3Jzojw7mpr7vpGfZPLAE,3787
 doc/create_conf_doc.py,sha256=IVOdP70KvbW9WS_UQu3Iyd0YfS60E2fJ5IDtQ_s4cDw,1143
+doc/doc_config.py,sha256=anqeOVjqE2e7eVzg7yuh9dvIneTkrA5doGl1cVBqT7Q,730
 doc/get_mathjax.py,sha256=VIvKRCdDuF2VoY8JD3mSey9XX13AZMmwTJBHdt1tUs4,1012
-nabu/__init__.py,sha256=R001g25kFvEVDDeajbatTdAG1ufFI08DldAcf4ADwF4,270
+nabu/__init__.py,sha256=DO4fHjlr5q2r3IDpkSpuzsOIMuHK5R3I2w91UQaUEdY,270
 nabu/tests.py,sha256=cew9OY2uTyncHI_HM32W8CP6B1GTGKaOW65XtMEqs7o,1417
 nabu/testutils.py,sha256=qqtGgkIhpOpXhgeoXlqCb91Rx-JlI4ALaDF6nt8YRRk,13298
 nabu/utils.py,sha256=w-xfRb6TFQpS-tao6nlvfmr962pmeec-WH1GltSUCrk,23767
@@ -31,7 +32,6 @@ nabu/app/shrink_dataset.py,sha256=P9dorO0Q-gPAWgSHyZi3XQp4jkMTJacDYzNvJY4oh98,35
 nabu/app/stitching.py,sha256=Ibp1oVokLVMz-VX762j1C0E88Di0YJvRt-b8NjGoe7g,3310
 nabu/app/utils.py,sha256=XUBRWDmth4i3BZHd27rfarFAUP7OEcsMeVmDJ6T4EXA,1178
 nabu/app/validator.py,sha256=IR-DcUV5h1Fc5CChBfBIaglrGpfKNICX7tGirAroMiw,3368
-nabu/app/tests/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 nabu/app/tests/test_reduce_dark_flat.py,sha256=T-_zyzD0-f2c5Z-tlzmRF5p3vPtyL2RFb-D5fIYYEoM,2641
 nabu/cuda/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 nabu/cuda/convolution.py,sha256=n8KsJ7IZdPOs_K5QZC6qblnOvIKYwxtdt03oNa0GiMU,241
@@ -132,17 +132,17 @@ nabu/pipeline/detector_distortion_provider.py,sha256=ru1AxbcuO-FA8FYooPBWgp1lzdS
 nabu/pipeline/estimators.py,sha256=4V5pwl5vUFMJDanWnmw7POnSsa9lKyKtUzvq9GLcJwc,41374
 nabu/pipeline/fallback_utils.py,sha256=7ccrKYE-rp3fydb72VA6W0_eKcEoqYBEAPlmij_lyEc,6086
 nabu/pipeline/params.py,sha256=VdrekcxOnbrMzvvLcwEWINiMM0uVKmPxJJBwp3lhHBg,3479
-nabu/pipeline/processconfig.py,sha256=3wCobeC_gI9OTO7v0Hk-IeEJUdKoavK-OzKLd1da5Dg,8216
+nabu/pipeline/processconfig.py,sha256=O0phgvfWtL9bg3_GE3cw9MZXS8PUy8z2rzhpoqP9U84,8320
 nabu/pipeline/utils.py,sha256=NONAgBfTfUYvBNfoTqD33MAYaPZyCJL10SnR6B0lLec,3462
 nabu/pipeline/writer.py,sha256=0ts40VNN3RiRURvZ2gNqsigsAJuwcjnYF4RJ15qaMpI,7558
 nabu/pipeline/fullfield/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-nabu/pipeline/fullfield/chunked.py,sha256=qGE9gpww2zPbtPeM1Fe0RPRhl3onqxs8fr3HRug-x6I,36919
+nabu/pipeline/fullfield/chunked.py,sha256=IElD8g_KtYS7VOXuIEsRbdb9fMmtpB_AK7mAyejbEs0,37125
 nabu/pipeline/fullfield/chunked_cuda.py,sha256=aGzjY8MX6OL8auEj6Y0RfOGCmFnczsdfj6-8Net5AbQ,5645
 nabu/pipeline/fullfield/computations.py,sha256=VpIURVXh8EpNSfait_AIFM4Ci-GK_546Wkb-Wn9r31Y,9935
-nabu/pipeline/fullfield/dataset_validator.py,sha256=sRgUECUc8aOjFbwrW-dHjvIf7K3T40YPSIgt3cInKAc,3055
+nabu/pipeline/fullfield/dataset_validator.py,sha256=8B2lB9j7elF_NmOOOyr8UADVfC15Oofzy2AyWoPufQM,3265
 nabu/pipeline/fullfield/nabu_config.py,sha256=a0mMoLkvlvHgX6RmUS1m1UhJS-XB3O6wBCnkNoI90Cs,30358
-nabu/pipeline/fullfield/processconfig.py,sha256=ad2lmo-cCkzfDJqMd__FhbfIInndTxQsLdgH9Ec9Tzc,36107
-nabu/pipeline/fullfield/reconstruction.py,sha256=Km_ZDtoiDQdX3TdTh6E9bzS5hoMC0jYU5eZWodaLbIg,36627
+nabu/pipeline/fullfield/processconfig.py,sha256=qSVeUvpt9BS2kR3zNk95_MGoLV4idiSJyYHlAPXbgTs,36405
+nabu/pipeline/fullfield/reconstruction.py,sha256=b-ErQE__Ttz2XECJjmdoY6Msfh-lrUOPZCsAhn6p-nA,37150
 nabu/pipeline/helical/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 nabu/pipeline/helical/dataset_validator.py,sha256=0YQc0hdYdpaXznFaKmlj9SIu7mNs0xXMejcRkhOZHaI,640
 nabu/pipeline/helical/fbp.py,sha256=0fAz-Fb0Rn_FzellvcS2cy-Wvm-5dxEf494YFt4pLws,5845
@@ -158,7 +158,7 @@ nabu/pipeline/helical/span_strategy.py,sha256=7zV_Oo_liFiuv6m70o08XyoEIo_7QYs7MV
 nabu/pipeline/helical/utils.py,sha256=51Qbh8db6-DX0iB9B9Kb07uwIG6_upAJg_8nhyzbB7o,1555
 nabu/pipeline/helical/weight_balancer.py,sha256=j0TGe50tbbsilQvml9CgMxeSy83CNaifHj-xuMGl8uE,3981
 nabu/pipeline/helical/tests/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-nabu/pipeline/helical/tests/test_accumulator.py,sha256=nNHwqUgSyUpdZVYNVyxqekj0SoThCF8s-8o3NfSw6vI,6416
+nabu/pipeline/helical/tests/test_accumulator.py,sha256=DCwTAWQLdUNJBJpjhHT8o1gLbznpuj_zqbQOfQnrShw,6534
 nabu/pipeline/helical/tests/test_pipeline_elements_full.py,sha256=zeR9SaeD0mnhtKU7qo4Qrn_lg1I1Vhg4dqzj6jy8tpg,14569
 nabu/pipeline/helical/tests/test_strategy.py,sha256=rt8SsUHBMMcVFl48kRGcOyf1y4bYqaA2xDznQxE7wFs,2721
 nabu/pipeline/tests/test_chunk_reader.py,sha256=OB279hSvgmVhWv_OauZNWTJeaaiheETayGYK79Op10Q,3410
@@ -213,7 +213,7 @@ nabu/processing/unsharp_cuda.py,sha256=tbgw3selI4x4qsSxyQJ8Q4HUxdEBbZOJtSys-0yzj
 nabu/processing/unsharp_opencl.py,sha256=ikmZhQB-kji3UFrvFzHJNvDUpaVSpzcCJRX_bqSQeGQ,2637
 nabu/processing/tests/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 nabu/processing/tests/test_fft.py,sha256=zDGDTXZjHBVbiVFiQfkrkYFFMyotJRFU-KgoNm1FGms,9827
-nabu/processing/tests/test_fftshift.py,sha256=90QlNO62pN9P_oY54JYrPX5pLjzO5SSC4ZEyr5F__hQ,2559
+nabu/processing/tests/test_fftshift.py,sha256=-XgJUm0eF3D-rMTlI9u3jaWYIlPFZEpM0PwW3SMDLG0,2618
 nabu/processing/tests/test_histogram.py,sha256=25CLs1WZpLF9xZ2DR82x4_YokA5Z76Qsnn6zY8YdJj8,2283
 nabu/processing/tests/test_medfilt.py,sha256=lVfLWIxWiLfODFc14WYbq1W02rgQDtCnrSgXnWgU6yU,2722
 nabu/processing/tests/test_muladd.py,sha256=cRhAC5hgmRV0BAwPA4o4M-kcx-UDniLK7sSyiN0F3kE,1927
@@ -223,7 +223,7 @@ nabu/processing/tests/test_rotation.py,sha256=vedRXV9RePJywBKoyBkGANP1dhZCjphbYO
 nabu/processing/tests/test_transpose.py,sha256=hTG17wTaB5Wv6twbW3ZFhBv6BYfqJY7DTQPoO0-KdkM,2760
 nabu/processing/tests/test_unsharp.py,sha256=R3ovbwDDp3ccy2A8t6CcUVELXRWkED5EnQdN2FQOfQM,4391
 nabu/reconstruction/__init__.py,sha256=EmKVvx_-FJvzJngG4ielIC7FhMCpI1Waaflg_lF44tk,163
-nabu/reconstruction/cone.py,sha256=kVe1CWtkfOkeYH1jrSFVO9mON58p5BR1_MKxdmiEgbM,11028
+nabu/reconstruction/cone.py,sha256=ET0xCoFRt5oD7IpzHNmlm-bX4eanBenH186VGTgLAj0,12159
 nabu/reconstruction/fbp.py,sha256=5GB7XCnxftSHq1ZBLjWi-7OTiyCU4qe-M4EPzvsoxLg,4829
 nabu/reconstruction/fbp_base.py,sha256=igY--_GiKGAcephOU1I8O1GjVcryJnReyywlgtROXW4,16833
 nabu/reconstruction/fbp_opencl.py,sha256=coEGLq65PCuvWnhAbIyLPHACkWjMB0XOceMp9ZIDWtc,3274
@@ -239,11 +239,11 @@ nabu/reconstruction/sinogram.py,sha256=KTSGP_JJABf4Yr9l628HPbyWsBnpbnyGKyPEq3ZrP
 nabu/reconstruction/sinogram_cuda.py,sha256=wS84AIy3T00d1kTtuJOQmA3hktbDVs4ybwB9haiBcoY,10623
 nabu/reconstruction/sinogram_opencl.py,sha256=p793N26VknU8KIZLtDgFY6HNx0TylemZ1YL4WKD3fHs,1403
 nabu/reconstruction/tests/__init__.py,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-YBdrKVGs,1
-nabu/reconstruction/tests/test_cone.py,sha256=R9Q-o9jz5ZBRwpGRRDwWr4owrrI3bJow5f_x_toq_lw,11813
-nabu/reconstruction/tests/test_deringer.py,sha256=u7HTMKH0DiZ1JAs68svi7eOCQt_sgxpXH6RQ12rDaVE,8299
+nabu/reconstruction/tests/test_cone.py,sha256=xrFsIFGmpE9txpR3d93upF2S4yS_53IjZdZEKaaYspg,14313
+nabu/reconstruction/tests/test_deringer.py,sha256=C5wj6RNzmpt_Cry4fonC8KXWvgPpcXfRbG8Bex_30S4,8380
 nabu/reconstruction/tests/test_fbp.py,sha256=p80zPCZkgJpERpqG5HHfbtbHBeqJUT8WY-q6FXOJJ7M,10053
 nabu/reconstruction/tests/test_filtering.py,sha256=PFJLQMDBQo-UuS_CfKrWZ_DdHarmVlcbsiZ_kmToWXY,4782
-nabu/reconstruction/tests/test_halftomo.py,sha256=rdPY4oL8JTJqDzpn-pdqjDp72pN39-5DipKqBTyyBxo,4171
+nabu/reconstruction/tests/test_halftomo.py,sha256=j-vq9Oyxl7dYGuAMMO2G-Y7EcryD1RGEyXqmycc0o_8,4290
 nabu/reconstruction/tests/test_projector.py,sha256=W4zntShzL47HjMGQG11zIYzMXwX0KfMN4BVIAapdy_I,6033
 nabu/reconstruction/tests/test_reconstructor.py,sha256=dEGqlQHfFwX_V2Ybnq5AAM5tprXn_2OuCSrC6cW4S0A,3221
 nabu/reconstruction/tests/test_sino_normalization.py,sha256=fGv5Dlidxgm8ZC70Nk6oqVgpY2jzOW9NJaGlo44IJOo,3692
@@ -272,7 +272,7 @@ nabu/stitching/overlap.py,sha256=eXAKsILS5jwqFY62JhDijeNW8H50rP-yjdUUGqjj0aY,157
 nabu/stitching/sample_normalization.py,sha256=_radin_wxnuD3MMmZNAOKA__aPa2z3ss4TFbZeocpXc,2069
 nabu/stitching/slurm_utils.py,sha256=sZ-VQPh_YlJ1Lkh7ap8qxII0rBpZryMyoxE5Xn557t8,8906
 nabu/stitching/utils.py,sha256=kMn2JEMDhcBQMweSlM0rUd-037H7iNUURTFMhXOTzC8,23651
-nabu/stitching/z_stitching.py,sha256=RRrLUDiOrImj1wvun13RkEC9tYL3WvbCNzS66iSKMgg,103400
+nabu/stitching/z_stitching.py,sha256=_DnPn4einJgzjqYu4u-LSwLAOoDgp5Jdu7iTYdsx9bw,103399
 nabu/stitching/tests/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 nabu/stitching/tests/test_alignment.py,sha256=MACak1ILOr8nRKeT0mWfMd-ZvhCl3SWjjcp6GjRbITc,2735
 nabu/stitching/tests/test_config.py,sha256=ttWuVB9Y_MM3_wGdKbcbYi_PG3vN87cL7o5zKsMzn9g,8490
@@ -281,16 +281,16 @@ nabu/stitching/tests/test_overlap.py,sha256=vfZuK32pclWL0Hg8u5NH0JoxKO28qk3ObRMm
 nabu/stitching/tests/test_sample_normalization.py,sha256=E49E_Quv-Qon6qSuaH9ZBZLqq4TPuBl8RqgB18Rwjc0,1348
 nabu/stitching/tests/test_slurm_utils.py,sha256=bbhCQd06R3irGB4B9r79KKlf0AlBchI53N2ldsXoAQQ,4950
 nabu/stitching/tests/test_utils.py,sha256=CjV0vPvXEchJ5vo6o7hGQA-PsOOAyAamuQ6fiHKCQ9M,641
-nabu/stitching/tests/test_z_stitching.py,sha256=8gio27FTULOX7bzypmdaAyVwQiO-JOwgBL1e9FwZUN4,42582
+nabu/stitching/tests/test_z_stitching.py,sha256=7VbNb7LwAahkLrxmx4V1M292op3e8W5M5NMZ2KABhFw,42160
 nabu/thirdparty/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 nabu/thirdparty/algotom_convert_sino.py,sha256=iZVRilvyqMyLTu8RKgbqDFUjObWW5X69rCARrnNizuI,13872
 nabu/thirdparty/pore3d_deringer_munch.py,sha256=o4bisnFc-wMjuohWBT8wgWmfNehPQGtCl6G2NebJlbg,4500
 nabu/thirdparty/tomocupy_remove_stripe.py,sha256=VgXHr2tzTAAGZix5pwhFfbPxj4tt3yXBcjCPNQSLPAg,22810
 nabu/thirdparty/tomopy_phase.py,sha256=hK4oPpkogLOhv23XzzEXQY2u3r8fJvASY_bINVs6ERE,8634
 nabu/thirdparty/tomwer_load_flats_darks.py,sha256=ZNoVAinUb_wGYbfvs_4BVnWsjsQmNxSvCh1bWhR2WWg,5611
-nabu-2024.1.6.dist-info/LICENSE,sha256=1eAIPSnEsnSFNUODnLtNtQTs76exG3ZxJ1DJR6zoUBA,1066
-nabu-2024.1.6.dist-info/METADATA,sha256=ogaBqKAavm40N8GeX3XPDsRTwKm12-BgSfbB3HuR7ag,5224
-nabu-2024.1.6.dist-info/WHEEL,sha256=5sUXSg9e4bi7lTLOHcm6QEYwO5TIF1TNbTSVFVjcJcc,92
-nabu-2024.1.6.dist-info/entry_points.txt,sha256=cJKGkBeykVL7uK3E4R0RLRqMXifTL2qdO573syPAvJc,1288
-nabu-2024.1.6.dist-info/top_level.txt,sha256=fsm_N3eXLRZk2QXF9OSKPNDPFXOz8FAQjHh5avT3dok,9
-nabu-2024.1.6.dist-info/RECORD,,
+nabu-2024.1.8.dist-info/LICENSE,sha256=1eAIPSnEsnSFNUODnLtNtQTs76exG3ZxJ1DJR6zoUBA,1066
+nabu-2024.1.8.dist-info/METADATA,sha256=qlqJl5Qy-ajxs4_j-PfKcIvwds6vYOT9j8V21egtvQs,5237
+nabu-2024.1.8.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
+nabu-2024.1.8.dist-info/entry_points.txt,sha256=cJKGkBeykVL7uK3E4R0RLRqMXifTL2qdO573syPAvJc,1288
+nabu-2024.1.8.dist-info/top_level.txt,sha256=fsm_N3eXLRZk2QXF9OSKPNDPFXOz8FAQjHh5avT3dok,9
+nabu-2024.1.8.dist-info/RECORD,,

{nabu-2024.1.6.dist-info → nabu-2024.1.8.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: bdist_wheel (0.41.1)
+Generator: bdist_wheel (0.42.0)
 Root-Is-Purelib: true
 Tag: py3-none-any