tomwer 2.0.0.dev4__tar.gz → 2.0.0.dev6__tar.gz

{tomwer-2.0.0.dev4/src/tomwer.egg-info → tomwer-2.0.0.dev6}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: tomwer
-Version: 2.0.0.dev4
+Version: 2.0.0.dev6
 Summary: Tomography workflow tools
 Author-email: Henri Payno <henri.payno@esrf.fr>, Pierre Paleo <pierre.paleo@esrf.fr>, Pierre-Olivier Autran <pierre-olivier.autran@esrf.fr>, Jérôme Lesaint <jerome.lesaint@esrf.fr>, Alessandro Mirone <mirone@esrf.fr>
 License: MIT
@@ -76,7 +76,7 @@ Requires-Dist: tomwer[full_no_qt]; extra == "full"
 Requires-Dist: PyQt6; extra == "full"
 Provides-Extra: doc
 Requires-Dist: tomwer[full_no_cuda]; extra == "doc"
-Requires-Dist: Sphinx>=4.0.0; extra == "doc"
+Requires-Dist: sphinx; extra == "doc"
 Requires-Dist: nbsphinx; extra == "doc"
 Requires-Dist: pandoc; extra == "doc"
 Requires-Dist: jupyterlab; extra == "doc"

{tomwer-2.0.0.dev4 → tomwer-2.0.0.dev6}/pyproject.toml

