Index: trunk/archive/scripts/src/phase2/pmFPAWrite.c
===================================================================
--- trunk/archive/scripts/src/phase2/pmFPAWrite.c	(revision 5105)
+++ trunk/archive/scripts/src/phase2/pmFPAWrite.c	(revision 5371)
@@ -7,10 +7,11 @@
 
 static bool writeHDU(psFits *fits,	// FITS file to which to write
-		     p_pmHDU *hdu	// HDU to write
+		     pmPixelData *pixelData // Pixel data to write
     )
 {
     bool status = true;			// Status of write, to return
-    for (int i = 0; i < hdu->pixels->n; i++) {
-	status &= psFitsWriteImage(fits, hdu->header, hdu->pixels->data[i], i);
+    for (int i = 0; i < pixelData->images->n; i++) {
+	status &= psFitsWriteImage(fits, pixelData->header, pixelData->images->data[i], i);
+	// XXX: Insert here the writing on mask and weight images
     }
 
@@ -46,12 +47,12 @@
 		    pmCellOutgestConcepts(cell, db);
 
-		    if (cell->private && strlen(cell->private->extname) > 0) {
-			status &= writeHDU(fits, cell->private);
+		    if (cell->data && strlen(cell->data->extname) > 0) {
+			status &= writeHDU(fits, cell->data);
 		    }
 		}
 	    }
 	    
-	    if (chip->private && strlen(chip->private->extname) > 0) {
-		status &= writeHDU(fits, chip->private);
+	    if (chip->data && strlen(chip->data->extname) > 0) {
+		status &= writeHDU(fits, chip->data);
 	    }
 	}
@@ -59,6 +60,6 @@
     }
 
-    if (fpa->private && strlen(fpa->private->extname) > 0) {
-	status &= writeHDU(fits, fpa->private);
+    if (fpa->data && strlen(fpa->data->extname) > 0) {
+	status &= writeHDU(fits, fpa->data);
     }