Changeset 23 in TRACY3 for branches/tracy3-3.10.1b/tracy/tracy/inc/read_script.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/read_script.h (modified) (6 diffs)

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

@@ -37 +37 @@
    long  _PrintTrack_nmax; 
    
-   //start track particle coordinates; PrintTrackFlag
-   char _PrintTrackElem_track_file[max_str];
-   double _PrintTrackElem_x, _PrintTrackElem_px, _PrintTrackElem_y, 
-          _PrintTrackElem_py, _PrintTrackElem_delta, _PrintTrackElem_ctau;
-   long  _PrintTrackElem_nelem1, _PrintTrackElem_nelem2; 
-   
-   
    //twiss file 
    char _PrintTwiss_twiss_file[max_str];
@@ -65 +58 @@
    long _FmapFlag_nxpoint, _FmapFlag_nypoint, _FmapFlag_nturn;
    double _FmapFlag_xmax, _FmapFlag_ymax, _FmapFlag_delta;
-   bool _FmapFlag_diffusion;
-   bool _FmapFlag_printloss;
-   
+   bool _FmapFlag_diffusion; 
  
  //extern bool FmapdpFlag;
@@ -73 +64 @@
    long _FmapdpFlag_nxpoint, _FmapdpFlag_nepoint, _FmapdpFlag_nturn;
    double _FmapdpFlag_xmax, _FmapdpFlag_emax, _FmapdpFlag_z;
-   bool _FmapdpFlag_diffusion;
-   bool _FmapdpFlag_printloss;
+   bool _FmapdpFlag_diffusion;  
 
    
@@ -120 +110 @@
    _FmapFlag_nxpoint=31L, _FmapFlag_nypoint=21L, _FmapFlag_nturn=516L;
    _FmapFlag_xmax=0.025, _FmapFlag_ymax=0.005, _FmapFlag_delta=0.0;
-   _FmapFlag_diffusion = true, _FmapFlag_printloss = false;
+   _FmapFlag_diffusion = true;
 
 /*fmap for off momentum particle*/
@@ -126 +116 @@
  _FmapdpFlag_nxpoint=31L, _FmapdpFlag_nepoint=21L, _FmapdpFlag_nturn=516L;
  _FmapdpFlag_xmax=0.025, _FmapdpFlag_emax=0.005, _FmapdpFlag_z=0.0;
- _FmapdpFlag_diffusion = true, _FmapdpFlag_printloss = false;
- 
+ _FmapdpFlag_diffusion = true;                  
+
 /* tune shift with amplitude*/
  strcpy(_AmplitudeTuneShift_nudx_file,"nudx.out");
@@ -172 +162 @@
 
 /***** file names************/
-extern char    lat_file[max_str];
-
-//files with multipole errors; for soleil lattice
+ //files with multipole errors; for soleil lattice
  extern char fic_hcorr[max_str],fic_vcorr[max_str], fic_skew[max_str];
  extern char multipole_file[max_str];