Index: trunk/psphot/src/psphotApResid.c
===================================================================
--- trunk/psphot/src/psphotApResid.c	(revision 6495)
+++ trunk/psphot/src/psphotApResid.c	(revision 6715)
@@ -30,13 +30,13 @@
     Npsf = 0;
 
-    // select all good PM_SOURCE_STAR entries
+    // select all good PM_SOURCE_TYPE_STAR entries
     for (int i = 0; i < sources->n; i++) {
 	source = sources->data[i];
 
-	if (source->type != PM_SOURCE_STAR) continue; 
-	if (source->mode &  PM_SOURCE_SATSTAR) continue;
-	if (source->mode &  PM_SOURCE_BLEND) continue;
-	if (source->mode &  PM_SOURCE_FAIL) continue;
-	if (source->mode &  PM_SOURCE_POOR) continue;
+	if (source->type != PM_SOURCE_TYPE_STAR) continue; 
+	if (source->mode &  PM_SOURCE_MODE_SATSTAR) continue;
+	if (source->mode &  PM_SOURCE_MODE_BLEND) continue;
+	if (source->mode &  PM_SOURCE_MODE_FAIL) continue;
+	if (source->mode &  PM_SOURCE_MODE_POOR) continue;
 
 	// XXX tune independently?
@@ -51,8 +51,8 @@
 	yPos->data.F64[Npsf] = model->params->data.F32[3];
 
-	flux->data.F64[Npsf] = pow(10.0, -0.4*source->fitMag);
+	flux->data.F64[Npsf] = pow(10.0, -0.4*source->psfMag);
 	r2rflux->data.F64[Npsf] = PS_SQR(model->radius) / flux->data.F64[Npsf];
 	
-	apResid->data.F64[Npsf] = source->apMag + pmGrowthCurveCorrect (psf->growth, model->radius) - source->fitMag ;
+	apResid->data.F64[Npsf] = source->apMag + pmGrowthCurveCorrect (psf->growth, model->radius) - source->psfMag;
 
 	// XXX sanity clip?