=updated moffat fn fitting to include position angles