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

tomwer/core/process/cluster/supervisor.py

@@ -1,43 +1,61 @@
 # 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
+"""module containing FutureSupervisorTask.
 """
 
-__authors__ = ["H. Payno"]
-__license__ = "MIT"
-__date__ = "23/08/2021"
-
+from typing import Iterable
 
 from ewokscore.task import Task as EwoksTask
+from tomwer.core.futureobject import FutureTomwerObject
+from tomwer.core.scan.scanbase import TomwerScanBase
+from tomwer.core.process.drac.processeddataset import DracReconstructedVolumeDataset
+from tomwer.core.volume.volumebase import TomwerVolumeBase
+from tomwer.core.volume.volumefactory import VolumeFactory
 
 
-class _SupervisorPlaceHolder(
-    EwoksTask, input_names=("future_tomo_obj",), output_names=("data",)
+class FutureSupervisorTask(
+    EwoksTask,
+    input_names=("future_tomo_obj",),
+    output_names=("data", "volume", "data_portal_processed_datasets"),
 ):
+    """
+    Task used to wait for a 'FutureTomwerObject' and convert it to original instance of:
+
+    * TomwerScanBase (data): if the FutureTomwerObject is based on a scan instance
+    * TomwerVolumeBase (volume): if the FutureTomwerObject is based on a volume instance
+    * tuple of IcatReconstructedVolumeDataset (data_portal_processed_datasets): if the FutureTomwerObject is based on a volume instance
+    """
+
     def run(self):
-        future_data = self.inputs.future_data
-        future_data.results()
-        self.outputs.data = future_data.scan
+        future_tomo_obj = self.inputs.future_tomo_obj
+        if not isinstance(future_tomo_obj, FutureTomwerObject):
+            raise TypeError(
+                f"future_data is expected to be an instance of {FutureTomwerObject}. Got {type(future_tomo_obj)}"
+            )
+        future_tomo_obj.results()
+
+        tomo_obj = future_tomo_obj.tomo_obj
+
+        if isinstance(tomo_obj, TomwerScanBase):
+            self.outputs.data = tomo_obj
+
+            # the volume reconstruction return an instance of 'FutureTomwerObj' with a scan.
+            # so to make drac publication compatible with it we also need to send the 'data_portal_processed_datasets'
+            def build_drac_dataset(vol_id):
+                volume = VolumeFactory.create_tomo_object_from_identifier(vol_id)
+                return DracReconstructedVolumeDataset(
+                    tomo_obj=volume,
+                    source_scan=tomo_obj,
+                )
+
+            assert isinstance(tomo_obj.latest_vol_reconstructions, Iterable)
+            self.outputs.data_portal_processed_datasets = tuple(
+                [
+                    build_drac_dataset(vol_id=vol_id)
+                    for vol_id in tomo_obj.latest_vol_reconstructions
+                ]
+            )
+            self.outputs.volume = None
+        elif isinstance(tomo_obj, TomwerVolumeBase):
+            self.outputs.volume = tomo_obj
+            self.outputs.data_portal_processed_datasets = ()
+            self.outputs.data = None

tomwer/core/process/conditions/filters.py

@@ -1,35 +1,10 @@
 # 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 the process of the reference creator.
 This is related to the issue #184
 """
+from __future__ import annotations
 
-__authors__ = ["H.Payno"]
-__license__ = "MIT"
-__date__ = "19/07/2018"
 
 import fnmatch
 import logging
@@ -72,7 +47,7 @@ class _PatternBaseFilter(BaseFilter):
     def setPattern(self, pattern):
         """
         compile th filter for the given pattern
-        :param str pattern:
+        :param pattern:
         """
         self._pattern = pattern
 
@@ -89,7 +64,7 @@ class RegularExpressionFilter(_PatternBaseFilter):
     def setPattern(self, pattern):
         """
         compile th filter for the given pattern
-        :param str pattern:
+        :param pattern:
         """
         super().setPattern(pattern)
         if self._pattern is not None:

tomwer/core/process/control/datalistener/datalistener.py

@@ -1,38 +1,11 @@
 # 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/07/2017"
+from __future__ import annotations
 
 
 import logging
 import os
 import socket
 import time
-import typing
 
 from ewokscore.task import Task as EwoksTask
 from nxtomomill import converter as nxtomomill_converter
@@ -53,23 +26,11 @@ try:
 except ImportError:
     from nxtomomill.io.config import HDF5Config
 
-try:
-    from nxtomomill.converter import _Acquisition
-
-    _SCAN_NUMBER_PATH = _Acquisition._SCAN_NUMBER_PATH
-except ImportError:
-    from nxtomomill.converter.hdf5.acquisition.baseacquisition import BaseAcquisition
-
-    try:
-        _SCAN_NUMBER_PATH = BaseAcquisition._SCAN_NUMBER_PATH
-    except ImportError:
-        _SCAN_NUMBER_PATH = None
-
 _logger = logging.getLogger(__name__)
 
 
 def nxtomomill_input_callback(entry, desc):
-    """note: for the data listener we want to avoid any user intereaction.
+    """note: for the data listener we want to avoid any user interaction.
     In order to avoid any time lost"""
     if entry == "energy":
         default_energy = 19.0
@@ -106,7 +67,7 @@ class DataListener(BaseProcessInfo):
     "When the event 'scan_ended' is received all data might not have been write" " yet"
 
     SWMR_MODE = None
-    """The bliss writer is not using the swmr mode. This class has independant behavior regarding the tomoscan / nxotmo get_swmr_mode which is
+    """The bliss writer is not using the swmr mode. This class has independent behavior regarding the tomoscan / nxotmo get_swmr_mode which is
     dedicated to the internal tomotools behavior
     """
 
@@ -185,7 +146,7 @@ class DataListener(BaseProcessInfo):
         sample_file: str,
         entry: str,
         proposal_file: str,
-        master_sample_file: typing.Union[str, None],
+        master_sample_file: str | None,
     ) -> tuple:
         """
 
@@ -203,9 +164,6 @@ class DataListener(BaseProcessInfo):
 
                 try:
                     # register process.
-                    # also store the source 'scan' folder. This information will
-                    # be needed by the datatransfert if some given later.
-                    source_scans = DataListener._get_scan_sources(sample_file, entry)
                     self.register_process(
                         process_file=scan.process_file,
                         entry=scan.entry,
@@ -213,7 +171,6 @@ class DataListener(BaseProcessInfo):
                         configuration={
                             "sample_file": sample_file,
                             "entry": entry,
-                            "source_scans": source_scans,
                             "file_proposal": proposal_file,
                             "master_sample_file": master_sample_file,
                         },
@@ -227,34 +184,9 @@ class DataListener(BaseProcessInfo):
                 scans.append(scan)
         return tuple(scans)
 
-    @staticmethod
-    def _get_scan_sources(bliss_file, entry) -> list:
-        """Return the list of scans dir for this bliss_file / entry"""
-
-        def get_scan_indexes():
-            with open_hdf5(bliss_file) as h5f:
-                entry_node = h5f[entry]
-                if _SCAN_NUMBER_PATH in entry_node:
-                    return h5py_read_dataset(entry_node[_SCAN_NUMBER_PATH])
-                else:
-                    raise ValueError("Unable to find scan number indexes")
-
-        scans_indexes = get_scan_indexes()
-        res = []
-        for scans_index in scans_indexes:
-            # Bad hack
-            # TODO: we should find a better way to retrieve source. From
-            # virtual dataset I don't see it. Maybe from symbolic link.
-            scan_folder_name = "scan" + str(scans_index).zfill(4)
-            scan_folder_name = os.path.join(
-                os.path.dirname(bliss_file), scan_folder_name
-            )
-            res.append(scan_folder_name)
-        return res
-
     @staticmethod
     def get_proposal_file(process_file, entry):
-        """Return the proposal file of the experimentation if registred by the
+        """Return the proposal file of the experimentation if registered by the
         data listener"""
         if entry is None:
             with open_hdf5(process_file) as h5f:
@@ -360,7 +292,7 @@ class DataListener(BaseProcessInfo):
 
     @staticmethod
     def get_master_sample_file(process_file, entry):
-        """Return the proposal file of the experimentation if registred by the
+        """Return the proposal file of the experimentation if registered by the
         data listener"""
         if entry is None:
             with open_hdf5(process_file) as h5f:
@@ -564,7 +496,7 @@ class DataListener(BaseProcessInfo):
         activate or deactivate the thread. When deactivate call join and
         delete the thread
 
-        :param bool activate:
+        :param activate:
         """
         if activate:
             if self._listening_thread is not None:

tomwer/core/process/control/datalistener/rpcserver.py

@@ -1,38 +1,11 @@
 # 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 getpass
 import logging
 import socket
 import threading
 import time
-import typing
 from multiprocessing import Process
 
 from jsonrpc import JSONRPCResponseManager, dispatcher
@@ -88,7 +61,7 @@ class BlissAcquisition:
     def set_status(self, status):
         self.status = TangoAcquisitionStatus.from_value(status)
 
-    def end(self, end_time, succeed: bool, error: typing.Union[None, str]):
+    def end(self, end_time, succeed: bool, error: str | None):
         if succeed is True:
             self.status = TangoAcquisitionStatus.ENDED
         else:
@@ -109,7 +82,7 @@ class BlissAcquisition:
         return self._end_time
 
     @property
-    def error(self) -> typing.Union[None, str]:
+    def error(self) -> str | None:
         return self.error
 
 
@@ -121,8 +94,6 @@ class _BaseDataListenerThread:
     is composed of several scans. A scan can be the 'init' information,
     dark frames, flat frames, projections frames, return projections...
 
-    :param str device_name: name of the tango device proxy
-    :param Union[None, list]: list of the tango acquisitions
     """
 
     _JOIN_TIMEOUT = 5  # s
@@ -261,13 +232,12 @@ class DataListenerThread(_BaseDataListenerThread, threading.Thread):
         )
 
 
-def send_signal_to_local_rpc_servers(signal, port, extended_find=True):
-    """ "
+def send_signal_to_local_rpc_servers(signal, port: int, extended_find: bool = True):
+    """
     :param signal: signal to be emit
-    :param int port: port to check
-    :param bool extended_find: if True then will try to find a process that
-                               occupy the port even if this is not a process
-                               launched by the user and launched by tomwer.
+    :param port: port to check
+    :param extended_find: if True then will try to find a process that occupy the port
+        even if this is not a process launched by the user and launched by tomwer.
     """
     # TODO: this should be moved to some utils
     import psutil

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

@@ -1,40 +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__ = ["H. Payno"]
-__license__ = "MIT"
-__date__ = "30/09/2019"
+from __future__ import annotations
 
 import logging
 import os
 import threading
 import time
-from typing import Optional
 
 from ewokscore.task import Task as EwoksTask
 
@@ -158,7 +127,7 @@ class _DataWatcher(BaseProcessInfo):
         """Start a new observation (if none running ) or stop the current
         observation
 
-        :param bool b: the value to set to the observation
+        :param b: the value to set to the observation
         """
         self.start() if b else self.stop()
 
@@ -166,7 +135,7 @@ class _DataWatcher(BaseProcessInfo):
         """
         Stop the thread of observation
 
-        :param bool sucess: if True this mean that we are stopping the
+        :param sucess: if True this mean that we are stopping the
                             observation because we found an acquisition
                             finished. In this case we don't want to update the
                             status and the log message
@@ -223,7 +192,7 @@ class _DataWatcher(BaseProcessInfo):
     def getLinuxFilePattern(self):
         return self.linux_filter_file_pattern
 
-    def setLinuxFilePattern(self, pattern: Optional[str]):
+    def setLinuxFilePattern(self, pattern: str | None):
         if pattern is None:
             self.linux_filter_file_pattern = pattern
         else:
@@ -259,23 +228,23 @@ class _DataWatcher(BaseProcessInfo):
         """
         When parsing folders, should we start by the oldest or the newest file
 
-        :param bool b: if True, will parse folders from the oldest one
+        :param b: if True, will parse folders from the oldest one
         """
         self.startByOldest = b
 
-    def setSrcAndDestPattern(self, srcPattern, destPattern):
+    def setSrcAndDestPattern(self, srcPattern: str | None, destPattern: str | None):
         """Set the values of source pattern and dest pattern
 
-        :param str or None srcPattern: the value to set to the source pattern
+        :param srcPattern: the value to set to the source pattern
                                        (see datawatcher)
-        :param str or None destPattern: the value to set to the destination
+        :param destPattern: the value to set to the destination
                                         pattern (see datawatcher)
         """
         self.srcPattern = srcPattern
         self.destPattern = destPattern
 
     def _initObservation(self):
-        """Init the thread running the datawatcher functions"""
+        """Init the thread running the data watcher functions"""
         if self.observationThread is None:
             self._createDataWatcher()
         headDir = self.getFolderObserved()
@@ -424,7 +393,9 @@ class DataWatcher(_DataWatcher):
     """
 
     sigTMStatusChanged = Signal(str)
+    """emit when the status of the scan changed"""
     sigScanReady = Signal(object)
+    """emit when scan ready"""
 
     import threading
 

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

@@ -1,37 +1,4 @@
-# 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.
-#
-#############################################################################*/
-
-"""
-This module is used to manage observations. Initially on files.
-Observations are runned on a thread and run each n seconds.
-They are manage by thread and signals
-"""
-
-__authors__ = ["H.Payno"]
-__license__ = "MIT"
-__date__ = "09/02/2017"
-
+from __future__ import annotations
 
 import logging
 import os
@@ -39,7 +6,6 @@ import threading
 import time
 from collections import OrderedDict
 from fnmatch import fnmatch
-from typing import Optional
 
 import h5py
 
@@ -63,18 +29,18 @@ class _DataWatcherStaticObserverMixIn:
         self,
         scanID,
         obsMethod,
-        srcPattern,
-        destPattern,
-        patternObs,
+        srcPattern: str | None,
+        destPattern: str | None,
+        patternObs: str | None,
         observationRegistry,
     ):
         """
 
-        :param str scanID: path to the scan
+        :param scanID: path to the scan
         :param obsMethod: method fo rdetecting end of acquisition
-        :param Union[str,None] srcPattern:
-        :param Union[str,None] destPattern:
-        :param Union[str,None] patternObs:
+        :param srcPattern:
+        :param destPattern:
+        :param patternObs:
         :param observationRegistry: what registry the observation should update
         """
         self.obsMethod = obsMethod
@@ -207,8 +173,8 @@ class _DataWatcherStaticObserverMixIn:
         If srcPattern or destPattern are setted to None then we won't apply
         this 'two directories' synchronization and check
 
-        :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
         """
         self.srcPattern = srcPattern
@@ -217,12 +183,12 @@ class _DataWatcherStaticObserverMixIn:
     def setUnixFileNamePattern(self, pattern):
         self.file_name_pattern = pattern
 
-    def setObservationMethod(self, obsMeth, info=None):
+    def setObservationMethod(self, obsMeth: str | None, info=None):
         """
         Set if we are looking for the .xml file
 
-        :param str or tuple obsMeth:
-        :param dict info: some extra information needed for some observation
+        :param obsMeth:
+        :param info: some extra information needed for some observation
                           method
         """
         assert info is None or type(info) is dict
@@ -275,18 +241,18 @@ class _DataWatcherStaticObserver(_DataWatcherStaticObserverMixIn, threading.Thre
 class _DataWatcherObserver_MixIn:
     """Thread launching the data watcher process (observation of acquisition)
 
-    :param str headDir: the root dir to make to fin dacquisition
-    :param int time_between_loops: seconds between observation threads
-    :param bool startByOldest: if True then we parse folder from the oldest to
+    :param headDir: the root dir to make to fin dacquisition
+    :param time_between_loops: seconds between observation threads
+    :param startByOldest: if True then we parse folder from the oldest to
         the newest
     :param funcAdvancementHandler: handlers of the signals sended by data
                                    watcher (one for sigNbDirExplored and one
                                    for sigAdvanceExploration)
-    :param str obsMethod: is True then will the creation of the xml file will
+    :param obsMethod: is True then will the creation of the xml file will
         notice the end of the acquisition. Otherwise we will look for .info
         file and for all .edf file to be copied
-    :param str or None srcPattern: see data watcher
-    :param str or None destPattern: see data watcher
+    :param srcPattern: see data watcher
+    :param destPattern: see data watcher
     """
 
     latestScanReady = []
@@ -296,12 +262,12 @@ class _DataWatcherObserver_MixIn:
         obsMethod,
         time_between_loops,
         observationClass,
-        headDir=None,
+        headDir: str | None = None,
         startByOldest=False,
-        srcPattern=None,
-        destPattern=None,
-        ignoredFolders=None,
-        file_name_pattern=None,
+        srcPattern: str | None = None,
+        destPattern: str | None = None,
+        ignoredFolders: str | None = None,
+        file_name_pattern: str | None = None,
     ):
         self.observations = observationClass()
         self.observations.ignoredFolders = (
@@ -322,11 +288,11 @@ class _DataWatcherObserver_MixIn:
         self._firstRun = True
 
     @property
-    def file_name_pattern(self) -> Optional[str]:
+    def file_name_pattern(self) -> str | None:
         return self._file_name_pattern
 
     @file_name_pattern.setter
-    def file_name_pattern(self, pattern: Optional[str]):
+    def file_name_pattern(self, pattern: str | None):
         if pattern is None or pattern.lstrip(" ").rstrip(" ") == "":
             self._file_name_pattern = None
         else:
@@ -415,8 +381,8 @@ class _DataWatcherObserver_MixIn:
         Set if we are looking for the .xml file from .edf observation or any
         .hdf5 file
 
-        :param str or tuple obsMeth:
-        :param dict info: some extra information needed for some observation
+        :param or tuple obsMeth:
+        :param info: some extra information needed for some observation
                           method
         """
         assert info is None or type(info) is dict
@@ -463,8 +429,8 @@ class _DataWatcherObserver_MixIn:
         If srcPattern or destPattern are setted to None then we won't apply
         this 'two directories' synchronization and check
 
-        :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
         """
         self.srcPattern = srcPattern