Reimplement convolution in POPPY optical_psf model

It is not implemented correctly, so fix it.

Work has been started on poppy branch.