nabu 2024.1.9__tar.gz → 2024.1.10__tar.gz

{nabu-2024.1.9/nabu.egg-info → nabu-2024.1.10}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: nabu
-Version: 2024.1.9
+Version: 2024.1.10
 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>
@@ -48,9 +48,29 @@ Classifier: Topic :: Scientific/Engineering :: Physics
 Classifier: Topic :: Scientific/Engineering :: Medical Science Apps.
 Requires-Python: >=3.7
 Description-Content-Type: text/markdown
+License-File: LICENSE
+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.0.4
+Requires-Dist: psutil
+Requires-Dist: pytest
+Requires-Dist: tifffile
 Provides-Extra: full
+Requires-Dist: scikit-image; extra == "full"
+Requires-Dist: PyWavelets; extra == "full"
+Requires-Dist: glymur; 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"
+Requires-Dist: pyvkfft; extra == "full"
 Provides-Extra: doc
-License-File: LICENSE
+Requires-Dist: sphinx; extra == "doc"
+Requires-Dist: cloud_sptheme; extra == "doc"
+Requires-Dist: myst-parser; extra == "doc"
+Requires-Dist: nbsphinx; extra == "doc"
 
 # Nabu
 

{nabu-2024.1.9 → nabu-2024.1.10}/nabu/__init__.py

@@ -1,4 +1,4 @@
-__version__ = "2024.1.9"
+__version__ = "2024.1.10"
 __nabu_modules__ = [
     "app",
     "cuda",

{nabu-2024.1.9 → nabu-2024.1.10}/nabu/stitching/z_stitching.py

@@ -1191,12 +1191,30 @@ class PreProcessZStitcher(ZStitcher):
         # handle sample
         n_frames = n_proj
         if False not in [isinstance(scan, NXtomoScan) for scan in self.z_serie]:
+
+            def get_sample_translation_for_projs(scan: NXtomoScan, attr):
+                values = numpy.array(getattr(scan, attr))
+                mask = scan.image_key_control == ImageKey.PROJECTION.value
+                return values[mask]
+
             # we consider the new x, y and z position to be at the center of the one created
-            x_translation = [scan.x_translation for scan in self.z_serie if scan.x_translation is not None]
+            x_translation = [
+                get_sample_translation_for_projs(scan, "x_translation")
+                for scan in self.z_serie
+                if scan.x_translation is not None
+            ]
             nx_tomo.sample.x_translation = [numpy.asarray(x_translation).mean()] * n_frames
-            y_translation = [scan.y_translation for scan in self.z_serie if scan.y_translation is not None]
+            y_translation = [
+                get_sample_translation_for_projs(scan, "y_translation")
+                for scan in self.z_serie
+                if scan.y_translation is not None
+            ]
             nx_tomo.sample.y_translation = [numpy.asarray(y_translation).mean()] * n_frames
-            z_translation = [scan.z_translation for scan in self.z_serie if scan.z_translation is not None]
+            z_translation = [
+                get_sample_translation_for_projs(scan, "z_translation")
+                for scan in self.z_serie
+                if scan.z_translation is not None
+            ]
             nx_tomo.sample.z_translation = [numpy.asarray(z_translation).mean()] * n_frames
 
             nx_tomo.sample.name = self.z_serie[0].sample_name

{nabu-2024.1.9 → nabu-2024.1.10/nabu.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: nabu
-Version: 2024.1.9
+Version: 2024.1.10
 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>
@@ -48,9 +48,29 @@ Classifier: Topic :: Scientific/Engineering :: Physics
 Classifier: Topic :: Scientific/Engineering :: Medical Science Apps.
 Requires-Python: >=3.7
 Description-Content-Type: text/markdown
+License-File: LICENSE
+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.0.4
+Requires-Dist: psutil
+Requires-Dist: pytest
+Requires-Dist: tifffile
 Provides-Extra: full
+Requires-Dist: scikit-image; extra == "full"
+Requires-Dist: PyWavelets; extra == "full"
+Requires-Dist: glymur; 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"
+Requires-Dist: pyvkfft; extra == "full"
 Provides-Extra: doc
-License-File: LICENSE
+Requires-Dist: sphinx; extra == "doc"
+Requires-Dist: cloud_sptheme; extra == "doc"
+Requires-Dist: myst-parser; extra == "doc"
+Requires-Dist: nbsphinx; extra == "doc"
 
 # Nabu
 

{nabu-2024.1.9 → nabu-2024.1.10}/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

{nabu-2024.1.9 → nabu-2024.1.10}/nabu.egg-info/top_level.txt

@@ -1,5 +1,3 @@
-build
 dist
 doc
 nabu
-scripts