Skip to content

Commit b15430a

Browse files
authored
Merge pull request #781 from tpersson/fixMakeThinAndUpdateVersion
Fixes new makethin and updates versino number
2 parents 85dea91 + a4daac1 commit b15430a

File tree

4 files changed

+6
-6
lines changed

4 files changed

+6
-6
lines changed

VERSION

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
VERSION = 5.05.00
2-
VERSION_NUM = 50500
3-
VERSION_DATE = 2019.05.10
1+
VERSION = 5.05.01
2+
VERSION_NUM = 50501
3+
VERSION_DATE = 2019.06.07

doc/latexuguide/coverpage.tex

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
\begin{center}\LARGE % document title
1919
\textbf{The MAD-X Program} \\
2020
(Methodical Accelerator Design) \\
21-
Version 5.05.00 \\
21+
Version 5.05.01 \\
2222
\textbf{User's Reference Manual}
2323
\end{center}
2424
\vskip 1.5em

doc/latexuguide/uguide.tex

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@
4444
%\addeditor{IT}
4545

4646
\usepackage{versions}
47-
\markversion{5.05.00} % update coverpage.tex too
47+
\markversion{5.05.01} % update coverpage.tex too
4848

4949
%\usepackage{comment}
5050

src/mad_mkthin.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1636,7 +1636,7 @@ void SeqElList::kn_ks_from_thick_elem(const element* thick_elem,command_paramete
16361636
}
16371637
const struct command_parameter* p;
16381638
const std::vector<std::string> kn_name={"k0", "k1", "k2", "k3"};
1639-
const std::vector<std::string> ks_name={"k0s","k1s","k2s","k3"};
1639+
const std::vector<std::string> ks_name={"k0s","k1s","k2s","k3s"};
16401640
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;
16411641
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;
16421642
}

0 commit comments

Comments
 (0)