aboutsummaryrefslogtreecommitdiff
path: root/acquisition
diff options
context:
space:
mode:
authorBlaise Thompson <blaise@untzag.com>2018-04-05 08:11:15 -0500
committerBlaise Thompson <blaise@untzag.com>2018-04-05 08:11:15 -0500
commit57cc38f603b5145185d67b36bb3138cdaa5b4cf9 (patch)
treeed11dc8bbbaec5454b953bc3baecb397a13dacbb /acquisition
parent5c0cd9524716e91bfce3386cf13f29236c56568e (diff)
parentba8235a76c56f6fba6eb9919f3a64054f17fe79d (diff)
Merge branch 'jcw'
Diffstat (limited to 'acquisition')
-rw-r--r--acquisition/chapter.tex4
1 files changed, 2 insertions, 2 deletions
diff --git a/acquisition/chapter.tex b/acquisition/chapter.tex
index 0d3d1c5..0436028 100644
--- a/acquisition/chapter.tex
+++ b/acquisition/chapter.tex
@@ -36,7 +36,7 @@ for w2 in w2_points:
set_d2(d2)
measure_signal()
\end{codefragment}
-In this simple example, there are 5 \python{w1} destinations, 7 \phon{w2} destinations, and 12
+In this simple example, there are 5 \python{w1} destinations, 7 \python{w2} destinations, and 12
\python{d2} destinations, so there are a total of $5\times7\times12=420$ pixels in the
three-dimensional scan. %
The acquisition software must set the hardware to each of these points and acquire data at each of
@@ -732,7 +732,7 @@ We can write the conjugate equation to \ref{eq:simple_exponential_decay}, asking
need to get a cerain signal level?'':
\begin{eqnarray}
\log{(S)} &=& -\frac{t}{\tau} \\
-t &=& -\taulog{(S)}.
+t &=& -\tau\log{(S)}.
\end{eqnarray}
So to step linearly in $t$, my step size has to go as $-\tau\log{(S)}$.