Changeset 23 in TRACY3 for branches/tracy3-3.10.1b/tracy/tracy/src/rdmfile.cc

Timestamp:

Dec 6, 2013, 5:12:43 PM (10 years ago)

Author:

zhangj

Message:

Clean version of Tracy: SoleilVersion at the end of 2011.Use this clean version to find the correct dipole fringe field to have the correct FMAP and FMAPDP of ThomX. Modified files: tpsa_lin.cc, soleillib.cc, prtmfile.cc, rdmfile.cc, read_script.cc, physlib.cc, tracy.cc, t2lat.cc, t2elem.cc, naffutils.cc in /tracy/tracy/src folder; naffutils.h, tracy_global.h, physlib.h, tracy.h, read_script.h, solielilib.h, t2elem.h in /tracy/tracy.inc folder; soltracy.cc in tracy/tools folder

File:

• branches/tracy3-3.10.1b/tracy/tracy/src/rdmfile.cc (modified) (1 diff)

branches/tracy3-3.10.1b/tracy/tracy/src/rdmfile.cc

@@ -217 +217 @@
                 if (prt)
                     printf("%s\n", line);
-                sscanf(line, "%lf %lf %lf %lf %lf  %lf %lf", &Cell[i].Elem.PL,
+                sscanf(line, "%lf %lf %lf %lf %lf", &Cell[i].Elem.PL,
                         &Cell[i].Elem.M->Pirho, &Cell[i].Elem.M->PTx1,
-                        &Cell[i].Elem.M->PTx2, &Cell[i].Elem.M->PH1, &Cell[i].Elem.M->PH2, &Cell[i].Elem.M->Pgap);
+                        &Cell[i].Elem.M->PTx2, &Cell[i].Elem.M->Pgap);
                 if (Cell[i].Elem.M->Pirho != 0.0)
                     Cell[i].Elem.M->Porder = 1;