Index: trunk/archive/scripts/src/phase2/pmFPA.c
===================================================================
--- trunk/archive/scripts/src/phase2/pmFPA.c	(revision 5462)
+++ trunk/archive/scripts/src/phase2/pmFPA.c	(revision 5564)
@@ -40,8 +40,8 @@
 //////////////////////////////////////////////////////////////////////////////////////////////////////////////
 
-pmPixelData *pmPixelDataAlloc(const char *extname)
-{
-    pmPixelData *pd = psAlloc(sizeof(pmPixelData));
-    psMemSetDeallocator(pd, (psFreeFunc)p_pmPixelDataFree);
+p_pmHDU *p_pmHDUAlloc(const char *extname)
+{
+    p_pmHDU *pd = psAlloc(sizeof(p_pmHDU));
+    psMemSetDeallocator(pd, (psFreeFunc)p_pmHDUFree);
 
     pd->extname = extname;
@@ -54,10 +54,10 @@
 }
 
-void p_pmPixelDataFree(pmPixelData *pd)
-{
-    psFree(pd->header);
-    psFree(pd->images);
-    psFree(pd->masks);
-    psFree(pd->weights);
+void p_pmHDUFree(p_pmHDU *hdu)
+{
+    psFree(hdu->header);
+    psFree(hdu->images);
+    psFree(hdu->masks);
+    psFree(hdu->weights);
 }
 
@@ -77,5 +77,5 @@
     fpa->chips = psArrayAlloc(0);
 
-    fpa->data = NULL;
+    fpa->hdu = NULL;
 
     return fpa;
@@ -92,5 +92,5 @@
     psFree(fpa->chips);
 
-    psFree(fpa->data);
+    psFree(fpa->hdu);
 }
 
@@ -119,5 +119,5 @@
     chip->valid = true;    
 
-    chip->data = NULL;
+    chip->hdu = NULL;
 
     psMetadataAddStr(chip->concepts, PS_LIST_HEAD, "CHIP.NAME", 0, "Chip name added at pmChipAlloc", name);
@@ -134,5 +134,5 @@
     psFree(chip->cells);
 
-    psFree(chip->data);
+    psFree(chip->hdu);
 
     // We don't free the parent member, since that would generate a circular call.  We don't increment the
@@ -156,7 +156,5 @@
 
     cell->toChip = NULL;
-    cell->fromChip = NULL;
     cell->toFPA = NULL;
-    cell->toTP = NULL;
     cell->toSky = NULL;
 
@@ -171,5 +169,5 @@
     cell->valid = true;
 
-    cell->data = NULL;
+    cell->hdu = NULL;
 
     return cell;
@@ -179,7 +177,5 @@
 {
     psFree(cell->toChip);
-    psFree(cell->fromChip);
     psFree(cell->toFPA);
-    psFree(cell->toTP);
     psFree(cell->toSky);
 
@@ -188,5 +184,5 @@
     psFree(cell->readouts);
 
-    psFree(cell->data);
+    psFree(cell->hdu);
 
     // We don't free the parent member, since that would generate a circular call.  We don't increment the
@@ -197,5 +193,5 @@
 			  psImage *image, // The pixels
 			  psImage *mask,// The mask pixels
-			  int col0, int row0, int colParity, int rowParity, int colBin, int rowBin // Data
+			  int col0, int row0, int colBin, int rowBin // Data
     )
 {
@@ -215,6 +211,4 @@
     *(int*)&readout->col0 = col0;
     *(int*)&readout->row0 = row0;
-    *(int*)&readout->colParity = colParity;
-    *(int*)&readout->rowParity = rowParity;
     *(int*)&readout->colBins = colBin;
     *(int*)&readout->rowBins = rowBin;