Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: m-labs/artiq
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 950eaef08cf2
Choose a base ref
...
head repository: m-labs/artiq
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: aa50c5b4d97c
Choose a head ref
  • 3 commits
  • 2 files changed
  • 1 contributor

Commits on Feb 24, 2016

  1. examples/transport: int arguments

    @jordens
    jordens committed Feb 24, 2016
    Copy the full SHA
    d807398 View commit details

  2. pdq2.mediator: err on short segments

    @jordens
    jordens committed Feb 24, 2016
    Copy the full SHA
    f2acf95 View commit details

  3. pdq2.mediator: minor tweaks

    @jordens
    jordens committed Feb 24, 2016
    Copy the full SHA
    aa50c5b View commit details
Showing with 8 additions and 5 deletions.
  1. +6 −3 artiq/devices/pdq2/mediator.py
  2. +2 −2 examples/master/repository/coredevice_examples/transport.py
9 changes: 6 additions & 3 deletions artiq/devices/pdq2/mediator.py
View file
Original file line number Diff line number Diff line change
@@ -103,6 +103,9 @@ def _invalidate(self):
def _get_program(self):
r = []
for segment in self.segments:
if segment.duration < 2*trigger_duration:
raise ValueError(("Segment too short ({:g} s), trigger might "
"spill").format(segment.duration))
segment_program = [
{
"dac_divider": dac_divider,
@@ -168,10 +171,10 @@ def __init__(self, dmgr, pdq2_devices, trigger_device, frame_devices):
def disarm(self):
for frame in self.frames:
frame._invalidate()
self.frames = []
self.armed = False
self.frames.clear()
for dev in self.pdq2s:
dev.park()
self.armed = False

def get_program(self):
return [f._get_program() for f in self.frames]
@@ -181,7 +184,6 @@ def arm(self):
raise ArmError()
for frame in self.frames:
frame._arm()
self.armed = True

full_program = self.get_program()
n = 0
@@ -203,6 +205,7 @@ def arm(self):
n += dn
for pdq2 in self.pdq2s:
pdq2.unpark()
self.armed = True

def create_frame(self):
if self.armed:
4 changes: 2 additions & 2 deletions examples/master/repository/coredevice_examples/transport.py
View file
Original file line number Diff line number Diff line change
@@ -17,8 +17,8 @@ def build(self):

self.setattr_argument("wait_at_stop", NumberValue(100*us))
self.setattr_argument("speed", NumberValue(1/(10*us)))
self.setattr_argument("repeats", NumberValue(100))
self.setattr_argument("bins", NumberValue(100))
self.repeats = int(self.get_argument("repeats", NumberValue(100)))
self.bins = int(self.get_argument("bins", NumberValue(100)))

t = np.linspace(0, 10, 101) # waveform time
u = 1 - np.cos(np.pi*t/t[-1])