Changeset 25766 for branches/eam_branches/20090820/psModules/src/objects/pmModel.c

Timestamp:

Oct 2, 2009, 5:10:19 PM (17 years ago)

Author:

eugene

Message:

merge changes from trunk

Location:

branches/eam_branches/20090820

Files:

• . (modified) (1 prop)
• psModules/src/objects/pmModel.c (modified) (8 diffs)

branches/eam_branches/20090820/psModules/src/objects/pmModel.c

@@ -56 +56 @@
 
     tmp->type = type;
-    tmp->chisq = 0.0;
-    tmp->chisqNorm = 0.0;
+    tmp->mag = NAN;
+    tmp->chisq = NAN;
+    tmp->chisqNorm = NAN;
     tmp->nDOF  = 0;
     tmp->nPix  = 0;
     tmp->nIter = 0;
-    tmp->radiusFit = 0;
+    tmp->fitRadius = 0;
     tmp->flags = PM_MODEL_STATUS_NONE;
     tmp->residuals = NULL;              // XXX should the model own this memory?
@@ -86 +87 @@
     tmp->modelParamsFromPSF = class->modelParamsFromPSF;
     tmp->modelFitStatus     = class->modelFitStatus;
+    tmp->modelSetLimits     = class->modelSetLimits;
 
     psTrace("psModules.objects", 10, "---- %s() end ----\n", __func__);
@@ -108 +110 @@
     new->nIter     = model->nIter;
     new->flags     = model->flags;
-    new->radiusFit = model->radiusFit;
+    new->fitRadius = model->fitRadius;
 
     for (int i = 0; i < new->params->n; i++) {
@@ -189 +191 @@
     psVector *params = model->params;
 
-    psS32 imageCol;
-    psS32 imageRow;
-    psF32 pixelValue;
+    float imageCol;
+    float imageRow;
+    float pixelValue;
 
     // save original values; restore before returning
@@ -232 +234 @@
     psF32 **Rx = NULL;
     psF32 **Ry = NULL;
-    psImageMaskType **Rm = NULL;
+    pmResidMaskType **Rm = NULL;
 
     if (model->residuals) {
@@ -240 +242 @@
         Rx = (model->residuals->Rx)   ? model->residuals->Rx->data.F32 : NULL;
         Ry = (model->residuals->Ry)   ? model->residuals->Ry->data.F32 : NULL;
-        Rm = (model->residuals->mask) ? model->residuals->mask->data.PS_TYPE_IMAGE_MASK_DATA : NULL;
+        Rm = (model->residuals->mask) ? model->residuals->mask->data.PM_TYPE_RESID_MASK_DATA : NULL;
         if (Ro) {
             NX = model->residuals->Ro->numCols;
@@ -255 +257 @@
                 continue;
 
-            // XXX should we use using 0.5 pixel offset?
-            // Convert to coordinate in parent image, with offset (dx,dy)
-            imageCol = ix + image->col0 - dx;
-            imageRow = iy + image->row0 - dy;
-
-            x->data.F32[0] = (float) imageCol;
-            x->data.F32[1] = (float) imageRow;
+            // Convert to coordinate in parent image, with offset (dx,dy)
+            // 0.5 PIX: the model take pixel coordinates so convert the pixel index here
+            imageCol = ix + 0.5 + image->col0 - dx;
+            imageRow = iy + 0.5 + image->row0 - dy;
+
+            x->data.F32[0] = imageCol;
+            x->data.F32[1] = imageRow;
 
             pixelValue = 0.0;
@@ -276 +278 @@
                 float rx = xBin*ix + DX;
 
-                int rx0 = rx - 0.5;
-                int rx1 = rx + 0.5;
-                int ry0 = ry - 0.5;
-                int ry1 = ry + 0.5;
-
-                if (rx0 < 0) goto skip;
-                if (ry0 < 0) goto skip;
-                if (rx1 >= NX) goto skip;
-                if (ry1 >= NY) goto skip;
-
-                // these go from 0.0 to 1.0 between the centers of the pixels 
-                float fx = rx - 0.5 - rx0;
-                float Fx = 1.0 - fx;
-                float fy = ry - 0.5 - ry0;
-                float Fy = 1.0 - fy;
-
-                // check the residual image mask (if set). give up if any of the 4 pixels are masked.
-                if (Rm) {
-                    if (Rm[ry0][rx0]) goto skip;
-                    if (Rm[ry0][rx1]) goto skip;
-                    if (Rm[ry1][rx0]) goto skip;
-                    if (Rm[ry1][rx1]) goto skip;
-                }
-
-                // a possible further optimization if we re-use these values
-                // XXX allow for masked pixels, and add pixel weights
-                float V0 = (Ro[ry0][rx0]*Fx + Ro[ry0][rx1]*fx);
-                float V1 = (Ro[ry1][rx0]*Fx + Ro[ry1][rx1]*fx);
-                float Vo = V0*Fy + V1*fy;
-                if (!isfinite(Vo)) goto skip;
-
-                float Vx = 0.0;
-                float Vy = 0.0;
-
-                // skip Rx,Ry if Ro is masked
-                if (Rx && Ry && (mode & PM_MODEL_OP_RES1)) {
-                    V0 = (Rx[ry0][rx0]*Fx + Rx[ry0][rx1]*fx);
-                    V1 = (Rx[ry1][rx0]*Fx + Rx[ry1][rx1]*fx);
-                    Vx = V0*Fy + V1*fy;
-
-                    V0 = (Ry[ry0][rx0]*Fx + Ry[ry0][rx1]*fx);
-                    V1 = (Ry[ry1][rx0]*Fx + Ry[ry1][rx1]*fx);
-                    Vy = V0*Fy + V1*fy;
-                }
-                if (!isfinite(Vx)) goto skip;
-                if (!isfinite(Vy)) goto skip;
-
-                // 2D residual variations are set for the true source position
-                pixelValue += Io*(Vo + XoSave*Vx + XoSave*Vy);
+                int rx0 = rx - 0.5;
+                int rx1 = rx + 0.5;
+                int ry0 = ry - 0.5;
+                int ry1 = ry + 0.5;
+
+                if (rx0 < 0) goto skip;
+                if (ry0 < 0) goto skip;
+                if (rx1 >= NX) goto skip;
+                if (ry1 >= NY) goto skip;
+
+                // these go from 0.0 to 1.0 between the centers of the pixels
+                float fx = rx - 0.5 - rx0;
+                float Fx = 1.0 - fx;
+                float fy = ry - 0.5 - ry0;
+                float Fy = 1.0 - fy;
+
+                // check the residual image mask (if set). give up if any of the 4 pixels are masked.
+                if (Rm) {
+                    if (Rm[ry0][rx0]) goto skip;
+                    if (Rm[ry0][rx1]) goto skip;
+                    if (Rm[ry1][rx0]) goto skip;
+                    if (Rm[ry1][rx1]) goto skip;
+                }
+
+                // a possible further optimization if we re-use these values
+                // XXX allow for masked pixels, and add pixel weights
+                float V0 = (Ro[ry0][rx0]*Fx + Ro[ry0][rx1]*fx);
+                float V1 = (Ro[ry1][rx0]*Fx + Ro[ry1][rx1]*fx);
+                float Vo = V0*Fy + V1*fy;
+                if (!isfinite(Vo)) goto skip;
+
+                float Vx = 0.0;
+                float Vy = 0.0;
+
+                // skip Rx,Ry if Ro is masked
+                if (Rx && Ry && (mode & PM_MODEL_OP_RES1)) {
+                    V0 = (Rx[ry0][rx0]*Fx + Rx[ry0][rx1]*fx);
+                    V1 = (Rx[ry1][rx0]*Fx + Rx[ry1][rx1]*fx);
+                    Vx = V0*Fy + V1*fy;
+
+                    V0 = (Ry[ry0][rx0]*Fx + Ry[ry0][rx1]*fx);
+                    V1 = (Ry[ry1][rx0]*Fx + Ry[ry1][rx1]*fx);
+                    Vy = V0*Fy + V1*fy;
+                }
+                if (!isfinite(Vx)) goto skip;
+                if (!isfinite(Vy)) goto skip;
+
+                // 2D residual variations are set for the true source position
+                pixelValue += Io*(Vo + XoSave*Vx + XoSave*Vy);
             }
 
-        skip:
+        skip:
             // add or subtract the value
             if (add) {