Changeset 23 in TRACY3 for branches/tracy3-3.10.1b/tracy/tracy/src/naffutils.cc

Timestamp:

Dec 6, 2013, 5:12:43 PM (10 years ago)

Author:

zhangj

Message:

Clean version of Tracy: SoleilVersion at the end of 2011.Use this clean version to find the correct dipole fringe field to have the correct FMAP and FMAPDP of ThomX. Modified files: tpsa_lin.cc, soleillib.cc, prtmfile.cc, rdmfile.cc, read_script.cc, physlib.cc, tracy.cc, t2lat.cc, t2elem.cc, naffutils.cc in /tracy/tracy/src folder; naffutils.h, tracy_global.h, physlib.h, tracy.h, read_script.h, solielilib.h, t2elem.h in /tracy/tracy.inc folder; soltracy.cc in tracy/tools folder

File:

• branches/tracy3-3.10.1b/tracy/tracy/src/naffutils.cc (modified) (4 diffs)

branches/tracy3-3.10.1b/tracy/tracy/src/naffutils.cc

@@ -18 +18 @@
 
 /****************************************************************************/
-/* void Trac_Simple4DCOD(double x, double px, double y, double py, double dp, 
-                 double ctau, long nmax, double Tx[][NTURN], bool *status2)
+/* void Trac_Simple4DCOD(double x, double px, double y, double py, double dp, long nmax,
+                 double Tx[][NTURN], bool *status)
 
    Purpose:
        Single particle tracking around the closed orbit for NTURN turns
-       The 6D phase trajectory is saved in a array, but the 
-       tracked dp and ctau is not about the COD.
+       The 6D phase trajectory is saved in a array
 
    Input:
@@ -70 +69 @@
 
   
-  if (!trace && status.codflag) 
+  if (trace && status.codflag) 
     printf("dp= % .5e %% xcod= % .5e mm zcod= % .5e mm \n",
              dp*1e2, globval.CODvect[0]*1e3, globval.CODvect[2]*1e3);
@@ -108 +107 @@
   } while ((lastn < nmax) && (lastpos == globval.Cell_nLoc) && (lostF == false));
 
-  
   if (lastpos != globval.Cell_nLoc)
   { /* Particle lost: Error message section */
@@ -118 +116 @@
 }
 
-
-/****************************************************************************/
-/* void Trac_Simple4DCOD(double x, double px, double y, double py, double dp, 
-                 double ctau, long nmax, double Tx[][NTURN], bool *status2)
-
-   Purpose:
-       Single particle tracking around the closed orbit for NTURN turns
-       The 6D phase trajectory is saved in a array, but the 
-       tracked dp and ctau is not about the COD.
-
-   Input:
-       x, px, y, py 4 transverse coordinates
-       dp           energy offset
-       nmax         number of turns
-       pos          starting position for tracking
-       aperture     global physical aperture
-
-   Output:
-      lastn         last n (should be nmax if  not lost)
-      lastpos       last position in the ring
-      Tx            6xNTURN matrix of phase trajectory
-
-   Return:
-       none
-
-   Global variables:
-       NTURN number of turn for tracking
-       globval
-
-   Specific functions:
-       Cell_Pass
-
-   Comments:
-       useful for connection with NAFF
-       19/01/03 tracking around the closed orbit
-       
-       11/06/2013  Modified by Jianfeng Zhang @ LAL 
-       The same feature as function  
-       Trac_Simple4DCOD(double x, double px, double y, double py, double dp, 
-                 double ctau, long nmax, double Tx[][NTURN], bool *status2)
-       but add the feature to extract the position of the location of 
-       the lost particle; 
-       called by function 
-       fmap(const char *FmapFile, long Nbx, long Nbz, long Nbtour, double xmax, double zmax,
-          double energy, bool diffusion, bool loss)       
-       in soleillib.cc.
-       
-****************************************************************************/
-void Trac_Simple4DCOD(double x, double px, double y, double py, double dp, 
-                 double ctau, long nmax, double Tx[][NTURN], long& lastn, long& lastpos, ss_vect<double>& x1, bool *status2)
-{
-  bool             lostF = false; /* Lost particle Flag */
-  Vector2          aperture = {1.0, 1.0};
-
-   lastn = 0;
-   lastpos = globval.Cell_nLoc;
-  *status2 = true; /* stable */
-   x1[0]=0,x1[1]=0,x1[2]=0,x1[3]=0,x1[4]=0,x1[5]=0;
-  
-  if (globval.MatMeth) Cell_Concat(dp);
-
-  /* Get closed orbit */
-
-  getcod(dp, lastpos);
-
-  
-  if (!trace && status.codflag) 
-    printf("dp= % .5e %% xcod= % .5e mm zcod= % .5e mm \n",
-             dp*1e2, globval.CODvect[0]*1e3, globval.CODvect[2]*1e3);
-
-  /* Tracking coordinates around the closed orbit */
-  x1[0] =  x + globval.CODvect[0]; x1[1] = px + globval.CODvect[1];
-  x1[2] =  y + globval.CODvect[2]; x1[3] = py + globval.CODvect[3];
-  x1[4] = dp; x1[5] = ctau;
-
-  Tx[0][lastn] = x1[0]; Tx[1][lastn] = x1[1];
-  Tx[2][lastn] = x1[2]; Tx[3][lastn] = x1[3];
-  Tx[4][lastn] = x1[4]; Tx[5][lastn] = x1[5];
-  lastn++;
-
-  do
-  { /* tracking through the ring */
-    if ((lastpos == globval.Cell_nLoc) &&
-        (fabs(x1[0]) < aperture[0]) && (fabs(x1[2]) < aperture[1]) && status.codflag)
-    {
-      if (globval.MatMeth)
-        Cell_fPass(x1, lastpos);
-      else
-        Cell_Pass(0, globval.Cell_nLoc, x1, lastpos);
-      Tx[0][lastn] = x1[0]; Tx[1][lastn] = x1[1];
-      Tx[2][lastn] = x1[2]; Tx[3][lastn] = x1[3];
-      Tx[4][lastn] = x1[4]; Tx[5][lastn] = x1[5];
-    }
-    else
-    {
-      printf("Trac_Simple: Particle lost \n");
-      fprintf(stdout, "%6ld plane: %1d %+10.5g %+10.5g %+10.5g %+10.5g %+10.5g %+10.5g \n", 
-         lastn, status.lossplane, x1[0], x1[1], x1[2], x1[3], x1[4], x1[5]);
-      lostF = true;
-      *status2 = false;
-    }
-    lastn++;
-  } while ((lastn < nmax) && (lastpos == globval.Cell_nLoc) && (lostF == false));
-
-  
-  if (lastpos != globval.Cell_nLoc)
-  { /* Particle lost: Error message section */
-    *status2 = false;
-    printf("Trac_Simple: Particle lost \n");
-    fprintf(stdout, "turn=%5ld plane= %1d %+10.5g %+10.5g %+10.5g %+10.5g %+10.5g %+10.5g \n", lastn-1,
-             status.lossplane, x1[0], x1[1], x1[2], x1[3], x1[4], x1[5]);
-  }
-}
-
-
 /****************************************************************************/
 /* void Trac_Simple6DCOD(double x, double px, double y, double py, double dp, long nmax,
-                 double Tx[][NTURN], bool *status2)
+                 double Tx[][NTURN], bool *status)
 
    Purpose: