From 76d4598971fb872f0a30d77e9cc2474c5a3e597b Mon Sep 17 00:00:00 2001 From: David Nadlinger Date: Tue, 14 May 2019 20:32:40 +0100 Subject: [PATCH] manual/management_system: Reference RTIO manual with diagram; unify terminology Other parts of the manual speak of "executing" RTIO events instead of "triggering" them. --- doc/manual/management_system.rst | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/doc/manual/management_system.rst b/doc/manual/management_system.rst index eec66edc4..a3b3fdaaa 100644 --- a/doc/manual/management_system.rst +++ b/doc/manual/management_system.rst @@ -54,10 +54,10 @@ Experiments are divided into three phases that are programmed by the user: The three phases of several experiments are then executed in a pipelined manner by the scheduler in the ARTIQ master: experiment A executes its preparation stage, then experiment A executes its running stage while experiment B executes its preparation stage, and so on. -.. note:: - The next experiment (B) may start :meth:`~artiq.language.environment.Experiment.run` ing before all events placed into (core device) RTIO buffers by the previous experiment (A) have triggered. These events can then trigger when experiment B is :meth:`~artiq.language.environment.Experiment.run` ing. Using :meth:`~artiq.coredevice.core.Core.reset` clears the RTIO buffers, discarding untriggered events, including those left over from A. - - Interactions between events of different experiments, can be avoided by preventing the :meth:`~artiq.language.environment.Experiment.run` method of experiment A from returning before all events have triggered. This can be achieved using :meth:`~artiq.coredevice.core.Core.wait_until_mu`. In most cases, :func:`~artiq.language.core.now_mu` will return an appropriate timestamp. +.. note:: + The next experiment (B) may start :meth:`~artiq.language.environment.Experiment.run`\ ing before all events placed into (core device) RTIO buffers by the previous experiment (A) have been execute. These events can then execute while experiment B is :meth:`~artiq.language.environment.Experiment.run`\ ing. Using :meth:`~artiq.coredevice.core.Core.reset` clears the RTIO buffers, discarding pending events, including those left over from A. + + Interactions between events of different experiments can be avoided by preventing the :meth:`~artiq.language.environment.Experiment.run` method of experiment A from returning until all events have been executed. This is discussed in the section on RTIO :ref:`rtio-handover-synchronization`. Priorities and timed runs -------------------------