wavesynth: interpolate->coefficients

jordens · jordens · commit 7ea9250b31df · 2015-04-05T04:43:27.000-06:00
diff --git a/artiq/devices/pdq2/driver.py b/artiq/devices/pdq2/driver.py
@@ -6,7 +6,7 @@
 
 import serial
 
-from artiq.wavesynth.interpolate import discrete_compensate
+from artiq.wavesynth.coefficients import discrete_compensate
 
 
 logger = logging.getLogger(__name__)
diff --git a/artiq/wavesynth/coefficients.py b/artiq/wavesynth/coefficients.py
@@ -24,11 +24,14 @@ def _interpolate(time, data, sample_times, order=3):
 
 
 def discrete_compensate(c):
-    if len(c) > 2:
-        c[1] += c[2]/2
-    if len(c) > 3:
-        c[1] += c[3]/6
+    l = len(c)
+    if l > 2:
+        c[1] += c[2]/2.
+    if l > 3:
+        c[1] += c[3]/6.
         c[2] += c[3]
+    if l > 4:
+        raise ValueError("only third-order splines supported")
 
 
 def _zip_program(times, channels, target):
diff --git a/artiq/wavesynth/compute_samples.py b/artiq/wavesynth/compute_samples.py
@@ -1,7 +1,7 @@
 from copy import copy
 from math import cos, pi
 
-from artiq.wavesynth.interpolate import discrete_compensate
+from artiq.wavesynth.coefficients import discrete_compensate
 
 
 class Spline:
