Changeset 25745 for branches/eam_branches/20090715/psModules/src/objects/pmModel.c

Timestamp:

Oct 2, 2009, 12:11:34 PM (17 years ago)

Author:

eugene

Message:

merge changes from trunk

File:

• branches/eam_branches/20090715/psModules/src/objects/pmModel.c (modified) (3 diffs)

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

@@ -87 +87 @@
     tmp->modelParamsFromPSF = class->modelParamsFromPSF;
     tmp->modelFitStatus     = class->modelFitStatus;
+    tmp->modelSetLimits     = class->modelSetLimits;
 
     psTrace("psModules.objects", 10, "---- %s() end ----\n", __func__);
@@ -256 +257 @@
                 continue;
 
-            // Convert to coordinate in parent image, with offset (dx,dy)
+            // 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;
@@ -277 +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) {