Changeset 3341 for trunk/psLib/test/dataIO/tst_psFits.c

Timestamp:

Feb 28, 2005, 1:34:10 PM (21 years ago)

Author:

desonia

Message:

Changes to psMetadata to match latest SDRS.

File:

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

trunk/psLib/test/dataIO/tst_psFits.c

@@ -6 +6 @@
 *  @author Robert DeSonia, MHPCC
 *
-*  @version $Revision: 1.19 $ $Name: not supported by cvs2svn $
-*  @date $Date: 2005-02-22 19:25:53 $
+*  @version $Revision: 1.20 $ $Name: not supported by cvs2svn $
+*  @date $Date: 2005-02-28 23:34:10 $
 *
 *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -93 +93 @@
 
         psMetadataAdd(header,PS_LIST_TAIL, "MYINT",
-                      PS_TYPE_S32, PS_META_PRIMITIVE,
+                      PS_META_S32,
                       "psS32 Item", (psS32)lcv);
 
         psMetadataAdd(header,PS_LIST_TAIL, "MYFLT",
-                      PS_TYPE_F32, PS_META_PRIMITIVE,
+                      PS_META_F32,
                       "psF32 Item", (float)(1.0f/(float)(1+lcv)));
 
         psMetadataAdd(header,PS_LIST_TAIL, "MYDBL",
-                      PS_TYPE_F64, PS_META_PRIMITIVE,
+                      PS_META_F64,
                       "psF64 Item", (double)(1.0/(double)(1+lcv)));
 
         psMetadataAdd(header,PS_LIST_TAIL, "MYBOOL",
-                      PS_TYPE_BOOL, PS_META_PRIMITIVE,
+                      PS_META_BOOL,
                       "psBool Item",
                       (lcv%2 == 0));
 
         psMetadataAdd(header,PS_LIST_TAIL, "MYSTR",
-                      PS_TYPE_PTR, PS_META_STR,
+                      PS_META_STR,
                       "String Item",
                       extname);
@@ -162 +162 @@
 
         psMetadataAdd(header,PS_LIST_TAIL, "MYINT",
-                      PS_TYPE_S32, PS_META_PRIMITIVE,
+                      PS_META_S32,
                       "psS32 Item", (psS32)row);
 
         psMetadataAdd(header,PS_LIST_TAIL, "MYFLT",
-                      PS_TYPE_F32, PS_META_PRIMITIVE,
+                      PS_META_F32,
                       "psF32 Item", (float)(1.0f/(float)(1+row)));
 
         psMetadataAdd(header,PS_LIST_TAIL, "MYDBL",
-                      PS_TYPE_F64, PS_META_PRIMITIVE,
+                      PS_META_F64,
                       "psF64 Item", (double)(1.0/(double)(1+row)));
 
         psMetadataAdd(header,PS_LIST_TAIL, "MYBOOL",
-                      PS_TYPE_BOOL, PS_META_PRIMITIVE,
+                      PS_META_BOOL,
                       "psBool Item",
                       (row%2 == 0));
@@ -648 +648 @@
 
         if (boolItem == NULL ||
-                boolItem->type != PS_META_PRIMITIVE ||
-                boolItem->pType != PS_TYPE_BOOL) {
+                boolItem->type != PS_META_BOOL) {
             psError(PS_ERR_UNKNOWN, true,
                     "Failed to retrieve psBool metadata item from file.");