From 33aafa93abe7653fff60a67886e1b9b98285beff Mon Sep 17 00:00:00 2001
From: Blaise Thompson <blaise@untzag.com>
Date: Thu, 12 Apr 2018 11:47:12 -0500
Subject: 2018-04-12 11:47

---
 opa/chapter.tex            |  40 ++++++++++++++++++++++++++++++++--------
 opa/poweramp flowchart.png | Bin 90565 -> 0 bytes
 opa/poweramp_flowchart.png | Bin 0 -> 90565 bytes
 opa/preamp flowchart.png   | Bin 52647 -> 0 bytes
 opa/preamp_flowchart.png   | Bin 0 -> 52647 bytes
 5 files changed, 32 insertions(+), 8 deletions(-)
 delete mode 100644 opa/poweramp flowchart.png
 create mode 100644 opa/poweramp_flowchart.png
 delete mode 100644 opa/preamp flowchart.png
 create mode 100644 opa/preamp_flowchart.png

(limited to 'opa')

diff --git a/opa/chapter.tex b/opa/chapter.tex
index 7a1d9e6..59e4243 100644
--- a/opa/chapter.tex
+++ b/opa/chapter.tex
@@ -50,9 +50,19 @@ femtosecond TOPAS-C models because they are by far the most challenging model to
 % TODO: introduction to the internal design of the OPA
 
 \begin{figure}
-  \caption[CAPTION TODO]{
-    CAPTION TODO: TOPAS-C FACTORY POWER CURVES
+  \includegraphics[width=\textwidth]{opa/OPA_ranges}
+  \caption{
+    CAPTION TODO
+  }
+  \label{opa:fig:preamp}
+\end{figure}
+
+\begin{figure}
+  \includegraphics[width=\textwidth]{opa/OPA_powers}
+  \caption{
+    CAPTION TODO
   }
+  \label{opa:fig:preamp}
 \end{figure}
 
 \section{Preamp}  % ===============================================================================
@@ -88,23 +98,22 @@ the full spectrum at each motor position.  %
 \end{figure}
 
 \begin{figure}
-  \includegraphics[width=\linewidth]{opa/autotune_preamp}
+  \includegraphics[width=\linewidth]{opa/preamp_flowchart}
   \caption{
     CAPTION TODO
   }
-  \label{opa:fig:autotune_preamp}
 \end{figure}
 
-\section{Poweramp}  % =============================================================================
-
 \begin{figure}
-  \includegraphics[width=\linewidth]{opa/poweramp}
+  \includegraphics[width=\linewidth]{opa/autotune_preamp}
   \caption{
     CAPTION TODO
   }
-  \label{opa:fig:poweramp}
+  \label{opa:fig:autotune_preamp}
 \end{figure}
 
+\section{Poweramp}  % =============================================================================
+
 Once generated, the seed goes on to be amplified in a second BBO crystal ``C2'' with the rest of
 the 800 nm pump.  %
 Optimizing this amplification step is primarily a matter of setting C2 angle.  %
@@ -141,6 +150,21 @@ Each separate marker color represents a different setpoint.  %
 As with D2, the C2 upper panel compares the old tuning curve (thin black) with the output tuning
 curve (colored X's).  %
 
+\begin{figure}
+  \includegraphics[width=\linewidth]{opa/poweramp}
+  \caption{
+    CAPTION TODO
+  }
+  \label{opa:fig:poweramp}
+\end{figure}
+
+\begin{figure}
+  \includegraphics[width=\linewidth]{opa/poweramp_flowchart}
+  \caption{
+    CAPTION TODO
+  }
+\end{figure}
+
 \begin{figure}
   \includegraphics[width=\textwidth]{opa/d2}
   \caption{
diff --git a/opa/poweramp flowchart.png b/opa/poweramp flowchart.png
deleted file mode 100644
index 7ab1dc4..0000000
Binary files a/opa/poweramp flowchart.png and /dev/null differ
diff --git a/opa/poweramp_flowchart.png b/opa/poweramp_flowchart.png
new file mode 100644
index 0000000..7ab1dc4
Binary files /dev/null and b/opa/poweramp_flowchart.png differ
diff --git a/opa/preamp flowchart.png b/opa/preamp flowchart.png
deleted file mode 100644
index 01b04f1..0000000
Binary files a/opa/preamp flowchart.png and /dev/null differ
diff --git a/opa/preamp_flowchart.png b/opa/preamp_flowchart.png
new file mode 100644
index 0000000..01b04f1
Binary files /dev/null and b/opa/preamp_flowchart.png differ
-- 
cgit v1.2.3