Tweak units in workup procedures (#80)

* Tweak units in workup procedures * Move unit handling to the test
wright-group · Dec 27, 2019 · 2aac816 · 2aac816
1 parent c37b46c
commit 2aac816
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 3 deletions.
diff --git a/attune/workup/_holistic.py b/attune/workup/_holistic.py
@@ -98,6 +98,7 @@ def holistic(
             spectral_axis = data.axis_names[spectral_axis]
         elif isinstance(spectral_axis, wt.data.Axis):
             spectral_axis = spectral_axis.expression
+        getattr(data, spectral_axis).convert(curve.setpoints.units)
         # take channel moments
         data.moment(
             axis=spectral_axis,

diff --git a/attune/workup/_plot.py b/attune/workup/_plot.py
@@ -157,7 +157,7 @@ def plot_holistic(
     ax_amp.contour(
         data,
         channel=center_channel,
-        levels=center_ticks,
+        levels=sorted(center_ticks),
         cmap=center_cmap,
         linewidths=2,
         alpha=1,

diff --git a/attune/workup/_setpoint.py b/attune/workup/_setpoint.py
@@ -66,10 +66,10 @@ def setpoint(
         New curve object.
     """
     data = data.copy()
-    data.convert("wn")
+    # data.convert("wn")
     if curve is not None:
         old_curve = curve.copy()
-        old_curve.convert("wn")
+        # old_curve.convert("wn")
         setpoints = old_curve.setpoints
     else:
         old_curve = None

diff --git a/tests/workup/setpoint/2018-11-30/aixcb.py b/tests/workup/setpoint/2018-11-30/aixcb.py
@@ -25,6 +25,9 @@ def test():
 
     old = attune.TopasCurve.read([__here__ / "old.crv"], interaction_string="NON-NON-NON-Sig")
 
+    data.convert("wn")
+    old.convert("wn")
+
     new = attune.workup.setpoint(data, -1, "2", autosave=False, curve=old)
 
     print(new)