Changeset 16396 for trunk/psModules/src/camera/pmFPA.h

Timestamp:

Feb 11, 2008, 3:52:56 PM (18 years ago)

Author:

Paul Price

Message:

Adding separate tracking values for image/mask/weight when reading incrementally. Without these, reading image, mask and weight incrementally into the same readout will update row0/col0 3 separate times --- the data won't match!

File:

• trunk/psModules/src/camera/pmFPA.h (modified) (10 diffs)

trunk/psModules/src/camera/pmFPA.h

@@ -6 +6 @@
  * @author Eugene Magnier, IfA
  *
- * @version $Revision: 1.19 $ $Name: not supported by cvs2svn $
- * @date $Date: 2008-01-02 20:32:25 $
+ * @version $Revision: 1.20 $ $Name: not supported by cvs2svn $
+ * @date $Date: 2008-02-12 01:52:56 $
  * Copyright 2005-2006 Institute for Astronomy, University of Hawaii
  */
@@ -16 +16 @@
 /// @addtogroup Camera Camera Layout
 /// @{
-
-#define FPA_ASTROM 1                    ///< Include astrometry information in the structures?
 
 // Return chip position, given FPA position; calculations are all done in pixel units
@@ -42 +40 @@
 /// astrometric transformations.  The astrometric transformations encode how to transform from the tangent
 /// plane to the sky, and back.
-typedef struct
-{
-    #if FPA_ASTROM
+typedef struct {
     // Astrometric transformations
     psPlaneTransform *fromTPA;  ///< Transformation from tangent plane to focal plane, or NULL
     psPlaneTransform *toTPA;  ///< Transformation from focal plane to tangent plane, or NULL
     psProjection *toSky;         ///< Projection from tangent plane to sky, or NULL
-    #endif
     // Information
     psMetadata *concepts;               ///< FPA-level concepts
@@ -57 +52 @@
     psArray *chips;                     ///< The component chips
     pmHDU *hdu;                         ///< FITS header data unit of interest, or NULL
-}
-pmFPA;
+} pmFPA;
 
 /// A chip (contiguous detector element)
@@ -67 +61 @@
 /// interest, and astrometric transformations.  The astrometric transformations provide transforms between the
 /// chip and FPA coordinates and back.
-typedef struct
-{
-    #if FPA_ASTROM
+typedef struct {
     // Astrometric transformations
     psPlaneTransform *toFPA;            ///< Transformation from chip to FPA coordinates, or NULL
     psPlaneTransform *fromFPA;          ///< Transformation from FPA to chip coordinates, or NULL
-    #endif
     // Information
     psMetadata *concepts;               ///< Chip-level concepts
@@ -84 +75 @@
     bool data_exists;                   ///< Does the data for this chip exist (read case only)?
     pmHDU *hdu;                         ///< FITS header data unit of interest,
-}
-pmChip;
+} pmChip;
 
 /// A cell (smallest logical unit)
@@ -104 +94 @@
  *
  */
-typedef struct
-{
+typedef struct {
     psMetadata *concepts;               ///< Cell-level concepts
     unsigned int conceptsRead;          ///< Which concepts have been read; see pmConceptsSource
@@ -116 +105 @@
     bool data_exists;                   ///< Does the data for this cell exist (read case only)?
     pmHDU *hdu;                         ///< FITS header data unit of interest
-}
-pmCell;
+} pmCell;
 
 /// A readout (individual read of a cell)
@@ -127 +115 @@
 /// sections (prescans or overscans, or otherwise), a summary of analysis tasks that have been performed,
 /// status flags, and the offsets used for reading a FITS file incrementally.
-typedef struct
-{
+typedef struct {
     int col0;                           ///< Column offset; non-zero if reading in columns incrementally
     int row0;                           ///< Row offset; non-zero if reading in rows incrementally
@@ -140 +127 @@
     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;
+    int imageScan, maskScan, weightScan;///< Separate tracking numbers for reading images incrementally
+} pmReadout;
 
 /// Free all readouts within a cell