Changeset 23 in TRACY3 for branches/tracy3-3.10.1b/tracy/tracy/src/tracy.cc

Timestamp:

Dec 6, 2013, 5:12:43 PM (10 years ago)

Author:

zhangj

Message:

Clean version of Tracy: SoleilVersion at the end of 2011.Use this clean version to find the correct dipole fringe field to have the correct FMAP and FMAPDP of ThomX. Modified files: tpsa_lin.cc, soleillib.cc, prtmfile.cc, rdmfile.cc, read_script.cc, physlib.cc, tracy.cc, t2lat.cc, t2elem.cc, naffutils.cc in /tracy/tracy/src folder; naffutils.h, tracy_global.h, physlib.h, tracy.h, read_script.h, solielilib.h, t2elem.h in /tracy/tracy.inc folder; soltracy.cc in tracy/tools folder

File:

• branches/tracy3-3.10.1b/tracy/tracy/src/tracy.cc (modified) (3 diffs)

branches/tracy3-3.10.1b/tracy/tracy/src/tracy.cc

@@ -97 +97 @@
 template void radiate(ss_vect<tps> &, const double, const double, const tps[]);
 
-template void Drift(double, double, ss_vect<double> &);
-
-template void Drift(double, double, ss_vect<tps> &);
-
 template void Drift(double, ss_vect<double> &);
 
@@ -109 +105 @@
 template void bend_fringe(double, ss_vect<tps> &);
 
-template void bend_fringe(double, double, ss_vect<double> &);
-
-template void bend_fringe(double, double, ss_vect<tps> &);
-
-template static void BendCurvature(double, double, ss_vect<double> &);
-
-template static void BendCurvature(double, double, ss_vect<tps> &);
-
-template static void EdgeFocus(double, double, double, ss_vect<double> &, bool);
-
-template static void EdgeFocus(double, double, double, ss_vect<tps> &,bool);
+template static void EdgeFocus(double, double, double, ss_vect<double> &);
+
+template static void EdgeFocus(double, double, double, ss_vect<tps> &);
 
 template void quad_fringe(double, ss_vect<double> &);
@@ -128 +116 @@
 
 template void Drift_Pass(CellType &, ss_vect<tps> &);
-
-
-template void dipole_kick(double, double, double, ss_vect<double> &);
-template void dipole_kick(double, double, double, ss_vect<tps> &);
-template void multipole_kick(int, double[], double, double, ss_vect<double> &);
-template void multipole_kick(int, double[], double, double, ss_vect<tps> &);
 
 template void thin_kick(int, double[], double, double, double,