Merge pull request #66 from wright-group/cap_workup

Cap changes to the scan window
wright-group · Aug 7, 2019 · fbd1a04 · fbd1a04
2 parents 68e37df + c04f75b
commit fbd1a04
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/attune/workup/_intensity.py b/attune/workup/_intensity.py
@@ -20,9 +20,9 @@ def _intensity(data, channel_name, tune_points, *, spline=True, **spline_kwargs)
 
     if spline:
         spline = wt.kit.Spline(tune_points, offsets, **spline_kwargs)
-        return spline(tune_points)
+        return spline(tune_points).clip(data.axes[1].min(), data.axes[1].max())
     if np.allclose(data.axes[0].points, tune_points):
-        return offsets
+        return offsets.clip(data.axes[1].min(), data.axes[1].max())
     else:
         raise ValueError("Data points and curve points do not match, and splining disabled")
 

diff --git a/attune/workup/_setpoint.py b/attune/workup/_setpoint.py
@@ -30,9 +30,9 @@ def _setpoint(data, channel_name, tune_points, *, spline=True, **spline_kwargs):
     offsets = np.array(offsets)
     if spline:
         spline = wt.kit.Spline(data.axes[0].points, offsets, **spline_kwargs)
-        return spline(tune_points)
+        return spline(tune_points).clip(data.axes[1].min(), data.axes[1].max())
     if np.allclose(data.axes[0].points, tune_points):
-        return offsets[::-1]
+        return offsets[::-1].clip(data.axes[1].min(), data.axes[1].max())
     else:
         raise ValueError("Data points and curve points do not match, and splining disabled")
 

diff --git a/attune/workup/_tune_test.py b/attune/workup/_tune_test.py
@@ -17,9 +17,9 @@ def _offsets(data, channel_name, tune_points, *, spline=True, **spline_kwargs):
 
     if spline:
         spline = wt.kit.Spline(data.axes[0].points, offsets, **spline_kwargs)
-        return spline(tune_points)
+        return spline(tune_points).clip(data.axes[1].min(), data.axes[1].max())
     if np.allclose(data.axes[0].points, tune_points):
-        return offsets
+        return offsets.clip(data.axes[1].min(), data.axes[1].max())
     else:
         raise ValueError("Data points and curve points do not match, and splining disabled")