Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fixes new makethin and updates versino number #781

Merged
merged 1 commit into from Jun 7, 2019
Merged

Fixes new makethin and updates versino number #781

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
6 changes: 3 additions & 3 deletions VERSION
View file
Open in desktop
@@ -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
2 changes: 1 addition & 1 deletion doc/latexuguide/coverpage.tex
View file
Open in desktop
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion doc/latexuguide/uguide.tex
View file
Open in desktop
Expand Up @@ -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}

Expand Down
2 changes: 1 addition & 1 deletion src/mad_mkthin.cpp
View file
Open in desktop
Expand Up @@ -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;
}
Expand Down