nabu 2024.2.1__tar.gz → 2024.2.3__tar.gz

{nabu-2024.2.1/nabu.egg-info → nabu-2024.2.3}/PKG-INFO

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

@@ -1,4 +1,4 @@
-__version__ = "2024.2.1"
+__version__ = "2024.2.3"
 __nabu_modules__ = [
     "app",
     "cuda",

{nabu-2024.2.1 → nabu-2024.2.3}/nabu/pipeline/estimators.py

@@ -89,13 +89,14 @@ def estimate_cor(method, dataset_info, do_flatfield=True, cor_options=None, logg
         estimated_cor = cor_finder.find_cor()
     else:
         composite_options = update_func_kwargs(CompositeCORFinder, cor_options)
-        for what in ["cor_options", "logger"]:
+        for what in ["cor_options", "logger", "do_flatfield"]:
             composite_options.pop(what, None)
         cor_finder = CompositeCORFinder(
             dataset_info,
             cor_options=cor_options,
+            do_flatfield=do_flatfield,
             logger=logger,
-            **composite_options,
+            **composite_options,  # contains take_log
         )
         estimated_cor = cor_finder.find_cor()
     return estimated_cor
@@ -451,6 +452,7 @@ class CompositeCORFinder(CORFinderBase):
         oversampling=4,
         theta_interval=5,
         n_subsampling_y=40,
+        do_flatfield=True,
         take_log=True,
         cor_options=None,
         spike_threshold=0.04,
@@ -458,7 +460,7 @@ class CompositeCORFinder(CORFinderBase):
         norm_order=1,
     ):
         super().__init__(
-            "composite-coarse-to-fine", dataset_info, do_flatfield=True, cor_options=cor_options, logger=logger
+            "composite-coarse-to-fine", dataset_info, do_flatfield=False, cor_options=cor_options, logger=logger
         )
         if norm_order not in [1, 2]:
             raise ValueError(
@@ -535,7 +537,10 @@ class CompositeCORFinder(CORFinderBase):
 
         self.absolute_indices = sorted(self.dataset_info.projections.keys())
 
-        my_flats = self.dataset_info.flats
+        if do_flatfield:
+            my_flats = self.dataset_info.flats
+        else:
+            my_flats = None
 
         if my_flats is not None and len(list(my_flats.keys())):
             self.use_flat = True

{nabu-2024.2.1 → nabu-2024.2.3}/nabu/stitching/config.py

@@ -1038,8 +1038,9 @@ class PreProcessedSingleAxisStitchingConfiguration(SingleAxisStitchingConfigurat
                 config[STITCHING_SECTION].get(ALIGNMENT_AXIS_2_FIELD, AlignmentAxis2.CENTER)
             ),
             pad_mode=config[STITCHING_SECTION].get(PAD_MODE_FIELD, "constant"),
-            duplicate_data=not config[STITCHING_SECTION].get(AVOID_DATA_DUPLICATION_FIELD, False),
-            normalization_by_sample=NormalizationBySample.from_dict(config.get(NORMALIZATION_BY_SAMPLE_SECTION, {})),
+            duplicate_data=not _scalar_or_tuple_to_bool_or_tuple_of_bool(
+                config[STITCHING_SECTION].get(AVOID_DATA_DUPLICATION_FIELD, False)
+            ),
         )
 
 
@@ -1196,7 +1197,9 @@ class PostProcessedSingleAxisStitchingConfiguration(SingleAxisStitchingConfigura
                 config[STITCHING_SECTION].get(ALIGNMENT_AXIS_2_FIELD, AlignmentAxis2.CENTER)
             ),
             pad_mode=config[STITCHING_SECTION].get(PAD_MODE_FIELD, "constant"),
-            duplicate_data=not config[STITCHING_SECTION].get(AVOID_DATA_DUPLICATION_FIELD, False),
+            duplicate_data=not _scalar_or_tuple_to_bool_or_tuple_of_bool(
+                config[STITCHING_SECTION].get(AVOID_DATA_DUPLICATION_FIELD, False)
+            ),
             normalization_by_sample=NormalizationBySample.from_dict(config.get(NORMALIZATION_BY_SAMPLE_SECTION, {})),
         )
 

{nabu-2024.2.1 → nabu-2024.2.3/nabu.egg-info}/PKG-INFO

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

@@ -40,7 +40,6 @@ nabu/app/shrink_dataset.py
 nabu/app/stitching.py
 nabu/app/utils.py
 nabu/app/validator.py
-nabu/app/tests/__init__.py
 nabu/app/tests/test_reduce_dark_flat.py
 nabu/cuda/__init__.py
 nabu/cuda/convolution.py
@@ -272,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.1 → nabu-2024.2.3}/nabu.egg-info/top_level.txt

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

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

@@ -1,10 +0,0 @@
-import pytest
-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()