M-Labs/artiq
2
0
Fork 2
mirror of https://github.com/m-labs/artiq.git synced 2024-12-25 19:28:26 +08:00
Code Issues Projects Releases Wiki Activity

examples/transport: adapt to new PDQ2 mediator (WIP, broken)

Browse Source
This commit is contained in:
Sebastien Bourdeauducq 2015-03-22 22:31:59 +01:00
parent 0b174085c8
commit b45ad9d1a3
1 changed files with 7 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
examples/master/repository/transport.py
View File

@ -29,31 +29,16 @@ class Transport(Experiment, AutoDB):
def prepare(self, stop): def prepare(self, stop):
t = transport_data["t"][:stop]*self.speed t = transport_data["t"][:stop]*self.speed
u = transport_data["u"][:stop] u = transport_data["u"][:stop]
# start a new frame
self.electrodes.disarm()
self.tf = self.electrodes.create_frame() self.tf = self.electrodes.create_frame()
# interpolates t and u and appends the (t, u) segment to the frame self.tf.create_segment(t, u, name="to_stop")
# adds wait-for-trigger to the first line/spline knot
# will also apply offset and gain calibration data
# stores duration and the fact that this segment needs to be triggered
# both (duration and segment triggering flag) to be retrieved during
# kernel compilation, see transport()
self.tf.append(t, u, trigger=True,
name="to_stop")
# append the reverse transport (from stop to 0) # append the reverse transport (from stop to 0)
# both durations are the same in this case # both durations are the same in this case
self.tf.append(t[-1] - t[::-1], u[::-1], trigger=True, self.tf.create_segment(t[-1] - t[::-1], u[::-1], name="from_stop")
name="from_stop")
# closes the frame with a wait line before jumping back into
# the jump table so that frame signal can be set before the jump
# also mark the frame as closed and prevent further append()ing
self.tf.close()
# user must pass all frames that are going to be used next
# selects possible frame id based on rtio_frame assignments
# from core device
# distributes frames to the sub-devices in CompoundPDQ2 # distributes frames to the sub-devices in CompoundPDQ2
# and uploads them # and uploads them
# uploading is ARM_DIS, writing, ARM_EN self.electrodes.arm()
self.electrodes.prepare(self.tf)
@kernel @kernel
def cool(self): def cool(self):
@ -64,11 +49,7 @@ class Transport(Experiment, AutoDB):
@kernel @kernel
def transport(self): def transport(self):
# ensures no frame is currently being actively played # selects transport frame
# set rtio frame select signal to frame id
# rtio trigger jump into transport frame
# (does not advance the timeline)
self.tf.begin()
# triggers pdqs to start transport frame segment # triggers pdqs to start transport frame segment
# plays the transport waveform from 0 to stop # plays the transport waveform from 0 to stop
# delay()s the core by the duration of the waveform segment # delay()s the core by the duration of the waveform segment
@ -77,10 +58,8 @@ class Transport(Experiment, AutoDB):
delay(self.wait_at_stop) delay(self.wait_at_stop)
# transport back (again: trigger, delay()) # transport back (again: trigger, delay())
# segments can only be advance()ed in order # segments can only be advance()ed in order
# since this is the last segment, pdq will go back to jump table
self.tf.from_stop.advance() self.tf.from_stop.advance()
# ensures all segments have been advanced() through, must leave pdq
# in a state where the next frame can begin()
self.tf.finish()
@kernel @kernel
def detect(self): def detect(self):