srenblad/artiq
1
0
Fork 0
forked from M-Labs/artiq
Code Pull Requests Activity

doc/slides: minor fixes

Browse Source
This commit is contained in:
Sebastien Bourdeauducq 2017-09-06 19:25:38 +08:00
parent 264d5fde83
commit 629827f573
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
doc/slides/artiq_overview.tex
View File

@ -32,7 +32,7 @@
\title{The ARTIQ experiment control system} \title{The ARTIQ experiment control system}
\author[S]{{\bf S\'ebastien~Bourdeauducq}} \author[S]{{\bf S\'ebastien~Bourdeauducq}}
\institute[S]{ \institute[S]{
M-Labs Ltd, Hong Kong -- \url{http://m-labs.hk} M-Labs Ltd, Hong Kong -- \url{https://m-labs.hk}
} }
\begin{document} \begin{document}
@ -96,7 +96,7 @@ for i in range(3):
delay(5*us) delay(5*us)
dds.pulse(900*MHz, 7*us) # first pulse 5 µs after trigger dds.pulse(900*MHz, 7*us) # first pulse 5 µs after trigger
# re-reference time-line # re-reference time-line
at(start + seconds_to_mu(1*ms)) at_mu(start + seconds_to_mu(1*ms))
dds.pulse(200*MHz, 11*us) # exactly 1 ms after trigger dds.pulse(200*MHz, 11*us) # exactly 1 ms after trigger
\end{minted} \end{minted}
@ -245,13 +245,13 @@ class Experiment:
\begin{frame} \begin{frame}
\frametitle{Short-term hardware support} \frametitle{Third-party hardware support}
\footnotesize \footnotesize
\begin{itemize} \begin{itemize}
\item Core device: Papilio Pro, Pipistrello, KC705 \item Core device: KC705
\item High speed DDS with AD9858 and AD9914 \\ \item High speed DDS with AD9914 \\
(direct core device, $ < 25$ channels) (direct core device, $ < 25$ channels)
\item Waveform generation: PDQ (NIST), PXI6733 \item Waveform generation: PDQ (NIST)
\item Lab Brick Digital Attenuators \item Lab Brick Digital Attenuators
\item Novatech 409B DDS \item Novatech 409B DDS
\item Thorlabs motor controllers \item Thorlabs motor controllers
@ -261,7 +261,7 @@ class Experiment:
\begin{frame} \begin{frame}
\begin{center} \begin{center}
\includegraphics[width=3cm]{../../logo/artiq.pdf} \\ \includegraphics[width=3cm]{../../logo/artiq.pdf} \\
\url{http://m-labs.hk/artiq} \url{https://m-labs.hk/artiq}
\end{center} \end{center}
\footnotesize \footnotesize