Skip to content

Bug Fix: Wiggler diffusion matrix #759

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

Merged
ZeusMarti merged 19 commits into from
Aug 28, 2024
Merged

Bug Fix: Wiggler diffusion matrix #759

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
4b2d2b6
Adding wiggler matrix diffusion code and modifying wiggler integrator…
joanarenillas Apr 18, 2024
67815dd
Silencing warnings for .mexw64 and .pyd extensions
joanarenillas Apr 18, 2024
5195b73
Defining energy in mex file from Param instead of ElemData
joanarenillas Apr 18, 2024
3d1d5f4
Wiggler difussion matrices added to ohmienvelope
joanarenillas Apr 19, 2024
0a17f21
Matlab/Python mex function update
joanarenillas Apr 24, 2024
29b1e58
update matlab & python runners
joanarenillas Apr 24, 2024
cc7e79c
Merged gwigrad2 to gwigR
joanarenillas Apr 25, 2024
b8d3f47
GwigInit function update
joanarenillas Apr 25, 2024
18b6efd
Adding rotation and translation to integrators
joanarenillas May 2, 2024
a53e4c7
Spelling typos
joanarenillas May 3, 2024
f190c6a
Wiggler index deletion enhanced
joanarenillas May 6, 2024
122a643
File modification log update
joanarenillas May 6, 2024
bfcc432
Updated radiation kicks computation and documentation
joanarenillas May 9, 2024
7cad461
Minor changes to documentation
joanarenillas May 9, 2024
37b1a9e
Updating rotation and translation diffusion
joanarenillas May 9, 2024
9696216
Minor changes to integrator file
joanarenillas May 10, 2024
57f9003
Translation diffusion deleted
joanarenillas May 14, 2024
5df1df6
radiation kicks back to original formula
ZeusMarti Jul 15, 2024
57fd8f7
Merge branch 'master' into wigglerintegrator_debugged
oscarxblanco Aug 26, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,11 @@
*.mex
*.mexa64
*.mexmaci64
*.mexw64

# Compiled python
*.pyc
*.pyd

# pytest cache
.cache
Expand Down
16 changes: 13 additions & 3 deletions atintegrators/GWigSymplecticPass.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,11 @@
*---------------------------------------------------------------------------
* Modification Log:
* -----------------
* .03 2024-05-06 J. Arenillas, ALBA, jarenillas@axt.email
* Adding rotations and translations to wiggler.
* Bug fix in wiggler initialisation.
* Energy parameter bug fix.
*
* .02 2003-06-18 J. Li
* Cleanup the code
*
Expand Down Expand Up @@ -123,11 +128,13 @@ void GWigSymplecticPass(double *r, double Energy, double Ltot, double Lw,
/* Energy is defined in the lattice in eV but GeV is used by the gwig code. */
Energy = Energy / 1e9;

GWigInit(&Wig, Energy, Ltot, Lw, Bmax, Nstep, Nmeth, NHharm, NVharm, By, Bx, T1, T2, R1, R2);

for (c = 0;c<num_particles;c++) {
GWigInit(&Wig, Energy, Ltot, Lw, Bmax, Nstep, Nmeth, NHharm, NVharm, By, Bx, T1, T2, R1, R2);
r6 = r+c*6;
if (!atIsNaN(r6[0])) {
/* Misalignment at entrance */
if (T1) ATaddvv(r6,T1);
if (R1) ATmultmv(r6,R1);
switch (Nmeth) {
case second:
GWigPass_2nd(&Wig, r6);
Expand All @@ -139,6 +146,9 @@ void GWigSymplecticPass(double *r, double Energy, double Ltot, double Lw,
printf("Invalid wiggler integration method %d.\n", Nmeth);
break;
}
/* Misalignment at exit */
if (R2) ATmultmv(r6,R2);
if (T2) ATaddvv(r6,T2);
}
}
}
Expand All @@ -158,7 +168,7 @@ ExportMode struct elem *trackFunction(const atElem *ElemData,struct elem *Elem,
int Nstep, Nmeth;
int NHharm, NVharm;

Energy = atGetDouble(ElemData, "Energy"); check_error();
Energy=atGetOptionalDouble(ElemData,"Energy",Param->energy); check_error();
Ltot = atGetDouble(ElemData, "Length"); check_error();
Lw = atGetDouble(ElemData, "Lw"); check_error();
Bmax = atGetDouble(ElemData, "Bmax"); check_error();
Expand Down
17 changes: 13 additions & 4 deletions atintegrators/GWigSymplecticRadPass.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,10 @@
*---------------------------------------------------------------------------
* Modification Log:
* -----------------
* .03 2024-05-06 J. Arenillas, ALBA, jarenillas@axt.email
* Adding rotations and translations to wiggler.
* Bug fix in wiggler initialisation.
* Energy parameter bug fix.
* .02 2003-06-18 J. Li
* Cleanup the code
*
Expand Down Expand Up @@ -123,7 +127,7 @@ void GWigInit(struct gwigR *Wig,double design_energy, double Ltot, double Lw,

#define second 2
#define fourth 4
void GWigSymplecticRadPass(double *r,double Energy, double Ltot, double Lw,
void GWigSymplecticRadPass(double *r, double Energy, double Ltot, double Lw,
double Bmax, int Nstep, int Nmeth, int NHharm, int NVharm,
double *By, double *Bx, double *T1, double *T2,
double *R1, double *R2, int num_particles)
Expand All @@ -141,11 +145,13 @@ void GWigSymplecticRadPass(double *r,double Energy, double Ltot, double Lw,
zEndPointV[0] = 0;
zEndPointV[1] = Ltot;

GWigInit(&Wig, Energy, Ltot, Lw, Bmax, Nstep, Nmeth, NHharm, NVharm,0, 0, zEndPointH, zEndPointV, By, Bx, T1, T2, R1, R2);

for(c = 0;c<num_particles;c++) {
GWigInit(&Wig, Energy, Ltot, Lw, Bmax, Nstep, Nmeth, NHharm, NVharm,0, 0, zEndPointH, zEndPointV, By, Bx, T1, T2, R1, R2);
r6 = r+c*6;
if(!atIsNaN(r6[0])) {
/* Misalignment at entrance */
if (T1) ATaddvv(r6,T1);
if (R1) ATmultmv(r6,R1);
switch (Nmeth) {
case second:
GWigPass_2nd(&Wig, r6);
Expand All @@ -157,6 +163,9 @@ void GWigSymplecticRadPass(double *r,double Energy, double Ltot, double Lw,
printf("Invalid wiggler integration method %d.\n", Nmeth);
break;
}
/* Misalignment at exit */
if (R2) ATmultmv(r6,R2);
if (T2) ATaddvv(r6,T2);
}
}
}
Expand All @@ -176,7 +185,7 @@ ExportMode struct elem *trackFunction(const atElem *ElemData,struct elem *Elem,
int Nstep, Nmeth;
int NHharm, NVharm;

Energy = atGetDouble(ElemData, "Energy"); check_error();
Energy=atGetOptionalDouble(ElemData,"Energy",Param->energy); check_error();
Ltot = atGetDouble(ElemData, "Length"); check_error();
Lw = atGetDouble(ElemData, "Lw"); check_error();
Bmax = atGetDouble(ElemData, "Bmax"); check_error();
Expand Down
Loading