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

tomwer/core/process/reconstruction/nabu/utils.py

@@ -1,37 +1,9 @@
 # coding: utf-8
-# /*##########################################################################
-#
-# Copyright (c) 2016-2020 European Synchrotron Radiation Facility
-#
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to deal
-# in the Software without restriction, including without limitation the rights
-# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-# copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-#
-# The above copyright notice and this permission notice shall be included in
-# all copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-# THE SOFTWARE.
-#
-# ###########################################################################*/
-
-__authors__ = ["H. Payno"]
-__license__ = "MIT"
-__date__ = "06/08/2020"
-
+from __future__ import annotations
 
 import datetime
 import logging
 import os
-import typing
 from contextlib import AbstractContextManager
 
 from nabu.pipeline.config import generate_nabu_configfile, parse_nabu_config_file
@@ -78,7 +50,7 @@ def retrieve_lst_of_value_from_str(my_string: str, type_) -> tuple:
     Return a list of value from a string like '12,23' or '(12, 23)',
     '[12;23]', '12;23' or with the pattern from:to:step like '0:10:1'
 
-    :param str mystring:
+    :param mystring:
     :return: list of single value
     """
     if not isinstance(my_string, str):
@@ -113,31 +85,10 @@ def retrieve_lst_of_value_from_str(my_string: str, type_) -> tuple:
         return tuple(res)
 
 
-def get_nabu_resources_desc(scan: TomwerScanBase, method, workers=1) -> dict:
-    """
-    Create the descriptor of nabu's resources
-
-    :param TomwerScanBase scan:
-    :param str method:
-    :return: nabu's description of resources to be used
-    """
-    assert isinstance(scan, TomwerScanBase)
-    res = {
-        "method": method,
-        "cpu_workers": workers,
-        "partition": "gpu",
-        "memory_per_node": "90%",
-        "threads_per_node": "100%",
-    }
-    return res
-
-
-def get_nabu_about_desc(overwrite) -> dict:
+def get_nabu_about_desc(overwrite: bool) -> dict:
     """
-    Create the description for nabu's about
+    Create the description for nabu's 'about'
 
-    :param self:
-    :return:
     """
     return {"overwrite_results": str(bool(overwrite))}
 
@@ -147,7 +98,7 @@ def get_recons_volume_identifier(
     location: str,
     file_format: str,
     scan: TomwerScanBase,
-    slice_index: typing.Union[int, None],
+    slice_index: int | None,
     axis: NabuPlane,
 ) -> tuple:
     """
@@ -240,11 +191,11 @@ def get_multi_cor_recons_volume_identifiers(
     """
     util to retrieve Volumes (identifier) reconstructed by nabu-multicor
 
-    :param TomwerScanBase scan: scam processed by the nabu-multicor
-    :param str location: location of the files
-    :param tuple cors: cors for which we want the reconstructed slices. As this extension is created by nabu
+    :param scan: scam processed by the nabu-multicor
+    :param location: location of the files
+    :param cors: cors for which we want the reconstructed slices. As this extension is created by nabu
                        the cor reference is in absolute.
-    :param str file_format: file format of the reconstruction
+    :param file_format: file format of the reconstruction
 
     :return: a dict with absolute cor value as key and the Volume identifier as value
     """
@@ -442,7 +393,7 @@ class RingCorrectionMethod(_Enum):
     MEAN_DIVISION = "mean-division"
 
 
-def nabu_std_err_has_error(errs: typing.Optional[bytes]):
+def nabu_std_err_has_error(errs: bytes | None):
     """
     small util to parse stderr where some warning can exists.
     But I don't think we want to catch all warnings from nabu so this is a (bad) concession
@@ -513,7 +464,7 @@ def update_cfg_file_after_transfer(config_file_path, old_path, new_path):
 
 
 def slice_index_to_int(
-    slice_index: typing.Union[int, str],
+    slice_index: int | str,
     scan: TomwerScanBase,
     axis=NabuPlane.XY,
 ) -> int:

tomwer/core/process/reconstruction/normalization/normalization.py

@@ -1,38 +1,9 @@
 # coding: utf-8
-# /*##########################################################################
-#
-# Copyright (c) 2016-2017 European Synchrotron Radiation Facility
-#
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to deal
-# in the Software without restriction, including without limitation the rights
-# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-# copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-#
-# The above copyright notice and this permission notice shall be included in
-# all copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-# THE SOFTWARE.
-#
-# ###########################################################################*/
+
 """
 material for radio and sinogram normalization
 """
-
-
-__authors__ = [
-    "H. Payno",
-]
-__license__ = "MIT"
-__date__ = "25/06/2021"
-
+from __future__ import annotations
 
 import functools
 import logging
@@ -208,7 +179,6 @@ class SinoNormalizationTask(
         :param end_y:
         :param calc_area:
         :return:
-        :rtype: dict
         """
         if start_x is None or end_x is None or start_y is None or end_y is None:
             raise ValueError("min_x, max_x, min_y and max_y should all be provided.")

tomwer/core/process/reconstruction/normalization/params.py

@@ -1,40 +1,8 @@
 # coding: utf-8
-# /*##########################################################################
-#
-# Copyright (c) 2016-2017 European Synchrotron Radiation Facility
-#
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to deal
-# in the Software without restriction, including without limitation the rights
-# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-# copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-#
-# The above copyright notice and this permission notice shall be included in
-# all copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-# THE SOFTWARE.
-#
-# ###########################################################################*/
 """
 material for radio and sinogram normalization
 """
-
-
-__authors__ = [
-    "H. Payno",
-]
-__license__ = "MIT"
-__date__ = "25/06/2021"
-
-
-import typing
+from __future__ import annotations
 
 from silx.utils.enum import Enum as _Enum
 from tomoscan.normalization import Method
@@ -70,7 +38,7 @@ class _DatasetInfos:
         return self._scope
 
     @scope.setter
-    def scope(self, scope: typing.Union[str, _DatasetScope]):
+    def scope(self, scope: str | _DatasetScope):
         self._scope = _DatasetScope.from_value(scope)
 
     @property
@@ -115,7 +83,7 @@ class SinoNormalizationParams:
         return self._method
 
     @method.setter
-    def method(self, method: typing.Union[str, Method, None]):
+    def method(self, method: str | Method | None):
         if method is None:
             method = Method.NONE
         self._method = Method.from_value(method)

tomwer/core/process/reconstruction/output.py

@@ -4,22 +4,17 @@ import logging
 from silx.utils.enum import Enum as _Enum
 from tomwer.io.utils.raw_and_processed_data import (
     to_processed_data_path,
-    to_raw_data_path,
 )
 from tomwer.core.scan.scanbase import TomwerScanBase
+from tomwer.core.process.output import ProcessDataOutputDirMode
 from tomwer.core.utils.scanutils import format_output_location
 
 _logger = logging.getLogger(__name__)
 
 
-PROCESS_FOLDER_NAME = "reconstructed_volumes"
+PROCESS_FOLDER_RECONSTRUCTED_VOLUMES = "reconstructed_volumes"
 
-
-class ProcessDataOutputDirMode(_Enum):
-    IN_SCAN_FOLDER = "same folder as scan"
-    PROCESSED_DATA_FOLDER = "PROCESSED_DATA folder"
-    RAW_DATA_FOLDER = "RAW_DATA folder"
-    OTHER = "other"
+PROCESS_FOLDER_RECONSTRUCTED_SLICES = "reconstructed_slices"
 
 
 class NabuOutputFileFormat(_Enum):
@@ -59,8 +54,16 @@ def get_output_folder_from_scan(
     nabu_location: str | None,
     file_basename: str,
     file_format: NabuOutputFileFormat,
+    processed_data_folder_name: str | None,
 ) -> tuple[str, str]:
     """
+
+    :param mode: output mode, should save this to raw data, processed data...
+    :param scan: scan for which we want to get the output folder
+    :param nabu_location: output location provided by user (in case mode is 'other')
+    :param file_basename: file basename to take in order to create output files
+    :param file_format: output volume format (edf...)
+    :param processed_data_folder_name: name of the processed data folder. Like 'reconstructed_volumes' or 'reconstructed_slices'...
     :return: (location, location_cfg_files). Location is the nabu configuration field 'output/location' 'location_cfg_files' is the information on where to save the nabu configuration file
 
     """
@@ -68,27 +71,22 @@ def get_output_folder_from_scan(
     file_format = NabuOutputFileFormat.from_value(file_format)
 
     if output_mode is ProcessDataOutputDirMode.OTHER and nabu_location in ("", None):
-        _logger.info(
-            "output dir requested is other bit no path provided. Fall back on the output dir to the scan folder"
+        _logger.error(
+            "'other' output dir requested but no path provided. Fall back on the output dir to the scan folder"
         )
         # note: this is only an info because we expect to pass by this one for all .ows configuration (before 1.3 version)
         # as there was no different option by the time
         output_mode = ProcessDataOutputDirMode.IN_SCAN_FOLDER
 
     if output_mode is ProcessDataOutputDirMode.OTHER:
-        assert nabu_location not in (
-            "",
-            None,
-        ), "nabu_location not provided when expected"
         location = format_output_location(nabu_location, scan=scan)
         location_cfg_files = location
     elif output_mode in (
         ProcessDataOutputDirMode.IN_SCAN_FOLDER,
         ProcessDataOutputDirMode.PROCESSED_DATA_FOLDER,
-        ProcessDataOutputDirMode.RAW_DATA_FOLDER,
     ):
         # otherwise default location will be the data root level
-        location = os.path.join(scan.path, PROCESS_FOLDER_NAME)
+        location = os.path.join(scan.path, processed_data_folder_name)
         location_cfg_files = location
         if file_format in (
             NabuOutputFileFormat.EDF.value,
@@ -99,9 +97,6 @@ def get_output_folder_from_scan(
         if output_mode is ProcessDataOutputDirMode.PROCESSED_DATA_FOLDER:
             location = to_processed_data_path(location)
             location_cfg_files = to_processed_data_path(location_cfg_files)
-        if output_mode is ProcessDataOutputDirMode.RAW_DATA_FOLDER:
-            location = to_raw_data_path(location)
-            location_cfg_files = to_raw_data_path(location_cfg_files)
     else:
         raise NotImplementedError(f"mode {output_mode.value} is not implemented yet")
 

tomwer/core/process/reconstruction/paramsbase.py

@@ -1,32 +1,5 @@
 # coding: utf-8
-# /*##########################################################################
-#
-# Copyright (c) 2016-2017 European Synchrotron Radiation Facility
-#
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to deal
-# in the Software without restriction, including without limitation the rights
-# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-# copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-#
-# The above copyright notice and this permission notice shall be included in
-# all copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-# THE SOFTWARE.
-#
-# ###########################################################################*/
-
-__authors__ = ["H. Payno"]
-__license__ = "MIT"
-__date__ = "05/03/2019"
-
+from __future__ import annotations
 
 import copy
 import itertools
@@ -109,16 +82,14 @@ class _ReconsParam(object):
             self.__unmanaged_params[parameter] = value
             self.changed()
 
-    def to_unique_recons_set(self, as_to_dict=False) -> tuple:
+    def to_unique_recons_set(self, as_to_dict: bool = False) -> tuple:
         """
 
         :return: a tuple of unique reconstruction parameters in order to have
                  each parameter as a single value (and no list)
-        :param bool as_to_dict: True if we want to get the same value as if we
+        :param as_to_dict: True if we want to get the same value as if we
                                 where exporting it with to_dict function. There
                                 is some cast in the to_dict function.
-        :type: Union[tuple, None]
-        :rtype: tuple
         """
         params_list = OrderedDict()
         dict_values = self.to_dict()
@@ -174,7 +145,7 @@ class _ReconsParam(object):
         """
         copy parameters value from other_rp
 
-        :param _ReconsParam: reconsparam to copy
+        :param other_rp: reconsparam to copy
         """
         if other_rp is None:
             return

tomwer/core/process/reconstruction/saaxis/params.py

@@ -1,35 +1,7 @@
-# coding: utf-8
-# /*##########################################################################
-#
-# Copyright (c) 2016-2017 European Synchrotron Radiation Facility
-#
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to deal
-# in the Software without restriction, including without limitation the rights
-# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-# copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-#
-# The above copyright notice and this permission notice shall be included in
-# all copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-# THE SOFTWARE.
-#
-# ###########################################################################*/
-
-__authors__ = ["H. Payno"]
-__license__ = "MIT"
-__date__ = "18/02/2021"
-
-
-from collections.abc import Iterable
-from typing import Union
+from __future__ import annotations
+
+
+from typing import Iterable
 
 import numpy
 from silx.utils.enum import Enum as _Enum
@@ -88,7 +60,7 @@ class SAAxisParams(SABaseParams):
         self._mode = mode
 
     @property
-    def image_width(self) -> Union[None, float]:
+    def image_width(self) -> float | None:
         return self._image_width
 
     @image_width.setter

tomwer/core/process/reconstruction/saaxis/saaxis.py

@@ -1,40 +1,10 @@
-# coding: utf-8
-###########################################################################
-# Copyright (C) 2016 European Synchrotron Radiation Facility
-#
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to deal
-# in the Software without restriction, including without limitation the rights
-# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-# copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-#
-# The above copyright notice and this permission notice shall be included in
-# all copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-# THE SOFTWARE.
-#
-#############################################################################
-
 """contain the SAAxisProcess. Half automatic center of rotation calculation
 """
 
-__authors__ = [
-    "H.Payno",
-]
-__license__ = "MIT"
-__date__ = "10/02/2021"
-
+from __future__ import annotations
 
 import logging
 import os
-from typing import Optional
 
 import h5py
 import numpy
@@ -85,7 +55,6 @@ from tomwer.core.process.reconstruction.nabu.utils import (
 )
 from tomwer.core.process.reconstruction.nabu.nabuscores import _ReconstructorMultiCor
 
-from ..nabu import utils
 from .params import SAAxisParams
 
 _logger = logging.getLogger(__name__)
@@ -97,7 +66,7 @@ DEFAULT_RECONS_FOLDER = "multi_cor_results"
 def one_slice_several_cor(
     scan,
     configuration: dict,
-    process_id: Optional[int] = None,
+    process_id: int | None = None,
 ) -> tuple:
     """
     Run a slice reconstruction using nabu per Center Of Rotation (cor) provided
@@ -106,13 +75,12 @@ def one_slice_several_cor(
     .. warning:: if target if the slurm cluster this will wait for the processing to be done to return the result.
                  as this function is returning the result of the score process on reconstructed slices
 
-    :param TomwerScanBase scan:
-    :param dict configuration: nabu reconstruction parameters (can include 'slurm-cluster' key defining the slurm configuration)
-    :param int process_id: process id
+    :param scan:
+    :param configuration: nabu reconstruction parameters (can include 'slurm-cluster' key defining the slurm configuration)
+    :param process_id: process id
     :return: cor_reconstructions, outs, errs
              cor_reconstructions is a dictionary of cor as key and a tuple
              (url, score) as value
-    :rtype: tuple
     """
     task = SAAxisTask(
         process_id=process_id,
@@ -197,7 +165,7 @@ class SAAxisTask(
         self._dump_roi = dump
 
     @staticmethod
-    def autofocus(scan) -> Optional[float]:
+    def autofocus(scan) -> float | None:
         scores = scan.saaxis_params.scores
         if scores is None:
             return
@@ -258,9 +226,9 @@ class SAAxisTask(
         nabu_configuration["output"]["location"] = output_dir
         nabu_configuration["output"]["file_format"] = file_format
         # handle resources section
-        nabu_configuration["resources"] = utils.get_nabu_resources_desc(
-            scan=scan, workers=1, method="local"
-        )
+        nabu_configuration["resources"] = nabu_configuration.get("resources", {})
+        nabu_configuration["resources"]["method"] = "local"
+
         return nabu_configuration
 
     def _run_nabu_multicor(
@@ -270,7 +238,7 @@ class SAAxisTask(
         cors,
         slice_index,
         file_format,
-        cluster_config: Optional[dict],
+        cluster_config: dict | None,
         dry_run=False,
     ):
         if not (cluster_config is None or isinstance(cluster_config, dict)):
@@ -286,7 +254,7 @@ class SAAxisTask(
             file_format=file_format,
             cluster_config=cluster_config if cluster_config is not None else None,
             process_id=self.process_id,
-            instanciate_classes_only=True,
+            instantiate_classes_only=True,
             output_file_prefix_pattern="cor_{file_name}_{value}",  # as the cor is evolving, create different files to make sure the name will be unique
         )
 
@@ -371,7 +339,7 @@ class SAAxisTask(
         """
         compute score along the different slices
 
-        :param dict cor_reconstructions: key is expected to be a float with the cor value and the value is expected to be a volume identifier (volume with a single frame)
+        :param cor_reconstructions: key is expected to be a float with the cor value and the value is expected to be a volume identifier (volume with a single frame)
         """
         post_processing = _PostProcessing(
             slice_index=slice_index,
@@ -447,9 +415,12 @@ class SAAxisTask(
                 _logger.info(
                     f"{scan}: set estimated cor from previously computed cor ({params.estimated_cor})"
                 )
-        #  from scan.estimated_cor_position
-        if params.estimated_cor is None and scan.estimated_cor_frm_motor is not None:
-            params.estimated_cor = scan.estimated_cor_frm_motor
+        #  from scan.x_rotation_axis_pixel_position
+        if (
+            params.estimated_cor is None
+            and scan.x_rotation_axis_pixel_position is not None
+        ):
+            params.estimated_cor = scan.x_rotation_axis_pixel_position
             _logger.info(
                 f"{scan}: set estimated cor from motor position ({params.estimated_cor})"
             )

tomwer/core/process/reconstruction/sadeltabeta/params.py

@@ -1,34 +1,5 @@
 # coding: utf-8
-# /*##########################################################################
-#
-# Copyright (c) 2016-2017 European Synchrotron Radiation Facility
-#
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to deal
-# in the Software without restriction, including without limitation the rights
-# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-# copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-#
-# The above copyright notice and this permission notice shall be included in
-# all copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-# THE SOFTWARE.
-#
-# ###########################################################################*/
-
-__authors__ = ["H. Payno"]
-__license__ = "MIT"
-__date__ = "04/05/2021"
-
-
-import typing
+from __future__ import annotations
 
 from tomwer.core.process.reconstruction.nabu.utils import retrieve_lst_of_value_from_str
 from tomwer.core.process.reconstruction.scores.params import SABaseParams
@@ -59,7 +30,7 @@ class SADeltaBetaParams(SABaseParams):
         self._selected_db = value
 
     @property
-    def selected_delta_beta_value(self) -> typing.Union[None, float]:
+    def selected_delta_beta_value(self) -> float | None:
         return self._selected_db
 
     def to_dict(self) -> dict: