10/01/2011

 Add ErrorCoupling2Flag which is delicated for the soleil lattice with two half quadrupoles.

Now ErrorCouplingFlag is delicated for the lattice with full quadrupoles.

tracy/tools/soltracy.cc

@@ -209,7 +209,7 @@ int main(int argc, char *argv[]) {
     printglob(); /* print parameter list */
   }
 
-  // add coupling by random rotating of the quadrupole magnets
+  // add coupling by random rotating of the full quadrupole magnets
   if (ErrorCouplingFlag == true) {
     SetErr(err_seed, err_rms);
     Ring_GetTwiss(chroma = true, 0.0); /* Compute and get Twiss parameters */
@@ -218,6 +218,16 @@ int main(int argc, char *argv[]) {
     GetEmittance(ElemIndex("cav"), true);
     printglob(); /* print parameter list */
   }
+  
+  // add coupling by random rotating of the half quadrupole magnets, delicated for soleil
+  if (ErrorCoupling2Flag == true) {
+    SetErr2(err_seed, err_rms);
+    Ring_GetTwiss(chroma = true, 0.0); /* Compute and get Twiss parameters */
+    printlatt(); /* dump linear lattice functions into "linlat.dat" */
+    Coupling_Edwards_Teng();
+    GetEmittance(ElemIndex("cav"), true);
+    printglob(); /* print parameter list */
+  }
 
   // WARNING Fit tunes and chromaticities before applying errors !!!!
   //set multipoles in all magnets