tomwer 1.4.16__py3-none-any.whl → 1.4.18__py3-none-any.whl

tomwer/app/nabuapp.py

@@ -95,7 +95,9 @@ class NabuWindow(NabuDialog):
 
         # add center of rotation widget
         self._corWidget = _CORWidget(parent=self)
-        rw = self._widget._mainWidget._configuration._reconstructionWidget
+        rw = (
+            self._widget._mainWidget._nabuSettingsWidget._configuration._reconstructionWidget
+        )
         rw.layout().addWidget(self._corWidget, 99, 0, 1, 2)
 
         self._dataViewer = None

tomwer/app/stitching/common.py

@@ -33,6 +33,8 @@ from tomwer.gui.cluster.slurm import SlurmSettingsWidget
 from tomwer.core.scan.scanbase import TomwerScanBase
 from tomwer.core.scan.nxtomoscan import NXtomoScan
 from tomwer.core.volume import HDF5Volume
+from tomwer.core.volume.volumebase import TomwerVolumeBase
+from tomwer.core.tomwer_object import TomwerObject
 
 
 class MainWidget(qt.QTabWidget):
@@ -131,6 +133,14 @@ class MainWidget(qt.QTabWidget):
     def loadSettings(self, config_file):
         self._stitchingConfigWindow._loadSettings(config_file)
 
+    def get_available_pre_processing_stitching_mode(self):
+        return self._stitchingConfigWindow.get_available_pre_processing_stitching_mode()
+
+    def get_available_post_processing_stitching_mode(self):
+        return (
+            self._stitchingConfigWindow.get_available_post_processing_stitching_mode()
+        )
+
 
 class _StitcherThread(qt.QThread):
     DEFAULT_OUTPUT_CONFIG_NAME = "stitching_conf_autosave.conf"
@@ -189,6 +199,9 @@ class _StitcherThread(qt.QThread):
 
 
 class MainWindow(qt.QDialog):
+
+    sigTomoObjAdded = qt.Signal(TomwerObject)
+
     def __init__(self, axis: int, parent=None) -> None:
         super().__init__(parent)
         self.setLayout(qt.QVBoxLayout())
@@ -268,7 +281,22 @@ class MainWindow(qt.QDialog):
         self._mainWindow._stitchingConfigWindow._widget._mainWidget.setCurrentWidget(
             orderedListWidget
         )
-        orderedListWidget._callbackAddTomoObj()
+        tomo_objs = orderedListWidget._callbackAddTomoObj()
+        for tomo_obj in tomo_objs:
+            if len(tomo_objs) > 0:
+                self.__updateStitchingTypeFromObjAdded(tomo_obj=tomo_objs[0])
+
+    def __updateStitchingTypeFromObjAdded(self, tomo_obj: TomwerObject):
+        if isinstance(tomo_obj, TomwerScanBase):
+            self.setStitchingType(self.get_available_pre_processing_stitching_mode()[0])
+        elif isinstance(tomo_obj, TomwerVolumeBase):
+            self.setStitchingType(
+                self.get_available_post_processing_stitching_mode()[0]
+            )
+        else:
+            raise TypeError(
+                f"tomo_obj is expected to be an instance of {type(TomwerObject)}. Got {type(tomo_obj)}"
+            )
 
     def close(self):
         self._mainWindow.close()
@@ -330,6 +358,12 @@ class MainWindow(qt.QDialog):
     def setPostProcessingOutput(self, url: DataUrl) -> None:
         self._mainWindow._stitchingConfigWindow.setPostProcessingOutput(url=url)
 
+    def get_available_pre_processing_stitching_mode(self) -> tuple[StitchingType]:
+        return self._mainWindow.get_available_pre_processing_stitching_mode()
+
+    def get_available_post_processing_stitching_mode(self) -> tuple[StitchingType]:
+        return self._mainWindow.get_available_post_processing_stitching_mode()
+
 
 def main(argv, stitcher_name: str, stitching_axis: int, logger):
     parser = argparse.ArgumentParser(description=__doc__)

tomwer/core/scan/nxtomoscan.py

