Changeset 4191 for trunk/psLib/src/fits

Timestamp:

Jun 9, 2005, 9:40:51 AM (21 years ago)

Author:

desonia

Message:

removed extname from psFitsWrite* functions (Bug #412).

Location:

trunk/psLib/src/fits

Files:

• psFits.c (modified) (5 diffs)
• psFits.h (modified) (3 diffs)

trunk/psLib/src/fits/psFits.c

@@ -7 +7 @@
  *  @author Robert DeSonia, MHPCC
  *
- *  @version $Revision: 1.32 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2005-06-08 21:07:59 $
+ *  @version $Revision: 1.33 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2005-06-09 19:40:51 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -797 +797 @@
                       const psMetadata* header,
                       const psImage* input,
-                      int numZPlanes,
-                      char* extname)
+                      int numZPlanes)
 {
 
@@ -837 +836 @@
 
     fits_create_img(fits->p_fd, bitPix, naxis, naxes, &status);
-
-    if (extname != NULL) {
-        fits_update_key_str(fits->p_fd, "EXTNAME", (char*)extname, NULL, &status);
-    }
 
     if (bZero != 0) {        // set the bscale/bzero
@@ -1453 +1448 @@
 bool psFitsWriteTable(const psFits* fits,
                       psMetadata* header,
-                      psArray* table,
-                      char* extname)
+                      psArray* table)
 {
     int status = 0;
@@ -1524 +1518 @@
         }
         columnTypes->data[n] = fitsType;
+    }
+
+    psBool mStatus = false;
+    char* extname = psMetadataLookupPtr(&mStatus, header, "EXTNAME");
+    if ( ! mStatus) {
+        extname = psMetadataLookupPtr(&mStatus, header, "HDUNAME");
+        if (! mStatus) {
+            extname = NULL;
+        }
     }
 

trunk/psLib/src/fits/psFits.h

@@ -7 +7 @@
  *  @author Robert DeSonia, MHPCC
  *
- *  @version $Revision: 1.13 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2005-06-09 19:26:48 $
+ *  @version $Revision: 1.14 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2005-06-09 19:40:51 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -178 +178 @@
     const psMetadata* header,          ///< header items for the new HDU.  Can be NULL.
     const psImage* input,              ///< the image to output
-    int depth,                         ///< the number of z-planes of the FITS image data cube
-    char* extname                      ///< extension name
+    int depth                          ///< the number of z-planes of the FITS image data cube
 );
 
@@ -248 +247 @@
     const psFits* fits,                ///< the psFits object
     psMetadata* header,                ///< header items for the new HDU.  Can be NULL.
-    psArray* table,
+    psArray* table
     ///< Array of psMetadata items, which contains the output data items of each row.
-    char* extname                      ///< extension name
 );