put new PSF functionality into demo
(#590)