Index: trunk/psphot/src/psphotOutput.c
===================================================================
--- trunk/psphot/src/psphotOutput.c	(revision 5128)
+++ trunk/psphot/src/psphotOutput.c	(revision 5350)
@@ -186,15 +186,15 @@
 
     // write necessary information to output header
-    psMetadataAdd (imdata->header, PS_LIST_TAIL, "NSTARS",   PS_META_S32 | PS_META_REPLACE, "NUMBER OF STARS",     sources->n);
-    psMetadataAdd (imdata->header, PS_LIST_TAIL, "ZERO_PT",  PS_META_F32 | PS_META_REPLACE, "zero point",          ZERO_POINT);
-    psMetadataAdd (imdata->header, PS_LIST_TAIL, "APMIFIT",  PS_META_F32 | PS_META_REPLACE, "aperture residual",   psf->ApResid);
-    psMetadataAdd (imdata->header, PS_LIST_TAIL, "dAPMIFIT", PS_META_F32 | PS_META_REPLACE, "ap residual scatter", psf->dApResid);
-    psMetadataAdd (imdata->header, PS_LIST_TAIL, "SKYBIAS",  PS_META_F32 | PS_META_REPLACE, "aperture sky bias",   psf->skyBias);
-    psMetadataAdd (imdata->header, PS_LIST_TAIL, "PHOTCODE", PS_META_STR | PS_META_REPLACE, "photometry code",     PHOTCODE);
-    psMetadataAdd (imdata->header, PS_LIST_TAIL, "FWHM_X",   PS_META_F32 | PS_META_REPLACE, "PSF FWHM X",          0.0);
-    psMetadataAdd (imdata->header, PS_LIST_TAIL, "FWHM_Y",   PS_META_F32 | PS_META_REPLACE, "PSF FWHM Y",          0.0);
-    psMetadataAdd (imdata->header, PS_LIST_TAIL, "ANGLE",    PS_META_F32 | PS_META_REPLACE, "PSF ANGLE",           0.0);
-    psMetadataAdd (imdata->header, PS_LIST_TAIL, "FSATUR",   PS_META_F32 | PS_META_REPLACE, "SATURATION MAG",      0.0);
-    psMetadataAdd (imdata->header, PS_LIST_TAIL, "FLIMIT",   PS_META_F32 | PS_META_REPLACE, "COMPLETENESS MAG",    0.0);
+    psMetadataAdd (imdata->header, PS_LIST_TAIL, "NSTARS",   PS_DATA_S32 | PS_META_REPLACE, "NUMBER OF STARS",     sources->n);
+    psMetadataAdd (imdata->header, PS_LIST_TAIL, "ZERO_PT",  PS_DATA_F32 | PS_META_REPLACE, "zero point",          ZERO_POINT);
+    psMetadataAdd (imdata->header, PS_LIST_TAIL, "APMIFIT",  PS_DATA_F32 | PS_META_REPLACE, "aperture residual",   psf->ApResid);
+    psMetadataAdd (imdata->header, PS_LIST_TAIL, "dAPMIFIT", PS_DATA_F32 | PS_META_REPLACE, "ap residual scatter", psf->dApResid);
+    psMetadataAdd (imdata->header, PS_LIST_TAIL, "SKYBIAS",  PS_DATA_F32 | PS_META_REPLACE, "aperture sky bias",   psf->skyBias);
+    psMetadataAdd (imdata->header, PS_LIST_TAIL, "PHOTCODE", PS_DATA_STRING | PS_META_REPLACE, "photometry code",     PHOTCODE);
+    psMetadataAdd (imdata->header, PS_LIST_TAIL, "FWHM_X",   PS_DATA_F32 | PS_META_REPLACE, "PSF FWHM X",          0.0);
+    psMetadataAdd (imdata->header, PS_LIST_TAIL, "FWHM_Y",   PS_DATA_F32 | PS_META_REPLACE, "PSF FWHM Y",          0.0);
+    psMetadataAdd (imdata->header, PS_LIST_TAIL, "ANGLE",    PS_DATA_F32 | PS_META_REPLACE, "PSF ANGLE",           0.0);
+    psMetadataAdd (imdata->header, PS_LIST_TAIL, "FSATUR",   PS_DATA_F32 | PS_META_REPLACE, "SATURATION MAG",      0.0);
+    psMetadataAdd (imdata->header, PS_LIST_TAIL, "FLIMIT",   PS_DATA_F32 | PS_META_REPLACE, "COMPLETENESS MAG",    0.0);
 
     // create file, write-out header
