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

tomwer/core/process/reconstruction/tests/test_sadeltabeta.py

@@ -0,0 +1,48 @@
+# coding: utf-8
+from __future__ import annotations
+
+
+import os
+import shutil
+import tempfile
+import unittest
+
+from tomwer.core.process.reconstruction.sadeltabeta.sadeltabeta import (
+    SADeltaBetaParams,
+    SADeltaBetaTask,
+)
+from tomwer.core.utils.scanutils import MockNXtomo
+
+
+class TestSADeltaBetaProcess(unittest.TestCase):
+    """Test the SAAxisProcess class"""
+
+    def setUp(self) -> None:
+        super().setUp()
+        self.tempdir = tempfile.mkdtemp()
+        dim = 10
+        mock = MockNXtomo(
+            scan_path=self.tempdir, n_proj=10, n_ini_proj=10, scan_range=180, dim=dim
+        )
+        self.scan = mock.scan
+
+    def tearDown(self) -> None:
+        shutil.rmtree(self.tempdir)
+        super().tearDown()
+
+    def test(self):
+        process = SADeltaBetaTask(
+            inputs={
+                "data": self.scan,
+                "sa_delta_beta_params": SADeltaBetaParams().to_dict(),
+                "serialize_output_data": False,
+            }
+        )
+
+        default_sadelta_beta_params = SADeltaBetaParams()
+        default_sadelta_beta_params.output_dir = os.path.join(
+            self.tempdir, "output_dir"
+        )
+        default_sadelta_beta_params.dry_run = True
+
+        process.run()

tomwer/core/process/reconstruction/{test → tests}/test_utils.py

@@ -10,11 +10,11 @@ def test_cor_conversion():
     """
     test absolute_pos_to_relative and relative_pos_to_absolute functions
     """
-    assert relative_pos_to_absolute(relative_pos=0.0, det_width=100) == 49.5
-    assert relative_pos_to_absolute(relative_pos=0.0, det_width=101) == 50.0
+    assert relative_pos_to_absolute(relative_pos=0.0, det_width=100) == 50.0
+    assert relative_pos_to_absolute(relative_pos=0.0, det_width=101) == 50.5
 
-    assert absolute_pos_to_relative(absolute_pos=20, det_width=500) == -229.5
-    assert absolute_pos_to_relative(absolute_pos=300, det_width=500) == 50.5
+    assert absolute_pos_to_relative(absolute_pos=20, det_width=500) == -230.0
+    assert absolute_pos_to_relative(absolute_pos=300, det_width=500) == 50.0
 
     for det_width in (10, 20, 30, 50):
         for relative_cor_pos in (0, -2.3, -4.5):

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

@@ -1,12 +1,16 @@
 def relative_pos_to_absolute(relative_pos: float, det_width: int):
     """
-    convert relative center of rotation to absolute
+    Convert relative center of rotation to absolute.
     """
-    return relative_pos + (det_width - 1) / 2.0
+    # Compute the midpoint differently for even and odd widths
+    midpoint = det_width / 2.0
+    return relative_pos + midpoint
 
 
 def absolute_pos_to_relative(absolute_pos: float, det_width: int):
     """
-    convert absolute center of rotation to relative
+    Convert absolute center of rotation to relative.
     """
-    return absolute_pos - (det_width - 1) / 2.0
+    # Compute the midpoint differently for even and odd widths
+    midpoint = det_width / 2.0
+    return absolute_pos - midpoint

tomwer/core/process/script/python.py

@@ -1,31 +1,5 @@
 # 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.
-#
-#############################################################################*/
-
-
-__authors__ = ["H.Payno"]
-__license__ = "MIT"
-__date__ = "03/08/2020"
+from __future__ import annotations
 
 
 import code

tomwer/core/process/script/tests/test_script.py

