revision of ray and wave optics