Index: trunk/psphot/src/psphotEvalFLT.c
===================================================================
--- trunk/psphot/src/psphotEvalFLT.c	(revision 5993)
+++ trunk/psphot/src/psphotEvalFLT.c	(revision 6715)
@@ -7,5 +7,5 @@
     // do we actually have a valid EXT model?
     if (model == NULL) {
-	source->mode &= ~PM_SOURCE_FITTED;
+	source->mode &= ~PM_SOURCE_MODE_FITTED;
 	return false;
     }
@@ -16,5 +16,5 @@
 	break;
       case PM_MODEL_UNTRIED:
-	source->mode &= ~PM_SOURCE_FITTED; 
+	source->mode &= ~PM_SOURCE_MODE_FITTED; 
 	return false;
       case PM_MODEL_BADARGS:
@@ -23,17 +23,17 @@
       default:
 	psLogMsg ("psphot", 5, "EXT fail fit\n");
-	source->mode |= PM_SOURCE_FAIL;
+	source->mode |= PM_SOURCE_MODE_FAIL;
 	return false;
     }
 
     // unless we prove otherwise, this object is extended
-    source->type = PM_SOURCE_EXTENDED;
+    source->type = PM_SOURCE_TYPE_EXTENDED;
 
     // the following source->mode information pertains to modelEXT:
-    source->mode |= PM_SOURCE_EXTMODEL;
+    source->mode |= PM_SOURCE_MODE_EXTMODEL;
 
     // 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;
     } 
@@ -44,5 +44,5 @@
     // poor-quality fit; only keep if nothing else works...
     psLogMsg ("psphot", 5, "EXT poor fit\n");
-    source->mode |= PM_SOURCE_POOR;
+    source->mode |= PM_SOURCE_MODE_POOR;
     return false;
 }