Index: trunk/archive/scripts/src/phase2/pmFPA.h
===================================================================
--- trunk/archive/scripts/src/phase2/pmFPA.h	(revision 5104)
+++ trunk/archive/scripts/src/phase2/pmFPA.h	(revision 5371)
@@ -11,7 +11,9 @@
 typedef struct {
     const char *extname;		// Extension name, if it corresponds to this level
-    psArray *pixels;			// The pixel data, if it corresponds to this level
     psMetadata *header;			// The FITS header, if it corresponds to this level
-} p_pmHDU;
+    psArray *images;			// The pixel data, if it corresponds to this level
+    psArray *masks;			// The mask data, if it corresponds to this level
+    psArray *weights;			// The weight data, if it corresponds to this level
+} pmPixelData;
 
 typedef struct {
@@ -25,5 +27,5 @@
     psMetadata *phu;			// Primary Header
     psArray *chips;			// The chips
-    p_pmHDU *private;			// FITS data
+    pmPixelData *data;			// FITS data
 } pmFPA;
 
@@ -40,5 +42,5 @@
     pmFPA *parent;			// Parent FPA
     bool valid;				// Valid for reading in?
-    p_pmHDU *private;			// FITS data
+    pmPixelData *data;			// FITS data
 } pmChip;
 
@@ -59,5 +61,5 @@
     pmChip *parent;			// Parent chip
     bool valid;				// Valid for operating on?
-    p_pmHDU *private;			// FITS data
+    pmPixelData *data;			// FITS data
 } pmCell;
 
@@ -72,13 +74,19 @@
     const unsigned int rowBins;		// Amount of binning in y-dimension
     // Information
+    psMetadata *concepts;		// Concepts for readouts
+    pmCell *parent;			// Parent cell
     psImage *image;			// The pixels
     psImage *mask;			// Mask image
-    psList *overscans;			// List of subimages containing the overscan regions
-    psMetadata *concepts;		// Concepts for readouts
+    psImage *weight;			// Weight image
 } pmReadout;
 
+
+psList *pmReadoutGetBias(pmReadout *readout // Readout for which to get the bias sections
+    );
+
+
 // Allocators and deallocators
-p_pmHDU *p_pmHDUAlloc(const char *extname);
-void p_pmHDUFree(p_pmHDU *hdu);
+pmPixelData *pmPixelDataAlloc(const char *extname);
+void p_pmPixelDataFree(pmPixelData *pd);
 pmFPA *pmFPAAlloc(const psMetadata *camera // Camera configuration
     );
@@ -96,7 +104,7 @@
 void p_pmCellFree(pmCell *cell);
 
-pmReadout *pmReadoutAlloc(pmCell *cell,	// Cell to which the readout belongs
+pmReadout *pmReadoutAlloc(pmCell *cell, // Cell to which the readout belongs
 			  psImage *image, // The pixels
-			  psList *overscans, // The overscan images
+			  psImage *mask,// The mask pixels
 			  int col0, int row0, int colParity, int rowParity, int colBin, int rowBin // Data
     );