Changeset 7168 for trunk/psModules/src/camera/pmFPAWrite.c

Timestamp:

May 22, 2006, 2:23:08 PM (20 years ago)

Author:

Paul Price

Message:

Adding pmHDUGenerate to make an HDU (image) from the cells contained below. Altered pmFPACopy to use pmHDUGenerate functions. The motivation for pmHDUGenerate is that when we go through an FPA bit by bit, creating an output FPA, we don't know the size of the resultant output images until we're done with the whole lot. So we simply create the cells, and call pmHDUGenerateFromFPA (etc) to generate the HDU image which is then written out. It takes care of the TRIMSEC, BIASSEC, etc.

File:

• trunk/psModules/src/camera/pmFPAWrite.c (modified) (7 diffs)

trunk/psModules/src/camera/pmFPAWrite.c

@@ -6 +6 @@
 #include "pmHDU.h"
 #include "pmHDUUtils.h"
+#include "pmHDUGenerate.h"
 #include "pmConcepts.h"
 
+#include "pmFPAWrite.h"
 
 bool pmReadoutWriteNext(pmReadout *readout, // Readout to write
@@ -51 +53 @@
         return false;
     }
-    psImage *image = hdu->images->data[z]; // The image from the HDU to write
+    psImage *image = readout->image; // The image from the HDU to write
     if (readout->row0 == 0 && readout->col0 == 0 && z == 0) {
         // Then we can assume that nothing has been written to the FITS file for now
@@ -68 +70 @@
 
     // We can simply update an existing HDU
-    if (!psFitsMoveExtName(fits, hdu->extname)) {
+    if (((hdu->phu || strcasecmp(hdu->extname, "PHU") == 0) && !psFitsMoveExtNum(fits, 0, false)) ||
+            !psFitsMoveExtName(fits, hdu->extname)) {
         psError(PS_ERR_IO, false, "Unable to move to extension %s\n", hdu->extname);
         return false;
@@ -86 +89 @@
     pmHDU *hdu = cell->hdu;             // The HDU
     if (hdu && ((!pixels && hdu->phu) || pixels)) {
+        if (pixels && !hdu->images && !pmHDUGenerateForCell(cell)) {
+            psError(PS_ERR_IO, false, "Unable to generate HDU for cell.\n");
+            return false;
+        }
         bool status = pmConceptsWriteCell(cell, PM_CONCEPT_SOURCE_HEADER | PM_CONCEPT_SOURCE_CAMERA |
                                           PM_CONCEPT_SOURCE_DEFAULTS, false, NULL);
@@ -107 +114 @@
     pmHDU *hdu = chip->hdu;             // The HDU
     if (hdu && ((!pixels && hdu->phu) || pixels)) {
+        if (pixels && !hdu->images && !pmHDUGenerateForChip(chip)) {
+            psError(PS_ERR_IO, false, "Unable to generate HDU for chip.\n");
+            return false;
+        }
         bool status = pmConceptsWriteChip(chip, PM_CONCEPT_SOURCE_HEADER | PM_CONCEPT_SOURCE_CAMERA |
                                           PM_CONCEPT_SOURCE_DEFAULTS, false, NULL);
@@ -130 +141 @@
 
 
-
 bool pmFPAWrite(pmFPA *fpa,             // FPA to write
                 psFits *fits,           // FITS file to which to write
@@ -139 +149 @@
     pmHDU *hdu = fpa->hdu;              // The HDU
     if (hdu && ((!pixels && hdu->phu) || pixels)) {
+        if (pixels && !hdu->images && !pmHDUGenerateForFPA(fpa)) {
+            psError(PS_ERR_IO, false, "Unable to generate HDU for FPA.\n");
+            return false;
+        }
         bool status = pmConceptsWriteFPA(fpa, PM_CONCEPT_SOURCE_HEADER | PM_CONCEPT_SOURCE_CAMERA |
                                          PM_CONCEPT_SOURCE_DEFAULTS, NULL);