Index: trunk/extsrc/gpcsw/gpcsrc/analysis/libpsf/psf.c
===================================================================
--- trunk/extsrc/gpcsw/gpcsrc/analysis/libpsf/psf.c	(revision 23924)
+++ trunk/extsrc/gpcsw/gpcsrc/analysis/libpsf/psf.c	(revision 26766)
@@ -111,6 +111,10 @@
 /* Load up results (with a few sanity checks!) */
    if(psfout != NULL && alg != PSF_2DIM) {
-      psfout->ix = 0;
-      psfout->iy = 0;
+//      psfout->ix = 0;
+//      psfout->iy = 0;
+// 091211: JT this is a harmless lie, supposed to be highest pixel
+      psfout->ix = xu;
+      psfout->iy = yu;
+//
       psfout->x0 = xu;
       psfout->y0 = yu;
@@ -128,4 +132,12 @@
 	 psfextra->xfw = xfwhm;
 	 psfextra->yfw = yfwhm;
+         psfextra->majfw = 0.0;
+         psfextra->minfw = 0.0;
+         psfextra->thfw = 0.0;
+         psfextra->wpeak = 0.0;
+         psfextra->wbkgnd = 0.0;
+         psfextra->dflux = 0.0;
+         psfextra->dbkgnd = 0.0;
+         psfextra->rmsbkgnd = 0.0;
       }
       if(alg == PSF_BIN) psfextra->binfactor = extra;
Index: trunk/extsrc/gpcsw/gpcsrc/analysis/libpsf/psf2dim.f
===================================================================
--- trunk/extsrc/gpcsw/gpcsrc/analysis/libpsf/psf2dim.f	(revision 23924)
+++ trunk/extsrc/gpcsw/gpcsrc/analysis/libpsf/psf2dim.f	(revision 26766)
@@ -188,6 +188,8 @@
       wpar(9) = 0.5
 * WAUX: NXPATCH, NYPATCH, NX, XOFF, YOFF, EADU, EXTRASKY, IGNORE_VALUE, INIT
-      waux(1) = min(n,nx-1-mx) + n + 1
-      waux(2) = min(n,ny-1-my) + n + 1
+C      waux(1) = min(n,nx-1-mx) + n + 1
+C      waux(2) = min(n,ny-1-my) + n + 1
+      waux(1) = min(2*n+1, nx-1-iwxs)
+      waux(2) = min(2*n+1, ny-1-iwys)
       waux(3) = nx
       waux(4) = iwxs