tomwer 1.1.1__py3-none-any.whl → 1.2.0a0__py3-none-any.whl

orangecontrib/tomwer/widgets/edit/test/test_nxtomo_editor.py

@@ -1,9 +1,11 @@
 import gc
+
 import pytest
 from silx.gui import qt
-from tomwer.tests.utils import skip_gui_test
 from silx.gui.utils.testutils import TestCaseQt
+
 from orangecontrib.tomwer.widgets.edit.NXtomoEditorOW import NXtomoEditorOW
+from tomwer.tests.utils import skip_gui_test
 
 
 @pytest.mark.skipif(skip_gui_test(), reason="skip gui test")

orangecontrib/tomwer/widgets/other/PythonScriptOW.py

@@ -2,24 +2,26 @@
 the icon change (to difference them) and here the input is not a Table
 but a TomwerScanBase (use silx.gui.qt instead of AnyQt too)"""
 
-import sys
-import os
 import code
-import keyword
 import itertools
+import keyword
+import os
+import sys
 import unicodedata
 from unittest.mock import patch
-from silx.gui import qt
-from orangewidget import widget, gui
-from orangewidget.utils import itemmodels
+
+from orangewidget import gui, widget
 from orangewidget.settings import Setting, SettingsHandler
-from orangewidget.widget import OWBaseWidget, Input, Output
+from orangewidget.utils import itemmodels
+from orangewidget.widget import Input, Output, OWBaseWidget
+from silx.gui import qt
+from tomoscan.serie import Serie
+
 import tomwer.core.process.script.python
 from tomwer.core.cluster.cluster import SlurmClusterConfiguration
 from tomwer.core.futureobject import FutureTomwerObject
 from tomwer.core.scan.scanbase import TomwerScanBase
 from tomwer.core.volume.volumebase import TomwerVolumeBase
-from tomoscan.serie import Serie
 
 __all__ = ["OWPythonScript"]
 
@@ -778,9 +780,7 @@ class OWPythonScript(widget.OWBaseWidget, openclass=True):
             if not isinstance(out_var, signal_type) and out_var is not None:
                 self.Error.add_message(
                     signal,
-                    "'{}' has to be an instance of '{}'.".format(
-                        signal, signal_type.__name__
-                    ),
+                    f"'{signal}' has to be an instance of '{signal_type.__name__}'",
                 )
                 getattr(self.Error, signal)()
                 out_var = None

orangecontrib/tomwer/widgets/reconstruction/AxisOW.py

@@ -27,31 +27,31 @@ __authors__ = ["H. Payno"]
 __license__ = "MIT"
 __date__ = "04/03/2019"
 
-import tomwer.core.process.reconstruction.axis
-from ..utils import WidgetLongProcessing
+import copy
+import functools
+import logging
+
 from orangewidget import gui
-from orangecontrib.tomwer.orange.managedprocess import SuperviseOW
 from orangewidget.settings import Setting
-from orangecontrib.tomwer.orange.settings import CallbackSettingsHandler
 from orangewidget.widget import Input, Output
-from processview.gui.processmanager import ProcessManager
-from processview.core.manager import DatasetState
 from processview.core import helpers as pv_helpers
-from tomwer.core.process.reconstruction.axis.mode import AxisMode
-from tomwer.synctools.stacks.reconstruction.axis import AxisProcessStack
+from processview.core.manager import DatasetState
+from processview.gui.processmanager import ProcessManager
+from silx.gui import qt
+
+import tomwer.core.process.reconstruction.axis
+from orangecontrib.tomwer.orange.managedprocess import SuperviseOW
+from orangecontrib.tomwer.orange.settings import CallbackSettingsHandler
+from tomwer.core import settings, utils
 from tomwer.core.process.reconstruction.axis import AxisProcess
-from tomwer.synctools.axis import QAxisRP
-from tomwer.gui.reconstruction.axis import AxisWindow
-from tomwer.core.scan.scanbase import TomwerScanBase
+from tomwer.core.process.reconstruction.axis.mode import AxisMode
 from tomwer.core.scan.hdf5scan import HDF5TomoScan
-from tomwer.core.scan.scanbase import _TomwerBaseDock
-from silx.gui import qt
-from tomwer.core import settings
-from tomwer.core import utils
-import functools
-import copy
+from tomwer.core.scan.scanbase import TomwerScanBase, _TomwerBaseDock
+from tomwer.gui.reconstruction.axis import AxisWindow
+from tomwer.synctools.axis import QAxisRP
+from tomwer.synctools.stacks.reconstruction.axis import AxisProcessStack
 
-import logging
+from ..utils import WidgetLongProcessing
 
 logger = logging.getLogger(__name__)
 
@@ -116,8 +116,7 @@ class AxisOW(SuperviseOW, WidgetLongProcessing):
         if axis_params is not None:
             if not isinstance(axis_params, QAxisRP):
                 raise TypeError(
-                    "axis_params should be an instance of "
-                    "QAxisRP. Not {}".format(type(axis_params))
+                    f"axis_params should be an instance of QAxisRP. Not {type(axis_params)}"
                 )
         self._axis_params = axis_params or QAxisRP()
 
@@ -128,7 +127,7 @@ class AxisOW(SuperviseOW, WidgetLongProcessing):
             try:
                 self._axis_params.load_from_dict(axis_params_settings)
             except Exception as e:
-                logger.error(f"fail to load reconstruction settings: {str(e)}")
+                logger.error(f"fail to load reconstruction settings: {e}")
 
         #  gui settings
         gui_settings = self._ewoks_default_inputs.get("gui", {})
@@ -321,15 +320,11 @@ class AxisOW(SuperviseOW, WidgetLongProcessing):
                 self.__scan._axis_params.set_relative_value(
                     self._axis_params.relative_cor_value
                 )
+                _cor_value = self.__scan.axis_params.relative_cor_value
                 pv_helpers.notify_succeed(
                     process=self,
                     dataset=self.__scan,
-                    details="axis calculation defined for {}: {} (using {})"
-                    "".format(
-                        str(self.__scan.path),
-                        str(self.__scan.axis_params.relative_cor_value),
-                        "manual",
-                    ),
+                    details=f"axis calculation defined for {self.__scan.path}: {_cor_value} (using manual)",
                 )
             # validate the center of rotation
             pm = ProcessManager()

orangecontrib/tomwer/widgets/reconstruction/CastNabuVolumeOW.py

@@ -27,25 +27,27 @@ __authors__ = ["H. Payno"]
 __license__ = "MIT"
 __date__ = "15/12/2021"
 
+import logging
 from typing import Optional
 
+from orangewidget import gui
+from orangewidget.settings import Setting
+from orangewidget.widget import Input, Output
 from processview.core.manager.manager import DatasetState, ProcessManager
+from silx.gui import qt
+
+import tomwer.core.process.reconstruction.nabu.castvolume
+from orangecontrib.tomwer.widgets.utils import WidgetLongProcessing
 from tomwer.core import settings
 from tomwer.core.cluster.cluster import SlurmClusterConfiguration
 from tomwer.core.futureobject import FutureTomwerObject
-from ...orange.managedprocess import SuperviseOW
-from orangecontrib.tomwer.widgets.utils import WidgetLongProcessing
-from orangewidget.settings import Setting
-from orangewidget import gui
-from orangewidget.widget import Input, Output
-from silx.gui import qt
 from tomwer.core.scan.scanbase import TomwerScanBase
-from tomwer.synctools.stacks.reconstruction.castvolume import CastVolumeProcessStack
-import tomwer.core.process.reconstruction.nabu.castvolume
-from tomwer.gui.reconstruction.nabu.castvolume import CastVolumeWidget
-from tomwer.core.volume.volumebase import TomwerVolumeBase
 from tomwer.core.utils import isLowOnMemory
-import logging
+from tomwer.core.volume.volumebase import TomwerVolumeBase
+from tomwer.gui.reconstruction.nabu.castvolume import CastVolumeWidget
+from tomwer.synctools.stacks.reconstruction.castvolume import CastVolumeProcessStack
+
+from ...orange.managedprocess import SuperviseOW
 
 _logger = logging.getLogger(__name__)
 

orangecontrib/tomwer/widgets/reconstruction/DarkRefAndCopyOW.py

@@ -28,23 +28,25 @@ __license__ = "MIT"
 __date__ = "10/01/2018"
 
 
+import copy
 import logging
-from ..utils import WidgetLongProcessing
-from silx.gui import qt
+
+import tomoscan.esrf.scan.utils
 from orangewidget import gui
-from orangecontrib.tomwer.orange.managedprocess import SuperviseOW
 from orangewidget.settings import Setting
 from orangewidget.widget import Input, Output
+from processview.core.manager import DatasetState, ProcessManager
+from silx.gui import qt
+
+import tomwer.core.process.reconstruction.darkref.darkrefscopy
+from orangecontrib.tomwer.orange.managedprocess import SuperviseOW
 from tomwer.core.scan.scanbase import TomwerScanBase
 from tomwer.gui.reconstruction.darkref.darkrefcopywidget import DarkRefAndCopyWidget
 from tomwer.synctools.darkref import QDKRFRP
 from tomwer.synctools.stacks.reconstruction.dkrefcopy import DarkRefCopyProcessStack
-from processview.core.manager import DatasetState
-from processview.core.manager import ProcessManager
-import tomoscan.esrf.scan.utils
 from tomwer.utils import docstring
-import tomwer.core.process.reconstruction.darkref.darkrefscopy
-import copy
+
+from ..utils import WidgetLongProcessing
 
 _logger = logging.getLogger(__name__)
 
@@ -245,7 +247,7 @@ class DarkRefAndCopyOW(SuperviseOW, WidgetLongProcessing):
                     reduced_frames=scan.reduced_flats, scan=scan
                 )
             )
-        _logger.info("{} ended".format(str(scan)))
+        _logger.info(f"{scan} ended")
 
     def setReducedDarks(self, darks: dict):
         self.widget._refCopyWidget.save_darks_to_be_copied(darks)

orangecontrib/tomwer/widgets/reconstruction/NabuOW.py

@@ -28,25 +28,27 @@ __license__ = "MIT"
 __date__ = "14/02/2020"
 
 
+import copy
 import logging
-from typing import Optional
-from tomwer.core.volume.volumefactory import VolumeFactory
-import tomwer.core.process.reconstruction.nabu.nabuslices
 from contextlib import AbstractContextManager
-from silx.gui import qt
-from tomwer.synctools.stacks.reconstruction.nabu import NabuSliceProcessStack
-from tomwer.core.process.reconstruction.nabu.nabuslices import NabuSlices
-from tomwer.gui.reconstruction.nabu.slices import NabuWindow
-from tomwer.core.scan.scanbase import TomwerScanBase
-from ..utils import WidgetLongProcessing
-from orangewidget.settings import Setting
+from typing import Optional
+
 from orangewidget import gui
-from tomwer.core.scan.scanbase import _TomwerBaseDock
+from orangewidget.settings import Setting
 from orangewidget.widget import Input, Output
-from ...orange.managedprocess import SuperviseOW
+from silx.gui import qt
+
+import tomwer.core.process.reconstruction.nabu.nabuslices
 from tomwer.core.cluster import SlurmClusterConfiguration
 from tomwer.core.futureobject import FutureTomwerObject
-import copy
+from tomwer.core.process.reconstruction.nabu.nabuslices import NabuSlices
+from tomwer.core.scan.scanbase import TomwerScanBase, _TomwerBaseDock
+from tomwer.core.volume.volumefactory import VolumeFactory
+from tomwer.gui.reconstruction.nabu.slices import NabuWindow
+from tomwer.synctools.stacks.reconstruction.nabu import NabuSliceProcessStack
+
+from ...orange.managedprocess import SuperviseOW
+from ..utils import WidgetLongProcessing
 
 _logger = logging.getLogger(__name__)
 
@@ -190,7 +192,7 @@ class NabuOW(WidgetLongProcessing, SuperviseOW):
         scan_ = copy.copy(scan)
         scan_.clear_latest_reconstructions()
 
-        _logger.info("add {} to the stack".format(str(scan)))
+        _logger.info(f"add {scan} to the stack")
         # update the reconstruction mode if possible
         self._nabuWidget.setScan(scan_)
         self._processingStack.add(scan_, self.getConfiguration())

orangecontrib/tomwer/widgets/reconstruction/NabuVolumeOW.py

@@ -28,32 +28,35 @@ __license__ = "MIT"
 __date__ = "14/02/2020"
 
 
+import copy
+import functools
 import logging
+from collections.abc import Iterable
 from contextlib import AbstractContextManager
+
+from orangewidget import gui
+from orangewidget.settings import Setting
+from orangewidget.widget import Input, Output
 from silx.gui import qt
-from tomwer.synctools.stacks.reconstruction.nabu import NabuVolumeProcessStack
-from tomwer.core.process.reconstruction.nabu.nabuvolume import NabuVolume
-from tomwer.gui.reconstruction.nabu.volume import NabuVolumeWindow
-from tomwer.core.scan.scanbase import TomwerScanBase
+from tomoscan.identifier import VolumeIdentifier
+
+import tomwer.core.process.reconstruction.nabu.nabuvolume
+from orangecontrib.tomwer.widgets.utils import WidgetLongProcessing
+from tomwer.core import settings
 from tomwer.core.cluster import SlurmClusterConfiguration
 from tomwer.core.futureobject import FutureTomwerObject
-from orangecontrib.tomwer.widgets.utils import WidgetLongProcessing
-from tomwer.core.volume.volumefactory import VolumeFactory
-from orangewidget.settings import Setting
-from orangewidget import gui
-from orangewidget.widget import Input, Output
-from ...orange.managedprocess import SuperviseOW
 from tomwer.core.process.reconstruction.nabu import utils as nabu_utils
+from tomwer.core.process.reconstruction.nabu.nabuvolume import NabuVolume
+from tomwer.core.scan.scanbase import TomwerScanBase
 from tomwer.core.utils.char import BETA_CHAR, DELTA_CHAR
-from collections.abc import Iterable
-from tomwer.utils import docstring
-from tomwer.core import settings
-import tomwer.core.process.reconstruction.nabu.nabuvolume
-from tomwer.core.volume.volumebase import TomwerVolumeBase
 from tomwer.core.utils.scanutils import format_output_location
-from tomoscan.identifier import VolumeIdentifier
-import functools
-import copy
+from tomwer.core.volume.volumebase import TomwerVolumeBase
+from tomwer.core.volume.volumefactory import VolumeFactory
+from tomwer.gui.reconstruction.nabu.volume import NabuVolumeWindow
+from tomwer.synctools.stacks.reconstruction.nabu import NabuVolumeProcessStack
+from tomwer.utils import docstring
+
+from ...orange.managedprocess import SuperviseOW
 
 _logger = logging.getLogger(__name__)
 
@@ -202,10 +205,8 @@ class NabuVolumeOW(WidgetLongProcessing, SuperviseOW):
         # insure we are able to reconstruct
         if scan.nabu_recons_params in ({}, None):
             _logger.error(
-                "No reconstruction parameters found from nabu "
-                "slices for {}. You should first run slice "
-                "reconstruction prior to volume reconstruction"
-                "".format(str(scan))
+                f"No reconstruction parameters found from nabu slices for {scan}. "
+                "You should first run slice reconstruction prior to volume reconstruction"
             )
             self.Outputs.data.send(scan)
             self.sigScanReady.emit(scan)
@@ -235,9 +236,7 @@ class NabuVolumeOW(WidgetLongProcessing, SuperviseOW):
                     pass
             if len(pag_dbs) > 1:
                 _logger.warning(
-                    "Several value found for {} / {}. Volume"
-                    "reconstruction take one at most."
-                    "".format(DELTA_CHAR, BETA_CHAR)
+                    f"Several value found for {DELTA_CHAR} / {BETA_CHAR}. Volume reconstruction take one at most."
                 )
                 timeout = NabuVolumeOW.TIMEOUT if settings.isOnLbsram(scan) else None
                 self._dialogDB = _DeltaBetaSelectorDialog(
@@ -372,13 +371,10 @@ class _DeltaBetaSelectorDialog(qt.QDialog):
         self.layout().addWidget(self._buttons)
         self._timeout = timeout
         if self._timeout is None:
-            self.setWindowTitle(
-                "Select one value for {} / {}".format(DELTA_CHAR, BETA_CHAR)
-            )
+            self.setWindowTitle(f"Select one value for {DELTA_CHAR} / {BETA_CHAR}")
         else:
             self.setWindowTitle(
-                "Select one value for {} / {}. (close automatically in {} "
-                "sec.)".format(DELTA_CHAR, BETA_CHAR, self._timeout)
+                f"Select one value for {DELTA_CHAR} / {BETA_CHAR}. (close automatically in {self._timeout} sec.)"
             )
 
         # connect signal / slot
@@ -416,8 +412,7 @@ class _DeltaBetaSelectorDialog(qt.QDialog):
             self.reject()
         else:
             self.setWindowTitle(
-                "Select one value for {} / {}. (close automatically in {} "
-                "sec.)".format(DELTA_CHAR, BETA_CHAR, self._timeout)
+                f"Select one value for {DELTA_CHAR} / {BETA_CHAR}. (close automatically in {self._timeout} sec.)"
             )
             self._displayTimer.start(1000)
 

orangecontrib/tomwer/widgets/reconstruction/SAAxisOW.py

@@ -28,31 +28,32 @@ __license__ = "MIT"
 __date__ = "01/02/2021"
 
 
-from ..utils import WidgetLongProcessing
+import functools
+import logging
+from typing import Union
+
 from orangewidget import gui
-from orangecontrib.tomwer.orange.managedprocess import SuperviseOW
 from orangewidget.settings import Setting
-from orangecontrib.tomwer.orange.settings import CallbackSettingsHandler
 from orangewidget.widget import Input, Output
-from tomwer.synctools.stacks.reconstruction.saaxis import SAAxisProcessStack
-from tomwer.synctools.saaxis import QSAAxisParams
-from tomwer.synctools.axis import QAxisRP
-from tomwer.core.process.reconstruction.axis import AxisProcess
-from tomwer.core.scan.scanbase import TomwerScanBase
+from processview.core import helpers as pv_helpers
+from processview.core.manager import DatasetState, ProcessManager
 from silx.gui import qt
-from tomwer.gui.reconstruction.saaxis.saaxis import SAAxisWindow as _SAAxisWindow
-from processview.core.manager import ProcessManager, DatasetState
-from tomwer.core import settings
-from tomwer.core import utils
-from tomwer.core.process.reconstruction.saaxis.saaxis import SAAxisProcess
-from tomwer.core.scan.scanbase import _TomwerBaseDock
+
 import tomwer.core.process.reconstruction.saaxis.saaxis
+from orangecontrib.tomwer.orange.managedprocess import SuperviseOW
+from orangecontrib.tomwer.orange.settings import CallbackSettingsHandler
+from tomwer.core import settings, utils
 from tomwer.core.cluster import SlurmClusterConfiguration
 from tomwer.core.futureobject import FutureTomwerObject
-from processview.core import helpers as pv_helpers
-import functools
-import logging
-from typing import Union
+from tomwer.core.process.reconstruction.axis import AxisProcess
+from tomwer.core.process.reconstruction.saaxis.saaxis import SAAxisProcess
+from tomwer.core.scan.scanbase import TomwerScanBase, _TomwerBaseDock
+from tomwer.gui.reconstruction.saaxis.saaxis import SAAxisWindow as _SAAxisWindow
+from tomwer.synctools.axis import QAxisRP
+from tomwer.synctools.saaxis import QSAAxisParams
+from tomwer.synctools.stacks.reconstruction.saaxis import SAAxisProcessStack
+
+from ..utils import WidgetLongProcessing
 
 _logger = logging.getLogger(__name__)
 
@@ -100,7 +101,7 @@ class SAAxisWindow(_SAAxisWindow):
         else:
             axis_params_info = self.getQAxisRP().get_simple_str()
 
-            text = "start automatic cor for {} with {}".format(scan, axis_params_info)
+            text = f"start automatic cor for {scan} with {axis_params_info}"
             _logger.inform(text)
             cor_estimation_process = AxisProcess(
                 inputs={
@@ -113,10 +114,7 @@ class SAAxisWindow(_SAAxisWindow):
             try:
                 cor_estimation_process.run()
             except Exception as e:
-                text = (
-                    "Unable to run automatic cor calculation. Reason is "
-                    "{}.".format(e)
-                )
+                text = f"Unable to run automatic cor calculation. Reason is {e}"
                 _logger.error(text)
                 msg = qt.QMessageBox(self)
                 msg.setIcon(qt.QMessageBox.Critical)
@@ -125,9 +123,7 @@ class SAAxisWindow(_SAAxisWindow):
                 return None
             else:
                 cor = scan.axis_params.relative_cor_value
-                text = "automatic cor computed for {}: {} ({})".format(
-                    scan, cor, axis_params_info
-                )
+                text = f"automatic cor computed for {scan}: {cor} ({axis_params_info})"
                 _logger.inform(text)
                 self.setEstimatedCorPosition(value=cor)
                 self.getAutomaticCorWindow().hide()
@@ -198,7 +194,7 @@ class SAAxisWindow(_SAAxisWindow):
         if details is None:
             details = ""
         if selected_cor_value is None:
-            infos = "no selected cor value. {} skip SAAXIS".format(scan)
+            infos = f"no selected cor value. {scan} skip SAAXIS"
             infos = "\n".join((infos, details))
             _logger.warning(infos)
             scan.axis_params.set_relative_value(None)
@@ -213,11 +209,9 @@ class SAAxisWindow(_SAAxisWindow):
                 scan.nabu_recons_params["reconstruction"][
                     "rotation_axis_position"
                 ] = scan.axis_params.absolute_cor_value
-            infos = "cor selected for {}: relative: {}, absolute: {}".format(
-                scan,
-                scan.axis_params.relative_cor_value,
-                scan.axis_params.absolute_cor_value,
-            )
+            r_cor = scan.axis_params.relative_cor_value
+            a_cor = scan.axis_params.absolute_cor_value
+            infos = f"cor selected for {scan}: relative: {r_cor}, absolute: {a_cor}"
             infos = "\n".join((infos, details))
             pv_helpers.notify_succeed(
                 process=self._processing_stack, dataset=scan, details=infos
@@ -404,8 +398,7 @@ class SAAxisOW(SuperviseOW, WidgetLongProcessing):
         ):
             self.notify_skip(
                 scan=scan,
-                details="saaxis has been skiped for {} because "
-                "of low space in lbsram".format(scan),
+                details=f"saaxis has been skiped for {scan} because of low space in lbsram",
             )
             self.Outputs.data.send(scan)
         else:

orangecontrib/tomwer/widgets/reconstruction/SADeltaBetaOW.py

@@ -28,30 +28,32 @@ __license__ = "MIT"
 __date__ = "04/05/2021"
 
 
-from ..utils import WidgetLongProcessing
+import functools
+import logging
+
 from orangewidget import gui
-from orangecontrib.tomwer.orange.managedprocess import SuperviseOW
 from orangewidget.settings import Setting
-from orangecontrib.tomwer.orange.settings import CallbackSettingsHandler
 from orangewidget.widget import Input, Output
-from tomwer.core.process.reconstruction.sadeltabeta import SADeltaBetaProcess
-from tomwer.synctools.stacks.reconstruction.sadeltabeta import SADeltaBetaProcessStack
-from tomwer.synctools.sadeltabeta import QSADeltaBetaParams
-from tomwer.synctools.axis import QAxisRP
+from processview.core import helpers as pv_helpers
+from processview.core.manager import DatasetState, ProcessManager
 from silx.gui import qt
-from tomwer.gui.reconstruction.sadeltabeta import (
-    SADeltaBetaWindow as _SADeltaBetaWindow,
-)
-from tomwer.core.scan.scanbase import TomwerScanBase, _TomwerBaseDock
-from processview.core.manager import ProcessManager, DatasetState
+
 import tomwer.core.process.reconstruction.sadeltabeta.sadeltabeta
-from tomwer.core import settings
-from tomwer.core import utils
+from orangecontrib.tomwer.orange.managedprocess import SuperviseOW
+from orangecontrib.tomwer.orange.settings import CallbackSettingsHandler
+from tomwer.core import settings, utils
 from tomwer.core.cluster import SlurmClusterConfiguration
 from tomwer.core.futureobject import FutureTomwerObject
-from processview.core import helpers as pv_helpers
-import functools
-import logging
+from tomwer.core.process.reconstruction.sadeltabeta import SADeltaBetaProcess
+from tomwer.core.scan.scanbase import TomwerScanBase, _TomwerBaseDock
+from tomwer.gui.reconstruction.sadeltabeta import (
+    SADeltaBetaWindow as _SADeltaBetaWindow,
+)
+from tomwer.synctools.axis import QAxisRP
+from tomwer.synctools.sadeltabeta import QSADeltaBetaParams
+from tomwer.synctools.stacks.reconstruction.sadeltabeta import SADeltaBetaProcessStack
+
+from ..utils import WidgetLongProcessing
 
 _logger = logging.getLogger(__name__)
 
@@ -129,9 +131,7 @@ class SADeltaBetaWindow(_SADeltaBetaWindow):
             self.getCurrentDeltaBetaValue() or scan.sa_delta_beta_params.autofocus
         )
         if selected_db_value is None:
-            infos = "no selected delta / beta value. {} skip SADeltaBetaParams".format(
-                scan
-            )
+            infos = f"no selected delta / beta value. {scan} skip SADeltaBetaParams"
             _logger.warning(infos)
             scan.sa_delta_beta_params.set_db_selected_value(None)
             pv_helpers.notify_skip(
@@ -143,9 +143,8 @@ class SADeltaBetaWindow(_SADeltaBetaWindow):
                 if "phase" not in scan.nabu_recons_params:
                     scan.nabu_recons_params["phase"] = {}
                 scan.nabu_recons_params["phase"]["delta_beta"] = (selected_db_value,)
-            infos = "delta / beta selected for {}: {},".format(
-                scan, scan.sa_delta_beta_params.value
-            )
+            _db_value = scan.sa_delta_beta_params.value
+            infos = f"delta / beta selected for {scan}: {_db_value}"
             pv_helpers.notify_succeed(
                 process=self._processing_stack, dataset=scan, details=infos
             )
@@ -330,8 +329,7 @@ class SADeltaBetaOW(SuperviseOW, WidgetLongProcessing):
         ):
             self.notify_skip(
                 scan=scan,
-                details="sa-delta-beta has been skiped for {} because "
-                "of low space in lbsram".format(scan),
+                details=f"sa-delta-beta has been skiped for {scan} because of low space in lbsram",
             )
             self.Outputs.data.send(scan)
         else:

orangecontrib/tomwer/widgets/reconstruction/SinoNormOW.py

@@ -30,30 +30,29 @@ __license__ = "MIT"
 __date__ = "19/07/2021"
 
 
+import functools
 import logging
-from silx.gui import qt
-from tomwer.core.scan.scanbase import TomwerScanBase
-from orangecontrib.tomwer.widgets.utils import WidgetLongProcessing
-from orangewidget.settings import Setting
+
 from orangewidget import gui
+from orangewidget.settings import Setting
 from orangewidget.widget import Input, Output
-from ...orange.managedprocess import SuperviseOW
+from processview.core.manager import DatasetState, ProcessManager
+from silx.gui import qt
+from tomoscan.normalization import Method as NormMethod
+
+from orangecontrib.tomwer.widgets.utils import WidgetLongProcessing
+from tomwer.core import settings, utils
+from tomwer.core.process.reconstruction.normalization import SinoNormalizationTask
+from tomwer.core.process.reconstruction.normalization.params import _ValueSource
+from tomwer.core.scan.scanbase import TomwerScanBase
 from tomwer.gui.reconstruction.normalization.intensity import (
     SinoNormWindow as _SinoNormWindow,
 )
 from tomwer.synctools.stacks.reconstruction.normalization import (
     INormalizationProcessStack,
 )
-from processview.core.manager import ProcessManager
-from processview.core.manager import DatasetState
-from tomwer.core.process.reconstruction.normalization import (
-    SinoNormalizationTask,
-)
-from tomwer.core import settings
-from tomwer.core import utils
-from tomoscan.normalization import Method as NormMethod
-from tomwer.core.process.reconstruction.normalization.params import _ValueSource
-import functools
+
+from ...orange.managedprocess import SuperviseOW
 
 _logger = logging.getLogger(__name__)
 
@@ -193,8 +192,7 @@ class SinoNormOW(WidgetLongProcessing, SuperviseOW):
     def process(self, scan: TomwerScanBase):
         if not isinstance(scan, (TomwerScanBase, type(None))):
             raise TypeError(
-                "scan should be None or an instance of "
-                "TomwerScanBase. Not {}".format(type(scan))
+                f"scan should be None or an instance of TomwerScanBase. Not {(type(scan))}",
             )
         if scan is None:
             return
@@ -203,7 +201,7 @@ class SinoNormOW(WidgetLongProcessing, SuperviseOW):
         if settings.isOnLbsram(scan) and utils.isLowOnMemory(
             settings.get_lbsram_path()
         ):
-            details = "skip {} because low memory on lbsram".format(str(scan))
+            details = f"skip {scan} because low memory on lbsram"
             self.notify_skip(scan=scan, details=details)
             self.Outputs.data_out.send(scan)
         else: