M-Labs
/
artiq
mirror of https://github.com/m-labs/artiq.git
2
0
Fork 2
Code Issues Projects Releases Wiki Activity

pdq2: pep8

This commit is contained in:
Sebastien Bourdeauducq 2014-10-14 17:02:25 +08:00
parent ea0773ccb5
commit 88ad4fbf23
2 changed files with 75 additions and 70 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

94
artiq/devices/pdq2com.py
View File

@ -24,7 +24,7 @@ try:
written = self.dev.write(data) written = self.dev.write(data)
if written < 0: if written < 0:
raise pylibftdi.FtdiError(written, raise pylibftdi.FtdiError(written,
self.dev.get_error_string()) self.dev.get_error_string())
return written return written
def close(self): def close(self):
@ -82,31 +82,31 @@ class Pdq2:
""" """
PDQ DAC (a.k.a. QC_Waveform) PDQ DAC (a.k.a. QC_Waveform)
""" """
max_val = 1<<15 # signed 16 bit DAC max_val = 1 << 15 # signed 16 bit DAC
max_out = 10. max_out = 10.
freq = 50e6 # samples/s freq = 50e6 # samples/s
max_time = 1<<16 # unsigned 16 bit timer max_time = 1 << 16 # unsigned 16 bit timer
num_dacs = 3 num_dacs = 3
num_frames = 8 num_frames = 8
num_channels = 9 num_channels = 9
max_data = 4*(1<<10) # 8kx16 8kx16 4kx16 max_data = 4*(1 << 10) # 8kx16 8kx16 4kx16
escape_char = b"\xa5" escape_char = b"\xa5"
cordic_gain = 1. cordic_gain = 1.
for i in range(16): for i in range(16):
cordic_gain *= np.sqrt(1 + 2**(-2*i)) cordic_gain *= np.sqrt(1 + 2**(-2*i))
commands = { commands = {
"RESET_EN": b"\x00", "RESET_EN": b"\x00",
"RESET_DIS": b"\x01", "RESET_DIS": b"\x01",
"TRIGGER_EN": b"\x02", "TRIGGER_EN": b"\x02",
"TRIGGER_DIS": b"\x03", "TRIGGER_DIS": b"\x03",
"ARM_EN": b"\x04", "ARM_EN": b"\x04",
"ARM_DIS": b"\x05", "ARM_DIS": b"\x05",
"DCM_EN": b"\x06", "DCM_EN": b"\x06",
"DCM_DIS": b"\x07", "DCM_DIS": b"\x07",
"START_EN": b"\x08", "START_EN": b"\x08",
"START_DIS": b"\x09", "START_DIS": b"\x09",
} }
def __init__(self, serial=None): def __init__(self, serial=None):
self.serial = serial self.serial = serial
@ -123,8 +123,8 @@ class Pdq2:
return self.write(self.cmd(cmd)) return self.write(self.cmd(cmd))
def escape(self, data): def escape(self, data):
return data.replace(self.escape_char, self.escape_char + return data.replace(self.escape_char,
self.escape_char) self.escape_char + self.escape_char)
def write(self, *segments): def write(self, *segments):
""" """
@ -158,13 +158,13 @@ class Pdq2:
if tr is None: if tr is None:
tr = t tr = t
dv = [interpolate.splev(tr[:-1], spline, der=i) dv = [interpolate.splev(tr[:-1], spline, der=i)
for i in range(order + 1)] for i in range(order + 1)]
# correct for adder chain latency # correct for adder chain latency
correction_map = [ correction_map = [
(1, -1/2., 2), (1, -1/2., 2),
(1, -1/6., 3), (1, -1/6., 3),
(2, -1., 3), (2, -1., 3),
] ]
for i, c, j in correction_map: for i, c, j in correction_map:
if j >= len(dv): if j >= len(dv):
break break
@ -180,14 +180,14 @@ class Pdq2:
frame.append((part >> 32).astype("<i2")) frame.append((part >> 32).astype("<i2"))
else: else:
frame.append(part.astype("<" + dtype)) frame.append(part.astype("<" + dtype))
frame = np.rec.fromarrays(frame) # interleave frame = np.rec.fromarrays(frame) # interleave
logger.debug("frame %s dtype %s shape %s length %s", logger.debug("frame %s dtype %s shape %s length %s",
frame, frame.dtype, frame.shape, len(bytes(frame.data))) frame, frame.dtype, frame.shape, len(bytes(frame.data)))
return bytes(frame.data) return bytes(frame.data)
def frame(self, t, v, p=None, f=None, def frame(self, t, v, p=None, f=None,
order=3, aux=None, shift=0, trigger=True, end=True, order=3, aux=None, shift=0, trigger=True, end=True,
silence=False, stop=True, clear=True, wait=False): silence=False, stop=True, clear=True, wait=False):
""" """
serialize frame data serialize frame data
voltages in volts, times in seconds voltages in volts, times in seconds
@ -204,17 +204,17 @@ class Pdq2:
parts = [] parts = []
head = np.zeros(len(t) - 1, "<u2") head = np.zeros(len(t) - 1, "<u2")
head[:] |= length # 4 head[:] |= length # 4
if p is not None: if p is not None:
head[:] |= 1<<4 # typ # 2 head[:] |= 1 << 4 # typ # 2
head[0] |= trigger<<6 # 1 head[0] |= trigger << 6 # 1
head[-1] |= (not stop and silence)<<7 # 1 head[-1] |= (not stop and silence) << 7 # 1
if aux is not None: if aux is not None:
head[:] |= aux[:len(head)]<<8 # 1 head[:] |= aux[:len(head)] << 8 # 1
head[:] |= shift<<9 # 4 head[:] |= shift << 9 # 4
head[-1] |= (not stop and end)<<13 # 1 head[-1] |= (not stop and end) << 13 # 1
head[0] |= clear<<14 # 1 head[0] |= clear << 14 # 1
head[-1] |= (not stop and wait)<<15 # 1 head[-1] |= (not stop and wait) << 15 # 1
parts.append((head, "u2")) parts.append((head, "u2"))
t, tr, dt = self.line_times(t, shift) t, tr, dt = self.line_times(t, shift)
@ -243,19 +243,21 @@ class Pdq2:
if stop: if stop:
if p is not None: if p is not None:
frame += struct.pack("<HH hiihih H ii", (15<<0) | (1<<4) | frame += struct.pack("<HH hiihih H ii", (15 << 0) | (1 << 4) |
(silence<<7) | (end<<13) | (wait<<15), (silence << 7) |
1, int(v[-1]*2**15), 0, 0, 0, 0, 0, (end << 13) |
int(p[-1]*2**16), int(f[-1]*2**31), 0) (wait << 15),
1, int(v[-1]*2**15), 0, 0, 0, 0, 0,
int(p[-1]*2**16), int(f[-1]*2**31), 0)
else: else:
frame += struct.pack("<HH h", (2<<0) | frame += struct.pack("<HH h", (2 << 0) | (silence << 7) |
(silence<<7) | (end<<13) | (wait << 15), (end << 13) | (wait << 15),
1, int(v[-1]*2**15)) 1, int(v[-1]*2**15))
return frame return frame
def line(self, dt, v=(), a=(), p=(), f=(), typ=0, def line(self, dt, v=(), a=(), p=(), f=(), typ=0,
silence=False, end=False, trigger=False, aux=False, silence=False, end=False, trigger=False, aux=False,
clear=False): clear=False):
raise NotImplementedError raise NotImplementedError
fmt = "<HH" fmt = "<HH"
parts = [0, int(round(dt*self.freq))] parts = [0, int(round(dt*self.freq))]
@ -292,7 +294,7 @@ class Pdq2:
def add_mem_header(self, board, dac, data, adr=0): def add_mem_header(self, board, dac, data, adr=0):
assert dac in range(self.num_dacs) assert dac in range(self.num_dacs)
head = struct.pack("<HHH", (board << 4) | dac, head = struct.pack("<HHH", (board << 4) | dac,
adr, adr + len(data)//2 - 1) adr, adr + len(data)//2 - 1)
return head + data return head + data
def multi_frame(self, times_voltages, channel, map=None, **kwargs): def multi_frame(self, times_voltages, channel, map=None, **kwargs):

51
frontend/pdq2
View File

@ -17,37 +17,39 @@ def _main():
Evaluates times and voltages, interpolates and uploads Evaluates times and voltages, interpolates and uploads
them.""") them.""")
parser.add_argument("-s", "--serial", default=None, parser.add_argument("-s", "--serial", default=None,
help="device (FT245R) serial string [first]") help="device (FT245R) serial string [first]")
parser.add_argument("-c", "--channel", default=0, type=int, parser.add_argument("-c", "--channel", default=0, type=int,
help="channel: 3*board_num+dac_num [%(default)s]") help="channel: 3*board_num+dac_num [%(default)s]")
parser.add_argument("-f", "--frame", default=0, type=int, parser.add_argument("-f", "--frame", default=0, type=int,
help="frame [%(default)s]") help="frame [%(default)s]")
parser.add_argument("-e", "--free", default=False, parser.add_argument("-e", "--free", default=False,
action="store_true", action="store_true",
help="software trigger [%(default)s]") help="software trigger [%(default)s]")
parser.add_argument("-n", "--disarm", default=False, parser.add_argument("-n", "--disarm", default=False,
action="store_true", action="store_true",
help="disarm group [%(default)s]") help="disarm group [%(default)s]")
parser.add_argument("-t", "--times", parser.add_argument("-t", "--times",
default="np.arange(5)*1e-6", default="np.arange(5)*1e-6",
help="sample times (s) [%(default)s]") help="sample times (s) [%(default)s]")
parser.add_argument("-v", "--voltages", parser.add_argument("-v", "--voltages",
default="(1-np.cos(t/t[-1]*2*np.pi))/2", default="(1-np.cos(t/t[-1]*2*np.pi))/2",
help="sample voltages (V) [%(default)s]") help="sample voltages (V) [%(default)s]")
parser.add_argument("-o", "--order", default=3, type=int, parser.add_argument("-o", "--order", default=3, type=int,
help="interpolation (0: const, 1: lin, 2: quad, 3: cubic)" help="interpolation"
" [%(default)s]") " (0: const, 1: lin, 2: quad, 3: cubic)"
" [%(default)s]")
parser.add_argument("-m", "--dcm", default=None, type=int, parser.add_argument("-m", "--dcm", default=None, type=int,
help="choose fast 100MHz clock [%(default)s]") help="choose fast 100MHz clock [%(default)s]")
parser.add_argument("-x", "--demo", default=False, action="store_true", parser.add_argument("-x", "--demo", default=False, action="store_true",
help="demo mode: pulse and chirp, 1V*ch+0.1V*frame [%(default)s]") help="demo mode: pulse and chirp,"
" 1V*ch+0.1V*frame [%(default)s]")
parser.add_argument("-p", "--plot", help="plot to file [%(default)s]") parser.add_argument("-p", "--plot", help="plot to file [%(default)s]")
parser.add_argument("-d", "--debug", default=False, parser.add_argument("-d", "--debug", default=False,
action="store_true", help="debug communications") action="store_true", help="debug communications")
parser.add_argument("-r", "--reset", default=False, parser.add_argument("-r", "--reset", default=False,
action="store_true", help="do reset before") action="store_true", help="do reset before")
parser.add_argument("-b", "--bit", default=False, parser.add_argument("-b", "--bit", default=False,
action="store_true", help="do bit test") action="store_true", help="do bit test")
args = parser.parse_args() args = parser.parse_args()
@ -87,8 +89,8 @@ def _main():
f.append(b"".join([ f.append(b"".join([
dev.frame(times, vi, order=args.order, end=False), dev.frame(times, vi, order=args.order, end=False),
dev.frame(2*times, voltages, pi, fi, trigger=False), dev.frame(2*times, voltages, pi, fi, trigger=False),
#dev.frame(2*times, 0*vi+.1, 0*pi, 0*fi+1e6), # dev.frame(2*times, 0*vi+.1, 0*pi, 0*fi+1e6),
#dev.frame(times, 0*vi, order=args.order, silence=True), # dev.frame(times, 0*vi, order=args.order, silence=True),
])) ]))
board, dac = divmod(channel, dev.num_dacs) board, dac = divmod(channel, dev.num_dacs)
dev.write_data(dev.add_mem_header(board, dac, dev.map_frames(f))) dev.write_data(dev.add_mem_header(board, dac, dev.map_frames(f)))
@ -97,14 +99,15 @@ def _main():
t = np.arange(2*16) * 1. t = np.arange(2*16) * 1.
v = [-1, 0, -1] v = [-1, 0, -1]
for i in range(15): for i in range(15):
vi = 1<<i vi = 1 << i
v.extend([vi - 1, vi]) v.extend([vi - 1, vi])
v = np.array(v)*dev.max_out/(1<<15) v = np.array(v)*dev.max_out/(1 << 15)
t, v = t[:3], v[:3] t, v = t[:3], v[:3]
#print(t, v) # print(t, v)
for channel in range(dev.num_channels): for channel in range(dev.num_channels):
dev.write_data(dev.multi_frame([(t, v)], channel=channel, dev.write_data(dev.multi_frame([(t, v)], channel=channel,
order=0, map=map, shift=15, stop=False, trigger=False)) order=0, map=map, shift=15,
stop=False, trigger=False))
else: else:
tv = [(times, voltages)] tv = [(times, voltages)]
map = [None] * dev.num_frames map = [None] * dev.num_frames