Advanced Optical Calibration Of The Herschel Hifi Heterodyne Spectrometer