Index: trunk/psphot/src/psphotEvalPSF.c
===================================================================
--- trunk/psphot/src/psphotEvalPSF.c	(revision 5993)
+++ trunk/psphot/src/psphotEvalPSF.c	(revision 6715)
@@ -54,5 +54,5 @@
     // do we actually have a valid PSF model?
     if (model == NULL) {
-	source->mode &= ~PM_SOURCE_FITTED;
+	source->mode &= ~PM_SOURCE_MODE_FITTED;
 	return false;
     }
@@ -63,5 +63,5 @@
 	break;
       case PM_MODEL_UNTRIED:
-	source->mode &= ~PM_SOURCE_FITTED; 
+	source->mode &= ~PM_SOURCE_MODE_FITTED; 
 	return false;
       case PM_MODEL_BADARGS:
@@ -69,13 +69,13 @@
       case PM_MODEL_OFFIMAGE:
       default:
-	source->mode |= PM_SOURCE_FAIL;
+	source->mode |= PM_SOURCE_MODE_FAIL;
 	return false;
     }
 
     // unless we prove otherwise, this object is a star.
-    source->type = PM_SOURCE_STAR;
+    source->type = PM_SOURCE_TYPE_STAR;
 
     // the following source->mode information pertains to modelPSF:
-    source->mode |= PM_SOURCE_PSFMODEL;
+    source->mode |= PM_SOURCE_MODE_PSFMODEL;
 
     // if the object has fitted peak above saturation, label as SATSTAR
@@ -84,8 +84,8 @@
     // XXX no extended object can saturate and stay extended...
     if (model->params->data.F32[1] >= SATURATION) {
-	if (source->mode & PM_SOURCE_PSFSTAR) {
+	if (source->mode & PM_SOURCE_MODE_PSFSTAR) {
 	    psLogMsg ("psphot", 5, "PSFSTAR marked SATSTAR\n");
 	}
-	source->mode |=  PM_SOURCE_SATSTAR;
+	source->mode |=  PM_SOURCE_MODE_SATSTAR;
 	return true;
     } 
@@ -93,5 +93,5 @@
     // if the object has a fitted peak below 0, the fit did not converge cleanly
     if (model->params->data.F32[1] <= 0) {
-	source->mode |= PM_SOURCE_FAIL;
+	source->mode |= PM_SOURCE_MODE_FAIL;
 	return false;
     } 
@@ -99,7 +99,7 @@
     // if the source was predicted to be a SATSTAR, but it fitted below saturation, 
     // make a note to the user
-    if (source->mode & PM_SOURCE_SATSTAR) {
+    if (source->mode & PM_SOURCE_MODE_SATSTAR) {
 	psLogMsg ("psphot", 5, "SATSTAR marked normal (fitted peak below saturation)\n");
-	source->mode &= ~PM_SOURCE_SATSTAR;
+	source->mode &= ~PM_SOURCE_MODE_SATSTAR;
     }
 
@@ -115,5 +115,5 @@
     nSy = dSY / hypot (MIN_DS, 1 / (SY * SN));
 
-    // assign PM_SOURCE_GOODSTAR to bright objects within PSF region of dparams[]
+    // assign PM_SOURCE_MODE_GOODSTAR to bright objects within PSF region of dparams[]
     keep = TRUE;
     keep &= (fabs(nSx) < PSF_SHAPE_NSIGMA);
@@ -124,5 +124,5 @@
 
     // this source is not a star, warn if it was a PSFSTAR
-    if (source->mode & PM_SOURCE_PSFSTAR) {
+    if (source->mode & PM_SOURCE_MODE_PSFSTAR) {
 	psLogMsg ("psphot", 5, "PSFSTAR demoted based on fit quality   (%f, %f  :  %f %f %f %f)\n", 
 		  model->params->data.F32[2], model->params->data.F32[3], nSx, nSy, SN, Chi);
@@ -134,5 +134,5 @@
     // object appears to be small, suspected defect
     if ((nSx <= -PSF_SHAPE_NSIGMA) || (nSy <= -PSF_SHAPE_NSIGMA)) {
-	source->type = PM_SOURCE_DEFECT;
+	source->type = PM_SOURCE_TYPE_DEFECT;
 	return false;
     }
@@ -140,10 +140,10 @@
     // object appears to be large, suspected extended source
     if ((nSx >= PSF_SHAPE_NSIGMA) || (nSy >= PSF_SHAPE_NSIGMA)) {
-	source->type = PM_SOURCE_EXTENDED;
+	source->type = PM_SOURCE_TYPE_EXTENDED;
 	return false;
     }
 
     // poor-quality fit; only keep if nothing else works...
-    source->mode |= PM_SOURCE_POOR;
+    source->mode |= PM_SOURCE_MODE_POOR;
     return false;
 }	
@@ -155,5 +155,5 @@
     // do we actually have a valid PSF model?
     if (model == NULL) {
-	source->mode &= ~PM_SOURCE_FITTED;
+	source->mode &= ~PM_SOURCE_MODE_FITTED;
 	return false;
     }
@@ -164,5 +164,5 @@
 	break;
       case PM_MODEL_UNTRIED:
-	source->mode &= ~PM_SOURCE_FITTED; 
+	source->mode &= ~PM_SOURCE_MODE_FITTED; 
 	return false;
       case PM_MODEL_BADARGS:
@@ -170,13 +170,13 @@
       case PM_MODEL_OFFIMAGE:
       default:
-	source->mode |= PM_SOURCE_FAIL;
+	source->mode |= PM_SOURCE_MODE_FAIL;
 	return false;
     }
 
     // unless we prove otherwise, this object is a star.
-    source->type = PM_SOURCE_STAR;
+    source->type = PM_SOURCE_TYPE_STAR;
 
     // the following source->mode information pertains to modelPSF:
-    source->mode |= PM_SOURCE_PSFMODEL;
+    source->mode |= PM_SOURCE_MODE_PSFMODEL;
 
     // if the object has fitted peak above saturation, label as SATSTAR
@@ -185,8 +185,8 @@
     // XXX no extended object can saturate and stay extended...
     if (model->params->data.F32[1] >= SATURATION) {
-	if (source->mode & PM_SOURCE_PSFSTAR) {
+	if (source->mode & PM_SOURCE_MODE_PSFSTAR) {
 	    psLogMsg ("psphot", 5, "PSFSTAR marked SATSTAR\n");
 	}
-	source->mode |=  PM_SOURCE_SATSTAR;
+	source->mode |=  PM_SOURCE_MODE_SATSTAR;
 	return true;
     } 
@@ -194,5 +194,5 @@
     // if the object has a fitted peak below 0, the fit did not converge cleanly
     if (model->params->data.F32[1] <= 0) {
-	source->mode |= PM_SOURCE_FAIL;
+	source->mode |= PM_SOURCE_MODE_FAIL;
 	return false;
     } 
@@ -200,7 +200,7 @@
     // if the source was predicted to be a SATSTAR, but it fitted below saturation, 
     // make a note to the user
-    if (source->mode & PM_SOURCE_SATSTAR) {
+    if (source->mode & PM_SOURCE_MODE_SATSTAR) {
 	psLogMsg ("psphot", 5, "SATSTAR marked normal (fitted peak below saturation)\n");
-	source->mode &= ~PM_SOURCE_SATSTAR;
+	source->mode &= ~PM_SOURCE_MODE_SATSTAR;
     }
     return true;