From e09517375d93e60d6be0e2f11e15e5dc7e9ccea8 Mon Sep 17 00:00:00 2001 From: Lukas Pielsticker <50139597+lukaspie@users.noreply.github.com> Date: Tue, 20 Feb 2024 09:53:49 +0100 Subject: [PATCH] change import paths to plugin structure --- pynxtools_xps/file_parser.py | 14 ++++++-------- pynxtools_xps/reader.py | 4 ++-- pynxtools_xps/sle/sle_specs.py | 2 +- pynxtools_xps/txt/txt_scienta.py | 2 +- pynxtools_xps/txt/txt_vamas_export.py | 2 +- pynxtools_xps/vms/vamas.py | 16 ++++++++-------- pynxtools_xps/vms/vamas_data_model.py | 2 +- pynxtools_xps/xml/xml_specs.py | 2 +- pynxtools_xps/xy/xy_specs.py | 2 +- 9 files changed, 22 insertions(+), 24 deletions(-) diff --git a/pynxtools_xps/file_parser.py b/pynxtools_xps/file_parser.py index ef8e2784..d099e164 100644 --- a/pynxtools_xps/file_parser.py +++ b/pynxtools_xps/file_parser.py @@ -23,18 +23,16 @@ from typing import List, Dict -from pynxtools.dataconverter.readers.xps.sle.sle_specs import SleMapperSpecs +from pynxtools_xps.sle.sle_specs import SleMapperSpecs # from pynxtools.dataconverter.readers.xps.slh.slh_specs import SlhMapperSpecs -from pynxtools.dataconverter.readers.xps.txt.txt_scienta import TxtMapperScienta +from pynxtools_xps.txt.txt_scienta import TxtMapperScienta # from pynxtools.dataconverter.readers.xps.txt.txt_specs import TxtMapperSpecs -from pynxtools.dataconverter.readers.xps.txt.txt_vamas_export import ( - TxtMapperVamasExport, -) -from pynxtools.dataconverter.readers.xps.vms.vamas import VamasMapper -from pynxtools.dataconverter.readers.xps.xy.xy_specs import XyMapperSpecs -from pynxtools.dataconverter.readers.xps.xml.xml_specs import XmlMapperSpecs +from pynxtools_xps.txt.txt_vamas_export import TxtMapperVamasExport +from pynxtools_xps.vms.vamas import VamasMapper +from pynxtools_xps.xy.xy_specs import XyMapperSpecs +from pynxtools_xps.xml.xml_specs import XmlMapperSpecs class XpsDataFileParser: diff --git a/pynxtools_xps/reader.py b/pynxtools_xps/reader.py index 7805efeb..be357400 100644 --- a/pynxtools_xps/reader.py +++ b/pynxtools_xps/reader.py @@ -34,9 +34,9 @@ flatten_and_replace, parse_flatten_json, ) -from pynxtools.dataconverter.readers.xps.file_parser import XpsDataFileParser -from pynxtools.dataconverter.readers.xps.reader_utils import construct_entry_name from pynxtools.dataconverter.template import Template +from pynxtools_xps.file_parser import XpsDataFileParser +from pynxtools_xps.reader_utils import construct_entry_name np.set_printoptions(threshold=sys.maxsize) diff --git a/pynxtools_xps/sle/sle_specs.py b/pynxtools_xps/sle/sle_specs.py index 2ff4695e..a80dc638 100644 --- a/pynxtools_xps/sle/sle_specs.py +++ b/pynxtools_xps/sle/sle_specs.py @@ -33,7 +33,7 @@ import xarray as xr import numpy as np -from pynxtools.dataconverter.readers.xps.reader_utils import ( +from pynxtools_xps.reader_utils import ( XPSMapper, construct_entry_name, construct_data_key, diff --git a/pynxtools_xps/txt/txt_scienta.py b/pynxtools_xps/txt/txt_scienta.py index 20123ff2..4b456986 100644 --- a/pynxtools_xps/txt/txt_scienta.py +++ b/pynxtools_xps/txt/txt_scienta.py @@ -27,7 +27,7 @@ import xarray as xr import numpy as np -from pynxtools.dataconverter.readers.xps.reader_utils import ( +from pynxtools_xps.reader_utils import ( XPSMapper, construct_entry_name, construct_data_key, diff --git a/pynxtools_xps/txt/txt_vamas_export.py b/pynxtools_xps/txt/txt_vamas_export.py index 1e7ac030..4923e266 100644 --- a/pynxtools_xps/txt/txt_vamas_export.py +++ b/pynxtools_xps/txt/txt_vamas_export.py @@ -26,7 +26,7 @@ import xarray as xr import numpy as np -from pynxtools.dataconverter.readers.xps.reader_utils import ( +from pynxtools_xps.reader_utils import ( XPSMapper, check_uniform_step_width, get_minimal_step, diff --git a/pynxtools_xps/vms/vamas.py b/pynxtools_xps/vms/vamas.py index 8af1dd02..4957f913 100644 --- a/pynxtools_xps/vms/vamas.py +++ b/pynxtools_xps/vms/vamas.py @@ -27,9 +27,9 @@ import xarray as xr import numpy as np -from pynxtools.dataconverter.readers.xps.vms.vamas_data_model import VamasHeader, Block +from pynxtools_xps.vms.vamas_data_model import VamasHeader, VamasBlock -from pynxtools.dataconverter.readers.xps.reader_utils import ( +from pynxtools_xps.reader_utils import ( XPSMapper, construct_entry_name, construct_data_key, @@ -475,7 +475,7 @@ def _parse_norm_block(self): This method has to be implemented in the inherited parsers. """ - return Block() + return VamasBlock() @abstractmethod def _parse_map_block(self): @@ -485,7 +485,7 @@ def _parse_map_block(self): This method has to be implemented in the inherited parsers. """ - return Block() + return VamasBlock() def _get_scan_numbers_for_spectra(self, spectra): """ @@ -638,7 +638,7 @@ def _parse_norm_block(self): """ # pylint: disable=too-many-statements - block = Block() + block = VamasBlock() block.block_id = self.data.pop(0).strip() block.sample_id = self.data.pop(0).strip() block.year = int(self.data.pop(0).strip()) @@ -719,7 +719,7 @@ def _parse_map_block(self): """ # pylint: disable=too-many-statements - block = Block() + block = VamasBlock() block.block_id = self.data.pop(0).strip() block.sample_id = self.data.pop(0).strip() block.year = int(self.data.pop(0).strip()) @@ -844,7 +844,7 @@ def _parse_norm_block(self): """ # pylint: disable=too-many-statements - block = Block() + block = VamasBlock() block.block_id = self.data.pop(0).strip() block.sample_id = self.data.pop(0).strip() block.year = int(self.data.pop(0).strip()) @@ -925,7 +925,7 @@ def _parse_map_block(self): """ # pylint: disable=too-many-statements - block = Block() + block = VamasBlock() block.block_id = self.data.pop(0).strip() block.sample_id = self.data.pop(0).strip() block.year = int(self.data.pop(0).strip()) diff --git a/pynxtools_xps/vms/vamas_data_model.py b/pynxtools_xps/vms/vamas_data_model.py index 05e21bb6..878445d5 100644 --- a/pynxtools_xps/vms/vamas_data_model.py +++ b/pynxtools_xps/vms/vamas_data_model.py @@ -49,7 +49,7 @@ class VamasHeader: @dataclass -class Block: +class VamasBlock: """An object to store a block of spectrum data and meta-data.""" block_id: str = "" diff --git a/pynxtools_xps/xml/xml_specs.py b/pynxtools_xps/xml/xml_specs.py index f519bcad..dace81b6 100644 --- a/pynxtools_xps/xml/xml_specs.py +++ b/pynxtools_xps/xml/xml_specs.py @@ -25,7 +25,7 @@ import xarray as xr import numpy as np -from pynxtools.dataconverter.readers.xps.reader_utils import ( +from pynxtools_xps.reader_utils import ( XPSMapper, construct_entry_name, ) diff --git a/pynxtools_xps/xy/xy_specs.py b/pynxtools_xps/xy/xy_specs.py index 94d63524..47f12c70 100644 --- a/pynxtools_xps/xy/xy_specs.py +++ b/pynxtools_xps/xy/xy_specs.py @@ -31,7 +31,7 @@ import xarray as xr import numpy as np -from pynxtools.dataconverter.readers.xps.reader_utils import ( +from pynxtools_xps.reader_utils import ( XPSMapper, check_uniform_step_width, get_minimal_step,