Index: trunk/psModules/src/objects/pmSourcePhotometry.c
===================================================================
--- trunk/psModules/src/objects/pmSourcePhotometry.c	(revision 14938)
+++ trunk/psModules/src/objects/pmSourcePhotometry.c	(revision 14962)
@@ -3,6 +3,6 @@
  *  @author EAM, IfA; GLG, MHPCC
  *
- *  @version $Revision: 1.30 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2007-09-21 00:09:05 $
+ *  @version $Revision: 1.31 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2007-09-21 02:46:46 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -94,7 +94,18 @@
     y = model->params->data.F32[PM_PAR_YPOS];
 
-    // measure object model photometry
-    // XXX use the pmPSF.FluxScale to get this value
-    status = pmSourcePhotometryModel (&source->psfMag, source->modelPSF);
+    // measure PSF model photometry
+    if (psf->FluxScale) {
+	double fluxScale = pmTrend2DEval (psf->FluxScale, x, y);
+	if (isfinite(fluxScale) && (fluxScale > 0.0)) {
+	    source->psfMag = -2.5*log10(fluxScale * source->modelPSF->params->data.F32[PM_PAR_I0]);
+	} else {
+	    source->psfMag = NAN;
+	}
+	fprintf (stderr, ".");
+    } else {
+	status = pmSourcePhotometryModel (&source->psfMag, source->modelPSF);
+    }
+
+    // measure EXT model photometry
     status = pmSourcePhotometryModel (&source->extMag, source->modelEXT);
     // for PSFs, correct both apMag and psfMag to same system, consistent with infinite flux star in aperture RADIUS