10/01/2011

delete the flag CavityonFlag.
since it's a global variable, and it's not easy to control it in the input script.

tracy/tracy/inc/read_script.h

 /* global flag, used in script_read() and main() for read the input from script*/
 
-extern bool CavityOnFlag;
 extern bool QuadFringeOnFlag;
 
 extern bool RFvoltageFlag; extern double RFvolt;

tracy/tracy/src/read_script.cc

@@ -28,7 +28,6 @@
 ****************************************************************************/
 /* global flag, used in script_read() and main() for read the input from script*/
 
-bool CavityOnFlag = false;
 bool QuadFringeOnFlag = false;
 
 bool RFvoltageFlag =false; double RFvolt =0.0;
@@ -346,13 +345,7 @@ void read_script(const char *param_file_name, bool rd_lat)
           EtaFlag = true;
         
       }
-       // include RF cavity and set 4/6 D tracking
-       // true=6D, false=4D
-      else if (strcmp("CavityOnFlag", name) == 0){
-       
-          globval.Cavity_on = true;
-        
-      } else if (strcmp("PhaseSpaceFlag", name) == 0) {
+       else if (strcmp("PhaseSpaceFlag", name) == 0) {
         sscanf(line, "%*s %s %lf %lf %lf %lf %lf %lf %ld %s", _Phase_Dim,
             &_Phase_X, &_Phase_Px, &_Phase_Y, &_Phase_Py, &_Phase_delta,
             &_Phase_ctau, &_Phase_nturn, str);