Changeset 23197 for branches/cnb_branches/cnb_branch_20090215/psModules/src/objects/pmModel.c

Timestamp:

Mar 5, 2009, 11:13:29 AM (17 years ago)

Author:

beaumont

Message:

Finished ppStack visualization. Unified the way in which visualizations are invoked, plotting windows are closed, etc

Location:

branches/cnb_branches/cnb_branch_20090215

Files:

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

branches/cnb_branches/cnb_branch_20090215/psModules/src/objects/pmModel.c

@@ -6 +6 @@
  *  @author EAM, IfA
  *
- *  @version $Revision: 1.27.4.1 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2009-02-19 17:59:50 $
+ *  @version $Revision: 1.28 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2009-02-16 22:30:26 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -235 +235 @@
 
     if (model->residuals) {
-        DX = xBin*(image->col0 - xCenter - dx) + model->residuals->xCenter + 0.5;
-        DY = yBin*(image->row0 - yCenter - dy) + model->residuals->yCenter + 0.5;
-        Ro = (model->residuals->Ro)   ? model->residuals->Ro->data.F32 : NULL;
-        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;
-        if (Ro) {
-            NX = model->residuals->Ro->numCols;
-            NY = model->residuals->Ro->numRows;
-        }
+        DX = xBin*(image->col0 - xCenter - dx) + model->residuals->xCenter + 0.5;
+        DY = yBin*(image->row0 - yCenter - dy) + model->residuals->yCenter + 0.5;
+        Ro = (model->residuals->Ro)   ? model->residuals->Ro->data.F32 : NULL;
+        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;
+        if (Ro) {
+            NX = model->residuals->Ro->numCols;
+            NY = model->residuals->Ro->numRows;
+        }           
     }
 
@@ -256 +256 @@
 
             // XXX should we use using 0.5 pixel offset?
-            // Convert to coordinate in parent image, with offset (dx,dy)
+            // Convert to coordinate in parent image, with offset (dx,dy)
             imageCol = ix + image->col0 - dx;
             imageRow = iy + image->row0 - dy;
@@ -276 +276 @@
                 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) {