From 33889202185692797c605d2dc79c12d21664bd62 Mon Sep 17 00:00:00 2001
From: zhang <zhang@9a6e40ed-f3a0-4838-9b4a-bf418f78e88d>
Date: Wed, 20 Oct 2010 13:36:13 +0000
Subject: [PATCH] 20/10/2010

1)  Add the change in read_script.cc
---
 tracy/tracy/inc/read_script.h | 21 +++++++++++++++++----
 1 file changed, 17 insertions(+), 4 deletions(-)

diff --git a/tracy/tracy/inc/read_script.h b/tracy/tracy/inc/read_script.h
index 13db55f..a1228a1 100644
--- a/tracy/tracy/inc/read_script.h
+++ b/tracy/tracy/inc/read_script.h
@@ -1,12 +1,20 @@
 /* global flag, used in script_read() and main() for read the input from script*/
+
+extern bool RFvoltageFlag; extern double RFvolt;
+
 extern bool TuneTracFlag;
 extern bool ChromTracFlag ;
 
-extern bool FmapFlag , ExperimentFMAFlag, DetailedFMAFlag;
+extern bool FmapFlag;
 extern long _FmapFlag_nxpoint, _FmapFlag_nypoint, _FmapFlag_nturn;
 extern double _FmapFlag_xmax, _FmapFlag_ymax, _FmapFlag_delta;
 extern bool _FmapFlag_diffusion;
 
+extern bool FmapdpFlag;
+extern long _FmapdpFlag_nxpoint, _FmapdpFlag_nepoint, _FmapdpFlag_nturn;
+extern double _FmapdpFlag_xmax, _FmapdpFlag_emax, _FmapdpFlag_z;
+extern bool _FmapdpFlag_diffusion;	
+
 extern bool AmplitudeTuneShiftFlag;
 extern long _AmplitudeTuneShift_nxpoint, _AmplitudeTuneShift_nypoint;
 extern long _AmplitudeTuneShift_nturn;
@@ -23,12 +31,16 @@ extern long _MomentumAccFlag_istart, _MomentumAccFlag_istop,
 extern double _MomentumAccFlag_deltaminn, _MomentumAccFlag_deltamaxn;
 extern double _MomentumAccFlag_deltaminp, _MomentumAccFlag_deltamaxp;
 
-extern bool ErrorCouplingFlag ; extern bool CouplingFlag ;
+extern bool ErrorCouplingFlag ; extern long err_seed; extern double err_rms;
+extern bool CouplingFlag ;
 
 extern char fic_hcorr[max_str],fic_vcorr[max_str], fic_skew[max_str];
+extern char multipole_file[max_str];
+extern bool ReadMultipoleFlag;
 extern bool MultipoleFlag , ThinsextFlag ;
-extern bool FitTuneFlag  ; extern double targetnux , targetnuz ;
-extern bool FitChromFlag ; extern double targetksix, targetksiz ;
+
+extern bool FitTuneFlag  ; extern char qm1[max_str],qm2[max_str]; extern double targetnux , targetnuz ;
+extern bool FitChromFlag ; extern char sxm1[max_str],sxm2[max_str]; extern double targetksix, targetksiz ;
 extern bool ChamberFlag , ChamberNoU20Flag , ReadChamberFlag;
 extern bool GirderErrorFlag ;
 extern bool SigmaFlag ;
@@ -40,4 +52,5 @@ extern bool PhaseSpaceFlag;
 extern bool TouschekFlag, IBSFlag, TousTrackFlag;
 extern char chamber_file[max_str];
 
+
 void read_script(const char *param_file_name, bool rd_lat);
-- 
GitLab