nabu 2024.2.12__tar.gz → 2024.2.14__tar.gz

{nabu-2024.2.12/nabu.egg-info → nabu-2024.2.14}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: nabu
-Version: 2024.2.12
+Version: 2024.2.14
 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>

{nabu-2024.2.12 → nabu-2024.2.14}/nabu/__init__.py

@@ -1,4 +1,4 @@
-__version__ = "2024.2.12"
+__version__ = "2024.2.14"
 __nabu_modules__ = [
     "app",
     "cuda",

{nabu-2024.2.12 → nabu-2024.2.14}/nabu/io/cast_volume.py

@@ -206,6 +206,9 @@ def cast_volume(
         data_min = data_min if data_min is not None else found_data_min
         data_max = data_max if data_max is not None else found_data_max
 
+    if isinstance(output_volume, JP2KVolume):
+        output_volume.rescale_data = False
+
     data = []
     for input_slice, frame_dumper in zip(
         input_volume.browse_slices(),

{nabu-2024.2.12 → nabu-2024.2.14}/nabu/reconstruction/fbp.py

@@ -79,6 +79,13 @@ class CudaBackprojector(BackprojectorBase):
             self.sino_mult = CudaSinoMult(self.sino_shape, self.rot_center, ctx=self._processing.ctx)
         self._prepare_textures()  # has to be done after compilation for Cuda (to bind texture to built kernel)
 
+    def _get_filter_init_extra_options(self):
+        return {
+            "cuda_options": {
+                "ctx": self._processing.ctx,
+            },
+        }
+
     def _transfer_to_texture(self, sino, do_checks=True):
         if do_checks and not (sino.flags.c_contiguous):
             raise ValueError("Expected C-Contiguous array")

{nabu-2024.2.12 → nabu-2024.2.14}/nabu/reconstruction/fbp_base.py

@@ -237,14 +237,15 @@ class BackprojectorBase:
         self._axis_correction = np.zeros((1, self.n_angles), dtype=np.float32)
         self._axis_correction[0, :] = axcorr[:]  # pylint: disable=E1136
 
+    def _get_filter_init_extra_options(self):
+        return {}
+
     def _init_filter(self, filter_name):
         self.filter_name = filter_name
         if filter_name in ["None", "none"]:
             self.sino_filter = None
             return
-        sinofilter_other_kwargs = {}
-        if self.backend != "numpy":
-            sinofilter_other_kwargs["%s_options" % self.backend] = {"ctx": self._processing.ctx}
+        sinofilter_other_kwargs = self._get_filter_init_extra_options()
         self.sino_filter = self.SinoFilterClass(
             self.sino_shape,
             filter_name=self.filter_name,

{nabu-2024.2.12 → nabu-2024.2.14}/nabu/reconstruction/fbp_opencl.py

@@ -74,5 +74,13 @@ class OpenCLBackprojector(BackprojectorBase):
                 return
             return cl.enqueue_copy(self._processing.queue, self._d_sino.data, sino.data)
 
+    def _get_filter_init_extra_options(self):
+        return {
+            "opencl_options": {
+                "ctx": self._processing.ctx,
+                "queue": self._processing.queue,  # !!!!
+            },
+        }
+
     def _set_kernel_slice_arg(self, d_slice):
         self.kern_proj_args[1] = d_slice

{nabu-2024.2.12 → nabu-2024.2.14/nabu.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: nabu
-Version: 2024.2.12
+Version: 2024.2.14
 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>

{nabu-2024.2.12 → nabu-2024.2.14}/nabu.egg-info/SOURCES.txt

@@ -271,7 +271,6 @@ nabu/resources/templates/id16_holo.conf
 nabu/resources/templates/id16a_fluo.conf
 nabu/resources/templates/id19_pag.conf
 nabu/resources/tests/__init__.py
-nabu/resources/tests/test_extract.py
 nabu/resources/tests/test_nxflatfield.py
 nabu/resources/tests/test_units.py
 nabu/stitching/__init__.py

nabu-2024.2.12/nabu/resources/tests/test_extract.py

@@ -1,9 +0,0 @@
-from nabu.utils import list_match_queries
-
-
-def test_list_match_queries():
-
-    # entry0000 .... entry0099
-    avail = ["entry%04d" % i for i in range(100)]
-    query = "entry0000"
-    list_match_queries()