srenblad
/
artiq
forked from M-Labs/artiq
1
0
Fork 0
Code Pull Requests Activity

sawg: work around #632

This commit is contained in:
Robert Jördens 2016-11-29 17:01:39 +01:00
parent a3d9e21b8c
commit c53040e1e4
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
artiq/coredevice/sawg.py
View File

@ -54,7 +54,7 @@ class Spline:
rtio_output_list(now_mu(), self.channel, 0, self.to_mu64(value)) rtio_output_list(now_mu(), self.channel, 0, self.to_mu64(value))
@kernel @kernel
def set_list_mu(self, value: TList(TInt32)): def set_list_mu(self, value):
"""Set spline raw values. """Set spline raw values.
:param value: Spline packed raw values. :param value: Spline packed raw values.
@ -62,7 +62,7 @@ class Spline:
rtio_output_list(now_mu(), self.channel, 0, value) rtio_output_list(now_mu(), self.channel, 0, value)
@portable(flags={"fast-math"}) @portable(flags={"fast-math"})
def pack_coeff_mu(self, coeff: TList(TInt64)) -> TList(TInt32): def pack_coeff_mu(self, coeff) -> TList(TInt32):
n = len(coeff) n = len(coeff)
width = n*self.width + (n - 1)*n//2*self.time_width width = n*self.width + (n - 1)*n//2*self.time_width
packed = [int32(0)] * ((width + 31)//32) packed = [int32(0)] * ((width + 31)//32)
@ -83,7 +83,7 @@ class Spline:
return packed return packed
@portable(flags={"fast-math"}) @portable(flags={"fast-math"})
def coeff_to_mu(self, coeff: TList(TFloat)) -> TList(TInt32): def coeff_to_mu(self, coeff) -> TList(TInt32):
n = len(coeff) n = len(coeff)
coeff64 = [int64(0)] * n coeff64 = [int64(0)] * n
for i in range(n): for i in range(n):
@ -102,7 +102,7 @@ class Spline:
return self.pack_coeff_mu(coeff64) return self.pack_coeff_mu(coeff64)
@kernel @kernel
def set_list(self, value: TList(TFloat)): def set_list(self, value):
"""Set spline coefficients. """Set spline coefficients.
:param value: List of floating point spline knot coefficients, :param value: List of floating point spline knot coefficients,