diff --git a/VERSION b/VERSION index a96f1e4b9..3fcb04268 100644 --- a/VERSION +++ b/VERSION @@ -1,3 +1,3 @@ VERSION = 5.07.00 VERSION_NUM = 50700 -VERSION_DATE = 2021.05.02 +VERSION_DATE = 2021.05.03 diff --git a/doc/latexuguide/error.tex b/doc/latexuguide/error.tex index 189bada66..6d703fd67 100644 --- a/doc/latexuguide/error.tex +++ b/doc/latexuguide/error.tex @@ -101,7 +101,16 @@ \subsection{Permanent Misalignments} In case EALIGN and permanent misalignment are used togheter the values are added togheter component by component. The effect of the permanent misalignment is ignored by SURVEY by default but by adding the \text{PERM\_ALIGN\_SURVEY} the -start and end location of each element is given. +start and end location of each element is given. The permanent misalignemnt need to +be defined in the creation of the sequence. An example is given below: +\begin{verbatim} +a=0.06; +q1:quadrupole, l=1, k1=0.01; +myseq: sequence, l=10; +q1, at=5, dtheta=0.1, dphi=0.2, dpsi=0.3, dx=0.04, dy=0.05, ds:=a; +endsequence; +\end{verbatim} +It is also possible to defined the permanet misalignments using defered expresions. %% \begin{figure}[ht] %% \centering %% \setlength{\unitlength}{1pt} diff --git a/doc/latexuguide/survey.tex b/doc/latexuguide/survey.tex index 289692890..d3b4c24cd 100644 --- a/doc/latexuguide/survey.tex +++ b/doc/latexuguide/survey.tex @@ -16,7 +16,7 @@ \chapter{SURVEY} can be specified. \madbox{ -SURVEY, \=SEQUENCE=string, FILE= string, \\ +SURVEY, \=SEQUENCE=string, FILE= string, PERM\_ALIGN\_SURVEY= logical\\ \>X0=real, Y0=real, Z0=real, \\ \>THETA0=real, PHI0=real, PSI0=real;} @@ -26,6 +26,9 @@ \chapter{SURVEY} last sequence expanded with the \texttt{USE} command will be surveyed. \ttitem{FILE} the name of external file to which the results are written.\\ (Default:~survey) + \ttitem{PERM\_ALIGN\_SURVEY} If TRUE the output includes the permanent misalignments + and the start of each element ends with a .ENT and the exit of each element with .EXI. + \\ (Default:~FALSE) \ttitem{X0, Y0, Z0} the initial horizontal, vertical and longitudinal coordinates in meters.\\ (Default: 0.0, 0.0, 0.0) \ttitem{THETA0, PHI0, PSI0} the initial horizontal and vertical angles