Changeset 5371 for trunk/archive/scripts/src/phase2/pmFPA.h

Timestamp:

Oct 18, 2005, 4:19:41 PM (21 years ago)

Author:

Paul Price

Message:

Current state before I go on holiday. Not sure if it works or not. Not current for pslib8.

File:

• trunk/archive/scripts/src/phase2/pmFPA.h (modified) (6 diffs)

trunk/archive/scripts/src/phase2/pmFPA.h

@@ -11 +11 @@
 typedef struct {
     const char *extname;                // Extension name, if it corresponds to this level
-    psArray *pixels;                    // The pixel data, if it corresponds to this level
     psMetadata *header;                 // The FITS header, if it corresponds to this level
-} p_pmHDU;
+    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
+} pmPixelData;
 
 typedef struct {
@@ -25 +27 @@
     psMetadata *phu;                    // Primary Header
     psArray *chips;                     // The chips
-    p_pmHDU *private;                   // FITS data
+    pmPixelData *data;                  // FITS data
 } pmFPA;
 
@@ -40 +42 @@
     pmFPA *parent;                      // Parent FPA
     bool valid;                         // Valid for reading in?
-    p_pmHDU *private;                   // FITS data
+    pmPixelData *data;                  // FITS data
 } pmChip;
 
@@ -59 +61 @@
     pmChip *parent;                     // Parent chip
     bool valid;                         // Valid for operating on?
-    p_pmHDU *private;                   // FITS data
+    pmPixelData *data;                  // FITS data
 } pmCell;
 
@@ -72 +74 @@
     const unsigned int rowBins;         // Amount of binning in y-dimension
     // Information
+    psMetadata *concepts;               // Concepts for readouts
+    pmCell *parent;                     // Parent cell
     psImage *image;                     // The pixels
     psImage *mask;                      // Mask image
-    psList *overscans;                  // List of subimages containing the overscan regions
-    psMetadata *concepts;               // Concepts for readouts
+    psImage *weight;                    // Weight image
 } pmReadout;
 
+
+psList *pmReadoutGetBias(pmReadout *readout // Readout for which to get the bias sections
+    );
+
+
 // Allocators and deallocators
-p_pmHDU *p_pmHDUAlloc(const char *extname);
-void p_pmHDUFree(p_pmHDU *hdu);
+pmPixelData *pmPixelDataAlloc(const char *extname);
+void p_pmPixelDataFree(pmPixelData *pd);
 pmFPA *pmFPAAlloc(const psMetadata *camera // Camera configuration
     );
@@ -96 +104 @@
 void p_pmCellFree(pmCell *cell);
 
-pmReadout *pmReadoutAlloc(pmCell *cell, // Cell to which the readout belongs
+pmReadout *pmReadoutAlloc(pmCell *cell, // Cell to which the readout belongs
                           psImage *image, // The pixels
-                          psList *overscans, // The overscan images
+                          psImage *mask,// The mask pixels
                           int col0, int row0, int colParity, int rowParity, int colBin, int rowBin // Data
     );