From f02ceee6268e60441a80d1bee247e4729dfa93ac Mon Sep 17 00:00:00 2001 From: David Nadlinger Date: Fri, 26 Oct 2018 12:46:08 +0100 Subject: [PATCH] language: Clarify now_mu() docstring [nfc] --- artiq/language/core.py | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/artiq/language/core.py b/artiq/language/core.py index e6cd1a498..40b932fb4 100644 --- a/artiq/language/core.py +++ b/artiq/language/core.py @@ -199,7 +199,12 @@ def delay_mu(duration): def now_mu(): - """Retrieves the current RTIO time, in machine units.""" + """Retrieve the current RTIO timeline cursor, in machine units. + + Note the conceptual difference between this and the current value of the + hardware RTIO counter; see e.g. + :meth:`artiq.coredevice.core.Core.get_rtio_counter_mu` for the latter. + """ return _time_manager.get_time_mu()