Changeset 25303

Timestamp:

Sep 9, 2009, 8:42:16 AM (17 years ago)

Author:

eugene

Message:

0.5 pix center corrections

Location:

branches/eam_branches/20090715/psModules/src/objects

Files:

• models/pmModel_GAUSS.c (modified) (1 diff)
• pmGrowthCurveGenerate.c (modified) (1 diff)
• pmPSFtry.c (modified) (1 diff)
• pmSourceFitModel.c (modified) (1 diff)
• pmSourceFitSet.c (modified) (1 diff)

branches/eam_branches/20090715/psModules/src/objects/models/pmModel_GAUSS.c

@@ -29 +29 @@
 
 // the model is a function of the pixel coordinate (pixcoord[0,1] = x,y)
+// 0.5 PIX: the parameters are defined in terms of pixel coords, so the incoming pixcoords
+// values need to be pixel coords
 psF32 PM_MODEL_FUNC(psVector *deriv,
                     const psVector *params,

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

@@ -65 +65 @@
 
             // use the center of the center pixel of the image
+            // 0.5 PIX: is this offset needed? probably -- the psf model uses 0.5,0.5 as the center, double check
             float xc = (int)(ix*readout->image->numCols + 0.5*readout->image->numCols) + readout->image->col0 + 0.5;
             float yc = (int)(iy*readout->image->numRows + 0.5*readout->image->numRows) + readout->image->row0 + 0.5;

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

@@ -191 +191 @@
 
         // set object mask to define valid pixels
+        // XXX 0.5 PIX: is the circle symmetric about the peak coordinate (given 0.5,0.5 center)?
         psImageKeepCircle (source->maskObj, source->peak->x, source->peak->y, options->radius, "OR", markVal);
 

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

@@ -96 +96 @@
 
             // Convert i/j to image space:
-            coord->data.F32[0] = (psF32) (j + source->pixels->col0);
-            coord->data.F32[1] = (psF32) (i + source->pixels->row0);
+            // 0.5 PIX: the coordinate values must be in pixel coords, not index            
+            coord->data.F32[0] = (psF32) (j + 0.5 + source->pixels->col0);
+            coord->data.F32[1] = (psF32) (i + 0.5 + source->pixels->row0);
             x->data[nPix] = (psPtr *) coord;
             y->data.F32[nPix] = source->pixels->data.F32[i][j];

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

@@ -483 +483 @@
 
             // Convert i/j to image space:
-            coord->data.F32[0] = (psF32) (j + source->pixels->col0);
-            coord->data.F32[1] = (psF32) (i + source->pixels->row0);
+            // 0.5 PIX: the coordinate values must be in pixel coords, not index            
+            coord->data.F32[0] = (psF32) (j + 0.5 + source->pixels->col0);
+            coord->data.F32[1] = (psF32) (i + 0.5 + source->pixels->row0);
             x->data[nPix] = (psPtr *) coord;
             y->data.F32[nPix] = source->pixels->data.F32[i][j];