Index: trunk/psphot/src/psphotOutput.c
===================================================================
--- trunk/psphot/src/psphotOutput.c	(revision 4954)
+++ trunk/psphot/src/psphotOutput.c	(revision 5048)
@@ -91,22 +91,22 @@
 
 	    // use PSF model with stars
-	  case PS_SOURCE_PSFSTAR:
-	  case PS_SOURCE_SATSTAR:
-	  case PS_SOURCE_GOODSTAR:
+	  case PM_SOURCE_PSFSTAR:
+	  case PM_SOURCE_SATSTAR:
+	  case PM_SOURCE_GOODSTAR:
 	    model = source->modelPSF;
 	    break;
 
 	    // use FLT model with galaxies
-	  case PS_SOURCE_GALAXY:
+	  case PM_SOURCE_GALAXY:
 	    model = source->modelFLT;
 	    break;
 	    
 	    // skip defects and poorly fitted stars or galaxies
-	  case PS_SOURCE_DEFECT:
-	  case PS_SOURCE_SATURATED:
-	  case PS_SOURCE_FAINTSTAR:
-	  case PS_SOURCE_POOR_FIT_PSF:
-	  case PS_SOURCE_POOR_FIT_GAL:
-	  case PS_SOURCE_FAIL_FIT_GAL:
+	  case PM_SOURCE_DEFECT:
+	  case PM_SOURCE_SATURATED:
+	  case PM_SOURCE_FAINTSTAR:
+	  case PM_SOURCE_POOR_FIT_PSF:
+	  case PM_SOURCE_POOR_FIT_GAL:
+	  case PM_SOURCE_FAIL_FIT_GAL:
 	  default:
 	    model = NULL;
@@ -183,26 +183,26 @@
 
 	    // use PSF model with stars
-	  case PS_SOURCE_SATSTAR:
+	  case PM_SOURCE_SATSTAR:
 	    flags = 4;
 	    model = source->modelPSF;
 	    break;
 
-	  case PS_SOURCE_PSFSTAR:
-	  case PS_SOURCE_GOODSTAR:
+	  case PM_SOURCE_PSFSTAR:
+	  case PM_SOURCE_GOODSTAR:
 	    model = source->modelPSF;
 	    break;
 
 	    // use FLT model with galaxies
-	  case PS_SOURCE_GALAXY:
+	  case PM_SOURCE_GALAXY:
 	    model = source->modelFLT;
 	    break;
 	    
 	    // skip defects and poorly fitted stars or galaxies
-	  case PS_SOURCE_DEFECT:
-	  case PS_SOURCE_SATURATED:
-	  case PS_SOURCE_FAINTSTAR:
-	  case PS_SOURCE_POOR_FIT_PSF:
-	  case PS_SOURCE_POOR_FIT_GAL:
-	  case PS_SOURCE_FAIL_FIT_GAL:
+	  case PM_SOURCE_DEFECT:
+	  case PM_SOURCE_SATURATED:
+	  case PM_SOURCE_FAINTSTAR:
+	  case PM_SOURCE_POOR_FIT_PSF:
+	  case PM_SOURCE_POOR_FIT_GAL:
+	  case PM_SOURCE_FAIL_FIT_GAL:
 	  default:
 	    model = NULL;
@@ -288,22 +288,22 @@
 
 	    // use PSF model with stars
-	  case PS_SOURCE_PSFSTAR:
-	  case PS_SOURCE_SATSTAR:
-	  case PS_SOURCE_GOODSTAR:
+	  case PM_SOURCE_PSFSTAR:
+	  case PM_SOURCE_SATSTAR:
+	  case PM_SOURCE_GOODSTAR:
 	    model = source->modelPSF;
 	    break;
 
 	    // use FLT model with galaxies
-	  case PS_SOURCE_GALAXY:
+	  case PM_SOURCE_GALAXY:
 	    model = source->modelFLT;
 	    break;
 	    
 	    // skip defects and poorly fitted stars or galaxies
