Skip to content

Commit f3764bc

Browse files
authored
Merge pull request #951 from tpersson/versionNumbers2020sep
Update version numbers
2 parents cbd669b + 669ee24 commit f3764bc

File tree

10 files changed

+13046
-13713
lines changed

10 files changed

+13046
-13713
lines changed

VERSION

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
VERSION = 5.06.00
2-
VERSION_NUM = 50600
3-
VERSION_DATE = 2020.08.13
1+
VERSION = 5.06.01
2+
VERSION_NUM = 50601
3+
VERSION_DATE = 2020.09.01

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.06.00 \\
21+
Version 5.06.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.06.00} % update coverpage.tex too
47+
\markversion{5.06.01} % update coverpage.tex too
4848

4949
%\usepackage{comment}
5050

src/trrun.f90

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -961,6 +961,9 @@ subroutine ttmap(switch,code,el,track,ktrack,dxt,dyt,sum,turn,part_id, &
961961
case (code_rfmultipole)
962962
call ttrfmult(track,ktrack,turn)
963963

964+
case(code_changerefp0)
965+
call ttchangep0(track,ktrack)
966+
964967
case (code_hmonitor:code_rcollimator, code_instrument, &
965968
code_slmonitor:code_imonitor, code_placeholder, code_collimator)
966969
if(el .gt. 0) call ttdrf(el,track,ktrack)
@@ -1801,7 +1804,6 @@ subroutine ttchangep0(track,ktrack)
18011804

18021805
pc0 = get_value('beam ','pc ')
18031806
bet0 = get_value('beam ','beta ')
1804-
18051807
do i =1, ktrack
18061808
px_ = track(1,i)
18071809
py_ = track(3,i)

testing/updateTests.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
#copyfile(src, dst)
3333
mypath = '../tests/'
3434

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

0 commit comments

Comments
 (0)