Merge pull request #154 from EasyScience/develop

Back to EasyCore

Author: andped10

EasyReflectometry/calculators/bornagain/calculator.py

@@ -1,7 +1,7 @@
 __author__ = 'github.com/arm61'
 
 import numpy as np
-from easyscience.Objects.Inferface import ItemContainer
+from easyCore.Objects.Inferface import ItemContainer
 
 from EasyReflectometry.experiment import Model
 from EasyReflectometry.sample import Layer

EasyReflectometry/calculators/calculator_base.py

@@ -4,8 +4,8 @@
 from typing import Callable
 
 import numpy as np
-from easyscience.Objects.core import ComponentSerializer
-from easyscience.Objects.Inferface import ItemContainer
+from easyCore.Objects.core import ComponentSerializer
+from easyCore.Objects.Inferface import ItemContainer
 
 from EasyReflectometry.experiment import Model
 from EasyReflectometry.sample import BaseAssembly

EasyReflectometry/calculators/factory.py

@@ -1,6 +1,6 @@
 __author__ = 'github.com/wardsimon'
 
-from easyscience.Objects.Inferface import InterfaceFactoryTemplate
+from easyCore.Objects.Inferface import InterfaceFactoryTemplate
 
 from EasyReflectometry.calculators import CalculatorBase
 

EasyReflectometry/experiment/model.py

@@ -8,8 +8,8 @@
 
 import numpy as np
 import yaml
-from easyscience.Objects.ObjectClasses import BaseObj
-from easyscience.Objects.ObjectClasses import Parameter
+from easyCore.Objects.ObjectClasses import BaseObj
+from easyCore.Objects.ObjectClasses import Parameter
 
 from EasyReflectometry.experiment.resolution_functions import is_percentage_fhwm_resolution_function
 from EasyReflectometry.parameter_utils import get_as_parameter

EasyReflectometry/fitting.py

@@ -2,14 +2,14 @@
 
 import numpy as np
 import scipp as sc
-from easyscience.Fitting.Fitting import MultiFitter as easyFitter
+from easyCore.Fitting.Fitting import MultiFitter as easyFitter
 
 from EasyReflectometry.experiment import Model
 
 
 class Fitter:
     def __init__(self, *args: Model):
-        r"""A convinence class for the :py:class:`easyscience.Fitting.Fitting`
+        r"""A convinence class for the :py:class:`easyCore.Fitting.Fitting`
         which will populate the :py:class:`sc.DataGroup` appropriately
         after the fitting is performed.
 

EasyReflectometry/parameter_utils.py

@@ -2,7 +2,7 @@
 from numbers import Number
 from typing import Union
 
-from easyscience.Objects.ObjectClasses import Parameter
+from easyCore.Objects.ObjectClasses import Parameter
 
 
 def get_as_parameter(name: str, value: Union[Parameter, Number, None], default_dict: dict) -> Parameter:

EasyReflectometry/sample/assemblies/base_assembly.py

@@ -1,7 +1,7 @@
 from typing import Any
 from typing import Optional
 
-from easyscience.Fitting.Constraints import ObjConstraint
+from easyCore.Fitting.Constraints import ObjConstraint
 
 from ..base_core import BaseCore
 from ..elements.layers.layer import Layer

EasyReflectometry/sample/assemblies/repeating_multilayer.py

@@ -1,6 +1,6 @@
 from typing import Union
 
-from easyscience.Objects.ObjectClasses import Parameter
+from easyCore.Objects.ObjectClasses import Parameter
 
 from EasyReflectometry.parameter_utils import get_as_parameter
 

EasyReflectometry/sample/assemblies/surfactant_layer.py

@@ -2,8 +2,8 @@
 
 from typing import Optional
 
-from easyscience.Fitting.Constraints import ObjConstraint
-from easyscience.Objects.ObjectClasses import Parameter
+from easyCore.Fitting.Constraints import ObjConstraint
+from easyCore.Objects.ObjectClasses import Parameter
 
 from ..elements.layers.layer_area_per_molecule import LayerAreaPerMolecule
 from ..elements.layers.layer_collection import LayerCollection

EasyReflectometry/sample/base_core.py

@@ -1,7 +1,7 @@
 from abc import abstractmethod
 
 import yaml
-from easyscience.Objects.ObjectClasses import BaseObj
+from easyCore.Objects.ObjectClasses import BaseObj
 
 
 class BaseCore(BaseObj):