tthin@tquad.f tquads@tquads.f, tstrad@tstrad.f
tthine@tthine.f tturne1@tturne.f
trad@trad.f tquads@tquads.f
ttstat@ttstat.f tracka@tracka.f
用のパッチ
自信が無いのでだれか査読して！
----PATCH----
Index: src/tquad.f
===================================================================
--- src/tquad.f (revision 363)
+++ src/tquad.f (working copy)
@@ -7,8 +7,8 @@
integer*4 ndiv,np,l
real*8 x(np),px(np),y(np),py(np),z(np),dv(np),g(np),pz(np)
if(al .le. 0.d0)then
- call tthin(np,x,px,y,py,z,g,dv,pz,
- 1 4,l,0.d0,ak,dx,dy,theta,cost,sint, 1.d0,.false.)
+ call tthin(np,x,px,y,py,z,g,dv,pz,4,l,0.d0,ak,
+ $ dx,dy,theta,cost,sint, 1.d0,.false.)
return
elseif(ak .eq. 0.d0)then
call tdrift(np,x,px,y,py,z,g,dv,pz,al,
Index: src/tturne.f
===================================================================
--- src/tturne.f (revision 376)
+++ src/tturne.f (working copy)
@@ -274,7 +274,7 @@
$ rlist(lp+13),rlist(lp+14) .eq. 0.d0,ld)
go to 1010
1600 call tthine(trans,cod,beam,beamr,lele,al,rlist(lp+2),
- 1 rlist(lp+5),rlist(lp+6),rlist(lp+4),ld)
+ 1 rlist(lp+5),rlist(lp+6),rlist(lp+4),.false.,ld)
go to 1010
3000 call tsole(trans,cod,beam,beamr,latt,l,ke,sol,
1 twiss,size,gammab,iatr,iacod,iabmi,ndim,plot)
Index: src/tracka.f
===================================================================
--- src/tracka.f (revision 363)
+++ src/tracka.f (working copy)
@@ -35,8 +35,8 @@
if(trpt)then
call ttinit(latt,x,px,y,py,z,g,dv,pz)
call ttstat(np0,x,px,y,py,z,g,dv,pz,
- 1 'Entrance',sa,ss,es,.true.,
- 1 outfl)
+ 1 'Entrance',sa,ss,es,
+ $ .false.,.true.,outfl)
else
call tinip(np,x,px,y,py,z,g,dv,pz,emx,emz,codin,cmplot)
endif
@@ -210,7 +210,8 @@
enddo
1010 if(trpt .and. outfl .gt. 0)then
call ttstat(np,x,px,y,py,z,g,dv,pz,
- 1 'Exit',sa,ss,es,.true.,outfl)
+ 1 'Exit',sa,ss,es,
+ $ .false.,.true.,outfl)
else
lfnplt=nint(rgetgl1('PHSPLOTS'))
if(lfnplt .gt. 0)then
Index: src/tquads.f
===================================================================
--- src/tquads.f (revision 363)
+++ src/tquads.f (working copy)
@@ -20,8 +20,8 @@
ilist(2,ifv+1)=italoc(2)-2
endif
if(al .le. 0.d0)then
- call tthin(np,x,px,y,py,z,g,dv,pz,
- 1 4,0.d0,ak,dx,dy,theta,cost,sint, 1.d0,.false.)
+ call tthin(np,x,px,y,py,z,g,dv,pz,4,ld,0.d0,ak,
+ $ dx,dy,theta,cost,sint, 1.d0,.false.)
return
endif
enarad=rad .and. radlvl .ne. 1.d0
@@ -66,7 +66,7 @@
if(enarad)then
b1=brho*ak/al
call trad(np,x,px,y,py,g,dv,0.d0,
- 1 b1,0.d0,.5d0*al,1.d0)
+ 1 b1,0.d0,0.d0,.5d0*al, 1.d0)
endif
if(ifv .eq. 0)then
call tsolqu(np,x,px,y,py,z,g,dv,pz,al,ak,bz,0.d0,0.d0,eps0)
@@ -124,8 +124,7 @@
endif
if(enarad)then
call trad(np,x,px,y,py,g,dv,0.d0,
- 1 b1,0.d0,
- 1 .5d0*al,-1.d0)
+ 1 b1,0.d0,0.d0,.5d0*al,-1.d0)
endif
if(mfring .eq. 2 .or. mfring .eq. 3)then
do 2120 i=1,np
Index: src/tstrad.f
===================================================================
--- src/tstrad.f (revision 363)
+++ src/tstrad.f (working copy)
@@ -12,7 +12,7 @@
1 cosp1,sinp1,cosp2,sinp2
if(al .le. 0.d0)then
call tthin(np,x,px,y,py,z,g,dv,pz,2,l,al,-phib,
- 1 dx,dy,theta,cost,sint,.false.)
+ 1 dx,dy,theta,cost,sint,1.d0,.false.)
return
elseif(phib .eq. 0.d0)then
call tdrift(np,x,px,y,py,z,g,dv,pz,al,0.d0,0.d0,0.d0)
----PATCH----