- Added spectra to PropXtalk.C for storing calibrated, waveform-derived, energy.
- Made ReadCalibrationFile function more general by passing it vectors rather than filling all values into the same ones regardless.
- Added code to call ReadCalibrationFile to populate a list of waveform gains.
- Simple calibrate function added for wave energy, CalibrateWaveEnergy(float,vector<float>).
   This has to be distinct from CalibrateEnergy() as the types are different and there is no integration.  Possibly better to overload and pass integration as a parameter, may do this later.
- Fixed some bugs in ReadCalibrationFile(), Calib vectors now passed by reference.
- Calibrated waveenergy spectra now produced by PropXtalk.C, they seem correct.
- Bug fixed in TCanvas used for plotting from PropXtalk.C.
Merge branch 'PropXtalkImprovements'
- trying to sort out some merge mess.
Conflicts:
	Calib.h