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: 00402c9af956
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: 5ecfa8197f4b
Choose a head ref
  • 2 commits
  • 3 files changed
  • 1 contributor

Commits on Oct 17, 2016

  1. Copy the full SHA
    115204f View commit details
  2. Copy the full SHA
    5ecfa81 View commit details
Showing with 11 additions and 5 deletions.
  1. +5 −4 artiq/dashboard/datasets.py
  2. +3 −0 artiq/master/scheduler.py
  3. +3 −1 doc/manual/management_system.rst
9 changes: 5 additions & 4 deletions artiq/dashboard/datasets.py
Original file line number Diff line number Diff line change
@@ -7,6 +7,7 @@
from artiq.tools import short_format
from artiq.gui.tools import LayoutWidget, QRecursiveFilterProxyModel
from artiq.gui.models import DictSyncTreeSepModel
from artiq.gui.scientific_spinbox import ScientificSpinBox


logger = logging.getLogger(__name__)
@@ -50,10 +51,10 @@ def get_edit_widget_value(self):

class NumberEditor(Editor):
def get_edit_widget(self, initial_value):
self.edit_widget = QtWidgets.QDoubleSpinBox()
self.edit_widget.setMinimum(float("-inf"))
self.edit_widget.setMaximum(float("+inf"))
self.edit_widget.setDecimals(8)
self.edit_widget = ScientificSpinBox()
self.edit_widget.setDecimals(13)
self.edit_widget.setPrecision()
self.edit_widget.setRelativeStep()
self.edit_widget.setValue(float(initial_value))
return self.edit_widget

3 changes: 3 additions & 0 deletions artiq/master/scheduler.py
Original file line number Diff line number Diff line change
@@ -446,6 +446,9 @@ def check_pause(self, rid):
whether returning control to the host and pausing would have an effect,
in order to avoid the cost of switching kernels in the common case
where ``pause`` does nothing.
This function does not have side effects, and does not have to be
followed by a call to ``pause``.
"""
for pipeline in self._pipelines.values():
if rid in pipeline.pool.runs:
4 changes: 3 additions & 1 deletion doc/manual/management_system.rst
Original file line number Diff line number Diff line change
@@ -72,7 +72,9 @@ To check whether ``pause()`` would in fact *not* return immediately, use :meth:`

The experiment must place the hardware in a safe state and disconnect from the core device (typically, by using ``self.core.comm.close()``) before calling ``pause``.

Accessing the ``pause`` method is done through a virtual device called ``scheduler`` that is accessible to all experiments. The scheduler virtual device is requested like regular devices using ``get_device`` or ``attr_device``.
Accessing the ``pause`` and ``check_pause`` methods is done through a virtual device called ``scheduler`` that is accessible to all experiments. The scheduler virtual device is requested like regular devices using ``get_device`` or ``attr_device``.

``check_pause`` can be called (via RPC) from a kernel, but ``pause`` must not.

Multiple pipelines
------------------