diff --git a/tracy/tracy/inc/read_script.h b/tracy/tracy/inc/read_script.h index d1991ed3bbd42751320142e6336000b682f82fed..d2f8a4ac6337896577cd1a96e665d18f14b80227 100644 --- a/tracy/tracy/inc/read_script.h +++ b/tracy/tracy/inc/read_script.h @@ -1,6 +1,5 @@ /* 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; diff --git a/tracy/tracy/src/read_script.cc b/tracy/tracy/src/read_script.cc index 3b18723d771b515583caa3da612f6e09ffaef706..5eaea51cd428ac9c46bb87ac8b9e7bc9e32fb837 100644 --- a/tracy/tracy/src/read_script.cc +++ b/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);