From e97761f11bae3a309068fb7f4b253615d7043b3b Mon Sep 17 00:00:00 2001
From: zhang <zhang@9a6e40ed-f3a0-4838-9b4a-bf418f78e88d>
Date: Wed, 20 Oct 2010 13:50:29 +0000
Subject: [PATCH] 20/10/2010
1) Fix the bug to read blank line in ReadCh( )
2) Add functions to read multipole errors
from a file, and then add all the errors
to the previous values of the
corresponding multipoles, and then
the summation value replace the
previous values.
Speicific for the multipole error in Soleil ring.
---
tracy/tracy/inc/soleillib.h | 32 ++++++++++++++++++++++++++++++--
1 file changed, 30 insertions(+), 2 deletions(-)
diff --git a/tracy/tracy/inc/soleillib.h b/tracy/tracy/inc/soleillib.h
index 99adb4f..26660c2 100644
--- a/tracy/tracy/inc/soleillib.h
+++ b/tracy/tracy/inc/soleillib.h
@@ -9,7 +9,7 @@
*/
/**** Protypes ****/
-void SetErr(void);
+void SetErr(long seed,double fac);
void InducedAmplitude(long spos);
void Hfonction(long pos, double dP);
//void Hcofonction(long pos, double dP,Vector2 H);
@@ -85,4 +85,32 @@ void spectrum(long Nbx, long Nbz, long Nbtour, double xmax, double zmax,
double energy, bool diffusion);
/* coupling*/
-void Coupling_Edwards_Teng(void);
+void Coupling_Edwards_Teng(void);
+
+/* get and set RF voltage */
+double get_RFVoltage(const int Fnum);
+
+void set_RFVoltage(const int Fnum, const double V_RF);
+
+/* Read multipole errors from a file for soleil*/
+void ReadFieldErr(const char *FieldErrorFile);
+
+void AddFieldErrors(const char *name, const double r0,
+ const int n, const double Bn, const double An);
+
+void AddFieldValues_type(const int N, const double r0,
+ const int n, const double Bn, const double An);
+
+void AddFieldValues_fam(const int Fnum, const double r0,
+ const int n, const double Bn, const double An);
+
+void add_bnL_sys_elem(const int Fnum, const int Knum,
+ const int n, const double bnL, const double anL);
+void SetCorrQtErr_fam(char const *fic, const int Fnum, const double conv, const double r0,
+ const int n, const double Bn, const double An);
+
+
+
+
+
+
--
GitLab