Skip to content

Commit

Permalink
Merge pull request #951 from tpersson/versionNumbers2020sep
Browse files Browse the repository at this point in the history
Update version numbers
  • Loading branch information
tpersson authored Sep 1, 2020
2 parents cbd669b + 669ee24 commit f3764bc
Show file tree
Hide file tree
Showing 10 changed files with 13,046 additions and 13,713 deletions.
6 changes: 3 additions & 3 deletions VERSION
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
VERSION = 5.06.00
VERSION_NUM = 50600
VERSION_DATE = 2020.08.13
VERSION = 5.06.01
VERSION_NUM = 50601
VERSION_DATE = 2020.09.01
2 changes: 1 addition & 1 deletion doc/latexuguide/coverpage.tex
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
\begin{center}\LARGE % document title
\textbf{The MAD-X Program} \\
(Methodical Accelerator Design) \\
Version 5.06.00 \\
Version 5.06.01 \\
\textbf{User's Reference Manual}
\end{center}
\vskip 1.5em
Expand Down
2 changes: 1 addition & 1 deletion doc/latexuguide/uguide.tex
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@
%\addeditor{IT}

\usepackage{versions}
\markversion{5.06.00} % update coverpage.tex too
\markversion{5.06.01} % update coverpage.tex too

%\usepackage{comment}

Expand Down
4 changes: 3 additions & 1 deletion src/trrun.f90
Original file line number Diff line number Diff line change
Expand Up @@ -961,6 +961,9 @@ subroutine ttmap(switch,code,el,track,ktrack,dxt,dyt,sum,turn,part_id, &
case (code_rfmultipole)
call ttrfmult(track,ktrack,turn)

case(code_changerefp0)
call ttchangep0(track,ktrack)

case (code_hmonitor:code_rcollimator, code_instrument, &
code_slmonitor:code_imonitor, code_placeholder, code_collimator)
if(el .gt. 0) call ttdrf(el,track,ktrack)
Expand Down Expand Up @@ -1801,7 +1804,6 @@ subroutine ttchangep0(track,ktrack)

pc0 = get_value('beam ','pc ')
bet0 = get_value('beam ','beta ')

do i =1, ktrack
px_ = track(1,i)
py_ = track(3,i)
Expand Down
2 changes: 1 addition & 1 deletion testing/updateTests.py
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
#copyfile(src, dst)
mypath = '../tests/'

mypath = mypath +"test-emit/"
mypath = mypath +"test-ptc-twiss-old6"
print(mypath)
os.chdir(mypath)
onlyfiles = [f for f in listdir(".") if isfile(join(".", f))]
Expand Down
Loading

0 comments on commit f3764bc

Please sign in to comment.