Merge pull request #944 from tpersson/fixOfAccidentalcharInDoc

Add comment MREX and removes some attributes that are not used.

Author: madcern

doc/latexuguide/error.tex

@@ -172,20 +172,24 @@ \section{EALIGN: Alignment Errors} %EALIGN: Define Misalignments}
   right hand rule. (Default:~0~rad).  
 
   \ttitem{MREX} The horizontal read error for a monitor. This is ignored if
-  the element is not a monitor. \\
+  the element is not a monitor. Note that this is ignored by TWISS and TRACK
+  and only used by the orbit correction command.  \\
   If \texttt{MREX}$>$0 the reading for \textit{x} is too high (default: 0 m). 
 
   \ttitem{MREY} The vertical read error for a monitor. This is ignored if
-  the element is not a monitor. \\  
+  the element is not a monitor. Note that this is ignored by TWISS and TRACK
+  and only used by the orbit correction command.  \\  
   If \texttt{MREY}$>$0, the reading for \textit{y} is too high (default: 0 m). 
 
   \ttitem{MSCALX} The relative horizontal scaling error for a monitor. This
-  is ignored if the element is not a monitor. \\ 
+  is ignored if the element is not a monitor. Note that this is ignored by TWISS and TRACK
+  and only used by the orbit correction command.  \\ 
   If \texttt{MSCALX}$>$0 the reading for \textit{x} is too high (default: 0). A
   value of 0.5 implies that the actual reading is multiplied by 1.5.  
 
   \ttitem{MSCALY} The relative vertical scaling error for a monitor. This is
-  ignored if the element is not a monitor. \\  
+  ignored if the element is not a monitor. Note that this is ignored by TWISS and TRACK
+  and only used by the orbit correction command.  \\ 
   If \texttt{MSCALY}$>$0 the reading for \textit{y} is too high (default: 0). A
   value of -0.3 implies that the actual reading is multiplied by 0.7.  
 

doc/latexuguide/format.tex

@@ -1,4 +1,4 @@
-f%%\title{Command Format}
+%%\title{Command Format}
 %  Changed by: Chris ISELIN, 24-Jan-1997 
 %  Changed by: Hans Grote, 25-Sep-2002 
 %  Changed by: Ghislain ROY, 27-Jan-2014 

src/mad_dict.c

@@ -2916,13 +2916,6 @@ const char *const_element_def =
 "ramp4    = [i, 0],  "
 "betrf    = [r, 0],  "
 "pg       = [r, 0],  "
-"shunt    = [r, 0],  "
-"tfill    = [r, 0],  "
-"eloss    = [r, 0],  "
-"volterr  = [r, 0],  "
-"lagerr   = [r, 0],  "
-"nbin     = [i, 0],  "
-"binmax   = [r, 0],  "
 "magnet   = [i, 0],  "
 "slice    = [i, 1],  "
 "lfile    = [s, none, lfile],  "
@@ -2968,13 +2961,6 @@ const char *const_element_def =
 "ramp4    = [i, 0],  "
 "betrf    = [r, 0],  "
 "pg       = [r, 0],  "
-"shunt    = [r, 0],  "
-"tfill    = [r, 0],  "
-"eloss    = [r, 0],  "
-"volterr  = [r, 0],  "
-"lagerr   = [r, 0],  "
-"nbin     = [i, 0],  "
-"binmax   = [r, 0],  "
 "magnet   = [i, 0],  "
 "slice    = [i, 1],  "
 "lfile    = [s, none, lfile],  "