Correct BEAM momentum to agree with FROMFILE distribution.

RegressionTests/AWAGun-TrackBack-1/AWAGun-TrackBack-1.in

@@ -18,8 +18,8 @@ REAL beam_bunch_charge   = 1e-9;      //Charge of bunch. (C)
 REAL Edes    = 1.4e-9; //initial energy in GeV
 REAL gamma   = (Edes+EMASS)/EMASS;
 REAL beta    = sqrt(1-(1/gamma^2));
-REAL P0      = gamma*beta*EMASS;    //inital z momentum
-
+REAL P0      = 13.234 * EMASS;  // Inital z-momentum in the distribution file (GeV/c).
+//REAL P0      = beta*gamma * EMASS;  // Inital z-momentum in the distribution file (GeV/c).
 //Printing initial energy and momentum to terminal output.
 value , {Edes, P0, OPALVERSION};
 

RegressionTests/Kick-Test-1/Kick-Test-1.in

@@ -17,8 +17,7 @@ REAL RF_FREQUENCY = 700.0e6;			     // Reference frequency of problem (Hz).
 REAL RF_WAVELENGTH = CLIGHT / RF_FREQUENCY; 	     // Reference wavelength (m).
 
 REAL Q_E = 1.60217653e-19;  	 		     // Elementary charge (C).
-REAL E_MASS = 9.10938188e-31;		     // Mass of electron (kg).
-
+REAL P0 = 14.66 * EMASS;  // Mean z-momentum in the particle distribution file (GeV/c).
 
 REAL BEAM_BUNCH_CHARGE = 0.0e-15;     // Beam bunch charge (C).
 REAL NUMBER_OF_PARTICLES = 10000; // Number of particles in simulation