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: de4a15c31503
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: 9ffc370416f7
Choose a head ref
  • 2 commits
  • 5 files changed
  • 1 contributor

Commits on Feb 18, 2015

  1. style

    sbourdeauducq committed Feb 18, 2015
    Copy the full SHA
    5bb6a3d View commit details

Commits on Feb 19, 2015

  1. Copy the full SHA
    9ffc370 View commit details
Showing with 6 additions and 2 deletions.
  1. +2 −0 artiq/frontend/artiq_run.py
  2. +2 −0 artiq/master/worker_impl.py
  3. +1 −0 artiq/test/lda.py
  4. +1 −1 doc/manual/developing_a_ndsp.rst
  5. +0 −1 examples/flopping_f_simulation.py
2 changes: 2 additions & 0 deletions artiq/frontend/artiq_run.py
Original file line number Diff line number Diff line change
@@ -113,6 +113,8 @@ def main():

unit_inst = unit(dbh, **arguments)
unit_inst.run()
if hasattr(unit_inst, "analyze"):
unit_inst.analyze()

if args.hdf5 is not None:
f = h5py.File(args.hdf5, "w")
2 changes: 2 additions & 0 deletions artiq/master/worker_impl.py
Original file line number Diff line number Diff line change
@@ -94,6 +94,8 @@ def run(obj):
try:
unit_inst = unit(dbh, **obj["arguments"])
unit_inst.run()
if hasattr(unit_inst, "analyze"):
unit_inst.analyze()
except Exception:
put_object({"action": "report_completed",
"status": "failed",
1 change: 1 addition & 0 deletions artiq/test/lda.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import unittest
import os

from artiq.devices.lda.driver import Lda, Ldasim
from artiq.language.units import dB

2 changes: 1 addition & 1 deletion doc/manual/developing_a_ndsp.rst
Original file line number Diff line number Diff line change
@@ -78,7 +78,7 @@ The client

Clients are small command-line utilities that expose certain functionalities of the drivers. The ``artiq_rpctool`` utility contains a generic client that can be used in most cases, and developing a custom client is not required. Try these commands ::

$ artiq_rpctool ::1 3249 list-methods
$ artiq_rpctool ::1 3249 list-methods
$ artiq_rpctool ::1 3249 call message test

In case you are developing a NDSP that is complex enough to need a custom client, we will see how to develop one. Create a ``hello_client.py`` file with the following contents: ::
1 change: 0 additions & 1 deletion examples/flopping_f_simulation.py
Original file line number Diff line number Diff line change
@@ -52,7 +52,6 @@ def run(self):
self.frequency.append(frequency)
self.brightness.append(brightness)
time.sleep(0.1)
self.analyze()

def analyze(self):
popt, pcov = curve_fit(model_numpy,