Changeset 23 in TRACY3 for branches/tracy3-3.10.1b/tracy/tracy/inc/soleillib.h

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/inc/soleillib.h (modified) (2 diffs)

branches/tracy3-3.10.1b/tracy/tracy/inc/soleillib.h

@@ -58 +58 @@
 //              double z, bool diffusion, bool matlab);
 void fmap(const char *FmapFile, long Nbx, long Nbz, long Nbtour, double xmax, double zmax,
-          double energy, bool diffusion);       
-void fmap(const char *FmapFile, long Nbx, long Nbz, long Nbtour, double xmax, double zmax,
-          double energy, bool diffusion, bool printloss);       
+          double energy, bool diffusion);         
 void fmap_p(const char *FmapFile, long Nbx, long Nbz, long Nbtour, double xmax, double zmax,
-          double energy, bool diffusion, bool printloss, int numprocs, int myid);         
+          double energy, bool diffusion, int numprocs, int myid);         
 void fmapdp(const char *FmapdpFile, long Nbx, long Nbe, long Nbtour, double xmax, double emax,
-              double z, bool diffusion, bool printloss);
+              double z, bool diffusion);
 void fmapdp_p(const char *FmapdpFile, long Nbx, long Nbe, long Nbtour, double xmax, double emax, 
-            double z, bool diffusion, bool printloss, int numprocs, int myid);
+            double z, bool diffusion, int numprocs, int myid);
 void Nu_Naff(void);
 
@@ -130 +128 @@
 /* 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);                    
-//print the coordinates at lattice elements tracked for n turns
+//print the coordinates at lattice elements
 void PrintTrack(const char *TrackFile, double x, double px,double y,double py, 
                 double delta, double ctau, long int nmax);
-//print the tracked coordinates after a lattice element
-void PrintTrackElem(const char *TrackFile, double x, double px,double y,double py, 
-                double delta, double ctau, long int nelem1,long int nelem2);
+