Moved reporting and recording calibration results out of calibration function.  This leaves some noise in the calling function but it is tidier and further work will be easier.
This allowed to remove stupid passing of output streams into calibration function and negated need for nulloutput when calibrating temporary spectra.
Added proper gain estimate for wave calibration.