Merge branch 'twoFlashDepthTmp' into twoFlashDepth
merged changes.  Now the rayTraceIdealLens has 31 bands and can render a PSF from diffraction