Changeset 32 in TRACY3 for trunk/tracy/tracy/inc/tracy_global.h

Timestamp:

Apr 9, 2014, 3:50:11 PM (10 years ago)

Author:

zhangj

Message:

active the transport of the twiss functions and orbits of the transfer line.

File:

• trunk/tracy/tracy/inc/tracy_global.h (modified) (5 diffs)

trunk/tracy/tracy/inc/tracy_global.h

@@ -3 +3 @@
 
 typedef struct globvalrec {
-  double        dPcommon,       // dp for numerical differentiation 
+  double        dPcommon,       // dp for numerical differentiation; defined in lattice
                 dPparticle;     // energy deviation 
   double        delta_RF;       // RF acceptance 
@@ -9 +9 @@
   double        Omega,
                 U0,             // energy lost per turn in keV 
-                Alphac;         // alphap 
+                Alphac;         // momentum compaction factor
   Vector2       Chrom;          // chromaticities 
-  double        Energy;         // ring energy 
-  long          Cell_nLoc,      // number of elements in a cell
+  double        Energy;         // ring energy; defined in lattice 
+  long          Cell_nLoc,      // number of elements in a cell (For example, a lattice can have several same cells)
                 Elem_nFam,      // number of families 
                 CODimax;        /* maximum number of cod search before
                                    failing */
-  double        CODeps;         // precision for closed orbit finder
+  double        CODeps;         // precision for closed orbit finder; defined in the lattice
   Vector        CODvect;        // closed orbit; beam position at the first element of lattice 
   
@@ -35 +35 @@
                 Vi;             // imaginal par of the eigenvectors 
 
-  bool          MatMeth,        // matrix method 
+  bool          MatMeth,        // matrix method or symplectic tracking? 
                 Cavity_on,      // if true, cavity turned on 
                 radiation,      // if true, radiation turned on 
-                emittance,
-                quad_fringe,    /* dipole- and quadrupole hard-edge
+                emittance,       // calculate emittance?
+                quad_fringe,    /* dipole- and quadrupole hard-edge?
                                    fringe fields. */
-                H_exact,        // "small ring" Hamiltonian. 
+                H_exact,        // "small ring" or approximation Hamiltonian?  
                 pathlength,     // absolute path length
                 stable,
@@ -105 +105 @@
   mpolArray   PBrnd;     // random scale factor of rms error PBrms gradient, bn and an
   mpolArray   PB;        // total field strength(design,sys,rms) gradient, bn and an
+  //basic parameters 
   int         Porder;    // The highest order in PB
   int         n_design;  // multipole order (design, All = 0, Dip = 1, Quad = 2, Sext = 3, Oct = 4, Dec = 5, Dodec = 6)
   pthicktype  Pthick;    // thick element
-  // Bending Angles
+  // dipole type
   double PTx1;           // horizontal entrance angle [deg]
   double PTx2;           // horizontal exit angle [deg]
   double PH1;            // bending curvature of the entrance pole face of dipole, see P116 SAC-75. 
   double PH2;            // bending curvature of the exit pole face of dipole, see P116 SAC-75. 
-  double Pgap;           // total magnet gap [m] 
-  double Pirho;          // angle([radian], but in lattice definition, angle is with unit degree)/length of the dipole, 1/rho [1/m] 
+  double Pgap;           // total dipole gap [m] 
+  double Pirho;          // curvature of the dipoles. 1/rho [1/m] 
   double Pc0, Pc1, Ps1;  // corrections for roll error of bend 
   Matrix AU55,           // Upstream 5x5 matrix 
@@ -285 +286 @@
                                          maxampl[X_][0] < x < maxampl[X_][1]
                                          maxampl[Y_][0] < y < maxampl[Y_][1] */
-};
+
+   Vector        CODvect;        //orbit at the end of the lattice element  Added by Jianfeng Zhang @ LAL, 01/04/2014.
+};