Index: trunk/psModules/src/astrom/pmAstrometry.h
===================================================================
--- trunk/psModules/src/astrom/pmAstrometry.h	(revision 5170)
+++ trunk/psModules/src/astrom/pmAstrometry.h	(revision 5435)
@@ -8,6 +8,6 @@
 *  @author GLG, MHPCC
 *
-*  @version $Revision: 1.1 $ $Name: not supported by cvs2svn $
-*  @date $Date: 2005-09-28 20:43:52 $
+*  @version $Revision: 1.2 $ $Name: not supported by cvs2svn $
+*  @date $Date: 2005-10-20 23:06:24 $
 *
 *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -24,4 +24,11 @@
 /// @addtogroup AstroImage
 /// @{
+
+// XXXX: This is incorrect.  Must determine what p_pmHDU is.
+typedef struct
+{
+    int what;
+}
+p_pmHDU;
 
 /** Focal plane data structure
@@ -52,7 +59,6 @@
     const psMetadata *camera;           ///< Camera configuration
     psArray *chips;                     ///< The chips
-    // FITS data
-    psMetadata *header;                 ///< The FITS header, if it corresponds to this level
-    psDB *db;                           ///< Database handle
+    p_pmHDU *private;                   ///< FITS data
+    psMetadata *phu;                    ///< Primary Header
 }
 pmFPA;
@@ -86,8 +92,5 @@
     pmFPA *parent;                      ///< Parent FPA
     bool valid;                         ///< Do we bother about reading and working with this chip?
-    // FITS data
-    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 *private;                   ///< FITS data
 }
 pmChip;
@@ -113,12 +116,10 @@
     // Information
     psMetadata *concepts;               ///< Cache for PS concepts
+    psMetadata *camera;                 ///< Camera Info
     psMetadata *analysis;               ///< Cell-level analysis metadata
     psArray *readouts;                  ///< The readouts (referred to by number)
     pmChip *parent;                     ///< Parent chip
     bool valid;                         ///< Do we bother about reading and working with this cell?
-    // FITS data
-    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 *private;                   ///< FITS data
 }
 pmCell;
@@ -143,10 +144,8 @@
     // Information
     psImage *image;                     ///< Imaging area of readout
-    // XXX: The following mask was removed from the pmReadout struct in recent SDRS
-    // versions.  However, I'm keeping it here since al ot of modules still require
-    // it.
     psImage *mask;                      ///< Mask of input image
+    psImage *weight;                    ///< Weight of input image
+    psList *bias;                       ///< List of bias section (sub-)images
     psMetadata *analysis;               ///< Readout-level analysis metadata
-    psMetadata *concepts;               ///< Cache for PS Concepts
     pmCell *parent;                     ///< Parent cell
 }
@@ -178,5 +177,7 @@
  */
 pmCell *pmCellAlloc(
-    pmChip *chip                        ///< Parent chip
+    pmChip *chip,                        ///< Parent chip
+    psMetadata *cameradata,
+    psString name
 );
 
@@ -191,5 +192,9 @@
  *  @return pmChip*    newly allocated pmChip
  */
-pmChip *pmChipAlloc(pmFPA *fpa);
+pmChip *pmChipAlloc(
+    pmFPA *fpa,
+    psString name
+
+);
 
 /** Allocates a pmFPA
@@ -202,6 +207,5 @@
  */
 pmFPA *pmFPAAlloc(
-    const psMetadata *camera,           ///< Camera configuration
-    psDB *db                            ///< Database handle
+    const psMetadata *camera            ///< Camera configuration
 );