From 4db5cf1a863bd41271137f151174de430827836b Mon Sep 17 00:00:00 2001
From: zhang <zhang@9a6e40ed-f3a0-4838-9b4a-bf418f78e88d>
Date: Thu, 22 Dec 2011 13:02:02 +0000
Subject: [PATCH] Add switch case to print the number of correctors, bpms, and
skew quadrupoles.
---
tracy/tracy/src/physlib.cc | 27 +++++++++++++++++++++------
1 file changed, 21 insertions(+), 6 deletions(-)
diff --git a/tracy/tracy/src/physlib.cc b/tracy/tracy/src/physlib.cc
index b10bd93..619ef4b 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");
--
GitLab