add new version of 2-d EM code, not storing Z array; plus PsfEx test case