ratapi 0.0.0.dev12__tar.gz → 0.0.0.dev14__tar.gz

{ratapi-0.0.0.dev12/ratapi.egg-info → ratapi-0.0.0.dev14}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: ratapi
-Version: 0.0.0.dev12
+Version: 0.0.0.dev14
 Summary: Python extension for the Reflectivity Analysis Toolbox (RAT)
 Project-URL: Documentation, https://rascalsoftware.github.io/RAT/
 Project-URL: Repository, https://github.com/RascalSoftware/python-RAT

{ratapi-0.0.0.dev12 → ratapi-0.0.0.dev14}/pyproject.toml

@@ -2,13 +2,13 @@
 requires = [
     'setuptools>=61',
     'wheel',
-    'pybind11>=2.4',
+    'pybind11>=2.4, <=2.13.6',
 ]
 build-backend = 'setuptools.build_meta'
 
 [project]
 name = "ratapi"
-version = "0.0.0.dev12"
+version = "0.0.0.dev14"
 description = "Python extension for the Reflectivity Analysis Toolbox (RAT)"
 readme = "README.md"
 requires-python = ">=3.10"

{ratapi-0.0.0.dev12 → ratapi-0.0.0.dev14}/ratapi/utils/plotting.py

@@ -36,7 +36,7 @@ def _extract_plot_data(event_data: PlotEventData, q4: bool, show_error_bar: bool
     show_error_bar : bool, default: True
         Controls whether the error bars are shown
     shift_value : float
-        A value between 1 and 100 that controls the spacing between the reflectivity plots for each of the contrasts
+        A value between 0 and 100 that controls the spacing between the reflectivity plots for each of the contrasts
 
     Returns
     -------
@@ -46,14 +46,14 @@ def _extract_plot_data(event_data: PlotEventData, q4: bool, show_error_bar: bool
     """
     results = {"ref": [], "error": [], "sld": [], "sld_resample": []}
 
-    if shift_value < 1 or shift_value > 100:
-        raise ValueError("Parameter `shift_value` must be between 1 and 100")
+    if shift_value < 0 or shift_value > 100:
+        raise ValueError("Parameter `shift_value` must be between 0 and 100")
 
     for i, (r, data, sld) in enumerate(
         zip(event_data.reflectivity, event_data.shiftedData, event_data.sldProfiles, strict=False)
     ):
         # Calculate the divisor
-        div = 1 if i == 0 and not q4 else 10 ** ((i + 1) / 100 * shift_value)
+        div = 10 ** (i / 100 * shift_value)
         q4_data = 1 if not q4 or not event_data.dataPresent[i] else data[:, 0] ** 4
         mult = q4_data / div
 
@@ -137,7 +137,7 @@ def plot_ref_sld_helper(
     show_legend : bool, default: True
         Controls whether the legend is shown
     shift_value : float, default: 100
-        A value between 1 and 100 that controls the spacing between the reflectivity plots for each of the contrasts
+        A value between 0 and 100 that controls the spacing between the reflectivity plots for each of the contrasts
     animated : bool, default: False
         Controls whether the animated property of foreground plot elements should be set.
 
@@ -168,7 +168,7 @@ def plot_ref_sld_helper(
         # Plot confidence intervals if required
         if confidence_intervals is not None:
             # Calculate the divisor
-            div = 1 if i == 0 and not q4 else 10 ** ((i / 100) * shift_value)
+            div = 10 ** (i / 100 * shift_value)
             ref_min, ref_max = confidence_intervals["reflectivity"][i]
             mult = (1 if not q4 else plot_data["ref"][i][0] ** 4) / div
             ref_plot.fill_between(plot_data["ref"][i][0], ref_min * mult, ref_max * mult, alpha=0.6, color="grey")
@@ -277,7 +277,7 @@ def plot_ref_sld(
     show_legend : bool, default: True
             Controls whether the legend is shown
     shift_value : float, default: 100
-        A value between 1 and 100 that controls the spacing between the reflectivity plots for each of the contrasts
+        A value between 0 and 100 that controls the spacing between the reflectivity plots for each of the contrasts
 
     Returns
     -------
@@ -387,7 +387,7 @@ class BlittingSupport:
     show_legend : bool, default: True
         Controls whether the legend is shown
     shift_value : float, default: 100
-        A value between 1 and 100 that controls the spacing between the reflectivity plots for each of the contrasts
+        A value between 0 and 100 that controls the spacing between the reflectivity plots for each of the contrasts
     """
 
     def __init__(
@@ -505,6 +505,7 @@ class BlittingSupport:
             show_error_bar=self.show_error_bar,
             show_grid=self.show_grid,
             show_legend=self.show_legend,
+            shift_value=self.shift_value,
             animated=True,
         )
         self.figure.canvas.draw()

{ratapi-0.0.0.dev12 → ratapi-0.0.0.dev14/ratapi.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: ratapi
-Version: 0.0.0.dev12
+Version: 0.0.0.dev14
 Summary: Python extension for the Reflectivity Analysis Toolbox (RAT)
 Project-URL: Documentation, https://rascalsoftware.github.io/RAT/
 Project-URL: Repository, https://github.com/RascalSoftware/python-RAT