Changeset 32 in TRACY3 for trunk/tracy/tracy/src/t2lat.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/t2lat.cc (modified) (8 diffs)

trunk/tracy/tracy/src/t2lat.cc

@@ -258 +258 @@
 static long CheckUDItable(const char *name, struct LOC_Lattice_Read *LINK)
 {
-  long  i, j, FORLIM;
+  long  i=0, j=0, FORLIM=0;
 
   j = 0;
@@ -2652 +2652 @@
     QL = 0.0;   /* L */
     QKick = 0.0; /* kick angle of the corrector [rad]*/
-    Kplane = 0;   /* 1 is horizontal corrector, -1 is vertical corrector */
-    k1 = 1;     /* N */
-    k2 = Meth_Linear;   /* method */
-    dt = 0.0;
+    Kplane = 1;   /* 1 is horizontal corrector, -1 is vertical corrector */
+    k1 = 1;     /* N, cut piece of corrector */
+    k2 = Meth_Linear;   /* integartion method */
+    dt = 0.0;    /* roll angle of the corrector */
     ClearHOMandDBN(&V);
     getest__(P_expset(SET, 1 << ((long)comma)), "<, > expected", &V);
@@ -2668 +2668 @@
       P_addset(mysys, (long)rollsym);
       P_addset(mysys, (long)dbnsym);
-      do {   /*5: read L, K, N, T, T1, T2 */
+      do {   /*5: read L, kick angle, cut piece, integartion method, roll angle, T2 */
         test__(mysys, "illegal parameter", &V); sym1 = *V.sym;
         if (*V.sym == (long)dbnsym || *V.sym == (long)rollsym ||
@@ -2714 +2714 @@
             else if (sym1 == versym)
               Kplane = -1;
+            else{
+              cout << "t2lat: Error! Must specify the type of the corrector, Horizontal or vertical!" << endl;
+              exit_(1);
+            }
             GetSym__(&V);
           }
@@ -2743 +2747 @@
       WITH2->PN = k1;
       WITH2->PdTpar = dt;
-
-        if(Kplane == 0){
-                cout << "t2lat: Error! Must specify the type of the corrector, Horizontal or vertical!" << endl;
-                exit_(1);
-            }
       WITH2->PBpar[Kplane*Dip + HOMmax] = -1*QKick;  //assign the kick angle [rad]
  
@@ -3755 +3754 @@
   Reg("inv            ", invsym, &V);
   Reg("kick           ", corkicksym, &V); /* with "corrector", define the kick angle of the corrector ,  Jianfeng Zhang*/
-  Reg("kicker         ", kicksym, &V);
+ //Reg("kicker         ", kicksym, &V); /*overlap with the lattice element type: corrector*/
   Reg("ks             ", kssym, &V);
   Reg("lambda         ", lmdsym, &V);
@@ -4121 +4120 @@
 void GetEnergy(struct LOC_Lattice_Read *LINK)
 {
-  long k;
+  long k=0;
 
   k = CheckUDItable("energy         ", LINK);
@@ -4137 +4136 @@
 void GetRingType(struct LOC_Lattice_Read *LINK)
 {
-  long k;
+  long k=0;
 
   k = CheckUDItable("ringtype       ", LINK);