nabu 2024.2.0rc2__py3-none-any.whl → 2024.2.0rc3__py3-none-any.whl

nabu/__init__.py

@@ -1,4 +1,4 @@
-__version__ = "2024.2.0-rc2"
+__version__ = "2024.2.0-rc3"
 __nabu_modules__ = [
     "app",
     "cuda",

nabu/resources/dataset_analyzer.py

@@ -302,7 +302,7 @@ class EDFDatasetAnalyzer(DatasetAnalyzer):
         return np.deg2rad(self.dataset_scanner.rotation_angle())
 
     def get_reduced_flats(self, **reader_kwargs):
-        if self.flats in [None, {}]:
+        if self.raw_flats in [None, {}]:
             raise FileNotFoundError("No reduced flat ('refHST') found in %s" % self.location)
         # A few notes:
         # (1) In principle we could do the reduction (mean/median) from raw frames (ref_xxxx_yyyy)
@@ -311,15 +311,15 @@ class EDFDatasetAnalyzer(DatasetAnalyzer):
         #  (eg. subsampling, binning, distortion correction...)
         # (3) The following spawns one reader instance per file, which is not elegant,
         #   but in principle there are typically 1-2 reduced flats in a scan
-        readers = {k: EDFStackReader([self.flats[k].file_path()], **reader_kwargs) for k in self.flats.keys()}
-        return {k: readers[k].load_data()[0] for k in self.flats.keys()}
+        readers = {k: EDFStackReader([self.raw_flats[k].file_path()], **reader_kwargs) for k in self.raw_flats.keys()}
+        return {k: readers[k].load_data()[0] for k in self.raw_flats.keys()}
 
     def get_reduced_darks(self, **reader_kwargs):
         # See notes in get_reduced_flats() above
-        if self.darks in [None, {}]:
+        if self.raw_darks in [None, {}]:
             raise FileNotFoundError("No reduced dark ('darkend.edf' or 'dark.edf') found in %s" % self.location)
-        readers = {k: EDFStackReader([self.darks[k].file_path()], **reader_kwargs) for k in self.darks.keys()}
-        return {k: readers[k].load_data()[0] for k in self.darks.keys()}
+        readers = {k: EDFStackReader([self.raw_darks[k].file_path()], **reader_kwargs) for k in self.raw_darks.keys()}
+        return {k: readers[k].load_data()[0] for k in self.raw_darks.keys()}
 
     @property
     def files(self):
@@ -365,10 +365,10 @@ class HDF5DatasetAnalyzer(DatasetAnalyzer):
     def _get_dataset_hdf5_url(self):
         if len(self.projections) > 0:
             frames_to_take = self.projections
-        elif len(self.flats) > 0:
-            frames_to_take = self.flats
-        elif len(self.darks) > 0:
-            frames_to_take = self.darks
+        elif len(self.raw_flats) > 0:
+            frames_to_take = self.raw_flats
+        elif len(self.raw_darks) > 0:
+            frames_to_take = self.raw_darks
         else:
             raise ValueError("No projections, no flats and no darks ?!")
         first_proj_idx = sorted(frames_to_take.keys())[0]

{nabu-2024.2.0rc2.dist-info → nabu-2024.2.0rc3.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: nabu
-Version: 2024.2.0rc2
+Version: 2024.2.0rc3
 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>
@@ -53,7 +53,7 @@ Requires-Dist: numpy <2,>1.9.0
 Requires-Dist: scipy
 Requires-Dist: h5py >=3.0
 Requires-Dist: silx >=0.15.0
-Requires-Dist: tomoscan >=2.1.0a14
+Requires-Dist: tomoscan >=2.1.0
 Requires-Dist: psutil
 Requires-Dist: pytest
 Requires-Dist: tifffile

{nabu-2024.2.0rc2.dist-info → nabu-2024.2.0rc3.dist-info}/RECORD

@@ -1,7 +1,7 @@
 doc/conf.py,sha256=3xtCarCHrXPr50GbeRDuH-o3Jzojw7mpr7vpGfZPLAE,3787
 doc/create_conf_doc.py,sha256=IVOdP70KvbW9WS_UQu3Iyd0YfS60E2fJ5IDtQ_s4cDw,1143
 doc/get_mathjax.py,sha256=VIvKRCdDuF2VoY8JD3mSey9XX13AZMmwTJBHdt1tUs4,1012
-nabu/__init__.py,sha256=GU7YEox3KaUtQMTS4mUVSVO6IWhXqQ_Ad6wWGkVsDyk,274
+nabu/__init__.py,sha256=nj3TOWBu8oPUoBNHU2H_cND8gzxtol3hSVTR0ewGpTM,274
 nabu/tests.py,sha256=cew9OY2uTyncHI_HM32W8CP6B1GTGKaOW65XtMEqs7o,1417
 nabu/testutils.py,sha256=VkSL9tbY0XEH49Z5OjDFFhzkSxrCv4UIuvSVFgegSUY,7632
 nabu/utils.py,sha256=V1B_sD54XGNKn5pORa2yNCATyswOzybey3sv8BuIYWY,26355
@@ -250,7 +250,7 @@ nabu/reconstruction/tests/test_reconstructor.py,sha256=3p2Wk_OqgZqkNOkhK_NJWlHkO
 nabu/reconstruction/tests/test_sino_normalization.py,sha256=fGv5Dlidxgm8ZC70Nk6oqVgpY2jzOW9NJaGlo44IJOo,3692
 nabu/resources/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 nabu/resources/cor.py,sha256=-mcrTbj3G7o4PP5E_gIRo2j6_-ADmMkkOc_0CyQv84c,170
-nabu/resources/dataset_analyzer.py,sha256=_M7EQcRgldhtGeXCsOUNdx6M1nlLRWW8rKPWMB-lfN0,18518
+nabu/resources/dataset_analyzer.py,sha256=I79-QEFrWG7Zc6O6134sLfNpj3_VmAei-1Io-zuPCts,18566
 nabu/resources/gpu.py,sha256=GgpMb5umRQAUsEDEAefb4wSA5qm4JSMhkWmCEpW3X9g,5702
 nabu/resources/logger.py,sha256=-lOzhN_sU4R3BIfC69aMj2O8S_ocsvXsmwkhWlcxVEc,3758
 nabu/resources/nxflatfield.py,sha256=XlhLYj1TmSQ4s36W48kn0lNTvqXlFCuZxKHfTveltow,9225
@@ -311,9 +311,9 @@ nabu/thirdparty/pore3d_deringer_munch.py,sha256=o4bisnFc-wMjuohWBT8wgWmfNehPQGtC
 nabu/thirdparty/tomocupy_remove_stripe.py,sha256=Khe4zFf0kRzu65Yxnvq58gt1ljOztqJGdMDhVAiM7lM,24363
 nabu/thirdparty/tomopy_phase.py,sha256=hK4oPpkogLOhv23XzzEXQY2u3r8fJvASY_bINVs6ERE,8634
 nabu/thirdparty/tomwer_load_flats_darks.py,sha256=ZNoVAinUb_wGYbfvs_4BVnWsjsQmNxSvCh1bWhR2WWg,5611
-nabu-2024.2.0rc2.dist-info/LICENSE,sha256=1eAIPSnEsnSFNUODnLtNtQTs76exG3ZxJ1DJR6zoUBA,1066
-nabu-2024.2.0rc2.dist-info/METADATA,sha256=nJCwt8-vLEu5ZeqjsatPynMDbqdIILum0iPK23dEqD0,5544
-nabu-2024.2.0rc2.dist-info/WHEEL,sha256=5sUXSg9e4bi7lTLOHcm6QEYwO5TIF1TNbTSVFVjcJcc,92
-nabu-2024.2.0rc2.dist-info/entry_points.txt,sha256=cJKGkBeykVL7uK3E4R0RLRqMXifTL2qdO573syPAvJc,1288
-nabu-2024.2.0rc2.dist-info/top_level.txt,sha256=fsm_N3eXLRZk2QXF9OSKPNDPFXOz8FAQjHh5avT3dok,9
-nabu-2024.2.0rc2.dist-info/RECORD,,
+nabu-2024.2.0rc3.dist-info/LICENSE,sha256=1eAIPSnEsnSFNUODnLtNtQTs76exG3ZxJ1DJR6zoUBA,1066
+nabu-2024.2.0rc3.dist-info/METADATA,sha256=DtswpBFRHCRI-w--UzSZ9Mp1Zc8R-xBjBfcCYRzCJPs,5541
+nabu-2024.2.0rc3.dist-info/WHEEL,sha256=5sUXSg9e4bi7lTLOHcm6QEYwO5TIF1TNbTSVFVjcJcc,92
+nabu-2024.2.0rc3.dist-info/entry_points.txt,sha256=cJKGkBeykVL7uK3E4R0RLRqMXifTL2qdO573syPAvJc,1288
+nabu-2024.2.0rc3.dist-info/top_level.txt,sha256=fsm_N3eXLRZk2QXF9OSKPNDPFXOz8FAQjHh5avT3dok,9
+nabu-2024.2.0rc3.dist-info/RECORD,,