Changeset 2855 for trunk/psLib/src/astronomy/psAstrometry.h

Timestamp:

Dec 30, 2004, 10:18:37 AM (22 years ago)

Author:

desonia

Message:

Updated psChip/psCell to current SDRS spec.

File:

• trunk/psLib/src/astronomy/psAstrometry.h (modified) (6 diffs)

trunk/psLib/src/astronomy/psAstrometry.h

@@ -8 +8 @@
 *  @author GLG, MHPCC
 *
-*  @version $Revision: 1.32 $ $Name: not supported by cvs2svn $
-*  @date $Date: 2004-12-02 21:12:51 $
+*  @version $Revision: 1.33 $ $Name: not supported by cvs2svn $
+*  @date $Date: 2004-12-30 20:18:36 $
 *
 *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -99 +99 @@
 typedef struct
 {
-    const psU32 colBins;        ///< Amount of binning in x-dimension
-    const psU32 rowBins;        ///< Amount of binning in y-dimension
-    const psS32 col0;                    ///< Offset from the left of chip.
-    const psS32 row0;                    ///< Offset from the bottom of chip.
+    const psS32 col0;                  ///< Offset from the left of chip.
+    const psS32 row0;                  ///< Offset from the bottom of chip.
+
+    const int colParity;               ///< Column Readout Direction
+    const int rowParity;               ///< Row Readout Direction
+
+    const psU32 colBins;               ///< Amount of binning in x-dimension
+    const psU32 rowBins;               ///< Amount of binning in y-dimension
 
     psImage* image;                    ///< Imaging area of readout
@@ -122 +126 @@
 typedef struct
 {
+    const psS32 col0;                  ///< Offset from the left of chip
+    const psS32 row0;                  ///< Offset from the bottom of chip
+
     psArray* readouts;                 ///< readouts from the cell
+
     psMetadata* metadata;              ///< cell-level metadata
 
     psPlaneTransform* toChip;          ///< transformations from cell to chip coordinates
-    psPlaneTransform* fromChip;        ///< transformations from chip to cell coordinates
+    psPlaneTransform* fromChip;        ///< transformations from cell to chip coordinates
     psPlaneTransform* toFPA;           ///< transformations from cell to FPA coordinates
-    psPlaneTransform* toTP;            ///< transformations from cell to tangent plane coordinates
-    psPlaneTransform* toSky;            ///< transformations from cell to tangent plane coordinates
+    psPlaneTransform* toTP;            ///< transformations from cell to FPA coordinates
+    psPlaneTransform* toSky;           ///< transformations from cell to tangent plane coordinates
 
     struct psChip* parent;             ///< chip in which contains this cell
@@ -145 +153 @@
 typedef struct psChip
 {
+    const psS32 col0;                  ///< Offset from the left of FPA
+    const psS32 row0;                  ///< Offset from the bottom of FPA
+
     psArray* cells;                    ///< cells in the chip
+
     psMetadata* metadata;              ///< chip-level metadata
 
@@ -282 +294 @@
 /** Allocator for psObservatory
  *
- *  This function shall construct a new psObservatory with attributes 
+ *  This function shall construct a new psObservatory with attributes
  *  cooresponding to the function parameters.
  *
@@ -340 +352 @@
  *  to NULL.
  *
- *  @return psReadout*    newly allocated psReadout
- */
-psReadout* psReadoutAlloc(
-    psS32 col0,                          ///< offset from the left of the cell
-    psS32 row0,                          ///< offset from the bottom of the cell
-    const psImage* image               ///< image of the readout
-);
+ *  @return psReadout*    newly allocated psReadout with all internal pointers set to NULL
+ */
+psReadout* psReadoutAlloc();
 
 /** Allocates a Wallace's Grommit structure.