tomwer 1.3.0a4__py3-none-any.whl → 1.3.0a6__py3-none-any.whl

tomwer/core/process/reconstruction/nabu/nabucommon.py

@@ -66,6 +66,7 @@ from tomwer.core.scan.edfscan import EDFTomoScan
 from tomwer.core.scan.nxtomoscan import NXtomoScan
 from tomwer.core.scan.scanbase import TomwerScanBase
 from tomwer.core.utils.slurm import get_slurm_script_name, is_slurm_available
+from tomwer.core.volume.volumefactory import VolumeFactory
 
 from . import settings, utils
 
@@ -149,8 +150,6 @@ class ResultsLocalRun(ResultsWithStd):
             )
 
         # check all identifiers
-        from tomwer.core.volume.volumefactory import VolumeFactory
-
         def check_identifier(identifier):
             if isinstance(identifier, str):
                 vol = VolumeFactory.create_tomo_object_from_identifier(

tomwer/core/process/reconstruction/nabu/nabuscores.py

@@ -549,7 +549,7 @@ class _ReconstructorMultiCor(_NabuBaseReconstructor):
         }
         return ResultsLocalRun(
             success=not nabu_std_err_has_error(errs),
-            results_identifiers=recons_vol_identifiers,
+            results_identifiers=recons_vol_identifiers.values(),
             std_out=outs,
             std_err=errs,
             config=config_to_dump,  # config_slices,

tomwer/core/process/reconstruction/nabu/utils.py

@@ -260,7 +260,6 @@ def get_multi_cor_recons_volume_identifiers(
         if file_format in ("hdf5", "h5", "hdf"):
             file_path = os.path.join(
                 location,
-                f"{file_prefix}_{cor:.3f}",  # this level is expected to be removed on the future nabu versions
                 f"{file_prefix}_{cor:.3f}_{str(slice_index).zfill(5)}.{file_format}",
             )
             volume = HDF5Volume(

tomwer/core/process/reconstruction/saaxis/saaxis.py

@@ -520,7 +520,10 @@ class SAAxisTask(
                     cors_res, rois = self._post_processing(
                         scan=scan,
                         slice_index=slice_index,
-                        cor_reconstructions=cor_reconstructions,
+                        cor_reconstructions={
+                            cor: recons
+                            for cor, recons in zip(params.cors, cor_reconstructions)
+                        },
                     )
                 except Exception as e:
                     _logger.error(e)

tomwer/version.py

@@ -79,7 +79,7 @@ MAJOR = 1
 MINOR = 3
 MICRO = 0
 RELEV = "alpha"  # <16
-SERIAL = 4  # <16
+SERIAL = 6  # <16
 
 date = __date__
 

{tomwer-1.3.0a4.dist-info → tomwer-1.3.0a6.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: tomwer
-Version: 1.3.0a4
+Version: 1.3.0a6
 Summary: "tomography workflow tools"
 Home-page: https://gitlab.esrf.fr/tomotools/tomwer
 Author: data analysis unit

{tomwer-1.3.0a4.dist-info → tomwer-1.3.0a6.dist-info}/RECORD

@@ -1,4 +1,4 @@
-tomwer-1.3.0a4-py3.11-nspkg.pth,sha256=xeeGR3TjdoVxdFeF6T-zSwZWh6Et--EYuPWu67LxL_c,574
+tomwer-1.3.0a6-py3.11-nspkg.pth,sha256=xeeGR3TjdoVxdFeF6T-zSwZWh6Et--EYuPWu67LxL_c,574
 orangecontrib/tomwer/__init__.py,sha256=B4DXy1gY_wXmNYa2aOfapmJb2mEuCAjoaNEGnpBs70g,148
 orangecontrib/tomwer/state_summary.py,sha256=5_dPzweL3r0ye4ZfJo6IV2ThJI8fQhWoO2ySdJJajj8,1711
 orangecontrib/tomwer/orange/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -224,7 +224,7 @@ orangecontrib/tomwer/widgets/visualization/icons/volumeviewer.svg,sha256=2uT9_px
 tomwer/__init__.py,sha256=82Jp1abyG4UWdGuT4nNU7LxaUV6xxkOte5pIz3w69Do,1745
 tomwer/__main__.py,sha256=65ohoCNpuwo7nvCGM5OeYazVDaD0LoAA3EoOzpoLyms,8878
 tomwer/utils.py,sha256=EgVwJ5CQVjoBvcKNwyVoXv_P4ciI11oxb8fNyy82Lck,8465
-tomwer/version.py,sha256=THhNUCxekjXuJcZeoI_ISVnJDaj5AlLt7YRO_mx6DSo,4386
+tomwer/version.py,sha256=-kWl-UBDVIClDJKvrhUEtgBC20XKyXBkj7X7268j0fY,4386
 tomwer/app/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 tomwer/app/axis.py,sha256=UQNxYpHzxnGdNpkV6sJoO_0tPGCxJkylghwbA7ENsM0,5948
 tomwer/app/canvas.py,sha256=RbQqgE7DuNjv4nGG6BNfnSevQO5_lCl7N71hGcLoxwE,1561
@@ -331,19 +331,19 @@ tomwer/core/process/reconstruction/lamino/tofu.py,sha256=ur3-OchDL1AZ-WP590Sjx_4
 tomwer/core/process/reconstruction/nabu/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 tomwer/core/process/reconstruction/nabu/castvolume.py,sha256=-V0FubAiBEdMPDgp3ovr0dAYeEzwrQbw_W0R3w8P4YQ,10237
 tomwer/core/process/reconstruction/nabu/helical.py,sha256=gauUkoPiShvnvMQrCQXv28g0yLe-GceML5kYMSXmNIg,1997
-tomwer/core/process/reconstruction/nabu/nabucommon.py,sha256=EO4sEQ_BXU7-VqYTeqa2QVgwfcFnzJIGcso0YxpAFXU,24215
-tomwer/core/process/reconstruction/nabu/nabuscores.py,sha256=V3xHOYqiJHAJdnY0DRz8hO1HRSR9wcBRQyM-FZA08Nw,24333
+tomwer/core/process/reconstruction/nabu/nabucommon.py,sha256=gB9-_cpns2trp37QvyRGHrhFlx_wuPKCK70cyXUzc3Y,24206
+tomwer/core/process/reconstruction/nabu/nabuscores.py,sha256=bkdNbKYmxkiNbUZBTKWaPZmdoaJJnKy_PeXPj0_JODY,24342
 tomwer/core/process/reconstruction/nabu/nabuslices.py,sha256=jP074_K2Px_QlOx4gMgwONj8j0LwlrVUBnWvzGZv7QU,36802
 tomwer/core/process/reconstruction/nabu/nabuvolume.py,sha256=0Gkkee35PwlvGAukVRIlQJKoz0dXcmuwVKOxEnXECzw,21498
 tomwer/core/process/reconstruction/nabu/settings.py,sha256=JpHKf0smiXeWC8i9Mj7h3g67teJ3Gqycd-Uwg2yzGOQ,2279
 tomwer/core/process/reconstruction/nabu/target.py,sha256=_Z4gViprjR3Vm4KASqsASStLA9GM1wTyoi3Pg0PUSeg,1481
-tomwer/core/process/reconstruction/nabu/utils.py,sha256=znQUJO5c0-Xw5svuPCs4iPEJhvIugCvVum_XM9RC_bk,17198
+tomwer/core/process/reconstruction/nabu/utils.py,sha256=EIgniS7MAqJEmWBiGG5xrQr-xJ25yN0RcdCSMCMrzR4,17086
 tomwer/core/process/reconstruction/normalization/__init__.py,sha256=TDtATpMVFkEOT93wLXLpW0A_TOeiQDiM7AWAqX4FIB0,119
 tomwer/core/process/reconstruction/normalization/normalization.py,sha256=G-eAZIct47RvzvHNMbKsG4Dt58vTSKhvH-NnIMzxzOs,13210
 tomwer/core/process/reconstruction/normalization/params.py,sha256=porWC6G5lQWF-4JB03B56uGmuMxjx3u0ZMums-Bh2p8,4790
 tomwer/core/process/reconstruction/saaxis/__init__.py,sha256=ZEOu0nZWlMyBoX_A64yeEjVflE5x4iWSpYLTgs45g0o,137
 tomwer/core/process/reconstruction/saaxis/params.py,sha256=dvBHxfSs3ffUk22drLAlcmAJJhaC42qV9aW45kC1ITA,5583
-tomwer/core/process/reconstruction/saaxis/saaxis.py,sha256=oAFxs7cFblyt01KBaFtpg7njkNGwbMOzx7Y3z4Oz6qI,31900
+tomwer/core/process/reconstruction/saaxis/saaxis.py,sha256=x0aHIONNJ_wZpTpv1j9-luUfgUCgolEFg0QWKZWX8Rc,32033
 tomwer/core/process/reconstruction/sadeltabeta/__init__.py,sha256=WDYJxfqPnz5IeLPCX5W8UEO8-Z-NSH79gkqp2DZn1bM,162
 tomwer/core/process/reconstruction/sadeltabeta/params.py,sha256=4UrLpA-6Wwfof9Jl1fcGTd5wrDzDB86GX4vo_PEgj74,4043
 tomwer/core/process/reconstruction/sadeltabeta/sadeltabeta.py,sha256=KWzWzLm3hBbmBwGwpPP7Whhwfj0PW7V40hKFfjlmfUU,30688
@@ -816,10 +816,10 @@ tomwer/tests/test_utils.py,sha256=D0rNDSK6csEOYBY_7gD-4A3jp8rYAm8L1_Xg34A9I2s,30
 tomwer/tests/utils.py,sha256=RAXx5A99WD4Vyuv_wjHBdr-Xu7UiThHRKw2eiB5GX10,107
 tomwer/third_part/WaitingOverlay.py,sha256=GnqiytcJDp_24Cmz_2nZAP5HfpL3Yh7AzR2ATIusGsg,3906
 tomwer/third_part/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-tomwer-1.3.0a4.dist-info/LICENSE,sha256=yR_hIZ1MfDh9x2_s23uFqBH7m5DgrBl9nJKkE37YChM,1877
-tomwer-1.3.0a4.dist-info/METADATA,sha256=eZYYjSKtzz2J5LrMezuXOVMZpeVWJGA-QpbI94YX96k,11426
-tomwer-1.3.0a4.dist-info/WHEEL,sha256=pkctZYzUS4AYVn6dJ-7367OJZivF2e8RA9b_ZBjif18,92
-tomwer-1.3.0a4.dist-info/entry_points.txt,sha256=fIcDnCxjgwzfIylLYhUsFyiNZjZMxsfRQBxi4f-cJg8,440
-tomwer-1.3.0a4.dist-info/namespace_packages.txt,sha256=Iut-JTfT11SZHHm77_ZeszD7pZDWXcTweCbvrJpqDyQ,14
-tomwer-1.3.0a4.dist-info/top_level.txt,sha256=Yz5zKh0FPiImtzHYcPuztG1AO8-6KEpUWgoChGbA0Ys,21
-tomwer-1.3.0a4.dist-info/RECORD,,
+tomwer-1.3.0a6.dist-info/LICENSE,sha256=yR_hIZ1MfDh9x2_s23uFqBH7m5DgrBl9nJKkE37YChM,1877
+tomwer-1.3.0a6.dist-info/METADATA,sha256=hLpVoLn8zOdUnSjKamJJkLZY_eocjY9BIjXrGScdLI0,11426
+tomwer-1.3.0a6.dist-info/WHEEL,sha256=pkctZYzUS4AYVn6dJ-7367OJZivF2e8RA9b_ZBjif18,92
+tomwer-1.3.0a6.dist-info/entry_points.txt,sha256=fIcDnCxjgwzfIylLYhUsFyiNZjZMxsfRQBxi4f-cJg8,440
+tomwer-1.3.0a6.dist-info/namespace_packages.txt,sha256=Iut-JTfT11SZHHm77_ZeszD7pZDWXcTweCbvrJpqDyQ,14
+tomwer-1.3.0a6.dist-info/top_level.txt,sha256=Yz5zKh0FPiImtzHYcPuztG1AO8-6KEpUWgoChGbA0Ys,21
+tomwer-1.3.0a6.dist-info/RECORD,,