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

Implements the exact translation in TWISS and TRACK #1136

Merged
merged 7 commits into from
Sep 5, 2022
Merged

Implements the exact translation in TWISS and TRACK #1136

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
edef543
Works fine.
tpersson Aug 30, 2022
a8e4125
Updated and aligned the tests.
tpersson Aug 30, 2022
4ec1361
Change in the roation test by accident.
tpersson Aug 30, 2022
2dfcf8a
Had to reduce the requirement to pass the tests on Mac.
tpersson Aug 30, 2022
d66d32a
Some lines still not good for Mac.
tpersson Aug 30, 2022
756bc26
Merge branch 'master' into translation_fix_2022September
rdemaria Sep 3, 2022
08a950d
Update test-ptc-twiss-6D-spin.cfg
rdemaria Sep 3, 2022
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
2 changes: 1 addition & 1 deletion Makefile_test
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ test-track-acd test-track-rotations test-beambeam-npart \
test-twiss test-twiss-2 test-twiss-3 test-twiss-4 test-twiss-5 \
test-twiss-6 test-twiss-8 test-twiss-9 test-twiss-10 test-twiss-11 \
test-twiss-12 test-twiss-13 test-twiss-14 test-twiss-15 test-twiss-16 test-twiss-17 \
test-twiss-exact test-translation test-crabcavity \
test-twiss-exact test-translation test-translation-2 test-crabcavity \
test-xrotation test-yrotation test-rotations test-rotations-2 test-interpolate test-rf-fringe \
test-cororbit test-cororbit-2 test-cororbit-3 test-cororbit-4 \
test-emit test-emit-2 \
Expand Down
11 changes: 7 additions & 4 deletions src/trrun.f90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3557,6 +3557,7 @@ end subroutine trsol

subroutine tttrans(track,ktrack)
use trackfi, only : beti
use math_constfi, only : one, two
implicit none
!----------------------------------------------------------------------*
! Purpose: *
Expand All @@ -3569,7 +3570,7 @@ subroutine tttrans(track,ktrack)
integer :: ktrack

integer :: i
double precision :: t_x, t_y, t_z
double precision :: t_x, t_y, t_z, pz
double precision :: node_value


Expand All @@ -3583,16 +3584,18 @@ subroutine tttrans(track,ktrack)
!$OMP PARALLEL PRIVATE(i)
!$OMP DO
do i = 1, ktrack
pz = sqrt(one + two*track(6,i)*beti + track(6,i)**2 - track(2,i)**2 - track(4,i)**2)
! Add vector to particle coordinates
track(1,i) = track(1,i) - t_x
track(3,i) = track(3,i) - t_y
track(5,i) = track(5,i) - t_z*beti
track(1,i) = track(1,i) - t_x + t_z*track(2,i)/pz
track(3,i) = track(3,i) - t_y + t_z*track(4,i)/pz
track(5,i) = track(5,i) - t_z*(beti+track(6,i))/pz
enddo

!$OMP END DO
!$OMP END PARALLEL
end subroutine tttrans


subroutine tttrak(ek,re,track,ktrack)
implicit none
!----------------------------------------------------------------------*
Expand Down
83 changes: 71 additions & 12 deletions src/twiss.f90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7025,10 +7025,12 @@ end SUBROUTINE tmsol0
SUBROUTINE tmtrans(fsec,ftrk,orbit,fmap,ek,re,te)
use twisslfi
use twissbeamfi, only : beta
use math_constfi, only : zero, one, two
use matrices, only : EYE
implicit none
!----------------------------------------------------------------------*
! Purpose: *
! TRANSPORT map for translation. *
! TRANSPORT map for translation. *
! Treated in a purely linear way. *
! Input: *
! ftrk (logical) if true, track orbit. *
Expand All @@ -7043,24 +7045,81 @@ SUBROUTINE tmtrans(fsec,ftrk,orbit,fmap,ek,re,te)
logical :: ftrk, fmap,fsec
double precision :: orbit(6);

double precision :: x, y, z
double precision :: dx, dy, dz, pz, csq, csq32, csq52, beta_pt
double precision :: node_value, ek(6), re(6,6), te(6,6,6)
double precision :: x, px, y, py, t, pt

RE=EYE
!---- Get translation parameters
dx = node_value('dx ')
dy = node_value('dy ')
dz = node_value('ds ')

