Changeset 27840 for branches/simtest_nebulous_branches/psModules/src/objects/pmGrowthCurveGenerate.c

Timestamp:

May 3, 2010, 8:50:52 AM (16 years ago)

Author:

eugene

Message:

updates from trunk

Location:

branches/simtest_nebulous_branches

Files:

• . (modified) (1 prop)
• psModules (modified) (1 prop)
• psModules/src/objects/pmGrowthCurveGenerate.c (modified) (3 diffs)

branches/simtest_nebulous_branches/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;
@@ -156 +157 @@
 
     // measure the fitMag for this model
-    pmSourcePhotometryModel (&fitMag, model);
+    pmSourcePhotometryModel (&fitMag, NULL, model);
     growth->fitMag = fitMag;
 
@@ -195 +196 @@
             return NULL;
         }
-        psImageKeepCircle (mask, xc, yc, radius, "AND", PS_NOT_IMAGE_MASK(markVal));
+        psImageMaskPixels (mask, "AND", PS_NOT_IMAGE_MASK(markVal)); // clear the circular mask
 
         // the 'ignore' mode is for testing