@@ -205,7 +205,7 @@
     mdi = psMetadataLookup (imdata->header, "NAXIS");
     mdi->data.S32 = 0;
-    mdi->type = PS_META_S32;
-
-    // psMetadataAdd (imdata->header, PS_LIST_HEAD, "NAXIS", PS_META_S32 | PS_META_REPLACE, "", 0);
+    mdi->type = PS_DATA_S32;
+
+    // psMetadataAdd (imdata->header, PS_LIST_HEAD, "NAXIS", PS_DATA_S32 | PS_META_REPLACE, "", 0);
     psFitsWriteHeader (imdata->header, fits);
     psFree (fits);
@@ -275,15 +275,15 @@
 
     // write necessary information to output header
-    psMetadataAdd (imdata->header, PS_LIST_TAIL, "NSTARS",   PS_META_S32 | PS_META_REPLACE, "NUMBER OF STARS",     sources->n);
-    psMetadataAdd (imdata->header, PS_LIST_TAIL, "ZERO_PT",  PS_META_F32 | PS_META_REPLACE, "zero point",          ZERO_POINT);
-    psMetadataAdd (imdata->header, PS_LIST_TAIL, "APMIFIT",  PS_META_F32 | PS_META_REPLACE, "aperture residual",   psf->ApResid);
-    psMetadataAdd (imdata->header, PS_LIST_TAIL, "dAPMIFIT", PS_META_F32 | PS_META_REPLACE, "ap residual scatter", psf->dApResid);
-    psMetadataAdd (imdata->header, PS_LIST_TAIL, "SKYBIAS",  PS_META_F32 | PS_META_REPLACE, "aperture sky bias",   psf->skyBias);
-    psMetadataAdd (imdata->header, PS_LIST_TAIL, "PHOTCODE", PS_META_STR | PS_META_REPLACE, "photometry code",     PHOTCODE);
-    psMetadataAdd (imdata->header, PS_LIST_TAIL, "FWHM_X",   PS_META_F32 | PS_META_REPLACE, "PSF FWHM X",          0.0);
-    psMetadataAdd (imdata->header, PS_LIST_TAIL, "FWHM_Y",   PS_META_F32 | PS_META_REPLACE, "PSF FWHM Y",          0.0);
-    psMetadataAdd (imdata->header, PS_LIST_TAIL, "ANGLE",    PS_META_F32 | PS_META_REPLACE, "PSF ANGLE",           0.0);
-    psMetadataAdd (imdata->header, PS_LIST_TAIL, "FSATUR",   PS_META_F32 | PS_META_REPLACE, "SATURATION MAG",      0.0);
-    psMetadataAdd (imdata->header, PS_LIST_TAIL, "FLIMIT",   PS_META_F32 | PS_META_REPLACE, "COMPLETENESS MAG",    0.0);
+    psMetadataAdd (imdata->header, PS_LIST_TAIL, "NSTARS",   PS_DATA_S32 | PS_META_REPLACE, "NUMBER OF STARS",     sources->n);
+    psMetadataAdd (imdata->header, PS_LIST_TAIL, "ZERO_PT",  PS_DATA_F32 | PS_META_REPLACE, "zero point",          ZERO_POINT);
+    psMetadataAdd (imdata->header, PS_LIST_TAIL, "APMIFIT",  PS_DATA_F32 | PS_META_REPLACE, "aperture residual",   psf->ApResid);
+    psMetadataAdd (imdata->header, PS_LIST_TAIL, "dAPMIFIT", PS_DATA_F32 | PS_META_REPLACE, "ap residual scatter", psf->dApResid);
+    psMetadataAdd (imdata->header, PS_LIST_TAIL, "SKYBIAS",  PS_DATA_F32 | PS_META_REPLACE, "aperture sky bias",   psf->skyBias);
+    psMetadataAdd (imdata->header, PS_LIST_TAIL, "PHOTCODE", PS_DATA_STRING | PS_META_REPLACE, "photometry code",     PHOTCODE);
+    psMetadataAdd (imdata->header, PS_LIST_TAIL, "FWHM_X",   PS_DATA_F32 | PS_META_REPLACE, "PSF FWHM X",          0.0);
+    psMetadataAdd (imdata->header, PS_LIST_TAIL, "FWHM_Y",   PS_DATA_F32 | PS_META_REPLACE, "PSF FWHM Y",          0.0);
+    psMetadataAdd (imdata->header, PS_LIST_TAIL, "ANGLE",    PS_DATA_F32 | PS_META_REPLACE, "PSF ANGLE",           0.0);
+    psMetadataAdd (imdata->header, PS_LIST_TAIL, "FSATUR",   PS_DATA_F32 | PS_META_REPLACE, "SATURATION MAG",      0.0);
+    psMetadataAdd (imdata->header, PS_LIST_TAIL, "FLIMIT",   PS_DATA_F32 | PS_META_REPLACE, "COMPLETENESS MAG",    0.0);
 
     // set NAXIS to 0
