fix tests, refactor a bit

Author: rozyczko

src/easyreflectometry/__init__.py

@@ -1,7 +1,5 @@
 from importlib import metadata
 
-from .orso_utils import LoadOrso
-from .orso_utils import load_data_from_orso_file
 from .project import Project
 
 try:
@@ -12,6 +10,4 @@
 __all__ = [
     Project,
     __version__,
-    LoadOrso,
-    load_data_from_orso_file,
 ]

src/easyreflectometry/calculators/calculator_base.py

@@ -1,22 +1,23 @@
 from __future__ import annotations
 
 from abc import ABCMeta
-from typing import TYPE_CHECKING
 from typing import Callable
 
 import numpy as np
 from easyscience.Objects.core import ComponentSerializer
 from easyscience.Objects.Inferface import ItemContainer
 
+#if TYPE_CHECKING:
+from easyreflectometry.model import Model
+from easyreflectometry.sample import BaseAssembly
+from easyreflectometry.sample import Layer
+from easyreflectometry.sample import Material
+from easyreflectometry.sample import MaterialMixture
+from easyreflectometry.sample import Multilayer
+
 from .wrapper_base import WrapperBase
 
-if TYPE_CHECKING:
-    from easyreflectometry.model import Model
-    from easyreflectometry.sample import BaseAssembly
-    from easyreflectometry.sample import Layer
-    from easyreflectometry.sample import Material
-    from easyreflectometry.sample import MaterialMixture
-    from easyreflectometry.sample import Multilayer
+
 class CalculatorBase(ComponentSerializer, metaclass=ABCMeta):
     """
     This class is a template and defines all properties that a calculator should have.

src/easyreflectometry/orso_utils.py

@@ -116,11 +116,16 @@ def load_orso_data(orso_str: str) -> DataSet1D:
             )
         attrs[f'R_{name}'] = {'orso_header': sc.scalar(Header.asdict(o.info))}
     data_group = sc.DataGroup(data=data, coords=coords, attrs=attrs)
-    dataset = DataSet1D(
-        x=data_group['coords']['Qz_0'].values,
-        y=data_group['data']['R_0'].values,
-        ye=data_group['data']['R_0'].variances,
-        xe=data_group['coords']['Qz_0'].variances,
-    )
-    return dataset
+    return data_group
+    # if 'Qz_spin_up' in data_group['coords']:
+    #     component = 'spin_up'
+    # else:
+    #     component = '0'
+    # dataset = DataSet1D(
+    #     x=data_group['coords'][f'Qz_{component}'].values,
+    #     y=data_group['data'][f'R_{component}'].values,
+    #     ye=data_group['data'][f'R_{component}'].variances,
+    #     xe=data_group['coords'][f'Qz_{component}'].variances,
+    # )
+    # return dataset
 

src/easyreflectometry/project.py

@@ -242,7 +242,7 @@ def get_index_d2o(self) -> int:
 
     def load_orso_file(self, path: Union[Path, str]) -> None:
         """Load an ORSO file and optionally create a model and a data from it."""
-        from easyreflectometry import LoadOrso
+        from easyreflectometry.orso_utils import LoadOrso
 
         model, data = LoadOrso(path)
         if model is not None:

tests/test_data.py

@@ -10,9 +10,9 @@
 from orsopy.fileio import load_orso
 
 import easyreflectometry
-from easyreflectometry.data.measurement import _load_orso
 from easyreflectometry.data.measurement import _load_txt
 from easyreflectometry.data.measurement import load
+from easyreflectometry.orso_utils import load_data_from_orso_file
 
 PATH_STATIC = os.path.join(os.path.dirname(easyreflectometry.__file__), '..', '..', 'tests', '_static')
 
@@ -47,7 +47,7 @@ def test_load_with_txt_commas(self):
 
     def test_orso1(self):
         fpath = os.path.join(PATH_STATIC, 'test_example1.ort')
-        er_data = _load_orso(fpath)
+        er_data = load_data_from_orso_file(fpath)
         o_data = load_orso(fpath)
         assert er_data['attrs']['R_spin_up']['orso_header'].value == Header.asdict(o_data[0].info)
         assert_almost_equal(er_data['data']['R_spin_up'].values, o_data[0].data[:, 1])
@@ -57,7 +57,7 @@ def test_orso1(self):
 
     def test_orso2(self):
         fpath = os.path.join(PATH_STATIC, 'test_example2.ort')
-        er_data = _load_orso(fpath)
+        er_data = load_data_from_orso_file(fpath)
         o_data = load_orso(fpath)
         for i, o in enumerate(list(reversed(o_data))):
             assert er_data['attrs'][f'R_{o.info.data_set}']['orso_header'].value == Header.asdict(o.info)
@@ -68,7 +68,7 @@ def test_orso2(self):
 
     def test_orso3(self):
         fpath = os.path.join(PATH_STATIC, 'test_example3.ort')
-        er_data = _load_orso(fpath)
+        er_data = load_data_from_orso_file(fpath)
         o_data = load_orso(fpath)
         for i, o in enumerate(o_data):
             assert er_data['attrs'][f'R_{o.info.data_set}']['orso_header'].value == Header.asdict(o.info)
@@ -79,7 +79,7 @@ def test_orso3(self):
 
     def test_orso4(self):
         fpath = os.path.join(PATH_STATIC, 'test_example4.ort')
-        er_data = _load_orso(fpath)
+        er_data = load_data_from_orso_file(fpath)
         o_data = load_orso(fpath)
         for i, o in enumerate(o_data):
             print(list(er_data.keys()))