x = orbit(1)
px = orbit(2)
y = orbit(3)
py = orbit(4)
t = orbit(5)
pt = orbit(6)

!---- Get translation parameters
x = node_value('dx ')
y = node_value('dy ')
z = node_value('ds ')

ek(1) = ek(1) - x
ek(3) = ek(3) - y
ek(5) = ek(5) - z/beta
fmap = .True.
csq = one + two*pt/beta + pt**2 - px**2 - py**2
pz = sqrt(csq)
csq32 = csq**(3d0/2d0)
csq52 = two*csq**(5d0/2d0)
beta_pt = pt + 1d0/beta

!---- Track orbit.
if (ftrk) call tmtrak(ek,re,te,orbit,orbit)
if(ftrk) then
orbit(1) = orbit(1) - dx + dz*px/pz
orbit(3) = orbit(3) - dy + dz*py/pz
orbit(5) = orbit(5) - dz*(beta_pt)/pz
endif


re(1,2) = dz/pz + dz*px**2/csq32
re(1,4) = dz*px*py/csq32
re(1,6) = -dz*px*(beta_pt)/csq32
re(3,2) = dz*px*py/csq32
re(3,4) = dz/pz + dz*py**2/csq32
re(3,6) = -dz*py*(beta_pt)/csq32
re(5,2) = -dz*px*(beta_pt)/csq32
re(5,4) = -dz*py*(beta_pt)/csq32
re(5,6) = -dz/pz + dz*beta_pt**2/csq32

if (fsec) then
te = zero
te(1,2,2) = 3d0*dz*px/(2d0*csq32) + 3d0*dz*px**3/(csq52)
te(1,2,4) = dz*py/(2d0*csq32) + 3d0*dz*px**2*py/(csq52)
te(1,2,6) = -dz*(beta_pt)/(2d0*csq32) - dz*px**2*3d0*(beta_pt)/(csq52)
te(1,4,2) = te(1,2,4)
te(1,4,4) = dz*px/(2d0*csq32) + 3d0*dz*px*py**2/(csq52)
te(1,4,6) = -3d0*dz*px*py*(beta_pt)/(csq52)
te(1,6,2) = te(1,2,6)
te(1,6,4) = te(1,4,6)
te(1,6,6) = -dz*px/(2d0*csq32) - dz*px*3d0*(-beta_pt)*(beta_pt)/(csq52)
te(3,2,2) = dz*py/(2d0*csq32) + 3d0*dz*px**2*py/(csq52)
te(3,2,4) = dz*px/(2d0*csq32) + 3d0*dz*px*py**2/(csq52)
te(3,2,6) = -3d0*dz*px*py*(beta_pt)/(csq52)
te(3,4,2) = te(3,2,4)
te(3,4,4) = 3d0*dz*py/(2d0*csq32) + 3d0*dz*py**3/(csq52)
te(3,4,6) = -dz*(beta_pt)/(2d0*csq32) - dz*py**2*3d0*(beta_pt)/(csq52)
te(3,6,2) = te(3,2,6)
te(3,6,4) = te(3,4,6)
te(3,6,6) = -dz*py/(2d0*csq32) + dz*py*3d0*beta_pt**2/(csq52)
te(5,2,2) = -dz*(beta_pt)/(2d0*csq32) - 3d0*dz*px**2*(beta_pt)/(csq52)
te(5,2,4) = -3d0*dz*px*py*(beta_pt)/(csq52)
te(5,2,6) = -dz*px/(2d0*csq32) + dz*px*3d0*beta_pt**2/(csq52)
te(5,4,2) = te(5,2,4)
te(5,4,4) = -dz*(beta_pt)/(2d0*csq32) - 3d0*dz*py**2*(beta_pt)/(csq52)
te(5,4,6) = -dz*py/(2d0*csq32) + dz*py*3d0*beta_pt**2/(csq52)
te(5,6,2) = te(5,2,6)
te(5,6,4) = te(5,4,6)
te(5,6,6) = dz*(beta_pt)/csq32 + dz*(beta_pt)/(2d0*csq32) - dz*3d0*beta_pt**3/(csq52)
endif

end SUBROUTINE tmtrans


