tomwer 1.2.1__py3-none-any.whl → 1.3.12__py3-none-any.whl

tomwer/core/process/control/test/test_volume_link.py

@@ -1,74 +1,74 @@
-# 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.
-#
-# ###########################################################################*/
+# # 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__ = "16/06/2021"
+# __authors__ = ["H. Payno"]
+# __license__ = "MIT"
+# __date__ = "16/06/2021"
 
 
-import os
-import shutil
-import tempfile
-import unittest
+# import os
+# import shutil
+# import tempfile
+# import unittest
 
-from tomwer.core.process.control.volumesymlink import VolumeSymbolicLinkTask
-from tomwer.core.scan.edfscan import EDFTomoScan
-from tomwer.core.utils.scanutils import MockEDF
+# from tomwer.core.process.control.volumesymlink import VolumeSymbolicLinkTask
+# from tomwer.core.scan.edfscan import EDFTomoScan
+# from tomwer.core.utils.scanutils import MockEDF
 
 
-class TestVolumeSymbolicLink(unittest.TestCase):
-    """Simple test of the VolumeSymbolicLink"""
+# class TestVolumeSymbolicLink(unittest.TestCase):
+#     """Simple test of the VolumeSymbolicLink"""
 
-    def setUp(self) -> None:
-        self._scan_folder = tempfile.mkdtemp()
-        self._output_folder = tempfile.mkdtemp()
-        MockEDF.fastMockAcquisition(self._scan_folder)
-        MockEDF.mockReconstruction(self._scan_folder, nRecons=2, nPagRecons=2)
-        self._scan = EDFTomoScan(self._scan_folder)
-        # here we simply estimate that the slice reconstruction will be
-        # volume reconstruction but the mechanism is the same.
-        self._scan.set_latest_vol_reconstructions(self._scan.get_reconstructions_urls())
+#     def setUp(self) -> None:
+#         self._scan_folder = tempfile.mkdtemp()
+#         self._output_folder = tempfile.mkdtemp()
+#         MockEDF.fastMockAcquisition(self._scan_folder)
+#         MockEDF.mockReconstruction(self._scan_folder, nRecons=2, nPagRecons=2)
+#         self._scan = EDFTomoScan(self._scan_folder)
+#         # here we simply estimate that the slice reconstruction will be
+#         # volume reconstruction but the mechanism is the same.
+#         self._scan.set_latest_vol_reconstructions(self._scan.get_reconstructions_urls())
 
-    def tearDown(self) -> None:
-        for folder in (self._scan_folder, self._output_folder):
-            shutil.rmtree(folder)
+#     def tearDown(self) -> None:
+#         for folder in (self._scan_folder, self._output_folder):
+#             shutil.rmtree(folder)
 
-    def test(self):
-        """simple test that the creation of a symbolic link works"""
-        vlink_process = VolumeSymbolicLinkTask(
-            inputs={
-                "data": self._scan,
-                "serialize_output_data": False,
-                "output_type": "static",
-                "output_folder": self._output_folder,
-            }
-        )
-        self.assertEqual(len(os.listdir(self._output_folder)), 0)
-        vlink_process.run()
-        self.assertEqual(len(os.listdir(self._output_folder)), 4)
+#     def test(self):
+#         """simple test that the creation of a symbolic link works"""
+#         vlink_process = VolumeSymbolicLinkTask(
+#             inputs={
+#                 "data": self._scan,
+#                 "serialize_output_data": False,
+#                 "output_type": "static",
+#                 "output_folder": self._output_folder,
+#             }
+#         )
+#         self.assertEqual(len(os.listdir(self._output_folder)), 0)
+#         vlink_process.run()
+#         self.assertEqual(len(os.listdir(self._output_folder)), 4)
 
