diff --git a/tracy/configure.in b/tracy/configure.in
index 8b4851a3f85b7c0f8c17a3e0a1fcd75ea85883c7..f8cff0e7d3e6b43afbcbbdef5de93d0fbddbda9b 100755
--- a/tracy/configure.in
+++ b/tracy/configure.in
@@ -1,7 +1,7 @@
# Process this file with autoconf to produce a configure script.
AC_INIT(tracy/src/t2elem.cc)
AC_CONFIG_AUX_DIR(config)
-AM_INIT_AUTOMAKE(Tracy, 2.0)
+AM_INIT_AUTOMAKE(Tracy, 3.0)
AM_CONFIG_HEADER(config.h)
# Checks for programs.
AC_PROG_AWK
diff --git a/tracy/tracy/src/max4_lib.cc b/tracy/tracy/src/max4_lib.cc
index cacbb6e66c83568e49e437f5de8ee47d7a38be43..60e6631266bfa15ba35e36dd31ac10e3a924d016 100644
--- a/tracy/tracy/src/max4_lib.cc
+++ b/tracy/tracy/src/max4_lib.cc
@@ -205,7 +205,7 @@ void prt_cod_rms_data(const char name[], double x_mean[][6], double x_sigma[][6]
for (j = 0; j <= globval.Cell_nLoc; j++){
- fprintf(fp, "%4i %8.3f %s %6.2f %10.3e +/- %10.3e %10.3e +/- %10.3e",
+ fprintf(fp, "%4li %8.3f %s %6.2f %10.3e +/- %10.3e %10.3e +/- %10.3e",
j, Cell[j].S, Cell[j].Elem.PName, get_code(Cell[j]),
1e3*x_mean[j][x_], 1e3*x_sigma[j][x_],
1e3*x_mean[j][y_], 1e3*x_sigma[j][y_]);
diff --git a/tracy/tracy/src/physlib.cc b/tracy/tracy/src/physlib.cc
index a664f98c4852f85c1c0e0aab8bcfab682fcb0f5b..69bdc94edaf5e2554251c3e251439dfa36ca9bc9 100644
--- a/tracy/tracy/src/physlib.cc
+++ b/tracy/tracy/src/physlib.cc
@@ -2367,7 +2367,7 @@ double Sgn (double x)
return (x == 0.0 ? 0.0 : (x > 0.0 ? 1.0 : -1.0));
}
-/*************************************************************************
+/*************************************************************************/
/*void ChamberOff(void)
Purpose:
@@ -2406,7 +2406,7 @@ void ChamberOff(void)
status.chambre = false;
}
-/*************************************************************************
+/*************************************************************************/
/*void PrintCh(void)
Purpose:
@@ -2608,6 +2608,8 @@ void GetChromTrac(long Nb, long Nbtour, double emax, double *xix, double *xiz)
double x = 1e-6, xp = 0.0, z = 1e-6, zp = 0.0;
double x0 = 1e-6, xp0 = 0.0, z0 = 1e-6, zp0 = 0.0;
+ //double xixExtra = 0.0, xizExtra= 0.0, xixhalf= 0.0, xizhalf= 0.0;
+ //double nux3 = 0.0, nux4 = 0.0, nuz3 = 0.0, nuz4 = 0.0;
/* initializations */
for (i = 0; i < nterm; i++) {
@@ -2625,7 +2627,7 @@ void GetChromTrac(long Nb, long Nbtour, double emax, double *xix, double *xiz)
if (trace)
fprintf(stdout,
- "\n Entering routine for chroma using tracking\n");
+ "\nGetChromTrac: Entering routine for chroma using tracking\n");
if (trace)
fprintf(stdout, "emax= % 10.6e nux1=% 10.6e nuz1= % 10.6e\n",
emax, nux1, nuz1);
@@ -2654,7 +2656,31 @@ void GetChromTrac(long Nb, long Nbtour, double emax, double *xix, double *xiz)
*xix = (nux2-nux1)*0.5/emax; *xiz = (nuz2-nuz1)*0.5/emax;
if (trace)
- fprintf (stdout, " Exiting routine for chroma using tracking\n\n");
+ fprintf (stdout, "GetChromTrac: Exiting routine for chroma using tracking\n\n");
+
+ /*
+ // Compute for half a step to diagnose precision
+ Trac_Simple(x, xp, z, zp, emax*0.5, 0.0, Nbtour, Tab, &status);
+ Get_NAFF(nterm, Nbtour, Tab, fx, fz, nb_freq);
+ nux3 = (fabs (fx[0]) > 1e-8 ? fx[0] : fx[1]); nuz3 = fz[0];
+
+ Trac_Simple(x, xp, z, zp, -emax*0.5, 0.0, Nbtour, Tab, &status);
+ Get_NAFF(nterm, Nbtour, Tab, fx, fz, nb_freq);
+ nux4 = (fabs(fx[0]) > 1e-8 ? fx[0] : fx[1]); nuz4 = fz[0];
+
+ xixhalf = (nux4-nux3)/emax; xizhalf = (nuz4-nuz3)/emax;
+
+ // Richardson extrapolation
+ xixExtra = (4.0*xixhalf-*xix)/3.0;
+ xizExtra = (4.0*xizhalf-*xiz)/3.0;
+
+ fprintf(stdout, "chroma evaluated at +/- %6.2g, xix = % f xiz = % f\n",
+ emax, *xix, *xiz);
+ fprintf(stdout, "chroma evaluated at +/- %6.2g, xix = % f xiz = % f\n",
+ emax/2, xixhalf, xizhalf);
+ fprintf(stdout, "chroma evaluated from Richardson Extrapolation, xix = % f xiz = % f\n",
+ xixExtra, xizExtra);
+ */
}
#undef nterm
diff --git a/tracy/tracy/src/prtmfile.cc b/tracy/tracy/src/prtmfile.cc
index 28a33fa7f4e2559b33a03e79b9c98080cb1a539d..a1ddb11a7239bf1f3405a77f849362411e1eb212 100644
--- a/tracy/tracy/src/prtmfile.cc
+++ b/tracy/tracy/src/prtmfile.cc
@@ -75,7 +75,7 @@
void prtName(FILE *fp, const int i,
const int type, const int method, const int N)
{
- fprintf(fp, "%-15s %4d %4d %4d\n",
+ fprintf(fp, "%-15s %4ld %4ld %4d\n",
Cell[i].Elem.PName, Cell[i].Fnum, Cell[i].Knum, i);
fprintf(fp, " %3d %3d %3d\n", type, method, N);
fprintf(fp, " %23.16e %23.16e %23.16e %23.16e\n",
diff --git a/tracy/tracy/src/radia2tracy.cc b/tracy/tracy/src/radia2tracy.cc
index d6f971880d04828549b25675537d2831f9d9d63d..cabd39a44bc0167820e3dc947f431be931d17a66 100644
--- a/tracy/tracy/src/radia2tracy.cc
+++ b/tracy/tracy/src/radia2tracy.cc
@@ -118,7 +118,7 @@ void splie2(double x1a[], double x2a[], double **ya,
Comments:
WARNING: the filename must be a lowercase name without special
- caracters !!!
+ characters !!!
and without its MANDATORY .dat extension
18/10/03 add test for numerical zero to correct H chromaticity
@@ -301,9 +301,9 @@ void LinearInterpolation2(T &X, T &Z, T &TX, T &TZ, CellType &Cell,
xstep = WITH->tabx[1]-WITH->tabx[0]; /* increasing values */
zstep = WITH->tabz[0]-WITH->tabz[1]; /* decreasing values */
- if (traceID) printf("xstep = % f zstep = % f\n", xstep, zstep);
+ if (traceID) printf("LinearInterpolation2: xstep = % f zstep = % f\n", xstep, zstep);
- /* test wether X and Z within the transverse map area */
+ /* test whether X and Z within the transverse map area */
if (X < WITH->tabx[0] || X > WITH->tabx[nx-1]) {
printf("LinearInterpolation2: X out of borders \n");
printf("X = % lf but tabx[0] = % lf and tabx[nx-1] = % lf\n",
@@ -342,7 +342,7 @@ void LinearInterpolation2(T &X, T &Z, T &TX, T &TZ, CellType &Cell,
}
iz = i - 1;
- if (traceID) printf("Indices are ix=%d and iz=%d\n", ix, iz);
+ if (traceID) printf("LinearInterpolation2: Indices are ix=%d and iz=%d\n", ix, iz);
/** Bilinear Interpolation **/
U = (X - WITH->tabx[ix])/xstep; T1 = -(Z - WITH->tabz[iz])/zstep;
@@ -392,7 +392,7 @@ void LinearInterpolation2(T &X, T &Z, T &TX, T &TZ, CellType &Cell,
}
if (traceID) {
- printf("X=% f interpolation : U= % lf T =% lf\n",
+ printf("LSN X=% f interpolation : U= % lf T =% lf\n",
is_double<T>::cst(X), is_double<T>::cst(U),
is_double<T>::cst(T1));
printf("THX = % lf 11= % lf 12= %lf 21 = %lf 22 =%lf \n",
@@ -450,7 +450,7 @@ void SplineInterpolation2(T &X, T &Z, T &thetax, T &thetaz,
WITH = Cell.Elem.ID; nx = WITH->nx; nz = WITH->nz;
- /* test wether X and Z within the transverse map area */
+ /* test whether X and Z within the transverse map area */
if (X < WITH->tabx[0] || X > WITH->tabx[nx-1] ||
Z > WITH->tabz[0] || Z < WITH->tabz[nz-1]) {
printf("SplineInterpDeriv2: out of borders in element s= %4.2f %*s\n",
diff --git a/tracy/tracy/src/rdmfile.cc b/tracy/tracy/src/rdmfile.cc
index 42657ed3c2ffaf4168f6c5c9f9c616a7d2b97139..d7b03621bc57b0d66923d110d5e508e817bb3606 100644
--- a/tracy/tracy/src/rdmfile.cc
+++ b/tracy/tracy/src/rdmfile.cc
@@ -142,7 +142,7 @@ void rdmfile(const char *mfile_dat)
Cell[i].dS[X_] = 0.0; Cell[i].dS[Y_] = 0.0;
Cell[i].dT[X_] = 1.0; Cell[i].dT[Y_] = 0.0;
- sscanf(line, "%s %d %d", Cell[i].Elem.PName, &Cell[i].Fnum, &Cell[i].Knum);
+ sscanf(line, "%s %ld %ld", Cell[i].Elem.PName, &Cell[i].Fnum, &Cell[i].Knum);
if (Cell[i].Knum == 1) {
strcpy(ElemFam[Cell[i].Fnum-1].ElemF.PName, Cell[i].Elem.PName);
diff --git a/tracy/tracy/src/read_script.cc b/tracy/tracy/src/read_script.cc
index 3d030e1d0250e466128ee1350efd95729e0a2c69..b778bc6511e670c16389bdcdd82eb38e7b7464fc 100644
--- a/tracy/tracy/src/read_script.cc
+++ b/tracy/tracy/src/read_script.cc
@@ -57,13 +57,20 @@ void read_script(const char *param_file_name, bool rd_lat)
char lat_file[max_str];
FILE *inf;
- const bool prt = true;
+ const bool prt = true; // for debugging printout each line of input file
long int LineNum=0;
char full_param_file_name[max_str];
char lat_FileName[max_str];
//bool TuneTracFlag;
-
- sprintf(full_param_file_name,"%s.prm",param_file_name);
+ char *pch;
+ char dummy[max_str];
+
+ strcpy(dummy, param_file_name);
+ pch = strstr (dummy,".prm"); // search for extension .prm
+ /* remove additional .prm if exist */
+ if (pch != NULL) strncpy(pch,"\0",1);
+
+ sprintf(full_param_file_name,"%s.prm",dummy);
if (prt) printf("\n reading in script file: %s\n",full_param_file_name);
inf = file_read(full_param_file_name);
@@ -122,7 +129,7 @@ void read_script(const char *param_file_name, bool rd_lat)
else if(strcmp(str, "false") == 0)
TuneTracFlag = false;
else {
- printf("set bool flag true or flase for TuneTracFlag \n");
+ printf("set bool flag true or false for TuneTracFlag \n");
exit_(1);
}
}
@@ -133,7 +140,7 @@ void read_script(const char *param_file_name, bool rd_lat)
else if(strcmp(str, "false") == 0)
ChromTracFlag = false;
else {
- printf("set bool flag true or flase for ChromTracFlag \n");
+ printf("set bool flag true or false for ChromTracFlag \n");
exit_(1);
}
}
@@ -144,7 +151,7 @@ void read_script(const char *param_file_name, bool rd_lat)
else if(strcmp(str, "false") == 0)
FmapFlag = false;
else {
- printf("set bool flag true or flase for FmapFlag \n");
+ printf("set bool flag true or false for FmapFlag \n");
exit_(1);
}
}
@@ -155,7 +162,7 @@ void read_script(const char *param_file_name, bool rd_lat)
else if(strcmp(str, "false") == 0)
ExperimentFMAFlag= false;
else {
- printf("set bool flag true or flase for ExperimentFMAFlag \n");
+ printf("set bool flag true or false for ExperimentFMAFlag \n");
exit_(1);
}
}
@@ -166,7 +173,7 @@ void read_script(const char *param_file_name, bool rd_lat)
else if(strcmp(str, "false") == 0)
DetailedFMAFlag = false;
else {
- printf("set bool flag true or flase for DetailedFMAFlag \n");
+ printf("set bool flag true or false for DetailedFMAFlag \n");
exit_(1);
}
}
@@ -177,7 +184,7 @@ void read_script(const char *param_file_name, bool rd_lat)
else if(strcmp(str, "false") == 0)
TuneShiftFlag = false;
else {
- printf("set bool flag true or flase for TuneShiftFlag \n");
+ printf("set bool flag true or false for TuneShiftFlag \n");
exit_(1);
}
}
@@ -188,7 +195,7 @@ void read_script(const char *param_file_name, bool rd_lat)
else if(strcmp(str, "false") == 0)
ErrorCouplingFlag = false;
else {
- printf("set bool flag true or flase for ErrorCouplingFlag \n");
+ printf("set bool flag true or false for ErrorCouplingFlag \n");
exit_(1);
}
}
@@ -199,7 +206,7 @@ void read_script(const char *param_file_name, bool rd_lat)
else if(strcmp(str, "false") == 0)
CouplingFlag = false;
else {
- printf("set bool flag true or flase for CouplingFlag \n");
+ printf("set bool flag true or false for CouplingFlag \n");
exit_(1);
}
}
@@ -210,7 +217,7 @@ void read_script(const char *param_file_name, bool rd_lat)
else if(strcmp(str, "false") == 0)
MomentumAccFlag = false;
else {
- printf("set bool flag true or flase for MomentumAccFlag \n");
+ printf("set bool flag true or false for MomentumAccFlag \n");
exit_(1);
}
}
@@ -221,7 +228,7 @@ void read_script(const char *param_file_name, bool rd_lat)
else if(strcmp(str, "false") == 0)
MultipoleFlag = false;
else {
- printf("set bool flag true or flase for MultipoleFlag \n");
+ printf("set bool flag true or false for MultipoleFlag \n");
exit_(1);
}
}
@@ -232,7 +239,7 @@ void read_script(const char *param_file_name, bool rd_lat)
else if(strcmp(str, "false") == 0)
ThinsextFlag = false;
else {
- printf("set bool flag true or flase for ThinsextFlag \n");
+ printf("set bool flag true or false for ThinsextFlag \n");
exit_(1);
}
}
@@ -243,7 +250,7 @@ void read_script(const char *param_file_name, bool rd_lat)
else if(strcmp(str, "false") == 0)
FitTuneFlag = false;
else {
- printf("set bool flag true or flase for FitTuneFlag \n");
+ printf("set bool flag true or false for FitTuneFlag \n");
exit_(1);
}
}
@@ -254,7 +261,7 @@ void read_script(const char *param_file_name, bool rd_lat)
else if(strcmp(str, "false") == 0)
FitChromFlag = false;
else {
- printf("set bool flag true or flase for FitChromFlag \n");
+ printf("set bool flag true or false for FitChromFlag \n");
exit_(1);
}
}
@@ -265,7 +272,7 @@ void read_script(const char *param_file_name, bool rd_lat)
else if(strcmp(str, "false") == 0)
ChamberFlag = false;
else {
- printf("set bool flag true or flase for ChamberFlag \n" );
+ printf("set bool flag true or false for ChamberFlag \n" );
exit_(1);
}
}
@@ -276,7 +283,7 @@ void read_script(const char *param_file_name, bool rd_lat)
else if(strcmp(str, "false") == 0)
ChamberNoU20Flag = false;
else {
- printf("set bool flag true or flase for ChamberNoU20Flag \n");
+ printf("set bool flag true or false for ChamberNoU20Flag \n");
exit_(1);
}
}
@@ -287,7 +294,7 @@ void read_script(const char *param_file_name, bool rd_lat)
else if(strcmp(str, "false") == 0)
ReadChamberFlag = false;
else {
- printf("set bool flag true or flase for ReadChamberFlag \n");
+ printf("set bool flag true or false for ReadChamberFlag \n");
exit_(1);
}
}
@@ -298,7 +305,7 @@ void read_script(const char *param_file_name, bool rd_lat)
else if(strcmp(str, "false") == 0)
GirderErrorFlag = false;
else {
- printf("set bool flag true or flase for GirderErrorFlag \n");
+ printf("set bool flag true or false for GirderErrorFlag \n");
exit_(1);
}
}
@@ -309,7 +316,7 @@ void read_script(const char *param_file_name, bool rd_lat)
else if(strcmp(str, "false") == 0)
SigmaFlag = false;
else {
- printf("set bool flag true or flase for SigmaFlag \n");
+ printf("set bool flag true or false for SigmaFlag \n");
exit_(1);
}
}
@@ -320,7 +327,7 @@ void read_script(const char *param_file_name, bool rd_lat)
else if(strcmp(str, "false") == 0)
PX2Flag = false;
else {
- printf("set bool flag true or flase for PX2Flag \n");
+ printf("set bool flag true or false for PX2Flag \n");
exit_(1);
}
}
@@ -331,7 +338,7 @@ void read_script(const char *param_file_name, bool rd_lat)
else if(strcmp(str, "false") == 0)
InducedAmplitudeFlag = false;
else {
- printf("set bool flag true or flase for InducedAmplitudeFlag \n" );
+ printf("set bool flag true or false for InducedAmplitudeFlag \n" );
exit_(1);
}
}
@@ -342,7 +349,7 @@ void read_script(const char *param_file_name, bool rd_lat)
else if(strcmp(str, "false") == 0)
CodeComparaisonFlag = false;
else {
- printf("set bool flag true or flase for CodeComparaisonFlag \n" );
+ printf("set bool flag true or false for CodeComparaisonFlag \n" );
exit_(1);
}
}
@@ -353,7 +360,7 @@ void read_script(const char *param_file_name, bool rd_lat)
else if(strcmp(str, "false") == 0)
EtaFlag = false;
else {
- printf("set bool flag true or flase for EtaFlag \n" );
+ printf("set bool flag true or false for EtaFlag \n" );
exit_(1);
}
}
@@ -366,7 +373,7 @@ void read_script(const char *param_file_name, bool rd_lat)
else if(strcmp(str, "false") == 0)
globval.Cavity_on = false;
else {
- printf("set bool flag true or flase for globval.Cavity_on \n" );
+ printf("set bool flag true or false for globval.Cavity_on \n" );
exit_(1);
}
}
@@ -377,7 +384,7 @@ void read_script(const char *param_file_name, bool rd_lat)
else if(strcmp(str, "false") == 0)
PhaseSpaceFlag = false;
else {
- printf("set bool flag true or flase for PhaseSpaceFlag \n" );
+ printf("set bool flag true or false for PhaseSpaceFlag \n" );
exit_(1);
}
}
@@ -388,7 +395,7 @@ void read_script(const char *param_file_name, bool rd_lat)
else if(strcmp(str, "false") == 0)
TouschekFlag = false;
else {
- printf("set bool flag true or flase for TouschekFlag \n" );
+ printf("set bool flag true or false for TouschekFlag \n" );
exit_(1);
}
}
@@ -399,7 +406,7 @@ void read_script(const char *param_file_name, bool rd_lat)
else if(strcmp(str, "false") == 0)
IBSFlag = false;
else {
- printf("set bool flag true or flase for IBSFlag \n" );
+ printf("set bool flag true or false for IBSFlag \n" );
exit_(1);
}
}
@@ -410,7 +417,7 @@ void read_script(const char *param_file_name, bool rd_lat)
else if(strcmp(str, "false") == 0)
TousTrackFlag = false;
else {
- printf("set bool flag true or flase for TousTrackFlag \n" );
+ printf("set bool flag true or false for TousTrackFlag \n" );
exit_(1);
}
}
diff --git a/tracy/tracy/src/soleilcommon.cc b/tracy/tracy/src/soleilcommon.cc
index 2faca815503b73e14bbf5f50207017dfef2c477e..60b4d4328a8d0724729c27a3041012354a385778 100644
--- a/tracy/tracy/src/soleilcommon.cc
+++ b/tracy/tracy/src/soleilcommon.cc
@@ -160,12 +160,6 @@ void Read_Lattice(char *fic)
globval.vcorr = get_vcorr_number(); /* number of vertical corrector into the lattice */
globval.qt = get_qt_number(); /* number of skew quad into the lattice */
-
-/* int lastpos;
- getcod(0.0, &lastpos);
-// findcod(0.0);
- printcod();
- exit(1);*/
/* define x/y physical aperture */
//ChamberOff();
diff --git a/tracy/tracy/src/soleillib.cc b/tracy/tracy/src/soleillib.cc
index 677ed46a9e4a66a2bc2a3c5911062345ef9408ab..76f60aa3bf303aa43d3d27dcaadf6625ebd3aff3 100644
--- a/tracy/tracy/src/soleillib.cc
+++ b/tracy/tracy/src/soleillib.cc
@@ -1796,12 +1796,10 @@ void Multipole_thicksext(void)
CellType Cell;
- int ElemFamIndex=0;
int mOrder = 0; /* multipole order */
double mKL = 0.0 ; /* multipole integrated strength */
double corr_strength = 0.0;
double hcorr[120], vcorr[120], qcorr[120];
- double hcorrThick[120], vcorrThick[120], qcorrThick[120];
double b2 = 0.0, b3 = 0.0;
double dBoB2 = 0.0, dBoB3 = 0.0, dBoB4 = 0.0, dBoB5 = 0.0, dBoB6 = 0.0,
dBoB7 = 0.0, dBoB9 = 0.0, dBoB11 = 0.0, dBoB15 = 0.0, dBoB21 = 0.0,
@@ -1813,13 +1811,12 @@ void Multipole_thicksext(void)
double x0i = 0.0, x02i = 0.0, x03i = 0.0, x04i = 0.0, x05i = 0.0,
x06i = 0.0, x07i = 0.0, x08i = 0.0, x012i = 0.0, x010i = 0.0,
x018i = 0.0, x024i = 0.0, x1i = 0.0;
- double theta = 0.0, brho = 0.0, dummyf = 0.0, conv = 0.0 ;
- char *dummy;
+ double theta = 0.0, brho = 0.0, conv = 0.0 ;
FILE *fi;
- char *fic_hcorr="//home/nadolski/codes/tracy/maille/soleil/corh.txt";
- char *fic_vcorr="/home/nadolski/codes/tracy/maille/soleil/corv.txt";
- char *fic_skew ="/home/nadolski/codes/tracy/maille/soleil/corqt.txt";
+ char const *fic_hcorr="//home/nadolski/codes/tracy/maille/soleil/corh.txt";
+ char const *fic_vcorr="/home/nadolski/codes/tracy/maille/soleil/corv.txt";
+ char const *fic_skew ="/home/nadolski/codes/tracy/maille/soleil/corqt.txt";
/*********************************************************/
@@ -2212,13 +2209,13 @@ void Multipole_thicksext(void)
}
- /***********************************************************************************/
- /*
- /*********** Set multipoles for quadripole ****************/
- /*
+ /***********************************************************************************
+ *
+ *********** Set multipoles for quadripole ****************
+ *
* x0ni w/ n = p-2 for a 2p-poles
*
- /***********************************************************************************/
+ ***********************************************************************************/
x0i = 1.0/30e-3; /* 1/Radius in meters */
b2 = 0.0; /* Quadrupole strength */
@@ -2294,13 +2291,13 @@ void Multipole_thicksext(void)
Cell.Elem.PName,Cell.Fnum, Cell.Knum, b2, mKL);
}
- /***********************************************************************************/
- /*
- /*********** Set multipoles for sextupole ****************/
- /*
+ /***********************************************************************************
+ *
+ *********** Set multipoles for sextupole ****************
+ *
* x0ni w/ n = p-3 for a 2p-poles
*
- /***********************************************************************************/
+ ***********************************************************************************/
b3 = 0.0;
x0i = 1.0/32e-3;
@@ -2370,13 +2367,13 @@ void Multipole_thicksext(void)
Cell.Elem.PName,Cell.Fnum, Cell.Knum, b3, mKL);
}
- /***********************************************************************************/
- /*
- /****** Set multipoles for sextupole horizontal correctors ****************/
- /*
+ /***********************************************************************************
+ *
+ ****** Set multipoles for sextupole horizontal correctors ****************
+ *
* x0ni w/ n = p-1 for a 2p-poles
*
- /***********************************************************************************/
+ ***********************************************************************************/
x0i = 1.0/35e-3; /* 1/radius */
x02i = x0i*x0i;
x03i = x02i*x0i;
@@ -2459,13 +2456,13 @@ void Multipole_thicksext(void)
Cell.Elem.PName,Cell.Fnum, Cell.Knum, corr_strength, mKL);
}
- /***********************************************************************************/
- /*
- /****** Set multipoles for vertical correctors ****************/
- /*
+ /***********************************************************************************
+ *
+ ****** Set multipoles for vertical correctors ****************
+ *
* x0ni w/ n = p-1 for a 2p-poles
*
- /***********************************************************************************/
+ ***********************************************************************************/
x0i = 1.0/35e-3; /* 1/radius */
x02i = x0i*x0i;
@@ -2550,13 +2547,13 @@ void Multipole_thicksext(void)
if (trace) printf("num= %4d name = %s Fnum = %3ld, Knum=%3ld BL/brho=% e mKl=% e\n",i,
Cell.Elem.PName,Cell.Fnum, Cell.Knum, corr_strength, mKL);
}
- /***********************************************************************************/
- /*
- /****** Set multipoles for skew quadripole ****************/
- /*
+ /***********************************************************************************
+ *
+ ****** Set multipoles for skew quadripole ****************
+ *
* x0ni w/ n = p-2 for a 2p-poles
*
- /***********************************************************************************/
+ ***********************************************************************************/
/* Set multipoles for skew quad */
x0i = 1.0/35e-3; /* 1/radius */
@@ -2679,9 +2676,9 @@ void Multipole_thinsext(void)
double x0i = 0.0, x02i = 0.0, x03i = 0.0, x04i = 0.0, x05i = 0.0,
x06i = 0.0, x07i = 0.0, x08i = 0.0, x012i = 0.0, x010i = 0.0,
x018i = 0.0, x024i = 0.0, x1i = 0.0;
- double theta = 0.0, brho = 0.0, dummyf = 0.0, conv = 0.0 ;
- char *dummy = NULL;
+ double theta = 0.0, brho = 0.0, conv = 0.0 ;
+
FILE *fi;
const char fic_hcorr[] = "hcor.dat";
const char fic_vcorr[] = "vcor.dat";
diff --git a/tracy/tracy/src/t2cell.cc b/tracy/tracy/src/t2cell.cc
index 8753980b345453ff8567900408e24e8102f41c20..91ad983d776d4d6c8d3f880ab4f312f20e63f2cb 100644
--- a/tracy/tracy/src/t2cell.cc
+++ b/tracy/tracy/src/t2cell.cc
@@ -264,7 +264,7 @@ void Cell_Pass(const long i0, const long i1, ss_vect<T> &x, long &lastpos)
}
}
-/**************************************************************************
+/**************************************************************************/
/* void Cell_Pass(const long i0, const long i1, tps &sigma, long &lastpos)
Purpose:
diff --git a/tracy/tracy/src/t2lat.cc b/tracy/tracy/src/t2lat.cc
index c4ddf1700fbe42a45e3686ffee3898e41ae63ed6..dd6dc20ca3f72c5102371096409724cd66824d40 100644
--- a/tracy/tracy/src/t2lat.cc
+++ b/tracy/tracy/src/t2lat.cc
@@ -4120,7 +4120,7 @@ static double Circumference(struct LOC_Lattice_Read *LINK)
Comments:
none
-/****************************************************************************/
+ ****************************************************************************/
static void RegisterKids(struct LOC_Lattice_Read *LINK)
{