SUBROUTINE tmsrot(ftrk,orbit,fmap,ek,re,te)
use twisslfi
use math_constfi, only : zero
Expand Down
4 changes: 2 additions & 2 deletions tests/test-ptc-twiss-6D-spin/test-ptc-twiss-6D-spin.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
1-7 * skip # head
* * any abs=3e-10 rel=6e-12
57 * abs=3e-12 # machine length
18400-18500 * any abs=1e-9 rel=1e-9 # Mac not giving good values here..
* * any abs=3e-10 rel=2e-10
3 changes: 3 additions & 0 deletions tests/test-translation-2/test-translation-2.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
1-8 * skip # head
* * abs=1e-12

179 changes: 179 additions & 0 deletions tests/test-translation-2/test-translation-2.madx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,179 @@
option, -echo;
set, format="10d", "25.17e", "-24s";

x0 = 0.01;
y0 = 0.01;
px0 = 0.013;
py0 = 0.017;
pt0 = 0.021;
an = 0.1;
prx: xrotation, angle=an;
pry: yrotation, angle=an;
tr_str = 1.5 ;
pry: TRANSLATION, DX:=0.01*tr_str, DY:=0.002*tr_str, DS:=0.02*tr_str, exact=1;

ly: line=(pry);

beam, energy=2, particle=proton;

select, flag=twi2, column=name,x,px,y,py,t,pt,
re11,re12,re13,re14,re15,re16,
re21,re22,re23,re24,re25,re26,
re31,re32,re33,re34,re35,re36,
re41,re42,re43,re44,re45,re46,
re51,re52,re53,re54,re55,re56,
re61,re62,re63,re64,re65,re66;
select, flag=twi3, column=name,
t112,t114,t116,t122,t124,t126,t132,t134,t136,t144,t146,t166,
t222,t224,t226,t244,t246,t266,
t312,t314,t316,t322,t324,t326,t332,t334,t336,t344,t346,t366,
t422,t424,t426,t444,t446,t466,
t512,t514,t516,t522,t524,t526,t532,t534,t536,t544,t546,t566;
select, flag=ptc2, column=name,x,px,y,py,t,pt,
re11,re12,re13,re14,re15,re16,
re21,re22,re23,re24,re25,re26,
re31,re32,re33,re34,re35,re36,
re41,re42,re43,re44,re45,re46,
re51,re52,re53,re54,re55,re56,
re61,re62,re63,re64,re65,re66;
create, table=ptc3, column=_name,
txxp,txxq,txxd,txpp,txpq,txpd,txyp,txyq,txyd,txqq,txqd,txdd,
tppp,tppq,tppd,tpqq,tpqd,tpdd,
tyxp,tyxq,tyxd,typp,typq,typd,tyyp,tyyq,tyyd,tyqq,tyqd,tydd,
tqpp,tqpq,tqpd,tqqq,tqqd,tqdd,
ttxp,ttxq,ttxd,ttpp,ttpq,ttpd,ttyp,ttyq,ttyd,ttqq,ttqd,ttdd;
ptc_select, table=ptc3, column=txxp, polynomial=1, monomial='110000';
ptc_select, table=ptc3, column=txxq, polynomial=1, monomial='100100';
ptc_select, table=ptc3, column=txxd, polynomial=1, monomial='100001';
ptc_select, table=ptc3, column=txpp, polynomial=1, monomial='020000';
ptc_select, table=ptc3, column=txpq, polynomial=1, monomial='010100';
ptc_select, table=ptc3, column=txpd, polynomial=1, monomial='010001';
ptc_select, table=ptc3, column=txyp, polynomial=1, monomial='011000';
ptc_select, table=ptc3, column=txyq, polynomial=1, monomial='001100';
ptc_select, table=ptc3, column=txyd, polynomial=1, monomial='001001';
ptc_select, table=ptc3, column=txqq, polynomial=1, monomial='000200';
ptc_select, table=ptc3, column=txqd, polynomial=1, monomial='000101';
ptc_select, table=ptc3, column=txdd, polynomial=1, monomial='000002';
ptc_select, table=ptc3, column=tppp, polynomial=2, monomial='020000';
ptc_select, table=ptc3, column=tppq, polynomial=2, monomial='010100';
ptc_select, table=ptc3, column=tppd, polynomial=2, monomial='010001';
ptc_select, table=ptc3, column=tpqq, polynomial=2, monomial='000200';
ptc_select, table=ptc3, column=tpqd, polynomial=2, monomial='000101';
ptc_select, table=ptc3, column=tpdd, polynomial=2, monomial='000002';
ptc_select, table=ptc3, column=tyxp, polynomial=3, monomial='110000';
ptc_select, table=ptc3, column=tyxq, polynomial=3, monomial='100100';
ptc_select, table=ptc3, column=tyxd, polynomial=3, monomial='100001';
ptc_select, table=ptc3, column=typp, polynomial=3, monomial='020000';
ptc_select, table=ptc3, column=typq, polynomial=3, monomial='010100';
ptc_select, table=ptc3, column=typd, polynomial=3, monomial='010001';
ptc_select, table=ptc3, column=tyyp, polynomial=3, monomial='011000';
ptc_select, table=ptc3, column=tyyq, polynomial=3, monomial='001100';
ptc_select, table=ptc3, column=tyyd, polynomial=3, monomial='001001';
ptc_select, table=ptc3, column=tyqq, polynomial=3, monomial='000200';
ptc_select, table=ptc3, column=tyqd, polynomial=3, monomial='000101';
ptc_select, table=ptc3, column=tydd, polynomial=3, monomial='000002';
ptc_select, table=ptc3, column=tqpp, polynomial=4, monomial='020000';
ptc_select, table=ptc3, column=tqpq, polynomial=4, monomial='010100';
ptc_select, table=ptc3, column=tqpd, polynomial=4, monomial='010001';
ptc_select, table=ptc3, column=tqqq, polynomial=4, monomial='000200';
ptc_select, table=ptc3, column=tqqd, polynomial=4, monomial='000101';
ptc_select, table=ptc3, column=tqdd, polynomial=4, monomial='000002';
ptc_select, table=ptc3, column=ttxp, polynomial=5, monomial='110000';
ptc_select, table=ptc3, column=ttxq, polynomial=5, monomial='100100';
ptc_select, table=ptc3, column=ttxd, polynomial=5, monomial='100001';
ptc_select, table=ptc3, column=ttpp, polynomial=5, monomial='020000';
ptc_select, table=ptc3, column=ttpq, polynomial=5, monomial='010100';
ptc_select, table=ptc3, column=ttpd, polynomial=5, monomial='010001';
ptc_select, table=ptc3, column=ttyp, polynomial=5, monomial='011000';
ptc_select, table=ptc3, column=ttyq, polynomial=5, monomial='001100';
ptc_select, table=ptc3, column=ttyd, polynomial=5, monomial='001001';
ptc_select, table=ptc3, column=ttqq, polynomial=5, monomial='000200';
ptc_select, table=ptc3, column=ttqd, polynomial=5, monomial='000101';
ptc_select, table=ptc3, column=ttdd, polynomial=5, monomial='000002';

