diff --git a/tracy/tracy/src/physlib.cc b/tracy/tracy/src/physlib.cc index 4620ec860ca67ef97abb44405e3624e28473dd09..4567e8c971c5841367aba7874f29dfcb8e23d01f 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.13 $ +/* Current revision $Revision: 1.14 $ On branch $Name: not supported by cvs2svn $ Latest change by $Author: zhang $ */ @@ -204,7 +204,7 @@ void printglob(void) { printf(" Radiation_On = %s \n", globval.radiation ? "TRUE " : "FALSE"); printf(" bpm = %3d qt = %3d ", GetnKid( globval.bpm), GetnKid(globval.qt)); - printf(" Chambre_On = %s \n", status.chambre ? "TRUE " : "FALSE"); + 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); @@ -2553,44 +2553,8 @@ double Sgn(double x) { return (x == 0.0 ? 0.0 : (x > 0.0 ? 1.0 : -1.0)); } -/*************************************************************************/ -/*void ChamberOff(void) - - Purpose: - Set global vacuum chamber limitation - - Input: - none - - Output: - none - - Return: - none - - Global variables: - none - - Specific functions: - none - - Comments: - none - *************************************************************************/ -void ChamberOff(void) { - int i; - - for (i = 0; i <= globval.Cell_nLoc; i++) { - Cell[i].maxampl[X_][0] = -max_ampl; - Cell[i].maxampl[X_][1] = max_ampl; - Cell[i].maxampl[Y_][0] = -max_ampl; - Cell[i].maxampl[Y_][1] = max_ampl; - } - status.chambre = false; -} - /*************************************************************************/ /*void PrintCh(void)