Index: /trunk/psModules/src/astrom/pmFPA.h
===================================================================
--- /trunk/psModules/src/astrom/pmFPA.h	(revision 7007)
+++ /trunk/psModules/src/astrom/pmFPA.h	(revision 7008)
@@ -7,6 +7,6 @@
 *  @author GLG, MHPCC
 *
-*  @version $Revision: 1.6 $ $Name: not supported by cvs2svn $
-*  @date $Date: 2006-04-25 00:26:48 $
+*  @version $Revision: 1.7 $ $Name: not supported by cvs2svn $
+*  @date $Date: 2006-04-30 22:05:41 $
 *
 *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -21,4 +21,6 @@
 #include "pslib.h"
 #include "pmHDU.h"
+
+# define FPA_ASTROM 1
 
 /// @addtogroup AstroImage
@@ -43,17 +45,17 @@
 typedef struct
 {
-    #if 0
+    # if FPA_ASTROM
     // Astrometric transformations
     psPlaneDistort* fromTangentPlane;   ///< Transformation from tangent plane to focal plane
-    psPlaneDistort* toTangentPlane;     ///< Transformation from focal plane to tangent plane
-    psProjection *projection;           ///< Projection from tangent plane to sky
-    #endif
-    // Information
-    psMetadata *concepts;               ///< Cache for PS concepts
-    unsigned int conceptsRead;          ///< Which concepts have been read
-    psMetadata *analysis;               ///< FPA-level analysis metadata
-    const psMetadata *camera;           ///< Camera configuration
-    psArray *chips;                     ///< The chips
-    pmHDU *hdu;                         ///< FITS data
+psPlaneDistort* toTangentPlane;     ///< Transformation from focal plane to tangent plane
+psProjection *projection;           ///< Projection from tangent plane to sky
+# endif
+// Information
+psMetadata *concepts;               ///< Cache for PS concepts
+unsigned int conceptsRead;          ///< Which concepts have been read
+psMetadata *analysis;               ///< FPA-level analysis metadata
+const psMetadata *camera;           ///< Camera configuration
+psArray *chips;                     ///< The chips
+pmHDU *hdu;                         ///< FITS data
 }
 pmFPA;
@@ -75,23 +77,23 @@
 typedef struct
 {
-    #if 0
+# if FPA_ASTROM
     // Offset specifying position on focal plane
     int col0;                           ///< Offset from the left of FPA.
-    int row0;                           ///< Offset from the bottom of FPA.
-    // Astrometric transformations
-    psPlaneTransform* toFPA;            ///< Transformation from chip to FPA coordinates
-    psPlaneTransform* fromFPA;          ///< Transformation from FPA to chip coordinates
-    #endif
-    // Information
-    psMetadata *concepts;               ///< Cache for PS concepts
-    unsigned int conceptsRead;          ///< Which concepts have been read
-    psMetadata *analysis;               ///< Chip-level analysis metadata
-    psArray *cells;                     ///< The cells (referred to by name)
-    pmFPA *parent;                      ///< Parent FPA
-    bool process;                       ///< Do we bother about reading and working with this chip?
-    bool file_exists;                   ///< Does the file for this chip exist (read case only)?
-    bool data_exists;                   ///< Does the data for this chip exist (read case only)?
-    pmHDU *hdu;                         ///< FITS data
-    struct pmCell *mosaic;              ///< A mosaic cell
+int row0;                           ///< Offset from the bottom of FPA.
+// Astrometric transformations
+psPlaneTransform* toFPA;            ///< Transformation from chip to FPA coordinates
+psPlaneTransform* fromFPA;          ///< Transformation from FPA to chip coordinates
+# endif
+// Information
+psMetadata *concepts;               ///< Cache for PS concepts
+unsigned int conceptsRead;          ///< Which concepts have been read
+psMetadata *analysis;               ///< Chip-level analysis metadata
+psArray *cells;                     ///< The cells (referred to by name)
+pmFPA *parent;                      ///< Parent FPA
+bool process;                       ///< Do we bother about reading and working with this chip?
+bool file_exists;                   ///< Does the file for this chip exist (read case only)?
+bool data_exists;                   ///< Does the data for this chip exist (read case only)?
+pmHDU *hdu;                         ///< FITS data
+struct pmCell *mosaic;              ///< A mosaic cell
 }
 pmChip;
@@ -108,14 +110,14 @@
 typedef struct
 {
-    psMetadata *concepts;               ///< Cache for PS concepts
-    unsigned int conceptsRead;          ///< Which concepts have been read
-    psMetadata *config;                 ///< Cell configuration info
-    psMetadata *analysis;               ///< Cell-level analysis metadata
-    psArray *readouts;                  ///< The readouts (referred to by number)
-    pmChip *parent;                     ///< Parent chip
-    bool process;                       ///< Do we bother about reading and working with this cell?
-    bool file_exists;                   ///< Does the file for this cell exist (read case only)?
-    bool data_exists;                   ///< Does the data for this cell exist (read case only)?
-    pmHDU *hdu;                         ///< FITS data
+psMetadata *concepts;               ///< Cache for PS concepts
+unsigned int conceptsRead;          ///< Which concepts have been read
+psMetadata *config;                 ///< Cell configuration info
+psMetadata *analysis;               ///< Cell-level analysis metadata
+psArray *readouts;                  ///< The readouts (referred to by number)
+pmChip *parent;                     ///< Parent chip
+bool process;                       ///< Do we bother about reading and working with this cell?
+bool file_exists;                   ///< Does the file for this cell exist (read case only)?
+bool data_exists;                   ///< Does the data for this cell exist (read case only)?
+pmHDU *hdu;                         ///< FITS data
 }
 pmCell;
@@ -133,15 +135,15 @@
 typedef struct
 {
-    int col0;                           ///< Column offset; non-zero if reading in columns bit by bit
-    int row0;                           ///< Row offset; non-zero if reading in rows bit by bit
-    psImage *image;                     ///< Imaging area of readout
-    psImage *mask;                      ///< Mask of input image
-    psImage *weight;                    ///< Weight of input image
-    psList *bias;                       ///< Overscan images
-    psMetadata *analysis;               ///< Readout-level analysis metadata
-    pmCell *parent;                     ///< Parent cell
-    bool process;                       ///< Do we bother about reading and working with this readout?
-    bool file_exists;                   ///< Does the file for this readout exist (read case only)?
-    bool data_exists;                   ///< Does the data for this readout exist (read case only)?
+int col0;                           ///< Column offset; non-zero if reading in columns bit by bit
+int row0;                           ///< Row offset; non-zero if reading in rows bit by bit
+psImage *image;                     ///< Imaging area of readout
+psImage *mask;                      ///< Mask of input image
+psImage *weight;                    ///< Weight of input image
+psList *bias;                       ///< Overscan images
+psMetadata *analysis;               ///< Readout-level analysis metadata
+pmCell *parent;                     ///< Parent cell
+bool process;                       ///< Do we bother about reading and working with this readout?
+bool file_exists;                   ///< Does the file for this readout exist (read case only)?
+bool data_exists;                   ///< Does the data for this readout exist (read case only)?
 }
 pmReadout;