tomwer 1.4.7__py3-none-any.whl → 1.4.8__py3-none-any.whl

orangecontrib/tomwer/widgets/reconstruction/CastNabuVolumeOW.py

@@ -13,6 +13,9 @@ from tomwer.core.cluster.cluster import SlurmClusterConfiguration
 from tomwer.core.futureobject import FutureTomwerObject
 from tomwer.core.scan.scanbase import TomwerScanBase
 from tomwer.core.volume.volumebase import TomwerVolumeBase
+from tomwer.core.process.drac.processeddataset import (
+    DracReconstructedVolumeDataset,
+)
 from tomwer.gui.reconstruction.nabu.castvolume import CastVolumeWidget
 from tomwer.gui.utils.qt_utils import block_signals
 
@@ -101,6 +104,11 @@ class CastNabuVolumeOW(WidgetLongProcessing, SuperviseOW):
             type=FutureTomwerObject,
             doc="future object (process remotely)",
         )
+        data_portal_processed_datasets = Output(
+            name="data_portal_processed_datasets",
+            type=tuple,
+            doc="data portal processed data to be saved",
+        )
 
     def __init__(self, parent=None):
         """ """
@@ -193,11 +201,28 @@ class CastNabuVolumeOW(WidgetLongProcessing, SuperviseOW):
         if future_tomo_obj is not None:
             self.Outputs.future_tomo_obj.send(future_tomo_obj)
         if obj is not None:
+            scan = None
             if isinstance(obj, TomwerScanBase):
+                # case the input object was a scan (expected)
                 self.Outputs.data.send(obj)
+                scan = obj
             elif isinstance(obj, TomwerVolumeBase):
+                # case the input object was a volume
                 self.Outputs.volume.send(obj)
             # for now we store a cast_volume to the object but this is not very well design.
             # I guess this will be removed once we move to ewoks or we need to redesign the stack approach
             if obj.cast_volume is not None:
+                assert isinstance(obj.cast_volume, TomwerVolumeBase)
                 self.Outputs.cast_volume.send(obj.cast_volume)
+
+                if scan is not None:
+                    # case the input object was a scan and we have succeeded to cast the volume
+                    # then we can publish to the data portal
+                    icatReconstructedDataset = DracReconstructedVolumeDataset(
+                        tomo_obj=obj.cast_volume,
+                        source_scan=scan,
+                    )
+
+                    self.Outputs.data_portal_processed_datasets.send(
+                        (icatReconstructedDataset,)
+                    )

tomwer/core/process/drac/processeddataset.py

@@ -10,6 +10,9 @@ from tomwer.core.process.reconstruction.nabu.plane import NabuPlane
 from tomwer.core.process.reconstruction.output import (
     PROCESS_FOLDER_RECONSTRUCTED_VOLUMES,
 )
+from tomwer.core.process.reconstruction.output import (
+    PROCESS_FOLDER_CAST_VOLUME,
+)
 
 
 __all__ = ["DracReconstructedVolumeDataset"]
@@ -145,3 +148,14 @@ class DracReconstructedVolumeDataset(DracDatasetBase):
             axis_folder,
             f"{basename}_capture_{axis.value}_{str(slice_index).zfill(6)}",
         )
+
+
+class DracCastReconstructedVolume(DracReconstructedVolumeDataset):
+    """
+    Class to associate casted - reconstructed volume(s) to an drac (processed) dataset
+    """
+
+    @property
+    def dataset_name(self) -> str:
+        """name to give to the drac (processed) dataset."""
+        return PROCESS_FOLDER_CAST_VOLUME

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

@@ -28,11 +28,17 @@ from tomwer.core.utils.slurm import get_slurm_script_name
 from tomwer.core.utils.volumeutils import volume_identifier_to_volume
 from tomwer.core.volume.volumebase import TomwerVolumeBase
 from tomwer.core.volume.volumefactory import VolumeFactory
+from tomwer.core.process.drac.processeddataset import (
+    DracReconstructedVolumeDataset,
+)
 
 _logger = logging.getLogger(__name__)
 
+CAST_VOLUME_WORKING_SUB_DIRECTORY = "cast_volume"
 
