Commit b51ea4f1 authored by snuverink_j's avatar snuverink_j
Browse files

fix figures

parent ef1359c5
...@@ -152,7 +152,15 @@ bend radius, entrance and exit angles etc. Therefore we have divided this sectio ...@@ -152,7 +152,15 @@ bend radius, entrance and exit angles etc. Therefore we have divided this sectio
an \textit{OPAL-cycl} simulation. an \textit{OPAL-cycl} simulation.
\end{enumerate} \end{enumerate}
\input{figures/Elements/RBend} \begin{figure}[tb]
\centering
\includegraphics{figures/Elements/rbend.png}
\caption{Illustration of a general rectangular bend (\keyword{RBEND}) with a positive bend angle $\alpha$. The
entrance edge angle, $E_{1}$, is positive in this example. An \keyword{RBEND} has parallel entrance and exit
pole faces, so the exit angle, $E_{2}$, is uniquely determined by the bend angle, $\alpha$, and $E_{1}$
($E_{2}=\alpha - E_{1}$). For a positively charge particle, the magnetic field is directed out of the page.}
\label{fig:rbend}
\end{figure}
\subsection{RBend (\textit{OPAL-t})} \subsection{RBend (\textit{OPAL-t})}
\label{ssec:RBend} \label{ssec:RBend}
...@@ -250,7 +258,14 @@ pole faces. Figure~\ref{rbend} shows an \texttt{RBEND3D} with a positive bend an ...@@ -250,7 +258,14 @@ pole faces. Figure~\ref{rbend} shows an \texttt{RBEND3D} with a positive bend an
\end{description} \end{description}
\clearpage \clearpage
\input{figures/Elements/SBend} \begin{figure}[tb]
\centering
\includegraphics{figures/Elements/sbend.png}
\label{fig:sbend}
\caption{Illustration of a general sector bend (\keyword{SBEND}) with a positive bend angle $\alpha$. In this example
the entrance and exit edge angles $E_{1}$ and $E_{2}$ have positive values. For a positively charge particle,
the magnetic field is directed out of the page.}
\end{figure}
\subsection{SBend (\textit{OPAL-t})} \subsection{SBend (\textit{OPAL-t})}
\label{ssec:SBend} \label{ssec:SBend}
...@@ -1010,8 +1025,8 @@ This is a restricted feature: \textit{OPAL-cycl}. ...@@ -1010,8 +1025,8 @@ This is a restricted feature: \textit{OPAL-cycl}.
\begin{figure}[tb] \begin{figure}[tb]
\begin{center} \begin{center}
\includegraphics[width=0.58\textwidth]{figures/Elements/sbend3d-1} \includegraphics[width=0.58\textwidth]{figures/Elements/sbend3d-1.png}
\includegraphics[width=0.4\textwidth]{figures/Elements/sbend3d-2} \includegraphics[width=0.4\textwidth]{figures/Elements/sbend3d-2.png}
\end{center} \end{center}
\caption{A hard edge model of $90$ degree dipole magnet with homogeneous magnetic field. The right figure \caption{A hard edge model of $90$ degree dipole magnet with homogeneous magnetic field. The right figure
is showing the horizontal cross section of the 3D magnetic field map when $z = 0$} is showing the horizontal cross section of the 3D magnetic field map when $z = 0$}
...@@ -1512,7 +1527,7 @@ rf0: RFCavity, VOLT=0.25796, FMAPFN="Cav1.dat", ...@@ -1512,7 +1527,7 @@ rf0: RFCavity, VOLT=0.25796, FMAPFN="Cav1.dat",
Figure~\ref{Cyclotron_cavity} shows the simplified geometry of a cavity gap and its parameters. Figure~\ref{Cyclotron_cavity} shows the simplified geometry of a cavity gap and its parameters.
\begin{figure}[hbt] \begin{figure}[hbt]
\centering\includegraphics[scale=0.6]{./figures/cyclotron/Cavity.pdf} \centering\includegraphics[scale=0.6]{./figures/cyclotron/Cavity.png}
\caption{Schematic of the simplified geometry of a cavity gap and parameters} \caption{Schematic of the simplified geometry of a cavity gap and parameters}
\label{fig:Cyclotron_cavity} \label{fig:Cyclotron_cavity}
\end{figure} \end{figure}
...@@ -1826,21 +1841,10 @@ The width of the septum. [{mm}] ...@@ -1826,21 +1841,10 @@ The width of the septum. [{mm}]
The particle hitting collimator will be recorded and directly deleted from the simulation. The particle hitting collimator will be recorded and directly deleted from the simulation.
\end{description} \end{description}
\begin{tikzpicture}[scale=1.5,axis/.style={very thick, ->, >=stealth'}] \begin{figure}[tb]
% Draw axes \centering
\draw [->,thick] (1,-2.0) -- (1,2.0) node (yaxis) [above] {$y$}; \includegraphics{figures/Elements/collimator.png}
\draw [->,thick] (-1.2,1.0) -- (4.0,1.0) node (xaxis) [right] {$x$}; \end{figure}
\draw (3.5,-0.2) --(2.0,-1.5)
(2.0,-1.5) --(2.5,-2.0)
(2.5,-2.0) --(4.0,-0.7)
(4.0,-0.7) --(3.5,-0.2);
\fill[red] (2.25,-1.75) circle (1pt) node (start)[below] {(xstart,ystart)};
\fill[red] (3.75,-0.45) circle (1pt) node (end)[above] {(xend,yend)};
\node (collimator) at (2.55,-0.55)[anchor=mid] {collimator};
\draw [<->,thick,blue] (2.75,-0.85)--(3.25,-1.35) node [right] {width};
\end{tikzpicture}
\noindent Example: \noindent Example:
\begin{verbatim} \begin{verbatim}
...@@ -1880,20 +1884,10 @@ The y coordinate of the end point. [{mm}] ...@@ -1880,20 +1884,10 @@ The y coordinate of the end point. [{mm}]
The width of the septum. [{mm}] The width of the septum. [{mm}]
\end{description} \end{description}
\begin{tikzpicture}[scale=1.5,axis/.style={very thick, ->, >=stealth'}] \begin{figure}[tb]
% Draw axes \centering
\draw [->,thick] (1,-2.0) -- (1,2.0) node (yaxis) [above] {$y$}; \includegraphics{figures/Elements/septum.png}
\draw [->,thick] (-1.2,1.0) -- (4.0,1.0) node (xaxis) [right] {$x$}; \end{figure}
\draw (3.5,-0.2) --(2.0,-1.5)
(2.0,-1.5) --(2.1,-1.6)
(2.1,-1.6) --(3.6,-0.3)
(3.6,-0.3) --(3.5,-0.2);
\fill[red] (2.05,-1.55) circle (1pt) node (start)[below] {(xstart,ystart)};
\fill[red] (3.55,-0.25) circle (1pt) node (end)[above] {(xend,yend)};
\node (steptum) at (2.55,-0.55)[anchor=mid] {septum};
\draw [<->,thick,blue] (2.75,-0.85)--(2.85,-0.95) node [right] {width};
\end{tikzpicture}
\noindent Example: \noindent Example:
\begin{verbatim} \begin{verbatim}
...@@ -1920,19 +1914,10 @@ The y coordinate of the end point. [{mm}] ...@@ -1920,19 +1914,10 @@ The y coordinate of the end point. [{mm}]
The width of the probe, NOT used yet. The width of the probe, NOT used yet.
\end{description} \end{description}
\begin{tikzpicture}[scale=1.5,axis/.style={very thick, ->, >=stealth'}] \begin{figure}[tb]
% Draw axes \centering
\draw [->,thick] (0.5,-2.0) -- (0.5,2.0) node (yaxis) [above] {$y$}; \includegraphics{figures/Elements/probe.png}
\draw [->,thick] (-1.2,1.0) -- (4.0,1.0) node (xaxis) [right] {$x$}; \end{figure}
\draw (1.5,-0.5) --(3.0,-1.5)
(3.0,-1.5) --(3.1,-1.4)
(3.1,-1.4) --(1.6,-0.4)
(1.6,-0.4) --(1.5,-0.5);
\fill[red] (1.55,-0.45) circle (1pt) node (start)[above] {(xstart,ystart)};
\fill[red] (3.05,-1.45) circle (1pt) node (end)[below] {(xend,yend)};
\node (steptum) at (2.55,-0.55)[anchor=mid] {probe};
\draw [<->,thick,blue] (2.25,-1.0)--(2.35,-0.9) node [right] {width};
\end{tikzpicture}
\noindent Example: \noindent Example:
\begin{verbatim} \begin{verbatim}
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment