tomwer 1.2.1__py3-none-any.whl → 1.2.3__py3-none-any.whl

orangecontrib/tomwer/widgets/control/NXTomomillOW.py

@@ -42,6 +42,8 @@ from tomwer.core.scan.blissscan import BlissScan
 from tomwer.core.scan.hdf5scan import HDF5TomoScan, HDF5TomoScanIdentifier
 from tomwer.gui.control.datalist import BlissHDF5DataListMainWindow
 from tomwer.gui.control.nxtomomill import NXTomomillInput, OverwriteMessage
+from ewoksorange.bindings.owwidgets import invalid_data
+
 
 logger = logging.getLogger(__name__)
 
@@ -310,3 +312,15 @@ class NXTomomillOW(
                 self.notify_failed(scan=scan)
         except Exception as e:
             logger.error(f"failed to handle task finished callback. Raiseon is {e}")
+
+    def trigger_downstream(self) -> None:
+        for ewoksname, var in self.get_task_outputs().items():
+            # note: for now we want to trigger 'data' for each items of 'datas'
+            if ewoksname == "datas" and not (
+                invalid_data.is_invalid_data(var.value) or var.value is None
+            ):
+                for data in var.value:
+                    channel = self._get_output_signal("data")
+                    channel.send(data)
+            else:
+                super().trigger_downstream()

tomwer/core/process/control/nxtomomill.py

@@ -59,7 +59,7 @@ class H5ToNxProcess(
         "hdf5_scan",
         "serialize_output_data",
     ),
-    output_names=("data",),
+    output_names=("data", "datas"),
 ):
     """
     Task to convert from a bliss dataset to a nexus compliant dataset
@@ -119,20 +119,20 @@ class H5ToNxProcess(
         if len(convs) == 0:
             return
 
-        if len(convs) > 1:
-            raise RuntimeError(
-                f"the H5ToNxProcess expects to create at most one NXtomo. {len(convs)} created"
+        datas = []
+        for conv in convs:
+            conv_file, conv_entry = conv
+            scan_converted = HDF5TomoScan(scan=conv_file, entry=conv_entry)
+            _logger.processSucceed(
+                f"{config.input_file} {config.entries} has been translated to {scan_converted}"
             )
-
-        conv_file, conv_entry = convs[0]
-        scan_converted = HDF5TomoScan(scan=conv_file, entry=conv_entry)
-        _logger.processSucceed(
-            f"{config.input_file} {config.entries} has been translated to {scan_converted}"
-        )
-        if self.get_input_value("serialize_output_data", True):
-            self.outputs.data = scan_converted.to_dict()
-        else:
-            self.outputs.data = scan_converted
+            if self.get_input_value("serialize_output_data", True):
+                data = scan_converted.to_dict()
+            else:
+                data = scan_converted
+            datas.append(data)
+        self.outputs.datas = datas
+        self.outputs.data = datas[-1] if len(datas) > 0 else None
 
 
 class EDFToNxProcess(

tomwer/synctools/stacks/reconstruction/dkrefcopy.py

@@ -53,7 +53,12 @@ class DarkRefCopyProcessStack(FIFO, qt.QObject):
     """Signal emit when dark or flat are set by a scan. str is the scan identifier"""
 
     def __init__(self, process_id=None):
-        self._save_dir = tempfile.mkdtemp()
+        try:
+            self._save_dir = tempfile.mkdtemp()
+        except Exception as e:
+            _logger.warning(
+                f"unable to create save dir. Error is {e}. Won't be able to copy any dark or flat"
+            )
         qt.QObject.__init__(self)
         FIFO.__init__(self, process_id=process_id)
 
@@ -77,19 +82,25 @@ class DarkRefCopyProcessStack(FIFO, qt.QObject):
             process=self,
             state=DatasetState.ON_GOING,
         )
-        _logger.processStarted(f"dk-ref-copy {data}")
+        _logger.processStarted(f"dk-flat-copy {data}")
         assert isinstance(data, TomwerScanBase)
         self._data_currently_computed = data
         if isOnLbsram(data) and isLowOnMemory(get_lbsram_path()) is True:
             # if computer is running into low memory on lbsram skip it
-            mess = "low memory, skip dk-ref-copy", data.path
-            ProcessManager().notify_dataset_state(
-                dataset=data, process=self._process_id, state=DatasetState.SKIPPED
-            )
-            _logger.processSkipped(mess)
-            if callback is not None:
-                callback()
-            self.scan_ready(scan=data)
+            mess = "low memory, skip dk-flat-copy", data.path
+            try:
+                ProcessManager().notify_dataset_state(
+                    dataset=data, process=self, state=DatasetState.SKIPPED
+                )
+                _logger.processSkipped(mess)
+                if callback is not None:
+                    callback()
+            except Exception as e:
+                _logger.error(e)
+            try:
+                FIFO._end_threaded_computation(self)
+            except Exception as e:
+                _logger.error(e)
         else:
             self._data_currently_computed = data
             self._computationThread.init(data=data, inputs=configuration)

tomwer/version.py

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

{tomwer-1.2.1.dist-info → tomwer-1.2.3.dist-info}/METADATA

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

{tomwer-1.2.1.dist-info → tomwer-1.2.3.dist-info}/RECORD

@@ -1,4 +1,4 @@
-tomwer-1.2.1-py3.11-nspkg.pth,sha256=xeeGR3TjdoVxdFeF6T-zSwZWh6Et--EYuPWu67LxL_c,574
+tomwer-1.2.3-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
@@ -38,7 +38,7 @@ orangecontrib/tomwer/widgets/control/EDF2NXTomomillOW.py,sha256=QyK1IyC6AKu0zJfP
 orangecontrib/tomwer/widgets/control/EmailOW.py,sha256=bg_A0RmcpEHPA7whUBfRUavHEt5pjdASsVECUd9lUCc,2459
 orangecontrib/tomwer/widgets/control/FilterOW.py,sha256=52t0D0NeLscvFyTT4yA7gPSn4CkkpppQpSf4STDiwjs,4659
 orangecontrib/tomwer/widgets/control/NXTomomillMixIn.py,sha256=VbFm--V4k28Jx4XgLCpo-ZBM6iOVCw6l1moLLwgOYKM,3269
-orangecontrib/tomwer/widgets/control/NXTomomillOW.py,sha256=M41e4w2dn4U4690EpsT51_9H0c-yRWwU0LgonLlFYL4,12150
+orangecontrib/tomwer/widgets/control/NXTomomillOW.py,sha256=IAwqSWmgMzVAiNyOoqtDeGftdeXskuHKZ8ZdWbjRfHU,12734
 orangecontrib/tomwer/widgets/control/NXtomoConcatenate.py,sha256=9jf0Qs8jb73hPeLukmulpGRLRRm3rcdHIeks82EwaKA,5998
 orangecontrib/tomwer/widgets/control/NotifierOW.py,sha256=k_SOG-L7EVwKtAb22aSpkpcdeHFDLFRixEcapQh9NxE,4207
 orangecontrib/tomwer/widgets/control/ReduceDarkFlatSelectorOW.py,sha256=llc0e2Y8nMtXDQ56WXZoIdvjRwqcwU64yPVRnuyIOxY,2836
@@ -211,7 +211,7 @@ orangecontrib/tomwer/widgets/visualization/icons/volumeviewer.svg,sha256=2uT9_px
 tomwer/__init__.py,sha256=82Jp1abyG4UWdGuT4nNU7LxaUV6xxkOte5pIz3w69Do,1745
 tomwer/__main__.py,sha256=jkdSlsmo3fEdkyV5yDRi1IyvQbyAWlXNm5B_G97Dr58,10290
 tomwer/utils.py,sha256=EgVwJ5CQVjoBvcKNwyVoXv_P4ciI11oxb8fNyy82Lck,8465
-tomwer/version.py,sha256=lfKGKGtY0OdM65k0ZDwe_qOiKfIi1gP2DvKddPds7vc,4386
+tomwer/version.py,sha256=50IgkXsMxUShVn_zSc0YI5vl8z5i4Pz0UdxauzVXOAk,4386
 tomwer/app/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 tomwer/app/axis.py,sha256=UQNxYpHzxnGdNpkV6sJoO_0tPGCxJkylghwbA7ENsM0,5948
 tomwer/app/canvas.py,sha256=Px0oWLny53xe-2OXnepfRH5ZIcuO_e7wSYmE0femhjg,1379
@@ -264,7 +264,7 @@ tomwer/core/process/control/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMp
 tomwer/core/process/control/datadiscovery.py,sha256=Rihr0KI0EhrgG9WTotx3r9gXKkIgRic5lu5jXPRSy-o,377
 tomwer/core/process/control/email.py,sha256=PVbnMGU9bHJx8T4FcJTJ-zBwiPAeBDky17zOc6MTWc4,4806
 tomwer/core/process/control/nxtomoconcatenate.py,sha256=WL8FoQFhigYwZlQTwDamR_LlunlGILwOovmDsPCE7Xo,3846
-tomwer/core/process/control/nxtomomill.py,sha256=LHbXf1ZY-F74kAnqYrr_jhqUFjGco34AYIpsyA9l1Z8,6812
+tomwer/core/process/control/nxtomomill.py,sha256=nTzgwg0JNs-VgpDdVTpazGlQq_YduUANPMEKmTnpcSk,6834
 tomwer/core/process/control/scanlist.py,sha256=68B1nLvPj5L89gC51Y-WmBbe_eep-6cPk5PhBWFTaQg,2048
 tomwer/core/process/control/scanselector.py,sha256=YD41hajIF4KdDEb6bkP2ZqMyCRmwvVNXzRyzqD5nSNQ,368
 tomwer/core/process/control/scantransfer.py,sha256=GKlEtOz4v59AZuAWO0BEGabX-Z6aFlc3ScBJnLgnbIQ,27656
@@ -757,7 +757,7 @@ tomwer/synctools/stacks/edit/imagekeyeditor.py,sha256=T2zVmYlQCHzv3PcTuCtMz-GNdT
 tomwer/synctools/stacks/reconstruction/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 tomwer/synctools/stacks/reconstruction/axis.py,sha256=Rc2jL3LjK5_wokMjIEXrUrMEINefnaZmxr-imperx7k,8865
 tomwer/synctools/stacks/reconstruction/castvolume.py,sha256=HTR1s09gQK2BnlpD8yRM-UnkRzr7kQb7LUETLMdk0og,7539
-tomwer/synctools/stacks/reconstruction/dkrefcopy.py,sha256=VLXWQBMjwnrsJBLsDqmVYQYiDINgXhdQKPeQPsXAvlY,6855
+tomwer/synctools/stacks/reconstruction/dkrefcopy.py,sha256=TNfOECMnkSAWA_BkLr7_RuJhU4xgjuNHcz2bQ8dxaJk,7243
 tomwer/synctools/stacks/reconstruction/lamino.py,sha256=r0qzxO1D5PXvL6VsK0Ln0GU4-79uRcpGKIaw5H_Oqx0,8438
 tomwer/synctools/stacks/reconstruction/nabu.py,sha256=MlsjVp2oPsKEOcrd03VMfN6CAe0DLEaeEOaCq-BtkGs,7803
 tomwer/synctools/stacks/reconstruction/normalization.py,sha256=883OVRZC81MzM5wmrHX_I5dUztp5G2lmpmu9RjCYdvM,5349
@@ -775,10 +775,10 @@ tomwer/tests/test_scripts.py,sha256=cAiWjkQtaG3p0nRVaDUY9RNieAb1tC6UT6vsyBkcBsE,
 tomwer/tests/test_utils.py,sha256=D0rNDSK6csEOYBY_7gD-4A3jp8rYAm8L1_Xg34A9I2s,305
 tomwer/tests/utils/__init__.py,sha256=AAO9QsJsqO7uEg7t7fOOdniqaD4Nw6g3gQO-Fb8hXE4,8653
 tomwer/tests/utils/utilstest.py,sha256=mNDjZhyzPatgMH0IwwiaFWUu8UBpzuhP5NLgxo1rrQE,7341
-tomwer-1.2.1.dist-info/LICENSE,sha256=yR_hIZ1MfDh9x2_s23uFqBH7m5DgrBl9nJKkE37YChM,1877
-tomwer-1.2.1.dist-info/METADATA,sha256=gp6hsxsGr4hoVMjlI6P1a9NfNDao_IQbNSEJwNXj7U0,10891
-tomwer-1.2.1.dist-info/WHEEL,sha256=pkctZYzUS4AYVn6dJ-7367OJZivF2e8RA9b_ZBjif18,92
-tomwer-1.2.1.dist-info/entry_points.txt,sha256=fIcDnCxjgwzfIylLYhUsFyiNZjZMxsfRQBxi4f-cJg8,440
-tomwer-1.2.1.dist-info/namespace_packages.txt,sha256=Iut-JTfT11SZHHm77_ZeszD7pZDWXcTweCbvrJpqDyQ,14
-tomwer-1.2.1.dist-info/top_level.txt,sha256=Yz5zKh0FPiImtzHYcPuztG1AO8-6KEpUWgoChGbA0Ys,21
-tomwer-1.2.1.dist-info/RECORD,,
+tomwer-1.2.3.dist-info/LICENSE,sha256=yR_hIZ1MfDh9x2_s23uFqBH7m5DgrBl9nJKkE37YChM,1877
+tomwer-1.2.3.dist-info/METADATA,sha256=i0wJKWJakaYT2SBh1R0ilJ8wZ04BFMA3g48KWlXU1lY,10891
+tomwer-1.2.3.dist-info/WHEEL,sha256=pkctZYzUS4AYVn6dJ-7367OJZivF2e8RA9b_ZBjif18,92
+tomwer-1.2.3.dist-info/entry_points.txt,sha256=fIcDnCxjgwzfIylLYhUsFyiNZjZMxsfRQBxi4f-cJg8,440
+tomwer-1.2.3.dist-info/namespace_packages.txt,sha256=Iut-JTfT11SZHHm77_ZeszD7pZDWXcTweCbvrJpqDyQ,14
+tomwer-1.2.3.dist-info/top_level.txt,sha256=Yz5zKh0FPiImtzHYcPuztG1AO8-6KEpUWgoChGbA0Ys,21
+tomwer-1.2.3.dist-info/RECORD,,