-DEFAULT_OUTPUT_DIR = "{volume_data_parent_folder}/cast_volume"
+DEFAULT_OUTPUT_DIR = (
+    "{volume_data_parent_folder}" f"/{CAST_VOLUME_WORKING_SUB_DIRECTORY}"
+)
 
 
 class CastVolumeTask(
@@ -46,6 +52,7 @@ class CastVolumeTask(
     output_names=(
         "volume",
         "future_tomo_obj",
+        "data_portal_processed_datasets",
     ),
 ):
     def __init__(
@@ -176,6 +183,7 @@ class CastVolumeTask(
                 scan.cast_volume = output_volume.get_identifier()
             else:
                 input_volume.cast_volume = output_volume.get_identifier()
+            self.outputs.data_portal_processed_datasets = tuple()
         # run volume cast remotely
         else:
 
@@ -230,6 +238,14 @@ class CastVolumeTask(
             )
             self.outputs.volume = output_volume
 
+            if scan is not None:
+                drac_reconstructed_dataset = DracReconstructedVolumeDataset(
+                    tomo_obj=output_volume,
+                    source_scan=scan,
+                )
+                self.outputs.data_portal_processed_datasets = (
+                    drac_reconstructed_dataset,
+                )
             # for now at the task level we consider this is succeed if it has been submitted
             ProcessManager().notify_dataset_state(
                 dataset=scan or input_volume,

tomwer/core/process/reconstruction/output.py

@@ -16,6 +16,8 @@ PROCESS_FOLDER_RECONSTRUCTED_VOLUMES = "reconstructed_volumes"
 
 PROCESS_FOLDER_RECONSTRUCTED_SLICES = "reconstructed_slices"
 
+PROCESS_FOLDER_CAST_VOLUME = "cast_volume"
+
 
 class NabuOutputFileFormat(_Enum):
     TIFF = "tiff"

tomwer/version.py

@@ -77,7 +77,7 @@ RELEASE_LEVEL_VALUE = {
 
 MAJOR = 1
 MINOR = 4
-MICRO = 7
+MICRO = 8
 RELEV = "final"  # <16
 SERIAL = 0  # <16
 

{tomwer-1.4.7.dist-info → tomwer-1.4.8.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: tomwer
-Version: 1.4.7
+Version: 1.4.8
 Summary: "tomography workflow tools"
 Home-page: https://gitlab.esrf.fr/tomotools/tomwer
 Author: Henri Payno, Pierre Paleo, Pierre-Olivier Autran, Jérôme Lesaint, Alessandro Mirone

{tomwer-1.4.7.dist-info → tomwer-1.4.8.dist-info}/RECORD

@@ -148,7 +148,7 @@ orangecontrib/tomwer/widgets/other/icons/hub.png,sha256=wnKSaxw2WnBkSQjI86aLZfdm
 orangecontrib/tomwer/widgets/other/icons/hub.svg,sha256=9EYoBKY-P-cO17nM48OPA9VDZSCbyGtrMRc80BGHflk,3735
 orangecontrib/tomwer/widgets/other/tests/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 orangecontrib/tomwer/widgets/reconstruction/AxisOW.py,sha256=Qz6r34NdNgBvn-UwbIhPQDDCgtlXa_rSLnCEIuI_mrQ,20067
-orangecontrib/tomwer/widgets/reconstruction/CastNabuVolumeOW.py,sha256=E9hTJH_WfMsbOpKsGworVkqc16kWIRL1ajZbpnT_IAI,7614
+orangecontrib/tomwer/widgets/reconstruction/CastNabuVolumeOW.py,sha256=sqpWF769TJ07ApEMqdz0BUWiXoKnZ8k2Fg1yfBaqdIc,8668
 orangecontrib/tomwer/widgets/reconstruction/DarkRefAndCopyOW.py,sha256=flRgeOXimjzKEtL6h-0hwaa04G-BqMydv0Ju5r0Reao,9696
 orangecontrib/tomwer/widgets/reconstruction/NabuHelicalPrepareWeightsDoubleOW.py,sha256=NjMC0BEmPhDZ795Q-yyL81-hluAyGE8MRiq8xMdqAqY,6233
 orangecontrib/tomwer/widgets/reconstruction/NabuOW.py,sha256=UvCNwpAtQ1AdCl5kUw13QsKxesIDV8SIjIW9cWCXIMc,9946
@@ -219,7 +219,7 @@ orangecontrib/tomwer/widgets/visualization/tests/__init__.py,sha256=47DEQpj8HBSa
 tomwer/__init__.py,sha256=cMIyH-uRxpa9WVnAuWjiBD7k9TK57WO21RzP_S-Mb8I,460
 tomwer/__main__.py,sha256=7tCADiS4u7k1PCxFhlRAcYSIOpxQTGUTx8sCEQ-hi1E,8707
 tomwer/utils.py,sha256=7h7dEgKAEUmQ43jkULvC1B9Adl55nkCty-SEKUKCl4U,7008
-tomwer/version.py,sha256=kSCzrMOEuSMZFSQbR90fj1YYaNmCYltkc0D3FMs6UT0,4386
+tomwer/version.py,sha256=9eVN2X5pHYpA_0DB79D32-UlghmotJxh_g2O_lUlL70,4386
 tomwer/app/__init__.py,sha256=h1FKED7Tw5f99yikygt7ruXsdrxQhcJxO7kagLGxhJg,84
 tomwer/app/axis.py,sha256=lB-IZx1o6KTWLIelITvYCIu2flFTB9NhuIfD2MhUZZA,5826
 tomwer/app/canvas.py,sha256=y8rYOiwmv6ug7JcjgkOzEiGQnNXjKWNNmKofT0n8TFg,1538
@@ -303,7 +303,7 @@ tomwer/core/process/drac/binning.py,sha256=uWIyAzQMhUjh5d74DUnbDgjRv4zMZtdbi6U0W
 tomwer/core/process/drac/dracbase.py,sha256=_EYcZscvNpLpSc6cuy6nmNKYWo2C8u6Ke_oXrLjOBiM,5639
 tomwer/core/process/drac/gallery.py,sha256=bQosh4xbTWj8Vn_vqepyJ1QMfLcVGxh7uPJ0ysLtx5o,4790
 tomwer/core/process/drac/output.py,sha256=ySwvMigBVvtQqrkG67jq384uevVKeOX-Vd8E2urs_Lg,235
-tomwer/core/process/drac/processeddataset.py,sha256=yWFfb7-CeYwLm1g8hYt7zVRgV_XNHXzfONxYPW8me0A,5425
+tomwer/core/process/drac/processeddataset.py,sha256=pp4uW249k7qFb1q1yZCtU1fbjoD9Y9onL5w3mOcxrWU,5839
 tomwer/core/process/drac/publish.py,sha256=S6UZ39Mv0I9A5bKQig5zohFenRPonu-oxK6DEUeAvD4,3845
 tomwer/core/process/drac/rawdataset.py,sha256=mB4sNTM1rx46n5whjIlY4xq1gz4_rbaS7yAS3QE2iT0,5175
 tomwer/core/process/drac/tests/test_gallery.py,sha256=WZaK42Y5S8sNrzgTToqctYvle8Xc1YBs3u6moei9ZMc,2319
@@ -316,7 +316,7 @@ tomwer/core/process/edit/nxtomoeditor.py,sha256=HUYInTVIUbqVtFXQKMCOpQ-tvgFz5w3U
 tomwer/core/process/edit/tests/test_darkflatpatch.py,sha256=0QOjUgiYkjuWDZvI5pkuiViK4HUJA5E2sXF5LXtf_vY,9366
 tomwer/core/process/edit/tests/test_imagekey_editor.py,sha256=ft-xDMRk6CRs7DehNEnh1uJ9gLKJ-SxZAb0GmsLek0w,2345
 tomwer/core/process/reconstruction/__init__.py,sha256=G_vePtIyh1WlXtcmOyQI3nRsP-F0bsaDSdLWHC0bVzo,159
-tomwer/core/process/reconstruction/output.py,sha256=_8kF_qhkXMW8f_u7xAi0u0KZLsD4GEiM6uaT7ZAco6g,4074
+tomwer/core/process/reconstruction/output.py,sha256=LMVH71rybFR1j-DTCo48k5M3feKuLBq9jE4n01qJAec,4118
 tomwer/core/process/reconstruction/params_cache.py,sha256=GTchgCH1Db7fuYsSGxSF6wCTeV5grlYQh5ab198nmOk,1527
 tomwer/core/process/reconstruction/paramsbase.py,sha256=6PjFcO0yYs_apgv2MImGSDLsBgQ7UeK2TSBLz28HYgc,6344
 tomwer/core/process/reconstruction/axis/__init__.py,sha256=VSQkN6M6JvM_c55OiboNyJUW8Zs1wkkQgv1JYmzvIr8,80
@@ -332,7 +332,7 @@ tomwer/core/process/reconstruction/darkref/darkrefscopy.py,sha256=D0i__aTsEvfJg_
 tomwer/core/process/reconstruction/darkref/params.py,sha256=vrDN8bZu28E4zLuHJzNvIIyyZq-4yhX9k9itXYCJ2iM,8756
 tomwer/core/process/reconstruction/darkref/settings.py,sha256=35jliuOIjMKTOJjgn4uiotcDEr6RskpLHfRWWLm76dc,188
 tomwer/core/process/reconstruction/nabu/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-tomwer/core/process/reconstruction/nabu/castvolume.py,sha256=4VEVnJxWfG8_Ku2uhUSQAgGfvP_08mXswmC3bHU7E4M,9317
+tomwer/core/process/reconstruction/nabu/castvolume.py,sha256=DGNj3YF97GRABy4xvhjjv8_IgyWoRb5TkBQcDFlpUDM,9945
 tomwer/core/process/reconstruction/nabu/helical.py,sha256=gauUkoPiShvnvMQrCQXv28g0yLe-GceML5kYMSXmNIg,1997
 tomwer/core/process/reconstruction/nabu/nabucommon.py,sha256=6jOdKpUW5MbRkf53evu4-ZBkQaNWMfl799-f0zQ9-1Q,24554
 tomwer/core/process/reconstruction/nabu/nabuscores.py,sha256=e5tRG1QtmVAdXb8KHMTMtBXA3KQXqKKcqipY2HzMURg,25275
@@ -903,9 +903,9 @@ tomwer/tests/orangecontrib/tomwer/widgets/visualization/tests/test_volume_viewer
 tomwer/tests/test_ewoks/test_conversion.py,sha256=a8cEWbErXiFCAkaapi0jeEoRKYxcFQCoa-Jr_u77_OM,3656
 tomwer/tests/test_ewoks/test_single_node_execution.py,sha256=YBUHfiAnkciv_kjj7biC5fOs7c7ofNImM_azGMn4LZM,2813
 tomwer/tests/test_ewoks/test_workflows.py,sha256=Eq80eexf5NVL7SzvwctLOaUeuQ8V3vDiFiHgbJA4Yb8,4871
-tomwer-1.4.7.dist-info/LICENSE,sha256=62p1wL0n9WMTu8x2YDv0odYgTqeSvTd9mQ0v6Mq7lzE,1876
-tomwer-1.4.7.dist-info/METADATA,sha256=cTWcuTnfLh2DnmMNzen6jZRoBgRDp3VRqOv9U08BI80,13415
-tomwer-1.4.7.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
-tomwer-1.4.7.dist-info/entry_points.txt,sha256=py3ZUWvGnWGc5c7Yhw_uBTm8Fmew0BDw3aQZnWMBNZI,500
-tomwer-1.4.7.dist-info/top_level.txt,sha256=Yz5zKh0FPiImtzHYcPuztG1AO8-6KEpUWgoChGbA0Ys,21
-tomwer-1.4.7.dist-info/RECORD,,
+tomwer-1.4.8.dist-info/LICENSE,sha256=62p1wL0n9WMTu8x2YDv0odYgTqeSvTd9mQ0v6Mq7lzE,1876
+tomwer-1.4.8.dist-info/METADATA,sha256=N3KGtY5cMcf1QBDrJWJsGSetIU0TUEdUfV0okormuLI,13415
+tomwer-1.4.8.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
+tomwer-1.4.8.dist-info/entry_points.txt,sha256=py3ZUWvGnWGc5c7Yhw_uBTm8Fmew0BDw3aQZnWMBNZI,500
+tomwer-1.4.8.dist-info/top_level.txt,sha256=Yz5zKh0FPiImtzHYcPuztG1AO8-6KEpUWgoChGbA0Ys,21
+tomwer-1.4.8.dist-info/RECORD,,