@@ -291,5 +291,5 @@
     mdi = psMetadataLookup (imdata->header, "NAXIS");
     mdi->data.S32 = 0;
-    mdi->type = PS_META_S32;
+    mdi->type = PS_DATA_S32;
 
     table = psArrayAlloc (sources->n);
@@ -310,16 +310,16 @@
 
 	row = psMetadataAlloc ();
-	psMetadataAdd (row, PS_LIST_HEAD, "X_PIX",   PS_META_F32, "", PAR[2]);
-	psMetadataAdd (row, PS_LIST_HEAD, "Y_PIX",   PS_META_F32, "", PAR[3]);
-	psMetadataAdd (row, PS_LIST_HEAD, "MAG_RAW", PS_META_F32, "", source->fitMag + ZERO_POINT);
-	psMetadataAdd (row, PS_LIST_HEAD, "MAG_ERR", PS_META_F32, "", (int)(1000*dmag));
-	psMetadataAdd (row, PS_LIST_HEAD, "MAG_GAL", PS_META_F32, "", type);
-	psMetadataAdd (row, PS_LIST_HEAD, "MAG_AP",  PS_META_F32, "", lsky);
-	psMetadataAdd (row, PS_LIST_HEAD, "LOG_SKY", PS_META_F32, "", 32.0);    // should be 'Mgal'
-	psMetadataAdd (row, PS_LIST_HEAD, "FWHM_X",  PS_META_F32, "", source->apMag + ZERO_POINT); 
-	psMetadataAdd (row, PS_LIST_HEAD, "FWHM_Y",  PS_META_F32, "", PAR[4]);  // should be 'FHWM x'
-	psMetadataAdd (row, PS_LIST_HEAD, "THETA",   PS_META_F32, "", PAR[5]);  // should be 'FHWM y'
+	psMetadataAdd (row, PS_LIST_HEAD, "X_PIX",   PS_DATA_F32, "", PAR[2]);
+	psMetadataAdd (row, PS_LIST_HEAD, "Y_PIX",   PS_DATA_F32, "", PAR[3]);
+	psMetadataAdd (row, PS_LIST_HEAD, "MAG_RAW", PS_DATA_F32, "", source->fitMag + ZERO_POINT);
+	psMetadataAdd (row, PS_LIST_HEAD, "MAG_ERR", PS_DATA_F32, "", (int)(1000*dmag));
+	psMetadataAdd (row, PS_LIST_HEAD, "MAG_GAL", PS_DATA_F32, "", type);
+	psMetadataAdd (row, PS_LIST_HEAD, "MAG_AP",  PS_DATA_F32, "", lsky);
+	psMetadataAdd (row, PS_LIST_HEAD, "LOG_SKY", PS_DATA_F32, "", 32.0);    // should be 'Mgal'
+	psMetadataAdd (row, PS_LIST_HEAD, "FWHM_X",  PS_DATA_F32, "", source->apMag + ZERO_POINT); 
+	psMetadataAdd (row, PS_LIST_HEAD, "FWHM_Y",  PS_DATA_F32, "", PAR[4]);  // should be 'FHWM x'
+	psMetadataAdd (row, PS_LIST_HEAD, "THETA",   PS_DATA_F32, "", PAR[5]);  // should be 'FHWM y'
 	psMetadataAdd (row, PS_LIST_HEAD, "DOPHOT",  PS_TYPE_S8,  "", 0);   // should be theta
-	// psMetadataAdd (header, PS_LIST_HEAD, "DUMMY",   PS_META_STR, "", NULL);
+	// psMetadataAdd (header, PS_LIST_HEAD, "DUMMY",   PS_DATA_STRING, "", NULL);
     
 	psArrayAdd (table, 100, row);
@@ -334,5 +334,5 @@
 
     theader = psMetadataAlloc ();
-    psMetadataAdd (theader, PS_LIST_HEAD, "EXTNAME", PS_META_STR, "extension name", "SMPFILE");
+    psMetadataAdd (theader, PS_LIST_HEAD, "EXTNAME", PS_DATA_STRING, "extension name", "SMPFILE");
 
     unlink (filename);