Change cov matrix calculation to use actual waveform amplitude/parameters instead of stationary phase approx