Use old curve setpoints for offsets (#77)

* Use old curve setpoints for offsets Closes #52 Closes #69 * modify curve _before_ plotting
wright-group · Nov 19, 2019 · d0847d4 · d0847d4
1 parent c64a223
commit d0847d4
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git a/attune/workup/_plot.py b/attune/workup/_plot.py
@@ -113,7 +113,11 @@ def plot_tune_test(data, channel, curve, prior_curve, raw_offsets=None):
         ax.plot(curve.setpoints[:], raw_offsets, c="grey", lw=5, alpha=0.5)
 
     ax.plot(
-        curve.setpoints[:], curve.setpoints[:] - prior_curve.setpoints[:], c="k", lw=5, alpha=0.5
+        prior_curve.setpoints[:],
+        curve.setpoints[:] - prior_curve.setpoints[:],
+        c="k",
+        lw=5,
+        alpha=0.5,
     )
     ax.axhline(c="k", lw=1)
     ax.grid()

diff --git a/attune/workup/_tune_test.py b/attune/workup/_tune_test.py
@@ -102,16 +102,16 @@ def tune_test(
     new_curve = old_curve.copy()
     new_curve.setpoints.positions += offsets
     new_curve.interpolate()
+    new_curve.map_setpoints(setpoints[:], units=setpoints.units)
+    new_curve.convert(curve.setpoints.units)
+    data.axes[0].convert(curve.setpoints.units)
 
     # plot ----------------------------------------------------------------------------------------
 
     fig, _ = plot_tune_test(
         data, channel.natural_name, new_curve, prior_curve=old_curve, raw_offsets=raw_offsets
     )
 
-    new_curve.map_setpoints(setpoints[:], units=setpoints.units)
-    new_curve.convert(curve.setpoints.units)
-    data.axes[0].convert(curve.setpoints.units)
     # finish --------------------------------------------------------------------------------------
     if autosave:
         save(new_curve, fig, "tune_test", save_directory)