Changeset 6715 for trunk/psphot/src/psphotGrowthCurve.c

Timestamp:

Mar 27, 2006, 4:31:17 PM (20 years ago)

Author:

eugene

Message:

substantial work on the pmFPAfile,view concepts

File:

• trunk/psphot/src/psphotGrowthCurve.c (modified) (2 diffs)

trunk/psphot/src/psphotGrowthCurve.c

@@ -16 +16 @@
 
     // use center of the image 
-    xc = 0.5*(readout->image->numCols + readout->image->col0);
-    yc = 0.5*(readout->image->numRows + readout->image->row0);
+    xc = 0.5*readout->image->numCols + readout->image->col0;
+    yc = 0.5*readout->image->numRows + readout->image->row0;
     dx = psf->growth->maxRadius + 1;
     dy = psf->growth->maxRadius + 1;
@@ -45 +45 @@
         radius = psf->growth->radius->data.F32[i];
 
-        psImageKeepCircle (mask, xc, yc, radius, "OR", PSPHOT_MASK_MARKED);
+        psImageKeepCircle (mask, xc, yc, radius, "OR", PM_SOURCE_MASK_MARKED);
 
-        pmSourceAddModel (image, mask, model, false, false);
+        pmModelAdd (image, mask, model, false, false);
 
-        pmSourcePhotometry (&fitMag, &apMag, model, image, mask);
+        pmSourcePhotometryAper (&apMag, model, image, mask);
 
-        psImageKeepCircle (mask, xc, yc, radius, "AND", ~PSPHOT_MASK_MARKED);
+        psImageKeepCircle (mask, xc, yc, radius, "AND", ~PM_SOURCE_MASK_MARKED);
 
         psf->growth->apMag->data.F32[i] = apMag;
     }
+    pmSourcePhotometryModel (&fitMag, model);
     psf->growth->fitMag = fitMag;