Skip to content
Snippets Groups Projects
Commit 2d5453c9 authored by zhang's avatar zhang
Browse files

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.
parent c9b6803c
No related branches found
No related tags found
No related merge requests found
/* global flag, used in script_read() and main() for read the input from script*/ /* global flag, used in script_read() and main() for read the input from script*/
extern bool CavityOnFlag;
extern bool QuadFringeOnFlag; extern bool QuadFringeOnFlag;
extern bool RFvoltageFlag; extern double RFvolt; extern bool RFvoltageFlag; extern double RFvolt;
......
...@@ -28,7 +28,6 @@ ...@@ -28,7 +28,6 @@
****************************************************************************/ ****************************************************************************/
/* global flag, used in script_read() and main() for read the input from script*/ /* global flag, used in script_read() and main() for read the input from script*/
bool CavityOnFlag = false;
bool QuadFringeOnFlag = false; bool QuadFringeOnFlag = false;
bool RFvoltageFlag =false; double RFvolt =0.0; bool RFvoltageFlag =false; double RFvolt =0.0;
...@@ -346,13 +345,7 @@ void read_script(const char *param_file_name, bool rd_lat) ...@@ -346,13 +345,7 @@ void read_script(const char *param_file_name, bool rd_lat)
EtaFlag = true; EtaFlag = true;
} }
// include RF cavity and set 4/6 D tracking else if (strcmp("PhaseSpaceFlag", name) == 0) {
// true=6D, false=4D
else if (strcmp("CavityOnFlag", name) == 0){
globval.Cavity_on = true;
} else if (strcmp("PhaseSpaceFlag", name) == 0) {
sscanf(line, "%*s %s %lf %lf %lf %lf %lf %lf %ld %s", _Phase_Dim, 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_X, &_Phase_Px, &_Phase_Y, &_Phase_Py, &_Phase_delta,
&_Phase_ctau, &_Phase_nturn, str); &_Phase_ctau, &_Phase_nturn, str);
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment