diff --git a/tracy/tracy/src/physlib.cc b/tracy/tracy/src/physlib.cc index b10bd934814589d3f5cb31148ebdc833e95d5881..619ef4bb2a2576735777be98c3c95ccfcbac4477 100644 --- a/tracy/tracy/src/physlib.cc +++ b/tracy/tracy/src/physlib.cc @@ -6,7 +6,7 @@ L. Nadolski SOLEIL 2002 Link to NAFF, Radia field maps J. Bengtsson NSLS-II, BNL 2004 - */ -/* Current revision $Revision: 1.18 $ +/* Current revision $Revision: 1.19 $ On branch $Name: not supported by cvs2svn $ Latest change by $Author: zhang $ */ @@ -202,11 +202,26 @@ void printglob(void) { printf(" MatMeth = %s ", globval.MatMeth ? "TRUE " : "FALSE"); printf(" Cavity_On = %s ", globval.Cavity_on ? "TRUE " : "FALSE"); printf(" Radiation_On = %s \n", globval.radiation ? "TRUE " : "FALSE"); - printf(" bpm = %3d qt = %3d ", GetnKid( - globval.bpm), GetnKid(globval.qt)); + + if(globval.bpm == 0) + printf(" bpm = 0"); + else + printf(" bpm = %3d", GetnKid(globval.bpm)); + if(globval.qt == 0) + printf(" qt = 0 \n"); + else + printf(" qt = %3d \n", GetnKid(globval.qt)); + if(globval.hcorr == 0) + printf(" hcorr = 0"); + else + printf(" hcorr = %3d", GetnKid(globval.hcorr)); + if(globval.vcorr == 0) + printf(" vcorr = 0 \n"); + else + printf(" vcorr = %3d \n", GetnKid(globval.vcorr)); + printf(" Chambre_On = %s \n", globval.Aperture_on ? "TRUE " : "FALSE"); - printf(" hcorr = %3d vcorr = %3d\n\n", GetnKid( - globval.hcorr), GetnKid(globval.vcorr)); + printf(" alphac = %8.4e\n", globval.Alphac); printf(" nux = %8.6f nuy = %8.6f", globval.TotalTune[X_], globval.TotalTune[Y_]); @@ -214,7 +229,7 @@ void printglob(void) { printf(" omega = %13.9f\n", globval.Omega); else { printf("\n"); - printf(" ksix = %8.6f ksiy = %8.6f\n", + printf(" ksix = %8.6f ksiy = %8.6f\n", globval.Chrom[X_], globval.Chrom[Y_]); } printf("\n");