Index: trunk/psLib/test/astronomy/tst_psMetadataIO.c
===================================================================
--- trunk/psLib/test/astronomy/tst_psMetadataIO.c	(revision 3381)
+++ trunk/psLib/test/astronomy/tst_psMetadataIO.c	(revision 3407)
@@ -14,6 +14,6 @@
  *  @author  Robert DeSonia, MHPCC
  *
- *  @version $Revision: 1.11 $  $Name: not supported by cvs2svn $
- *  @date  $Date: 2005-03-07 20:58:50 $
+ *  @version $Revision: 1.12 $  $Name: not supported by cvs2svn $
+ *  @date  $Date: 2005-03-11 20:38:56 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -66,6 +66,8 @@
 static void printMetadataItem(psMetadataItem *metadataItem, char *spaces)
 {
+    char* vecStr;
+
     printf("%sKey Name: %8s  ", spaces, metadataItem->name);
-    printf("Key mdType: %d  ", metadataItem->type);
+    printf("Key mdType: 0x%08x ", metadataItem->type);
 
     switch (metadataItem->type) {
@@ -85,9 +87,14 @@
         printf("Key Value: %15.3f  ", metadataItem->data.F64);
         break;
+    case PS_META_VEC:
+        vecStr = (char*)psVectorToString((psVector*)metadataItem->data.V, 15);
+        printf("Key Value: %15s  ", vecStr);
+        psFree(vecStr);
+        break;
     case PS_META_STR:
         printf("Key Value: %15s  ", (char*)metadataItem->data.V);
         break;
     default:
-        printf("Bad type: %d ", metadataItem->type);
+        printf("Bad type: 0x%08x ", metadataItem->type);
     }
     printf("Key Comment: %s\n", metadataItem->comment);
Index: trunk/psLib/test/astronomy/tst_psMetadata_01.c
===================================================================
--- trunk/psLib/test/astronomy/tst_psMetadata_01.c	(revision 3381)
+++ trunk/psLib/test/astronomy/tst_psMetadata_01.c	(revision 3407)
@@ -18,6 +18,6 @@
 *  @author  Ross Harman, MHPCC
 *
-*  @version $Revision: 1.22 $  $Name: not supported by cvs2svn $
-*  @date  $Date: 2005-03-07 20:58:50 $
+*  @version $Revision: 1.23 $  $Name: not supported by cvs2svn $
+*  @date  $Date: 2005-03-11 20:38:56 $
 *
 *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -72,5 +72,5 @@
 {
     printf("%sKey Name: %8s  ", spaces, metadataItem->name);
-    printf("Key mdType: %d  ", metadataItem->type);
+    printf("Key mdType: 0x%08x  ", metadataItem->type);
 
     switch (metadataItem->type) {
@@ -126,4 +126,5 @@
     printFooter(stdout, "psMetadata", "Test A - Read 1st hdr from simple FITS file", true);
 
+    printf("ID=%d\n",(int)psMemGetId());
 
     // Test B - Read 2nd hdr from complex FITS file
@@ -173,4 +174,5 @@
     printFooter(stdout, "psMetadata", "Test B - Read 2nd hdr from complex FITS file", true);
 
+    printf("ID=%d\n",(int)psMemGetId());
 
     // Test C - Read named hdr from complex FITS file
Index: trunk/psLib/test/astronomy/tst_psMetadata_02.c
===================================================================
--- trunk/psLib/test/astronomy/tst_psMetadata_02.c	(revision 3381)
+++ trunk/psLib/test/astronomy/tst_psMetadata_02.c	(revision 3407)
@@ -15,6 +15,6 @@
  *  @author  Robert DeSonia, MHPCC
  *
- *  @version $Revision: 1.13 $  $Name: not supported by cvs2svn $
- *  @date  $Date: 2005-03-07 20:58:50 $
+ *  @version $Revision: 1.14 $  $Name: not supported by cvs2svn $
+ *  @date  $Date: 2005-03-11 20:38:56 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -29,5 +29,5 @@
 {
     printf("Key Name: %8s  ", metadataItem->name);
-    printf("Key mdType: %2d  ", metadataItem->type);
+    printf("Key mdType: 0x%08x  ", metadataItem->type);
 
     switch (metadataItem->type) {
@@ -98,5 +98,5 @@
     printNegativeTestHeader(stdout,"psMetadata", "Test C - Attempt to create metadata item with invalid type",
                             "Invalid psMetadataType: 6", 0);
-    badItem = psMetadataItemAlloc("badItem", PS_META_NTYPE, "I am bad", "Bad comment");
+    badItem = psMetadataItemAlloc("badItem", -1, "I am bad", "Bad comment");
     printFooter(stdout, "psMetadata", "Test C - Attempt to create metadata item with invalid type", true);
 
Index: trunk/psLib/test/astronomy/tst_psMetadata_03.c
===================================================================
--- trunk/psLib/test/astronomy/tst_psMetadata_03.c	(revision 3381)
+++ trunk/psLib/test/astronomy/tst_psMetadata_03.c	(revision 3407)
@@ -18,6 +18,6 @@
 *  @author  Ross Harman, MHPCC
 *
-*  @version $Revision: 1.15 $  $Name: not supported by cvs2svn $
-*  @date  $Date: 2005-03-07 20:58:50 $
+*  @version $Revision: 1.16 $  $Name: not supported by cvs2svn $
+*  @date  $Date: 2005-03-11 20:38:56 $
 *
 *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -32,5 +32,5 @@
 {
     printf("Key Name: %8s  ", metadataItem->name);
-    printf("Key mdType: %2d  ", metadataItem->type);
+    printf("Key mdType: 0x%08x  ", metadataItem->type);
 
     switch (metadataItem->type) {
Index: trunk/psLib/test/astronomy/tst_psMetadata_04.c
===================================================================
--- trunk/psLib/test/astronomy/tst_psMetadata_04.c	(revision 3381)
+++ trunk/psLib/test/astronomy/tst_psMetadata_04.c	(revision 3407)
@@ -23,6 +23,6 @@
 *  @author  Ross Harman, MHPCC
 *
-*  @version $Revision: 1.16 $  $Name: not supported by cvs2svn $
-*  @date  $Date: 2005-03-07 20:58:50 $
+*  @version $Revision: 1.17 $  $Name: not supported by cvs2svn $
+*  @date  $Date: 2005-03-11 20:38:56 $
 *
 *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -37,5 +37,5 @@
 {
     printf("Key Name: %8s  ", metadataItem->name);
-    printf("Key mdType: %2d  ", metadataItem->type);
+    printf("Key mdType: 0x%08x  ", metadataItem->type);
 
     switch (metadataItem->type) {
Index: trunk/psLib/test/astronomy/tst_psMetadata_05.c
===================================================================
--- trunk/psLib/test/astronomy/tst_psMetadata_05.c	(revision 3381)
+++ trunk/psLib/test/astronomy/tst_psMetadata_05.c	(revision 3407)
@@ -22,6 +22,6 @@
 *  @author  Ross Harman, MHPCC
 *
-*  @version $Revision: 1.21 $  $Name: not supported by cvs2svn $
-*  @date  $Date: 2005-03-07 20:58:50 $
+*  @version $Revision: 1.22 $  $Name: not supported by cvs2svn $
+*  @date  $Date: 2005-03-11 20:38:56 $
 *
 *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -36,5 +36,5 @@
 {
     printf("Key Name: %8s  ", metadataItem->name);
-    printf("Key mdType: %2d  ", metadataItem->type);
+    printf("Key mdType: 0x%08x  ", metadataItem->type);
 
     switch (metadataItem->type) {
Index: trunk/psLib/test/astronomy/tst_psMetadata_06.c
===================================================================
--- trunk/psLib/test/astronomy/tst_psMetadata_06.c	(revision 3381)
+++ trunk/psLib/test/astronomy/tst_psMetadata_06.c	(revision 3407)
@@ -13,6 +13,6 @@
 *  @author  Ross Harman, MHPCC
 *
-*  @version $Revision: 1.11 $  $Name: not supported by cvs2svn $
-*  @date  $Date: 2005-03-07 20:58:50 $
+*  @version $Revision: 1.12 $  $Name: not supported by cvs2svn $
+*  @date  $Date: 2005-03-11 20:38:56 $
 *
 *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -27,5 +27,5 @@
 {
     printf("Key Name: %8s  ", metadataItem->name);
-    printf("Key mdType: %2d  ", metadataItem->type);
+    printf("Key mdType: 0x%08x  ", metadataItem->type);
 
     switch (metadataItem->type) {
Index: trunk/psLib/test/astronomy/verified/tst_psMetadataIO.stdout
===================================================================
--- trunk/psLib/test/astronomy/verified/tst_psMetadataIO.stdout	(revision 3381)
+++ trunk/psLib/test/astronomy/verified/tst_psMetadataIO.stdout	(revision 3407)
@@ -7,41 +7,41 @@
 Failed lines: 6 Expected: 6
 Contents of metadata list:
- Key Name:       pi  Key mdType: 2  Key Value:           3.142  Key Comment: Definition of pi
- Key Name: altitude  Key mdType: 0  Key Value:           10000  Key Comment: 
- Key Name:     time  Key mdType: 1  Key Value:        1234.568  Key Comment: 
- Key Name:   myBool  Key mdType: 3  Key Value:               0  Key Comment: F, f, 0, T, t, 1 are also acceptable
- Key Name:   title1  Key mdType: 5  Key Value:     Hello world  Key Comment: This is a comment for the string value
- Key Name:   title2  Key mdType: 5  Key Value:  Good bye world  Key Comment: STRING or STR may be used as the string type
- Key Name:   primes  Key mdType: 6  Bad type: 6 Key Comment: These are prime numbers
- Key Name: negatives  Key mdType: 6  Bad type: 6 Key Comment: 
- Key Name:  comment  Key mdType: 5  Key Value:            This  Key Comment: 
- Key Name:  comment  Key mdType: 5  Key Value:              is  Key Comment: 
- Key Name:  comment  Key mdType: 5  Key Value:              an  Key Comment: 
- Key Name:  comment  Key mdType: 5  Key Value:            ugly  Key Comment: 
- Key Name:  comment  Key mdType: 5  Key Value:         comment  Key Comment: 
- Key Name:  comment  Key mdType: 5  Key Value:             but  Key Comment: 
- Key Name:  comment  Key mdType: 5  Key Value:           still  Key Comment: 
- Key Name:  comment  Key mdType: 5  Key Value:           valid  Key Comment: 
- Key Name:    speed  Key mdType: 1  Key Value:          66.660  Key Comment: 
+ Key Name:       pi  Key mdType: 0x00000408 Key Value:           3.142  Key Comment: Definition of pi
+ Key Name: altitude  Key mdType: 0x00000104 Key Value:           10000  Key Comment: 
+ Key Name:     time  Key mdType: 0x00000404 Key Value:        1234.568  Key Comment: 
+ Key Name:   myBool  Key mdType: 0x00001301 Key Value:               0  Key Comment: F, f, 0, T, t, 1 are also acceptable
+ Key Name:   title1  Key mdType: 0x00010001 Key Value:     Hello world  Key Comment: This is a comment for the string value
+ Key Name:   title2  Key mdType: 0x00010001 Key Value:  Good bye world  Key Comment: STRING or STR may be used as the string type
+ Key Name:   primes  Key mdType: 0x00010002 Key Value:   [2,3,5,7,...]  Key Comment: These are prime numbers
+ Key Name: negatives  Key mdType: 0x00010002 Key Value:  [-1,-2,-3,...]  Key Comment: 
+ Key Name:  comment  Key mdType: 0x00010001 Key Value:            This  Key Comment: 
+ Key Name:  comment  Key mdType: 0x00010001 Key Value:              is  Key Comment: 
+ Key Name:  comment  Key mdType: 0x00010001 Key Value:              an  Key Comment: 
+ Key Name:  comment  Key mdType: 0x00010001 Key Value:            ugly  Key Comment: 
+ Key Name:  comment  Key mdType: 0x00010001 Key Value:         comment  Key Comment: 
+ Key Name:  comment  Key mdType: 0x00010001 Key Value:             but  Key Comment: 
+ Key Name:  comment  Key mdType: 0x00010001 Key Value:           still  Key Comment: 
+ Key Name:  comment  Key mdType: 0x00010001 Key Value:           valid  Key Comment: 
+ Key Name:    speed  Key mdType: 0x00000404 Key Value:          66.660  Key Comment: 
 
 Contents of metadata table:
- Key Name:  comment  Key mdType: 14  Key Value:                  Key Comment: 
-    Key Name:  comment  Key mdType: 5  Key Value:            This  Key Comment: 
-    Key Name:  comment  Key mdType: 5  Key Value:              is  Key Comment: 
-    Key Name:  comment  Key mdType: 5  Key Value:              an  Key Comment: 
-    Key Name:  comment  Key mdType: 5  Key Value:            ugly  Key Comment: 
-    Key Name:  comment  Key mdType: 5  Key Value:         comment  Key Comment: 
-    Key Name:  comment  Key mdType: 5  Key Value:             but  Key Comment: 
-    Key Name:  comment  Key mdType: 5  Key Value:           still  Key Comment: 
-    Key Name:  comment  Key mdType: 5  Key Value:           valid  Key Comment: 
- Key Name:   title2  Key mdType: 5  Key Value:  Good bye world  Key Comment: STRING or STR may be used as the string type
- Key Name:     time  Key mdType: 1  Key Value:        1234.568  Key Comment: 
- Key Name: negatives  Key mdType: 6  Bad type: 6 Key Comment: 
- Key Name:       pi  Key mdType: 2  Key Value:           3.142  Key Comment: Definition of pi
- Key Name:   myBool  Key mdType: 3  Key Value:               0  Key Comment: F, f, 0, T, t, 1 are also acceptable
- Key Name:   primes  Key mdType: 6  Bad type: 6 Key Comment: These are prime numbers
- Key Name: altitude  Key mdType: 0  Key Value:           10000  Key Comment: 
- Key Name:    speed  Key mdType: 1  Key Value:          66.660  Key Comment: 
- Key Name:   title1  Key mdType: 5  Key Value:     Hello world  Key Comment: This is a comment for the string value
+ Key Name:  comment  Key mdType: 0x0001000a Key Value:                  Key Comment: 
+    Key Name:  comment  Key mdType: 0x00010001 Key Value:            This  Key Comment: 
+    Key Name:  comment  Key mdType: 0x00010001 Key Value:              is  Key Comment: 
+    Key Name:  comment  Key mdType: 0x00010001 Key Value:              an  Key Comment: 
+    Key Name:  comment  Key mdType: 0x00010001 Key Value:            ugly  Key Comment: 
+    Key Name:  comment  Key mdType: 0x00010001 Key Value:         comment  Key Comment: 
+    Key Name:  comment  Key mdType: 0x00010001 Key Value:             but  Key Comment: 
+    Key Name:  comment  Key mdType: 0x00010001 Key Value:           still  Key Comment: 
+    Key Name:  comment  Key mdType: 0x00010001 Key Value:           valid  Key Comment: 
+ Key Name:   title2  Key mdType: 0x00010001 Key Value:  Good bye world  Key Comment: STRING or STR may be used as the string type
+ Key Name:     time  Key mdType: 0x00000404 Key Value:        1234.568  Key Comment: 
+ Key Name: negatives  Key mdType: 0x00010002 Key Value:  [-1,-2,-3,...]  Key Comment: 
+ Key Name:       pi  Key mdType: 0x00000408 Key Value:           3.142  Key Comment: Definition of pi
+ Key Name:   myBool  Key mdType: 0x00001301 Key Value:               0  Key Comment: F, f, 0, T, t, 1 are also acceptable
+ Key Name:   primes  Key mdType: 0x00010002 Key Value:   [2,3,5,7,...]  Key Comment: These are prime numbers
+ Key Name: altitude  Key mdType: 0x00000104 Key Value:           10000  Key Comment: 
+ Key Name:    speed  Key mdType: 0x00000404 Key Value:          66.660  Key Comment: 
+ Key Name:   title1  Key mdType: 0x00010001 Key Value:     Hello world  Key Comment: This is a comment for the string value
 
 ---> TESTPOINT PASSED (psMetadata{Test A - Read config file with overwrite set true} | tst_psMetadataIO.c)
@@ -54,41 +54,41 @@
 
 Failed lines: 7 Expected: 7 Contents of metadata list:
- Key Name:       pi  Key mdType: 2  Key Value:           3.142  Key Comment: Definition of pi
- Key Name: altitude  Key mdType: 0  Key Value:           10000  Key Comment: 
- Key Name:     time  Key mdType: 1  Key Value:        1234.568  Key Comment: 
- Key Name:   myBool  Key mdType: 3  Key Value:               0  Key Comment: F, f, 0, T, t, 1 are also acceptable
- Key Name:   title1  Key mdType: 5  Key Value:     Hello world  Key Comment: This is a comment for the string value
- Key Name:   title2  Key mdType: 5  Key Value:  Good bye world  Key Comment: STRING or STR may be used as the string type
- Key Name:   primes  Key mdType: 6  Bad type: 6 Key Comment: These are prime numbers
- Key Name: negatives  Key mdType: 6  Bad type: 6 Key Comment: 
- Key Name:  comment  Key mdType: 5  Key Value:            This  Key Comment: 
- Key Name:  comment  Key mdType: 5  Key Value:              is  Key Comment: 
- Key Name:  comment  Key mdType: 5  Key Value:              an  Key Comment: 
- Key Name:  comment  Key mdType: 5  Key Value:            ugly  Key Comment: 
- Key Name:  comment  Key mdType: 5  Key Value:         comment  Key Comment: 
- Key Name:  comment  Key mdType: 5  Key Value:             but  Key Comment: 
- Key Name:  comment  Key mdType: 5  Key Value:           still  Key Comment: 
- Key Name:  comment  Key mdType: 5  Key Value:           valid  Key Comment: 
- Key Name:    speed  Key mdType: 1  Key Value:          55.550  Key Comment: 
+ Key Name:       pi  Key mdType: 0x00000408 Key Value:           3.142  Key Comment: Definition of pi
+ Key Name: altitude  Key mdType: 0x00000104 Key Value:           10000  Key Comment: 
+ Key Name:     time  Key mdType: 0x00000404 Key Value:        1234.568  Key Comment: 
+ Key Name:   myBool  Key mdType: 0x00001301 Key Value:               0  Key Comment: F, f, 0, T, t, 1 are also acceptable
+ Key Name:   title1  Key mdType: 0x00010001 Key Value:     Hello world  Key Comment: This is a comment for the string value
+ Key Name:   title2  Key mdType: 0x00010001 Key Value:  Good bye world  Key Comment: STRING or STR may be used as the string type
+ Key Name:   primes  Key mdType: 0x00010002 Key Value:   [2,3,5,7,...]  Key Comment: These are prime numbers
+ Key Name: negatives  Key mdType: 0x00010002 Key Value:  [-1,-2,-3,...]  Key Comment: 
+ Key Name:  comment  Key mdType: 0x00010001 Key Value:            This  Key Comment: 
+ Key Name:  comment  Key mdType: 0x00010001 Key Value:              is  Key Comment: 
+ Key Name:  comment  Key mdType: 0x00010001 Key Value:              an  Key Comment: 
+ Key Name:  comment  Key mdType: 0x00010001 Key Value:            ugly  Key Comment: 
+ Key Name:  comment  Key mdType: 0x00010001 Key Value:         comment  Key Comment: 
+ Key Name:  comment  Key mdType: 0x00010001 Key Value:             but  Key Comment: 
+ Key Name:  comment  Key mdType: 0x00010001 Key Value:           still  Key Comment: 
+ Key Name:  comment  Key mdType: 0x00010001 Key Value:           valid  Key Comment: 
+ Key Name:    speed  Key mdType: 0x00000404 Key Value:          55.550  Key Comment: 
 
 Contents of metadata table:
- Key Name:  comment  Key mdType: 14  Key Value:                  Key Comment: 
-    Key Name:  comment  Key mdType: 5  Key Value:            This  Key Comment: 
-    Key Name:  comment  Key mdType: 5  Key Value:              is  Key Comment: 
-    Key Name:  comment  Key mdType: 5  Key Value:              an  Key Comment: 
-    Key Name:  comment  Key mdType: 5  Key Value:            ugly  Key Comment: 
-    Key Name:  comment  Key mdType: 5  Key Value:         comment  Key Comment: 
-    Key Name:  comment  Key mdType: 5  Key Value:             but  Key Comment: 
-    Key Name:  comment  Key mdType: 5  Key Value:           still  Key Comment: 
-    Key Name:  comment  Key mdType: 5  Key Value:           valid  Key Comment: 
- Key Name:   title2  Key mdType: 5  Key Value:  Good bye world  Key Comment: STRING or STR may be used as the string type
- Key Name:     time  Key mdType: 1  Key Value:        1234.568  Key Comment: 
- Key Name: negatives  Key mdType: 6  Bad type: 6 Key Comment: 
- Key Name:       pi  Key mdType: 2  Key Value:           3.142  Key Comment: Definition of pi
- Key Name:   myBool  Key mdType: 3  Key Value:               0  Key Comment: F, f, 0, T, t, 1 are also acceptable
- Key Name:   primes  Key mdType: 6  Bad type: 6 Key Comment: These are prime numbers
- Key Name: altitude  Key mdType: 0  Key Value:           10000  Key Comment: 
- Key Name:    speed  Key mdType: 1  Key Value:          55.550  Key Comment: 
- Key Name:   title1  Key mdType: 5  Key Value:     Hello world  Key Comment: This is a comment for the string value
+ Key Name:  comment  Key mdType: 0x0001000a Key Value:                  Key Comment: 
+    Key Name:  comment  Key mdType: 0x00010001 Key Value:            This  Key Comment: 
+    Key Name:  comment  Key mdType: 0x00010001 Key Value:              is  Key Comment: 
+    Key Name:  comment  Key mdType: 0x00010001 Key Value:              an  Key Comment: 
+    Key Name:  comment  Key mdType: 0x00010001 Key Value:            ugly  Key Comment: 
+    Key Name:  comment  Key mdType: 0x00010001 Key Value:         comment  Key Comment: 
+    Key Name:  comment  Key mdType: 0x00010001 Key Value:             but  Key Comment: 
+    Key Name:  comment  Key mdType: 0x00010001 Key Value:           still  Key Comment: 
+    Key Name:  comment  Key mdType: 0x00010001 Key Value:           valid  Key Comment: 
+ Key Name:   title2  Key mdType: 0x00010001 Key Value:  Good bye world  Key Comment: STRING or STR may be used as the string type
+ Key Name:     time  Key mdType: 0x00000404 Key Value:        1234.568  Key Comment: 
+ Key Name: negatives  Key mdType: 0x00010002 Key Value:  [-1,-2,-3,...]  Key Comment: 
+ Key Name:       pi  Key mdType: 0x00000408 Key Value:           3.142  Key Comment: Definition of pi
+ Key Name:   myBool  Key mdType: 0x00001301 Key Value:               0  Key Comment: F, f, 0, T, t, 1 are also acceptable
+ Key Name:   primes  Key mdType: 0x00010002 Key Value:   [2,3,5,7,...]  Key Comment: These are prime numbers
+ Key Name: altitude  Key mdType: 0x00000104 Key Value:           10000  Key Comment: 
+ Key Name:    speed  Key mdType: 0x00000404 Key Value:          55.550  Key Comment: 
+ Key Name:   title1  Key mdType: 0x00010001 Key Value:     Hello world  Key Comment: This is a comment for the string value
 
 ---> TESTPOINT PASSED (psMetadata{Test B - Read config file with overwrite set false} | tst_psMetadataIO.c)
@@ -101,41 +101,41 @@
 
 Failed lines: 6 Expected: 6 Contents of metadata list:
- Key Name:       pi  Key mdType: 2  Key Value:           3.142  Key Comment: Definition of pi
- Key Name: altitude  Key mdType: 0  Key Value:           10000  Key Comment: 
- Key Name:     time  Key mdType: 1  Key Value:        1234.568  Key Comment: 
- Key Name:   myBool  Key mdType: 3  Key Value:               0  Key Comment: F, f, 0, T, t, 1 are also acceptable
- Key Name:   title1  Key mdType: 5  Key Value:     Hello world  Key Comment: This is a comment for the string value
- Key Name:   title2  Key mdType: 5  Key Value:  Good bye world  Key Comment: STRING or STR may be used as the string type
- Key Name:   primes  Key mdType: 6  Bad type: 6 Key Comment: These are prime numbers
- Key Name: negatives  Key mdType: 6  Bad type: 6 Key Comment: 
- Key Name:  comment  Key mdType: 5  Key Value:            This  Key Comment: 
- Key Name:  comment  Key mdType: 5  Key Value:              is  Key Comment: 
- Key Name:  comment  Key mdType: 5  Key Value:              an  Key Comment: 
- Key Name:  comment  Key mdType: 5  Key Value:            ugly  Key Comment: 
- Key Name:  comment  Key mdType: 5  Key Value:         comment  Key Comment: 
- Key Name:  comment  Key mdType: 5  Key Value:             but  Key Comment: 
- Key Name:  comment  Key mdType: 5  Key Value:           still  Key Comment: 
- Key Name:  comment  Key mdType: 5  Key Value:           valid  Key Comment: 
- Key Name:    speed  Key mdType: 1  Key Value:          66.660  Key Comment: 
+ Key Name:       pi  Key mdType: 0x00000408 Key Value:           3.142  Key Comment: Definition of pi
+ Key Name: altitude  Key mdType: 0x00000104 Key Value:           10000  Key Comment: 
+ Key Name:     time  Key mdType: 0x00000404 Key Value:        1234.568  Key Comment: 
+ Key Name:   myBool  Key mdType: 0x00001301 Key Value:               0  Key Comment: F, f, 0, T, t, 1 are also acceptable
+ Key Name:   title1  Key mdType: 0x00010001 Key Value:     Hello world  Key Comment: This is a comment for the string value
+ Key Name:   title2  Key mdType: 0x00010001 Key Value:  Good bye world  Key Comment: STRING or STR may be used as the string type
+ Key Name:   primes  Key mdType: 0x00010002 Key Value:   [2,3,5,7,...]  Key Comment: These are prime numbers
+ Key Name: negatives  Key mdType: 0x00010002 Key Value:  [-1,-2,-3,...]  Key Comment: 
+ Key Name:  comment  Key mdType: 0x00010001 Key Value:            This  Key Comment: 
+ Key Name:  comment  Key mdType: 0x00010001 Key Value:              is  Key Comment: 
+ Key Name:  comment  Key mdType: 0x00010001 Key Value:              an  Key Comment: 
+ Key Name:  comment  Key mdType: 0x00010001 Key Value:            ugly  Key Comment: 
+ Key Name:  comment  Key mdType: 0x00010001 Key Value:         comment  Key Comment: 
+ Key Name:  comment  Key mdType: 0x00010001 Key Value:             but  Key Comment: 
+ Key Name:  comment  Key mdType: 0x00010001 Key Value:           still  Key Comment: 
+ Key Name:  comment  Key mdType: 0x00010001 Key Value:           valid  Key Comment: 
+ Key Name:    speed  Key mdType: 0x00000404 Key Value:          66.660  Key Comment: 
 
 Contents of metadata table:
- Key Name:  comment  Key mdType: 14  Key Value:                  Key Comment: 
-    Key Name:  comment  Key mdType: 5  Key Value:            This  Key Comment: 
-    Key Name:  comment  Key mdType: 5  Key Value:              is  Key Comment: 
-    Key Name:  comment  Key mdType: 5  Key Value:              an  Key Comment: 
-    Key Name:  comment  Key mdType: 5  Key Value:            ugly  Key Comment: 
-    Key Name:  comment  Key mdType: 5  Key Value:         comment  Key Comment: 
-    Key Name:  comment  Key mdType: 5  Key Value:             but  Key Comment: 
-    Key Name:  comment  Key mdType: 5  Key Value:           still  Key Comment: 
-    Key Name:  comment  Key mdType: 5  Key Value:           valid  Key Comment: 
- Key Name:   title2  Key mdType: 5  Key Value:  Good bye world  Key Comment: STRING or STR may be used as the string type
- Key Name:     time  Key mdType: 1  Key Value:        1234.568  Key Comment: 
- Key Name: negatives  Key mdType: 6  Bad type: 6 Key Comment: 
- Key Name:       pi  Key mdType: 2  Key Value:           3.142  Key Comment: Definition of pi
- Key Name:   myBool  Key mdType: 3  Key Value:               0  Key Comment: F, f, 0, T, t, 1 are also acceptable
- Key Name:   primes  Key mdType: 6  Bad type: 6 Key Comment: These are prime numbers
- Key Name: altitude  Key mdType: 0  Key Value:           10000  Key Comment: 
- Key Name:    speed  Key mdType: 1  Key Value:          66.660  Key Comment: 
- Key Name:   title1  Key mdType: 5  Key Value:     Hello world  Key Comment: This is a comment for the string value
+ Key Name:  comment  Key mdType: 0x0001000a Key Value:                  Key Comment: 
+    Key Name:  comment  Key mdType: 0x00010001 Key Value:            This  Key Comment: 
+    Key Name:  comment  Key mdType: 0x00010001 Key Value:              is  Key Comment: 
+    Key Name:  comment  Key mdType: 0x00010001 Key Value:              an  Key Comment: 
+    Key Name:  comment  Key mdType: 0x00010001 Key Value:            ugly  Key Comment: 
+    Key Name:  comment  Key mdType: 0x00010001 Key Value:         comment  Key Comment: 
+    Key Name:  comment  Key mdType: 0x00010001 Key Value:             but  Key Comment: 
+    Key Name:  comment  Key mdType: 0x00010001 Key Value:           still  Key Comment: 
+    Key Name:  comment  Key mdType: 0x00010001 Key Value:           valid  Key Comment: 
+ Key Name:   title2  Key mdType: 0x00010001 Key Value:  Good bye world  Key Comment: STRING or STR may be used as the string type
+ Key Name:     time  Key mdType: 0x00000404 Key Value:        1234.568  Key Comment: 
+ Key Name: negatives  Key mdType: 0x00010002 Key Value:  [-1,-2,-3,...]  Key Comment: 
+ Key Name:       pi  Key mdType: 0x00000408 Key Value:           3.142  Key Comment: Definition of pi
+ Key Name:   myBool  Key mdType: 0x00001301 Key Value:               0  Key Comment: F, f, 0, T, t, 1 are also acceptable
+ Key Name:   primes  Key mdType: 0x00010002 Key Value:   [2,3,5,7,...]  Key Comment: These are prime numbers
+ Key Name: altitude  Key mdType: 0x00000104 Key Value:           10000  Key Comment: 
+ Key Name:    speed  Key mdType: 0x00000404 Key Value:          66.660  Key Comment: 
+ Key Name:   title1  Key mdType: 0x00010001 Key Value:     Hello world  Key Comment: This is a comment for the string value
 
 ---> TESTPOINT PASSED (psMetadata{Test C - Read config file without auto-allocation of metadata} | tst_psMetadataIO.c)
Index: trunk/psLib/test/astronomy/verified/tst_psMetadata_01.stdout
===================================================================
--- trunk/psLib/test/astronomy/verified/tst_psMetadata_01.stdout	(revision 3381)
+++ trunk/psLib/test/astronomy/verified/tst_psMetadata_01.stdout	(revision 3407)
@@ -6,17 +6,18 @@
 
 Contents of metadata list:
- Key Name:   SIMPLE  Key mdType: 3  Key Value:               1  Key Comment: file does conform to FITS standard
- Key Name:   BITPIX  Key mdType: 0  Key Value:               8  Key Comment: number of bits per data pixel
- Key Name:    NAXIS  Key mdType: 0  Key Value:               0  Key Comment: number of data axes
- Key Name:  HISTORY  Key mdType: 5  Key Value:                  Key Comment: File modified by user 'harman' with fv  on 2004-08-04T<DATE>
+ Key Name:   SIMPLE  Key mdType: 0x00001301  Key Value:               1  Key Comment: file does conform to FITS standard
+ Key Name:   BITPIX  Key mdType: 0x00000104  Key Value:               8  Key Comment: number of bits per data pixel
+ Key Name:    NAXIS  Key mdType: 0x00000104  Key Value:               0  Key Comment: number of data axes
+ Key Name:  HISTORY  Key mdType: 0x00010001  Key Value:                  Key Comment: File modified by user 'harman' with fv  on 2004-08-04T<DATE>
 
 Contents of metadata table:
- Key Name:    NAXIS  Key mdType: 0  Key Value:               0  Key Comment: number of data axes
- Key Name:   SIMPLE  Key mdType: 3  Key Value:               1  Key Comment: file does conform to FITS standard
- Key Name:   BITPIX  Key mdType: 0  Key Value:               8  Key Comment: number of bits per data pixel
- Key Name:  HISTORY  Key mdType: 5  Key Value:                  Key Comment: File modified by user 'harman' with fv  on 2004-08-04T<DATE>
+ Key Name:    NAXIS  Key mdType: 0x00000104  Key Value:               0  Key Comment: number of data axes
+ Key Name:   SIMPLE  Key mdType: 0x00001301  Key Value:               1  Key Comment: file does conform to FITS standard
+ Key Name:   BITPIX  Key mdType: 0x00000104  Key Value:               8  Key Comment: number of bits per data pixel
+ Key Name:  HISTORY  Key mdType: 0x00010001  Key Value:                  Key Comment: File modified by user 'harman' with fv  on 2004-08-04T<DATE>
 
 ---> TESTPOINT PASSED (psMetadata{Test A - Read 1st hdr from simple FITS file} | tst_psMetadata_01.c)
 
+ID=34
 /***************************** TESTPOINT ******************************************\
 *             TestFile: tst_psMetadata_01.c                                        *
@@ -26,35 +27,36 @@
 
 Contents of metadata list:
- Key Name: XTENSION  Key mdType: 5  Key Value:      'IMAGE   '  Key Comment: IMAGE extension
- Key Name:   BITPIX  Key mdType: 0  Key Value:             -64  Key Comment: number of bits per data pixel
- Key Name:    NAXIS  Key mdType: 0  Key Value:               1  Key Comment: number of data axes
- Key Name:   NAXIS1  Key mdType: 0  Key Value:              64  Key Comment: length of data axis 1
- Key Name:   PCOUNT  Key mdType: 0  Key Value:               0  Key Comment: required keyword; must = 0
- Key Name:   GCOUNT  Key mdType: 0  Key Value:               1  Key Comment: required keyword; must = 1
- Key Name:   BITPIX  Key mdType: 0  Key Value:             -64  Key Comment: number of bits per data pixel
- Key Name:  EXTNAME  Key mdType: 5  Key Value:     'MY_DATA_1'  Key Comment: 
- Key Name:  HISTORY  Key mdType: 5  Key Value:                  Key Comment: File modified by user 'harman' with fv  on 2004-08-04T<DATE>
- Key Name:  HISTORY  Key mdType: 5  Key Value:                  Key Comment: File modified by user 'harman' with fv  on 2004-08-04T<DATE>
- Key Name:  HISTORY  Key mdType: 5  Key Value:                  Key Comment: File modified by user 'harman' with fv  on 2004-08-04T<DATE>
- Key Name:  HISTORY  Key mdType: 5  Key Value:                  Key Comment: File modified by user 'harman' with fv  on 2004-08-04T<DATE>
+ Key Name: XTENSION  Key mdType: 0x00010001  Key Value:      'IMAGE   '  Key Comment: IMAGE extension
+ Key Name:   BITPIX  Key mdType: 0x00000104  Key Value:             -64  Key Comment: number of bits per data pixel
+ Key Name:    NAXIS  Key mdType: 0x00000104  Key Value:               1  Key Comment: number of data axes
+ Key Name:   NAXIS1  Key mdType: 0x00000104  Key Value:              64  Key Comment: length of data axis 1
+ Key Name:   PCOUNT  Key mdType: 0x00000104  Key Value:               0  Key Comment: required keyword; must = 0
+ Key Name:   GCOUNT  Key mdType: 0x00000104  Key Value:               1  Key Comment: required keyword; must = 1
+ Key Name:   BITPIX  Key mdType: 0x00000104  Key Value:             -64  Key Comment: number of bits per data pixel
+ Key Name:  EXTNAME  Key mdType: 0x00010001  Key Value:     'MY_DATA_1'  Key Comment: 
+ Key Name:  HISTORY  Key mdType: 0x00010001  Key Value:                  Key Comment: File modified by user 'harman' with fv  on 2004-08-04T<DATE>
+ Key Name:  HISTORY  Key mdType: 0x00010001  Key Value:                  Key Comment: File modified by user 'harman' with fv  on 2004-08-04T<DATE>
+ Key Name:  HISTORY  Key mdType: 0x00010001  Key Value:                  Key Comment: File modified by user 'harman' with fv  on 2004-08-04T<DATE>
+ Key Name:  HISTORY  Key mdType: 0x00010001  Key Value:                  Key Comment: File modified by user 'harman' with fv  on 2004-08-04T<DATE>
 
 Contents of metadata table:
- Key Name:    NAXIS  Key mdType: 0  Key Value:               1  Key Comment: number of data axes
- Key Name:   NAXIS1  Key mdType: 0  Key Value:              64  Key Comment: length of data axis 1
- Key Name:   PCOUNT  Key mdType: 0  Key Value:               0  Key Comment: required keyword; must = 0
- Key Name: XTENSION  Key mdType: 5  Key Value:      'IMAGE   '  Key Comment: IMAGE extension
- Key Name:   BITPIX  Key mdType: 14  Key Value:                  Key Comment: 
-    Key Name:   BITPIX  Key mdType: 0  Key Value:             -64  Key Comment: number of bits per data pixel
-    Key Name:   BITPIX  Key mdType: 0  Key Value:             -64  Key Comment: number of bits per data pixel
- Key Name:   GCOUNT  Key mdType: 0  Key Value:               1  Key Comment: required keyword; must = 1
- Key Name:  HISTORY  Key mdType: 14  Key Value:                  Key Comment: 
-    Key Name:  HISTORY  Key mdType: 5  Key Value:                  Key Comment: File modified by user 'harman' with fv  on 2004-08-04T<DATE>
-    Key Name:  HISTORY  Key mdType: 5  Key Value:                  Key Comment: File modified by user 'harman' with fv  on 2004-08-04T<DATE>
-    Key Name:  HISTORY  Key mdType: 5  Key Value:                  Key Comment: File modified by user 'harman' with fv  on 2004-08-04T<DATE>
-    Key Name:  HISTORY  Key mdType: 5  Key Value:                  Key Comment: File modified by user 'harman' with fv  on 2004-08-04T<DATE>
- Key Name:  EXTNAME  Key mdType: 5  Key Value:     'MY_DATA_1'  Key Comment: 
+ Key Name:    NAXIS  Key mdType: 0x00000104  Key Value:               1  Key Comment: number of data axes
+ Key Name:   NAXIS1  Key mdType: 0x00000104  Key Value:              64  Key Comment: length of data axis 1
+ Key Name:   PCOUNT  Key mdType: 0x00000104  Key Value:               0  Key Comment: required keyword; must = 0
+ Key Name: XTENSION  Key mdType: 0x00010001  Key Value:      'IMAGE   '  Key Comment: IMAGE extension
+ Key Name:   BITPIX  Key mdType: 0x0001000a  Key Value:                  Key Comment: 
+    Key Name:   BITPIX  Key mdType: 0x00000104  Key Value:             -64  Key Comment: number of bits per data pixel
+    Key Name:   BITPIX  Key mdType: 0x00000104  Key Value:             -64  Key Comment: number of bits per data pixel
+ Key Name:   GCOUNT  Key mdType: 0x00000104  Key Value:               1  Key Comment: required keyword; must = 1
+ Key Name:  HISTORY  Key mdType: 0x0001000a  Key Value:                  Key Comment: 
+    Key Name:  HISTORY  Key mdType: 0x00010001  Key Value:                  Key Comment: File modified by user 'harman' with fv  on 2004-08-04T<DATE>
+    Key Name:  HISTORY  Key mdType: 0x00010001  Key Value:                  Key Comment: File modified by user 'harman' with fv  on 2004-08-04T<DATE>
+    Key Name:  HISTORY  Key mdType: 0x00010001  Key Value:                  Key Comment: File modified by user 'harman' with fv  on 2004-08-04T<DATE>
+    Key Name:  HISTORY  Key mdType: 0x00010001  Key Value:                  Key Comment: File modified by user 'harman' with fv  on 2004-08-04T<DATE>
+ Key Name:  EXTNAME  Key mdType: 0x00010001  Key Value:     'MY_DATA_1'  Key Comment: 
 
 ---> TESTPOINT PASSED (psMetadata{Test B - Read 2nd hdr from complex FITS file} | tst_psMetadata_01.c)
 
+ID=138
 /***************************** TESTPOINT ******************************************\
 *             TestFile: tst_psMetadata_01.c                                        *
@@ -64,25 +66,25 @@
 
 Contents of metadata list:
- Key Name: XTENSION  Key mdType: 5  Key Value:      'IMAGE   '  Key Comment: IMAGE extension
- Key Name:   BITPIX  Key mdType: 0  Key Value:             -64  Key Comment: number of bits per data pixel
- Key Name:    NAXIS  Key mdType: 0  Key Value:               1  Key Comment: number of data axes
- Key Name:   NAXIS1  Key mdType: 0  Key Value:              64  Key Comment: length of data axis 1
- Key Name:   PCOUNT  Key mdType: 0  Key Value:               0  Key Comment: required keyword; must = 0
- Key Name:   GCOUNT  Key mdType: 0  Key Value:               1  Key Comment: required keyword; must = 1
- Key Name:  EXTNAME  Key mdType: 5  Key Value:     'MY_DATA_2'  Key Comment: 
- Key Name:  HISTORY  Key mdType: 5  Key Value:                  Key Comment: File modified by user 'harman' with fv  on 2004-08-04T<DATE>
- Key Name:  HISTORY  Key mdType: 5  Key Value:                  Key Comment: File modified by user 'harman' with fv  on 2004-08-04T<DATE>
+ Key Name: XTENSION  Key mdType: 0x00010001  Key Value:      'IMAGE   '  Key Comment: IMAGE extension
+ Key Name:   BITPIX  Key mdType: 0x00000104  Key Value:             -64  Key Comment: number of bits per data pixel
+ Key Name:    NAXIS  Key mdType: 0x00000104  Key Value:               1  Key Comment: number of data axes
+ Key Name:   NAXIS1  Key mdType: 0x00000104  Key Value:              64  Key Comment: length of data axis 1
+ Key Name:   PCOUNT  Key mdType: 0x00000104  Key Value:               0  Key Comment: required keyword; must = 0
+ Key Name:   GCOUNT  Key mdType: 0x00000104  Key Value:               1  Key Comment: required keyword; must = 1
+ Key Name:  EXTNAME  Key mdType: 0x00010001  Key Value:     'MY_DATA_2'  Key Comment: 
+ Key Name:  HISTORY  Key mdType: 0x00010001  Key Value:                  Key Comment: File modified by user 'harman' with fv  on 2004-08-04T<DATE>
+ Key Name:  HISTORY  Key mdType: 0x00010001  Key Value:                  Key Comment: File modified by user 'harman' with fv  on 2004-08-04T<DATE>
 
 Contents of metadata table:
- Key Name:    NAXIS  Key mdType: 0  Key Value:               1  Key Comment: number of data axes
- Key Name:   NAXIS1  Key mdType: 0  Key Value:              64  Key Comment: length of data axis 1
- Key Name:   PCOUNT  Key mdType: 0  Key Value:               0  Key Comment: required keyword; must = 0
- Key Name: XTENSION  Key mdType: 5  Key Value:      'IMAGE   '  Key Comment: IMAGE extension
- Key Name:   GCOUNT  Key mdType: 0  Key Value:               1  Key Comment: required keyword; must = 1
- Key Name:   BITPIX  Key mdType: 0  Key Value:             -64  Key Comment: number of bits per data pixel
- Key Name:  HISTORY  Key mdType: 14  Key Value:                  Key Comment: 
-    Key Name:  HISTORY  Key mdType: 5  Key Value:                  Key Comment: File modified by user 'harman' with fv  on 2004-08-04T<DATE>
-    Key Name:  HISTORY  Key mdType: 5  Key Value:                  Key Comment: File modified by user 'harman' with fv  on 2004-08-04T<DATE>
- Key Name:  EXTNAME  Key mdType: 5  Key Value:     'MY_DATA_2'  Key Comment: 
+ Key Name:    NAXIS  Key mdType: 0x00000104  Key Value:               1  Key Comment: number of data axes
+ Key Name:   NAXIS1  Key mdType: 0x00000104  Key Value:              64  Key Comment: length of data axis 1
+ Key Name:   PCOUNT  Key mdType: 0x00000104  Key Value:               0  Key Comment: required keyword; must = 0
+ Key Name: XTENSION  Key mdType: 0x00010001  Key Value:      'IMAGE   '  Key Comment: IMAGE extension
+ Key Name:   GCOUNT  Key mdType: 0x00000104  Key Value:               1  Key Comment: required keyword; must = 1
+ Key Name:   BITPIX  Key mdType: 0x00000104  Key Value:             -64  Key Comment: number of bits per data pixel
+ Key Name:  HISTORY  Key mdType: 0x0001000a  Key Value:                  Key Comment: 
+    Key Name:  HISTORY  Key mdType: 0x00010001  Key Value:                  Key Comment: File modified by user 'harman' with fv  on 2004-08-04T<DATE>
+    Key Name:  HISTORY  Key mdType: 0x00010001  Key Value:                  Key Comment: File modified by user 'harman' with fv  on 2004-08-04T<DATE>
+ Key Name:  EXTNAME  Key mdType: 0x00010001  Key Value:     'MY_DATA_2'  Key Comment: 
 
 ---> TESTPOINT PASSED (psMetadata{Test C - Read named hdr from complex FITS file} | tst_psMetadata_01.c)
@@ -97,20 +99,20 @@
 
 Contents of metadata list:
- Key Name: XTENSION  Key mdType: 5  Key Value:      'IMAGE   '  Key Comment: IMAGE extension
- Key Name:   BITPIX  Key mdType: 0  Key Value:             -64  Key Comment: number of bits per data pixel
- Key Name:    NAXIS  Key mdType: 0  Key Value:               1  Key Comment: number of data axes
- Key Name:   NAXIS1  Key mdType: 0  Key Value:              64  Key Comment: length of data axis 1
- Key Name:   PCOUNT  Key mdType: 0  Key Value:               0  Key Comment: required keyword; must = 0
- Key Name:   GCOUNT  Key mdType: 0  Key Value:               1  Key Comment: required keyword; must = 1
- Key Name:  EXTNAME  Key mdType: 5  Key Value:     'MY_DATA_2'  Key Comment: 
+ Key Name: XTENSION  Key mdType: 0x00010001  Key Value:      'IMAGE   '  Key Comment: IMAGE extension
+ Key Name:   BITPIX  Key mdType: 0x00000104  Key Value:             -64  Key Comment: number of bits per data pixel
+ Key Name:    NAXIS  Key mdType: 0x00000104  Key Value:               1  Key Comment: number of data axes
+ Key Name:   NAXIS1  Key mdType: 0x00000104  Key Value:              64  Key Comment: length of data axis 1
+ Key Name:   PCOUNT  Key mdType: 0x00000104  Key Value:               0  Key Comment: required keyword; must = 0
+ Key Name:   GCOUNT  Key mdType: 0x00000104  Key Value:               1  Key Comment: required keyword; must = 1
+ Key Name:  EXTNAME  Key mdType: 0x00010001  Key Value:     'MY_DATA_2'  Key Comment: 
 
 Contents of metadata table:
- Key Name:    NAXIS  Key mdType: 0  Key Value:               1  Key Comment: number of data axes
- Key Name:   NAXIS1  Key mdType: 0  Key Value:              64  Key Comment: length of data axis 1
- Key Name:   PCOUNT  Key mdType: 0  Key Value:               0  Key Comment: required keyword; must = 0
- Key Name: XTENSION  Key mdType: 5  Key Value:      'IMAGE   '  Key Comment: IMAGE extension
- Key Name:   GCOUNT  Key mdType: 0  Key Value:               1  Key Comment: required keyword; must = 1
- Key Name:   BITPIX  Key mdType: 0  Key Value:             -64  Key Comment: number of bits per data pixel
- Key Name:  EXTNAME  Key mdType: 5  Key Value:     'MY_DATA_2'  Key Comment: 
+ Key Name:    NAXIS  Key mdType: 0x00000104  Key Value:               1  Key Comment: number of data axes
+ Key Name:   NAXIS1  Key mdType: 0x00000104  Key Value:              64  Key Comment: length of data axis 1
+ Key Name:   PCOUNT  Key mdType: 0x00000104  Key Value:               0  Key Comment: required keyword; must = 0
+ Key Name: XTENSION  Key mdType: 0x00010001  Key Value:      'IMAGE   '  Key Comment: IMAGE extension
+ Key Name:   GCOUNT  Key mdType: 0x00000104  Key Value:               1  Key Comment: required keyword; must = 1
+ Key Name:   BITPIX  Key mdType: 0x00000104  Key Value:             -64  Key Comment: number of bits per data pixel
+ Key Name:  EXTNAME  Key mdType: 0x00010001  Key Value:     'MY_DATA_2'  Key Comment: 
 
 ---> TESTPOINT PASSED (psMetadata{Test D - Remove items with same name from all metadata} | tst_psMetadata_01.c)
Index: trunk/psLib/test/astronomy/verified/tst_psMetadata_02.stderr
===================================================================
--- trunk/psLib/test/astronomy/verified/tst_psMetadata_02.stderr	(revision 3381)
+++ trunk/psLib/test/astronomy/verified/tst_psMetadata_02.stderr	(revision 3407)
@@ -4,5 +4,5 @@
     Unallowable operation: name is NULL.
 <DATE><TIME>|<HOST>|E|psMetadataItemAllocV (FILE:LINENO)
-    Specified psMetadataType, 15, is not supported.
+    Specified psMetadataType, -1, is not supported.
 <DATE><TIME>|<HOST>|E|psMetadataAddItem (FILE:LINENO)
     Unallowable operation: md is NULL.
Index: trunk/psLib/test/astronomy/verified/tst_psMetadata_02.stdout
===================================================================
--- trunk/psLib/test/astronomy/verified/tst_psMetadata_02.stdout	(revision 3381)
+++ trunk/psLib/test/astronomy/verified/tst_psMetadata_02.stdout	(revision 3407)
@@ -5,9 +5,9 @@
 \**********************************************************************************/
 
-Key Name:  myItem1  Key mdType:  3  Key Value:               1  Key Comment: I am a boolean
-Key Name:  myItem2  Key mdType:  0  Key Value:             111  Key Comment: I am a signed integer
-Key Name:  myItem3  Key mdType:  1  Key Value:         222.222  Key Comment: I am a single precision floating point
-Key Name:  myItem4  Key mdType:  2  Key Value:         333.333  Key Comment: I am a double precision floating point
-Key Name:  myItem5  Key mdType:  5  Key Value:     HELLO WORLD  Key Comment: I am a string
+Key Name:  myItem1  Key mdType: 0x00001301  Key Value:               1  Key Comment: I am a boolean
+Key Name:  myItem2  Key mdType: 0x00000104  Key Value:             111  Key Comment: I am a signed integer
+Key Name:  myItem3  Key mdType: 0x00000404  Key Value:         222.222  Key Comment: I am a single precision floating point
+Key Name:  myItem4  Key mdType: 0x00000408  Key Value:         333.333  Key Comment: I am a double precision floating point
+Key Name:  myItem5  Key mdType: 0x00010001  Key Value:     HELLO WORLD  Key Comment: I am a string
 
 ---> TESTPOINT PASSED (psMetadata{Test A - Allocate metadata items} | tst_psMetadata_02.c)
Index: trunk/psLib/test/astronomy/verified/tst_psMetadata_03.stdout
===================================================================
--- trunk/psLib/test/astronomy/verified/tst_psMetadata_03.stdout	(revision 3381)
+++ trunk/psLib/test/astronomy/verified/tst_psMetadata_03.stdout	(revision 3407)
@@ -5,8 +5,8 @@
 \**********************************************************************************/
 
-Key Name:  myItem1  Key mdType:  3  Key Value:               1  Key Comment: I am a boolean
-Key Name:  myItem2  Key mdType:  0  Key Value:              55  Key Comment: I am a integer
-Key Name:  myItem3  Key mdType:  3  Key Value:               0  Key Comment: I am a boolean
-Key Name:  myItem4  Key mdType:  0  Key Value:              66  Key Comment: I am a integer
+Key Name:  myItem1  Key mdType: 0x00001301  Key Value:               1  Key Comment: I am a boolean
+Key Name:  myItem2  Key mdType: 0x00000104  Key Value:              55  Key Comment: I am a integer
+Key Name:  myItem3  Key mdType: 0x00001301  Key Value:               0  Key Comment: I am a boolean
+Key Name:  myItem4  Key mdType: 0x00000104  Key Value:              66  Key Comment: I am a integer
 
 ---> TESTPOINT PASSED (psMetadata{Test A - Allocate metadata items} | tst_psMetadata_03.c)
Index: trunk/psLib/test/astronomy/verified/tst_psMetadata_04.stdout
===================================================================
--- trunk/psLib/test/astronomy/verified/tst_psMetadata_04.stdout	(revision 3381)
+++ trunk/psLib/test/astronomy/verified/tst_psMetadata_04.stdout	(revision 3407)
@@ -5,9 +5,9 @@
 \**********************************************************************************/
 
-Key Name:  myItem1  Key mdType:  3  Key Value:               1  Key Comment: I am a boolean
-Key Name:  myItem2  Key mdType:  0  Key Value:              55  Key Comment: I am a integer
-Key Name:  myItem3  Key mdType:  3  Key Value:               0  Key Comment: I am a boolean
-Key Name:  myItem4  Key mdType:  0  Key Value:              66  Key Comment: I am a integer
-Key Name:  myItem5  Key mdType:  2  Key Value:           3.140  Key Comment: I am a double
+Key Name:  myItem1  Key mdType: 0x00001301  Key Value:               1  Key Comment: I am a boolean
+Key Name:  myItem2  Key mdType: 0x00000104  Key Value:              55  Key Comment: I am a integer
+Key Name:  myItem3  Key mdType: 0x00001301  Key Value:               0  Key Comment: I am a boolean
+Key Name:  myItem4  Key mdType: 0x00000104  Key Value:              66  Key Comment: I am a integer
+Key Name:  myItem5  Key mdType: 0x00000408  Key Value:           3.140  Key Comment: I am a double
 
 ---> TESTPOINT PASSED (psMetadata{Test A - Allocate metadata items} | tst_psMetadata_04.c)
Index: trunk/psLib/test/astronomy/verified/tst_psMetadata_05.stdout
===================================================================
--- trunk/psLib/test/astronomy/verified/tst_psMetadata_05.stdout	(revision 3381)
+++ trunk/psLib/test/astronomy/verified/tst_psMetadata_05.stdout	(revision 3407)
@@ -5,8 +5,8 @@
 \**********************************************************************************/
 
-Key Name:  myItem1  Key mdType:  3  Key Value:               1  Key Comment: I am a boolean
-Key Name:  myItem2  Key mdType:  0  Key Value:              55  Key Comment: I am a integer
-Key Name:  myItem3  Key mdType:  3  Key Value:               0  Key Comment: I am a boolean
-Key Name:  myItem4  Key mdType:  0  Key Value:              66  Key Comment: I am a integer
+Key Name:  myItem1  Key mdType: 0x00001301  Key Value:               1  Key Comment: I am a boolean
+Key Name:  myItem2  Key mdType: 0x00000104  Key Value:              55  Key Comment: I am a integer
+Key Name:  myItem3  Key mdType: 0x00001301  Key Value:               0  Key Comment: I am a boolean
+Key Name:  myItem4  Key mdType: 0x00000104  Key Value:              66  Key Comment: I am a integer
 
 ---> TESTPOINT PASSED (psMetadata{Test A - Allocate metadata items} | tst_psMetadata_05.c)
Index: trunk/psLib/test/astronomy/verified/tst_psMetadata_06.stdout
===================================================================
--- trunk/psLib/test/astronomy/verified/tst_psMetadata_06.stdout	(revision 3381)
+++ trunk/psLib/test/astronomy/verified/tst_psMetadata_06.stdout	(revision 3407)
@@ -5,9 +5,9 @@
 \**********************************************************************************/
 
-Key Name:  myItem1  Key mdType:  3  Key Value:               1  Key Comment: I am a boolean
-Key Name:  myItem1  Key mdType:  0  Key Value:             111  Key Comment: I am a signed integer
-Key Name:  myItem1  Key mdType:  0  Key Value:             222  Key Comment: I am a signed integer
-Key Name:  myItem2  Key mdType:  0  Key Value:             333  Key Comment: I am a signed integer
-Key Name:  myItem2  Key mdType:  4  Key Value:          psList  Key Comment: I am a list
+Key Name:  myItem1  Key mdType: 0x00001301  Key Value:               1  Key Comment: I am a boolean
+Key Name:  myItem1  Key mdType: 0x00000104  Key Value:             111  Key Comment: I am a signed integer
+Key Name:  myItem1  Key mdType: 0x00000104  Key Value:             222  Key Comment: I am a signed integer
+Key Name:  myItem2  Key mdType: 0x00000104  Key Value:             333  Key Comment: I am a signed integer
+Key Name:  myItem2  Key mdType: 0x00010000  Key Value:          psList  Key Comment: I am a list
 
 ---> TESTPOINT PASSED (psMetadata{Test A - Allocate metadata and items} | tst_psMetadata_06.c)