Index: trunk/psModules/src/objects/models/pmModel_GAUSS.c
===================================================================
--- trunk/psModules/src/objects/models/pmModel_GAUSS.c	(revision 17805)
+++ trunk/psModules/src/objects/models/pmModel_GAUSS.c	(revision 19879)
@@ -193,10 +193,11 @@
 {
     pmMoments *moments = source->moments;
+    pmPeak    *peak    = source->peak;
     psF32     *PAR  = model->params->data.F32;
 
     psEllipseMoments emoments;
-    emoments.x2 = moments->Sx;
-    emoments.y2 = moments->Sy;
-    emoments.xy = moments->Sxy;
+    emoments.x2 = moments->Mxx;
+    emoments.y2 = moments->Myy;
+    emoments.xy = moments->Mxy;
 
     // force the axis ratio to be < 20.0
@@ -205,7 +206,7 @@
 
     PAR[PM_PAR_SKY]  = moments->Sky;
-    PAR[PM_PAR_I0]   = moments->Peak - moments->Sky;
-    PAR[PM_PAR_XPOS] = moments->x;
-    PAR[PM_PAR_YPOS] = moments->y;
+    PAR[PM_PAR_I0]   = peak->flux;
+    PAR[PM_PAR_XPOS] = peak->xf;
+    PAR[PM_PAR_YPOS] = peak->yf;
     PAR[PM_PAR_SXX] = PS_MAX(0.5, M_SQRT2*shape.sx);
     PAR[PM_PAR_SYY] = PS_MAX(0.5, M_SQRT2*shape.sy);
Index: trunk/psModules/src/objects/models/pmModel_PGAUSS.c
===================================================================
--- trunk/psModules/src/objects/models/pmModel_PGAUSS.c	(revision 17805)
+++ trunk/psModules/src/objects/models/pmModel_PGAUSS.c	(revision 19879)
@@ -194,10 +194,11 @@
 {
     pmMoments *moments = source->moments;
+    pmPeak    *peak    = source->peak;
     psF32     *PAR     = model->params->data.F32;
 
     psEllipseMoments emoments;
-    emoments.x2 = moments->Sx;
-    emoments.y2 = moments->Sx;
-    emoments.xy = moments->Sxy;
+    emoments.x2 = moments->Mxx;
+    emoments.xy = moments->Mxy;
+    emoments.y2 = moments->Myy;
 
     psEllipseAxes axes = psEllipseMomentsToAxes (emoments, 20.0);
@@ -205,7 +206,7 @@
 
     PAR[PM_PAR_SKY]  = moments->Sky;
-    PAR[PM_PAR_I0]   = moments->Peak - moments->Sky;
-    PAR[PM_PAR_XPOS] = moments->x; // XXX use peak->xf, peak->yf?
-    PAR[PM_PAR_YPOS] = moments->y;
+    PAR[PM_PAR_I0]   = peak->flux;
+    PAR[PM_PAR_XPOS] = peak->xf;
+    PAR[PM_PAR_YPOS] = peak->yf;
     PAR[PM_PAR_SXX] = PS_MAX(0.5, M_SQRT2*shape.sx);
     PAR[PM_PAR_SYY] = PS_MAX(0.5, M_SQRT2*shape.sy);
Index: trunk/psModules/src/objects/models/pmModel_QGAUSS.c
===================================================================
--- trunk/psModules/src/objects/models/pmModel_QGAUSS.c	(revision 17805)
+++ trunk/psModules/src/objects/models/pmModel_QGAUSS.c	(revision 19879)
@@ -220,7 +220,7 @@
 
     psEllipseMoments emoments;
-    emoments.x2 = moments->Sx;
-    emoments.y2 = moments->Sy;
-    emoments.xy = moments->Sxy;
+    emoments.x2 = moments->Mxx;
+    emoments.xy = moments->Mxy;
+    emoments.y2 = moments->Myy;
 
     // force the axis ratio to be < 20.0
@@ -239,7 +239,7 @@
     // XXX turn this off here for now PAR[PM_PAR_SKY]  = moments->Sky;
     PAR[PM_PAR_SKY]  = 0.0;
-    PAR[PM_PAR_I0]   = moments->Peak;
-    PAR[PM_PAR_XPOS] = peak->x;
-    PAR[PM_PAR_YPOS] = peak->y;
+    PAR[PM_PAR_I0]   = peak->flux;
+    PAR[PM_PAR_XPOS] = peak->xf;
+    PAR[PM_PAR_YPOS] = peak->yf;
     PAR[PM_PAR_SXX]  = PS_MAX(0.5, M_SQRT2*shape.sx);
     PAR[PM_PAR_SYY]  = PS_MAX(0.5, M_SQRT2*shape.sy);
Index: trunk/psModules/src/objects/models/pmModel_RGAUSS.c
===================================================================
--- trunk/psModules/src/objects/models/pmModel_RGAUSS.c	(revision 17805)
+++ trunk/psModules/src/objects/models/pmModel_RGAUSS.c	(revision 19879)
@@ -213,7 +213,7 @@
 
     psEllipseMoments emoments;
-    emoments.x2 = moments->Sx;
-    emoments.y2 = moments->Sy;
-    emoments.xy = moments->Sxy;
+    emoments.x2 = moments->Mxx;
+    emoments.xy = moments->Mxy;
+    emoments.y2 = moments->Myy;
 
     // force the axis ratio to be < 20.0
@@ -231,7 +231,7 @@
 
     PAR[PM_PAR_SKY]  = moments->Sky;
-    PAR[PM_PAR_I0]   = moments->Peak - moments->Sky;
-    PAR[PM_PAR_XPOS] = peak->x;
-    PAR[PM_PAR_YPOS] = peak->y;
+    PAR[PM_PAR_I0]   = peak->flux;
+    PAR[PM_PAR_XPOS] = peak->xf;
+    PAR[PM_PAR_YPOS] = peak->yf;
     PAR[PM_PAR_SXX]  = PS_MAX(0.5, M_SQRT2*shape.sx);
     PAR[PM_PAR_SYY]  = PS_MAX(0.5, M_SQRT2*shape.sy);
Index: trunk/psModules/src/objects/models/pmModel_SERSIC.c
===================================================================
--- trunk/psModules/src/objects/models/pmModel_SERSIC.c	(revision 17805)
+++ trunk/psModules/src/objects/models/pmModel_SERSIC.c	(revision 19879)
@@ -230,7 +230,7 @@
 
     psEllipseMoments emoments;
-    emoments.x2 = moments->Sx;
-    emoments.y2 = moments->Sy;
-    emoments.xy = moments->Sxy;
+    emoments.x2 = moments->Mxx;
+    emoments.xy = moments->Mxy;
+    emoments.y2 = moments->Myy;
 
     // force the axis ratio to be < 20.0
@@ -249,7 +249,7 @@
     // XXX PAR[PM_PAR_SKY]  = moments->Sky;
     PAR[PM_PAR_SKY]  = 0.0;
-    PAR[PM_PAR_I0]   = moments->Peak;
-    PAR[PM_PAR_XPOS] = peak->x;
-    PAR[PM_PAR_YPOS] = peak->y;
+    PAR[PM_PAR_I0]   = peak->flux;
+    PAR[PM_PAR_XPOS] = peak->xf;
+    PAR[PM_PAR_YPOS] = peak->yf;
     PAR[PM_PAR_SXX]  = PS_MAX(0.5, M_SQRT2*shape.sx);
     PAR[PM_PAR_SYY]  = PS_MAX(0.5, M_SQRT2*shape.sy);