rename experiment to model

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

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

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
 

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
 

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:

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:

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):

tests/experiment/test_model.py → 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

tests/experiment/test_model_collection.py → 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:

tests/experiment/test_resolution_functions.py → 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):

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

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