Changeset 19879 for trunk/psModules/src/objects/models/pmModel_PGAUSS.c

Timestamp:

Oct 3, 2008, 10:59:16 AM (18 years ago)

Author:

eugene

Message:

converted pmMoments elements to Mxx, Myy, Mxxx, etc

File:

• trunk/psModules/src/objects/models/pmModel_PGAUSS.c (modified) (2 diffs)

trunk/psModules/src/objects/models/pmModel_PGAUSS.c

@@ -194 +194 @@
 {
     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 +206 @@
 
     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);