Index: trunk/archive/scripts/src/phase2/pmFPAConceptsSet.c
===================================================================
--- trunk/archive/scripts/src/phase2/pmFPAConceptsSet.c	(revision 5462)
+++ trunk/archive/scripts/src/phase2/pmFPAConceptsSet.c	(revision 5564)
@@ -130,23 +130,23 @@
 
 	// We have a FITS header to look up --- search each level
-	if (cell && cell->data) {
-	    psMetadataItem *cellItem = psMetadataLookup(cell->data->header, keyword);
+	if (cell && cell->hdu) {
+	    psMetadataItem *cellItem = psMetadataLookup(cell->hdu->header, keyword);
 	    if (cellItem) {
 		// XXX: Need to clean up before returning
-		psMetadataAddItem(cell->data->header, headerItem, PS_LIST_TAIL, PS_META_REPLACE);
+		psMetadataAddItem(cell->hdu->header, headerItem, PS_LIST_TAIL, PS_META_REPLACE);
 		status = true;
 	    }
-	} else if (chip && chip->data) {
-	    psMetadataItem *chipItem = psMetadataLookup(chip->data->header, keyword);
+	} else if (chip && chip->hdu) {
+	    psMetadataItem *chipItem = psMetadataLookup(chip->hdu->header, keyword);
 	    if (chipItem) {
 		// XXX: Need to clean up before returning
-		psMetadataAddItem(chip->data->header, headerItem, PS_LIST_TAIL, PS_META_REPLACE);
+		psMetadataAddItem(chip->hdu->header, headerItem, PS_LIST_TAIL, PS_META_REPLACE);
 		status = true;
 	    }
-	} else if (fpa->data) {
-	    psMetadataItem *fpaItem = psMetadataLookup(fpa->data->header, keyword);
+	} else if (fpa->hdu) {
+	    psMetadataItem *fpaItem = psMetadataLookup(fpa->hdu->header, keyword);
 	    if (fpaItem) {
 		// XXX: Need to clean up before returning
-		psMetadataAddItem(fpa->data->header, headerItem, PS_LIST_TAIL, PS_META_REPLACE);
+		psMetadataAddItem(fpa->hdu->header, headerItem, PS_LIST_TAIL, PS_META_REPLACE);
 		status = true;
 	    }
@@ -376,5 +376,6 @@
     )
 {
-    // FPA.NAME --- don't need to worry about this
+    // FPA.NAME
+    setConcept(fpa, NULL, NULL, db, fpa->concepts, "FPA.NAME");
 
     // FPA.AIRMASS
@@ -397,5 +398,5 @@
 
 	// How to interpret the RA
-	psMetadata *camera = fpa->camera; // Camera configuration data
+	const psMetadata *camera = fpa->camera; // Camera configuration data
 	bool mdok = true;		// Status of MD lookup
 	psMetadata *formats = psMetadataLookupMD(&mdok, camera, "FORMATS");
@@ -444,5 +445,5 @@
 
 	// How to interpret the DEC
-	psMetadata *camera = fpa->camera; // Camera configuration data
+	const psMetadata *camera = fpa->camera; // Camera configuration data
 	bool mdok = true;		// Status of MD lookup
 	psMetadata *formats = psMetadataLookupMD(&mdok, camera, "FORMATS");
@@ -571,10 +572,10 @@
 		psString keyword = psMetadataLookupString(NULL, cell->camera, "CELL.TRIMSEC");
 		psMetadata *header = NULL; // The FITS header
-		if (cell->data) {
-		    header = cell->data->header;
-		} else if (chip->data) {
-		    header = chip->data->header;
-		} else if (fpa->data) {
-		    header = fpa->data->header;
+		if (cell->hdu) {
+		    header = cell->hdu->header;
+		} else if (chip->hdu) {
+		    header = chip->hdu->header;
+		} else if (fpa->hdu) {
+		    header = fpa->hdu->header;
 		}
 		if (! header) {
@@ -651,10 +652,10 @@
 		} else {
 		    psMetadata *header = NULL; // The FITS header
-		    if (cell->data) {
-			header = cell->data->header;
-		    } else if (chip->data) {
-			header = chip->data->header;
-		    } else if (fpa->data) {
-			header = fpa->data->header;
+		    if (cell->hdu) {
+			header = cell->hdu->header;
+		    } else if (chip->hdu) {
+			header = chip->hdu->header;
+		    } else if (fpa->hdu) {
+			header = fpa->hdu->header;
 		    }
 		    if (! header) {
@@ -689,5 +690,5 @@
 
 	// If these are specified by the header, we need to check to see if it's the same header keyword
-	psMetadata *camera = fpa->camera;
+	const psMetadata *camera = fpa->camera;
 	psMetadata *translation = psMetadataLookupMD(NULL, camera, "TRANSLATION");
 	psString xKeyword = psMetadataLookupString(NULL, translation, "CELL.XBIN");
@@ -707,10 +708,10 @@
 							     binString);
 	    psMetadata *header = NULL; // The FITS header
-	    if (cell->data) {
-		header = cell->data->header;
-	    } else if (chip->data) {
-		header = chip->data->header;
-	    } else if (fpa->data) {
-		header = fpa->data->header;
+	    if (cell->hdu) {
+		header = cell->hdu->header;
+	    } else if (chip->hdu) {
+		header = chip->hdu->header;
+	    } else if (fpa->hdu) {
+		header = fpa->hdu->header;
 	    }
 	    if (! header) {
@@ -784,10 +785,10 @@
 		// We're working with two separate headers
 		psMetadata *header = NULL; // The FITS header
-		if (cell->data) {
-		    header = cell->data->header;
-		} else if (chip->data) {
-		    header = chip->data->header;
-		} else if (fpa->data) {
-		    header = fpa->data->header;
+		if (cell->hdu) {
+		    header = cell->hdu->header;
+		} else if (chip->hdu) {
+		    header = chip->hdu->header;
+		} else if (fpa->hdu) {
+		    header = fpa->hdu->header;
 		}
 		if (! header) {
@@ -795,5 +796,5 @@
 		} else {
 		    // Get the headers
-		    psMetadata *camera = fpa->camera;
+		    const psMetadata *camera = fpa->camera;
 		    psMetadata *translation = psMetadataLookupMD(NULL, camera, "TRANSLATION");
 		    psString keywords = psMetadataLookupString(NULL, translation, "CELL.TIME");