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

tomwer/core/process/control/datawatcher/datawatcherprocess.py

@@ -1,35 +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.
-#
-#############################################################################*/
 
 """
 This module analyze headDir data directory to detect scan to be reconstructed
 """
-
-__authors__ = ["C. Nemoz", "H. Payno"]
-__license__ = "MIT"
-__date__ = "14/10/2016"
-
+from __future__ import annotations
 
 import logging
 import os
@@ -80,12 +54,12 @@ class _DataWatcherProcess:
         If srcPattern or destPattern are setted to None then we won't apply
         this 'two directories' synchronization and check
 
-    :param  str dataDir: Root directory containing data
-    :param  bool waitXML: if True then we will be waiting for the XML of
+    :param  dataDir: Root directory containing data
+    :param  waitXML: if True then we will be waiting for the XML of
         the acquisition to be writted. Otherwise we will look for the .info
         file and wait until all file will be copied
-    :param str srcPattern: the pattern to change by destPattern.
-    :param str destPattern: the pattern that will replace srcPattern in the
+    :param srcPattern: the pattern to change by destPattern.
+    :param destPattern: the pattern that will replace srcPattern in the
         scan path
     :param list ignoredFolders: the list of folders to ignored on parsing
                                  (them and sub folders)
@@ -106,7 +80,12 @@ class _DataWatcherProcess:
 
     INITIAL_STATUS = "not processing"
 
-    def __init__(self, dataDir, srcPattern=None, destPattern=None):
+    def __init__(
+        self,
+        dataDir: str,
+        srcPattern: str | None = None,
+        destPattern: str | None = None,
+    ):
         super().__init__()
         self.RootDir = os.path.abspath(dataDir)
         self.parsing_dir = os.path.abspath(dataDir)

tomwer/core/process/control/datawatcher/edfdwprocess.py

@@ -1,35 +1,10 @@
 # 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.
-#
-#############################################################################*/
 """
 data watcher classes used to define the status of an acquisition for EDF
 acquisitions
 """
 
-__authors__ = ["C. Nemoz", "H. Payno"]
-__license__ = "MIT"
-__date__ = "30/09/2019"
-
+from __future__ import annotations
 
 import logging
 import os
@@ -150,7 +125,7 @@ class _DataWatcherProcessUserFilePattern(_DataWatcherEDFProcess):
     If a file in the given folder exists then we will consider the acquisition
     ended
 
-    :param str pattern: the pattern we are looking for
+    :param pattern: the pattern we are looking for
     """
 
     def __init__(self, dataDir, srcPattern, destPattern, pattern):

tomwer/core/process/control/datawatcher/hdf5dwprocess.py

@@ -1,34 +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.
-#
-#############################################################################*/
 """
 data watcher classes used to define the status of an acquisition for EDF
 acquisitions
 """
-
-__authors__ = ["C. Nemoz", "H. Payno"]
-__license__ = "MIT"
-__date__ = "30/09/2019"
+from __future__ import annotations
 
 import logging
 

tomwer/core/process/control/datawatcher/status.py

@@ -1,30 +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__ = "31/05/2017"
+from __future__ import annotations
 
 
 # TODO: change this for enum

tomwer/core/process/control/emailnotifier.py

@@ -1,10 +1,16 @@
-import smtplib
 import platform
 import os
 import string
 
 from processview.core.manager import ProcessManager
 
+try:
+    from ewoksnotify.tasks.email import EmailTask
+except ImportError:
+    has_ewoksnotify = False
+else:
+    has_ewoksnotify = True
+
 from tomwer.core.process.task import Task
 from tomwer.core.tomwer_object import TomwerObject
 from tomwer.core.scan.scanbase import TomwerScanBase
@@ -15,28 +21,6 @@ from datetime import datetime
 from tomwer.version import version as __version
 
 
-class EmailTask(
-    Task,
-    input_names=("subject", "from_addr", "to_addrs", "text"),
-    optional_input_names=("mail_options", "rcpt_options", "host", "port"),
-):
-    """
-    Generic task to send a simple email
-    """
-
-    def run(self):
-        port = self.get_input_value("port", 0)
-        assert isinstance(port, int), "port is expected to be an int"
-        host = self.get_input_value("host", "smtps.esrf.fr")
-        server = smtplib.SMTP(host, port, timeout=5)
-        server.sendmail(
-            self.inputs.from_addr,
-            self.inputs.to_addrs,
-            f"Subject: {self.inputs.subject}\n\n{self.inputs.text}",
-        )
-        server.quit()
-
-
 class TomoEmailTask(
     Task,
     input_names=("tomo_obj", "configuration"),
@@ -48,6 +32,10 @@ class TomoEmailTask(
         self, varinfo=None, inputs=None, node_id=None, node_attrs=None, execinfo=None
     ):
         super().__init__(varinfo, inputs, node_id, node_attrs, execinfo)
+        if not has_ewoksnotify:
+            raise ImportError(
+                "ewoksnotify not install but required. Please run 'pip install ewoksnotify[full]'"
+            )
 
     def run(self):
         tomo_obj = self.inputs.tomo_obj

tomwer/core/process/control/nxtomoconcatenate.py

@@ -1,6 +1,6 @@
 import os
 import logging
-from tomoscan.serie import Serie
+from tomoscan.series import Series
 
 from ewokscore.missing_data import is_missing_data
 
@@ -16,7 +16,7 @@ _logger = logging.getLogger(__name__)
 class ConcatenateNXtomoTask(
     TaskWithProgress,
     input_names=(
-        "serie",
+        "series",
         "output_file",
         "output_entry",
         "overwrite",
@@ -32,15 +32,17 @@ class ConcatenateNXtomoTask(
     """
 
     def run(self):
