Added the accurate matching for wavelenghs. --Y.Cao