Changeset 6552 for branches/rel10_ifa/psModules/src/astrom/pmFPA.h

Timestamp:

Mar 8, 2006, 5:08:08 PM (20 years ago)

Author:

Paul Price

Message:

Broad changes to introduce pmHDU, and allow read/write at any level. Modified the camera configuration to use camera config (components of the camera) and format descriptions (FITS file layout).

File:

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

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

@@ -7 +7 @@
 *  @author GLG, MHPCC
 *
-*  @version $Revision: 1.1.4.2 $ $Name: not supported by cvs2svn $
-*  @date $Date: 2006-03-04 03:03:28 $
+*  @version $Revision: 1.1.4.3 $ $Name: not supported by cvs2svn $
+*  @date $Date: 2006-03-09 03:08:08 $
 *
 *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -18 +18 @@
 #include <config.h>
 #endif
+
 #include "pslib.h"
-#include "psDB.h"
+#include "pmHDU.h"
 
 /// @addtogroup AstroImage
 /// @{
-
 
 /** Focal plane data structure
@@ -43 +43 @@
 typedef struct
 {
+    #if 0
     // 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
@@ -72 +74 @@
 typedef struct
 {
+    #if 0
     // Offset specifying position on focal plane
     int col0;                           ///< Offset from the left of FPA.
@@ -78 +81 @@
     psPlaneTransform* toFPA;            ///< Transformation from chip to FPA coordinates
     psPlaneTransform* fromFPA;          ///< Transformation from FPA to chip coordinates
+    #endif
     // Information
     psMetadata *concepts;               ///< Cache for PS concepts
@@ -100 +104 @@
 typedef struct
 {
-    // Offset specifying position on chip
-    int col0;                           ///< Offset from the left of chip.
-    int row0;                           ///< Offset from the bottom of chip.
-    // Astrometric transformations
-    psPlaneTransform* toChip;           ///< Transformations from cell to chip coordinates
-    psPlaneTransform* toFPA;            ///< Transformations from cell to FPA coordinates
-    psPlaneTransform* toSky;            ///< Transformations from cell to sky coordinates
-    // Information
     psMetadata *concepts;               ///< Cache for PS concepts
-    psMetadata *camera;                 ///< Camera Info
+    psMetadata *config;                 ///< Cell configuration info
     psMetadata *analysis;               ///< Cell-level analysis metadata
     psArray *readouts;                  ///< The readouts (referred to by number)
@@ -168 +164 @@
 pmCell *pmCellAlloc(
     pmChip *chip,       ///< Parent chip
-    psMetadata *cameraData, ///< Camera data
     const char *name    ///< Name of cell
 );
@@ -199 +194 @@
 );
 
-/** Allocates a p_pmHDU
- *
- * XXX: More detailed description
- *
- * @return p_pmHDU*    newly allocated p_pmHDU
- */
-p_pmHDU *p_pmHDUAlloc(const char *extname // Extension name
-                     );
-
+// Find the HDU in the FPA hierarchy
+pmHDU *pmHDUFromFPA(pmFPA *fpa          // FPA for which to find HDU
+                   );
+pmHDU *pmHDUFromChip(pmChip *chip       // Chip for which to find HDU
+                    );
+pmHDU *pmHDUFromCell(pmCell *cell       // Cell for which to find HDU
+                    );
 
 /** Verify parent links.