Changeset 7224 for trunk/psLib/src/fits/psFitsImage.c

Timestamp:

May 25, 2006, 2:48:20 PM (20 years ago)

Author:

Paul Price

Message:

Fixing problem that prevented us from writing a PHU consisting of a header only --- need to call fits_create_img in psFitsWriteHeader if there are not currently any HDUs. This generates the primary HDU (without having to put in the required headers manually), and allows subsequent calls to psFitsWriteImage to generate a new HDU (without having to put in the required headers manually). Required keywords are written by cfitsio.

File:

• trunk/psLib/src/fits/psFitsImage.c (modified) (5 diffs)

trunk/psLib/src/fits/psFitsImage.c

@@ -7 +7 @@
  *  @author Robert DeSonia, MHPCC
  *
- *  @version $Revision: 1.5 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2006-05-22 22:38:27 $
+ *  @version $Revision: 1.6 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2006-05-26 00:48:20 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -331 +331 @@
     }
 
-    int chdu = psFitsGetExtNum(fits);
-    int hdus = psFitsGetSize(fits);
+    int chdu = psFitsGetExtNum(fits);   // Current HDU number
+    int hdus = psFitsGetSize(fits);     // Number of HDUs in file
     if (! after) {
         if (chdu == 0) {
@@ -346 +346 @@
         status = 0;
         fits_create_img(fits->fd, bitPix, naxis, naxes, &status);
-
     } else {
         fits_insert_img(fits->fd, bitPix, naxis, naxes, &status);
@@ -363 +362 @@
 
     if (header) {
-        // Update header with BITPIX, NAXIS[12], BSCALE, BZERO so we don't clobber the basic header
-        psMetadataAddS32(header, PS_LIST_TAIL, "BITPIX", PS_META_REPLACE, "Bits per pixel", bitPix);
-        psMetadataAddS32(header, PS_LIST_TAIL, "NAXIS",  PS_META_REPLACE, "Number of dimensions", naxis);
-        psMetadataAddS32(header, PS_LIST_TAIL, "NAXIS1", PS_META_REPLACE, "Number of columns", numCols);
-        psMetadataAddS32(header, PS_LIST_TAIL, "NAXIS2", PS_META_REPLACE, "Number of rows", numRows);
-        psMetadataAddF64(header, PS_LIST_TAIL, "BSCALE", PS_META_REPLACE, "Pixel value scale", 1.0);
-        psMetadataAddF64(header, PS_LIST_TAIL, "BZERO",  PS_META_REPLACE, "Pixel value offset", bZero);
-        if (extname && strlen(extname) > 0) {
-            psMetadataAddStr(header, PS_LIST_TAIL, "EXTNAME", PS_META_REPLACE, "Extenion Name", extname);
-        }
         psFitsWriteHeader(header, fits);
-    } else {
-        // Write the necessary headers manually
-        fits_write_key_dbl(fits->fd, "BZERO", bZero, 12, "Pixel Value Offset", &status);
-        fits_write_key_dbl(fits->fd, "BSCALE", 1.0, 12, "Pixel Value Scale", &status);
-        // Regrettably have to cast away "const" on extname, because CFITSIO is horrible
-        fits_write_key_str(fits->fd, "EXTNAME", (char *)extname, "Extension name", &status);
-    }
-
+    }
     if (input->parent == NULL) { // if no parent, assume that the image data is contiguous
         fits_write_img(fits->fd,
@@ -402 +384 @@
     }
 
-    if ( status != 0) {
+    if (status != 0) {
         char fitsErr[MAX_STRING_LENGTH];
         (void)fits_get_errstatus(status, fitsErr);