-        scans_serie = self.inputs.serie
-        if is_missing_data(scans_serie) or len(scans_serie) < 1:
+        scans_series = self.inputs.series
+        if is_missing_data(scans_series) or len(scans_series) < 1:
             raise ValueError("expected at least one nxtomo to be concatenated")
-        elif not isinstance(scans_serie, Serie):
-            raise TypeError(f"serie is expected to be a Serie. Get {type(scans_serie)}")
+        elif not isinstance(scans_series, Series):
+            raise TypeError(
+                f"series is expected to be a Series. Get {type(scans_series)}"
+            )
 
         # format output location if necessary
         output_file = format_output_location(
-            file_path=self.inputs.output_file, serie=scans_serie
+            file_path=self.inputs.output_file, series=scans_series
         )
 
         # cast scan from NXtomoScan to NXtomo
@@ -56,10 +58,10 @@ class ConcatenateNXtomoTask(
                     f"nxtomos are supposed to be instances of {NXtomo} or {NXtomoScan}. Get {type(obj)}"
                 )
 
-        scans_serie = tuple([cast_scan_to_nxtomo(nxtomo) for nxtomo in scans_serie])
+        scans_series = tuple([cast_scan_to_nxtomo(nxtomo) for nxtomo in scans_series])
 
         # apply concatenation
