Changeset 9066

Timestamp:

Sep 29, 2006, 4:29:20 PM (20 years ago)

Author:

magnier

Message:

adding EXTNAME option to psFitsWriteBlank

Location:

trunk/psLib/src/fits

Files:

• psFitsHeader.c (modified) (3 diffs)
• psFitsHeader.h (modified) (2 diffs)

trunk/psLib/src/fits/psFitsHeader.c

@@ -7 +7 @@
  *  @author Robert DeSonia, MHPCC
  *
- *  @version $Revision: 1.26 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2006-08-22 15:00:13 $
+ *  @version $Revision: 1.27 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2006-09-30 02:29:20 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -408 +408 @@
 
 bool psFitsWriteBlank(psFits* fits,
-                      const psMetadata* output
+                      const psMetadata* output,
+                      const char *extname
                      )
 {
@@ -420 +421 @@
     // Create a dummy image HDU for the primary HDU
     int status = 0;                 // Status of cfitsio
-    fits_create_img(fits->fd, 16, 0, NULL, &status);
+
+    int hdus = psFitsGetSize(fits);     // Number of HDUs in file
+    if (hdus == 0) {
+        // We're creating the first image
+        fits_create_img(fits->fd, 16, 0, NULL, &status);
+    } else {
+        // Insert after the current position
+        fits_insert_img(fits->fd, 16, 0, NULL, &status);
+    }
+
     if (status) {
         char fitsErr[MAX_STRING_LENGTH];
         (void)fits_get_errstatus(status, fitsErr);
-        psError(PS_ERR_IO, true, "Unable to create primary header.\n%s\n", fitsErr);
-        return false;
-    }
-
-    if (output) {
-        return fitsWriteHeader(fits, output, false);
+        psError(PS_ERR_IO, true, "Unable to create blank header.\n%s\n", fitsErr);
+        return false;
+    }
+
+    if (output && !fitsWriteHeader(fits, output, false)) {
+        psError(PS_ERR_IO, false, "Unable to write FITS header.\n");
+        return false;
+    }
+
+    if (extname && strlen(extname)) {
+        psFitsSetExtName(fits, extname);
     }
 

trunk/psLib/src/fits/psFitsHeader.h

@@ -7 +7 @@
  *  @author Robert DeSonia, MHPCC
  *
- *  @version $Revision: 1.8 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2006-06-13 22:28:02 $
+ *  @version $Revision: 1.9 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2006-09-30 02:29:20 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -57 +57 @@
 bool psFitsWriteBlank(
     psFits* fits,                       ///< the psFits object
-    const psMetadata* output            ///< the psMetadata data in which to write
+    const psMetadata* output,           ///< the psMetadata data in which to write
+    const char *extname
 );