diff --git a/doc/manual/core_device.rst b/doc/manual/core_device.rst index c99ff7862..d01a992a6 100644 --- a/doc/manual/core_device.rst +++ b/doc/manual/core_device.rst @@ -3,7 +3,7 @@ Core device The core device is a FPGA-based hardware component that contains a softcore CPU tightly coupled with the so-called RTIO core that provides precision timing. The CPU executes Python code that is statically compiled by the ARTIQ compiler, and communicates with the core device peripherals (TTL, DDS, etc.) over the RTIO core. This architecture provides high timing resolution, low latency, low jitter, high level programming capabilities, and good integration with the rest of the Python experiment code. -While it is possible to use all the other parts of ARTIQ (controllers, master, GUI, result management, etc.) without a core device, many experiments require it. +While it is possible to use all the other parts of ARTIQ (controllers, master, GUI, dataset management, etc.) without a core device, many experiments require it. .. _core-device-flash-storage: diff --git a/doc/manual/environment.rst b/doc/manual/environment.rst index 853c05ee2..d5d78d323 100644 --- a/doc/manual/environment.rst +++ b/doc/manual/environment.rst @@ -1,7 +1,7 @@ The environment =============== -Experiments interact with an environment that consists of devices, parameters, arguments and results. Access to the environment is handled by the class :class:`artiq.language.environment.EnvExperiment` that experiments should derive from. +Experiments interact with an environment that consists of devices, arguments and datasets. Access to the environment is handled by the class :class:`artiq.language.environment.EnvExperiment` that experiments should derive from. .. _device-db: diff --git a/doc/manual/getting_started_mgmt.rst b/doc/manual/getting_started_mgmt.rst index 8152295c5..9ddf82f1f 100644 --- a/doc/manual/getting_started_mgmt.rst +++ b/doc/manual/getting_started_mgmt.rst @@ -136,20 +136,20 @@ The master should now run the new version from its repository. As an exercise, add another argument to the experiment, commit and push the result, and verify that the new control is added in the GUI. -Results -------- +Datasets +-------- Modify the ``run()`` method of the experiment as follows: :: def run(self): - parabola = self.set_result("parabola", [], realtime=True) + parabola = self.set_dataset("parabola", [], broadcast=True) for i in range(int(self.count)): parabola.append(i*i) time.sleep(0.5) .. note:: You need to import the ``time`` module. -Commit, push and submit the experiment as before. While it is running, go to the "Results" dock of the GUI and create a new XY plot showing the new result. Observe how the points are added one by one to the plot. +Commit, push and submit the experiment as before. While it is running, go to the "Datasets" dock of the GUI and create a new XY plot showing the new result. Observe how the points are added one by one to the plot. After the experiment has finished executing, the results are written to a HDF5 file that resides in ``~/artiq-master/results//