Changeset 32 in TRACY3 for trunk/tracy/tracy/src/t2elem.cc

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/src/t2elem.cc (modified) (8 diffs)

trunk/tracy/tracy/src/t2elem.cc

@@ -885 +885 @@
 
  Comments:
- 06/11/2012     Jianfeng Nadolski @ LAL
+ 06/11/2012     Jianfeng Zhang @ LAL
                 Fix the bug in the kick map of the exact Hamiltonian. 
                 Add the second order of the approximate Hamiltonian.
@@ -893 +893 @@
 void thin_kick(int Order, double MB[], double L, double h_bend, double h_ref,
         ss_vect<T> &x) {
-    int j;
+    int j=0;
     T BxoBrho, ByoBrho, ByoBrho1, B[3];
     T sqrtpx, dpx, ps2new, psnew;
@@ -2448 +2448 @@
 
  Input:
- xref vector
- x    matrix
+ xref: 6*1 orbit 
+ x:    6*6 (optics) transfer matrix? 
 
  Output:
- xref
- x
+ xref:  6*1 orbit
+ x:   6*6 (optics) transfer matrix
 
  Return:
@@ -2622 +2622 @@
      */
 
-    double L;
+    double L=0.0;
     CellType *cellp;
     elemtype *elemp;
@@ -2674 +2674 @@
      (  0    0     0    0       1  )                     */
 
-    double t, sk, sk0, s, c;
+    double t=0.0, sk=0.0, sk0=0.0, s=0.0, c=0.0;
     Matrix a, ah, av;
 
@@ -2771 +2771 @@
      cos phi                                              */
 
-    double r, s, c, sk, p, fk, afk;
+    double r=0.0, s=0.0, c=0.0, sk=0.0, p=0.0, fk=0.0, afk=0.0;
     Matrix edge, ah, av;
-    double coef, scoef;
+    double coef=0.0, scoef=0.0;
 
     if (irho == 0.0) {
@@ -4126 +4126 @@
  ****************************************************************************/
 void Drift_Init(int Fnum1) {
-    int i;
+    int i=1;
     ElemFamType *elemfamp;
     CellType *cellp;
@@ -4171 +4171 @@
 
 void Mpole_Init(int Fnum1) {
-    double x;
-    int i;
+    double x=0.0;
+    int i=1;
     ElemFamType *elemfamp;
     CellType *cellp;