-        output_nxtomo = nx_concatenate(scans_serie)
+        output_nxtomo = nx_concatenate(scans_series)
 
         # dump result
         output_nxtomo.save(
@@ -79,29 +81,29 @@ class ConcatenateNXtomoTask(
             self.outputs.data = scan
 
 
-def format_output_location(file_path, serie: Serie):
+def format_output_location(file_path, series: Series):
     """
     format possible keys from the location like {scan_dir} or {scan_path}
 
-    :param file_path:
-    :param serie: serie of NXtomoScan
+    :param:
+    :param: series of NXtomoScan
     :return:
     """
-    if serie is None:
+    if series is None:
         _logger.warning("scan is !none, enable to format the nabu output location")
 
-    for scan in serie:
+    for scan in series:
         if not isinstance(scan, NXtomoScan):
             raise TypeError
 
     def get_common_path():
-        if len(serie) == 0:
+        if len(series) == 0:
             return ""
-        elif len(serie) == 1:
-            return os.path.dirname(serie[0].master_file)
+        elif len(series) == 1:
+            return os.path.dirname(series[0].master_file)
         else:
             return os.path.commonpath(
-                [os.path.dirname(scan.master_file) for scan in serie]
+                [os.path.dirname(scan.master_file) for scan in series]
             )
 
     keywords = {

tomwer/core/process/control/nxtomomill.py

@@ -1,40 +1,13 @@
 # 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.
-#
-# ###########################################################################*/
 
 from __future__ import annotations
 
-__authors__ = ["H. Payno"]
-__license__ = "MIT"
-__date__ = "30/07/2020"
-
 
 import logging
 import os
 import pathlib
 
-from tomoscan.serie import Serie
+from tomoscan.series import Series
 
 from nxtomomill import converter as nxtomomill_converter
 from nxtomomill.io.config import TomoEDFConfig as EDFConfig
@@ -60,7 +33,7 @@ class H5ToNxProcess(
         "bliss_scan",
         "serialize_output_data",
     ),
-    output_names=("data", "serie"),
+    output_names=("data", "series"),
 ):
     """
     Task to convert from a bliss dataset to a nexus compliant dataset
@@ -85,11 +58,6 @@ class H5ToNxProcess(
                     get_default_output_file(input_file=master_file_name)
                 )
                 output_folder = str(path.parent)
-            elif outputdir is ProcessDataOutputDirMode.RAW_DATA_FOLDER:
-                path = pathlib.Path(
-                    get_default_raw_data_output_file(input_file=master_file_name)
-                )
-                output_folder = str(path.parent)
             elif outputdir is ProcessDataOutputDirMode.IN_SCAN_FOLDER:
                 output_folder = os.path.dirname(master_file_name)
             else:
@@ -128,7 +96,7 @@ class H5ToNxProcess(
         if len(convs) == 0:
             return
 
-        serie = []
+        series = []
         for conv in convs:
             conv_file, conv_entry = conv
             scan_converted = NXtomoScan(scan=conv_file, entry=conv_entry)
@@ -139,11 +107,11 @@ class H5ToNxProcess(
                 data = scan_converted.to_dict()
             else:
                 data = scan_converted
-            serie.append(data)
-        self.outputs.serie = Serie(
-            name=f"serie created from {config.input_file}", iterable=serie
+            series.append(data)
+        self.outputs.series = Series(
+            name=f"series created from {config.input_file}", iterable=series
         )
-        self.outputs.data = serie[-1] if len(serie) > 0 else None
+        self.outputs.data = series[-1] if len(series) > 0 else None
 
 
 class EDFToNxProcess(
@@ -194,9 +162,6 @@ class EDFToNxProcess(
         elif output_dir is ProcessDataOutputDirMode.PROCESSED_DATA_FOLDER:
             path = pathlib.Path(get_default_output_file(folder_path))
             output_folder = str(path.parent)
-        elif output_dir is ProcessDataOutputDirMode.RAW_DATA_FOLDER:
-            path = pathlib.Path(get_default_raw_data_output_file(folder_path))
-            output_folder = str(path.parent)
         else:
             # else we expect people to provide output location
             output_folder = format_output_location(output_dir, scan=scan)
@@ -210,8 +175,8 @@ def get_default_raw_data_output_file(
     Policy: look for any 'RAW_DATA' in file directory. If find any (before any 'PROCESSED_DATA' directory) replace it "RAW_DATA".
     Then replace input_file by the expected file_extension and make sure the output file is different than the input file. Else append _nxtomo to it.
 
-    :param str input_file: file to be converted from bliss to NXtomo
-    :param str output_file_extension:
+    :param input_file: file to be converted from bliss to NXtomo
+    :param output_file_extension:
     :return: default output file according to policy
     """
     if isinstance(input_file, pathlib.Path):

tomwer/core/process/control/scanlist.py

@@ -1,36 +1,9 @@
 # coding: utf-8
-# /*##########################################################################
-# Copyright (C) 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.
-#
-#############################################################################*/
 
 """
 This module is used to define a set of folders to be emitted to the next box.
 """
 
-__authors__ = ["H.Payno"]
-__license__ = "MIT"
-__date__ = "05/07/2017"
-
-
 import logging
 
 from tomwer.core.process.task import Task

tomwer/core/process/control/scantransfer.py

@@ -1,10 +1,13 @@
+from __future__ import annotations
+
 import fnmatch
 import logging
 import os
 import shutil
-from tomwer.core.utils.deprecation import deprecated_warning
 
+from tomoscan.esrf.scan.utils import get_unique_files_linked
 import tomwer.version
+from tomwer.core.utils.deprecation import deprecated_warning
 from tomwer.core.process.reconstruction.nabu.settings import NABU_CFG_FILE_FOLDER
 from tomwer.core.process.reconstruction.nabu.utils import update_cfg_file_after_transfer
 from tomwer.core.process.task import Task
@@ -60,6 +63,7 @@ class ScanTransferTask(
     """
 
     scanready = Signal(TomwerScanBase)
+    """emit when scan ready"""
 
     def __init__(
         self, varinfo=None, inputs=None, node_id=None, node_attrs=None, execinfo=None
@@ -250,12 +254,12 @@ class ScanTransferTask(
         files_dest = []
         delete_opt = []
 
-        if os.path.exists(scan.process_file):
-            source_scans = DataListener.get_source_scans(
-                process_file=scan.process_file, entry=scan.entry
-            )
-        else:
-            source_scans = None
+        associated_files = get_unique_files_linked(url=scan.get_detector_url())
+        associated_files = filter(
+            lambda file_: os.path.abspath(file_) == os.path.abspath(scan.master_file),
+            associated_files,
+        )
+        source_scans = [os.path.dirname(file_) for file_ in associated_files]
         # manage scan folder
         if source_scans is not None:
             for source_scan in source_scans:
@@ -403,12 +407,11 @@ class ScanTransferTask(
         Return a tuple of three elemts:
         src_nexus_file, files_sources_for_nx, files_dest_for_nx
 
-        :param str src_nexus_file: source file to treat
+        :param src_nexus_file: source file to treat
         :return: (dst_nexus_file, files_sources_for_nx, files_dest_for_nx)
                 * dst_nexus_file: str -> output nexus file that will be created by the transfer
                 * list files_sources_for_nx: list of relative files connected to source nexus file
                 * files_dest_for_nx: list of creating files from files_sources_for_nx once transfer is accomplish
-        :rtype: tuple
         """
         dst_nx_file = self._get_hdf5_sample_file_or_nx_dst(src_nexus_file)
         linked_datasets_src = get_linked_files_with_entry(
@@ -432,11 +435,10 @@ class ScanTransferTask(
         """Launch the process process
 
         :param scan: the path to the file we want to move/process
-        :type scan: :class:`.TomoBase`
         :param move: if True, directly move the files. Otherwise copy the files
         :param overwrite: if True then force the copy even if the file/folder already
             exists
-        :param bool noRSync: True if we wan't do sue shutil instead of rsync.
+        :param noRSync: True if we wan't do sue shutil instead of rsync.
         """
         scan = data_identifier_to_scan(self.inputs.data)
         if scan is None:
@@ -621,7 +623,7 @@ class ScanTransferTask(
     def setDestDir(self, dist):
         """Force the outpudir to dist.
 
-        :param str dist: path to the folder. If None remove overwrite behavior
+        :param dist: path to the folder. If None remove overwrite behavior
         """
         self._destDir = dist
         if self._destDir is not None and os.path.isdir(self._destDir):
@@ -667,7 +669,7 @@ class ScanTransferTask(
     def setForceSync(self, b):
         """
 
-        :param bool b: if True then folderTransfert will wait until transfert
+        :param b: if True then folderTransfert will wait until transfert
             is done to be released. Otherwise will launch a 'free' thread wich
             will notice transfert end later.
         """

tomwer/core/process/control/scanvalidator.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__ = "18/06/2017"
+from __future__ import annotations
 
 import logging
 
@@ -52,7 +26,7 @@ class ScanValidator(BaseProcessInfo):
     """
     Simple workflow locker until the use validate scans
 
-    :param int memReleaserWaitLoop: the time to wait in second between two
+    :param memReleaserWaitLoop: the time to wait in second between two
                                     memory overload if we are in lbsram.
     """
 
@@ -226,7 +200,7 @@ class ScanValidator(BaseProcessInfo):
         user approval before validating. Otherwise each previous and next scan
         will be validated
 
-        :param boolean b: False if we want an automatic validation
+        :paramean b: False if we want an automatic validation
         """
         self._manualValidation = b
         if not self.isValidationManual():
@@ -261,7 +235,7 @@ class ScanValidatorP(ScanValidator):
     For now to avoid multiple inheritance from QObject with the process widgets
     we have to define two classes. One only for the QObject inheritance.
 
-    :param int memReleaserWaitLoop: the time to wait in second between two
+    :param memReleaserWaitLoop: the time to wait in second between two
                                     memory overload if we are in lbsram.
     """
 

tomwer/core/process/control/{test → tests}/test_concatenate_nxtomos.py

@@ -1,5 +1,5 @@
 import os
-from tomoscan.serie import Serie
+from tomoscan.series import Series
 
 from tomwer.core.process.control.nxtomoconcatenate import (
     ConcatenateNXtomoTask,
@@ -34,7 +34,7 @@ def test_concatenate_nx_tomo_task(tmp_path):
     assert not os.path.exists(output_scan_file)
     task = ConcatenateNXtomoTask(
         inputs={
-            "serie": Serie(iterable=[scan_1, scan_2]),
+            "series": Series(iterable=[scan_1, scan_2]),
             "output_file": output_scan_file,
             "output_entry": "my_entry",
             "overwrite": False,
@@ -59,19 +59,19 @@ def test_format_output_location():
     )
     assert (
         format_output_location(
-            "{common_path}/concatenate.nx", Serie(iterable=[scan1, scan2])
+            "{common_path}/concatenate.nx", Series(iterable=[scan1, scan2])
         )
         == "/path/to/concatenate.nx"
     )
 
     assert format_output_location(
-        "concatenate.nx", Serie("my_serie", [scan1, scan2])
+        "concatenate.nx", Series("my_serie", [scan1, scan2])
     ) == os.path.abspath("concatenate.nx")
 
     assert (
         format_output_location(
             "{common_path}/concatenate.nx",
-            Serie(
+            Series(
                 iterable=[
                     scan1,
                 ]