Merge remote-tracking branch 'origin/master' into develop

Author: andped10

src/easyreflectometry/calculators/wrapper_base.py

@@ -3,9 +3,8 @@
 
 import numpy as np
 
-from easyreflectometry.experiment import percentage_fhwm_resolution_function
-
-DEFAULT_RESOLUTION_FWHM_PERCENTAGE = 5.0
+from EasyReflectometry.experiment import DEFAULT_RESOLUTION_FWHM_PERCENTAGE
+from EasyReflectometry.experiment import percentage_fhwm_resolution_function
 
 
 class WrapperBase:

src/easyreflectometry/experiment/__init__.py

@@ -1,9 +1,11 @@
 from .model import Model
 from .model_collection import ModelCollection
+from .resolution_functions import DEFAULT_RESOLUTION_FWHM_PERCENTAGE
 from .resolution_functions import linear_spline_resolution_function
 from .resolution_functions import percentage_fhwm_resolution_function
 
 __all__ = (
+    DEFAULT_RESOLUTION_FWHM_PERCENTAGE,
     percentage_fhwm_resolution_function,
     linear_spline_resolution_function,
     Model,

src/easyreflectometry/experiment/resolution_functions.py

@@ -10,6 +10,8 @@
 
 import numpy as np
 
+DEFAULT_RESOLUTION_FWHM_PERCENTAGE = 5.0
+
 
 def percentage_fhwm_resolution_function(constant: float) -> Callable[[np.array], np.array]:
     """Create a resolution function that is constant across the q range.