use, sequence=ly;

track, onepass, onetable, file='yrot-tra1.tfs';
start, x=x0, px=px0, py=py0, pt=pt0;
observe, place=pry;
run, turns=1;
endtrack;
twiss, exact, x=x0, px=px0, py=py0, pt=pt0, betx=1, bety=1, rmatrix, table=twi2, file='yrot-twi2.tfs',
sectormap, sectortable=twi3, sectorfile='yrot-twi3.tfs';

ptc_create_universe;
ptc_create_layout, exact, model=2, method=6, nst=5;
ptc_twiss, x=x0, px=px0, py=py0, pt=pt0, betx=1, bety=1, betz=1, rmatrix, icase=56, no=5, table=ptc2, file='yrot-ptc2.tfs';
ptc_end;

write, table=ptc3, file='yrot-ptc3.tfs';

value, table(trackone,x,2)-table(ptc2,pry,x);
value, table(trackone,px,2)-table(ptc2,pry,px);
value, table(trackone,y,2)-table(ptc2,pry,y);
value, table(trackone,t,2)-table(ptc2,pry,t);
value, table(twi2,pry,x)-table(ptc2,pry,x);
value, table(twi2,pry,px)-table(ptc2,pry,px);
value, table(twi2,pry,y)-table(ptc2,pry,y);
value, table(twi2,pry,t)-table(ptc2,pry,t);
value, table(twi2,pry,re11)-table(ptc2,pry,re11);
value, table(twi2,pry,re12)-table(ptc2,pry,re12);
value, table(twi2,pry,re14)-table(ptc2,pry,re14);
value, table(twi2,pry,re16)-table(ptc2,pry,re16);
value, table(twi2,pry,re22)-table(ptc2,pry,re22);
value, table(twi2,pry,re24)-table(ptc2,pry,re24);
value, table(twi2,pry,re26)-table(ptc2,pry,re26);
value, table(twi2,pry,re31)-table(ptc2,pry,re31);
value, table(twi2,pry,re32)-table(ptc2,pry,re32);
value, table(twi2,pry,re34)-table(ptc2,pry,re34);
value, table(twi2,pry,re36)-table(ptc2,pry,re36);
value, table(twi2,pry,re51)-table(ptc2,pry,re51);
value, table(twi2,pry,re52)-table(ptc2,pry,re52);
value, table(twi2,pry,re54)-table(ptc2,pry,re54);
value, table(twi2,pry,re56)-table(ptc2,pry,re56);

