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

pdq2.mediator: use channel numbers from subdevices, track segment duration

This commit is contained in:
Robert Jördens 2016-02-22 15:27:04 +01:00
parent b327c50f14
commit 269e9c600c
1 changed files with 14 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
artiq/devices/pdq2/mediator.py
View File

@ -4,8 +4,7 @@ from artiq.language import *
frame_setup = 20*ns frame_setup = 20*ns
trigger_duration = 50*ns trigger_duration = 50*ns
sample_period = 10*ns sample_period = 10*ns
delay_margin_factor = 1.0001 delay_margin_factor = 1 + 1e-4
channels_per_pdq2 = 9
class FrameActiveError(Exception): class FrameActiveError(Exception):
@ -38,6 +37,7 @@ class _Segment:
self.segment_number = segment_number self.segment_number = segment_number
self.lines = [] self.lines = []
self.duration = 0*s
# for @kernel # for @kernel
self.core = frame.pdq.core self.core = frame.pdq.core
@ -48,12 +48,10 @@ class _Segment:
if self.frame.pdq.armed: if self.frame.pdq.armed:
raise ArmError() raise ArmError()
self.lines.append((dac_divider, duration, channel_data)) self.lines.append((dac_divider, duration, channel_data))
self.duration += duration*sample_period/dac_divider
def get_duration(self): def get_duration(self):
r = 0*s return self.duration
for dac_divider, duration, _ in self.lines:
r += duration*sample_period/dac_divider
return r
@kernel @kernel
def advance(self): def advance(self):
@ -96,7 +94,7 @@ class _Frame:
def _arm(self): def _arm(self):
self.segment_delays = [ self.segment_delays = [
seconds_to_mu(s.get_duration()*delay_margin_factor, self.core) seconds_to_mu(s.duration*delay_margin_factor, self.core)
for s in self.segments] for s in self.segments]
def _invalidate(self): def _invalidate(self):
@ -175,6 +173,9 @@ class CompoundPDQ2:
for dev in self.pdq2s: for dev in self.pdq2s:
dev.park() dev.park()
def get_program(self):
return [f._get_program() for f in self.frames]
def arm(self): def arm(self):
if self.armed: if self.armed:
raise ArmError() raise ArmError()
@ -182,8 +183,10 @@ class CompoundPDQ2:
frame._arm() frame._arm()
self.armed = True self.armed = True
full_program = [f._get_program() for f in self.frames] full_program = self.get_program()
for n, pdq2 in enumerate(self.pdq2s): n = 0
for pdq2 in self.pdq2s:
dn = pdq2.get_num_channels()
program = [] program = []
for full_frame_program in full_program: for full_frame_program in full_program:
frame_program = [] frame_program = []
@ -191,13 +194,13 @@ class CompoundPDQ2:
line = { line = {
"dac_divider": full_line["dac_divider"], "dac_divider": full_line["dac_divider"],
"duration": full_line["duration"], "duration": full_line["duration"],
"channel_data": full_line["channel_data"] "channel_data": full_line["channel_data"][n:n + dn],
[n*channels_per_pdq2:(n+1)*channels_per_pdq2],
"trigger": full_line["trigger"], "trigger": full_line["trigger"],
} }
frame_program.append(line) frame_program.append(line)
program.append(frame_program) program.append(frame_program)
pdq2.program(program) pdq2.program(program)
n += dn
for pdq2 in self.pdq2s: for pdq2 in self.pdq2s:
pdq2.unpark() pdq2.unpark()