easyreflectometry 1.2.0__tar.gz → 1.3.1__tar.gz

{easyreflectometry-1.2.0 → easyreflectometry-1.3.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: easyreflectometry
-Version: 1.2.0
+Version: 1.3.1
 Summary: A reflectometry python package built on the EasyScience framework.
 Project-URL: homepage, https://docs.easyreflectometry.org
 Project-URL: documentation, https://docs.easyreflectometry.org
@@ -41,42 +41,41 @@ Classifier: License :: OSI Approved :: BSD License
 Classifier: Operating System :: OS Independent
 Classifier: Programming Language :: Python :: 3
 Classifier: Programming Language :: Python :: 3 :: Only
-Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
 Classifier: Topic :: Scientific/Engineering
-Requires-Python: <3.13,>=3.9
-Requires-Dist: easyscience>=1.2.0
-Requires-Dist: orsopy>=0.0.4
-Requires-Dist: pint==0.23
-Requires-Dist: refl1d>=0.8.14
-Requires-Dist: refnx>=0.1.15
-Requires-Dist: scipp>=23.12.0
-Requires-Dist: xhtml2pdf>=0.2.16
+Requires-Python: <3.13,>=3.10
+Requires-Dist: easyscience==1.3.0
+Requires-Dist: orsopy==1.2.1
+Requires-Dist: refl1d[webview]==1.0.0a12
+Requires-Dist: refnx==0.1.52
+Requires-Dist: scipp==25.2.0
+Requires-Dist: xhtml2pdf==0.2.17
 Provides-Extra: dev
-Requires-Dist: build; extra == 'dev'
-Requires-Dist: codecov>=2.1.11; extra == 'dev'
-Requires-Dist: coverage; extra == 'dev'
-Requires-Dist: coveralls; extra == 'dev'
-Requires-Dist: flake8>=6.0.0; extra == 'dev'
-Requires-Dist: ipykernel; extra == 'dev'
-Requires-Dist: jupyter>=1.0.0; extra == 'dev'
-Requires-Dist: jupyterlab; extra == 'dev'
-Requires-Dist: plopp; extra == 'dev'
-Requires-Dist: pooch; extra == 'dev'
-Requires-Dist: pytest-cov>=3.0.0; extra == 'dev'
-Requires-Dist: pytest>=5.2; extra == 'dev'
-Requires-Dist: ruff; extra == 'dev'
-Requires-Dist: toml>=0.10; extra == 'dev'
-Requires-Dist: yapf>=0.31.0; extra == 'dev'
+Requires-Dist: build==1.2.2.post1; extra == 'dev'
+Requires-Dist: codecov==2.1.13; extra == 'dev'
+Requires-Dist: coverage==7.7.0; extra == 'dev'
+Requires-Dist: coveralls==4.0.1; extra == 'dev'
+Requires-Dist: flake8==7.1.2; extra == 'dev'
+Requires-Dist: ipykernel==6.29.5; extra == 'dev'
+Requires-Dist: jupyter==1.1.1; extra == 'dev'
+Requires-Dist: jupyterlab==4.3.6; extra == 'dev'
+Requires-Dist: plopp==25.3.0; extra == 'dev'
+Requires-Dist: pooch==1.8.2; extra == 'dev'
+Requires-Dist: pytest-cov==6.0.0; extra == 'dev'
+Requires-Dist: pytest==8.3.5; extra == 'dev'
+Requires-Dist: ruff==0.11.0; extra == 'dev'
+Requires-Dist: toml==0.10.2; extra == 'dev'
+Requires-Dist: yapf==0.43.0; extra == 'dev'
 Provides-Extra: docs
-Requires-Dist: myst-parser; extra == 'docs'
-Requires-Dist: nbsphinx; extra == 'docs'
+Requires-Dist: myst-parser==4.0.1; extra == 'docs'
+Requires-Dist: nbsphinx==0.9.7; extra == 'docs'
+Requires-Dist: sphinx; extra == 'docs'
 Requires-Dist: sphinx-autodoc-typehints; extra == 'docs'
-Requires-Dist: sphinx-book-theme; extra == 'docs'
-Requires-Dist: sphinx-copybutton; extra == 'docs'
-Requires-Dist: toml; extra == 'docs'
+Requires-Dist: sphinx-book-theme==1.1.4; extra == 'docs'
+Requires-Dist: sphinx-copybutton==0.5.2; extra == 'docs'
+Requires-Dist: toml==0.10.2; extra == 'docs'
 Description-Content-Type: text/markdown
 
 ![Logo](https://github.com/easyScience/EasyReflectometryLib/raw/master/docs/src/_static/logo.png)

{easyreflectometry-1.2.0 → easyreflectometry-1.3.1}/pyproject.toml

@@ -21,48 +21,50 @@ classifiers = [
     "Topic :: Scientific/Engineering",
     "Programming Language :: Python :: 3",
     "Programming Language :: Python :: 3 :: Only",
-    "Programming Language :: Python :: 3.9",
     "Programming Language :: Python :: 3.10",
     "Programming Language :: Python :: 3.11",
     "Programming Language :: Python :: 3.12",
     "Development Status :: 3 - Alpha"
 ]
-requires-python = ">=3.9,<3.13"
+
+requires-python = ">=3.10,<3.13"
+
 dependencies = [
-    "easyscience>=1.2.0",
-    "scipp>=23.12.0",
-    "refnx>=0.1.15",
-    "refl1d>=0.8.14",
-    "orsopy>=0.0.4",
-    "pint==0.23", # Only to ensure that unit is reported as dimensionless rather than empty string
-    "xhtml2pdf>=0.2.16"
+    "easyscience==1.3.0",
+    "scipp==25.2.0",
+    "refnx==0.1.52",
+    "refl1d[webview]==1.0.0a12",
+    "orsopy==1.2.1",
+    "xhtml2pdf==0.2.17",
 ]
 
 [project.optional-dependencies]
 dev = [
-    "build",
-    "codecov>=2.1.11",
-    "coverage",
-    "coveralls",
-    "flake8>=6.0.0",
-    "ipykernel",
-    "jupyter>=1.0.0",
-    "jupyterlab",
-    "plopp",
-    "pooch",
-    "pytest>=5.2",
-    "pytest-cov>=3.0.0",
-    "ruff",
-    "toml>=0.10",
-    "yapf>=0.31.0",
+    "build==1.2.2.post1",
+    "codecov==2.1.13",
+    "coverage==7.7.0",
+    "coveralls==4.0.1",
+    "flake8==7.1.2",
+    "ipykernel==6.29.5",
+    "jupyter==1.1.1",
+    "jupyterlab==4.3.6",
+    "plopp==25.3.0",
+    "pooch==1.8.2",
+    "pytest==8.3.5",
+    "pytest-cov==6.0.0",
+    "ruff==0.11.0",
+    "toml==0.10.2",
+    "yapf==0.43.0",
 ]
+
 docs = [
-    "myst_parser",
-    "nbsphinx",
+    "myst_parser==4.0.1",
+    "nbsphinx==0.9.7",
+    "sphinx",
     "sphinx_autodoc_typehints",
-    "sphinx_book_theme",
-    "sphinx-copybutton",
-    "toml"
+    "sphinx-book-theme==1.1.4",
+    "sphinx-copybutton==0.5.2",
+    "toml==0.10.2",
 ]
 
 [project.urls]
@@ -131,10 +133,9 @@ force-single-line = true
 legacy_tox_ini = """
 [tox]
 isolated_build = True
-envlist = py{3.9,3.10,3.11,3.12}
+envlist = py{3.10,3.11,3.12}
 [gh-actions]
 python =
-        3.9: py39
         3.10: py310
         3.11: py311
         3.12: py312

easyreflectometry-1.3.1/src/easyreflectometry/__version__.py

@@ -0,0 +1 @@
+__version__ = '1.3.1'

{easyreflectometry-1.2.0 → easyreflectometry-1.3.1}/src/easyreflectometry/calculators/refl1d/wrapper.py

@@ -3,10 +3,10 @@ __author__ = 'github.com/arm61'
 from typing import Tuple
 
 import numpy as np
-from refl1d import model
 from refl1d import names
+from refl1d.sample.layers import Repeat
 
-from easyreflectometry.model import PercentageFhwm
+from easyreflectometry.model import PercentageFwhm
 
 from ..wrapper_base import WrapperBase
 
@@ -34,7 +34,7 @@ class Refl1dWrapper(WrapperBase):
             magnetism = names.Magnetism(rhoM=0.0, thetaM=0.0)
         else:
             magnetism = None
-        self.storage['layer'][name] = model.Slab(name=str(name), magnetism=magnetism)
+        self.storage['layer'][name] = names.Slab(name=str(name), magnetism=magnetism)
 
     def create_item(self, name: str):
         """
@@ -42,8 +42,8 @@ class Refl1dWrapper(WrapperBase):
 
         :param name: The name of the item
         """
-        self.storage['item'][name] = model.Repeat(
-            model.Stack(model.Slab(names.SLD(), thickness=0, interface=0)), name=str(name)
+        self.storage['item'][name] = Repeat(
+            names.Stack(names.Slab(names.SLD(), thickness=0, interface=0)), name=str(name)
         )
         del self.storage['item'][name].stack[0]
 
@@ -66,7 +66,7 @@ class Refl1dWrapper(WrapperBase):
         :param key: The given value keys
         """
         if key in ['magnetism_rhoM', 'magnetism_thetaM']:
-            return getattr(self.storage['layer'][name].magnetism, key.split('_')[-1])
+            return getattr(self.storage['layer'][name].magnetism, key.split('_')[-1]).value #TODO: check if we want to return the raw value or the full Parameter  # noqa: E501
         return super().get_layer_value(name, key)
 
     def create_model(self, name: str):
@@ -157,7 +157,7 @@ class Refl1dWrapper(WrapperBase):
         sample = _build_sample(self.storage, model_name)
         dq_array = self._resolution_function.smearing(q_array)
 
-        if isinstance(self._resolution_function, PercentageFhwm):
+        if isinstance(self._resolution_function, PercentageFwhm):
             # Get percentage of Q and change from sigma to FWHM
             dq_array = dq_array * q_array / 100 / (2 * np.sqrt(2 * np.log(2)))
 
@@ -267,8 +267,8 @@ def _get_polarized_probe(
     return names.PolarizedQProbe(xs=four_probes, name='polarized')
 
 
-def _build_sample(storage: dict, model_name: str) -> model.Stack:
-    sample = model.Stack()
+def _build_sample(storage: dict, model_name: str) -> names.Stack:
+    sample = names.Stack()
     # -1 to reverse the order
     for i in storage['model'][model_name]['items'][::-1]:
         if i.repeat.value == 1:
@@ -276,9 +276,9 @@ def _build_sample(storage: dict, model_name: str) -> model.Stack:
             for j in range(len(i.stack))[::-1]:
                 sample |= i.stack[j]
         else:
-            stack = model.Stack()
+            stack = names.Stack()
             # -1 to reverse the order
             for j in range(len(i.stack))[::-1]:
                 stack |= i.stack[j]
-            sample |= model.Repeat(stack, repeat=i.repeat.value)
+            sample |= Repeat(stack, repeat=i.repeat.value)
     return sample

{easyreflectometry-1.2.0 → easyreflectometry-1.3.1}/src/easyreflectometry/calculators/refnx/wrapper.py

@@ -5,7 +5,7 @@ from typing import Tuple
 import numpy as np
 from refnx import reflect
 
-from easyreflectometry.model import PercentageFhwm
+from easyreflectometry.model import PercentageFwhm
 
 from ..wrapper_base import WrapperBase
 
@@ -143,7 +143,7 @@ class RefnxWrapper(WrapperBase):
         )
 
         dq_vector = self._resolution_function.smearing(q_array)
-        if isinstance(self._resolution_function, PercentageFhwm):
+        if isinstance(self._resolution_function, PercentageFwhm):
             # FWHM Percentage resolution is constant given as
             # For a constant resolution percentage refnx supports to pass a scalar value rather than a vector
             dq_vector = dq_vector[0]

{easyreflectometry-1.2.0 → easyreflectometry-1.3.1}/src/easyreflectometry/calculators/wrapper_base.py

@@ -2,7 +2,7 @@ from abc import abstractmethod
 
 import numpy as np
 
-from easyreflectometry.model import PercentageFhwm
+from easyreflectometry.model import PercentageFwhm
 from easyreflectometry.model import ResolutionFunction
 
 
@@ -16,7 +16,7 @@ class WrapperBase:
             'item': {},
             'model': {},
         }
-        self._resolution_function = PercentageFhwm()
+        self._resolution_function = PercentageFwhm()
 
     def reset_storage(self):
         """Reset the storage area to blank."""

{easyreflectometry-1.2.0 → easyreflectometry-1.3.1}/src/easyreflectometry/data/__init__.py

@@ -4,8 +4,8 @@ from .measurement import load
 from .measurement import load_as_dataset
 
 __all__ = [
-    load,
-    load_as_dataset,
-    ProjectData,
-    DataSet1D,
+    "load",
+    "load_as_dataset",
+    "ProjectData",
+    "DataSet1D",
 ]

{easyreflectometry-1.2.0 → easyreflectometry-1.3.1}/src/easyreflectometry/model/__init__.py

@@ -1,13 +1,13 @@
 from .model import Model
 from .model_collection import ModelCollection
 from .resolution_functions import LinearSpline
-from .resolution_functions import PercentageFhwm
+from .resolution_functions import PercentageFwhm
 from .resolution_functions import ResolutionFunction
 
 __all__ = (
-    LinearSpline,
-    PercentageFhwm,
-    ResolutionFunction,
-    Model,
-    ModelCollection,
+    "LinearSpline",
+    "PercentageFwhm",
+    "ResolutionFunction",
+    "Model",
+    "ModelCollection",
 )

{easyreflectometry-1.2.0 → easyreflectometry-1.3.1}/src/easyreflectometry/model/model.py

@@ -9,15 +9,15 @@ from typing import Union
 
 import numpy as np
 from easyscience import global_object
-from easyscience.Objects.new_variable import Parameter
 from easyscience.Objects.ObjectClasses import BaseObj
+from easyscience.Objects.variable import Parameter
 
 from easyreflectometry.sample import BaseAssembly
 from easyreflectometry.sample import Sample
 from easyreflectometry.utils import get_as_parameter
 from easyreflectometry.utils import yaml_dump
 
-from .resolution_functions import PercentageFhwm
+from .resolution_functions import PercentageFwhm
 from .resolution_functions import ResolutionFunction
 
 DEFAULTS = {
@@ -26,7 +26,7 @@ DEFAULTS = {
         'url': 'https://github.com/reflectivity/edu_outreach/blob/master/refl_maths/paper.tex',
         'value': 1.0,
         'min': 0,
-        'max': np.Inf,
+        'max': np.inf,
         'fixed': True,
     },
     'background': {
@@ -34,7 +34,7 @@ DEFAULTS = {
         'url': 'https://github.com/reflectivity/edu_outreach/blob/master/refl_maths/paper.tex',
         'value': 1e-8,
         'min': 0.0,
-        'max': np.Inf,
+        'max': np.inf,
         'fixed': True,
     },
     'resolution': {
@@ -71,7 +71,7 @@ class Model(BaseObj):
         :param scale: Scaling factor of profile.
         :param background: Linear background magnitude.
         :param name: Name of the model, defaults to 'EasyModel'.
-        :param resolution_function: Resolution function, defaults to PercentageFhwm.
+        :param resolution_function: Resolution function, defaults to PercentageFwhm.
         :param interface: Calculator interface, defaults to `None`.
 
         """
@@ -81,7 +81,7 @@ class Model(BaseObj):
         if sample is None:
             sample = Sample(interface=interface)
         if resolution_function is None:
-            resolution_function = PercentageFhwm(DEFAULTS['resolution']['value'])
+            resolution_function = PercentageFwhm(DEFAULTS['resolution']['value'])
 
         scale = get_as_parameter('scale', scale, DEFAULTS)
         background = get_as_parameter('background', background, DEFAULTS)
@@ -168,7 +168,7 @@ class Model(BaseObj):
     @property
     def _dict_repr(self) -> dict[str, dict[str, str]]:
         """A simplified dict representation."""
-        if isinstance(self._resolution_function, PercentageFhwm):
+        if isinstance(self._resolution_function, PercentageFwhm):
             resolution_value = self._resolution_function.as_dict()['constant']
             resolution = f'{resolution_value} %'
         else:

{easyreflectometry-1.2.0 → easyreflectometry-1.3.1}/src/easyreflectometry/model/resolution_functions.py

@@ -26,14 +26,14 @@ class ResolutionFunction:
 
     @classmethod
     def from_dict(cls, data: dict) -> ResolutionFunction:
-        if data['smearing'] == 'PercentageFhwm':
-            return PercentageFhwm(data['constant'])
+        if data['smearing'] == 'PercentageFwhm':
+            return PercentageFwhm(data['constant'])
         if data['smearing'] == 'LinearSpline':
             return LinearSpline(data['q_data_points'], data['fwhm_values'])
         raise ValueError('Unknown resolution function type')
 
 
-class PercentageFhwm(ResolutionFunction):
+class PercentageFwhm(ResolutionFunction):
     def __init__(self, constant: Union[None, float] = None):
         if constant is None:
             constant = DEFAULT_RESOLUTION_FWHM_PERCENTAGE
@@ -45,7 +45,7 @@ class PercentageFhwm(ResolutionFunction):
     def as_dict(
         self, skip: Optional[List[str]] = None
     ) -> dict[str, str]:  # skip is kept for consistency of the as_dict signature
-        return {'smearing': 'PercentageFhwm', 'constant': self.constant}
+        return {'smearing': 'PercentageFwhm', 'constant': self.constant}
 
 
 class LinearSpline(ResolutionFunction):

{easyreflectometry-1.2.0 → easyreflectometry-1.3.1}/src/easyreflectometry/project.py

@@ -11,7 +11,7 @@ import numpy as np
 from easyscience import global_object
 from easyscience.fitting import AvailableMinimizers
 from easyscience.fitting.fitter import DEFAULT_MINIMIZER
-from easyscience.Objects.new_variable import Parameter
+from easyscience.Objects.variable import Parameter
 from scipp import DataGroup
 
 from easyreflectometry.calculators import CalculatorFactory
@@ -21,7 +21,7 @@ from easyreflectometry.fitting import MultiFitter
 from easyreflectometry.model import LinearSpline
 from easyreflectometry.model import Model
 from easyreflectometry.model import ModelCollection
-from easyreflectometry.model import PercentageFhwm
+from easyreflectometry.model import PercentageFwhm
 from easyreflectometry.sample import Layer
 from easyreflectometry.sample import Material
 from easyreflectometry.sample import MaterialCollection
@@ -266,7 +266,7 @@ class Project:
 
     def sample_data_for_model_at_index(self, index: int = 0, q_range: Optional[np.array] = None) -> DataSet1D:
         original_resolution_function = self.models[index].resolution_function
-        self.models[index].resolution_function = PercentageFhwm(0)
+        self.models[index].resolution_function = PercentageFwhm(0)
         reflectivity_data = self.model_data_for_model_at_index(index, q_range)
         self.models[index].resolution_function = original_resolution_function
 

{easyreflectometry-1.2.0 → easyreflectometry-1.3.1}/src/easyreflectometry/sample/__init__.py

@@ -14,18 +14,18 @@ from .elements.materials.material_mixture import MaterialMixture
 from .elements.materials.material_solvated import MaterialSolvated
 
 __all__ = (
-    BaseAssembly,
-    GradientLayer,
-    Layer,
-    LayerAreaPerMolecule,
-    LayerCollection,
-    Material,
-    MaterialCollection,
-    MaterialDensity,
-    MaterialMixture,
-    MaterialSolvated,
-    Multilayer,
-    RepeatingMultilayer,
-    Sample,
-    SurfactantLayer,
+    "BaseAssembly",
+    "GradientLayer",
+    "Layer",
+    "LayerAreaPerMolecule",
+    "LayerCollection",
+    "Material",
+    "MaterialCollection",
+    "MaterialDensity",
+    "MaterialMixture",
+    "MaterialSolvated",
+    "Multilayer",
+    "RepeatingMultilayer",
+    "Sample",
+    "SurfactantLayer",
 )

{easyreflectometry-1.2.0 → easyreflectometry-1.3.1}/src/easyreflectometry/sample/assemblies/repeating_multilayer.py

@@ -2,7 +2,7 @@ from typing import Optional
 from typing import Union
 
 from easyscience import global_object
-from easyscience.Objects.new_variable import Parameter
+from easyscience.Objects.variable import Parameter
 
 from easyreflectometry.utils import get_as_parameter
 

{easyreflectometry-1.2.0 → easyreflectometry-1.3.1}/src/easyreflectometry/sample/assemblies/surfactant_layer.py

@@ -4,7 +4,7 @@ from typing import Optional
 
 from easyscience import global_object
 from easyscience.Constraints import ObjConstraint
-from easyscience.Objects.new_variable import Parameter
+from easyscience.Objects.variable import Parameter
 
 from ..collections.layer_collection import LayerCollection
 from ..elements.layers.layer_area_per_molecule import LayerAreaPerMolecule

{easyreflectometry-1.2.0 → easyreflectometry-1.3.1}/src/easyreflectometry/sample/elements/layers/layer.py

@@ -4,7 +4,7 @@ from typing import Union
 
 import numpy as np
 from easyscience import global_object
-from easyscience.Objects.new_variable import Parameter
+from easyscience.Objects.variable import Parameter
 
 from easyreflectometry.utils import get_as_parameter
 
@@ -18,7 +18,7 @@ DEFAULTS = {
         'value': 10.0,
         'unit': 'angstrom',
         'min': 0.0,
-        'max': np.Inf,
+        'max': np.inf,
         'fixed': True,
     },
     'roughness': {
@@ -27,7 +27,7 @@ DEFAULTS = {
         'value': 3.3,
         'unit': 'angstrom',
         'min': 0.0,
-        'max': np.Inf,
+        'max': np.inf,
         'fixed': True,
     },
 }

{easyreflectometry-1.2.0 → easyreflectometry-1.3.1}/src/easyreflectometry/sample/elements/layers/layer_area_per_molecule.py

@@ -4,7 +4,7 @@ from typing import Union
 import numpy as np
 from easyscience import global_object
 from easyscience.Constraints import FunctionalConstraint
-from easyscience.Objects.new_variable import Parameter
+from easyscience.Objects.variable import Parameter
 
 from easyreflectometry.special.calculations import area_per_molecule_to_scattering_length_density
 from easyreflectometry.special.calculations import neutron_scattering_length
@@ -31,8 +31,8 @@ DEFAULTS = {
         'url': 'https://www.ncnr.nist.gov/resources/activation/',
         'value': 4.186,
         'unit': 'angstrom',
-        'min': -np.Inf,
-        'max': np.Inf,
+        'min': -np.inf,
+        'max': np.inf,
         'fixed': True,
     },
     'isl': {
@@ -40,8 +40,8 @@ DEFAULTS = {
         'url': 'https://www.ncnr.nist.gov/resources/activation/',
         'value': 0.0,
         'unit': 'angstrom',
-        'min': -np.Inf,
-        'max': np.Inf,
+        'min': -np.inf,
+        'max': np.inf,
         'fixed': True,
     },
 }

{easyreflectometry-1.2.0 → easyreflectometry-1.3.1}/src/easyreflectometry/sample/elements/materials/material.py

@@ -5,7 +5,7 @@ from typing import Union
 
 import numpy as np
 from easyscience import global_object
-from easyscience.Objects.new_variable import Parameter
+from easyscience.Objects.variable import Parameter
 
 from easyreflectometry.utils import get_as_parameter
 
@@ -17,8 +17,8 @@ DEFAULTS = {
         'url': 'https://www.ncnr.nist.gov/resources/activation/',
         'value': 4.186,
         'unit': '1 / angstrom^2',
-        'min': -np.Inf,
-        'max': np.Inf,
+        'min': -np.inf,
+        'max': np.inf,
         'fixed': True,
     },
     'isld': {
@@ -26,8 +26,8 @@ DEFAULTS = {
         'url': 'https://www.ncnr.nist.gov/resources/activation/',
         'value': 0.0,
         'unit': '1 / angstrom^2',
-        'min': -np.Inf,
-        'max': np.Inf,
+        'min': -np.inf,
+        'max': np.inf,
         'fixed': True,
     },
 }

{easyreflectometry-1.2.0 → easyreflectometry-1.3.1}/src/easyreflectometry/sample/elements/materials/material_density.py

@@ -4,7 +4,7 @@ from typing import Union
 import numpy as np
 from easyscience import global_object
 from easyscience.Constraints import FunctionalConstraint
-from easyscience.Objects.new_variable import Parameter
+from easyscience.Objects.variable import Parameter
 
 from easyreflectometry.special.calculations import density_to_sld
 from easyreflectometry.special.calculations import molecular_weight
@@ -22,7 +22,7 @@ DEFAULTS = {
         'value': 2.33,
         'unit': 'gram / centimeter ** 3',
         'min': 0,
-        'max': np.Inf,
+        'max': np.inf,
         'fixed': True,
     },
     'molecular_weight': {
@@ -30,8 +30,8 @@ DEFAULTS = {
         'url': 'https://en.wikipedia.org/wiki/Molecular_mass',
         'value': 28.02,
         'unit': 'g / mole',
-        'min': -np.Inf,
-        'max': np.Inf,
+        'min': -np.inf,
+        'max': np.inf,
         'fixed': True,
     },
 }

{easyreflectometry-1.2.0 → easyreflectometry-1.3.1}/src/easyreflectometry/sample/elements/materials/material_mixture.py

@@ -3,7 +3,7 @@ from typing import Union
 
 from easyscience import global_object
 from easyscience.Constraints import FunctionalConstraint
-from easyscience.Objects.new_variable import Parameter
+from easyscience.Objects.variable import Parameter
 
 from easyreflectometry.special.calculations import weighted_average
 from easyreflectometry.utils import get_as_parameter

{easyreflectometry-1.2.0 → easyreflectometry-1.3.1}/src/easyreflectometry/sample/elements/materials/material_solvated.py

@@ -2,7 +2,7 @@ from typing import Optional
 from typing import Union
 
 from easyscience import global_object
-from easyscience.Objects.new_variable import Parameter
+from easyscience.Objects.variable import Parameter
 
 from easyreflectometry.utils import get_as_parameter
 

{easyreflectometry-1.2.0 → easyreflectometry-1.3.1}/src/easyreflectometry/summary/summary.py

@@ -144,7 +144,7 @@ class Summary:
             experiment_name = experiment.name
             num_data_points = len(experiment.x)
             resolution_function = self._project.models[idx].resolution_function.as_dict()['smearing']
-            if resolution_function == 'PercentageFhwm':
+            if resolution_function == 'PercentageFwhm':
                 precentage = self._project.models[idx].resolution_function.as_dict()['constant']
                 resolution_function = f'{resolution_function} {precentage}%'
             range_min = min(experiment.y)

{easyreflectometry-1.2.0 → easyreflectometry-1.3.1}/src/easyreflectometry/utils.py

@@ -5,7 +5,7 @@ from typing import Union
 
 import yaml
 from easyscience import global_object
-from easyscience.Objects.new_variable import Parameter
+from easyscience.Objects.variable import Parameter
 
 
 def get_as_parameter(

easyreflectometry-1.2.0/src/easyreflectometry/__version__.py

@@ -1 +0,0 @@
-__version__ = '1.2.0'