value, 0.5*table(ptc3,pry,txxp) - table(twi3,pry,t112);
value, 0.5*table(ptc3,pry,txxq) - table(twi3,pry,t114);
value, 0.5*table(ptc3,pry,txxd) - table(twi3,pry,t116);
value, table(ptc3,pry,txpp) - table(twi3,pry,t122);
value, 0.5*table(ptc3,pry,txpq) - table(twi3,pry,t124);
value, 0.5*table(ptc3,pry,txpd) - table(twi3,pry,t126);
value, 0.5*table(ptc3,pry,txpq) - table(twi3,pry,t142);
value, table(ptc3,pry,txqq) - table(twi3,pry,t144);
value, 0.5*table(ptc3,pry,txqd) - table(twi3,pry,t146);
value, 0.5*table(ptc3,pry,txpd) - table(twi3,pry,t162);
value, 0.5*table(ptc3,pry,txqd) - table(twi3,pry,t164);
value, table(ptc3,pry,txdd) - table(twi3,pry,t166);
value, table(ptc3,pry,tppp) - table(twi3,pry,t222);
value, 0.5*table(ptc3,pry,tppq) - table(twi3,pry,t224);
value, 0.5*table(ptc3,pry,tppd) - table(twi3,pry,t226);
value, 0.5*table(ptc3,pry,tppq) - table(twi3,pry,t242);
value, table(ptc3,pry,tpqq) - table(twi3,pry,t244);
value, 0.5*table(ptc3,pry,tpqd) - table(twi3,pry,t246);
value, 0.5*table(ptc3,pry,tppd) - table(twi3,pry,t262);
value, 0.5*table(ptc3,pry,tpqd) - table(twi3,pry,t264);
value, table(ptc3,pry,tpdd) - table(twi3,pry,t266);
value, 0.5*table(ptc3,pry,tyxp) - table(twi3,pry,t312);
value, 0.5*table(ptc3,pry,tyxq) - table(twi3,pry,t314);
value, 0.5*table(ptc3,pry,tyxd) - table(twi3,pry,t316);
value, table(ptc3,pry,typp) - table(twi3,pry,t322);
value, 0.5*table(ptc3,pry,typq) - table(twi3,pry,t324);
value, 0.5*table(ptc3,pry,typd) - table(twi3,pry,t326);
value, 0.5*table(ptc3,pry,typq) - table(twi3,pry,t342);
value, table(ptc3,pry,tyqq) - table(twi3,pry,t344);
value, 0.5*table(ptc3,pry,tyqd) - table(twi3,pry,t346);
value, 0.5*table(ptc3,pry,typd) - table(twi3,pry,t362);
value, 0.5*table(ptc3,pry,tyqd) - table(twi3,pry,t364);
value, table(ptc3,pry,tydd) - table(twi3,pry,t366);
value, 0.5*table(ptc3,pry,ttxp) - table(twi3,pry,t512);
value, 0.5*table(ptc3,pry,ttxq) - table(twi3,pry,t514);
value, 0.5*table(ptc3,pry,ttxd) - table(twi3,pry,t516);
value, table(ptc3,pry,ttpp) - table(twi3,pry,t522);
value, 0.5*table(ptc3,pry,ttpq) - table(twi3,pry,t524);
value, 0.5*table(ptc3,pry,ttpd) - table(twi3,pry,t526);
value, 0.5*table(ptc3,pry,ttpq) - table(twi3,pry,t542);
value, table(ptc3,pry,ttqq) - table(twi3,pry,t544);
value, 0.5*table(ptc3,pry,ttqd) - table(twi3,pry,t546);
value, 0.5*table(ptc3,pry,ttpd) - table(twi3,pry,t562);
value, 0.5*table(ptc3,pry,ttqd) - table(twi3,pry,t564);
value, table(ptc3,pry,ttdd) - table(twi3,pry,t566);