Input PSF Bug Fix & Convolution Modification

Fixed Bug whereby an input PSF could sometimes not be read
Modified convolution function for readability and performance