Clean up generator and make real rms emittance definition.