Changeset 6552 for branches/rel10_ifa/psModules/src/astrom/pmFPARead.c

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/pmFPARead.c (modified) (9 diffs)

branches/rel10_ifa/psModules/src/astrom/pmFPARead.c

@@ -12 +12 @@
 //////////////////////////////////////////////////////////////////////////////////////////////////////////////
 
-
+#if 0
 // Read a FITS extension into a chip
 static bool readExtension(p_pmHDU *hdu, // Pixel data into which to read
@@ -135 +135 @@
     return true;
 }
-
-//////////////////////////////////////////////////////////////////////////////////////////////////////////////
-// Public functions
-//////////////////////////////////////////////////////////////////////////////////////////////////////////////
-
-
-bool pmReadoutRead(pmReadout *readout,  // Readout to read into
-                   psFits *fits         // FITS file from which to read
-                  )
-{
-    //
-
-}
+#endif
+
 
 // Carve a readout from the image pixels
@@ -162 +151 @@
 
     // Get the list of overscans
-    psListIterator *iter = psListIteratorAlloc(biassecs, PS_LIST_HEAD, false); // Iterator
+    psListIterator *iter = psListIteratorAlloc((psList*)biassecs, PS_LIST_HEAD, false); // Iterator
     psRegion *biassec = NULL;       // A BIASSEC region from the list
     while ((biassec = psListGetAndIncrement(iter))) {
@@ -174 +163 @@
 }
 
-
+//////////////////////////////////////////////////////////////////////////////////////////////////////////////
+// Public functions
+//////////////////////////////////////////////////////////////////////////////////////////////////////////////
+
+
+#if 0
+bool pmReadoutRead(pmReadout *readout,  // Readout to read into
+                   psFits *fits         // FITS file from which to read
+                  )
+{
+    // This is very very different
+}
+#endif
+
+// Read in the cell, and allocate the readouts
 bool pmCellRead(pmCell *cell,           // Cell to read into
                 psFits *fits,           // FITS file from which to read
@@ -185 +188 @@
         return false;
     }
-
-    // Read the "concepts"
-    pmConceptsReadCell(cell, db);
 
     // Having read the cell, we now have to cut it up
@@ -205 +205 @@
 }
 
-
+// Read in the component cells
 bool pmChipRead(pmChip *chip,           // Chip to read into
                 psFits *fits,           // FITS file from which to read
@@ -223 +223 @@
 }
 
+// Read in the component chips
 bool pmFPARead(pmFPA *fpa,              // FPA to read into
                psFits *fits,            // FITS file from which to read
@@ -228 +229 @@
               )
 {
-    psArray *chips = fpa->cells;       // Array of cells
+    psArray *chips = fpa->chips;       // Array of chips
     for (int i = 0; i < chips->n; i++) {
-        pmCell *chip = chips->data[i];  // The cell of interest
+        pmChip *chip = chips->data[i];  // The cell of interest
         if (!pmChipRead(chip, fits, db)) {
             psError(PS_ERR_IO, false, "Unable to read chip %d.\n", i);
@@ -239 +240 @@
     return true;
 }
+
+// Read the PHU into the nominated HDU
+static bool readPHU(pmHDU *hdu,         // HDU to read into
+                    psFits *fits        // FITS file from which to read
+                   )
+{
+    if (! hdu || ! hdu->phu) {
+        return false;                   // Nothing to see here, move along
+    }
+    if (hdu->header) {
+        return true;                    // Already something to see here, no need to gawk at it...  (;
+    }
+    // Read the PHU
+    psFitsMoveExtNum(fits, 0, false);
+    hdu->header = psFitsReadHeader(hdu->header, fits);
+    return true;
+}
+
+// Read the PHU into a cell
+bool pmCellReadPHU(pmCell *cell,        // Cell to read into
+                   psFits *fits         // FITS file from which to read
+                  )
+{
+    return readPHU(cell->hdu, fits) || readPHU(cell->parent->hdu, fits) ||
+           readPHU(cell->parent->parent->hdu, fits);
+
+}
+
+// Read the PHU into a chip
+bool pmChipReadPHU(pmChip *chip,        // Chip to read into
+                   psFits *fits         // FITS file from which to read
+                  )
+{
+    return readPHU(chip->hdu, fits) || readPHU(chip->parent->hdu, fits);
+}
+
+// Read the PHU into an FPA
+bool pmFPAReadPHU(pmFPA *fpa,           // FPA to read into
+                  psFits *fits          // FITS file from which to read
+                 )
+{
+    return readPHU(fpa->hdu, fits);
+}
+
+
+
 
 #if 0