Index: trunk/psModules/src/objects/pmSourceIO_CMF.c
===================================================================
--- trunk/psModules/src/objects/pmSourceIO_CMF.c	(revision 8815)
+++ trunk/psModules/src/objects/pmSourceIO_CMF.c	(revision 8880)
@@ -3,6 +3,6 @@
  *  @author EAM, IfA
  *
- *  @version $Revision: 1.7 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2006-09-15 09:49:01 $
+ *  @version $Revision: 1.8 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2006-09-22 12:24:17 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -63,14 +63,14 @@
 
         type = pmSourceDophotType (source);
-        lsky = (PAR[0] < 1.0) ? 0.0 : log10(PAR[0]);
+        lsky = (PAR[PM_PAR_SKY] < 1.0) ? 0.0 : log10(PAR[PM_PAR_SKY]);
 
-        shape.sx  = PAR[4];
-        shape.sy  = PAR[5];
-        shape.sxy = PAR[6];
+        shape.sx  = PAR[PM_PAR_SXX];
+        shape.sy  = PAR[PM_PAR_SYY];
+        shape.sxy = PAR[PM_PAR_SXY];
         axes = psEllipseShapeToAxes (shape);
 
         row = psMetadataAlloc ();
-        psMetadataAdd (row, PS_LIST_TAIL, "X_PIX",   PS_DATA_F32, "", PAR[2]);
-        psMetadataAdd (row, PS_LIST_TAIL, "Y_PIX",   PS_DATA_F32, "", PAR[3]);
+        psMetadataAdd (row, PS_LIST_TAIL, "X_PIX",   PS_DATA_F32, "", PAR[PM_PAR_XPOS]);
+        psMetadataAdd (row, PS_LIST_TAIL, "Y_PIX",   PS_DATA_F32, "", PAR[PM_PAR_YPOS]);
         psMetadataAdd (row, PS_LIST_TAIL, "MAG_RAW", PS_DATA_F32, "", PS_MIN (99.0, source->psfMag + ZERO_POINT));
         psMetadataAdd (row, PS_LIST_TAIL, "MAG_GAL", PS_DATA_F32, "", PS_MIN (99.0, source->extMag + ZERO_POINT));
@@ -83,5 +83,4 @@
         psMetadataAdd (row, PS_LIST_TAIL, "DOPHOT",  PS_DATA_U8,  "", type);
         psMetadataAdd (row, PS_LIST_TAIL, "WEIGHT",  PS_DATA_U8,  "", PS_MIN (255, PS_MAX(0, 255*source->pixWeight)));
-        psMetadataAdd (row, PS_LIST_TAIL, "DUMMY",   PS_DATA_STRING, "", "12");
 
         psArrayAdd (table, 100, row);
@@ -145,17 +144,17 @@
         psMetadata *row = table->data[i];
 
-        lsky           = psMetadataLookupF32 (&status, row, "LOG_SKY");
-        PAR[0]         = pow(lsky, 10.0);
-        PAR[2]         = psMetadataLookupF32 (&status, row, "X_PIX");
-        PAR[3]         = psMetadataLookupF32 (&status, row, "Y_PIX");
-        axes.major     = psMetadataLookupF32 (&status, row, "FWHM_X");
-        axes.minor     = psMetadataLookupF32 (&status, row, "FWHM_Y");
-        axes.theta     = psMetadataLookupF32 (&status, row, "THETA");
+        lsky             = psMetadataLookupF32 (&status, row, "LOG_SKY");
+        PAR[PM_PAR_SKY]  = pow(lsky, 10.0);
+        PAR[PM_PAR_XPOS] = psMetadataLookupF32 (&status, row, "X_PIX");
+        PAR[PM_PAR_YPOS] = psMetadataLookupF32 (&status, row, "Y_PIX");
+        axes.major       = psMetadataLookupF32 (&status, row, "FWHM_X");
+        axes.minor       = psMetadataLookupF32 (&status, row, "FWHM_Y");
+        axes.theta       = psMetadataLookupF32 (&status, row, "THETA");
 
         shape = psEllipseAxesToShape (axes);
 
-        PAR[4] = shape.sx;
-        PAR[5] = shape.sy;
-        PAR[6] = shape.sxy;
+        PAR[PM_PAR_SXX] = shape.sx;
+        PAR[PM_PAR_SYY] = shape.sy;
+        PAR[PM_PAR_SXY] = shape.sxy;
 
         source->psfMag = psMetadataLookupF32 (&status, row, "MAG_RAW") - ZERO_POINT;