Index: trunk/psphot/src/psphotChoosePSF.c
===================================================================
--- trunk/psphot/src/psphotChoosePSF.c	(revision 9734)
+++ trunk/psphot/src/psphotChoosePSF.c	(revision 9771)
@@ -163,8 +163,8 @@
 
     // make a model with unit central intensity at the image center
-    modelEXT->params->data.F32[0] = 0;
-    modelEXT->params->data.F32[1] = 1;
-    modelEXT->params->data.F32[2] = 0.5*image->numCols;
-    modelEXT->params->data.F32[3] = 0.5*image->numRows;
+    modelEXT->params->data.F32[PM_PAR_SKY] = 0;
+    modelEXT->params->data.F32[PM_PAR_I0] = 1;
+    modelEXT->params->data.F32[PM_PAR_XPOS] = 0.5*image->numCols;
+    modelEXT->params->data.F32[PM_PAR_YPOS] = 0.5*image->numRows;
 
     // construct a PSF model at this coordinate
@@ -178,7 +178,8 @@
     psF64 FWHM_X = 2*modelRadiusFunc (modelPSF->params, 0.5);
 
-    shape.sx  = modelPSF->params->data.F32[4];
-    shape.sy  = modelPSF->params->data.F32[5];
-    shape.sxy = modelPSF->params->data.F32[6];
+    // XXX make sure this is consistent with the re-definition of PM_PAR_SXX
+    shape.sx  = modelPSF->params->data.F32[PM_PAR_SXX];
+    shape.sy  = modelPSF->params->data.F32[PM_PAR_SYY];
+    shape.sxy = modelPSF->params->data.F32[PM_PAR_SXY];
     axes = psEllipseShapeToAxes (shape);
 
@@ -195,4 +196,5 @@
 }
 
+// XXX fix this wrt re-definition of PM_PAR_SXX
 bool psphotMomentsStats (pmReadout *readout, psMetadata *recipe, psArray *sources) {