1- #include "atconstants.h"
21#include "atelem.c"
32#include "atlalib.c"
4- #include "atphyslib.c"
5- #include "driftkickrad.c" /* bndthinkickrad.c */
3+ #include "diff_bend_fringe.c"
4+ #include "diff_bnd_kick.c"
5+ #include "diff_drift.c"
66#include "quadfringe.c" /* QuadFringePassP, QuadFringePassN */
77
88struct elem
@@ -47,7 +47,8 @@ void BndMPoleSymplectic4RadPass(double *r, double le, double irho, double *A, do
4747 double * T1 , double * T2 ,
4848 double * R1 , double * R2 ,
4949 double * RApertures , double * EApertures ,
50- double * KickAngle , double scaling , double E0 , int num_particles )
50+ double * KickAngle , double scaling , double gamma , int num_particles ,
51+ double * bdiff )
5152{
5253 double SL = le /num_int_steps ;
5354 double L1 = SL * DRIFT1 ;
@@ -58,14 +59,16 @@ void BndMPoleSymplectic4RadPass(double *r, double le, double irho, double *A, do
5859 bool useLinFrEleExit = (fringeIntM0 != NULL && fringeIntP0 != NULL && FringeQuadExit == 2 );
5960 double B0 = B [0 ];
6061 double A0 = A [0 ];
62+ double rad_const = RAD_CONST * pow (gamma , 3 );
63+ double diff_const = DIF_CONST * pow (gamma , 5 );
6164
6265 if (KickAngle ) { /* Convert corrector component to polynomial coefficients */
6366 B [0 ] -= sin (KickAngle [0 ])/le ;
6467 A [0 ] += sin (KickAngle [1 ])/le ;
6568 }
6669 #pragma omp parallel for if (num_particles > OMP_PARTICLE_THRESHOLD) default(none) \
67- shared(r,num_particles,R1,T1,R2,T2,RApertures,EApertures,\
68- irho,gap,A,B,L1,L2,K1,K2,max_order,num_int_steps,E0 ,scaling,\
70+ shared(r,num_particles,R1,T1,R2,T2,RApertures,EApertures,bdiff, \
71+ irho,gap,A,B,L1,L2,K1,K2,max_order,num_int_steps,rad_const, diff_const ,scaling,\
6972 FringeBendEntrance,entrance_angle,fint1,FringeBendExit,exit_angle,fint2,\
7073 FringeQuadEntrance,useLinFrEleEntrance,FringeQuadExit,useLinFrEleExit,fringeIntM0,fringeIntP0)
7174 for (int c = 0 ; c < num_particles ; c ++ ) { /* Loop over particles */
@@ -81,7 +84,7 @@ void BndMPoleSymplectic4RadPass(double *r, double le, double irho, double *A, do
8184 if (RApertures ) checkiflostRectangularAp (r6 ,RApertures );
8285 if (EApertures ) checkiflostEllipticalAp (r6 ,EApertures );
8386 /* edge focus */
84- edge_fringe_entrance (r6 , irho , entrance_angle , fint1 , gap , FringeBendEntrance );
87+ diff_bend_fringe (r6 , irho , entrance_angle , fint1 , gap , FringeBendEntrance , 1.0 , bdiff );
8588 /* quadrupole gradient fringe entrance*/
8689 if (FringeQuadEntrance && B [1 ]!= 0 ) {
8790 if (useLinFrEleEntrance ) /*Linear fringe fields from elegant*/
@@ -91,13 +94,13 @@ void BndMPoleSymplectic4RadPass(double *r, double le, double irho, double *A, do
9194 }
9295 /* integrator */
9396 for (m = 0 ; m < num_int_steps ; m ++ ) { /* Loop over slices */
94- ATdrift6 (r6 ,L1 );
95- bndthinkickrad (r6 , A , B , K1 , irho , E0 , max_order );
96- ATdrift6 (r6 ,L2 );
97- bndthinkickrad (r6 , A , B , K2 , irho , E0 , max_order );
98- ATdrift6 (r6 ,L2 );
99- bndthinkickrad (r6 , A , B , K1 , irho , E0 , max_order );
100- ATdrift6 (r6 ,L1 );
97+ diff_drift (r6 , L1 , bdiff );
98+ diff_bnd_kick (r6 , A , B , max_order , K1 , irho , rad_const , diff_const , bdiff );
99+ diff_drift (r6 , L2 , bdiff );
100+ diff_bnd_kick (r6 , A , B , max_order , K2 , irho , rad_const , diff_const , bdiff );
101+ diff_drift (r6 , L2 , bdiff );
102+ diff_bnd_kick (r6 , A , B , max_order , K1 , irho , rad_const , diff_const , bdiff );
103+ diff_drift (r6 , L1 , bdiff );
101104 }
102105 /* quadrupole gradient fringe */
103106 if (FringeQuadExit && B [1 ]!= 0 ) {
@@ -107,7 +110,7 @@ void BndMPoleSymplectic4RadPass(double *r, double le, double irho, double *A, do
107110 QuadFringePassN (r6 , B [1 ]);
108111 }
109112 /* edge focus */
110- edge_fringe_exit (r6 , irho , exit_angle , fint2 , gap , FringeBendExit );
113+ diff_bend_fringe (r6 , irho , exit_angle , fint2 , gap , FringeBendExit , -1.0 , bdiff );
111114 /* Check physical apertures at the exit of the magnet */
112115 if (RApertures ) checkiflostRectangularAp (r6 ,RApertures );
113116 if (EApertures ) checkiflostEllipticalAp (r6 ,EApertures );
@@ -128,7 +131,9 @@ void BndMPoleSymplectic4RadPass(double *r, double le, double irho, double *A, do
128131ExportMode struct elem * trackFunction (const atElem * ElemData ,struct elem * Elem ,
129132 double * r_in , int num_particles , struct parameters * Param )
130133{
131- double irho , energy ;
134+ double irho , gamma ;
135+ double * bdiff = Param -> bdiff ;
136+
132137 if (!Elem ) {
133138 double Length , BendingAngle , EntranceAngle , ExitAngle , FullGap , Scaling ,
134139 FringeInt1 , FringeInt2 , Energy ;
@@ -193,7 +198,7 @@ ExportMode struct elem *trackFunction(const atElem *ElemData,struct elem *Elem,
193198 Elem -> KickAngle = KickAngle ;
194199 }
195200 irho = Elem -> BendingAngle /Elem -> Length ;
196- energy = atEnergy (Param -> energy , Elem -> Energy );
201+ gamma = atGamma (Param -> energy , Elem -> Energy , Param -> rest_energy );
197202
198203 BndMPoleSymplectic4RadPass (r_in , Elem -> Length , irho , Elem -> PolynomA , Elem -> PolynomB ,
199204 Elem -> MaxOrder , Elem -> NumIntSteps , Elem -> EntranceAngle , Elem -> ExitAngle ,
@@ -203,7 +208,7 @@ ExportMode struct elem *trackFunction(const atElem *ElemData,struct elem *Elem,
203208 Elem -> fringeIntM0 , Elem -> fringeIntP0 ,
204209 Elem -> T1 , Elem -> T2 , Elem -> R1 , Elem -> R2 ,
205210 Elem -> RApertures , Elem -> EApertures ,
206- Elem -> KickAngle , Elem -> Scaling , energy , num_particles );
211+ Elem -> KickAngle , Elem -> Scaling , gamma , num_particles , bdiff );
207212 return Elem ;
208213}
209214
@@ -224,6 +229,7 @@ void mexFunction(int nlhs, mxArray *plhs[], int nrhs, const mxArray *prhs[])
224229 double * PolynomA , * PolynomB , * R1 , * R2 , * T1 , * T2 , * EApertures , * RApertures , * fringeIntM0 , * fringeIntP0 , * KickAngle ;
225230 double irho ;
226231 double * r_in ;
232+ double Gamma ;
227233 const mxArray * ElemData = prhs [0 ];
228234 int num_particles = mxGetN (prhs [1 ]);
229235 if (mxGetM (prhs [1 ]) != 6 ) mexErrMsgTxt ("Second argument must be a 6 x N matrix" );
@@ -260,6 +266,7 @@ void mexFunction(int nlhs, mxArray *plhs[], int nrhs, const mxArray *prhs[])
260266
261267 /* ALLOCATE memory for the output array of the same size as the input */
262268 plhs [0 ] = mxDuplicateArray (prhs [1 ]);
269+ Gamma = atGamma (Energy , Energy , rest_energy );
263270 r_in = mxGetDoubles (plhs [0 ]);
264271
265272 BndMPoleSymplectic4RadPass (r_in , Length , irho , PolynomA , PolynomB ,
@@ -269,7 +276,7 @@ void mexFunction(int nlhs, mxArray *plhs[], int nrhs, const mxArray *prhs[])
269276 FringeQuadEntrance , FringeQuadExit ,
270277 fringeIntM0 , fringeIntP0 ,
271278 T1 , T2 , R1 , R2 , RApertures , EApertures ,
272- KickAngle , Scaling , Energy , num_particles );
279+ KickAngle , Scaling , Gamma , num_particles , NULL );
273280 } else if (nrhs == 0 ) {
274281 /* list of required fields */
275282 plhs [0 ] = mxCreateCellMatrix (9 ,1 );
0 commit comments