@@ -0,0 +1,41 @@
+# coding: utf-8
+from __future__ import annotations
+
+import os
+import shutil
+import tempfile
+import unittest
+
+from tomwer.core.process.script.python import PythonScript
+from tomwer.core.utils.scanutils import MockNXtomo
+
+
+class TestPythonScript(unittest.TestCase):
+    def setUp(self):
+        self.tempdir = tempfile.mkdtemp()
+        dim = 10
+        mock = MockNXtomo(
+            scan_path=os.path.join(self.tempdir, "scan1"),
+            n_proj=10,
+            n_ini_proj=10,
+            scan_range=180,
+            dim=dim,
+        )
+        self.scan = mock.scan
+
+    def tearDown(self):
+        shutil.rmtree(self.tempdir)
+
+    def test(self):
+        process = PythonScript(inputs={"data": self.scan})
+        process.definition()
+        process.program_version()
+        process.program_name()
+        # TODO: configuration should be passed in inputs during construction
+        process.set_configuration(
+            {
+                "scriptText": "print('toto')",
+            }
+        )
+
+        process.run()

tomwer/core/process/stitching/metadataholder.py

@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 import weakref
 import logging
 import numpy
@@ -5,7 +7,6 @@ import numpy
 from tomoscan.tomoobject import TomoObject
 from tomoscan.scanbase import TomoScanBase
 from tomoscan.volumebase import VolumeBase
-from typing import Optional
 
 _logger = logging.getLogger(__name__)
 
@@ -61,10 +62,10 @@ class StitchingMetadata:
         bb = self.tomo_obj.get_bounding_box(axis)
         return (bb.max - bb.min) / 2 + bb.min
 
-    def get_abs_position_px(self, axis, warn=True) -> Optional[int]:
+    def get_abs_position_px(self, axis, warn=True) -> int | None:
         if axis not in (0, 1, 2):
             raise ValueError("axis is expected to be in (0, 1, 2)")
-        # if user registerd position as pixels
+        # if user registered position as pixels
         if self._pos_as_px[axis] is not None:
             return int(self._pos_as_px[axis])
         else:
@@ -100,7 +101,7 @@ class StitchingMetadata:
         self._pos_as_px = [None, None, None]
         self._pos_as_m = [None, None, None]
 
-    def get_pixel_or_voxel_size(self, axis) -> Optional[float]:
+    def get_pixel_or_voxel_size(self, axis) -> float | None:
         """
         return value provided by the user if any else return the value contained in metadata
         """

tomwer/core/process/stitching/nabustitcher.py

@@ -1,5 +1,6 @@
 import logging
 
+from tqdm import tqdm
 from ewokscore.missing_data import is_missing_data
 
 from sluurp.executor import submit as submit_to_slurm_cluster
@@ -12,8 +13,10 @@ from nabu.stitching.config import (
     StitchingConfiguration,
     StitchingType,
 )