-	  case PS_SOURCE_DEFECT:
-	  case PS_SOURCE_SATURATED:
-	  case PS_SOURCE_FAINTSTAR:
-	  case PS_SOURCE_POOR_FIT_PSF:
-	  case PS_SOURCE_POOR_FIT_GAL:
-	  case PS_SOURCE_FAIL_FIT_GAL:
+	  case PM_SOURCE_DEFECT:
+	  case PM_SOURCE_SATURATED:
+	  case PM_SOURCE_FAINTSTAR:
+	  case PM_SOURCE_POOR_FIT_PSF:
+	  case PM_SOURCE_POOR_FIT_GAL:
+	  case PM_SOURCE_FAIL_FIT_GAL:
 	  default:
 	    model = NULL;
@@ -445,7 +445,7 @@
 
 	// valid source types for this function
-	if (source->type == PS_SOURCE_SATSTAR) goto valid;
-	if (source->type == PS_SOURCE_PSFSTAR) goto valid;
-	if (source->type == PS_SOURCE_GOODSTAR) goto valid;
+	if (source->type == PM_SOURCE_SATSTAR) goto valid;
+	if (source->type == PM_SOURCE_PSFSTAR) goto valid;
+	if (source->type == PM_SOURCE_GOODSTAR) goto valid;
 	continue;
 
@@ -509,5 +509,5 @@
 	model = (pmModel  *) source->modelFLT;
 	if (model == NULL) continue;
-	if (source->type == PS_SOURCE_GALAXY) goto valid;
+	if (source->type == PM_SOURCE_GALAXY) goto valid;
 	continue;
 
@@ -570,8 +570,8 @@
 
 	// skip these sources (in PSF or FLT)
-	if (source->type == PS_SOURCE_GALAXY) continue;
-	if (source->type == PS_SOURCE_PSFSTAR) continue;
-	if (source->type == PS_SOURCE_SATSTAR) continue;
-	if (source->type == PS_SOURCE_GOODSTAR) continue;
+	if (source->type == PM_SOURCE_GALAXY) continue;
+	if (source->type == PM_SOURCE_PSFSTAR) continue;
+	if (source->type == PM_SOURCE_SATSTAR) continue;
+	if (source->type == PM_SOURCE_GOODSTAR) continue;
 
 	if (source->moments == NULL) {
@@ -602,30 +602,30 @@
     switch (source->type) {
 
-      case PS_SOURCE_DEFECT:
-      case PS_SOURCE_SATURATED:
+      case PM_SOURCE_DEFECT:
+      case PM_SOURCE_SATURATED:
 	return (8);
 
-      case PS_SOURCE_SATSTAR:
+      case PM_SOURCE_SATSTAR:
 	return (10);
 
-      case PS_SOURCE_PSFSTAR:
-      case PS_SOURCE_GOODSTAR:
+      case PM_SOURCE_PSFSTAR:
+      case PM_SOURCE_GOODSTAR:
 	return (1);
 
-      case PS_SOURCE_POOR_FIT_PSF:
+      case PM_SOURCE_POOR_FIT_PSF:
 	return (7);
 
-      case PS_SOURCE_FAIL_FIT_PSF:
-      case PS_SOURCE_FAINTSTAR:
+      case PM_SOURCE_FAIL_FIT_PSF:
+      case PM_SOURCE_FAINTSTAR:
 	return (4);
 
-      case PS_SOURCE_GALAXY:
-      case PS_SOURCE_FAINT_GALAXY:
-      case PS_SOURCE_DROP_GALAXY:
-      case PS_SOURCE_FAIL_FIT_GAL:
-      case PS_SOURCE_POOR_FIT_GAL:
+      case PM_SOURCE_GALAXY:
+      case PM_SOURCE_FAINT_GALAXY:
+      case PM_SOURCE_DROP_GALAXY:
+      case PM_SOURCE_FAIL_FIT_GAL:
+      case PM_SOURCE_POOR_FIT_GAL:
 	return (2);
 
-      case PS_SOURCE_OTHER:
+      case PM_SOURCE_OTHER:
       default:
 	return (0);