tomwer 1.2.1__tar.gz → 1.2.3__tar.gz

{tomwer-1.2.1/tomwer.egg-info → tomwer-1.2.3}/PKG-INFO

@@ -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 → tomwer-1.2.3}/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-1.2.1 → tomwer-1.2.3}/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-1.2.1 → tomwer-1.2.3}/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-1.2.1 → tomwer-1.2.3}/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 → tomwer-1.2.3/tomwer.egg-info}/PKG-INFO

@@ -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