From 2b0400838aec7f69cab7721b655d4e1e53c4af13 Mon Sep 17 00:00:00 2001
From: zhang <zhang@9a6e40ed-f3a0-4838-9b4a-bf418f78e88d>
Date: Wed, 6 Oct 2010 10:46:22 +0000
Subject: [PATCH] Add paths to the files, now one only need to provide the
common directory of all the files and the file names in the .prm script.
---
tracy/tracy/src/read_script.cc | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/tracy/tracy/src/read_script.cc b/tracy/tracy/src/read_script.cc
index d1b4ce6..dbef6ac 100644
--- a/tracy/tracy/src/read_script.cc
+++ b/tracy/tracy/src/read_script.cc
@@ -23,7 +23,7 @@
Read_Lattice()
Comments:
- Jianfeng Zhang 07/10 soleil
+ Jianfeng Zhang 07/2010 soleil
****************************************************************************/
/* global flag, used in script_read() and main() for read the input from script*/
@@ -137,7 +137,7 @@ void read_script(const char *param_file_name, bool rd_lat)
/* chamber file */
else if (strcmp("chamber_file", name) == 0){
sscanf(line, "%*s %s", str);
- sprintf(chamber_file,"%s", str); /* add file directory of the chamber file*/
+ sprintf(chamber_file,"%s%s", in_dir, str); /* add file directory of the chamber file*/
}
/* read in bool flags */
@@ -340,15 +340,15 @@ void read_script(const char *param_file_name, bool rd_lat)
}
else if (strcmp("fic_hcorr", name) == 0){// read of h-correctors for multipoles
sscanf(line, "%*s %s", str);
- sprintf(fic_hcorr,"%s", str);
+ sprintf(fic_hcorr,"%s%s", in_dir, str);
}
else if (strcmp("fic_vcorr", name) == 0){// read of v-correctors for multipoles
sscanf(line, "%*s %s", str);
- sprintf(fic_vcorr,"%s", str);
+ sprintf(fic_vcorr,"%s%s", in_dir, str);
}
else if (strcmp("fic_skew", name) == 0){// read of skew quads for multipoles
sscanf(line, "%*s %s", str);
- sprintf(fic_skew,"%s", str);
+ sprintf(fic_skew,"%s%s", in_dir, str);
}
else if (strcmp("FitTuneFlag", name) == 0){
sscanf(line, "%*s %s %lf %lf", str,&targetnux,&targetnuz);
--
GitLab