nabu 2024.2.7__tar.gz → 2024.2.9__tar.gz

{nabu-2024.2.7/nabu.egg-info → nabu-2024.2.9}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: nabu
-Version: 2024.2.7
+Version: 2024.2.9
 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.7 → nabu-2024.2.9}/nabu/__init__.py

@@ -1,4 +1,4 @@
-__version__ = "2024.2.7"
+__version__ = "2024.2.9"
 __nabu_modules__ = [
     "app",
     "cuda",

{nabu-2024.2.7 → nabu-2024.2.9}/nabu/io/reader.py

@@ -688,8 +688,9 @@ class NXTomoReader(VolReaderBase):
             user_selection_dim0 = self.sub_region[0]
             indices = np.arange(self.data_shape_total[0])
             data_selection_indices_axis0 = np.hstack(
-                [indices[image_key_slice][user_selection_dim0] for image_key_slice in self._image_key_slices]
-            )
+                [indices[image_key_slice] for image_key_slice in self._image_key_slices]
+            )[user_selection_dim0]
+
             self._source_selection = (data_selection_indices_axis0,) + self.sub_region[1:]
 
     def _get_temporary_buffer(self, convert_after_reading):

{nabu-2024.2.7 → nabu-2024.2.9}/nabu/pipeline/estimators.py

@@ -150,7 +150,7 @@ class CORFinderBase:
                 lookup_side = default_lookup_side
             else:
                 lookup_side = initial_cor_pos
-            self._lookup_side = initial_cor_pos
+            self._lookup_side = lookup_side
 
     def _init_cor_finder(self):
         cor_finder_cls = self.search_methods[self.method]["class"]

{nabu-2024.2.7 → nabu-2024.2.9}/nabu/pipeline/fullfield/chunked.py

@@ -4,7 +4,7 @@ from math import ceil
 import numpy as np
 from silx.io.url import DataUrl
 
-from ...utils import get_num_threads, remove_items_from_list
+from ...utils import get_num_threads, remove_items_from_list, get_subregion as get_subregion_xy
 from ...resources.logger import LoggerOrPrint
 from ...resources.utils import extract_parameters
 from ...misc.binning import binning as image_binning
@@ -457,7 +457,8 @@ class ChunkedPipeline:
         self.double_flatfield = self.DoubleFlatFieldClass(
             self.radios_shape,
             result_url=result_url,
-            sub_region=self.sub_region[1:],
+            # DoubleFlatField expects sub_region as (start_x, end_x, start_y, end_y)
+            sub_region=get_subregion_xy(self.sub_region[1:][::-1]),
             input_is_mlog=False,
             output_is_mlog=False,
             average_is_on_log=avg_is_on_log,

{nabu-2024.2.7 → nabu-2024.2.9}/nabu/pipeline/fullfield/nabu_config.py

@@ -15,7 +15,7 @@ nabu_config = {
             "type": "advanced",
         },
         "nexus_version": {
-            "default": "1.0",
+            "default": "1.4",
             "help": "Nexus version to use when browsing the HDF5 dataset. Default is 1.0.",
             "validator": float_validator,
             "type": "advanced",

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

@@ -0,0 +1,9 @@
+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()

{nabu-2024.2.7 → nabu-2024.2.9/nabu.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: nabu
-Version: 2024.2.7
+Version: 2024.2.9
 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.7 → nabu-2024.2.9}/nabu.egg-info/SOURCES.txt

@@ -271,6 +271,7 @@ 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.7 → nabu-2024.2.9}/nabu.egg-info/top_level.txt

@@ -1,3 +1,4 @@
 dist
 doc
 nabu
+scripts