Skip to content
Snippets Groups Projects
Commit 1c95b76c authored by zhang's avatar zhang
Browse files

1) Add feature to read virtual source of coupling for soleil lattice.

2) Add feature to call COD correction.
3)  Add fmap_p( ), fmapdp_p( ), momacceptance_p( ), to do parallel
     computation of fmap, fmapdp, momacceptance.
parent 25fe5622
No related branches found
No related tags found
No related merge requests found
...@@ -36,6 +36,9 @@ void Multipole_thinsext(const char *fic_hcorr, const char *fic_vcorr, const cha ...@@ -36,6 +36,9 @@ void Multipole_thinsext(const char *fic_hcorr, const char *fic_vcorr, const cha
void MomentumAcceptance(char *MomAccFile,long deb, long fin, double ep_min, void MomentumAcceptance(char *MomAccFile,long deb, long fin, double ep_min,
double ep_max, long nstepp, double em_min, double em_max, double ep_max, long nstepp, double em_min, double em_max,
long nstepm, long nturn, double zmax); long nstepm, long nturn, double zmax);
void MomentumAcceptance_p(char *MomAccFile,long deb, long fin, double ep_min,
double ep_max, long nstepp, double em_min, double em_max,
long nstepm, long nturn, double zmax, int numprocs, int myid);
void Trac_Tab(double x, double px, double y, double py, double dp, void Trac_Tab(double x, double px, double y, double py, double dp,
long nmax, long pos, long *lastn, long *lastpos, FILE *outf1, double Tx[][NTURN]); long nmax, long pos, long *lastn, long *lastpos, FILE *outf1, double Tx[][NTURN]);
...@@ -55,8 +58,12 @@ void TunesShiftWithEnergy(const char *NudpFile,long Nb, long Nbtour, double emax ...@@ -55,8 +58,12 @@ void TunesShiftWithEnergy(const char *NudpFile,long Nb, long Nbtour, double emax
// double z, bool diffusion, bool matlab); // double z, bool diffusion, bool matlab);
void fmap(const char *FmapFile, long Nbx, long Nbz, long Nbtour, double xmax, double zmax, void fmap(const char *FmapFile, long Nbx, long Nbz, long Nbtour, double xmax, double zmax,
double energy, bool diffusion); double energy, bool diffusion);
void fmap_p(const char *FmapFile, long Nbx, long Nbz, long Nbtour, double xmax, double zmax,
double energy, bool diffusion, int numprocs, int myid);
void fmapdp(const char *FmapdpFile, long Nbx, long Nbe, long Nbtour, double xmax, double emax, void fmapdp(const char *FmapdpFile, long Nbx, long Nbe, long Nbtour, double xmax, double emax,
double z, bool diffusion); double z, bool diffusion);
void fmapdp_p(const char *FmapdpFile, long Nbx, long Nbe, long Nbtour, double xmax, double emax,
double z, bool diffusion, int numprocs, int myid);
void Nu_Naff(void); void Nu_Naff(void);
...@@ -94,6 +101,9 @@ double get_RFVoltage(const int Fnum); ...@@ -94,6 +101,9 @@ double get_RFVoltage(const int Fnum);
void set_RFVoltage(const int Fnum, const double V_RF); void set_RFVoltage(const int Fnum, const double V_RF);
/* close orbit correction */
void CODCorrect(const char *hcorr_file,const char *vcorr_file,int n_orbit,int nwh,int nwv);
/* Read multipole errors from a file for soleil*/ /* Read multipole errors from a file for soleil*/
void ReadFieldErr(const char *FieldErrorFile); void ReadFieldErr(const char *FieldErrorFile);
...@@ -112,6 +122,9 @@ void Add_bnL_sys_elem(const int Fnum, const int Knum, const char *keywrd, ...@@ -112,6 +122,9 @@ void Add_bnL_sys_elem(const int Fnum, const int Knum, const char *keywrd,
void AddCorrQtErr_fam(char const *fic, const int Fnum, const double conv, const char *keywrd, const double r0, void AddCorrQtErr_fam(char const *fic, const int Fnum, const double conv, const char *keywrd, const double r0,
const int n, const double Bn, const double An); const int n, const double Bn, const double An);
/* Read the setting of skew quadrupoles from a file; for soleil lattice */
void ReadVirtualSkewQuad(const char *VirtualSkewQuadFile);
/* fit tunes for soleil lattice, in which each quadrupole is cut into two parts*/ /* fit tunes for soleil lattice, in which each quadrupole is cut into two parts*/
void FitTune4(long qf1,long qf2, long qd1, long qd2, double nux, double nuy); void FitTune4(long qf1,long qf2, long qd1, long qd2, double nux, double nuy);
//print the coordinates at lattice elements //print the coordinates at lattice elements
......
This diff is collapsed.
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment