Merge pull request #781 from tpersson/fixMakeThinAndUpdateVersion

Fixes new makethin and updates versino number
MethodicalAcceleratorDesign · Jun 7, 2019 · b15430a · b15430a
2 parents 85dea91 + a4daac1
commit b15430a
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 6 deletions.
diff --git a/VERSION b/VERSION
@@ -1,3 +1,3 @@
-VERSION      = 5.05.00
-VERSION_NUM  = 50500
-VERSION_DATE = 2019.05.10
+VERSION      = 5.05.01
+VERSION_NUM  = 50501
+VERSION_DATE = 2019.06.07
diff --git a/doc/latexuguide/coverpage.tex b/doc/latexuguide/coverpage.tex
@@ -18,7 +18,7 @@
 \begin{center}\LARGE                 % document title
 \textbf{The MAD-X Program} \\
 (Methodical Accelerator Design) \\
-Version 5.05.00 \\
+Version 5.05.01 \\
 \textbf{User's Reference Manual}
 \end{center}
 \vskip 1.5em

diff --git a/doc/latexuguide/uguide.tex b/doc/latexuguide/uguide.tex
@@ -44,7 +44,7 @@
 %\addeditor{IT}
 
 \usepackage{versions}
-\markversion{5.05.00} % update coverpage.tex too
+\markversion{5.05.01} % update coverpage.tex too
 
 %\usepackage{comment}
 

diff --git a/src/mad_mkthin.cpp b/src/mad_mkthin.cpp
@@ -1636,7 +1636,7 @@ void SeqElList::kn_ks_from_thick_elem(const element* thick_elem,command_paramete
   }
   const struct command_parameter* p;
   const std::vector<std::string> kn_name={"k0", "k1", "k2", "k3"};
-  const std::vector<std::string> ks_name={"k0s","k1s","k2s","k3"};
+  const std::vector<std::string> ks_name={"k0s","k1s","k2s","k3s"};
   for(unsigned int i=0;i<kn_name.size();++i) kn_pars[i] = (p=return_param_recurse(kn_name[i].c_str() ,thick_elem)) ? clone_command_parameter(p) : nullptr;
   for(unsigned int i=0;i<ks_name.size();++i) ks_pars[i] = (p=return_param_recurse(ks_name[i].c_str() ,thick_elem)) ? clone_command_parameter(p) : nullptr;
 }