Changeset 5168 for trunk/psLib/test/fits/tst_psFits.c

Timestamp:

Sep 28, 2005, 10:02:49 AM (21 years ago)

Author:

desonia

Message:

added support for reading vectors from binary tables.

File:

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

trunk/psLib/test/fits/tst_psFits.c

@@ -6 +6 @@
 *  @author Robert DeSonia, MHPCC
 *
-*  @version $Revision: 1.10 $ $Name: not supported by cvs2svn $
-*  @date $Date: 2005-09-28 02:38:01 $
+*  @version $Revision: 1.11 $ $Name: not supported by cvs2svn $
+*  @date $Date: 2005-09-28 20:02:49 $
 *
 *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -203 +203 @@
 
         psVector* vec = psVectorAlloc(5,PS_TYPE_S32);
-        for (int x=0; x < 5; x++) {
-            vec->data.S32[x] = x*2;
+        for (int x=0; x < 4; x++) {
+            vec->data.S32[x] = x*10+row;
         }
         psMetadataAdd(header,PS_LIST_TAIL, "MYVEC",
@@ -899 +899 @@
         psBool boolItem = psMetadataLookupBool(NULL, rowData, "MYBOOL");
         psString strItem = psMetadataLookupStr(NULL, rowData, "MYSTR");
+        psVector* vecItem = psMetadataLookupPtr(NULL, rowData, "MYVEC");
 
         if (intItem != row) {
@@ -935 +936 @@
                     row, strItem, strValue);
             return 24;
+        }
+
+        if ( vecItem == NULL ) {
+            psError(PS_ERR_UNKNOWN, true,
+                    "Failed to retrieve psVector metadata item from file (row=%d).",
+                    row);
+            return 25;
+        }
+
+        if ( vecItem->type.type != PS_DATA_S32 ||
+                vecItem->data.S32[0] != row ||
+                vecItem->data.S32[3] != row+30 ) {
+            psError(PS_ERR_UNKNOWN, true,
+                    "Retrieved psVector (row=%d) didn't match expected values [%d,%d,%d,%d] vs [%d,%d,%d,%d].",
+                    row,vecItem->data.S32[0], vecItem->data.S32[1],
+                    vecItem->data.S32[2], vecItem->data.S32[3],
+                    row,row+10,row+20,row+30);
+            return 26;
         }
     }