easyreflectometry 1.2.0__tar.gz → 1.3.0__tar.gz

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: easyreflectometry
-Version: 1.2.0
+Version: 1.3.0
 Summary: A reflectometry python package built on the EasyScience framework.
 Project-URL: homepage, https://docs.easyreflectometry.org
 Project-URL: documentation, https://docs.easyreflectometry.org

easyreflectometry-1.3.0/src/easyreflectometry/__version__.py

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

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

@@ -6,7 +6,7 @@ import numpy as np
 from refl1d import model
 from refl1d import names
 
-from easyreflectometry.model import PercentageFhwm
+from easyreflectometry.model import PercentageFwhm
 
 from ..wrapper_base import WrapperBase
 
@@ -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)))
 

{easyreflectometry-1.2.0 → easyreflectometry-1.3.0}/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.0}/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.0}/src/easyreflectometry/model/__init__.py

@@ -1,12 +1,12 @@
 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,
+    PercentageFwhm,
     ResolutionFunction,
     Model,
     ModelCollection,

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

@@ -17,7 +17,7 @@ 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 = {
@@ -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.0}/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.0}/src/easyreflectometry/project.py

@@ -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.0}/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/src/easyreflectometry/__version__.py

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