@@ -86,7 +86,7 @@ full = [
 ]
 doc = [
     "tomwer[full_no_cuda]",
-    "Sphinx>=4.0.0",
+    "sphinx",
     "nbsphinx",
     "pandoc",
     "jupyterlab",

tomwer-2.0.0.dev6/src/orangecontrib/tomwer/tutorials/darks and flats copy - method 2.ows

@@ -0,0 +1,42 @@
+<?xml version='1.0' encoding='utf-8'?>
+<scheme version="2.0" title="darks and flats copy - method 2" description="">
+	<nodes>
+		<node id="0" name="scan selector" qualified_name="orangecontrib.tomwer.widgets.control.DataSelectorOW.DataSelectorOW" project_name="tomwer" version="" title="scan selector" position="(-519.0, -209.0)" />
+		<node id="1" name="image-key-upgrader" qualified_name="orangecontrib.tomwer.widgets.edit.ImageKeyUpgraderOW.ImageKeyUpgraderOW" project_name="tomwer" version="" title="image-key-upgrader" position="(-293.0, -209.0)" />
+		<node id="2" name="scan selector" qualified_name="orangecontrib.tomwer.widgets.control.DataSelectorOW.DataSelectorOW" project_name="tomwer" version="" title="scan selector (1)" position="(291.0, -211.0)" />
+		<node id="3" name="copy reduced darks and flats" qualified_name="orangecontrib.tomwer.widgets.reconstruction.CopyReducedDarkAndFlatOW.CopyReducedDarkAndFlatOW" project_name="tomwer" version="" title="copy reduced darks and flats" position="(61.0, -213.0)" />
+	</nodes>
+	<links>
+		<link id="0" source_node_id="0" sink_node_id="1" source_channel="data" sink_channel="data" enabled="true" source_channel_id="data" sink_channel_id="data" />
+		<link id="1" source_node_id="1" sink_node_id="3" source_channel="data" sink_channel="data" enabled="true" source_channel_id="data" sink_channel_id="data" />
+		<link id="2" source_node_id="3" sink_node_id="2" source_channel="data" sink_channel="data" enabled="true" source_channel_id="data" sink_channel_id="data" />
+	</links>
+	<annotations>
+		<text id="0" type="text/plain" rect="(-597.0, -79.0, 150.0, 126.0)" font-family="Sans" font-size="16">step2: provide scans for which we need to copy reduced darks and flats</text>
+		<arrow id="1" start="(-522.0, -87.0)" end="(-523.0, -151.0)" fill="#C1272D" />
+		<text id="2" type="text/plain" rect="(-379.0, -87.0, 236.0, 111.0)" font-family="Sans" font-size="16">invalid any existing darks or flats frames (else reduced darks and flats will use them instead of making the copy)</text>
+		<arrow id="3" start="(-293.0, -97.0)" end="(-290.0, -158.0)" fill="#C1272D" />
+		<text id="4" type="text/plain" rect="(-70.0, -81.0, 270.0, 80.0)" font-family="Sans" font-size="16">will copy reduced darks / flats to `dataset_{darks|flats}.hdf5` to be used for reconstruction</text>
+		<arrow id="5" start="(61.99999999999998, -91.0)" end="(61.99999999999998, -142.0)" fill="#C1272D" />
+		<text id="6" type="text/plain" rect="(-141.0, -427.0, 464.0, 85.0)" font-family="Sans" font-size="16">step1: provide reduced darks and flats from the 'copy' tab,
+unselecting auto and setting them through `select darks url` and `select flats url`</text>
+		<arrow id="7" start="(57.0, -334.0)" end="(58.99999999999997, -259.00000000000006)" fill="#C1272D" />
+		<text id="8" type="text/plain" rect="(241.0, -94.0, 150.0, 88.0)" font-family="Sans" font-size="16">result: scans with copied reduced darks / flats</text>
+		<text id="9" type="text/plain" rect="(-601.0, -590.0, 932.0, 68.0)" font-family="Sans" font-size="16">Context: on this workflow we want to copy reduced flats / darks from a dataset to others.
+This one of the various way to do this.
+</text>
+		<text id="10" type="text/plain" rect="(-593.0, 94.0, 919.0, 84.0)" font-family="Sans" font-size="16">Note: reduced darks / flats can be saved to disk from another python script using the `silx.io.dictdump` dicttoh5 function.
+Reduced darks and flats are dictionary with index in the sequence as key (so index==0 if the dark / flat serie is done at the beginning) and the reduced darks / flats as value (2D numpy array) </text>
+		<arrow id="11" start="(291.0, -109.0)" end="(290.0, -158.0)" fill="#C1272D" />
+	</annotations>
+	<thumbnail />
+	<node_properties>
+		<properties node_id="0" format="literal">{'_scanIDs': [], 'controlAreaVisible': True, 'savedWidgetGeometry': None, '__version__': 1}</properties>
+		<properties node_id="1" format="literal">{'_ewoks_default_inputs': {'operations': {}}, '_ewoks_execinfo': {}, '_ewoks_task_options': {}, '_ewoks_varinfo': {}, 'controlAreaVisible': True, 'default_inputs': {}, 'savedWidgetGeometry': None, '__version__': 1}</properties>
+		<properties node_id="2" format="literal">{'_scanIDs': [], 'controlAreaVisible': True, 'savedWidgetGeometry': None, '__version__': 1}</properties>
+		<properties node_id="3" format="literal">{'_auto_mode': True, '_ewoks_default_inputs': {}, '_ewoks_execinfo': {}, '_ewoks_task_options': {}, '_ewoks_varinfo': {}, 'controlAreaVisible': True, 'default_inputs': {}, 'savedWidgetGeometry': None, '__version__': 1}</properties>
+	</node_properties>
+	<session_state>
+		<window_groups />
+	</session_state>
+</scheme>

tomwer-2.0.0.dev6/src/orangecontrib/tomwer/tutorials/untitled.ows

@@ -0,0 +1,15 @@
+<?xml version='1.0' encoding='utf-8'?>
+<scheme version="2.0" title="" description="">
+	<nodes>
+		<node id="0" name="nabu volume reconstruction" qualified_name="orangecontrib.tomwer.widgets.reconstruction.NabuVolumeOW.NabuVolumeOW" project_name="tomwer" version="" title="nabu volume reconstruction" position="(440.0, 214.0)" />
+	</nodes>
+	<links />
+	<annotations />
+	<thumbnail />
+	<node_properties>
+		<properties node_id="0" format="literal">{'_ewoks_default_inputs': {'data': None, 'nabu_volume_params': None, 'nabu_params': None}, 'controlAreaVisible': True, 'savedWidgetGeometry': b'\x01\xd9\xd0\xcb\x00\x03\x00\x00\x00\x00\x03\x08\x00\x00\x01o\x00\x00\x04\xd1\x00\x00\x03\xe5\x00\x00\x03\x08\x00\x00\x01\x94\x00\x00\x04\xd1\x00\x00\x03\xe5\x00\x00\x00\x00\x00\x00\x00\x00\x07\x80\x00\x00\x03\x08\x00\x00\x01\x94\x00\x00\x04\xd1\x00\x00\x03\xe5', '__version__': 1}</properties>
+	</node_properties>
+	<session_state>
+		<window_groups />
+	</session_state>
+</scheme>

{tomwer-2.0.0.dev4 → tomwer-2.0.0.dev6}/src/orangecontrib/tomwer/widgets/control/TomoObjSeriesOW.py

@@ -22,7 +22,7 @@ class TomoObjSeriesOW(OWBaseWidget, openclass=True):
     priority = 55
     keywords = ["tomography", "selection", "tomwer", "series", "group"]
 
-    ewokstaskclass = tomwer.tasks.control.tomoobjseries._TomoobjseriesPlaceHolder
+    ewokstaskclass = tomwer.tasks.control.tomoobjseries._TomoObjSeriesPlaceHolder
 
     want_main_area = True
     want_control_area = False

{tomwer-2.0.0.dev4 → tomwer-2.0.0.dev6}/src/orangecontrib/tomwer/widgets/reconstruction/CoROW.py

@@ -24,23 +24,15 @@ from tomwer.core.reconstruction.cor.mode import CoRMethod
 from tomwer.core.reconstruction.params_cache import (
     save_reconstruction_parameters_to_cache,
 )
+from tomwer.models.reconstruction.cor import CoRParams
 from tomwer.core.scan.scanbase import TomwerScanBase
 from tomwer.gui.reconstruction.cor import CoRMainWindow
-from tomwer.gui.reconstruction.cor.QCoRParams import QCoRParams as _QCoRParams
 from tomwer.synctools.stacks.reconstruction.cor import CoRProcessStack
 
 logger = logging.getLogger(__name__)
 
 
 class CoROW(SuperviseOW):
-    """
-    Widget used to defined the center of rotation (CoR) position to be used for a
-    reconstruction.
-
-    :param _connect_handler: True if we want to store the modifications
-                      on the setting. Need for unit test since
-                      keep alive qt widgets.
-    """
 
     name = "center of rotation finder"
     id = "orange.widgets.tomwer.axis"
@@ -90,43 +82,20 @@ class CoROW(SuperviseOW):
     class Outputs:
         data = Output(name="data", type=TomwerScanBase, doc="one scan to be process")
 
-    def __init__(self, parent=None, cor_params: _QCoRParams | None = None):
-        """
-
-        :param parent: QWidget parent or None
-        :param _connect_handler: used for CI, because if connected fails CI
-        :param cor_params: reconstruction parameters
-        """
+    def __init__(self, parent=None):
         super().__init__(parent)
-        if cor_params is not None:
-            if not isinstance(cor_params, _QCoRParams):
-                raise TypeError(
-                    f"cor_params should be an instance of QAxisRP. Not {type(cor_params)}"
-                )
-        self._cor_params = cor_params or _QCoRParams()
 
         # handle settings
-        #  axis params settings
-        cor_params_settings = self._ewoks_default_inputs.get(
-            ParametersKeys.COR_PARAMS_KEY, None
+        cor_params_dict = self._ewoks_default_inputs.get(
+            ParametersKeys.COR_PARAMS_KEY, CoRParams().model_dump()
         )
-        if cor_params_settings not in (None, dict()):
-            try:
-                self._cor_params.load_from_dict(cor_params_settings)
-            except Exception as e:
-                logger.error(f"fail to load reconstruction settings: {e}")
+        self._cor_params = CoRParams(**(cor_params_dict or CoRParams().model_dump()))
 
         #  gui settings
         gui_settings = self._ewoks_default_inputs.get("gui", {})
         if gui_settings is None:
             gui_settings = {}
 
-        original_mode = self._cor_params.mode
-        if original_mode is CoRMethod.manual:
-            original_cor = self._cor_params.relative_cor_value
-        else:
-            original_cor = None
-
         self.__lastAxisProcessParamsCache = None
         # used to memorize the last (reconstruction parameters, scan)
         self.__scan = None
@@ -135,14 +104,17 @@ class CoROW(SuperviseOW):
             cor_params=self._cor_params, process_id=self.process_id
         )
 
-        self._widget = CoRMainWindow(parent=self, cor_params=self._cor_params)
+        self._widget = CoRMainWindow(parent=self)
 
         self._layout = gui.vBox(self.mainArea, self.name).layout()
         self._layout.setContentsMargins(0, 0, 0, 0)
 
         self._layout.addWidget(self._widget)
 
-        # load settings
+        # push saved params into the GUI (handles manual/read mode restoration internally)
+        self._widget.setConfiguration(self._cor_params.model_dump())
+
+        # load gui settings
         try:
             if "mode_is_lock" in gui_settings:
                 mode_lock = gui_settings["mode_is_lock"]
@@ -172,37 +144,7 @@ class CoROW(SuperviseOW):
         self._processingStack.sigComputationStarted.connect(self._startProcessing)
         self._processingStack.sigComputationEnded.connect(self._scanProcessed)
 
-        self._cor_params.sigChanged.connect(self._updateSettingsVals)
-        self._widget._corWidget._settingsWidget._mainWidget._calculationWidget.sigUpdateXRotAxisPixelPosOnNewScan.connect(
-            self._updateSettingsVals
-        )
-        self._widget.sigAxisEditionLocked.connect(self._updateSettingsVals)
-        self._widget.sigModeChanged.connect(self._updateSettingsVals)
-        self._widget.sigLockModeChanged.connect(self._updateSettingsVals)
-
-        self._widget._corWidget._settingsWidget._mainWidget._calculationWidget._estimatedCorWidget.sigValueChanged.connect(
-            self._updateSettingsVals
-        )
-
-        # handle special case of the manual mode
-        # force axis to manual because not handled by the widget setup directly
-        if original_mode in (
-            CoRMethod.manual,
-            CoRMethod.read,
-        ):
-            self._cor_params.mode = original_mode
-            if original_cor is not None:
-                self._cor_params.set_relative_value(original_cor)
-
-            self.setMode(original_mode)
-            # force gui update
-            self._widget.sigModeChanged.emit("manual")
-            # hard fix, but this widget has to be redone and rework anyway
-            self._widget._corWidget._settingsWidget._mainWidget._calculationWidget._modeChanged()
-            if original_cor is not None:
-                self._widget._controlWidget._positionInfo.setPosition(
-                    relative_cor=original_cor, abs_cor=None
-                )
+        self._widget.sigConfigChanged.connect(self._updateSettingsVals)
 
     def _scanProcessed(self, scan, future_tomo_obj):
         assert isinstance(scan, TomwerScanBase)
@@ -240,8 +182,9 @@ class CoROW(SuperviseOW):
             self.show()
 
     def _processing_to_come_hash(self):
-        dict_for_cache = self._cor_params.to_dict().copy()
-        dict_for_cache.pop("POSITION_VALUE")
+        dict_for_cache = self.getConfiguration().copy()
+        dict_for_cache.pop("relative_cor_value", None)
+        dict_for_cache.pop("absolute_cor_value", None)
         return (
             dict_for_cache,
             str(self.__scan),
@@ -254,7 +197,7 @@ class CoROW(SuperviseOW):
             return
 
         if self.isValueLock():
-            cor = self._cor_params.relative_cor_value
+            cor = self.getConfiguration()["relative_cor_value"]
             save_reconstruction_parameters_to_cache(scan=scan)
         else:
             cor = None
@@ -272,7 +215,7 @@ class CoROW(SuperviseOW):
         self._processingStack.add(
             data=scan,
             configuration={
-                ParametersKeys.COR_PARAMS_KEY: self._cor_params.to_dict(),
+                ParametersKeys.COR_PARAMS_KEY: self.getConfiguration(),
                 "relative_cor_value": cor,
             },
             callback=callback,
@@ -284,7 +227,7 @@ class CoROW(SuperviseOW):
         """
         if self.__scan:
             if self.getMode() is CoRMethod.manual:
-                # when value is set from manual mode we need to retrieve it from the GUI `_axis_param`. Else it has already been set
+                # when value is set from manual mode we need to retrieve it from the GUI. Else it has already been set
                 # to the scan `_cor_params`
                 if (
                     self.__scan._cor_params.frame_width is None
@@ -292,9 +235,8 @@ class CoROW(SuperviseOW):
                 ):
                     self.__scan._cor_params.frame_width = self.__scan.dim_1
 
-                self.__scan._cor_params.set_relative_value(
-                    self._cor_params.relative_cor_value
-                )
+                relative_cor_value = self.getConfiguration().get("relative_cor_value")
+                self.__scan._cor_params.set_relative_value(relative_cor_value)
                 relative_cor_value = self.__scan.cor_params.relative_cor_value
                 save_reconstruction_parameters_to_cache(scan=self.__scan)
                 pv_helpers.notify_succeed(
@@ -337,18 +279,19 @@ class CoROW(SuperviseOW):
         msg.exec()
 
     def _updateSettingsVals(self):
-        # remove rp setting to the advantage of 'static_input'
-        cor_params = self._cor_params.to_dict()
+        params = self.getConfiguration()
+        # make sure serialization is correct
+        CoRParams(**params)
         self._ewoks_default_inputs = {
             "data": None,
-            ParametersKeys.COR_PARAMS_KEY: cor_params,
+            ParametersKeys.COR_PARAMS_KEY: params,
             "gui": {
                 "mode_is_lock": self.isModeLocked(),
                 "value_is_lock": self.isValueLock(),
                 "auto_update_estimated_cor": self._widget.getAutoUpdateEstimatedCor(),
                 "y_axis_inverted": self._widget.isYAxisInverted(),
             },
-            "relative_value": cor_params.get("POSITION_VALUE"),
+            "relative_value": params.get("relative_cor_value"),
         }
 
     def _skip_exec(self, b):
@@ -401,7 +344,7 @@ class CoROW(SuperviseOW):
             return
 
         self.__scan = scan
-        self._cor_params.frame_width = scan.dim_1
+        self._widget.setFrameWidth(scan.dim_1)
 
         # process manually
         process_manually = not (self.isValueLock() or self.isModeLocked())
@@ -413,6 +356,16 @@ class CoROW(SuperviseOW):
 
         self.__compute()
 
+    def getConfiguration(self) -> dict:
+        return self._widget.getConfiguration()
+
+    def setConfiguration(self, config: dict) -> None:
+        try:
+            self._cor_params = CoRParams(**config)
+        except Exception as e:
+            logger.warning(f"Fail to create CoRParams from config: {e}")
+        self._widget.setConfiguration(config)
+
     def _updatePosition(self, scan):
         if scan.cor_params is not None:
             self._widget.setPosition(relative_value=scan.cor_params.relative_cor_value)
@@ -451,9 +404,6 @@ class CoROW(SuperviseOW):
     def setEstimatedCor(self, value):
         self._widget.setEstimatedCor(value=value)
 
-    def getAxisParams(self):
-        return self._widget.getAxisParams()
-
     def setValueLock(self, lock: bool):
         self._widget.setValueLock(lock=lock)
 

{tomwer-2.0.0.dev4 → tomwer-2.0.0.dev6}/src/orangecontrib/tomwer/widgets/reconstruction/MultiCoROW.py

@@ -20,7 +20,7 @@ from tomwer.core.scan.scanbase import TomwerScanBase
 from tomwer.core.reconstruction.multi.multicor.multicor import _is_margin_too_large
 from tomwer.core.reconstruction.common.phase import NabuPhaseMethod
 from tomwer.core.settings import ParametersKeys
-from tomwer.gui.reconstruction.cor.QCoRParams import QCoRParams as _QCoRParams
+from tomwer.models.reconstruction.cor import CoRParams
 from tomwer.gui.reconstruction.multicor.QMultiCoRParams import (
     QMultiCoRParams as _QMultiCoRParams,
 )
@@ -199,7 +199,7 @@ class MultiCoROW(
         self._widget.setConfiguration(configuration)
 
     @Inputs.data
-    def _scanReceived(self, scan):
+    def _scanReceived(self, scan, *args, **kwargs):
         self.process(scan=scan)
 
     def process(self, scan):
@@ -209,7 +209,7 @@ class MultiCoROW(
         if scan is None:
             return
         if scan.cor_params is None:
-            scan.cor_params = _QCoRParams()
+            scan.cor_params = CoRParams()
         if scan.multicor_params is None:
             scan.multicor_params = _QMultiCoRParams()
         if not check_nabu_params_are_provided(

{tomwer-2.0.0.dev4 → tomwer-2.0.0.dev6}/src/orangecontrib/tomwer/widgets/reconstruction/MultiPagOW.py

@@ -11,7 +11,7 @@ from silx.gui import qt
 import tomwer.tasks.reconstruction.multipag
 from tomwer.core.scan.scanbase import TomwerScanBase
 from tomwer.core.settings import ParametersKeys
-from tomwer.gui.reconstruction.cor.QCoRParams import QCoRParams as _QCoRParams
+from tomwer.models.reconstruction.cor import CoRParams
 from tomwer.gui.reconstruction.multipag.QMultiPagParams import (
     QMultiPagParams as _QMultiPagParams,
 )
@@ -155,14 +155,14 @@ class MultiPagOW(
         return self._widget.isAutoFocusLock()
 
     @Inputs.data
-    def _scanReceived(self, scan):
+    def _scanReceived(self, scan, *args, **kwargs):
         self.process(scan=scan)
 
     def process(self, scan):
         if scan is None:
             return
         if scan.cor_params is None:
-            scan.cor_params = _QCoRParams()
+            scan.cor_params = CoRParams()
         if scan.multipag_params is None:
             scan.multipag_params = _QMultiPagParams()
         if not check_nabu_params_are_provided(

{tomwer-2.0.0.dev4 → tomwer-2.0.0.dev6}/src/orangecontrib/tomwer/widgets/reconstruction/NabuSlicesOW.py

@@ -24,7 +24,7 @@ from tomwer.core.scan.scanbase import TomwerScanBase
 from tomwer.core.volume.volumefactory import VolumeFactory
 from tomwer.core.settings import ParametersKeys
 from tomwer.gui.reconstruction.nabu.slices.NabuSlicesWindow import NabuSlicesWindow
-from tomwer.gui.reconstruction.cor.QCoRParams import QCoRParams as _QCoRParams
+from tomwer.models.reconstruction.cor import CoRParams as _CoRParams
 from tomwer.gui.utils.reconstruction import check_nabu_params_are_provided
 from tomwer.synctools.stacks.reconstruction.nabu import NabuSliceProcessStack
 
@@ -170,7 +170,7 @@ class NabuSlicesOW(SuperviseOW, BaseNabuRecOW):
         if scan.cor_params is None or scan.cor_params.relative_cor_value is None:
             # try to retrieve last computed cor value from nabu process
             if scan.cor_params is None:
-                scan.cor_params = _QCoRParams()
+                scan.cor_params = _CoRParams()
             load_reconstruction_parameters_from_cache(scan=scan)
 
         self.show()

{tomwer-2.0.0.dev4 → tomwer-2.0.0.dev6}/src/orangecontrib/tomwer/widgets/reconstruction/NabuVolumeOW.py

@@ -23,6 +23,7 @@ from tomwer.core.utils.dictutils import concatenate_dict
 from tomwer.core.settings import ParametersKeys
 from tomwer.core.volume.volumebase import TomwerVolumeBase
 from tomwer.core.volume.volumefactory import VolumeFactory
+from tomwer.models.reconstruction.cor import CoRParams as _CoRParams
 from tomwer.gui.reconstruction.nabu.volume.NabuVolumeWindow import NabuVolumeWindow
 from tomwer.gui.utils.reconstruction import check_nabu_params_are_provided
 from tomwer.synctools.stacks.reconstruction.nabu import NabuVolumeProcessStack
@@ -156,11 +157,7 @@ class NabuVolumeOW(SuperviseOW, BaseNabuRecOW):
         if dataset.cor_params is None or dataset.cor_params.relative_cor_value is None:
             # try to retrieve last computed cor value from nabu process
             if dataset.cor_params is None:
-                from tomwer.gui.reconstruction.cor.QCoRParams import (
-                    QCoRParams as _QCoRParams,
-                )
-
-                dataset.cor_params = _QCoRParams()
+                dataset.cor_params = _CoRParams()
             load_reconstruction_parameters_from_cache(scan=dataset)
 
         self.process(dataset)

{tomwer-2.0.0.dev4 → tomwer-2.0.0.dev6}/src/tomwer/app/cor.py

@@ -22,7 +22,7 @@ from tomwer.core.settings import ParametersKeys
 from tomwer.gui import icons
 from tomwer.gui.reconstruction.cor import CoRMainWindow
 from tomwer.gui.utils.splashscreen import getMainSplashScreen
-from tomwer.gui.reconstruction.cor.QCoRParams import QCoRParams as _QCoRParams
+from tomwer.models.reconstruction.cor import CoRParams as _CoRParams
 
 logging.basicConfig(level=logging.WARNING)
 _logger = logging.getLogger(__name__)
@@ -31,7 +31,7 @@ _logger = logging.getLogger(__name__)
 class _CoRProcessGUI(CoRMainWindow):
     def __init__(self, scan, cor_params, parent=None, backend=None):
         cor_params.frame_width = scan.dim_1
-        super().__init__(parent=parent, cor_params=cor_params, backend=backend)
+        super().__init__(parent=parent, backend=backend)
         self.hideLockButton()
         self.hideApplyButton()
         self.setScan(scan=scan)
@@ -160,12 +160,12 @@ def main(argv):
     requires_reduced_dark_and_flat(scan=scan, logger_=_logger)
     # define the process_index is any tomwer_processes_existing
     if scan.cor_params is None:
-        scan.cor_params = _QCoRParams()
+        scan.cor_params = _CoRParams()
 
     if options.debug:
         _logger.setLevel(logging.DEBUG)
 
-    cor_params = _QCoRParams()
+    cor_params = _CoRParams()
 
     window = _CoRProcessGUI(scan=scan, cor_params=cor_params)
     window.setWindowTitle("CoR")

{tomwer-2.0.0.dev4 → tomwer-2.0.0.dev6}/src/tomwer/app/multicor.py

@@ -19,6 +19,7 @@ from tomwer.core.scan.scanfactory import ScanFactory
 from tomwer.core.utils.resource import increase_max_number_file
 from tomwer.core.settings import ParametersKeys
 from tomwer.gui import icons
+from tomwer.models.reconstruction.cor import CoRParams as _CoRParams
 from orangecontrib.tomwer.widgets.reconstruction.MultiCoROW import (
     MultiCoROW as _MultiCoRWindow,
 )
@@ -26,7 +27,6 @@ from tomwer.gui.reconstruction.nabu.nabuconfig.NabuSettingsWidget import (
     NabuSettingsWidget,
 )
 from tomwer.gui.utils.splashscreen import getMainSplashScreen
-from tomwer.gui.reconstruction.cor.QCoRParams import QCoRParams as _QCoRParams
 from tomwer.gui.reconstruction.multicor.QMultiCoRParams import (
     QMultiCoRParams as _QMultiCoRParams,
 )
@@ -140,7 +140,7 @@ def main(argv):
         window.setWindowTitle("multi-CoR")
         window.setWindowIcon(icons.getQIcon("tomwer"))
         if scan.cor_params is None:
-            scan.cor_params = _QCoRParams()
+            scan.cor_params = _CoRParams()
         if scan.multicor_params is None:
             scan.multicor_params = _QMultiCoRParams()
         # force load of reduced_flats and reduced_darks

{tomwer-2.0.0.dev4 → tomwer-2.0.0.dev6}/src/tomwer/app/multipag.py

@@ -24,14 +24,14 @@ from tomwer.gui.reconstruction.nabu.nabuconfig.NabuSettingsWidget import (
 from tomwer.core.scan.scanfactory import ScanFactory
 from tomwer.core.utils.resource import increase_max_number_file
 from tomwer.core.settings import ParametersKeys
+from tomwer.models.reconstruction.cor import CoRParams as _CoRParams
 from tomwer.gui import icons
 from tomwer.gui.utils.splashscreen import getMainSplashScreen
-from tomwer.gui.reconstruction.cor.QCoRParams import QCoRParams as _QCoRParams
 from tomwer.gui.reconstruction.multipag.QMultiPagParams import (
     QMultiPagParams as _QMultiPagParams,
 )
 from tomoscan.esrf.scan.utils import cwd_context
-from tomwer.gui.reconstruction.multicor.corrangeselector import _EstimatedCorWidget
+from tomwer.gui.reconstruction.multicor.corrangeselector import _EstimatedCoRWidget
 
 logging.basicConfig(level=logging.WARNING)
 _logger = logging.getLogger(__name__)
@@ -45,7 +45,7 @@ class MultiPagWindow(_MultiPagWindow):
 
         # CoR value
         self._widget._tabWidget.setTabText(0, "CoR & delta beta values")
-        self._corWidget = _EstimatedCorWidget(
+        self._corWidget = _EstimatedCoRWidget(
             self, title="estimated CoR position", autoCoROpt=False
         )
         self._widget._tabWidget._deltaBetaSelectionWidget.layout().insertWidget(
@@ -166,7 +166,7 @@ def main(argv):
         window.setWindowTitle("multi-Paganin")
         window.setWindowIcon(icons.getQIcon("tomwer"))
         if scan.cor_params is None:
-            scan.cor_params = _QCoRParams()
+            scan.cor_params = _CoRParams()
         if scan.multipag_params is None:
             scan.multipag_params = _QMultiPagParams()
         # force load of reduced_flats and reduced_darks

{tomwer-2.0.0.dev4 → tomwer-2.0.0.dev6}/src/tomwer/core/reconstruction/cor/anglemode.py

@@ -11,7 +11,7 @@ from silx.io.url import DataUrl
 _logger = logging.getLogger(__name__)
 
 
-class CorAngleMode(_Enum):
+class CoRAngleMode(_Enum):
     """Existing modes for computing the Center of Rotation (CoR)"""
 
     use_0_180 = "0-180"
@@ -20,7 +20,7 @@ class CorAngleMode(_Enum):
 
 
 def find_angles_pair(
-    mode: CorAngleMode, projection_angles: dict[float, DataUrl]
+    mode: CoRAngleMode, projection_angles: dict[float, DataUrl]
 ) -> tuple[CoRResource | None, CoRResource | None]:
     """
     Find a pair of opposite projections for CoR computation.
@@ -30,7 +30,7 @@ def find_angles_pair(
 
     :return: The two selected projections as `CoRResource` instances, or `(None, None)` if no suitable pair can be found.
     """
-    mode = CorAngleMode(mode)
+    mode = CoRAngleMode(mode)
 
     angles = numpy.array(tuple(projection_angles.keys()))
 
@@ -42,9 +42,9 @@ def find_angles_pair(
         return value % 360
 
     initial_angle = mod_angle(angles[0])
-    if mode in (CorAngleMode.use_0_180, CorAngleMode.manual_selection):
+    if mode in (CoRAngleMode.use_0_180, CoRAngleMode.manual_selection):
         target_angle_pair = (initial_angle, mod_angle(initial_angle + 180.0))
-    elif mode is CorAngleMode.use_90_270:
+    elif mode is CoRAngleMode.use_90_270:
         target_angle_pair = (
             mod_angle(initial_angle + 90.0),
             mod_angle(initial_angle + 270.0),

{tomwer-2.0.0.dev4 → tomwer-2.0.0.dev6}/src/tomwer/core/reconstruction/tests/test_anglemode.py

@@ -5,7 +5,7 @@ import numpy
 import random
 from dataclasses import dataclass
 
-from ..cor.anglemode import CorAngleMode, find_angles_pair
+from ..cor.anglemode import CoRAngleMode, find_angles_pair
 from silx.io.url import DataUrl
 
 
@@ -44,7 +44,7 @@ def shuffle_dict(my_dict: dict[float, DataUrl]) -> dict[float, DataUrl]:
 @dataclass
 class TestCase:
     projections: dict[float, DataUrl]
-    mode: CorAngleMode
+    mode: CoRAngleMode
     expected_result: tuple[int, int]
     "DataUrl indices - found pair"
 
@@ -52,62 +52,62 @@ class TestCase:
 test_cases = (
     TestCase(
         projections=projection_set_1,
-        mode=CorAngleMode.use_0_180,
+        mode=CoRAngleMode.use_0_180,
         expected_result=(0, 180),
     ),
     TestCase(
         projections=projection_set_1,
-        mode=CorAngleMode.use_90_270,
+        mode=CoRAngleMode.use_90_270,
         expected_result=(90, 270),
     ),
     TestCase(
         projections=shuffle_dict(projection_set_1),
-        mode=CorAngleMode.use_0_180,
+        mode=CoRAngleMode.use_0_180,
         expected_result=(0, 180),
     ),
     TestCase(
         projections=shuffle_dict(projection_set_1),
-        mode=CorAngleMode.use_90_270,
+        mode=CoRAngleMode.use_90_270,
         expected_result=(90, 270),
     ),
     TestCase(
         projections=projection_set_2,
-        mode=CorAngleMode.use_0_180,
+        mode=CoRAngleMode.use_0_180,
         expected_result=(0, 360),
     ),
     TestCase(
         projections=projection_set_3,
-        mode=CorAngleMode.use_0_180,
+        mode=CoRAngleMode.use_0_180,
         expected_result=(0, 360),
     ),
     TestCase(
         projections=projection_set_4,
-        mode=CorAngleMode.use_0_180,
+        mode=CoRAngleMode.use_0_180,
         expected_result=(0, 360),
     ),
     TestCase(
         projections=projection_set_5,
-        mode=CorAngleMode.use_0_180,
+        mode=CoRAngleMode.use_0_180,
         expected_result=(0, 720),
     ),
     TestCase(
         projections=projection_set_5,
-        mode=CorAngleMode.use_90_270,
+        mode=CoRAngleMode.use_90_270,
         expected_result=(360, 1080),
     ),
     TestCase(
         projections=projection_set_6,
-        mode=CorAngleMode.use_0_180,
+        mode=CoRAngleMode.use_0_180,
         expected_result=(0, 180),
     ),
     TestCase(
         projections=projection_set_7,
-        mode=CorAngleMode.use_0_180,
+        mode=CoRAngleMode.use_0_180,
         expected_result=(0, 360),
     ),
     TestCase(
         projections=projection_set_7,
-        mode=CorAngleMode.use_90_270,
+        mode=CoRAngleMode.use_90_270,
         expected_result=(180, 540),
     ),
 )