diff --git a/tracy/tracy/src/nsls-ii_lib.cc b/tracy/tracy/src/nsls-ii_lib.cc index 341b5ca3de9fac0c1c20a3f15e96b1422e89d4e7..5a81b423b520ee7cc4311c751a5e21a1cda48d0e 100644 --- a/tracy/tracy/src/nsls-ii_lib.cc +++ b/tracy/tracy/src/nsls-ii_lib.cc @@ -5,9 +5,9 @@ T. Shaftan, I. Pinayev, Y. Luo, C. Montag, B. Nash */ -/* Current revision $Revision: 1.13 $ +/* Current revision $Revision: 1.14 $ On branch $Name: not supported by cvs2svn $ - Latest change by $Author: zhang $ + Latest change by $Author: nadolski $ */ // global params @@ -211,7 +211,7 @@ FILE* file_write(const char file_name[]) return(fp); } - +/* Check for closed orbit if not exit the program*/ void chk_cod(const bool cod, const char *proc_name) { @@ -3966,6 +3966,10 @@ bool ID_corr(const int N_calls, const int N_steps) void get_param(const char *param_file) +/* + * Read parameter file in input file xxxx.prm + * + */ { char line[max_str], name[max_str], str[max_str], s_prm[max_str]; char lat_file[max_str], flat_file[max_str], IDCq_name[max_str][8]; @@ -3982,9 +3986,12 @@ void get_param(const char *param_file) inf = file_read(param_file); - // read param file + // read parameter file + // initialization strcpy(ae_file, ""); strcpy(fe_file, ""); strcpy(ap_file, ""); + if (prt) printf("\n"); + // loop over all lines of the file while (fgets(line, max_str, inf) != NULL) { if (prt) printf("%s", line); if (strstr(line, "#") == NULL) { @@ -5166,7 +5173,7 @@ void get_alphac2(void) const double d_delta = 1e-3; //const double d_delta = 1e-4; - int i, j, n; + int i, n; long int lastpos; // last tracking position when the particle is stable double delta[2*n_points+1], alphac[2*n_points+1], sigma; Vector x, b;