-from nabu.stitching.z_stitching import (
-    z_stitching,
+from nabu.stitching.z_stitching import z_stitching
+from nabu.stitching.y_stitching import y_stitching
+
+from nabu.stitching.utils.post_processing import (
     StitchingPostProcAggregation as _StitchingPostProcAggregation,
 )
 from nabu.stitching.slurm_utils import split_stitching_configuration_to_slurm_job
@@ -64,8 +67,20 @@ class StitcherTask(
             progress = (
                 None if is_missing_data(self.inputs.progress) else self.inputs.progress
             )
-            stitched_identifier = z_stitching(configuration=config, progress=progress)
-            if config.stitching_type is StitchingType.Z_PREPROC:
+
+            if config.stitching_type in (
+                StitchingType.Z_PREPROC,
+                StitchingType.Y_PREPROC,
+            ):
+                if config.stitching_type is StitchingType.Z_PREPROC:
+                    stitched_identifier = z_stitching(
+                        configuration=config, progress=progress
+                    )
+                else:
+                    stitched_identifier = y_stitching(
+                        configuration=config, progress=progress
+                    )
+
                 nx_tomo = ScanFactory.create_tomo_object_from_identifier(
                     stitched_identifier.to_str()
                 )
@@ -76,6 +91,9 @@ class StitcherTask(
                 self.outputs.volume = None
                 self.outputs.future_tomo_obj = None
             elif config.stitching_type is StitchingType.Z_POSTPROC:
+                stitched_identifier = z_stitching(
+                    configuration=config, progress=progress
+                )
                 volume = VolumeFactory.create_tomo_object_from_identifier(
                     stitched_identifier.to_str()
                 )
@@ -85,10 +103,12 @@ class StitcherTask(
             else:
                 raise NotImplementedError()
         else:
-            # opt2: run remotly and aggregate locally
+            # opt2: run remotely and aggregate locally
             futures = {}
 
             # 2.1 launch jobs
+            # TODO: refactor: nabu.app.stitching could be called or something like that...
+            slurm_job_progress_bars: dict = {}
             for i_job, (job, sub_config) in enumerate(
                 split_stitching_configuration_to_slurm_job(
                     config, yield_configuration=True
@@ -99,11 +119,21 @@ class StitcherTask(
                     sub_config.get_output_object().get_identifier().to_str()
                 )
                 futures[output_tomo_obj] = submit_to_slurm_cluster(job, timeout=999999)
+                # note on total=100: we only consider percentage in this case (providing advancement from slurm jobs)
+                slurm_job_progress_bars[job] = tqdm(
+                    total=100,
+                    position=i_job + 1,
+                    desc=f"   part {str(i_job).ljust(3)}",
+                    delay=0.5,  # avoid to mess with terminal and (near) future logs
+                    bar_format="{l_bar}{bar}",  # avoid using 'r_bar' as 'total' is set to 100 (percentage)
+                    leave=False,
+                )
 
             # handle post processing
             data_aggregation = StitchingPostProcAggregation(
                 futures=futures,
                 stitching_config=config,
+                progress_bars=slurm_job_progress_bars,
             )
             for future in futures.values():
                 # TODO: do we ned to make sure the processing is not finished yet ?

tomwer/core/process/stitching/tests/test_metadataholder.py

@@ -0,0 +1,17 @@
+from tomwer.core.process.stitching.metadataholder import StitchingMetadata
+
+
+def test_to_dict_from_dict():
+    """Test conversion of StitchingMetadata from dict and to dict"""
+    metadata = StitchingMetadata(tomo_obj=None)
+    metadata._pixel_or_voxel_size = [12.3, 2.5, None]
+    metadata._pos_as_m = [None, 3.6, None]
+    metadata._pos_as_px = [5, 9, 8]
+
+    ddict = metadata.to_dict()
+    assert isinstance(ddict, dict)
+
+    loaded_metadata = StitchingMetadata.from_dict(ddict, tomo_obj=None)
+    assert loaded_metadata == metadata
+    assert loaded_metadata.to_dict() == ddict
+    assert isinstance(str(loaded_metadata), str)

tomwer/core/process/task.py

@@ -1,44 +1,14 @@
-# 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.
-#
-# ###########################################################################*/
 """
 Define the tomwer Task class.
 Insure connection with ewoks.
 All instances of tomwer Tasks should avoid gui import (as qt).
 """
 
-
-__author__ = ["H. Payno"]
-__license__ = "MIT"
-__date__ = "27/07/2021"
-
+from __future__ import annotations
 
 import logging
-import typing
 from collections import namedtuple
 from datetime import datetime
-from typing import Union
 
 import h5py
 import numpy
@@ -66,7 +36,7 @@ class BaseProcessInfo:
 
     def __init__(self, inputs=None):
         """
-        :param bool: return_dict: if True serialize (to_dict / from_dict functions) between each task
+        :param return_dict: if True serialize (to_dict / from_dict functions) between each task
         """
         if inputs is None:
             inputs = {}
@@ -86,7 +56,6 @@ class BaseProcessInfo:
         """
 
         :return: display the list of all managed keys and possible values
-        :rtype: str
         """
         # TODO: use argsparse instead of this dict ?
         raise NotImplementedError("BaseProcess is an abstract class")
@@ -94,7 +63,7 @@ class BaseProcessInfo:
     def get_output_value(self, key):
         """
 
-        :param str key:
+        :param key:
         :return:
         """
         assert type(key) is str
@@ -109,7 +78,7 @@ class BaseProcessInfo:
     def register_output(self, key, value):
         """
 
-        :param str key: name of the output
+        :param key: name of the output
         :param value: value of the output
         """
         self._output_values[key] = value
@@ -129,11 +98,10 @@ class BaseProcessInfo:
         """definition of the process"""
         raise NotImplementedError("Base class")
 
-    def get_configuration(self) -> Union[None, dict]:
+    def get_configuration(self) -> dict | None:
         """
 
         :return: configuration of the process
-        :rtype: dict
         """
         if self._settings is None:
             return None
@@ -149,10 +117,10 @@ class BaseProcessInfo:
         self,
         process_file: str,
         entry: str,
-        configuration: Union[dict, None],
-        results: Union[dict, None],
+        configuration: dict | None,
+        results: dict | None,
         process_index: int,
-        interpretations: Union[dict, None] = None,
+        interpretations: dict | None = None,
         overwrite: bool = True,
     ) -> None:
         """
@@ -160,19 +128,14 @@ class BaseProcessInfo:
         output data stored will be the one defined by the data_keys
 
         :param process_file: where to store the processing information
-        :type process_file: str
-        :param str entry: entry process
+        :param entry: entry process
         :param configuration: configuration of the process
-        :type configuration: Union[dict,None]
         :param results: result of the processing
-        :type: Union[dict,None]
         :param process_index: index of the process
-        :type process_index: int
-        :param bool overwrite: if True then overwrite the process if already
+        :param overwrite: if True then overwrite the process if already
                                exists
-        :param interpretations: for each result we can add a flag
+        :paramerpretations: for each result we can add a flag
                                 'interpretation'
-        :type interpretations: Union[None, dict
         """
         assert process_file is not None
         with FileLockerManager().get_lock(file_name=process_file):
@@ -194,11 +157,11 @@ class BaseProcessInfo:
     def _register_process(
         process_file: str,
         process,
-        entry: typing.Union[str, None],
-        configuration: Union[dict, None],
-        results: Union[dict, None],
+        entry: str | None,
+        configuration: dict | None,
+        results: dict | None,
         process_index: int,
-        interpretations: Union[dict, None] = None,
+        interpretations: dict | None = None,
         overwrite: bool = True,
     ) -> None:
         """
@@ -207,19 +170,14 @@ class BaseProcessInfo:
 
         :param process: process to record
         :param process_file: where to store the processing information
-        :type process_file: str
-        :param Union[str, None] entry: entry process
+        :param entry: entry process
         :param configuration: configuration of the process
-        :type configuration: Union[dict,None]
         :param results: result of the processing
-        :type: Union[dict,None]
         :param process_index: index of the process
-        :type process_index: int
-        :param bool overwrite: if True then overwrite the process if already
+        :param overwrite: if True then overwrite the process if already
                                exists
-        :param interpretations: for each result we can add a flag
+        :paramerpretations: for each result we can add a flag
                                 'interpretation'
-        :type interpretations: Union[None, dict
         """
         assert process_file is not None, "The process file should be defined"
         if interpretations is None:
@@ -345,7 +303,7 @@ class BaseProcessInfo:
     @staticmethod
     def get_most_recent_process(
         root_node: h5py.Group, process, version: str = None
-    ) -> Union[None, h5py.Group]:
+    ) -> h5py.Group | None:
         nodes = Task._get_process_nodes(
             root_node=root_node, process=process, version=version, depth=1
         )
@@ -371,10 +329,9 @@ class BaseProcessInfo:
     def get_processes_frm_type(process_file: str, process_type, entry=None) -> list:
         """
 
-        :param str process_file: file to read
+        :param process_file: file to read
         :param process_type: process type we are looking for
         :return: list of _process_desc(sequence_index, configuration, results)
-        :rtype: list
         """
         # retrieve process to load
         with open_hdf5(process_file) as h5f:

tomwer/core/process/{test → tests}/test_conditions.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__ = "19/07/2018"
-
+from __future__ import annotations
 
 import shutil
 import tempfile

tomwer/core/process/{test → tests}/test_dark_and_flat.py

@@ -1,31 +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/04/2019"
+from __future__ import annotations
 
 
 import os

tomwer/core/process/{test → tests}/test_data_listener.py

@@ -1,31 +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__ = "09/06/2020"
+from __future__ import annotations
 
 
 import os

tomwer/core/process/{test → tests}/test_data_transfer.py

@@ -1,31 +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/04/2019"
+from __future__ import annotations
 
 
 import gc
@@ -211,7 +185,7 @@ class TestBlissDataTransfer(unittest.TestCase):
 
 @pytest.mark.skipif(not RSyncManager().has_rsync(), reason="requires rsync")
 class NXTomoDataTransferBase(unittest.TestCase):
-    """Make sure we can transfer data from an NXTomo with linked dependancies"""
+    """Make sure we can transfer data from a NXtomo with linked dependancies"""
 
     def setUp(self) -> None:
         super().setUp()

tomwer/core/process/{test → tests}/test_data_watcher.py

@@ -1,31 +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/04/2019"
+from __future__ import annotations
 
 
 import os