add missing field maps and distribution files; simplify Injector2 scripts so...

add missing field maps and distribution files; simplify Injector2 scripts so that supplementary files can be placed in main directory

examples/Distribution/spdist.opal

+1
+0.0         0.0           0.0           0.0          0.0           0.00

examples/Distribution/tdist.opal

+2
+0.0         0.0           0.0           0.0          0.0           0.00
+0.005       0.0           0.0           0.0        0.005           0.00

examples/Fieldmaps/Cav1.dat

+7
+   0.00      0.50      0.05
+   0.18      0.54      0.40
+   0.35      0.63      0.63
+   0.52      0.74      0.71
+   0.68      0.86      0.64
+   0.85      0.95      0.43
+   1.00      0.99      0.15
\ No newline at end of file

examples/Fieldmaps/Cav3.dat

+7
+0.00      0.15      2.40
+0.20      0.65      2.41
+0.40      0.98      0.66
+0.60      0.88     -1.59
+0.80      0.43     -2.65
+1.00     -0.05     -1.71

examples/Injector2-sc.in

@@ -146,10 +146,6 @@ REAL KIG3o_vary_Z= 2.0;
 
 VALUE, {KIP3_1L_vary, KIVU_vary_Z, KIG3U_vary_Z, KIG3O_vary_Z};
 
-// Not sure what is going on here, is this replacing the collimators listed above??
-
-CALL,FILE = "../Collimators/collimatorsJUN15.dat";
-
 //---------------------------------------------------------------------------------------------//
 //                                      Distributions                                          //
 //---------------------------------------------------------------------------------------------//
@@ -158,13 +154,13 @@ CALL,FILE = "../Collimators/collimatorsJUN15.dat";
 //       Manual). Some from other sources are in BETA*GAMMA, thus have no units.
 
 //For Single Particle
-DistSP: DISTRIBUTION, TYPE = fromfile, FNAME = "../Distribution/spdist.opal",
+DistSP: DISTRIBUTION, TYPE = fromfile, FNAME = "spdist.opal",
         INPUTMOUNITS = EV;
 //For Multiple Particles
-DistSC: DISTRIBUTION, TYPE = fromfile, FNAME = "../Distribution/scdist.opal",
+DistSC: DISTRIBUTION, TYPE = fromfile, FNAME = "scdist.opal",
         INPUTMOUNITS = NONE;
 //For Tune 
-DistT:  DISTRIBUTION, TYPE = fromfile, FNAME = "../Distribution/tdist.opal";
+DistT:  DISTRIBUTION, TYPE = fromfile, FNAME = "tdist.opal";
 
 //General Distribution
 DistG: DISTRIBUTION, TYPE = gauss,

examples/Injector2.in

@@ -146,10 +146,6 @@ REAL KIG3o_vary_Z= 2.0;
 
 VALUE, {KIP3_1L_vary, KIVU_vary_Z, KIG3U_vary_Z, KIG3O_vary_Z};
 
-// Not sure what is going on here, is this replacing the collimators listed above??
-
-CALL,FILE = "../Collimators/collimatorsJUN15.dat";
-
 //---------------------------------------------------------------------------------------------//
 //                                      Distributions                                          //
 //---------------------------------------------------------------------------------------------//
@@ -158,13 +154,13 @@ CALL,FILE = "../Collimators/collimatorsJUN15.dat";
 //       Manual). Some from other sources are in BETA*GAMMA, thus have no units.
 
 //For Single Particle
-DistSP: DISTRIBUTION, TYPE = fromfile, FNAME = "../Distribution/spdist.opal",
+DistSP: DISTRIBUTION, TYPE = fromfile, FNAME = "spdist.opal",
         INPUTMOUNITS = EV;
 //For Multiple Particles
-DistSC: DISTRIBUTION, TYPE = fromfile, FNAME = "../Distribution/scdist.opal",
+DistSC: DISTRIBUTION, TYPE = fromfile, FNAME = "scdist.opal",
         INPUTMOUNITS = NONE;
 //For Tune 
-DistT:  DISTRIBUTION, TYPE = fromfile, FNAME = "../Distribution/tdist.opal";
+DistT:  DISTRIBUTION, TYPE = fromfile, FNAME = "tdist.opal";
 
 //General Distribution
 DistG: DISTRIBUTION, TYPE = gauss,

tutorial.asciidoc

@@ -153,10 +153,19 @@ acceleration cavities (represented by 2 single-gap cavities here) and
 two single-gap flat-top cavities.
 
 Following is an input file of *Single Particle Tracking mode* for PSI
-Injector II cyclotron and other data files.
+Injector II cyclotron.
 
 {website}/{branch}/examples/Injector2.in[Injector2.in]
 
+The supplementary files should be placed in the same directory.
+
+* {website}/{branch}/examples/Fieldmaps/Cav1.dat[Cav1.dat]
+* {website}/{branch}/examples/Fieldmaps/Cav3.dat[Cav3.dat]
+* {website}/{branch}/examples/Fieldmaps/ZYKL9Z.NAR[ZYKL9Z.NAR]
+* {website}/{branch}/examples/Distribution/scdist.opal[scdist.opal]
+* {website}/{branch}/examples/Distribution/spdist.opal[spdist.opal]
+* {website}/{branch}/examples/Distribution/tdist.opal[tdist.opal]
+
 To run opal on a single node, just use this command:
 
 ----
@@ -204,6 +213,8 @@ effects in Injector II.
 
 {website}/{branch}/examples/Injector2-sc.in[Injector2-sc.in]
 
+For the supplementary files see above, <<sec.tutorial.inj2>>
+
 To run opal on single node, just use this command:
 
 ----