Changeset 20592 for trunk/psModules/src/objects/pmModel.c

Timestamp:

Nov 8, 2008, 2:28:18 PM (18 years ago)

Author:

eugene

Message:

move residuals correctly with the PSF when using the offsets

File:

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

trunk/psModules/src/objects/pmModel.c

@@ -6 +6 @@
  *  @author EAM, IfA
  *
- *  @version $Revision: 1.24 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2008-10-29 00:01:22 $
+ *  @version $Revision: 1.25 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2008-11-09 00:28:18 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -211 +211 @@
 
     // apply optional relative offset
-    params->data.F32[PM_PAR_XPOS] += dx;
-    params->data.F32[PM_PAR_YPOS] += dy;
+    // params->data.F32[PM_PAR_XPOS] += dx;
+    // params->data.F32[PM_PAR_YPOS] += dy;
 
     // use these values for this realization
@@ -232 +232 @@
 
     if (model->residuals) {
-        DX = xBin*(image->col0 - xCenter) + model->residuals->xCenter + 0.5;
-        DY = yBin*(image->row0 - yCenter) + model->residuals->yCenter + 0.5;
+        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;
@@ -254 +254 @@
             // XXX should we use using 0.5 pixel offset?
             // Convert to coordinate in parent image, with offset (dx,dy)
-            imageCol = ix + image->col0;
-            imageRow = iy + image->row0;
+            imageCol = ix + image->col0 - dx;
+            imageRow = iy + image->row0 - dy;
 
             x->data.F32[0] = (float) imageCol;