Index: trunk/archive/scripts/src/phase2/pmFPAConceptsGet.c
===================================================================
--- trunk/archive/scripts/src/phase2/pmFPAConceptsGet.c	(revision 5371)
+++ trunk/archive/scripts/src/phase2/pmFPAConceptsGet.c	(revision 5462)
@@ -100,5 +100,5 @@
     psMetadataItem *defItem = psMetadataLookup(defaults, concept);
     if (defItem) {
-	if (defItem->type == PS_META_META) {
+	if (defItem->type == PS_DATA_METADATA) {
 	    // A dependent default
 	    psTrace(__func__, 7, "Evaluating dependent default....\n");
@@ -122,5 +122,5 @@
 		return NULL;
 	    }
-	    if (depItem->type != PS_META_STR) {
+	    if (depItem->type != PS_DATA_STRING) {
 		psError(PS_ERR_IO, true, "Value of %s is not of type string, as required for dependency"
 			" --- ignored.\n", dependsOn);
@@ -270,12 +270,12 @@
     if (item) {
 	switch (item->type) {
-	  case PS_META_F32:
+	  case PS_DATA_F32:
 	    value = item->data.F32;
 	    break;
-	  case PS_META_F64:
+	  case PS_DATA_F64:
 	    // Assume it's OK to truncate to floating point from double
 	    value = (float)item->data.F64;
 	    break;
-	  case PS_META_S32:
+	  case PS_DATA_S32:
 	    // Promote to float
 	    value = (float)item->data.S32;
@@ -370,5 +370,5 @@
     if (item) {
 	switch (item->type) {
-	  case PS_META_STR:
+	  case PS_DATA_STRING:
 	    value = item->data.V;
 	    break;
@@ -383,5 +383,5 @@
     psTrace(__func__, 7, "Adding %s (%s): %s\n", name, comment, value);
 
-    psMetadataAdd(concepts, PS_LIST_TAIL, name, PS_META_STR, comment, value);
+    psMetadataAdd(concepts, PS_LIST_TAIL, name, PS_DATA_STRING, comment, value);
 }
 
@@ -428,5 +428,5 @@
 		ra = raItem->data.F64;
 		break;
-	      case PS_META_STR:
+	      case PS_DATA_STRING:
 		// Sexagesimal format
 		{
@@ -480,5 +480,5 @@
 	}
 
-	psMetadataAdd(fpa->concepts, PS_LIST_TAIL, "FPA.RA", PS_META_F64, 
+	psMetadataAdd(fpa->concepts, PS_LIST_TAIL, "FPA.RA", PS_DATA_F64, 
 		      "Right Ascension of the boresight (radians)", ra);
 
@@ -497,5 +497,5 @@
 		dec = decItem->data.F64;
 		break;
-	      case PS_META_STR:
+	      case PS_DATA_STRING:
 		// Sexagesimal format
 		{
@@ -549,5 +549,5 @@
 	}
 
-	psMetadataAdd(fpa->concepts, PS_LIST_TAIL, "FPA.DEC", PS_META_F64, 
+	psMetadataAdd(fpa->concepts, PS_LIST_TAIL, "FPA.DEC", PS_DATA_F64, 
 		      "Declination of the boresight (radians)", dec);
 
@@ -633,5 +633,5 @@
 	    psError(PS_ERR_IO, false, "Couldn't find CELL.TRIMSEC.\n");
 	    *trimsec = psRegionSet(0.0, 0.0, 0.0, 0.0);
-	} else if (secItem->type != PS_META_STR) {
+	} else if (secItem->type != PS_DATA_STRING) {
 	    psError(PS_ERR_IO, true, "CELL.TRIMSEC is not of type STR (%x)\n", secItem->type);
 	    *trimsec = psRegionSet(0.0, 0.0, 0.0, 0.0);
@@ -643,5 +643,5 @@
 		psError(PS_ERR_IO, false, "Couldn't find CELL.TRIMSEC.SOURCE.\n");
 		*trimsec = psRegionSet(0.0, 0.0, 0.0, 0.0);
-	    } else if (sourceItem->type != PS_META_STR) {
+	    } else if (sourceItem->type != PS_DATA_STRING) {
 		psError(PS_ERR_IO, true, "CELL.TRIMSEC.SOURCE is not of type STR (%x)\n", sourceItem->type);
 		*trimsec = psRegionSet(0.0, 0.0, 0.0, 0.0);
@@ -681,5 +681,5 @@
 	} // Looking up CELL.TRIMSEC
 
-	psMetadataAdd(cell->concepts, PS_LIST_TAIL, "CELL.TRIMSEC", PS_META_UNKNOWN,
+	psMetadataAdd(cell->concepts, PS_LIST_TAIL, "CELL.TRIMSEC", PS_DATA_UNKNOWN,
 		      "Trim section", trimsec);
 	psFree(trimsec);
@@ -693,5 +693,5 @@
 	if (! secItem) {
 	    psError(PS_ERR_IO, false, "Couldn't find CELL.BIASSEC.\n");
-	} else if (secItem->type != PS_META_STR) {
+	} else if (secItem->type != PS_DATA_STRING) {
 	    psError(PS_ERR_IO, true, "CELL.BIASSEC is not of type STR (%x)\n", secItem->type);
 	} else {
@@ -701,5 +701,5 @@
 	    if (! sourceItem) {
 		psError(PS_ERR_IO, false, "Couldn't find CELL.BIASSEC.SOURCE.\n");
-	    } else if (sourceItem->type != PS_META_STR) {
+	    } else if (sourceItem->type != PS_DATA_STRING) {
 		psError(PS_ERR_IO, true, "CELL.BIASSEC.SOURCE is not of type STR (%x)\n", sourceItem->type);
 	    } else {
@@ -752,5 +752,5 @@
 	} // Looking up CELL.BIASSEC
 
-	psMetadataAdd(cell->concepts, PS_LIST_TAIL, "CELL.BIASSEC", PS_META_LIST, "Bias sections", biassecs);
+	psMetadataAdd(cell->concepts, PS_LIST_TAIL, "CELL.BIASSEC", PS_DATA_LIST, "Bias sections", biassecs);
 	psFree(biassecs);
     }
@@ -762,5 +762,5 @@
 	if (! binItem) {
 	    psError(PS_ERR_IO, false, "Couldn't find CELL.XBIN.\n");
-	} else if (binItem->type == PS_META_STR) {
+	} else if (binItem->type == PS_DATA_STRING) {
 	    psString binString = binItem->data.V; // The string containing the binning
 	    if (sscanf(binString, "%d %*d", &xBin) != 1 &&
@@ -784,5 +784,5 @@
 	if (! binItem) {
 	    psError(PS_ERR_IO, false, "Couldn't find CELL.YBIN.\n");
-	} else if (binItem->type == PS_META_STR) {
+	} else if (binItem->type == PS_DATA_STRING) {
 	    psString binString = binItem->data.V; // The string containing the binning
 	    if (sscanf(binString, "%*d %d", &yBin) != 1 &&
@@ -809,5 +809,5 @@
 	if (! sysItem) {
 	    psError(PS_ERR_IO, true, "Couldn't find CELL.TIMESYS --- assuming UTC.\n");
-	} else if (sysItem->type != PS_META_STR) {
+	} else if (sysItem->type != PS_DATA_STRING) {
 	    psError(PS_ERR_IO, true, "CELL.TIMESYS isn't of type STRING --- assuming UTC.\n");
 	} else {
@@ -839,5 +839,5 @@
 		if (mdok && strlen(timeFormat) > 0) {
 		    switch (timeItem->type) {
-		      case PS_META_STR:
+		      case PS_DATA_STRING:
 			{
 			    psString timeString = timeItem->data.V;	// String with the time
@@ -887,5 +887,5 @@
 					    psError(PS_ERR_IO, false, "Unable to find time header: %s\n",
 						    timeName);
-					} else if (timeItem->type == PS_META_STR) {
+					} else if (timeItem->type == PS_DATA_STRING) {
 					    // Time is a string, in the usual way:
 					    psStringAppend(&dateString, "T%s", timeItem->data.V);
@@ -965,5 +965,5 @@
 	} // Getting CELL.TIME
 
-	psMetadataAdd(cell->concepts, PS_LIST_TAIL, "CELL.TIME", PS_META_UNKNOWN, "Time of exposure", time);
+	psMetadataAdd(cell->concepts, PS_LIST_TAIL, "CELL.TIME", PS_DATA_UNKNOWN, "Time of exposure", time);
 	psFree(time);
     }