diff --git a/src/easyreflectometry/calculators/bornagain/calculator.py b/src/easyreflectometry/calculators/bornagain/calculator.py index 3a17caef..205cf935 100644 --- a/src/easyreflectometry/calculators/bornagain/calculator.py +++ b/src/easyreflectometry/calculators/bornagain/calculator.py @@ -3,7 +3,7 @@ import numpy as np from easyscience.Objects.Inferface import ItemContainer -from easyreflectometry.experiment import Model +from easyreflectometry.model import Model from easyreflectometry.sample import Layer from easyreflectometry.sample import Material from easyreflectometry.sample import MaterialMixture diff --git a/src/easyreflectometry/calculators/calculator_base.py b/src/easyreflectometry/calculators/calculator_base.py index 122e3cbc..8811b7c3 100644 --- a/src/easyreflectometry/calculators/calculator_base.py +++ b/src/easyreflectometry/calculators/calculator_base.py @@ -7,7 +7,7 @@ from easyscience.Objects.core import ComponentSerializer from easyscience.Objects.Inferface import ItemContainer -from easyreflectometry.experiment import Model +from easyreflectometry.model import Model from easyreflectometry.sample import BaseAssembly from easyreflectometry.sample import Layer from easyreflectometry.sample import Material diff --git a/src/easyreflectometry/calculators/refl1d/wrapper.py b/src/easyreflectometry/calculators/refl1d/wrapper.py index 020801b7..98aaf96e 100644 --- a/src/easyreflectometry/calculators/refl1d/wrapper.py +++ b/src/easyreflectometry/calculators/refl1d/wrapper.py @@ -6,7 +6,7 @@ from refl1d import model from refl1d import names -from easyreflectometry.experiment.resolution_functions import PercentageFhwm +from easyreflectometry.model.resolution_functions import PercentageFhwm from ..wrapper_base import WrapperBase diff --git a/src/easyreflectometry/calculators/refnx/wrapper.py b/src/easyreflectometry/calculators/refnx/wrapper.py index 3ab62a9b..7ff39edb 100644 --- a/src/easyreflectometry/calculators/refnx/wrapper.py +++ b/src/easyreflectometry/calculators/refnx/wrapper.py @@ -5,7 +5,7 @@ import numpy as np from refnx import reflect -from easyreflectometry.experiment.resolution_functions import PercentageFhwm +from easyreflectometry.model.resolution_functions import PercentageFhwm from ..wrapper_base import WrapperBase diff --git a/src/easyreflectometry/calculators/wrapper_base.py b/src/easyreflectometry/calculators/wrapper_base.py index 8f9440ee..56f90a16 100644 --- a/src/easyreflectometry/calculators/wrapper_base.py +++ b/src/easyreflectometry/calculators/wrapper_base.py @@ -2,8 +2,8 @@ import numpy as np -from easyreflectometry.experiment import PercentageFhwm -from easyreflectometry.experiment import ResolutionFunction +from easyreflectometry.model import PercentageFhwm +from easyreflectometry.model import ResolutionFunction class WrapperBase: diff --git a/src/easyreflectometry/fitting.py b/src/easyreflectometry/fitting.py index 92f7794a..89e4eb64 100644 --- a/src/easyreflectometry/fitting.py +++ b/src/easyreflectometry/fitting.py @@ -5,7 +5,7 @@ from easyscience.fitting import AvailableMinimizers from easyscience.fitting.multi_fitter import MultiFitter as easyFitter -from easyreflectometry.experiment import Model +from easyreflectometry.model import Model class Fitter: diff --git a/src/easyreflectometry/experiment/__init__.py b/src/easyreflectometry/model/__init__.py similarity index 100% rename from src/easyreflectometry/experiment/__init__.py rename to src/easyreflectometry/model/__init__.py diff --git a/src/easyreflectometry/experiment/model.py b/src/easyreflectometry/model/model.py similarity index 100% rename from src/easyreflectometry/experiment/model.py rename to src/easyreflectometry/model/model.py diff --git a/src/easyreflectometry/experiment/model_collection.py b/src/easyreflectometry/model/model_collection.py similarity index 100% rename from src/easyreflectometry/experiment/model_collection.py rename to src/easyreflectometry/model/model_collection.py diff --git a/src/easyreflectometry/experiment/resolution_functions.py b/src/easyreflectometry/model/resolution_functions.py similarity index 100% rename from src/easyreflectometry/experiment/resolution_functions.py rename to src/easyreflectometry/model/resolution_functions.py diff --git a/tests/calculators/refnx/test_refnx_wrapper.py b/tests/calculators/refnx/test_refnx_wrapper.py index de2a0027..093bfb2c 100644 --- a/tests/calculators/refnx/test_refnx_wrapper.py +++ b/tests/calculators/refnx/test_refnx_wrapper.py @@ -16,8 +16,8 @@ from refnx import reflect from easyreflectometry.calculators.refnx.wrapper import RefnxWrapper -from easyreflectometry.experiment import LinearSpline -from easyreflectometry.experiment import PercentageFhwm +from easyreflectometry.model import LinearSpline +from easyreflectometry.model import PercentageFhwm class TestRefnx(unittest.TestCase): diff --git a/tests/experiment/test_model.py b/tests/model/test_model.py similarity index 99% rename from tests/experiment/test_model.py rename to tests/model/test_model.py index f8746327..f0f3c496 100644 --- a/tests/experiment/test_model.py +++ b/tests/model/test_model.py @@ -15,9 +15,9 @@ from numpy.testing import assert_equal from easyreflectometry.calculators import CalculatorFactory -from easyreflectometry.experiment import LinearSpline -from easyreflectometry.experiment import Model -from easyreflectometry.experiment import PercentageFhwm +from easyreflectometry.model import LinearSpline +from easyreflectometry.model import Model +from easyreflectometry.model import PercentageFhwm from easyreflectometry.sample import Layer from easyreflectometry.sample import LayerCollection from easyreflectometry.sample import Material diff --git a/tests/experiment/test_model_collection.py b/tests/model/test_model_collection.py similarity index 95% rename from tests/experiment/test_model_collection.py rename to tests/model/test_model_collection.py index 02f0ec4b..8614efb8 100644 --- a/tests/experiment/test_model_collection.py +++ b/tests/model/test_model_collection.py @@ -1,7 +1,7 @@ from easyscience import global_object -from easyreflectometry.experiment.model import Model -from easyreflectometry.experiment.model_collection import ModelCollection +from easyreflectometry.model.model import Model +from easyreflectometry.model.model_collection import ModelCollection class TestModelCollection: diff --git a/tests/experiment/test_resolution_functions.py b/tests/model/test_resolution_functions.py similarity index 88% rename from tests/experiment/test_resolution_functions.py rename to tests/model/test_resolution_functions.py index ab8eb614..ff5b1816 100644 --- a/tests/experiment/test_resolution_functions.py +++ b/tests/model/test_resolution_functions.py @@ -2,10 +2,10 @@ import numpy as np -from easyreflectometry.experiment.resolution_functions import DEFAULT_RESOLUTION_FWHM_PERCENTAGE -from easyreflectometry.experiment.resolution_functions import LinearSpline -from easyreflectometry.experiment.resolution_functions import PercentageFhwm -from easyreflectometry.experiment.resolution_functions import ResolutionFunction +from easyreflectometry.model.resolution_functions import DEFAULT_RESOLUTION_FWHM_PERCENTAGE +from easyreflectometry.model.resolution_functions import LinearSpline +from easyreflectometry.model.resolution_functions import PercentageFhwm +from easyreflectometry.model.resolution_functions import ResolutionFunction class TestPercentageFhwm(unittest.TestCase): diff --git a/tests/test_fitting.py b/tests/test_fitting.py index 42948feb..08a7fc01 100644 --- a/tests/test_fitting.py +++ b/tests/test_fitting.py @@ -8,9 +8,9 @@ import easyreflectometry from easyreflectometry.calculators import CalculatorFactory from easyreflectometry.data import load -from easyreflectometry.experiment import Model -from easyreflectometry.experiment import PercentageFhwm from easyreflectometry.fitting import Fitter +from easyreflectometry.model import Model +from easyreflectometry.model import PercentageFhwm from easyreflectometry.sample import Layer from easyreflectometry.sample import Material from easyreflectometry.sample import Sample diff --git a/tests/test_topmost_nesting.py b/tests/test_topmost_nesting.py index 585dc8da..1babee04 100644 --- a/tests/test_topmost_nesting.py +++ b/tests/test_topmost_nesting.py @@ -8,8 +8,8 @@ from numpy.testing import assert_almost_equal from easyreflectometry.calculators import CalculatorFactory -from easyreflectometry.experiment import LinearSpline -from easyreflectometry.experiment import Model +from easyreflectometry.model import LinearSpline +from easyreflectometry.model import Model from easyreflectometry.sample import Multilayer from easyreflectometry.sample import RepeatingMultilayer from easyreflectometry.sample import SurfactantLayer