Majors changes to psf_2D.py

faster and simpler format