diff --git a/tracy/tracy/src/soleillib.cc b/tracy/tracy/src/soleillib.cc index 14eaf31444b22e10578769989dce6263ed9e941a..2138fa143fc05f6e1d024e57f3912875432d0f10 100644 --- a/tracy/tracy/src/soleillib.cc +++ b/tracy/tracy/src/soleillib.cc @@ -3587,7 +3587,7 @@ void MomentumAcceptance(char *MomAccFile, long deb, long fin, x0[4] = codvector[0][delta_]; x0[5] = codvector[0][ct_]; - if (0) fprintf(stdout,"dP=% e : %e %e %e %e %e %e\n", + if (1) fprintf(stdout,"dP=% e : %e %e %e %e %e %e\n", dP,x0[x_],x0[px_],x0[y_],x0[py_],x0[delta_],x0[ct_]); // Store vertical initial conditions // case where deb is not element 1 @@ -4110,10 +4110,10 @@ void MomentumAcceptance_p(char *_MomAccFile, long deb, long fin, double ep_min, delta = Cell.BeamPos[delta_]; ctau0 = Cell.BeamPos[ct_]; - if (trace) fprintf(stdout,"%3ld %6.4g %6.4g %6.4g %6.4g %6.4g %6.4g\n", + if (trace) fprintf(stdout,"Closed orbit: %3ld %6.4g %6.4g %6.4g %6.4g %6.4g %6.4g\n", pos, x, px, y, py, delta, ctau0); - if (trace) fprintf(stdout,"%3ld %6.4g %6.4g %6.4g %6.4g %6.4g %6.4g\n", pos, + if (trace) fprintf(stdout,"CODvect:%3ld %6.4g %6.4g %6.4g %6.4g %6.4g %6.4g\n", pos, globval.CODvect[x_], globval.CODvect[px_],globval.CODvect[y_], globval.CODvect[py_], globval.CODvect[delta_],globval.CODvect[ct_]); @@ -4130,16 +4130,17 @@ void MomentumAcceptance_p(char *_MomAccFile, long deb, long fin, double ep_min, else dp2 = ep_max; - if (trace) - fprintf(stdout, "i=%4ld dp=%6.4g pos=%3ld %6.4g %6.4g %6.4g %6.4g %6.4g %6.4g\n", - i, dp2, pos, x, px, y+taby0[i-1L][pos-1L], + if (!trace) + fprintf(stdout, "i=%4ld dp=%6.4g pos=%3ld x=%6.4g px=%6.4g y=%6.4g py=%6.4g dp=%6.4g ctau=%6.4g\n", + i, dp2, pos, x, px, y+taby0[i-1L][pos-1L], py+tabpy0[i-1L][pos-1L], dp2+delta, ctau0); - if (trace) fprintf(stdout,"pos=%4ld z0 =% 10.5f py0 =% 10.5f \n", + if (trace) fprintf(stdout,"pos=%4ld y0 =% 10.5f py0 =% 10.5f \n", pos, taby0[i-1L][pos-1L], tabpy0[i-1L][pos-1L]); Trac(x, px, y+taby0[i-1L][pos-1L], py+tabpy0[i-1L][pos-1L], dp2+delta , ctau0, nturn, pos, lastn, lastpos, outf1, x1); + if (!trace) fprintf(stdout, "last turn= %ld\n", lastn); }while (((lastn) == nturn) && (i != nstepp));