Changeset 6518

Timestamp:

Mar 3, 2006, 5:03:28 PM (20 years ago)

Author:

Paul Price

Message:

Modifying to use pmHDU.

File:

• branches/rel10_ifa/psModules/src/astrom/pmFPA.h (modified) (6 diffs)

branches/rel10_ifa/psModules/src/astrom/pmFPA.h

@@ -7 +7 @@
 *  @author GLG, MHPCC
 *
-*  @version $Revision: 1.1.4.1 $ $Name: not supported by cvs2svn $
-*  @date $Date: 2006-02-17 17:13:41 $
+*  @version $Revision: 1.1.4.2 $ $Name: not supported by cvs2svn $
+*  @date $Date: 2006-03-04 03:03:28 $
 *
 *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -24 +24 @@
 /// @{
 
-// XXX: Is this correct?  Must determine what p_pmHDU is.
-// XXX: Create the p_pmHDU alloc/free.
-typedef struct
-{
-    const char *extname;                // Extension name, if it corresponds to this level
-    psMetadata *header;                 // The FITS header, if it corresponds to this level
-    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
-}
-p_pmHDU;
 
 /** Focal plane data structure
@@ -63 +52 @@
     const psMetadata *camera;           ///< Camera configuration
     psArray *chips;                     ///< The chips
-    p_pmHDU *hdu;                       ///< FITS data
-    psMetadata *phu;                    ///< Primary Header
+    pmHDU *hdu;                         ///< FITS data
 }
 pmFPA;
@@ -97 +85 @@
     bool process;                       ///< Do we bother about reading and working with this chip?
     bool exists;                        ///< Does the chip exist --- has it been read in?
-    p_pmHDU *hdu;                       ///< FITS data
+    pmHDU *hdu;                         ///< FITS data
 }
 pmChip;
@@ -127 +115 @@
     bool process;                       ///< Do we bother about reading and working with this cell?
     bool exists;                        ///< Does the cell exist --- has it been read in?
-    p_pmHDU *hdu;                       ///< FITS data
+    pmHDU *hdu;                         ///< FITS data
 }
 pmCell;
@@ -143 +131 @@
 typedef struct
 {
-    // Position on the cell
-    // XXX: These may be removed in the future; use parent->concepts instead?
-    int col0;                           ///< Offset from the left of chip.
-    int row0;                           ///< Offset from the bottom of chip.
-    int colBins;                        ///< Amount of binning in x-dimension
-    int rowBins;                        ///< Amount of binning in y-dimension
-    // Information
     psImage *image;                     ///< Imaging area of readout
     psImage *mask;                      ///< Mask of input image