Changeset 3037 for trunk/psLib/test/fileUtils/tst_psFits.c

Timestamp:

Jan 18, 2005, 9:36:26 AM (22 years ago)

Author:

desonia

Message:

* empty log message *

File:

• trunk/psLib/test/fileUtils/tst_psFits.c (modified) (4 diffs)

trunk/psLib/test/fileUtils/tst_psFits.c

@@ -6 +6 @@
 *  @author Robert DeSonia, MHPCC
 *
-*  @version $Revision: 1.13 $ $Name: not supported by cvs2svn $
-*  @date $Date: 2005-01-18 19:14:04 $
+*  @version $Revision: 1.14 $ $Name: not supported by cvs2svn $
+*  @date $Date: 2005-01-18 19:35:24 $
 *
 *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -74 +74 @@
 {
 
-    if (access(multiFilename, F_OK) != 0) {
-        psFits* fitsFile = psFitsAlloc(multiFilename);
-
-        if (fitsFile == NULL) {
-            psError(PS_ERR_UNKNOWN, false,
-                    "Could not create 'multi' FITS file.");
+    remove
+        (multiFilename);
+
+    psFits* fitsFile = psFitsAlloc(multiFilename);
+
+    if (fitsFile == NULL) {
+        psError(PS_ERR_UNKNOWN, false,
+                "Could not create 'multi' FITS file.");
+        return false;
+    }
+
+    psImage* image = psImageAlloc(16,16,PS_TYPE_F32);
+
+    char extname[80];
+    for (int lcv = 0; lcv < 8; lcv++) {
+        snprintf(extname,80,"ext-%d", lcv);
+
+        psMetadata* header = psMetadataAlloc();
+
+        psMetadataAdd(header,PS_LIST_TAIL, "MYINT",
+                      PS_TYPE_S32, PS_META_PRIMITIVE,
+                      "psS32 Item", (psS32)lcv);
+
+        psMetadataAdd(header,PS_LIST_TAIL, "MYFLT",
+                      PS_TYPE_F32, PS_META_PRIMITIVE,
+                      "psF32 Item", (float)(1.0f/(float)(1+lcv)));
+
+        psMetadataAdd(header,PS_LIST_TAIL, "MYDBL",
+                      PS_TYPE_F64, PS_META_PRIMITIVE,
+                      "psF64 Item", (double)(1.0/(double)(1+lcv)));
+
+        psMetadataAdd(header,PS_LIST_TAIL, "MYBOOL",
+                      PS_TYPE_BOOL, PS_META_PRIMITIVE,
+                      "psBool Item",
+                      (lcv%2 == 0));
+
+        psMetadataAdd(header,PS_LIST_TAIL, "MYSTR",
+                      PS_TYPE_PTR, PS_META_STR,
+                      "String Item",
+                      extname);
+
+        // set the pixels in the image
+        psBinaryOp(image,image,"=",psScalarAlloc(lcv,PS_TYPE_F32));
+        if (! psFitsWriteImage(fitsFile,header,image,1, extname) ) {
+            psError(PS_ERR_UNKNOWN, false,
+                    "Could not write image.");
             return false;
         }
 
-        psImage* image = psImageAlloc(16,16,PS_TYPE_F32);
-
-        char extname[80];
-        for (int lcv = 0; lcv < 8; lcv++) {
-            snprintf(extname,80,"ext-%d", lcv);
-
-            psMetadata* header = psMetadataAlloc();
-
-            psMetadataAdd(header,PS_LIST_TAIL, "MYINT",
-                          PS_TYPE_S32, PS_META_PRIMITIVE,
-                          "psS32 Item", (psS32)lcv);
-
-            psMetadataAdd(header,PS_LIST_TAIL, "MYFLT",
-                          PS_TYPE_F32, PS_META_PRIMITIVE,
-                          "psF32 Item", (float)(1.0f/(float)(1+lcv)));
-
-            psMetadataAdd(header,PS_LIST_TAIL, "MYDBL",
-                          PS_TYPE_F64, PS_META_PRIMITIVE,
-                          "psF64 Item", (double)(1.0/(double)(1+lcv)));
-
-            psMetadataAdd(header,PS_LIST_TAIL, "MYBOOL",
-                          PS_TYPE_BOOL, PS_META_PRIMITIVE,
-                          "psBool Item",
-                          (lcv%2 == 0));
-
-            psMetadataAdd(header,PS_LIST_TAIL, "MYSTR",
-                          PS_TYPE_PTR, PS_META_STR,
-                          "String Item",
-                          extname);
-
-            // set the pixels in the image
-            psBinaryOp(image,image,"=",psScalarAlloc(lcv,PS_TYPE_F32));
-            if (! psFitsWriteImage(fitsFile,header,image,1, extname) ) {
-                psError(PS_ERR_UNKNOWN, false,
-                        "Could not write image.");
-                return false;
-            }
-
-            psFree(header);
-        }
-        psFree(image);
-        psFree(fitsFile);
-    }
+        psFree(header);
+    }
+    psFree(image);
+    psFree(fitsFile);
 
     return true;
@@ -133 +134 @@
 {
 
-    if (access(tableFilename, F_OK) != 0) {
-        psFits* fitsFile = psFitsAlloc(tableFilename);
-
-        if (fitsFile == NULL) {
-            psError(PS_ERR_UNKNOWN, false,
-                    "Could not create 'table' FITS file.");
-            return false;
-        }
-
-        // make the PHU an image (per FITS standard, it must be)
-        psImage* image = psImageAlloc(16,16,PS_TYPE_F32);
-
-        if (! psFitsWriteImage(fitsFile,NULL,image,1,"primary") ) {
-            psError(PS_ERR_UNKNOWN, false,
-                    "Could not write PHU image.");
-            return false;
-        }
-
-        psFree(image);
-
-        // build a table structure
-        psArray* table = psArrayAlloc(tableNumRows);
-        table->n = 0;
-        for (int row = 0; row < tableNumRows; row++) {
-            psMetadata* header = psMetadataAlloc();
-
-            psMetadataAdd(header,PS_LIST_TAIL, "MYINT",
-                          PS_TYPE_S32, PS_META_PRIMITIVE,
-                          "psS32 Item", (psS32)row);
-
-            psMetadataAdd(header,PS_LIST_TAIL, "MYFLT",
-                          PS_TYPE_F32, PS_META_PRIMITIVE,
-                          "psF32 Item", (float)(1.0f/(float)(1+row)));
-
-            psMetadataAdd(header,PS_LIST_TAIL, "MYDBL",
-                          PS_TYPE_F64, PS_META_PRIMITIVE,
-                          "psF64 Item", (double)(1.0/(double)(1+row)));
-
-            psMetadataAdd(header,PS_LIST_TAIL, "MYBOOL",
-                          PS_TYPE_BOOL, PS_META_PRIMITIVE,
-                          "psBool Item",
-                          (row%2 == 0));
-
-            psArrayAdd(table,0,header);
-        }
-
-        psFitsWriteTable(fitsFile, NULL, table, "table-1");
-
-        psFree(table);
-        psFree(fitsFile);
-    }
+    remove
+        (tableFilename);
+
+    psFits* fitsFile = psFitsAlloc(tableFilename);
+
+    if (fitsFile == NULL) {
+        psError(PS_ERR_UNKNOWN, false,
+                "Could not create 'table' FITS file.");
+        return false;
+    }
+
+    // make the PHU an image (per FITS standard, it must be)
+    psImage* image = psImageAlloc(16,16,PS_TYPE_F32);
+
+    if (! psFitsWriteImage(fitsFile,NULL,image,1,"primary") ) {
+        psError(PS_ERR_UNKNOWN, false,
+                "Could not write PHU image.");
+        return false;
+    }
+
+    psFree(image);
+
+    // build a table structure
+    psArray* table = psArrayAlloc(tableNumRows);
+    table->n = 0;
+    for (int row = 0; row < tableNumRows; row++) {
+        psMetadata* header = psMetadataAlloc();
+
+        psMetadataAdd(header,PS_LIST_TAIL, "MYINT",
+                      PS_TYPE_S32, PS_META_PRIMITIVE,
+                      "psS32 Item", (psS32)row);
+
+        psMetadataAdd(header,PS_LIST_TAIL, "MYFLT",
+                      PS_TYPE_F32, PS_META_PRIMITIVE,
+                      "psF32 Item", (float)(1.0f/(float)(1+row)));
+
+        psMetadataAdd(header,PS_LIST_TAIL, "MYDBL",
+                      PS_TYPE_F64, PS_META_PRIMITIVE,
+                      "psF64 Item", (double)(1.0/(double)(1+row)));
+
+        psMetadataAdd(header,PS_LIST_TAIL, "MYBOOL",
+                      PS_TYPE_BOOL, PS_META_PRIMITIVE,
+                      "psBool Item",
+                      (row%2 == 0));
+
+        psArrayAdd(table,0,header);
+    }
+
+    psFitsWriteTable(fitsFile, NULL, table, "table-1");
+
+    psFree(table);
+    psFree(fitsFile);
 
     return true;
@@ -867 +869 @@
         }
 
-        if ( (boolItem && !((row&0x01) == 0)) ||
-                (!boolItem && ((row&0x01) == 0))) {
+        if ( boolItem != ((row&0x01) == 0)) {
             psError(PS_ERR_UNKNOWN, true,
                     "Failed to retrieve psBool metadata item from file (row=%d). Got %d vs %d",