@@ -427,7 +427,7 @@ class NXtomoScan(_tsNXtomoScan, TomwerScanBase):
             )
         return {
             "hdf5_entry": self.entry,
-            "location": os.path.basename(self.master_file),
+            "location": filter_esrf_mounting_points(os.path.abspath(self.master_file)),
             "binning": binning,
             "binning_z": binning_z,
             "projections_subsampling": proj_subsampling,

tomwer/gui/stitching/SingleAxisStitchingWidget.py

@@ -92,6 +92,30 @@ class SingleAxisStitchingWidget(qt.QWidget, _SingleAxisMixIn):
         if idx >= 0:
             self._stitchingTypeCB.setCurrentIndex(idx)
 
+    def get_available_pre_processing_stitching_mode(self):
+        pre_proc_modes: tuple[str] = tuple(
+            filter(
+                lambda mode: "preproc" in mode,
+                [
+                    self._stitchingTypeCB.itemText(i_item)
+                    for i_item in range(self._stitchingTypeCB.count())
+                ],
+            )
+        )
+        return tuple([StitchingType.from_value(mode) for mode in pre_proc_modes])
+
+    def get_available_post_processing_stitching_mode(self):
+        post_proc_modes: tuple[str] = tuple(
+            filter(
+                lambda mode: "postproc" in mode,
+                [
+                    self._stitchingTypeCB.itemText(i_item)
+                    for i_item in range(self._stitchingTypeCB.count())
+                ],
+            )
+        )
+        return tuple([StitchingType.from_value(mode) for mode in post_proc_modes])
+
     def addTomoObj(self, tomo_obj: TomwerObject):
         self._mainWidget.addTomoObj(tomo_obj)
         self._updatePreviewPixelSize()

tomwer/gui/stitching/StitchingWindow.py

@@ -438,6 +438,11 @@ class _SingleAxisStitchingWindow(
         # update to force overwrite
         config["output"]["overwrite_results"] = True
 
+        # avoid any recalculation of the axis position. So the preview is accurate
+        config["output"]["axis_0_params"] = ""
+        config["output"]["axis_1_params"] = ""
+        config["output"]["axis_2_params"] = ""
+
         # clean current preview to notify some calculation is going on
         preview_plot = self._widget._mainWidget._previewPlot
         preview_plot._waitingOverlay.show()
@@ -583,6 +588,12 @@ class _SingleAxisStitchingWindow(
     def setPostProcessingOutput(self, *args, **kwargs):
         self._outputWidget.setPostProcessingOutput(*args, **kwargs)
 
+    def get_available_pre_processing_stitching_mode(self):
+        return self._widget.get_available_pre_processing_stitching_mode()
+
+    def get_available_post_processing_stitching_mode(self):
+        return self._widget.get_available_post_processing_stitching_mode()
+
 
 class YStitchingWindow(_SingleAxisStitchingWindow, axis=1):
     pass

tomwer/gui/stitching/axisorderedlist.py

@@ -361,7 +361,7 @@ class EditableOrderedTomoObjWidget(AxisOrderedTomoObjWidget):
             [self._tomoObjsTableView.model().getTomoObj(item) for item in selection]
         )
 
-    def _callbackAddTomoObj(self):
+    def _callbackAddTomoObj(self) -> tuple[TomwerObject]:
         dialog = qt.QFileDialog()
         dialog.setFileMode(qt.QFileDialog.ExistingFiles)
         dialog.setNameFilters(
@@ -372,9 +372,9 @@ class EditableOrderedTomoObjWidget(AxisOrderedTomoObjWidget):
 
         if not dialog.exec_():
             dialog.close()
-            return
+            return ()
         elif len(dialog.selectedFiles()) == 0:
-            return
+            return ()
         else:
             tomo_objs = []
             for file in dialog.selectedFiles():
@@ -386,6 +386,7 @@ class EditableOrderedTomoObjWidget(AxisOrderedTomoObjWidget):
                     tomo_objs.extend(new_objs)
             for tomo_obj in tomo_objs:
                 self.addTomoObj(tomo_obj=tomo_obj, trigger_callbacks=True)
+            return tuple(tomo_objs)
 
     def _callbackRemoveSelectedTomoObj(self):
         obj_to_remove = self.getSelectedTomoObjs()

tomwer/gui/stitching/config/positionoveraxis.py

@@ -333,9 +333,15 @@ class _TomoObjPosition(qt.QWidget):
         self.layout().addWidget(self._resetValueQPB)
 
         # connect signal / slot
-        self._spinBox.valueChanged.connect(self._valueChanged)
+        self._spinBox.editingFinished.connect(self._sbEditingFinished)
         self._resetValueQPB.clicked.connect(self.resetOriginalValue)
 
+    def _sbEditingFinished(self):
+        sender = self.sender()
+        assert isinstance(sender, qt.QSpinBox)
+        new_value = sender.value()
+        self._valueChanged(new_value=new_value)
+
     def _valueChanged(self, new_value):
         self.sigValueChanged.emit(
             self.__lastValue,
@@ -354,10 +360,12 @@ class _TomoObjPosition(qt.QWidget):
         self._positionChanged()
 
     def _positionChanged(self):
-        self._valueChanged(new_value=self._spinBox.value())
+        self._valueChanged(self._spinBox.value())
 
-    def setValue(self, value: float) -> None:
+    def setValue(self, value: float, emit_editing_finished: bool = False) -> None:
         self._spinBox.setValue(value)
+        if emit_editing_finished:
+            self._spinBox.editingFinished.emit()
         self.__lastValue = value
 
     def getValue(self) -> float:

tomwer/gui/stitching/tests/test_ZStitchingWindow.py

@@ -69,10 +69,10 @@ def test_ZStitchingWindow(
     )
 
     window._editTomoObjFirstAxisPositionsWidget.setEditionMode("free")
-    widget_tomo_obj_0.setValue(10)
+    widget_tomo_obj_0.setValue(10, emit_editing_finished=True)
     assert window.getConfiguration()["stitching"]["axis_0_pos_px"] == [10, 0, -90]
     window._editTomoObjFirstAxisPositionsWidget.setEditionMode("downstream")
-    widget_tomo_obj_0.setValue(30)
+    widget_tomo_obj_0.setValue(30, emit_editing_finished=True)
     assert window.getConfiguration()["stitching"]["axis_0_pos_px"] == [30, 20, -70]
     window._editTomoObjFirstAxisPositionsWidget.setEditionMode("upstream")
     widget_tomo_obj_2 = (
@@ -80,7 +80,7 @@ def test_ZStitchingWindow(
             scans[2].get_identifier().to_str()
         ]
     )
-    widget_tomo_obj_2.setValue(-120)
+    widget_tomo_obj_2.setValue(-120, emit_editing_finished=True)
     assert window.getConfiguration()["stitching"]["axis_0_pos_px"] == [-20, -30, -120]
 
     # test reset positions to initial positions

tomwer/gui/utils/inputwidget.py

@@ -437,7 +437,13 @@ class OutputVolumeDefinition(qt.QWidget):
         # output file or folder
         self._outputFileLabel = qt.QLabel("", self)
         self.layout().addWidget(self._outputFileLabel, 1, 0, 1, 1)
-        self._outputFileQLE = QLFileSystem("", parent=None)
+        self._outputFileQLE = QLFileSystem(
+            os.path.join(
+                os.getcwd(),
+                "stitched_volume.hdf5",
+            ),
+            parent=None,
+        )
         self.layout().addWidget(self._outputFileQLE, 1, 1, 1, 1)
         self._selectPB = qt.QPushButton("select", self)
         self.layout().addWidget(self._selectPB, 1, 2, 1, 1)

tomwer/gui/utils/utils.py

@@ -49,7 +49,7 @@ def open_url_with_image_j(url: DataUrl) -> threading.Thread:
 
     :param url: url we want to open in imagej
     """
-    global __image_j_from
+    global __image_j_from  # noqa: F824
     if not has_imagej():
         raise OSError("ImageJ is not installed")
     thread = ImageJthread(url=url, image_j_from=__image_j_from)

tomwer/version.py

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

{tomwer-1.4.16.dist-info → tomwer-1.4.18.dist-info}/METADATA

@@ -1,6 +1,6 @@
-Metadata-Version: 2.2
+Metadata-Version: 2.4
 Name: tomwer
-Version: 1.4.16
+Version: 1.4.18
 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
@@ -26,7 +26,7 @@ Requires-Dist: setuptools
 Requires-Dist: psutil
 Requires-Dist: silx[full]<2.1.1,>=2.0
 Requires-Dist: tomoscan>=2.1.0a18
-Requires-Dist: nxtomo>=1.3.0dev4
+Requires-Dist: nxtomo<2.0,>=1.3.0dev4
 Requires-Dist: nxtomomill>=1.1.0a0
 Requires-Dist: processview>=1.5.0
 Requires-Dist: ewoks>=0.1.1
@@ -48,7 +48,7 @@ Requires-Dist: werkzeug; extra == "full-base"
 Requires-Dist: json-rpc; extra == "full-base"
 Requires-Dist: scipy; extra == "full-base"
 Requires-Dist: Pillow; extra == "full-base"
-Requires-Dist: glymur; extra == "full-base"
+Requires-Dist: glymur<0.14; extra == "full-base"
 Requires-Dist: resource; extra == "full-base"
 Requires-Dist: tifffile; extra == "full-base"
 Requires-Dist: hdf5plugin; extra == "full-base"
@@ -68,7 +68,7 @@ Requires-Dist: werkzeug; extra == "full-no-nabu"
 Requires-Dist: json-rpc; extra == "full-no-nabu"
 Requires-Dist: scipy; extra == "full-no-nabu"
 Requires-Dist: Pillow; extra == "full-no-nabu"
-Requires-Dist: glymur; extra == "full-no-nabu"
+Requires-Dist: glymur<0.14; extra == "full-no-nabu"
 Requires-Dist: resource; extra == "full-no-nabu"
 Requires-Dist: tifffile; extra == "full-no-nabu"
 Requires-Dist: hdf5plugin; extra == "full-no-nabu"
@@ -88,7 +88,7 @@ Requires-Dist: werkzeug; extra == "full-no-cuda"
 Requires-Dist: json-rpc; extra == "full-no-cuda"
 Requires-Dist: scipy; extra == "full-no-cuda"
 Requires-Dist: Pillow; extra == "full-no-cuda"
-Requires-Dist: glymur; extra == "full-no-cuda"
+Requires-Dist: glymur<0.14; extra == "full-no-cuda"
 Requires-Dist: resource; extra == "full-no-cuda"
 Requires-Dist: tifffile; extra == "full-no-cuda"
 Requires-Dist: hdf5plugin; extra == "full-no-cuda"
@@ -109,7 +109,7 @@ Requires-Dist: werkzeug; extra == "full"
 Requires-Dist: json-rpc; extra == "full"
 Requires-Dist: scipy; extra == "full"
 Requires-Dist: Pillow; extra == "full"
-Requires-Dist: glymur; extra == "full"
+Requires-Dist: glymur<0.14; extra == "full"
 Requires-Dist: resource; extra == "full"
 Requires-Dist: tifffile; extra == "full"
 Requires-Dist: hdf5plugin; extra == "full"
@@ -132,7 +132,7 @@ Requires-Dist: werkzeug; extra == "doc"
 Requires-Dist: json-rpc; extra == "doc"
 Requires-Dist: scipy; extra == "doc"
 Requires-Dist: Pillow; extra == "doc"
-Requires-Dist: glymur; extra == "doc"
+Requires-Dist: glymur<0.14; extra == "doc"
 Requires-Dist: resource; extra == "doc"
 Requires-Dist: tifffile; extra == "doc"
 Requires-Dist: hdf5plugin; extra == "doc"
@@ -166,7 +166,7 @@ Requires-Dist: werkzeug; extra == "dev"
 Requires-Dist: json-rpc; extra == "dev"
 Requires-Dist: scipy; extra == "dev"
 Requires-Dist: Pillow; extra == "dev"
-Requires-Dist: glymur; extra == "dev"
+Requires-Dist: glymur<0.14; extra == "dev"
 Requires-Dist: resource; extra == "dev"
 Requires-Dist: tifffile; extra == "dev"
 Requires-Dist: hdf5plugin; extra == "dev"
@@ -193,7 +193,7 @@ Requires-Dist: werkzeug; extra == "dev-no-cuda"
 Requires-Dist: json-rpc; extra == "dev-no-cuda"
 Requires-Dist: scipy; extra == "dev-no-cuda"
 Requires-Dist: Pillow; extra == "dev-no-cuda"
-Requires-Dist: glymur; extra == "dev-no-cuda"
+Requires-Dist: glymur<0.14; extra == "dev-no-cuda"
 Requires-Dist: resource; extra == "dev-no-cuda"
 Requires-Dist: tifffile; extra == "dev-no-cuda"
 Requires-Dist: hdf5plugin; extra == "dev-no-cuda"
@@ -218,7 +218,7 @@ Requires-Dist: werkzeug; extra == "test"
 Requires-Dist: json-rpc; extra == "test"
 Requires-Dist: scipy; extra == "test"
 Requires-Dist: Pillow; extra == "test"
-Requires-Dist: glymur; extra == "test"
+Requires-Dist: glymur<0.14; extra == "test"
 Requires-Dist: resource; extra == "test"
 Requires-Dist: tifffile; extra == "test"
 Requires-Dist: hdf5plugin; extra == "test"
@@ -231,6 +231,7 @@ Requires-Dist: tomoscan[test]>=2.1.0a18; extra == "test"
 Provides-Extra: setup-requires
 Requires-Dist: setuptools; extra == "setup-requires"
 Requires-Dist: numpy>=1.12; extra == "setup-requires"
+Dynamic: license-file
 
 .. image:: doc/img/tomwer.png
    :alt: Tomwer Logo

{tomwer-1.4.16.dist-info → tomwer-1.4.18.dist-info}/RECORD

@@ -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=alEn949jQ3mVKKhR8I9K3oqXSOu85M72-Ldd5-fyb7I,4387
+tomwer/version.py,sha256=ZockRUONTpS2pMmqMM74e8Rvh1TysPALNWyegIXFEyE,4387
 tomwer/app/__init__.py,sha256=h1FKED7Tw5f99yikygt7ruXsdrxQhcJxO7kagLGxhJg,84
 tomwer/app/axis.py,sha256=lB-IZx1o6KTWLIelITvYCIu2flFTB9NhuIfD2MhUZZA,5826
 tomwer/app/canvas.py,sha256=y8rYOiwmv6ug7JcjgkOzEiGQnNXjKWNNmKofT0n8TFg,1538
@@ -231,7 +231,7 @@ tomwer/app/imagekeyupgrader.py,sha256=qLbfWPz68b2DxMYNd5MlIyZdQ12YQ7F-KUA92RcI01
 tomwer/app/intensitynormalization.py,sha256=5uT8xQWjjq7uV8-0jru_2Qf9SIN5ooVCPH8Ok8inMYE,5998
 tomwer/app/multicor.py,sha256=NgSYIh1CTM1ssD5fXfH4j9MM3HU_NUEx_4EIWehijMs,8900
 tomwer/app/multipag.py,sha256=LHk4-97aYqFQ9UgQb8mYW1_nkUQBbgUxee4RinloCjk,12016
-tomwer/app/nabuapp.py,sha256=f8mao2GprCN-CCTFHUlrCLoxFNZmMpzegrlMNnyE_XI,7643
+tomwer/app/nabuapp.py,sha256=1kBQlyzkEYW-iEH6hdYlrXuvg1MPQfPLmDIA5P6oXE4,7687
 tomwer/app/nxtomoeditor.py,sha256=1Wj59ZF3QvDBmUkUosxZlxvOM-mCvs74l1YJe3tFtwQ,3012
 tomwer/app/patchrawdarkflat.py,sha256=0s4Uk7rlF6VYcwKAysxj5ncP7jTgDL9XIiMPqZUktvg,3779
 tomwer/app/radiostack.py,sha256=S6VB7BSmpfFdnGEyX_7wvLFiOtbtlEwgP7PEUAJLN4w,2640
@@ -252,7 +252,7 @@ tomwer/app/canvas_launcher/splash.py,sha256=cpUuZVKwlQbeAWfAqjpjP4q1v1MmkfxU6WWl
 tomwer/app/canvas_launcher/utils.py,sha256=WfsCHAhiiv4-TUNodgyKJenVvmFWnxsy5OBwTBK2jKE,1279
 tomwer/app/canvas_launcher/widgetsscheme.py,sha256=9Or1KMmSxIs_dJmJGV0Xhjg9HH4m8aPGbtiEuK2i6q0,2744
 tomwer/app/stitching/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-tomwer/app/stitching/common.py,sha256=-DNsE3XbBBCvm-NqSTCyJMiYY5GoGHkdzC0y66jZ6Po,15779
+tomwer/app/stitching/common.py,sha256=unFHRuJdzKMLlBM6znQx-KPcbJ7H__EKKe8CUw_Apfs,17293
 tomwer/core/__init__.py,sha256=-EtD8J-a7WVnCgYS7WHkisYn61iM2PpHWcXwE5BetJ8,71
 tomwer/core/futureobject.py,sha256=8Sd9gOrdhYc0PvzPeZPBNOmaHuwB5epG6RJyABRsCmQ,5113
 tomwer/core/resourcemanager.py,sha256=VLNnVodMa-HOMZhN2qpUR_L6phJ8IHPUEPYMxuW6VHg,1067
@@ -408,7 +408,7 @@ tomwer/core/scan/edfscan.py,sha256=5brP6ewiDRaT0ssSf35kAYzfWwynyTaoSPcOjmNxf0o,2
 tomwer/core/scan/futurescan.py,sha256=chXjteQ4_6cSyFBoCil-DeHkHGGzM-xb21xJRYLEfhI,213
 tomwer/core/scan/hdf5scan.py,sha256=rQ-WtbOIgNtnMxA2kC23fEAcJIJIKboAv7UQColkrBg,966
 tomwer/core/scan/helicalmetadata.py,sha256=JRBxqHkyTe5f3FDlbIeDfN31P6Ms48SqGiFRXHuZ8sw,472
-tomwer/core/scan/nxtomoscan.py,sha256=wfyTtgxSaazxacUyUxdESJldUTbpJ8G-NhF09xO1XGI,18413
+tomwer/core/scan/nxtomoscan.py,sha256=juA5so5YpiLDC4-JMCcR5xNovCRbLmcEkWN65QfWkzk,18441
 tomwer/core/scan/scanbase.py,sha256=GO5DgYHtLZJwLW1-Y4ztHxgfdGMPUIhx1rhBG9lWBeM,25627
 tomwer/core/scan/scanfactory.py,sha256=-bF0Ru9bn8bnGk4MKXhbt5Oli19qN1WvFPDMtqw81BA,9116
 tomwer/core/scan/scantype.py,sha256=pQjWuCy_014uK5cdb8pFAkE_EPHJvPdSo3NM8aWTo58,137
@@ -416,7 +416,6 @@ tomwer/core/scan/tests/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3
 tomwer/core/scan/tests/test_edf.py,sha256=JI7wH5emdjlYl08OhmjIO_8mui7rHa-aRCUwmkCRyys,830
 tomwer/core/scan/tests/test_future_scan.py,sha256=tsF9p57dCOmW0fPyl6BP2lLSo0rRYRF6hSF-kryLMDM,848
 tomwer/core/scan/tests/test_nxtomoscan.py,sha256=w2mNuCsfWMl1b9jP_-vkTDkCD_z9oM02yx42f6-DzY8,4751
-tomwer/core/scan/tests/test_process_registration.py,sha256=g4Toef92SjxCBUE82MTbjonFJpc3PQqfpF6FSCarN5U,1988
 tomwer/core/scan/tests/test_scan.py,sha256=mHFPi2Tc7Z2_5rWvAp3YmObVSTB5yi-sTkHm1iOJlDo,12228
 tomwer/core/tests/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 tomwer/core/tests/test_scanutils.py,sha256=xWwd1nycVDWmFaIaL2gQ_xxrUMhVCARaNHI2SxT9NOI,844
@@ -598,13 +597,13 @@ tomwer/gui/reconstruction/tests/test_saaxis.py,sha256=6lXKa5yY8pYkcBap7hyzLwhp8W
 tomwer/gui/reconstruction/tests/test_sadeltabeta.py,sha256=96tE_gxIcmp0qDXQmIwSEkYl3Js7dT2CyUH1doyjGc0,4491
 tomwer/gui/samplemoved/__init__.py,sha256=jNA03mYWfP3_S1MRet6ijYe5DNCTK3Br7-5yrW3oEG4,8240
 tomwer/gui/samplemoved/selectiontable.py,sha256=CzQnJBxfIeoZSw8aR0VvrsaIg6fozREI8YRXdzQbA7Q,7968
-tomwer/gui/stitching/SingleAxisStitchingWidget.py,sha256=syBzSf8yRE9poZh0UKqZcyD8ZmEt-vama8bVRsGBuDw,13023
+tomwer/gui/stitching/SingleAxisStitchingWidget.py,sha256=KSAEUVpSkZ56XjnpF2RlrgenjIkfJct367kbZaYQlXA,13917
 tomwer/gui/stitching/StitchingOptionsWidget.py,sha256=c5kRZOMuGKK_CgK28IkBawaVvK2cmczbWF4TcVUZxq4,18186
-tomwer/gui/stitching/StitchingWindow.py,sha256=g5lurZ3rZ010PBvU4oOWqDgcF3SbDzIqgIOyBHZ-Lyw,24608
+tomwer/gui/stitching/StitchingWindow.py,sha256=tm7aadWGUcmHnVXws1ifJtbb835U3dF4mLZGiP3VQSM,25103
 tomwer/gui/stitching/__init__.py,sha256=jYSG4DSAtMGm9Yuf4MVdlSdMO8JKOp_t-8NKsnR92LU,45
 tomwer/gui/stitching/action.py,sha256=7CkACYKsRt3c_6PgrmQVZwSi9UwvGrQVUymJytHbqcE,1659
 tomwer/gui/stitching/alignment.py,sha256=QGWnogvBSbx3kk8lrFDoipmhqbVHEe46WGAeOorlHQ8,4001
-tomwer/gui/stitching/axisorderedlist.py,sha256=2Os8cjZM9B-LCYB9p6JW7MpqXWaVd6oeWSqP4ZbSlBM,17980
+tomwer/gui/stitching/axisorderedlist.py,sha256=IEJoOXlf8wpWkJijLjF-jGRMHOpQ8lGVuajvIqc670s,18045
 tomwer/gui/stitching/metadataholder.py,sha256=jeR6_DM529aEmxQLeLM3CB-49GHq6KLY2Nc24kSC-HA,913
 tomwer/gui/stitching/normalization.py,sha256=sECW3S83-eQJut2RodfxCRsTnTV4XLCL-z-pVtD1U5Y,4492
 tomwer/gui/stitching/preview.py,sha256=no74hLS4d_mDVwMXkO7k5aNn-B3Y4h-Jx0dlM20rhbE,2292
@@ -616,11 +615,11 @@ tomwer/gui/stitching/utils.py,sha256=ZgfKHLyH7l81Ry-4M5ajdwqdeos_J4g4Ee3j3yoXcJo
 tomwer/gui/stitching/config/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 tomwer/gui/stitching/config/axisparams.py,sha256=1cRa9ukPvVK7AGePJsJx2M_i_5TMLJocVwrotz7uxXk,8026
 tomwer/gui/stitching/config/output.py,sha256=2kOKV5vTt1scIkmEUyhSvERRs8UvEHojRazCC0RzeE8,6176
-tomwer/gui/stitching/config/positionoveraxis.py,sha256=NGgjxzhxCXa3fBtHP9O9oiqLw8lpUqV_NNbhrnRGrdY,16328
+tomwer/gui/stitching/config/positionoveraxis.py,sha256=3vKasddv6d--qO5Izjg6JBE1HXhgYI-RBNFBuLF-BUU,16642
 tomwer/gui/stitching/config/stitchingstrategies.py,sha256=BI5KYs0qeEp-hfFI7M9MJN8EHmoC7iaJqQ7Hf902v6Y,4598
 tomwer/gui/stitching/config/tomoobjdetails.py,sha256=GkQIqE2ArXFJFtmjrwc0txbZldNKJK-fpMEF_68S1qQ,14667
 tomwer/gui/stitching/config/tests/test_axisparams.py,sha256=btumHdTFr2xmiFZ-GbWAuRy6kjwYUilMrluhiE0repM,738
-tomwer/gui/stitching/tests/test_ZStitchingWindow.py,sha256=NEfL8fjcYreiAKyfojiUdhAmoQx0bPjFLZUklS2xQkk,3007
+tomwer/gui/stitching/tests/test_ZStitchingWindow.py,sha256=_qywMShdazk7WekGCUA2rv8ZN-WGuQJ-v8zqCGuWYN0,3091
 tomwer/gui/stitching/tests/test_axis_ordered_list.py,sha256=ueXQ-YrP0S325PrJiPLdsM4GdzhZm8lTzb-P9hJ3TEY,700
 tomwer/gui/stitching/tests/test_normalization.py,sha256=m4anggtaZ32JSfZ5yHgis5CD0HYpjLvS6bpDitQv9ec,643
 tomwer/gui/stitching/tests/test_preview.py,sha256=sQ0fh07e1oYgWwlB4tqHlOv9Qsf_-bZS39GfsolGW3s,2349
@@ -641,7 +640,7 @@ tomwer/gui/utils/completer.py,sha256=XQGVSiUdLa1MfgXPDY5qfcTxtjVerxmVKXmWDb-kQ-I
 tomwer/gui/utils/flow.py,sha256=p9KoaXSK_YhyFrpUTXr-HI1pAoDRiCPW1F9tVgjSIbA,10668
 tomwer/gui/utils/gpu.py,sha256=R2sRA77zyxdy5bVYGNltQpKS_9wuaj9eIn6rglsWGWg,2223
 tomwer/gui/utils/illustrations.py,sha256=SoLAGBIrdYAu44qIZM8kvC74naOTJzUyAxSUkpblyEw,3134
-tomwer/gui/utils/inputwidget.py,sha256=s1siEQ6nBOTVRF7v8wlgCISS0bYiVmWYpFnWCqM5ueY,22376
+tomwer/gui/utils/inputwidget.py,sha256=E8S4XwuIFxdm7ylBzqQVcJtEYif5CgMx5RTAyQ9Vs8E,22505
 tomwer/gui/utils/loadingmode.py,sha256=A9FeNacgnDFqhyrq5-qybCvV_NwGdXU-Skr_5vwoTZM,2928
 tomwer/gui/utils/qt_utils.py,sha256=QMXte_vdCEwr4Vybt5sopczQ_OuRd1W5h6SydqFH0F8,538
 tomwer/gui/utils/sandboxes.py,sha256=QfSRhL1KrFhS2Wr734Tzvp1OjTp82Ozc0ULr-JycFlI,6145
@@ -651,7 +650,7 @@ tomwer/gui/utils/slider.py,sha256=NLooxIa_2dMv60UAt_PV2BKcd15WuNv1EiV1JRdVcu0,21
 tomwer/gui/utils/splashscreen.py,sha256=Wt6lDby3irZn6Vc52whPRTbJOzmMA66VH6d5cIXy_dI,489
 tomwer/gui/utils/step.py,sha256=epEKQwj2byRFH_Lc2XUuMGOVcrKR0m1iFP7HPqb5iG0,5397
 tomwer/gui/utils/unitsystem.py,sha256=0g6pYemy2MpkGQJGuuR9yCwbZ9mt3nPA1dqAvAqUHRo,5994
-tomwer/gui/utils/utils.py,sha256=e_PA4P8GjBW17uemqSDjMy5YLYgVIy2qppmP2kYTALU,2673
+tomwer/gui/utils/utils.py,sha256=FbzvEkJacSdZXe4lvrYOge9csQGx50hH-R8gbx5E0sI,2687
 tomwer/gui/utils/vignettes.py,sha256=1HoABQcreptH6GIuo5nrLZmPcsTWuQlRuSW5IHJTRT4,17792
 tomwer/gui/utils/waiterthread.py,sha256=lyRCzVDAyxquO3JbXxDhVTCv_YjzOQd7PAPsGWjKBrE,494
 tomwer/gui/utils/lineselector/__init__.py,sha256=GZ847ef5X2wk_sAHxg6h24TarPYmb4NZjQI3jjkc7jE,75
@@ -849,7 +848,6 @@ tomwer/synctools/tests/test_darkRefs.py,sha256=1OgWaV-hgDmi4rkh0hxjCW_codBAnxNhp
 tomwer/synctools/tests/test_foldertransfer.py,sha256=ZFIJWSjgYAWw3ktzamid5DJZNnMkAV6Pj72dKG69cJc,12024
 tomwer/synctools/utils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 tomwer/synctools/utils/scanstages.py,sha256=vIUKVDSfM2UwPjjmZTiIN1tNg4antnGcSPv1aYapJCY,7830
-tomwer/tasks/reconstruction/cleardarkflat.py,sha256=_V_x7W8vp1_AqqtQ9xk2VRgwlivn4IPTLEpWySjSZRE,1353
 tomwer/tests/__init__.py,sha256=dPPaIvpzHssjwxsMzYJM_gxQ2e0cnRyQHXxi9ux6ZOY,19
 tomwer/tests/conftest.py,sha256=0XlKfOrVtPg8VmyQn4BoK_mzcliFUtacDGLlZ5wD_PM,1912
 tomwer/tests/datasets.py,sha256=QXQ3jSwgWzfq4CaELOSrk9kHg5GmrP7kGHsdOlNSEIE,336
@@ -906,9 +904,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.16.dist-info/LICENSE,sha256=62p1wL0n9WMTu8x2YDv0odYgTqeSvTd9mQ0v6Mq7lzE,1876
-tomwer-1.4.16.dist-info/METADATA,sha256=GWby5-pOa4v9WTqx5SUKnrMkx0vYn0IGgoKLin6Q-CM,13416
-tomwer-1.4.16.dist-info/WHEEL,sha256=beeZ86-EfXScwlR_HKu4SllMC9wUEj_8Z_4FJ3egI2w,91
-tomwer-1.4.16.dist-info/entry_points.txt,sha256=py3ZUWvGnWGc5c7Yhw_uBTm8Fmew0BDw3aQZnWMBNZI,500
-tomwer-1.4.16.dist-info/top_level.txt,sha256=Yz5zKh0FPiImtzHYcPuztG1AO8-6KEpUWgoChGbA0Ys,21
-tomwer-1.4.16.dist-info/RECORD,,
+tomwer-1.4.18.dist-info/licenses/LICENSE,sha256=62p1wL0n9WMTu8x2YDv0odYgTqeSvTd9mQ0v6Mq7lzE,1876
+tomwer-1.4.18.dist-info/METADATA,sha256=JzR1mNQUR3mOwD1uqJNJKCE62eAa0U5Vy67pb2qNc5o,13483
+tomwer-1.4.18.dist-info/WHEEL,sha256=pxyMxgL8-pra_rKaQ4drOZAegBVuX-G_4nRHjjgWbmo,91
+tomwer-1.4.18.dist-info/entry_points.txt,sha256=py3ZUWvGnWGc5c7Yhw_uBTm8Fmew0BDw3aQZnWMBNZI,500
+tomwer-1.4.18.dist-info/top_level.txt,sha256=Yz5zKh0FPiImtzHYcPuztG1AO8-6KEpUWgoChGbA0Ys,21
+tomwer-1.4.18.dist-info/RECORD,,

{tomwer-1.4.16.dist-info → tomwer-1.4.18.dist-info}/WHEEL

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

tomwer/core/scan/tests/test_process_registration.py

@@ -1,64 +0,0 @@
-# coding: utf-8
-from __future__ import annotations
-
-import shutil
-import tempfile
-import unittest
-
-from tomoscan.io import HDF5File, get_swmr_mode
-
-from tomwer.core.process.task import Task
-from tomwer.core.utils.scanutils import MockNXtomo
-
-
-class TestProcessRegistration(unittest.TestCase):
-    """
-    Make sure utils link to the process registration are
-    correctly working
-    """
-
-    class DummyProcess(Task):
-        @staticmethod
-        def program_name():
-            """Name of the program used for this processing"""
-            return "dummy program"
-
-        @staticmethod
-        def program_version():
-            """version of the program used for this processing"""
-            return "0.0.0"
-
-        @staticmethod
-        def definition():
-            """definition of the process"""
-            return "no definition"
-
-    def setUp(self):
-        self.tmp_dir = tempfile.mkdtemp()
-        self.scan = MockNXtomo(scan_path=self.tmp_dir, n_proj=2).scan
-
-    def tearDown(self):
-        shutil.rmtree(self.tmp_dir)
-
-    def testGetProcessNodes(self):
-        """insure it return the last dark process based on the processing index"""
-
-        for i in range(20):
-            Task._register_process(
-                self.scan.process_file,
-                process=self.DummyProcess,
-                entry=self.scan.entry,
-                configuration=None,
-                results={"output": i},
-                process_index=i,
-            )
-
-        with HDF5File(self.scan.process_file, "r", swmr=get_swmr_mode()) as h5f:
-            nodes = Task._get_process_nodes(
-                root_node=h5f[self.scan.entry], process=self.DummyProcess
-            )
-            self.assertEqual(len(nodes), 20)
-            self.assertTrue("/entry/tomwer_process_16" in nodes)
-            self.assertEqual(nodes["/entry/tomwer_process_16"], 16)
-            self.assertTrue("/entry/tomwer_process_1" in nodes)
-            self.assertEqual(nodes["/entry/tomwer_process_1"], 1)

tomwer/tasks/reconstruction/cleardarkflat.py

@@ -1,42 +0,0 @@
-"""
-Contains task to clear reduced dark and flat frames
-"""
-
-from __future__ import annotations
-
-from tomoscan.scanbase import TomoScanBase as TomoscanScanBase
-
-from processview.core.manager import DatasetState, ProcessManager
-from processview.core.superviseprocess import SuperviseProcess
-
-from tomwer.tasks.task import Task
-from tomwer.core.scan.scanbase import TomwerScanBase
-from tomwer.core.scan.scanfactory import ScanFactory
-from tomwer.core.utils.scanutils import data_identifier_to_scan
-from tomwer.core.reconstruction.darkflat import params as dkrf_reconsparams
-from tomwer.utils import docstring
-
-
-class ClearReducedDarkAndFlat(
-    Task,
-    SuperviseProcess,
-    input_names=("data",),
-    output_names=("data",),
-):
-    """
-    Task to clear reduced darks and flats. Both on disk and on the object cache.
-    th goal of this task is to make sure the scan is cleared of any reduced frames to reprocess it later.
-    """
-
-    def run(self):
-        scan = self.inputs.data
-        if not isinstance(scan, TomoscanScanBase):
-            raise TypeError(
-                f"scan should be an instance of {TomoscanScanBase}. Got {type(scan)}"
-            )
-        scan.set_reduced_flats(None)
-        scan.reduced_flats_infos = None
-        scan.set_reduced_darks(None)
-        scan.reduced_darks_infos = None
-
-        self.outputs.data = scan