From ba6a36a0dcfe5f07ac679f694182e088f72f8547 Mon Sep 17 00:00:00 2001 From: zhang <zhang@9a6e40ed-f3a0-4838-9b4a-bf418f78e88d> Date: Mon, 5 Jul 2010 15:07:05 +0000 Subject: [PATCH] ZJ updated from Tracy II. Tested, works fine. --- tracy/tracy/inc/max4_lib.h | 5 ----- tracy/tracy/inc/physlib.h | 10 +++++----- tracy/tracy/inc/soleillib.h | 13 +++++++++---- tracy/tracy/inc/tracy.h | 3 ++- tracy/tracy/inc/tracy_global.h | 5 +++++ tracy/tracy/inc/tracy_lib.h | 3 +++ 6 files changed, 24 insertions(+), 15 deletions(-) diff --git a/tracy/tracy/inc/max4_lib.h b/tracy/tracy/inc/max4_lib.h index 5b1f956..c5e9a0c 100644 --- a/tracy/tracy/inc/max4_lib.h +++ b/tracy/tracy/inc/max4_lib.h @@ -1,8 +1,3 @@ - -extern bool freq_map; -// dynamic aperture -extern const double delta ; - char* get_prm_scl(void); void LoadFieldErr_scl(const char *FieldErrorFile, const bool Scale_it, diff --git a/tracy/tracy/inc/physlib.h b/tracy/tracy/inc/physlib.h index 0c9132f..c8f322c 100644 --- a/tracy/tracy/inc/physlib.h +++ b/tracy/tracy/inc/physlib.h @@ -249,11 +249,11 @@ void Dis_In(long *bpmdis, long *vcorrdis, long *hcorrdis, /* high level functions for reading lattice file*/ -void Read_Lattice(char *fic); -long get_bpm_number(void); -long get_hcorr_number(void); -long get_vcorr_number(void); -long get_qt_number(void); +//void Read_Lattice(char *fic); +//long get_bpm_number(void); +//long get_hcorr_number(void); +//long get_vcorr_number(void); +//long get_qt_number(void); /* tracking */ diff --git a/tracy/tracy/inc/soleillib.h b/tracy/tracy/inc/soleillib.h index 1b5b7d5..d7c77aa 100644 --- a/tracy/tracy/inc/soleillib.h +++ b/tracy/tracy/inc/soleillib.h @@ -11,8 +11,9 @@ /**** Protypes ****/ void SetErr(void); void InducedAmplitude(long spos); -void Hfonction(long pos, double dP,Vector2 H); -void Hcofonction(long pos, double dP,Vector2 H); +void Hfonction(long pos, double dP); +//void Hcofonction(long pos, double dP,Vector2 H); +void Hcofonction(long pos, double dP); void Get_Disp_dp(void); void read_corrh(void); void set_vectorcod(Vector codvector[], double dP); @@ -42,10 +43,14 @@ void Dyna(long Nbx, long Nbz, long Nbtour, double xmax, double zmax, /* Frequency map analysis */ void NuDp(long Nb, long Nbtour, double emax); +//void fmap(long Nbx, long Nbz, long Nbtour, double xmax, double zmax, +// double energy, bool diffusion, bool matlab); +//void fmapdp(long Nbx, long Nbe, long Nbtour, double xmax, double emax, +// double z, bool diffusion, bool matlab); void fmap(long Nbx, long Nbz, long Nbtour, double xmax, double zmax, - double energy, bool diffusion, bool matlab); + double energy, bool diffusion); void fmapdp(long Nbx, long Nbe, long Nbtour, double xmax, double emax, - double z, bool diffusion, bool matlab); + double z, bool diffusion); void Nu_Naff(void); void NuDx(long Nbx, long Nbz, long Nbtour, double xmax, double ymax, double energy); diff --git a/tracy/tracy/inc/tracy.h b/tracy/tracy/inc/tracy.h index 00eec03..e3482e1 100644 --- a/tracy/tracy/inc/tracy.h +++ b/tracy/tracy/inc/tracy.h @@ -60,7 +60,8 @@ const double eps_0 = 1.0/(sqr(c0)*mu_0); // permeability of free space const double r_e = q_e/(4.0*M_PI*eps_0*m_e); // classical electron radius const double h_bar = 6.58211899e-16; // reduced Planck constant [eV] -const double max_ampl = 10.0; // [m] +// const double max_ampl = 10.0; // [m] nsrl-ii +const double max_ampl = 1.0; // [m] soleil enum pthicktype { thick = 0, thin = 1 }; diff --git a/tracy/tracy/inc/tracy_global.h b/tracy/tracy/inc/tracy_global.h index a0aef49..949c14c 100644 --- a/tracy/tracy/inc/tracy_global.h +++ b/tracy/tracy/inc/tracy_global.h @@ -54,6 +54,11 @@ typedef struct globvalrec { epsp; /* transverse and longitudinal projected emittances */ int RingType; // 1 if a ring (0 if transfer line) + + Vector bpm_list; + Vector hcorr_list; + Vector vcorr_list; + Vector qt_list; } globvalrec; diff --git a/tracy/tracy/inc/tracy_lib.h b/tracy/tracy/inc/tracy_lib.h index cd9c02f..9d416ec 100644 --- a/tracy/tracy/inc/tracy_lib.h +++ b/tracy/tracy/inc/tracy_lib.h @@ -86,7 +86,10 @@ using namespace std; #include "prtmfile.h" #include "nsls-ii_lib.h" + #include "max4_lib.h" +#include "soleilcommon.h" + // Truncated Power Series Algebra (TPSA) extern const int nv_tps, nd_tps, ndpt_tps, iref_tps; extern int no_tps; -- GitLab