-        self.assertTrue(isinstance(vlink_process.program_name(), str))
-        self.assertTrue(isinstance(vlink_process.program_version(), str))
-        self.assertTrue(isinstance(vlink_process.definition(), str))
+#         self.assertTrue(isinstance(vlink_process.program_name(), str))
+#         self.assertTrue(isinstance(vlink_process.program_version(), str))
+#         self.assertTrue(isinstance(vlink_process.definition(), str))

tomwer/core/process/control/timer.py

@@ -35,7 +35,7 @@ from tomwer.core.process.task import Task
 from tomwer.core.scan.scanbase import TomwerScanBase
 from tomwer.core.scan.scanfactory import ScanFactory
 from tomwer.core.utils.scanutils import data_identifier_to_scan
-from silx.utils.deprecation import deprecated_warning, deprecated
+from tomwer.core.utils.deprecation import deprecated_warning, deprecated
 
 _logger = logging.getLogger(__name__)
 

tomwer/core/process/control/volumesymlink.py

@@ -1,200 +1,200 @@
-# 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__ = "16/11/2020"
-
-
-import logging
-import os
-
-from silx.utils.enum import Enum as _Enum
-from silx.utils.deprecation import deprecated_warning, deprecated
-from tomoscan.factory import Factory
-from tomoscan.volumebase import VolumeBase
-
-import tomwer.version
-from tomwer.core.process.task import Task
-from tomwer.core.scan.scanbase import TomwerScanBase
-from tomwer.core.scan.scanfactory import ScanFactory
-from tomwer.core.utils.scanutils import data_identifier_to_scan
-from tomwer.utils import docstring
-
-_logger = logging.getLogger(__name__)
-
-
-class OutputType(_Enum):
-    STATIC = "static"
-    ONE_LEVEL_UPPER = "../volume"
-
-
-def create_volume_symbolic_link(scan: TomwerScanBase, output_folder: str):
-    """
-    Create a symbolic link for each volume reconstructed of `scan`
-
-    :param TomwerScanBase scan:
-    :param str output_folder:
-    """
-    if scan.latest_vol_reconstructions is None:
-        _logger.info("No volume reconstructed found")
-        return
-    if not os.path.exists(output_folder):
-        os.makedirs(output_folder)
-    for volume_url in scan.latest_vol_reconstructions:
-        volume = Factory.create_tomo_object_from_identifier(volume_url)
-        assert isinstance(volume, VolumeBase)
-        volume_files = set(
-            list(volume.browse_data_files()) + list(volume.browse_metadata_files()),
-        )
-        for src_file_path in volume_files:
-            if src_file_path is not None:
-                dst_file_path = os.path.join(
-                    output_folder, os.path.basename(src_file_path)
-                )
-                if os.path.exists(dst_file_path):
-                    _logger.info(
-                        "{} already exists. Cannot create a symbolic link on it"
-                    )
-                else:
-                    print(
-                        "src_file is", src_file_path, "dst_file_path is", dst_file_path
-                    )
-                    os.symlink(src=src_file_path, dst=dst_file_path)
-
-
-class VolumeSymbolicLinkTask(
-    Task,
-    input_names=("data",),
-    output_names=("data",),
-    optional_input_names=("serialize_output_data", "output_type", "output_folder"),
-):
-    """
-    Process class for volume symbolic link
-    """
-
-    def __init__(
-        self, varinfo=None, inputs=None, node_id=None, node_attrs=None, execinfo=None
-    ):
-        super().__init__(
-            varinfo=varinfo,
-            inputs=inputs,
-            node_id=node_id,
-            node_attrs=node_attrs,
-            execinfo=execinfo,
-        )
-        self._output_type = OutputType.ONE_LEVEL_UPPER
-        self._output_folder = None
-
-    @docstring(Task.set_configuration)
-    @deprecated(
-        reason="ewoksification",
-        replacement="task.inputs.output_type and task.inputs.output_folder",
-        since_version="1.2",
-    )
-    def set_configuration(self, properties):
-        if "output_type" in properties:
-            self._output_type = OutputType.from_value(properties["output_type"])
-        if "output_folder" in properties:
-            self._output_folder = properties["output_folder"]
-
-    @deprecated(
-        reason="ewoksification",
-        replacement="task.inputs.output_type and task.inputs.output_folder",
-        since_version="1.2",
-    )
-    def get_configuration(self):
-        return super().get_configuration()
-
-    @docstring(Task.program_name)
-    @staticmethod
-    def program_name():
-        return "tomwer_volume_symlink"
-
-    @docstring(Task.program_version)
-    @staticmethod
-    def program_version():
-        return tomwer.version.version
-
-    @docstring(Task.run)
-    def run(self):
-        scan = data_identifier_to_scan(self.inputs.data)
-        if type(scan) is dict:
-            scan = ScanFactory.create_scan_object_frm_dict(scan)
-        else:
-            scan = scan
-        if scan is None:
-            return
-        if not isinstance(scan, TomwerScanBase):
-            raise TypeError(
-                f"scan is expected to be a dict or an instance of TomwerScanBase. Not {type(scan)}"
-            )
-
-        output_type = OutputType.from_value(
-            self.get_input_value("output_type", self._output_type)
-        )
-        output_folder = self.get_input_value("output_folder", self._output_folder)
-        if output_type is OutputType.STATIC:
-            if output_folder is None:
-                raise ValueError(
-                    "Manual setting of the output folder is "
-                    "requested but None is provided."
-                )
-            else:
-                if not os.path.isabs(output_folder):
-                    os.path.abspath(
-                        os.path.join(os.path.realpath(scan.path), output_folder)
-                    )
-        elif output_type is OutputType.ONE_LEVEL_UPPER:
-            output_folder = os.path.realpath(scan.path)
-            output_folder = os.path.abspath(
-                os.path.join(output_folder, output_type.value)
-            )
-        else:
-            raise ValueError(f"output type {output_type.value} is not managed")
-        create_volume_symbolic_link(scan=scan, output_folder=output_folder)
-        if self.get_input_value("serialize_output_data", True):
-            self.outputs.data = scan.to_dict()
-        else:
-            self.outputs.data = scan
-
-    @docstring(Task.definition)
-    @staticmethod
-    def definition():
-        return "Create a symbolic link to the volume folder"
-
-
-class VolumeSymbolicLinkProcess(VolumeSymbolicLinkTask):
-    def __init__(
-        self, varinfo=None, inputs=None, node_id=None, node_attrs=None, execinfo=None
-    ):
-        deprecated_warning(
-            name="tomwer.core.process.control.volumesymlink.VolumeSymbolicLinkProcess",
-            type_="class",
-            reason="improve readibility",
-            since_version="1.2",
-            replacement="VolumeSymbolicLinkTask",
-        )
-        super().__init__(varinfo, inputs, node_id, node_attrs, execinfo)
+# # 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__ = "16/11/2020"
+
+
+# import logging
+# import os
+
+# from silx.utils.enum import Enum as _Enum
+# from tomwer.core.utils.deprecation import deprecated_warning, deprecated
+# from tomoscan.factory import Factory
+# from tomoscan.volumebase import VolumeBase
+
+# import tomwer.version
+# from tomwer.core.process.task import Task
+# from tomwer.core.scan.scanbase import TomwerScanBase
+# from tomwer.core.scan.scanfactory import ScanFactory
+# from tomwer.core.utils.scanutils import data_identifier_to_scan
+# from tomwer.utils import docstring
+
+# _logger = logging.getLogger(__name__)
+
+
+# class OutputType(_Enum):
+#     STATIC = "static"
+#     ONE_LEVEL_UPPER = "../volume"
+
+
+# def create_volume_symbolic_link(scan: TomwerScanBase, output_folder: str):
+#     """
+#     Create a symbolic link for each volume reconstructed of `scan`
+
+#     :param TomwerScanBase scan:
+#     :param str output_folder:
+#     """
+#     if scan.latest_vol_reconstructions is None:
+#         _logger.info("No volume reconstructed found")
+#         return
+#     if not os.path.exists(output_folder):
+#         os.makedirs(output_folder)
+#     for volume_url in scan.latest_vol_reconstructions:
+#         volume = Factory.create_tomo_object_from_identifier(volume_url)
+#         assert isinstance(volume, VolumeBase)
+#         volume_files = set(
+#             list(volume.browse_data_files()) + list(volume.browse_metadata_files()),
+#         )
+#         for src_file_path in volume_files:
+#             if src_file_path is not None:
+#                 dst_file_path = os.path.join(
+#                     output_folder, os.path.basename(src_file_path)
+#                 )
+#                 if os.path.exists(dst_file_path):
+#                     _logger.info(
+#                         "{} already exists. Cannot create a symbolic link on it"
+#                     )
+#                 else:
+#                     print(
+#                         "src_file is", src_file_path, "dst_file_path is", dst_file_path
+#                     )
+#                     os.symlink(src=src_file_path, dst=dst_file_path)
+
+
+# class VolumeSymbolicLinkTask(
+#     Task,
+#     input_names=("data",),
+#     output_names=("data",),
+#     optional_input_names=("serialize_output_data", "output_type", "output_folder"),
+# ):
+#     """
+#     Process class for volume symbolic link
+#     """
+
+#     def __init__(
+#         self, varinfo=None, inputs=None, node_id=None, node_attrs=None, execinfo=None
+#     ):
+#         super().__init__(
+#             varinfo=varinfo,
+#             inputs=inputs,
+#             node_id=node_id,
+#             node_attrs=node_attrs,
+#             execinfo=execinfo,
+#         )
+#         self._output_type = OutputType.ONE_LEVEL_UPPER
+#         self._output_folder = None
+
+#     @docstring(Task.set_configuration)
+#     @deprecated(
+#         reason="ewoksification",
+#         replacement="task.inputs.output_type and task.inputs.output_folder",
+#         since_version="1.2",
+#     )
+#     def set_configuration(self, properties):
+#         if "output_type" in properties:
+#             self._output_type = OutputType.from_value(properties["output_type"])
+#         if "output_folder" in properties:
+#             self._output_folder = properties["output_folder"]
+
+#     @deprecated(
+#         reason="ewoksification",
+#         replacement="task.inputs.output_type and task.inputs.output_folder",
+#         since_version="1.2",
+#     )
+#     def get_configuration(self):
+#         return super().get_configuration()
+
+#     @docstring(Task.program_name)
+#     @staticmethod
+#     def program_name():
+#         return "tomwer_volume_symlink"
+
+#     @docstring(Task.program_version)
+#     @staticmethod
+#     def program_version():
+#         return tomwer.version.version
+
+#     @docstring(Task.run)
+#     def run(self):
+#         scan = data_identifier_to_scan(self.inputs.data)
+#         if type(scan) is dict:
+#             scan = ScanFactory.create_scan_object_frm_dict(scan)
+#         else:
+#             scan = scan
+#         if scan is None:
+#             return
+#         if not isinstance(scan, TomwerScanBase):
+#             raise TypeError(
+#                 f"scan is expected to be a dict or an instance of TomwerScanBase. Not {type(scan)}"
+#             )
+
+#         output_type = OutputType.from_value(
+#             self.get_input_value("output_type", self._output_type)
+#         )
+#         output_folder = self.get_input_value("output_folder", self._output_folder)
+#         if output_type is OutputType.STATIC:
+#             if output_folder is None:
+#                 raise ValueError(
+#                     "Manual setting of the output folder is "
+#                     "requested but None is provided."
+#                 )
+#             else:
+#                 if not os.path.isabs(output_folder):
+#                     os.path.abspath(
+#                         os.path.join(os.path.abspath(scan.path), output_folder)
+#                     )
+#         elif output_type is OutputType.ONE_LEVEL_UPPER:
+#             output_folder = os.path.abspath(scan.path)
+#             output_folder = os.path.abspath(
+#                 os.path.join(output_folder, output_type.value)
+#             )
+#         else:
+#             raise ValueError(f"output type {output_type.value} is not managed")
+#         create_volume_symbolic_link(scan=scan, output_folder=output_folder)
+#         if self.get_input_value("serialize_output_data", True):
+#             self.outputs.data = scan.to_dict()
+#         else:
+#             self.outputs.data = scan
+
+#     @docstring(Task.definition)
+#     @staticmethod
+#     def definition():
+#         return "Create a symbolic link to the volume folder"
+
+
+# class VolumeSymbolicLinkProcess(VolumeSymbolicLinkTask):
+#     def __init__(
+#         self, varinfo=None, inputs=None, node_id=None, node_attrs=None, execinfo=None
+#     ):
+#         deprecated_warning(
+#             name="tomwer.core.process.control.volumesymlink.VolumeSymbolicLinkProcess",
+#             type_="class",
+#             reason="improve readibility",
+#             since_version="1.2",
+#             replacement="VolumeSymbolicLinkTask",
+#         )
+#         super().__init__(varinfo, inputs, node_id, node_attrs, execinfo)

tomwer/core/process/edit/darkflatpatch.py

@@ -31,24 +31,24 @@ __date__ = "04/11/2020"
 import nxtomomill.version
 from nxtomomill.utils import add_dark_flat_nx_file
 from silx.io.url import DataUrl
-from silx.utils.deprecation import deprecated_warning, deprecated
+from tomwer.core.utils.deprecation import deprecated_warning, deprecated
 
 from tomwer.core.process.task import Task
-from tomwer.core.scan.hdf5scan import HDF5TomoScan
+from tomwer.core.scan.nxtomoscan import NXtomoScan
 from tomwer.core.scan.scanbase import TomwerScanBase
 from tomwer.core.utils.scanutils import data_identifier_to_scan
 
 
-def apply_dark_flat_patch(scan: HDF5TomoScan, config: dict) -> TomwerScanBase:
+def apply_dark_flat_patch(scan: NXtomoScan, config: dict) -> TomwerScanBase:
     """
 
     :param scan:
     :param config:
     :return:
     """
-    if not isinstance(scan, HDF5TomoScan):
+    if not isinstance(scan, NXtomoScan):
         raise ValueError(
-            f"Dark and flat patch only manage HDF5TomoScan and not {type(scan)}"
+            f"Dark and flat patch only manage NXtomoScan and not {type(scan)}"
         )
     if config is None:
         return scan
@@ -82,7 +82,7 @@ class DarkFlatPatchTask(
             raise TypeError(
                 f"scan is expected to be a dict or an instance of TomwerScanBase. Not {type(scan)}"
             )
-        if not isinstance(scan, HDF5TomoScan):
+        if not isinstance(scan, NXtomoScan):
             raise ValueError(f"input type of {scan}: {type(scan)} is not managed")
 
         config = self.inputs.configuration
@@ -95,15 +95,14 @@ class DarkFlatPatchTask(
             if isinstance(value, DataUrl):
                 config[key] = value.path()
 
-        with scan.acquire_process_file_lock():
-            self.register_process(
-                process_file=scan.process_file,
-                entry=scan.entry,
-                configuration=config,
-                results={},
-                process_index=scan.pop_process_index(),
-                overwrite=True,
-            )
+        self.register_process(
+            process_file=scan.process_file,
+            entry=scan.entry,
+            configuration=config,
+            results={},
+            process_index=scan.pop_process_index(),
+            overwrite=True,
+        )
         if self.get_input_value("serialize_output_data", True):
             self.outputs.data = scan.to_dict()
         else: