Add drawing of trigger options

diff --git a/trb3/CtsHowtos.tex b/trb3/CtsHowtos.tex
index 423add0cec2a442f3f32d4aaedea5906f067a854..9f1f910789e2f6b9c15f70142cf8d2e06fab854b 100644 (file)
--- a/trb3/CtsHowtos.tex
+++ b/trb3/CtsHowtos.tex
@@ -1,4 +1,14 @@
 \newpage
+
+\subsection{Trigger Generation Options}
+   \begin{figure}
+      \begin{center}
+         \includegraphics[width=0.9\textwidth]{figures/triggeroptions.pdf}
+         \caption[Trigger Generation Options]{Summary of various trigger sources in CTS and all other FPGAs}
+         \label{fig:triggeroptions}
+      \end{center}
+   \end{figure}
+
 \label{sec:cts_howto_external_trigger}
 
 \subsection{HowTo Implement an External Trigger Module}

diff --git a/trb3/CtsSlowControl.tex b/trb3/CtsSlowControl.tex
index 05eeddaae16f5d37bb68e4f1e667304833679e81..728ce90a961a558230894b0769b67507a17a8186 100755 (executable)
--- a/trb3/CtsSlowControl.tex
+++ b/trb3/CtsSlowControl.tex
@@ -24,7 +24,7 @@
    This decision reduces the amount of header words and thus speeds up the enumeration process. It further decreases
    the code complexity of the client software.
    
-   \begin{table}[H]
+   \begin{table}[h]
       \begin{center}
          \begin{tabularx}{\textwidth}{|r@{}@{}c@{}@{}l|lX|} \hline
             \multicolumn{3}{|c|}{\textbf{Bit(s)}} &

diff --git a/trb3/figures/triggeroptions.pdf b/trb3/figures/triggeroptions.pdf
new file mode 100644 (file)
index 0000000..e51063f
Binary files /dev/null and b/trb3/figures/triggeroptions.pdf differ

diff --git a/trb3/trb3qs_preamble.tex b/trb3/trb3qs_preamble.tex
index 4f8146d32aa63b8c634dfaa153a36c8e2cb22de3..f9d7e62714068b6a9f38649b78bb64206e02c7a0 100644 (file)
--- a/trb3/trb3qs_preamble.tex
+++ b/trb3/trb3qs_preamble.tex
@@ -1,3 +1,13 @@
+\makeatletter
+\DeclareOldFontCommand{\rm}{\normalfont\rmfamily}{\mathrm}
+\DeclareOldFontCommand{\sf}{\normalfont\sffamily}{\mathsf}
+\DeclareOldFontCommand{\tt}{\normalfont\ttfamily}{\mathtt}
+\DeclareOldFontCommand{\bf}{\normalfont\bfseries}{\mathbf}
+\DeclareOldFontCommand{\it}{\normalfont\itshape}{\mathit}
+\DeclareOldFontCommand{\sl}{\normalfont\slshape}{\@nomath\sl}
+\DeclareOldFontCommand{\sc}{\normalfont\scshape}{\@nomath\sc}
+\makeatother
+
 \usepackage[usenames,dvipsnames,svgnames,table]{xcolor}
 \usepackage{color}
 
@@ -77,4 +87,4 @@
 \DeclareCaptionFormat{listing}{\colorbox[rgb]{0.8, 0.8, 0.8}{\parbox{.98\textwidth}{\hspace{15pt}#1#2#3}}}
 \captionsetup[lstlisting]{format=listing,singlelinecheck=false, margin=0pt, font={tt}}
 
-% \lstinputlisting[label=samplecode,caption=A sample]{sourceCode/HelloWorld.java}
\ No newline at end of file
+% \lstinputlisting[label=samplecode,caption=A sample]{sourceCode/HelloWorld.java}