nabu 2024.1.9__py3-none-any.whl → 2024.1.10__py3-none-any.whl

nabu/__init__.py

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

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.dist-info → nabu-2024.1.10.dist-info}/METADATA

@@ -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>
@@ -49,28 +49,28 @@ 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: 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: 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: doc
-Requires-Dist: sphinx ; extra == 'doc'
-Requires-Dist: cloud-sptheme ; extra == 'doc'
-Requires-Dist: myst-parser ; extra == 'doc'
-Requires-Dist: nbsphinx ; extra == 'doc'
+Requires-Dist: sphinx; extra == "doc"
+Requires-Dist: cloud-sptheme; extra == "doc"
+Requires-Dist: myst-parser; extra == "doc"
+Requires-Dist: nbsphinx; extra == "doc"
 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'
+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"
 
 # Nabu
 

{nabu-2024.1.9.dist-info → nabu-2024.1.10.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=hocwYzVbHilZVlwb2HfL232A1uxBLouRbjQWv0nq_Ng,270
+nabu/__init__.py,sha256=4kysNldwr4sj73bjmoKdGzQ-6tc8gz-0FLrOb1apyLk,271
 nabu/tests.py,sha256=cew9OY2uTyncHI_HM32W8CP6B1GTGKaOW65XtMEqs7o,1417
 nabu/testutils.py,sha256=qqtGgkIhpOpXhgeoXlqCb91Rx-JlI4ALaDF6nt8YRRk,13298
 nabu/utils.py,sha256=w-xfRb6TFQpS-tao6nlvfmr962pmeec-WH1GltSUCrk,23767
@@ -31,7 +31,6 @@ nabu/app/shrink_dataset.py,sha256=P9dorO0Q-gPAWgSHyZi3XQp4jkMTJacDYzNvJY4oh98,35
 nabu/app/stitching.py,sha256=Ibp1oVokLVMz-VX762j1C0E88Di0YJvRt-b8NjGoe7g,3310
 nabu/app/utils.py,sha256=XUBRWDmth4i3BZHd27rfarFAUP7OEcsMeVmDJ6T4EXA,1178
 nabu/app/validator.py,sha256=IR-DcUV5h1Fc5CChBfBIaglrGpfKNICX7tGirAroMiw,3368
-nabu/app/tests/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 nabu/app/tests/test_reduce_dark_flat.py,sha256=T-_zyzD0-f2c5Z-tlzmRF5p3vPtyL2RFb-D5fIYYEoM,2641
 nabu/cuda/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 nabu/cuda/convolution.py,sha256=n8KsJ7IZdPOs_K5QZC6qblnOvIKYwxtdt03oNa0GiMU,241
@@ -272,7 +271,7 @@ nabu/stitching/overlap.py,sha256=YbPon4_n4lT678F1aFSHx-ButcSYYqlBFjDqfNA77T4,156
 nabu/stitching/sample_normalization.py,sha256=_radin_wxnuD3MMmZNAOKA__aPa2z3ss4TFbZeocpXc,2069
 nabu/stitching/slurm_utils.py,sha256=sZ-VQPh_YlJ1Lkh7ap8qxII0rBpZryMyoxE5Xn557t8,8906
 nabu/stitching/utils.py,sha256=kMn2JEMDhcBQMweSlM0rUd-037H7iNUURTFMhXOTzC8,23651
-nabu/stitching/z_stitching.py,sha256=_DnPn4einJgzjqYu4u-LSwLAOoDgp5Jdu7iTYdsx9bw,103399
+nabu/stitching/z_stitching.py,sha256=E7qRRkayyAoJOAu94eIziVVLdz_6ecoBe9u1twbaVH4,103941
 nabu/stitching/tests/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 nabu/stitching/tests/test_alignment.py,sha256=MACak1ILOr8nRKeT0mWfMd-ZvhCl3SWjjcp6GjRbITc,2735
 nabu/stitching/tests/test_config.py,sha256=ttWuVB9Y_MM3_wGdKbcbYi_PG3vN87cL7o5zKsMzn9g,8490
@@ -288,9 +287,9 @@ nabu/thirdparty/pore3d_deringer_munch.py,sha256=o4bisnFc-wMjuohWBT8wgWmfNehPQGtC
 nabu/thirdparty/tomocupy_remove_stripe.py,sha256=VgXHr2tzTAAGZix5pwhFfbPxj4tt3yXBcjCPNQSLPAg,22810
 nabu/thirdparty/tomopy_phase.py,sha256=hK4oPpkogLOhv23XzzEXQY2u3r8fJvASY_bINVs6ERE,8634
 nabu/thirdparty/tomwer_load_flats_darks.py,sha256=ZNoVAinUb_wGYbfvs_4BVnWsjsQmNxSvCh1bWhR2WWg,5611
-nabu-2024.1.9.dist-info/LICENSE,sha256=1eAIPSnEsnSFNUODnLtNtQTs76exG3ZxJ1DJR6zoUBA,1066
-nabu-2024.1.9.dist-info/METADATA,sha256=SE80zwpzgCSLc4Fsw_DNJtDcUs8_74dQTjrACHcQjkE,5237
-nabu-2024.1.9.dist-info/WHEEL,sha256=5sUXSg9e4bi7lTLOHcm6QEYwO5TIF1TNbTSVFVjcJcc,92
-nabu-2024.1.9.dist-info/entry_points.txt,sha256=cJKGkBeykVL7uK3E4R0RLRqMXifTL2qdO573syPAvJc,1288
-nabu-2024.1.9.dist-info/top_level.txt,sha256=fsm_N3eXLRZk2QXF9OSKPNDPFXOz8FAQjHh5avT3dok,9
-nabu-2024.1.9.dist-info/RECORD,,
+nabu-2024.1.10.dist-info/LICENSE,sha256=1eAIPSnEsnSFNUODnLtNtQTs76exG3ZxJ1DJR6zoUBA,1066
+nabu-2024.1.10.dist-info/METADATA,sha256=AlQVC7OyK98VQa34vZGMJZLDz0w-Ho24nUOaTpucrvo,5220
+nabu-2024.1.10.dist-info/WHEEL,sha256=R06PA3UVYHThwHvxuRWMqaGcr-PuniXahwjmQRFMEkY,91
+nabu-2024.1.10.dist-info/entry_points.txt,sha256=cJKGkBeykVL7uK3E4R0RLRqMXifTL2qdO573syPAvJc,1288
+nabu-2024.1.10.dist-info/top_level.txt,sha256=fsm_N3eXLRZk2QXF9OSKPNDPFXOz8FAQjHh5avT3dok,9
+nabu-2024.1.10.dist-info/RECORD,,

{nabu-2024.1.9.dist-info → nabu-2024.1.10.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: bdist_wheel (0.41.1)
+Generator: setuptools (75.5.0)
 Root-Is-Purelib: true
 Tag: py3-none-any