diff --git a/tracy/tracy/inc/nsls-ii_lib.h b/tracy/tracy/inc/nsls-ii_lib.h
index 6671dc5477985ac406e17b2462f12084962397dc..7f7665bf78ec9bbf5abc75123d2a85cda7b0293c 100644
--- a/tracy/tracy/inc/nsls-ii_lib.h
+++ b/tracy/tracy/inc/nsls-ii_lib.h
@@ -1,326 +1,328 @@
-// global params
-
-extern char     in_dir[];
-
-extern bool     DA_bare, freq_map, tune_shift;
-extern int      n_aper, n_track, n_orbit, n_scale;
-
-extern bool     bba;
-extern int      n_lin,
-                SQ_per_scell, BPM_per_scell, HCM_per_scell, VCM_per_scell;
-extern double   kick;
-extern int      n_stat;
-
-extern double   VDweight, HVweight, VHweight;
-
-extern int      n_x, n_y, n_dp, n_tr;
-extern double   x_max_FMA, y_max_FMA, delta_FMA;
-
-extern double   delta_DA_;
-
-extern char     ae_file[max_str], fe_file[max_str], ap_file[max_str];
-extern int      N_calls, N_steps;
-extern double   disp_wave_y;
-extern Vector2  beta_ref;
-
-extern ss_vect<tps>  map;
-extern MNF_struct    MNF;
-
-void lwr_case(char str[]);
-
-void upr_case(char str[]);
-
-//void prt_trace (void);
-
-void file_rd(ifstream &inf, const char file_name[]);
-
-void file_wr(ofstream &outf, const char file_name[]);
-
-FILE* file_read(const char file_name[]);
-
-FILE* file_write(const char file_name[]);
-
-void chk_cod(const bool cod, const char *proc_name);
-
-void no_sxt(void);
-
-void get_map(void);
-
-tps get_h(void);
-
-void get_m2(const ss_vect<tps> &ps, tps m2[]);
-
-ss_vect<tps> get_S(const int n_DOF);
-
-ss_vect<tps> tp_S(const int n_DOF, const ss_vect<tps> &A);
-
-void get_dnu(const ss_vect<tps> &A, double dnu[]);
-
-ss_vect<tps> get_A_CS(const ss_vect<tps> &A, double dnu[]);
-
-void get_twoJ(const int n_DOF, const ss_vect<double> &ps,
-	      const ss_vect<tps> &A, double twoJ[]);
-
-double get_curly_H(const double alpha_x, const double beta_x,
-		   const double eta_x, const double etap_x);
-
-double get_eps_x(void);
-
-void GetEmittance(const int Fnum, const bool prt);
-
-void prt_lat(const char *fname, const int Fnum, const bool all);
-
-void prt_chrom_lat(void);
-
-void prt_cod(const char *file_name, const int Fnum, const bool all);
-
-void prt_beampos(const char *file_name);
-
-void CheckAlignTol(const char *OutputFile);
-
-void misalign_rms_elem(const int Fnum, const int Knum,
-		       const double dx_rms, const double dy_rms,
-		       const double dr_rms, const bool new_rnd);
-
-void misalign_sys_elem(const int Fnum, const int Knum,
-		       const double dx_sys, const double dy_sys,
-		       const double dr_sys);
-
-void misalign_rms_fam(const int Fnum,
-		      const double dx_rms, const double dy_rms,
-		      const double dr_rms, const bool new_rnd);
-
-void misalign_sys_fam(const int Fnum,
-		      const double dx_sys, const double dy_sys,
-		      const double dr_sys);
-
-void misalign_rms_type(const int type,
-		       const double dx_rms, const double dy_rms,
-		       const double dr_rms, const bool new_rnd);
-
-void misalign_sys_type(const int type,
-		       const double dx_sys, const double dy_sys,
-		       const double dr_sys);
-
-void misalign_rms_girders(const int gs, const int ge,
-			  const double dx_rms, const double dy_rms,
-			  const double dr_rms, const bool new_rnd);
-
-void misalign_sys_girders(const int gs, const int ge,
-			  const double dx_sys, const double dy_sys,
-			  const double dr_sys);
-
-void LoadAlignTol(const char *AlignFile, const bool Scale_it,
-		  const double Scale, const bool new_rnd, const int k);
-
-void set_aper_elem(const int Fnum, const int Knum, 
-		   const double Dxmin, const double Dxmax, 
-		   const double Dymin, const double Dymax);
-
-void set_aper_fam(const int Fnum,
-		  const double Dxmin, const double Dxmax, 
-		  const double Dymin, const double Dymax);
-
-void set_aper_type(const int type, const double Dxmin, const double Dxmax, 
-		   const double Dymin, const double Dymax);
-
-void LoadApers(const char *AperFile, const double scl_x, const double scl_y);
-
-double get_L(const int Fnum, const int Knum);
-
-void set_L(const int Fnum, const int Knum, const double L);
-
-void set_L(const int Fnum, const double L);
-
-void set_dL(const int Fnum, const int Knum, const double dL);
-
-void get_bn_design_elem(const int Fnum, const int Knum,
-			const int n, double &bn, double &an);
-
-void get_bnL_design_elem(const int Fnum, const int Knum,
-			 const int n, double &bnL, double &anL);
-
-void set_bn_design_elem(const int Fnum, const int Knum,
-			const int n, const double bn, const double an);
-
-void set_dbn_design_elem(const int Fnum, const int Knum,
-			 const int n, const double dbn, const double dan);
-
-void set_bn_design_fam(const int Fnum,
-		       const int n, const double bn, const double an);
-
-void set_dbn_design_fam(const int Fnum,
-			const int n, const double dbn, const double dan);
-
-void set_bnL_design_elem(const int Fnum, const int Knum,
-			 const int n, const double bnL, const double anL);
-
-void set_dbnL_design_elem(const int Fnum, const int Knum,
-			 const int n, const double dbnL, const double danL);
-
-void set_bnL_design_fam(const int Fnum,
-			const int n, const double bnL, const double anL);
-
-void set_dbnL_design_fam(const int Fnum,
-			 const int n, const double dbnL, const double danL);
-
-void set_bnL_design_type(const int type,
-			 const int n, const double bnL, const double anL);
-
-void set_bnL_sys_elem(const int Fnum, const int Knum,
-		      const int n, const double bnL, const double anL);
-
-void set_bnL_sys_fam(const int Fnum,
-		     const int n, const double bnL, const double anL);
-
-void set_bnL_sys_type(const int type,
-		      const int n, const double bnL, const double anL);
-
-void set_bnL_rms_elem(const int Fnum, const int Knum,
-		      const int n, const double bnL, const double anL,
-		      const bool new_rnd);
-
-void set_bnL_rms_fam(const int Fnum,
-		     const int n, const double bnL, const double anL,
-		     const bool new_rnd);
-
-void set_bnL_rms_type(const int type,
-		      const int n, const double bnL, const double anL,
-		      const bool new_rnd);
-
-void set_bnr_sys_elem(const int Fnum, const int Knum,
-		      const int n, const double bnr, const double anr);
-
-void set_bnr_sys_fam(const int Fnum,
-		     const int n, const double bnr, const double anr);
-
-void set_bnr_sys_type(const int type,
-		      const int n, const double bnr, const double anr);
-
-void set_bnr_rms_elem(const int Fnum, const int Knum,
-		      const int n, const double bnr, const double anr,
-		      const bool new_rnd);
-
-void set_bnr_rms_fam(const int Fnum,
-		     const int n, const double bnr, const double anr,
-		     const bool new_rnd);
-
-void set_bnr_rms_type(const int type,
-		      const int n, const double bnr, const double anr,
-		      const bool new_rnd);
-
-double get_Wiggler_BoBrho(const int Fnum, const int Knum);
-
-void set_Wiggler_BoBrho(const int Fnum, const int Knum, const double BoBrhoV);
-
-void set_Wiggler_BoBrho(const int Fnum, const double BoBrhoV);
-
-void set_ID_scl(const int Fnum, const int Knum, const double scl);
-
-void SetFieldValues_fam(const int Fnum, const bool rms, const double r0,
-			const int n, const double Bn, const double An,
-			const bool new_rnd);
-
-void SetFieldValues_type(const int N, const bool rms, const double r0,
-			 const int n, const double Bn, const double An,
-			 const bool new_rnd);
-
-void SetFieldErrors(const char *name, const bool rms, const double r0,
-		    const int n, const double Bn, const double An,
-		    const bool new_rnd);
-
-void LoadFieldErr(const char *FieldErrorFile, const bool Scale_it,
-		  const double Scale, const bool new_rnd);
-
-bool CorrectCOD(int n_orbit);
-
-void Align_BPMs(const int n);
-
-void get_bare();
-
-void get_dbeta_dnu(double m_dbeta[], double s_dbeta[],
-		   double m_dnu[], double s_dnu[]);
-
-bool CorrectCOD_N(const char *ae_file, const int n_orbit,
-		  const int n, const int k);
-
-void ini_skew_cor(const double deta_y_max);
-
-void corr_eps_y(void);
-
-void get_IDs(void);
-
-void set_IDs(const double scl);
-
-void reset_quads(void);
-
-void ini_ID_corr(void);
-
-bool ID_corr(const int N_calls, const int N_steps);
-
-void get_param(const char *param_file);
-
-void error_and_correction(const char *param_file, bool rd_lat);
-
-void prt_codcor_lat(void);
-
-void prt_beamsizes();
-
-double Touschek(const double Qb, const double delta_RF,
-	      const double eps_x, const double eps_y,
-		const double sigma_delta, const double sigma_s);
-
-double Touschek(const double Qb, const double delta_RF,const bool consistent,
-		const double eps_x, const double eps_y,
-		const double sigma_delta, double sigma_s,
-		const int n_turn, const bool aper_on,
-		double sum_delta[][2], double sum2_delta[][2]);
-
-void IBS(const double Qb,
-	 const double eps_SR[], double eps[],
-	 const double alpha_z, const double beta_z);
-
-void rm_space(char *name);
-
-void get_bn(char file_name[], int n, const bool prt);
-
-double get_dynap(const double delta);
-
-double get_chi2(long int n, double x[], double y[], long int m, Vector b);
-
-void pol_fit(int n, double x[], double y[], int order, Vector &b,
-	     double &sigma);
-
-void get_ksi2(const double d_delta);
-
-bool get_nu(const double Ax, const double Ay, const double delta,
-	    double &nu_x, double &nu_y);
-
-void dnu_dA(const double Ax_max, const double Ay_max, const double delta);
-
-bool orb_corr(const int n_orbit);
-
-double get_code(CellType &Cell);
-
-void get_alphac(void);
-
-void get_alphac2(void);
-
-void bend_cal_Fam(const int Fnum);
-
-void bend_cal(void);
-
-double h_ijklm(const tps &h, const int i, const int j, const int k,
-	       const int l, const int m);
-
-ss_vect<tps> get_A(const double alpha[], const double beta[],
-		   const double eta[], const double etap[]);
-
-
-void get_ab(const ss_vect<tps> &A,
-	    double alpha[], double beta[], double eta[], double etap[]);
-
-void set_tune(const char file_name1[], const char file_name2[], const int n);
-
-void prt_H_long(const int n, const double phi_max, const double delta_max,
-		const double U0);
+// global params
+
+extern char     in_dir[];
+
+extern bool     DA_bare, freq_map, tune_shift;
+extern int      n_aper, n_track, n_orbit, n_scale;
+
+extern bool     bba;
+extern int      n_lin,
+                SQ_per_scell, BPM_per_scell, HCM_per_scell, VCM_per_scell;
+extern double   kick;
+extern int      n_stat;
+
+extern double   VDweight, HVweight, VHweight;
+
+extern int      n_x, n_y, n_dp, n_tr;
+extern double   x_max_FMA, y_max_FMA, delta_FMA;
+
+extern double   delta_DA_;
+
+extern char     ae_file[max_str], fe_file[max_str], ap_file[max_str];
+extern int      N_calls, N_steps;
+extern double   disp_wave_y;
+extern Vector2  beta_ref;
+
+extern ss_vect<tps>  map;
+extern MNF_struct    MNF;
+
+void lwr_case(char str[]);
+
+void upr_case(char str[]);
+
+//void prt_trace (void);
+
+void file_rd(ifstream &inf, const char file_name[]);
+
+void file_wr(ofstream &outf, const char file_name[]);
+
+FILE* file_read(const char file_name[]);
+
+FILE* file_write(const char file_name[]);
+
+void chk_cod(const bool cod, const char *proc_name);
+
+void no_sxt(void);
+
+void get_map(void);
+
+tps get_h(void);
+
+void get_m2(const ss_vect<tps> &ps, tps m2[]);
+
+ss_vect<tps> get_S(const int n_DOF);
+
+ss_vect<tps> tp_S(const int n_DOF, const ss_vect<tps> &A);
+
+void get_dnu(const ss_vect<tps> &A, double dnu[]);
+
+ss_vect<tps> get_A_CS(const ss_vect<tps> &A, double dnu[]);
+
+void get_twoJ(const int n_DOF, const ss_vect<double> &ps,
+	      const ss_vect<tps> &A, double twoJ[]);
+
+double get_curly_H(const double alpha_x, const double beta_x,
+		   const double eta_x, const double etap_x);
+
+double get_eps_x(void);
+
+void GetEmittance(const int Fnum, const bool prt);
+
+void prt_lat(const char *fname, const int Fnum, const bool all);
+
+void prt_chrom_lat(void);
+
+void prt_cod(const char *file_name, const int Fnum, const bool all);
+
+void prt_beampos(const char *file_name);
+
+void CheckAlignTol(const char *OutputFile);
+
+void misalign_rms_elem(const int Fnum, const int Knum,
+		       const double dx_rms, const double dy_rms,
+		       const double dr_rms, const bool new_rnd);
+
+void misalign_sys_elem(const int Fnum, const int Knum,
+		       const double dx_sys, const double dy_sys,
+		       const double dr_sys);
+
+void misalign_rms_fam(const int Fnum,
+		      const double dx_rms, const double dy_rms,
+		      const double dr_rms, const bool new_rnd);
+
+void misalign_sys_fam(const int Fnum,
+		      const double dx_sys, const double dy_sys,
+		      const double dr_sys);
+
+void misalign_rms_type(const int type,
+		       const double dx_rms, const double dy_rms,
+		       const double dr_rms, const bool new_rnd);
+
+void misalign_sys_type(const int type,
+		       const double dx_sys, const double dy_sys,
+		       const double dr_sys);
+
+void misalign_rms_girders(const int gs, const int ge,
+			  const double dx_rms, const double dy_rms,
+			  const double dr_rms, const bool new_rnd);
+
+void misalign_sys_girders(const int gs, const int ge,
+			  const double dx_sys, const double dy_sys,
+			  const double dr_sys);
+
+void LoadAlignTol(const char *AlignFile, const bool Scale_it,
+		  const double Scale, const bool new_rnd, const int k);
+
+void set_aper_elem(const int Fnum, const int Knum, 
+		   const double Dxmin, const double Dxmax, 
+		   const double Dymin, const double Dymax);
+
+void set_aper_fam(const int Fnum,
+		  const double Dxmin, const double Dxmax, 
+		  const double Dymin, const double Dymax);
+
+void set_aper_type(const int type, const double Dxmin, const double Dxmax, 
+		   const double Dymin, const double Dymax);
+
+void LoadApers(const char *AperFile, const double scl_x, const double scl_y);
+
+double get_L(const int Fnum, const int Knum);
+
+void set_L(const int Fnum, const int Knum, const double L);
+
+void set_L(const int Fnum, const double L);
+
+void set_dL(const int Fnum, const int Knum, const double dL);
+
+void get_bn_design_elem(const int Fnum, const int Knum,
+			const int n, double &bn, double &an);
+
+void get_bnL_design_elem(const int Fnum, const int Knum,
+			 const int n, double &bnL, double &anL);
+
+void set_bn_design_elem(const int Fnum, const int Knum,
+			const int n, const double bn, const double an);
+
+void set_dbn_design_elem(const int Fnum, const int Knum,
+			 const int n, const double dbn, const double dan);
+
+void set_bn_design_fam(const int Fnum,
+		       const int n, const double bn, const double an);
+
+void set_dbn_design_fam(const int Fnum,
+			const int n, const double dbn, const double dan);
+
+void set_bnL_design_elem(const int Fnum, const int Knum,
+			 const int n, const double bnL, const double anL);
+
+void set_dbnL_design_elem(const int Fnum, const int Knum,
+			 const int n, const double dbnL, const double danL);
+
+void set_bnL_design_fam(const int Fnum,
+			const int n, const double bnL, const double anL);
+
+void set_dbnL_design_fam(const int Fnum,
+			 const int n, const double dbnL, const double danL);
+
+void set_bnL_design_type(const int type,
+			 const int n, const double bnL, const double anL);
+
+void set_bnL_sys_elem(const int Fnum, const int Knum,
+		      const int n, const double bnL, const double anL);
+
+void set_bnL_sys_fam(const int Fnum,
+		     const int n, const double bnL, const double anL);
+
+void set_bnL_sys_type(const int type,
+		      const int n, const double bnL, const double anL);
+
+void set_bnL_rms_elem(const int Fnum, const int Knum,
+		      const int n, const double bnL, const double anL,
+		      const bool new_rnd);
+
+void set_bnL_rms_fam(const int Fnum,
+		     const int n, const double bnL, const double anL,
+		     const bool new_rnd);
+
+void set_bnL_rms_type(const int type,
+		      const int n, const double bnL, const double anL,
+		      const bool new_rnd);
+
+void set_bnr_sys_elem(const int Fnum, const int Knum,
+		      const int n, const double bnr, const double anr);
+
+void set_bnr_sys_fam(const int Fnum,
+		     const int n, const double bnr, const double anr);
+
+void set_bnr_sys_type(const int type,
+		      const int n, const double bnr, const double anr);
+
+void set_bnr_rms_elem(const int Fnum, const int Knum,
+		      const int n, const double bnr, const double anr,
+		      const bool new_rnd);
+
+void set_bnr_rms_fam(const int Fnum,
+		     const int n, const double bnr, const double anr,
+		     const bool new_rnd);
+
+void set_bnr_rms_type(const int type,
+		      const int n, const double bnr, const double anr,
+		      const bool new_rnd);
+
+double get_Wiggler_BoBrho(const int Fnum, const int Knum);
+
+void set_Wiggler_BoBrho(const int Fnum, const int Knum, const double BoBrhoV);
+
+void set_Wiggler_BoBrho(const int Fnum, const double BoBrhoV);
+
+void set_ID_scl(const int Fnum, const int Knum, const double scl);
+
+void SetFieldValues_fam(const int Fnum, const bool rms, const double r0,
+			const int n, const double Bn, const double An,
+			const bool new_rnd);			
+			
+void SetFieldValues_type(const int N, const bool rms, const double r0,
+			 const int n, const double Bn, const double An,
+			 const bool new_rnd);
+
+void SetFieldErrors(const char *name, const bool rms, const double r0,
+		    const int n, const double Bn, const double An,
+		    const bool new_rnd);
+		    
+char* get_prm(void);
+
+void LoadFieldErr(const char *FieldErrorFile, const bool Scale_it,
+		  const double Scale, const bool new_rnd);
+
+bool CorrectCOD(int n_orbit);
+
+void Align_BPMs(const int n);
+
+void get_bare();
+
+void get_dbeta_dnu(double m_dbeta[], double s_dbeta[],
+		   double m_dnu[], double s_dnu[]);
+
+bool CorrectCOD_N(const char *ae_file, const int n_orbit,
+		  const int n, const int k);
+
+void ini_skew_cor(const double deta_y_max);
+
+void corr_eps_y(void);
+
+void get_IDs(void);
+
+void set_IDs(const double scl);
+
+void reset_quads(void);
+
+void ini_ID_corr(void);
+
+bool ID_corr(const int N_calls, const int N_steps);
+
+void get_param(const char *param_file);
+
+void error_and_correction(const char *param_file, bool rd_lat);
+
+void prt_codcor_lat(void);
+
+void prt_beamsizes();
+
+double Touschek(const double Qb, const double delta_RF,
+	      const double eps_x, const double eps_y,
+		const double sigma_delta, const double sigma_s);
+
+double Touschek(const double Qb, const double delta_RF,const bool consistent,
+		const double eps_x, const double eps_y,
+		const double sigma_delta, double sigma_s,
+		const int n_turn, const bool aper_on,
+		double sum_delta[][2], double sum2_delta[][2]);
+
+void IBS(const double Qb,
+	 const double eps_SR[], double eps[],
+	 const double alpha_z, const double beta_z);
+
+void rm_space(char *name);
+
+void get_bn(char file_name[], int n, const bool prt);
+
+double get_dynap(const double delta);
+
+double get_chi2(long int n, double x[], double y[], long int m, Vector b);
+
+void pol_fit(int n, double x[], double y[], int order, Vector &b,
+	     double &sigma);
+
+void get_ksi2(const double d_delta);
+
+bool get_nu(const double Ax, const double Ay, const double delta,
+	    double &nu_x, double &nu_y);
+
+void dnu_dA(const double Ax_max, const double Ay_max, const double delta);
+
+bool orb_corr(const int n_orbit);
+
+double get_code(CellType &Cell);
+
+void get_alphac(void);
+
+void get_alphac2(void);
+
+void bend_cal_Fam(const int Fnum);
+
+void bend_cal(void);
+
+double h_ijklm(const tps &h, const int i, const int j, const int k,
+	       const int l, const int m);
+
+ss_vect<tps> get_A(const double alpha[], const double beta[],
+		   const double eta[], const double etap[]);
+
+
+void get_ab(const ss_vect<tps> &A,
+	    double alpha[], double beta[], double eta[], double etap[]);
+
+void set_tune(const char file_name1[], const char file_name2[], const int n);
+
+void prt_H_long(const int n, const double phi_max, const double delta_max,
+		const double U0);