From cf2150890337dd364d9db12d241337d9ba4695c6 Mon Sep 17 00:00:00 2001
From: zhang <zhang@9a6e40ed-f3a0-4838-9b4a-bf418f78e88d>
Date: Thu, 24 Feb 2011 11:20:17 +0000
Subject: [PATCH] 24/02/2011
1) Add parameters in Printlatt( ), now user can define the file name to save twiss parameters.
---
tracy/tracy/inc/physlib.h | 3 +--
tracy/tracy/inc/read_script.h | 1 +
tracy/tracy/src/physlib.cc | 7 +++----
tracy/tracy/src/read_script.cc | 9 ++++++++-
4 files changed, 13 insertions(+), 7 deletions(-)
diff --git a/tracy/tracy/inc/physlib.h b/tracy/tracy/inc/physlib.h
index e300f75..49d45fb 100644
--- a/tracy/tracy/inc/physlib.h
+++ b/tracy/tracy/inc/physlib.h
@@ -55,7 +55,7 @@ void rm_mean(long int n, double x[]);
void printglob(void);
-void printlatt(void);
+void printlatt(const char fic[]);
void PrintMat(long n, Vector *A);
@@ -282,5 +282,4 @@ void TransTwiss(Vector2 &alpha, Vector2 &beta, Vector2 &eta, Vector2 &etap,
/* Vacuum chamber */
void PrintCh(void);
-void ChamberOff(void);
diff --git a/tracy/tracy/inc/read_script.h b/tracy/tracy/inc/read_script.h
index c5aba1e..432d321 100644
--- a/tracy/tracy/inc/read_script.h
+++ b/tracy/tracy/inc/read_script.h
@@ -74,6 +74,7 @@ extern char sxm1[max_str],sxm2[max_str]; extern double targetksix, targetksiz ;
//extern bool PhaseSpaceFlag;
extern bool TouschekFlag, IBSFlag, TousTrackFlag;
extern char chamber_file[max_str];
+extern char twiss_file[max_str];
void read_script(const char *param_file_name, bool rd_lat);
diff --git a/tracy/tracy/src/physlib.cc b/tracy/tracy/src/physlib.cc
index 4567e8c..22c2e4c 100644
--- a/tracy/tracy/src/physlib.cc
+++ b/tracy/tracy/src/physlib.cc
@@ -6,7 +6,7 @@
L. Nadolski SOLEIL 2002 Link to NAFF, Radia field maps
J. Bengtsson NSLS-II, BNL 2004 -
*/
-/* Current revision $Revision: 1.14 $
+/* Current revision $Revision: 1.15 $
On branch $Name: not supported by cvs2svn $
Latest change by $Author: zhang $
*/
@@ -261,15 +261,14 @@ void printglob(void) {
****************************************************************************/
//void printlatt(void)
-void printlatt(void) {
+void printlatt(const char fic[]) {
long int i = 0;
FILE *outf;
- const char fic[] = "linlat.out";
struct tm *newtime;
/* Get time and date */
newtime = GetTime();
-
+
if ((outf = fopen(fic, "w")) == NULL) {
fprintf(stdout, "printlatt: Error while opening file %s \n", fic);
exit(1);
diff --git a/tracy/tracy/src/read_script.cc b/tracy/tracy/src/read_script.cc
index f796b97..af85b63 100644
--- a/tracy/tracy/src/read_script.cc
+++ b/tracy/tracy/src/read_script.cc
@@ -108,6 +108,7 @@ bool TouschekFlag = false, IBSFlag = false, TousTrackFlag = false;
char chamber_file[max_str];
char multipole_file[max_str];
+char twiss_file[max_str];
#define OLD_LATTICE
/* Read script */
@@ -220,10 +221,16 @@ void read_script(const char *param_file_name, bool rd_lat)
}
else if (strcmp("multipole_file", name) == 0){
sscanf(line, "%*s %s", str);
- sprintf(multipole_file,"%s%s", in_dir, str); /* add file directory of the chamber file*/
+ sprintf(multipole_file,"%s%s", in_dir, str); /* add file directory of the multipole file*/
}
/* read in bool flags */
+ //print twiss parameters flag flag
+ else if (strcmp("PrintTwissFlag", name) == 0){
+ sscanf(line, "%*s %s", twiss_file);
+ strcpy(UserCommand[CommandNo-1],name);
+ }
+ //read chamber file flat
else if (strcmp("ReadChamberFlag", name) == 0){
strcpy(UserCommand[CommandNo-1],name);
}
--
GitLab