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

Timestamp:

Jan 10, 2013, 3:05:06 PM (11 years ago)

Author:

zhangj

Message:

 

File:

• trunk/tracy/tracy/src/t2elem.cc (modified) (6 diffs)

trunk/tracy/tracy/src/t2elem.cc

@@ -660 +660 @@
                  
                  (exact form of the H of the drift)
-                 A(x,y,-l,px,py,dP) = -sqrt( (1 + delta)^2 + px^2 + py^2 )  + delta 
+                 A(x,y,-l,px,py,dP) = -sqrt( (1 + delta)^2 - px^2 - py^2 )  + delta 
                                       
                  (exact form of the H of the kick from the magnet)                                       
-                 B(x,y,-l,px,py,dP) = -h*x*sqrt( (1 + delta)^2 + px^2 + py^2 ) + h x + h^2*x^2/2 + int(Re(By+iBx)/Brho)   
+                 B(x,y,-l,px,py,dP) = -h*x*sqrt( (1 + delta)^2 - px^2 - py^2 ) + h x + h^2*x^2/2 + int(Re(By+iBx)/Brho)   
                  
                  so this is the exact Hamitonian for small ring.
@@ -670 +670 @@
         The kick is given by
                                                                                                 e                     
-         Dp_x = L* (h_ref*sqrt( (1 + delta)^2 + px^2 + py^2 ) - h_bend - x^2*h_bend*h_ref/2 - ---- B_y ) 
+         Dp_x = L* (h_ref*sqrt( (1 + delta)^2 - (px^2 + py^2) ) - h_bend - x*h_bend*h_ref -   ---- B_y ) 
                                                                                                p_0                 
          Dp_y = L* e/p_0 * B_x
          
-         x    = L* h*x_ref / sqrt( (1 + delta)^2 + px^2 + py^2) * p_x
+         x    = L* h*x_ref / sqrt( (1 + delta)^2 - px^2 - py^2) * p_x
          
-         y    = L* h*x_ref / sqrt( (1 + delta)^2 + px^2 + py^2) * p_y
+         y    = L* h*x_ref / sqrt( (1 + delta)^2 - px^2 - py^2) * p_y
          
-         CT   = L* h*x_ref / sqrt( (1 + delta)^2 + px^2 + py^2) * (1+delta)
+         CT   = L* h*x_ref / sqrt( (1 + delta)^2 - px^2 - py^2) * (1+delta)
                                                                                            
     where
@@ -826 +826 @@
 //          x[ct_]+= (1+x0[delta_])*L*h_bend*h_ref + (1+x0[delta_])*h_ref*(asin(n1) - asin(n2));
 //  
-          }//approximate Hamiltonian 
-          else {
-          x[px_] -= L * (ByoBrho + (h_bend - h_ref) / 2.0 + h_ref * h_bend
+          }//approximate Hamiltonian 
+          else {
+            x[px_] -= L * (ByoBrho + (h_bend - h_ref) / 2.0 + h_ref * h_bend
                     * x0[x_] - h_ref * x0[delta_]);
-          x[ct_] += L * h_ref * x0[x_];  
-          
-      //  second order of the h_ref
-         u = L * h_ref * x0[x_] /(1.0+x[delta_]);
-         x[x_] += u * x0[px_];
-         x[y_] += u * x0[py_];
-        x[ct_] += u*(sqr(x0[px_])+sqr(x0[py_]))/(2.0*(1.0+x0[delta_]));
+            x[ct_] += L * h_ref * x0[x_];
+  
+         //  second order of the h_ref
+            u = L * h_ref * x0[x_] /(1.0+x[delta_]);
+            x[x_] += u * x0[px_];
+            x[y_] += u * x0[py_];
+            x[ct_] += u*(sqr(x0[px_])+sqr(x0[py_]))/(2.0*(1.0+x0[delta_]));
          }
           
@@ -922 +922 @@
     if (true) {
       
-      //  cout << "With Alex's  correction: " << endl;
+        //cout << "With Alex's  correction: " << endl;
       
       //with the contribution from the entrance angle of the particle at the edge
@@ -1308 +1308 @@
                  EdgeFocus(M->Pirho, M->PTx1, M->Pgap, x,true);
          } else {//small and big rings
-         
-          
-          
           if(M->PTx1!=0){
             EdgeFocus(M->Pirho, x);
-           p_rot(M->PTx1,  x); 
+           //p_rot(M->PTx1,  x); 
              //rotate from cartesian cooridnate to curlinear curved beam coordinate; 
              // since the map of a sector dipole is used in Tracy 3 
           }
+           p_rot(M->PTx1,  x); 
            bend_fringe(M->Pirho, M->Pgap, x); //fringe field
-        
-
-        
          }
        }
@@ -1431 +1426 @@
               
              bend_fringe(-M->Pirho, M->Pgap,x); //fringe field of the dipole
+              p_rot(M->PTx2, x); 
              if(M->PTx2!=0){
-              p_rot(M->PTx2, x); //rotate back to the cartesian cooridinate
+              //p_rot(M->PTx2, x); //rotate back to the cartesian cooridinate
             EdgeFocus(M->Pirho, x);
              }