tomwer 1.4.0__py3-none-any.whl → 1.4.0rc0__py3-none-any.whl

tomwer/core/process/reconstruction/axis/mode.py

@@ -1,7 +1,6 @@
 import logging
 
 from silx.utils.enum import Enum as _Enum
-from tomwer.core.process.reconstruction.axis.side import Side
 
 _logger = logging.getLogger(__name__)
 
@@ -12,14 +11,6 @@ class AxisModeMetadata:
 
     Ease processing and display
     Maybe this function should be part of nabu ?
-
-    :param lockable: True if this value can be lock and process automatically when a new scan is received
-    :param tooltip: short description of the mode (to be used by the GUI)
-    :param computing_constrains: some constrain like need to have a 0-360 acquisition (so no Half acquisition)
-    :param allows_padding: does the algorithm applies padding (and so can the user provide some mode)
-    :param valid_inputs: compatible input type (pair of radios or sinogram...)
-    :param valid_sides: can a side be provided
-    :param allows_estimated_cor_as_numerical_value: can a numerical value (first guess) be provided to the algorithm
     """
 
     def __init__(
@@ -30,7 +21,6 @@ class AxisModeMetadata:
         allows_padding=False,
         valid_inputs=(),
         valid_sides=(),
-        allows_estimated_cor_as_numerical_value: bool = True,
     ) -> None:
         self._lockable = lockable
         self._tooltip = tooltip
@@ -38,9 +28,6 @@ class AxisModeMetadata:
         self._allows_padding = allows_padding
         self._valid_inputs = valid_inputs
         self._valid_sides = valid_sides
-        self._allows_estimated_cor_as_numerical_value = (
-            allows_estimated_cor_as_numerical_value
-        )
 
     @property
     def is_lockable(self) -> bool:
@@ -66,10 +53,6 @@ class AxisModeMetadata:
     def valid_sides(self) -> tuple:
         return self._valid_sides
 
-    @property
-    def allows_estimated_cor_as_numerical_value(self) -> bool:
-        return self._allows_estimated_cor_as_numerical_value
-
 
 class _InputType(_Enum):
     SINOGRAM = "sinogram"
@@ -86,57 +69,35 @@ class AxisMode(_Enum):
     global_ = "global"
     manual = "manual"
     growing_window_sinogram = "sino-growing-window"
-    growing_window_radios = "growing-window"
+    growing_window_radios = "radios-growing-window"
     sliding_window_sinogram = "sino-sliding-window"
-    sliding_window_radios = "sliding-window"
+    sliding_window_radios = "radios-sliding-window"
     sino_coarse_to_fine = "sino-coarse-to-fine"
     composite_coarse_to_fine = "composite-coarse-to-fine"
-    fourier_angles = "fourier-angles"
-    octave_accurate_radios = "octave-accurate"
-    read = "read 'x_rotation_axis_pixel_position'"
+    sino_fourier_angles = "sino-fourier-angles"
+    octave_accurate_radios = "radios-octave-accurate"
+    read = "read from estimated cor"
     # alias to composite_coarse_to_fine with near mode
     near = "near"
 
     @classmethod
     def from_value(cls, value):
-        # ensure backward compatibility with workflow defined before COR method on sinograms
-        if value in ("global_", "global"):
-            value = AxisMode.global_
-        if value == "radio-growing-window":
+        # ensure backward compatiblity with workflow defined before COR method on sinograms
+        if value == "growing-window":
             _logger.warning(
-                f"Axis mode requested is '{value}'. To insure backward compatibility replace it by '{AxisMode.growing_window_radios.value}'"
+                "Axis mode requested is 'growing-window'. To insure backward compatibility replace it by 'growing-window-radios'"
             )
             value = AxisMode.growing_window_radios
-        elif value == "radio-sliding-window":
+        elif value == "sliding-window":
             _logger.warning(
-                f"Axis mode requested is '{value}'. To insure backward compatibility replace it by '{AxisMode.sliding_window_radios.value}'"
+                "Axis mode requested is 'sliding-window'. To insure backward compatibility replace it by 'sliding-window-radios'"
             )
             value = AxisMode.sliding_window_radios
-        elif value in ("radios-octave-accurate", "accurate"):
-            _logger.warning(
-                f"Axis mode requested is '{value}'. To insure backward compatibility replace it by '{AxisMode.octave_accurate_radios.value}'"
-            )
-            value = AxisMode.octave_accurate_radios
-        elif value in ("read", "read from estimated cor"):
+        elif value == "read":
             value = AxisMode.read
 
         return super().from_value(value=value)
 
-    def requires_radio_indices(self) -> bool:
-        return self in (
-            AxisMode.growing_window_radios,
-            AxisMode.sliding_window_radios,
-            AxisMode.octave_accurate_radios,
-        )
-
-    def requires_sinogram_index(self) -> bool:
-        return self in (
-            AxisMode.growing_window_sinogram,
-            AxisMode.sliding_window_sinogram,
-            AxisMode.fourier_angles,
-            AxisMode.sino_coarse_to_fine,
-        )
-
 
 AXIS_MODE_METADATAS = {
     # manual
@@ -146,7 +107,6 @@ AXIS_MODE_METADATAS = {
         computing_constrains=(),
         allows_padding=False,
         valid_inputs=(_InputType.RADIOS_X2,),
-        allows_estimated_cor_as_numerical_value=False,
     ),
     # read
     AxisMode.read: AxisModeMetadata(
@@ -155,7 +115,6 @@ AXIS_MODE_METADATAS = {
         computing_constrains=(),
         allows_padding=False,
         valid_inputs=None,
-        allows_estimated_cor_as_numerical_value=False,
     ),
     # radio algorithm
     AxisMode.centered: AxisModeMetadata(
@@ -164,7 +123,6 @@ AXIS_MODE_METADATAS = {
         computing_constrains=(),
         allows_padding=True,
         valid_inputs=(_InputType.RADIOS_X2,),
-        valid_sides=(Side.CENTER,),
     ),
     AxisMode.global_: AxisModeMetadata(
         lockable=True,
@@ -172,7 +130,6 @@ AXIS_MODE_METADATAS = {
         computing_constrains=(),
         allows_padding=True,
         valid_inputs=(_InputType.RADIOS_X2,),
-        allows_estimated_cor_as_numerical_value=False,
     ),
     AxisMode.growing_window_radios: AxisModeMetadata(
         lockable=True,
@@ -180,8 +137,7 @@ AXIS_MODE_METADATAS = {
         computing_constrains=(),
         allows_padding=True,
         valid_inputs=(_InputType.RADIOS_X2,),
-        valid_sides=(Side.RIGHT, Side.LEFT, Side.CENTER, Side.ALL),
-        allows_estimated_cor_as_numerical_value=False,
+        valid_sides=("left", "right", "center", "all"),
     ),
     AxisMode.sliding_window_radios: AxisModeMetadata(
         lockable=True,
@@ -189,16 +145,15 @@ AXIS_MODE_METADATAS = {
         computing_constrains=(),
         allows_padding=True,
         valid_inputs=(_InputType.RADIOS_X2,),
-        valid_sides=(Side.RIGHT, Side.LEFT, Side.CENTER),
+        valid_sides=("left", "right", "center", "near"),
     ),
     AxisMode.octave_accurate_radios: AxisModeMetadata(
         lockable=True,
         tooltip="Same method as the 'accurate' octave code",
-        computing_constrains=(_Constrain.FULL_TURN,),
+        computing_constrains=(),
         allows_padding=True,
         valid_inputs=(_InputType.RADIOS_X2,),
-        valid_sides=(Side.CENTER,),
-        allows_estimated_cor_as_numerical_value=False,
+        valid_sides=("center",),
     ),
     # sinogram algorithm
     AxisMode.growing_window_sinogram: AxisModeMetadata(
@@ -207,8 +162,7 @@ AXIS_MODE_METADATAS = {
         computing_constrains=(),
         allows_padding=True,
         valid_inputs=(_InputType.SINOGRAM,),
-        valid_sides=(Side.RIGHT, Side.LEFT, Side.CENTER, Side.ALL),
-        allows_estimated_cor_as_numerical_value=False,
+        valid_sides=("left", "right", "center", "all"),
     ),
     AxisMode.sliding_window_sinogram: AxisModeMetadata(
         lockable=True,
@@ -216,11 +170,7 @@ AXIS_MODE_METADATAS = {
         computing_constrains=(),
         allows_padding=True,
         valid_inputs=(_InputType.SINOGRAM,),
-        valid_sides=(
-            Side.RIGHT,
-            Side.LEFT,
-            Side.CENTER,
-        ),
+        valid_sides=("left", "right", "center", "near"),
     ),
     AxisMode.sino_coarse_to_fine: AxisModeMetadata(
         lockable=True,
@@ -228,22 +178,18 @@ AXIS_MODE_METADATAS = {
         computing_constrains=(_Constrain.FULL_TURN,),
         allows_padding=True,
         valid_inputs=(_InputType.SINOGRAM,),
-        valid_sides=(
-            Side.RIGHT,
-            Side.LEFT,
-        ),
-        allows_estimated_cor_as_numerical_value=False,
     ),
-    AxisMode.fourier_angles: AxisModeMetadata(
+    AxisMode.sino_fourier_angles: AxisModeMetadata(
         lockable=True,
         tooltip="",
         computing_constrains=(_Constrain.FULL_TURN,),
         allows_padding=True,
         valid_inputs=(_InputType.SINOGRAM,),
         valid_sides=(
-            Side.RIGHT,
-            Side.LEFT,
-            Side.CENTER,
+            "left",
+            "right",
+            "center",
+            "near",
         ),
     ),
     # coarse-to-fine algorithm
@@ -253,11 +199,7 @@ AXIS_MODE_METADATAS = {
         computing_constrains=(_Constrain.FULL_TURN,),
         allows_padding=True,
         valid_inputs=(_InputType.COMPOSITE,),
-        valid_sides=(
-            Side.RIGHT,
-            Side.LEFT,
-            Side.CENTER,
-        ),
+        valid_sides=("left", "right", "center", "near"),
     ),
     AxisMode.near: AxisModeMetadata(
         lockable=True,
@@ -265,10 +207,6 @@ AXIS_MODE_METADATAS = {
         computing_constrains=(_Constrain.FULL_TURN,),
         allows_padding=True,
         valid_inputs=(_InputType.COMPOSITE,),
-        valid_sides=(
-            Side.RIGHT,
-            Side.LEFT,
-            Side.CENTER,
-        ),
+        valid_sides=("left", "right", "center", "near"),
     ),
 }