made defns of Gaussian lineshapes consistent and FWHM correct