Ignore:
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:
1 edited

Legend:

Unmodified
Added
Removed

  • branches/tracy3-3.10.1b/tracy/tracy/inc/tracy_global.h

    r11 r23  
    7979  int         Pmethod;   // Integration Method
    8080  int         PN;        // Number of integration steps
    81   long        dipEdge_effect1; // dipole edge effect at the entrance
    82   long        dipEdge_effect2; // dipole edge effect at the exit
    8381  long        quadFF1;         /* Entrance quadrupole Fringe field flag */
    8482  long        quadFF2;         /* Exit quadrupole Fringe field flag */
    … …  
    10098  double      PdTrnd;    // (normal)random scale factor to rotation error PdTrms
    10199  // Multipole strengths
    102   mpolArray   PBpar;     // design field gradient; bn, and an
    103   mpolArray   PBsys;     // systematic multipole errors gradient, bn and an
    104   mpolArray   PBrms;     // rms multipole field errors gradient, bn and an
    105   mpolArray   PBrnd;     // random scale factor of rms error PBrms gradient, bn and an
    106   mpolArray   PB;        // total field strength(design,sys,rms) gradient, bn and an
     100  mpolArray   PBpar;     // design field strength
     101  mpolArray   PBsys;     // systematic multipole errors
     102  mpolArray   PBrms;     // rms multipole field errors
     103  mpolArray   PBrnd;     // random scale factor of rms error PBrms
     104  mpolArray   PB;        // total field strength(design,sys,rms)
    107105  int         Porder;    // The highest order in PB
    108106  int         n_design;  // multipole order (design, All = 0, Dip = 1, Quad = 2, Sext = 3, Oct = 4, Dec = 5, Dodec = 6)
    … …  
    111109  double PTx1;           // horizontal entrance angle [deg]
    112110  double PTx2;           // horizontal exit angle [deg]
    113   double PH1;            // bending curvature of the entrance pole face of dipole, see P116 SAC-75.
    114   double PH2;            // bending curvature of the exit pole face of dipole, see P116 SAC-75.
    115111  double Pgap;           // total magnet gap [m]
    116112  double Pirho;          // angle([radian], but in lattice definition, angle is with unit degree)/length of the dipole, 1/rho [1/m]
Note: See TracChangeset for help on using the changeset viewer.