Index: trunk/psLib/test/fits/tst_psFits.c
===================================================================
--- trunk/psLib/test/fits/tst_psFits.c	(revision 6484)
+++ trunk/psLib/test/fits/tst_psFits.c	(revision 6767)
@@ -6,6 +6,6 @@
 *  @author Robert DeSonia, MHPCC
 *
-*  @version $Revision: 1.18 $ $Name: not supported by cvs2svn $
-*  @date $Date: 2006-02-24 23:43:15 $
+*  @version $Revision: 1.19 $ $Name: not supported by cvs2svn $
+*  @date $Date: 2006-04-04 19:52:47 $
 *
 *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -118,12 +118,7 @@
                       extname);
 
-        psMetadataAdd(header,PS_LIST_TAIL, "EXTNAME",
-                      PS_DATA_STRING,
-                      "Extension Name",
-                      extname);
-
         // set the pixels in the image
         psBinaryOp(image,image,"=",psScalarAlloc(lcv,PS_TYPE_F32));
-        if (! psFitsWriteImage(fitsFile,header,image,1) ) {
+        if (! psFitsWriteImage(fitsFile,header,image,1,extname) ) {
             psError(PS_ERR_UNKNOWN, false,
                     "Could not write image.");
@@ -152,5 +147,5 @@
     psImage* image = psImageAlloc(16,16,PS_TYPE_F32);
 
-    if (! psFitsWriteImage(fitsFile,NULL,image,1) ) {
+    if (! psFitsWriteImage(fitsFile,NULL,image,1,NULL) ) {
         psError(PS_ERR_UNKNOWN, false,
                 "Could not write PHU image.");
@@ -263,5 +258,5 @@
     // write something to the file, otherwise CFITSIO will complain on close
     psImage* img = psImageAlloc(16,16,PS_TYPE_F32);
-    psFitsWriteImage(fitsFile,NULL,img,1);
+    psFitsWriteImage(fitsFile,NULL,img,1,NULL);
 
     psFree(fitsFile); // psFree should be equivalent to psFitsClose
@@ -284,5 +279,5 @@
 
     // write something to the file, otherwise CFITSIO will complain on close
-    psFitsWriteImage(fitsFile,NULL,img,1);
+    psFitsWriteImage(fitsFile,NULL,img,1,NULL);
 
     psFitsClose(fitsFile);
@@ -305,5 +300,5 @@
 
     // write something to the file, otherwise CFITSIO will complain on close
-    psFitsWriteImage(fitsFile,NULL,img,1);
+    psFitsWriteImage(fitsFile,NULL,img,1,NULL);
 
     psFitsClose(fitsFile);
@@ -821,5 +816,5 @@
     psFitsMoveExtNum(fits,numHDUs/2, false);
 
-    psMetadata* headerSet = psFitsReadHeaderSet(fits);
+    psMetadata* headerSet = psFitsReadHeaderSet(NULL,fits);
 
     if (headerSet == NULL) {
@@ -862,12 +857,5 @@
     }
 
-    psMetadata* set2 = psFitsReadHeaderSet(NULL);
-    if (set2 != NULL) {
-        psError(PS_ERR_UNKNOWN, false,
-                "psFitsReadHeaderSet returned non-NULL given a NULL psFits.");
-        return 10;
-    }
-
-    psMetadata* set3 = psFitsReadHeaderSet(fits);
+    psMetadata* set3 = psFitsReadHeaderSet(NULL,fits);
     if (set3 == NULL) {
         psError(PS_ERR_UNKNOWN, false,
@@ -902,9 +890,12 @@
     }
 
-
+    set3 = psFitsReadHeaderSet(set3,NULL);
+    if (set3 != NULL) {
+        psError(PS_ERR_UNKNOWN, false,
+                "psFitsReadHeaderSet returned non-NULL given a NULL psFits.");
+        return 10;
+    }
 
     psFree(headerSet);
-    psFree(set3);
-    // set2 should have been freed by psFitsReadHeaderSet upon an error.
 
     psFitsClose(fits);
@@ -1434,18 +1425,17 @@
         img4 = psImageCopy(img4,img3,PS_TYPE_##TYP); \
         psFits* fits = psFitsOpen(filename, "w"); \
-        psRegion region = {0,0,0,0}; \
-        if (! psFitsWriteImage(fits, NULL, img, 2)) { \
+        if (! psFitsWriteImage(fits, NULL, img, 2, NULL)) { \
             psError(PS_ERR_UNKNOWN, true,"Failed to write test image %s",filename); \
             return 1; \
         } \
-        if (! psFitsUpdateImage(fits,img3, region, 1)) { \
+        if (! psFitsUpdateImage(fits,img3, 0,0, 1)) { \
             psError(PS_ERR_UNKNOWN, true,"Failed to write test image %s",filename); \
             return 2; \
         } \
-        if (! psFitsWriteImage(fits,NULL, img3, 2)) { \
+        if (! psFitsWriteImage(fits,NULL, img3, 2, NULL)) { \
             psError(PS_ERR_UNKNOWN, true,"Failed to write test image %s",filename); \
             return 3; \
         } \
-        if (! psFitsUpdateImage(fits,img,region, 1)) { \
+        if (! psFitsUpdateImage(fits,img, 0, 0, 1)) { \
             psError(PS_ERR_UNKNOWN, true,"Failed to write test image %s",filename); \
             return 4; \
@@ -1588,12 +1578,11 @@
     GENIMAGE(img2,m,n,F32,row+2*col);
     mkdir("tmpImages",0777);
-    psRegion region = {0,0,0,0};
     psFits* fits = psFitsOpen("tmpImages/writeTest.fits","w");
 
-    if (! psFitsWriteImage(fits, NULL, img,1)) {
+    if (! psFitsWriteImage(fits, NULL, img,1, NULL)) {
         psError(PS_ERR_UNKNOWN, true,"Couldn't write writeTest.fits.");
         return 14;
     }
-    if (! psFitsUpdateImage(fits, img2, region, 0)) {
+    if (! psFitsUpdateImage(fits, img2, 0, 0, 0)) {
         psError(PS_ERR_UNKNOWN, true,"Couldn't update writeTest.fits.");
         return 15;
@@ -1604,4 +1593,6 @@
     // Did it really overwrite the pixel values?  Let's read it in and see.
     psFitsClose(fits);
+
+    psRegion region = {0,0,0,0};
     fits = psFitsOpen("tmpImages/writeTest.fits","r");
     img = psFitsReadImage(NULL, fits, region, 0);
@@ -1628,5 +1619,5 @@
     */
     psLogMsg(__func__,PS_LOG_INFO,"Following should generate an error message because input image is null.");
-    if ( psFitsWriteImage(fits,NULL,NULL, 1) ) {
+    if ( psFitsWriteImage(fits,NULL,NULL, 1, NULL) ) {
         psError(PS_ERR_UNKNOWN, true,"psImageWriteSection did not return false when input image is NULL.");
         return 20;