Changeset 7230

Timestamp:

May 26, 2006, 3:50:33 PM (20 years ago)

Author:

Paul Price

Message:

Moving psFitsWriteTable functionality into psFitsInsertTable (the two were virtually identical; this now mirrors psFitsWriteImage and psFitsInsertImage). psFitsInsertImage now writes out the supplied header.

Location:

trunk/psLib/src/fits

Files:

• psFitsTable.c (modified) (7 diffs)
• psFitsTable.h (modified) (3 diffs)

trunk/psLib/src/fits/psFitsTable.c

@@ -7 +7 @@
  *  @author Robert DeSonia, MHPCC
  *
- *  @version $Revision: 1.7 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2006-04-04 19:52:42 $
+ *  @version $Revision: 1.8 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2006-05-27 01:50:33 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
  */
 
+#include "config.h"
 #include "psFits.h"
 #include "string.h"
@@ -23 +24 @@
 #include "psTrace.h"
 #include "psVector.h"
-#include "config.h"
+#include "psFitsTable.h"
+#include "psFitsHeader.h"
 
 #define MAX_STRING_LENGTH 256  // maximum length string for FITS routines
@@ -603 +605 @@
 
 bool psFitsWriteTable(psFits* fits,
-                      const psMetadata* header,
-                      const psArray* table)
+                      psMetadata* header,
+                      const psArray* table,
+                      const char *extname)
 {
+    psFitsMoveLast(fits);
+    return psFitsInsertTable(fits, header, table, extname, true);
+
+    #if 0
+
     int status = 0;
 
@@ -710 +718 @@
     }
 
-    psString extname = NULL;
-    if (header != NULL) {
-        extname = psMetadataLookupStr(NULL, header, "EXTNAME");
-        if ( extname == NULL) {
-            extname = psMetadataLookupStr(NULL, header, "HDUNAME");
-        }
-    }
-
+    // Create the table
     fits_create_tbl(fits->fd,
                     BINARY_TBL,
@@ -727 +728 @@
                     extname, // extension name
                     &status);
-
     psFree(columnNames);
     psFree(columnTypes);
+
+    // Write header
+    if (header && !psFitsWriteHeader(header, fits)) {
+        psError(PS_ERR_IO, false, "Unable to write FITS header.\n");
+        return false;
+    }
 
     // fill in the table elements with data
@@ -810 +816 @@
 
     return true;
+    #endif
 }
 
 bool psFitsInsertTable(psFits* fits,
-                       const psMetadata* header,
+                       psMetadata* header,
                        const psArray* table,
+                       const char *extname,
                        bool after)
 {
@@ -921 +929 @@
     }
 
-    psString extname = NULL;
-    if (header != NULL) {
-        extname = psMetadataLookupStr(NULL, header, "EXTNAME");
-        if ( extname == NULL) {
-            extname = psMetadataLookupStr(NULL, header, "HDUNAME");
-        }
-    }
-
-    if (! after) {
-        if (psFitsGetExtNum(fits) == 0) {
-            // set status to signal fits_insert_img to insert a new primary HDU
-            status = PREPEND_PRIMARY;
-        } else {
-            // move back one to perform an insert after the previous HDU
-            psFitsMoveExtNum(fits, -1, true);
-        }
-    }
-
-    fits_insert_btbl(fits->fd,
-                     table->n, // number of rows in table
-                     columns->n, // number of columns in table
-                     (char**)columnNames->data, // names of the columns
-                     (char**)columnTypes->data, // format of the columns
-                     NULL, // physical unit of columns
-                     extname, // extension name
-                     0,
-                     &status);
-
+    // Create the table HDU
+    int hdus = psFitsGetSize(fits);     // Number of HDUs in file
+    if (hdus == 0) {
+        // We're creating the first extension
+        fits_create_tbl(fits->fd,
+                        BINARY_TBL,
+                        table->n, // number of rows in table
+                        columns->n, // number of columns in table
+                        (char**)columnNames->data, // names of the columns
+                        (char**)columnTypes->data, // format of the columns
+                        NULL, // physical unit of columns
+                        (char*)extname, // extension name; casting away const because cfitsio is horrible
+                        &status);
+    } else {
+        if (!after) {
+            if (psFitsGetExtNum(fits) == 0) {
+                // We're creating a replacement primary HDU.
+                // Set status to signal fits_insert_img to insert a new primary HDU
+                status = PREPEND_PRIMARY;
+            } else {
+                // Move back one to perform an insert after the previous HDU
+                psFitsMoveExtNum(fits, -1, true);
+            }
+        }
+        // Insert the table
+        fits_insert_btbl(fits->fd,
+                         table->n, // number of rows in table
+                         columns->n, // number of columns in table
+                         (char**)columnNames->data, // names of the columns
+                         (char**)columnTypes->data, // format of the columns
+                         NULL, // physical unit of columns
+                         (char*)extname, // extension name; casting away const because cfitsio is horrible
+                         0,
+                         &status);
+    }
     psFree(columnNames);
     psFree(columnTypes);
 
+    // Write header
+    if (header && !psFitsWriteHeader(header, fits)) {
+        psError(PS_ERR_IO, false, "Unable to write FITS header.\n");
+        return false;
+    }
 
     // fill in the table elements with data

trunk/psLib/src/fits/psFitsTable.h

@@ -7 +7 @@
  *  @author Robert DeSonia, MHPCC
  *
- *  @version $Revision: 1.2 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2006-04-04 19:52:42 $
+ *  @version $Revision: 1.3 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2006-05-27 01:50:33 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -82 +82 @@
 bool psFitsWriteTable(
     psFits* fits,                      ///< the psFits object
-    const psMetadata* header,          ///< header items for the new HDU.  Can be NULL.
-    const psArray* table
-    ///< Array of psMetadata items, which contains the output data items of each row.
+    psMetadata* header,          ///< header items for the new HDU.  Can be NULL.
+    const psArray* table, ///< Array of psMetadata items, which contains the output data items of each row.
+    const char *extname                 ///< Extension name
 );
 
@@ -96 +96 @@
 bool psFitsInsertTable(
     psFits* fits,                  ///< the psFits object
-    const psMetadata* header,      ///< header items for the new HDU.  Can be NULL.
-    const psArray* table,
-    ///< Array of psMetadata items, which contains the output data items of each row.
-    bool after
-    ///< TRUE if insert is done after CHDU, otherwise table is inserted before CHDU
+    psMetadata* header,      ///< header items for the new HDU.  Can be NULL.
+    const psArray* table, ///< Array of psMetadata items, which contains the output data items of each row.
+    const char *extname,                ///< Extension name
+    bool after    ///< TRUE if insert is done after CHDU, otherwise table is inserted before CHDU
 );