Merge pull request #42 from wright-group/fixes_from_running

Variety of fixes found while running

attune/curve/_base.py

@@ -261,7 +261,7 @@ def get_dependent_positions(self, setpoint, units="same", full=True):
         for k, v in self.dependents.items():
             out[k] = v(setpoint, units)
         if full and self.subcurve:
-            out.update(self.subcurve(setpoint, units, full))
+            out.update(self.subcurve(self.source_setpoints(setpoint, units), self.source_setpoints.units,  full))
         return out
 
     def get_source_setpoint(self, setpoint, units="same"):
@@ -345,11 +345,12 @@ def sort(self):
         order = self.setpoints[:].argsort()
         self.setpoints[:] = self.setpoints[order]
         try:
-            self.subcurve_setpoints[:] = self.subcurve_setpoints[order]
+            self.source_setpoints[:] = self.source_setpoints[order]
         except (AttributeError, TypeError):
             pass  # no subcurve setpoints
         for d in self.dependents.values():
             d[:] = d[order]
+        self.interpolate()
 
 
     def offset_by(self, dependent, amount):

attune/curve/_topas.py

@@ -83,6 +83,7 @@ def read_all(cls, filepaths):
             if interaction in curves:
                 c.subcurve = curves[interaction]
                 curves[interaction].supercurves.append(c)
+                c.interpolate()
         return curves
 
     @classmethod
@@ -260,7 +261,7 @@ def _write_curve(f, curve):
     curve.convert("nm")
     curve.sort()
     f.write(f"{curve.interaction}\n")
-    if curve.comment[-1] != "\n":
+    if len(curve.comment) == 0 or curve.comment[-1] != "\n":
         curve.comment += "\n"
     num_lines = curve.comment.count("\n")
     f.write(f"{num_lines}\n")

attune/workup/_plot.py

@@ -51,7 +51,7 @@ def plot_tune_test(data, channel, curve, prior_curve, raw_offsets=None):
     if raw_offsets is not 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)
+    ax.plot(curve.setpoints[:], curve.setpoints[:] - prior_curve.setpoints[:], c="k", lw=5, alpha=0.5)
     ax.axhline(c="k", lw=1)
     ax.grid()
 

attune/workup/_tune_test.py

@@ -84,7 +84,7 @@ def tune_test(
 
     # plot ----------------------------------------------------------------------------------------
 
-    fig, _ = plot_tune_test(data, channel.natural_name, new_curve, prior_curve=curve, raw_offsets=raw_offsets)
+    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)