Commit 3b06b09a authored by snuverink_j's avatar snuverink_j
Browse files

expand ifthenelse correctly

parent c0c479dc
......@@ -702,37 +702,6 @@ SAVE,FILE="structure";
SAVE,"structure";
\end{verbatim}
\ifthenelse{\boolean{ShowMap}}{
\subsection{MAKESEQ Statement}
\label{sec:makeseq}
\index{MAKESEQ}
A file containing a machine sequence can be generated in \textit{OPAL} by the
command
\begin{verbatim}
MAKESEQ,LINE=string,NAME=string,FILE=string;
\end{verbatim}
Please note this is not yet supported for \textit{OPAL-t} and \textit{OPAL-cycl}.
The named beam line see~Section~\ref{line} or sequence see~Section~\ref{sequence} is
written as a flat \texttt{SEQUENCE} see~Section~\ref{sequence} with the given
name on the named file.
All required elements and parameters are also written.
All expressions are evaluated and only their values appear in the
output.
The command has the following attributes:
\begin{description}
\item[LINE]
The line for which a flat sequence is to be written.
\item[NAME]
The name to be given to the sequence written.
\item[FILE]
The name of the file to receive the output.
\end{description}
}{}
\section{IF: Conditional Execution}
\label{sec:if}
\index{IF}
......
......@@ -126,7 +126,6 @@ DR2:DRIFT, L=DR1->L, TYPE=DRF;
\end{verbatim}
The length of \texttt{DR2} will always be equal to the length of \texttt{DR1}.
The reference system for a drift space is a Cartesian coordinate system
\ifthenelse{\boolean{ShowMap}}{see~Figure~\ref{straight}}{}.
This is a restricted feature: \texttt{DOPAL-cycl}. In \textit{OPAL-t} drifts are implicitly given, if no field is present.
......@@ -1046,7 +1045,7 @@ label:QUADRUPOLE, TYPE=string, APERTURE=real-vector,
\end{verbatim}
The reference system for a quadrupole is a Cartesian coordinate system
\ifthenelse{\boolean{ShowMap}}{see~Figure~\ref{straight}}{}. This is a restricted feature: \texttt{DOPAL-cycl}.
This is a restricted feature: \texttt{DOPAL-cycl}.
A \texttt{QUADRUPOLE} has three real attributes:
\begin{description}
......@@ -1094,8 +1093,6 @@ A \texttt{SEXTUPOLE} has three real attributes:
S:SEXTUPOLE, L=0.4, K2=0.00134;
\end{verbatim}
The reference system for a sextupole is a Cartesian coordinate system
\ifthenelse{\boolean{ShowMap}}{see~Figure~\ref{straight}}{}.
\section{Octupole}
\label{sec:octupole}
......@@ -1122,7 +1119,6 @@ An \texttt{OCTUPOLE} has three real attributes:
O3:OCTUPOLE, L=0.3, K3=0.543;
\end{verbatim}
The reference system for an octupole is a Cartesian coordinate system
\ifthenelse{\boolean{ShowMap}}{see~Figure~\ref{straight}}{}.
\clearpage
\section{General Multipole}
......@@ -1152,7 +1148,6 @@ The number of poles of each component is ($2 n + 2$).
Superposition of many multipole components is permitted.
The reference system for a multipole is a Cartesian coordinate system
\ifthenelse{\boolean{ShowMap}}{see~Figure~\ref{straight}}{}.
\noindent The following example is equivalent to the quadruple example in Section~\ref{quadrupole}.
\begin{verbatim}
......@@ -1227,7 +1222,7 @@ A \texttt{SOLENOID} has two real attributes:
the solenoid field points in the direction of increasing $s$.
\end{description}
The reference system for a solenoid is a Cartesian coordinate system
\ifthenelse{\boolean{ShowMap}}{see~Figure~\ref{straight}}{}. Using a solenoid in \textit{OPAL-t} mode, the following additional parameters are defined:
Using a solenoid in \textit{OPAL-t} mode, the following additional parameters are defined:
\begin{description}
\item[FMAPFN]
Field maps must be specified.
......@@ -1745,7 +1740,6 @@ This is a restricted feature: \texttt{DOPAL-cycl}.
%G1:GUN, L=6.0E-3, TEMISSION= 36E-12, EMISSIONSLICES=360;
%\end{verbatim}
%The reference system for a gun is a Cartesian coordinate system
%\ifthenelse{\boolean{ShowMap}}{ \seeref{straight}}{}.
\clearpage
......@@ -1793,8 +1787,6 @@ If the length is not zero, the aperture is also checked at the exit.
COLLIM:ECOLLIMATOR, L=0.5, XSIZE=0.01, YSIZE=0.005;
\end{verbatim}
The reference system for a collimator is a Cartesian coordinate system
\ifthenelse{\boolean{ShowMap}}{see~Figure~\ref{straight}}{}.
\subsection{\textit{OPAL-t} mode}
The \texttt{CCOLLIMATOR} isn't supported. \texttt{ECOLLIMATOR}s and \texttt{RCOLLIMATOR}s detect all particles which are outside the aperture defined by
......
......@@ -4,9 +4,6 @@
\label{chp:fieldsolver}
\index{Field Solver|(}
\ifthenelse{\boolean{ShowDebug}}{
\TODO{AA will rewrite}
}{}
Space charge effects are included in the simulation by specifying a field solver described in this chapter and attaching it to the
track command as described in \chpref{track}.
By default, the code does not assume any symmetry i.e. full 3D. In the near future it is planed to implement also a slice (2D) model.
......
......@@ -35,8 +35,8 @@
\index{TRACK}
\index{ENDTRACK}
Before starting to track, a beam line see~Section~\ref{line} \ifthenelse{\boolean{ShowMap}}{or
sequence see~Section~\ref{sequence}}{} and a beam see~Chapter~\ref{beam} must be selected.
Before starting to track, a beam line see~Section~\ref{line}
and a beam see~Chapter~\ref{beam} must be selected.
The time step (\texttt{DT}) and the maximal steps to track (\texttt{MAXSTEPS}) or \texttt{ZSTOP} should be set. This command causes \textit{OPAL} to enter "tracking mode",
in which it accepts only the track commands see~Table~\ref{trackcmd}. In order to preform several tracks, specify arrays of parameter
in \texttt{DT}, \texttt{MAXSTEPS} and \texttt{ZSTOP}. This can be used to change the time step manually.
......@@ -46,7 +46,7 @@ The attributes of the command are:
\begin{description}
\item[LINE]
The label of a preceding \texttt{LINE} see~Section~\ref{line}
\ifthenelse{\boolean{ShowMap}}{ or \texttt{SEQUENCE} see~Section~\ref{sequence}}{} (no default).
(no default).
\item[BEAM]
\sloppy The named \texttt{BEAM} command defines the particle mass, charge
and reference momentum (default: \texttt{UNNAMED\_BEAM}).
......@@ -117,13 +117,6 @@ How large \texttt{MTSSUBSTEPS} can be chosen of course depends on the importance
\end{description}
\ifthenelse{\boolean{ShowMap}}{
In \textit{OPAL-t} and \textit{OPAL-map}, the command format is:
\begin{verbatim}
TRACK, LINE=name, BEAM=name, MAXSTEPS=value, DT=value;
\end{verbatim}
}{}
In \textit{OPAL-cycl}, instead of setting time step, the time steps per-turn should be set.
The command format is:
\begin{verbatim}
......@@ -217,11 +210,6 @@ Its attributes are:
The name (a string, see Section~\ref{astring}) of the tracking method to be used.
For the time being the following methods are known:
\begin{description}
\ifthenelse{\boolean{ShowMap}}{
\item[THIN]
All elements are treated a s thin lenses.
This is the fastest of the known method which do not lump elements.
}{}
\item[PARALLEL-T]
This method puts \textit{OPAL} in \textit{OPAL-t} mode see~Chapter~\ref{opalt}.
\item[CYCLOTRON-T]
......
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