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

Fixed bug in ptc_twiss that did not add deltap to the user orbit #751

Merged
merged 2 commits into from Mar 28, 2019
Merged

Fixed bug in ptc_twiss that did not add deltap to the user orbit #751

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e789a2b
Fixed bug in ptc_twiss that did not add deltap to the user orbit, but…
piotrskowronski Mar 28, 2019
54d18f4
Merge remote-tracking branch 'upstream/master'
piotrskowronski Mar 28, 2019
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
4 changes: 2 additions & 2 deletions src/madx_ptc_twiss.f90
View file
Open in desktop
Expand Up @@ -716,14 +716,14 @@ subroutine ptc_twiss(tab_name,summary_tab_name)
orbit(3)=get_value('ptc_twiss ','y ')
orbit(4)=get_value('ptc_twiss ','py ')
orbit(6)=-get_value('ptc_twiss ','t ') ! swap of t sign
orbit(5)=orbit(5)+get_value('ptc_twiss ','pt ')
orbit(5)=get_value('ptc_twiss ','pt ')

if(mytime) then
call Convert_dp_to_dt (deltap, dt)
else
dt=deltap
endif
if(icase.eq.5 .or. icase.eq.56) orbit(5)=dt
if(icase.eq.5 .or. icase.eq.56) orbit(5) = dt + orbit(5)

closed_orbit = get_value('ptc_twiss ','closed_orbit ') .ne. 0

Expand Down