From 2d5453c9358c9be416ed74dcc377234328beb616 Mon Sep 17 00:00:00 2001
From: zhang <zhang@9a6e40ed-f3a0-4838-9b4a-bf418f78e88d>
Date: Mon, 10 Jan 2011 08:39:01 +0000
Subject: [PATCH] 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 | 1 -
tracy/tracy/src/read_script.cc | 9 +--------
2 files changed, 1 insertion(+), 9 deletions(-)
diff --git a/tracy/tracy/inc/read_script.h b/tracy/tracy/inc/read_script.h
index d1991ed..d2f8a4a 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 3b18723..5eaea51 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);
--
GitLab