Changed psf convolutor to account for overlap (i.e. circular convolution)