pdq2/mediator: rewrite, adapt to new PDQ RPC format, support anonymous segments, support uploading to controllers

This commit is contained in:
Sebastien Bourdeauducq 2015-03-22 22:30:59 +01:00
parent c18efa11b3
commit 0b174085c8
1 changed files with 150 additions and 81 deletions

View File

@ -6,109 +6,155 @@ from artiq.coredevice import rtio
frame_setup = 20*ns frame_setup = 20*ns
trigger_duration = 50*ns trigger_duration = 50*ns
frame_wait = 20*ns sample_period = 10*ns
sample_period = 10*us # FIXME: check this delay_margin_factor = 1.0001
channels_per_pdq2 = 9
class SegmentSequenceError(Exception):
pass
class FrameActiveError(Exception): class FrameActiveError(Exception):
"""Raised when a frame is active and playback of a segment from another
frame is attempted."""
pass pass
class FrameCloseError(Exception): class SegmentSequenceError(Exception):
"""Raised when attempting to play back a named segment which is not the
next in the sequence."""
pass
class InvalidatedError(Exception):
"""Raised when attemting to use a frame or segment that has been
invalidated (due to disarming the PDQ)."""
pass
class ArmError(Exception):
"""Raised when attempting to arm an already armed PDQ, to modify the
program of an armed PDQ, or to play a segment on a disarmed PDQ."""
pass pass
class _Segment: class _Segment:
def __init__(self, frame, sn, duration, host_data): def __init__(self, frame, segment_number):
self.core = frame.core
self.frame = frame self.frame = frame
self.sn = sn self.segment_number = segment_number
self.duration = duration
self.host_data = host_data self.lines = []
# for @kernel
self.core = frame.pdq.core
def add_line(self, duration, channel_data, dac_divider=1):
if self.frame.invalidated:
raise InvalidatedError
if self.frame.pdq.armed:
raise ArmError
self.lines.append((dac_divider, duration, channel_data))
def get_duration(self):
r = 0*s
for dac_divider, duration, _ in self.lines:
r += duration*sample_period/dac_divider
return r
@kernel @kernel
def advance(self): def advance(self):
if self.frame.pdq.current_frame != self.frame.fn: if self.frame.invalidated:
raise FrameActiveError raise InvalidatedError
if self.frame.pdq.next_sn != self.sn: if not self.frame.pdq.armed:
raise ArmError
# If a frame is currently being played, check that we are next.
if (self.frame.pdq.current_frame >= 0
and self.frame.pdq.next_segment != self.segment_number):
raise SegmentSequenceError raise SegmentSequenceError
self.frame.pdq.next_sn += 1 self.frame.advance()
t = time_to_cycles(now())
self.frame.pdq.trigger.on(t)
self.frame.pdq.trigger.off(t + time_to_cycles(trigger_duration))
delay(self.duration)
class _Frame: class _Frame:
def __init__(self, core): def __init__(self, pdq, frame_number):
self.core = core self.pdq = pdq
self.frame_number = frame_number
self.segments = []
self.segment_count = 0 self.segment_count = 0
self.closed = False
def append(self, t, u, trigger=False, name=None): self.invalidated = False
if self.closed:
raise FrameCloseError # for @kernel
sn = self.segment_count self.core = self.pdq.core
duration = (t[-1] - t[0])*sample_period
segment = _Segment(self, sn, duration, (t, u, trigger)) def create_segment(self, name=None):
if name is None: if self.invalidated:
# TODO raise InvalidatedError
raise NotImplementedError("Anonymous segments are not supported yet") if self.pdq.armed:
else: raise ArmError
segment = _Segment(self, self.segment_count)
if name is not None:
if hasattr(self, name): if hasattr(self, name):
raise NameError("Segment name already exists") raise NameError("Segment name already exists")
setattr(self, name, segment) setattr(self, name, segment)
self.segments.append(segment)
self.segment_count += 1 self.segment_count += 1
return segment
def close(self): def _arm(self):
if self.closed: self.segment_delays = [
raise FrameCloseError time_to_cycles(s.get_duration()*delay_margin_factor, self.core)
self.closed = True for s in self.segments]
@kernel def _invalidate(self):
def begin(self): self.invalidated = True
if self.pdq.current_frame >= 0:
raise FrameActiveError
self.pdq.current_frame = self.fn
self.pdq.next_sn = 0
t = (time_to_cycles(now()) def _get_program(self):
- time_to_cycles(frame_setup + trigger_duration + frame_wait)) r = []
self.pdq.frame0.set_value(t, self.fn & 1) for segment in self.segments:
self.pdq.frame1.set_value(t, (self.fn & 2) >> 1) segment_program = [
self.pdq.frame2.set_value(t, (self.fn & 4) >> 2) {
t += time_to_cycles(frame_setup) "dac_divider": dac_divider,
self.pdq.trigger.on(t) "duration": duration,
self.pdq.trigger.off(t + time_to_cycles(trigger_duration)) "channel_data": channel_data,
"wait_trigger": False,
"jump": False
} for dac_divider, duration, channel_data in segment.lines]
segment_program[-1]["wait_trigger"] = True
r += segment_program
r[-1]["wait_trigger"] = False
r[-1]["jump"] = True
return r
@kernel @kernel
def advance(self): def advance(self):
# TODO if self.invalidated:
raise NotImplementedError raise InvalidatedError
if not self.pdq.armed:
raise ArmError
@kernel t = time_to_cycles(now()) - time_to_cycles(trigger_duration/2)
def finish(self):
if self.pdq.current_frame != self.fn: if self.pdq.current_frame >= 0:
raise FrameActiveError # PDQ is in the middle of a frame. Check it is us.
if self.pdq.next_sn != self.segment_count: if self.frame.pdq.current_frame != self.frame_number:
raise FrameActiveError raise FrameActiveError
else:
# PDQ is in the jump table - set the selection signals
# to play our first segment.
self.pdq.current_frame = self.frame_number
self.pdq.next_segment = 0
t2 = t - time_to_cycles(frame_setup)
self.pdq.frame0.set_value(t2, self.frame_number & 1)
self.pdq.frame1.set_value(t2, (self.frame_number & 2) >> 1)
self.pdq.frame2.set_value(t2, (self.frame_number & 4) >> 2)
self.pdq.trigger.on(t)
self.pdq.trigger.off(t + time_to_cycles(trigger_duration))
delay(cycles_to_time(self.segment_delays[self.pdq.next_segment]))
self.pdq.next_segment += 1
# test for end of frame
if self.pdq.next_segment == self.segment_count:
self.pdq.current_frame = -1 self.pdq.current_frame = -1
self.pdq.next_sn = -1 self.pdq.next_segment = -1
def _prepare(self, pdq, fn):
if not self.closed:
raise FrameCloseError
self.pdq = pdq
self.fn = fn
def _invalidate(self):
del self.pdq
del self.fn
class CompoundPDQ2(AutoDB): class CompoundPDQ2(AutoDB):
@ -131,19 +177,42 @@ class CompoundPDQ2(AutoDB):
self.frames = [] self.frames = []
self.current_frame = -1 self.current_frame = -1
self.next_sn = -1 self.next_segment = -1
self.armed = False
def create_frame(self): def disarm(self):
return _Frame(self.core)
def prepare(self, *frames):
# prevent previous frames and their segments from
# being (incorrectly) used again
for frame in self.frames: for frame in self.frames:
frame._invalidate() frame._invalidate()
self.frames = []
self.armed = False
self.frames = list(frames) def arm(self):
for fn, frame in enumerate(frames): if self.armed:
frame._prepare(self, fn) raise ArmError
for frame in self.frames:
frame._arm()
# TODO: upload to PDQ2 devices full_program = [f._get_program() for f in self.frames]
for n, pdq2 in enumerate(self.pdq2s):
program = []
for full_frame_program in full_program:
frame_program = []
for full_line in full_frame_program:
line = {
"dac_divider": full_line["dac_divider"],
"duration": full_line["duration"],
"channel_data": full_line["channel_data"]
[n*channels_per_pdq2:(n+1)*channels_per_pdq2],
"wait_trigger": full_line["wait_trigger"],
"jump": full_line["jump"]
}
frame_program.append(line)
program.append(frame_program)
pdq2.program(program)
def create_frame(self):
if self.armed:
raise ArmError
r = _Frame(self, len(self.frames))
self.frames.append(r)
return r