Index: /trunk/psLib/test/collections/Makefile.am =================================================================== --- /trunk/psLib/test/collections/Makefile.am (revision 4230) +++ /trunk/psLib/test/collections/Makefile.am (revision 4231) @@ -48,4 +48,9 @@ check_DATA = test.config \ + test1.config \ + test2.config \ + test3.config \ + test4.config \ + test5.config \ header_1.fits \ header_2.fits @@ -86,4 +91,19 @@ cp $? $@ +test1.config: data/test1.config + cp $? $@ + +test2.config: data/test2.config + cp $? $@ + +tes3.config: data/test3.config + cp $? $@ + +tes4.config: data/test4.config + cp $? $@ + +tes5.config: data/test5.config + cp $? $@ + header_1.fits: data/header_1.fits cp $? $@ Index: /trunk/psLib/test/collections/data/test1.config =================================================================== --- /trunk/psLib/test/collections/data/test1.config (revision 4231) +++ /trunk/psLib/test/collections/data/test1.config (revision 4231) @@ -0,0 +1,57 @@ +Double F64 1.23456789 # This is a comment +Float F32 0.98765#This is a comment too +String STR This is the string that forms the value #comment + + # This is a comment line and is to be ignored +boolean BOOL T # The value of 'boolean' is 'true' + +@primes U8 2,3 5 7,11,13 17 # These are prime numbers + +comment MULTI # The rest of this line is ignored, but 'comment' is set to be non-unique +comment STR This +comment STR is +comment STR a +comment STR non-unique +comment STR key +Float F64 1.23456 # This generates a warning, and, if 'overwrite' is 'false', is ignored + +boolean1 BOOL F # The value of 'boolean' is 'false' + +@negprimes S8 -2, -3, -5, -7,-11,-13,-17,-19 + +@vector1 U16 0, 1, 2, 4, 8 +@vector2 U32 0, 8, 16, 32, 64, 128 +@vector3 U64 0, 64, 256, + +@vector4 S16 -2 -1 0 1 2 +@vector5 S32 -4, -2, 0, 2, 4, 6 +@vector6 S64 -16, -4, 0, 4 16 36 64 + +@vector7 F32 -1.03, 1.04, -1.05, 1.06 +@vector8 F64 -2.22, 2.21 -2.20, 2.19, -2.18 + +TYPE CELL EXTNAME BIASSEC CHIP # +CELL.00 CELL CCD00 BSEC-00 CHIP.00 +CELL.01 CELL CCD01 BSEC-01 CHIP.00 + +MYCELL MULTI +MYCELL METADATA + EXTNAME STR CCD00 + BIASSEC STR BSEC-00 + CHIP STR CHIP.00 + NCELL S32 24 +END +MYCELL S32 123 # A number + +cell METADATA + foo METADATA + bar STR BAZ + ping STR PONG + END + + EXTNAME STR CCD00 + BIASSEC STR BSEC-00 + CHIP STR CHIP.00 + NCELL S32 12 +END + Index: /trunk/psLib/test/collections/data/test2.config =================================================================== --- /trunk/psLib/test/collections/data/test2.config (revision 4231) +++ /trunk/psLib/test/collections/data/test2.config (revision 4231) @@ -0,0 +1,44 @@ + # This should generate error message +boolean BOOL X # The value of 'boolean' is 'true' + +value1 S32 # No value + +# Invalid vector entries +@vector U8 +@vector1 U8 x,y,z +@vector2 +@vector3 F8 ,,, + +# Multiple MULTI definitions +comment MULTI +comment MULTI + +# Type CELL not defined +MYCELL CELL CCD00 BSEC-00 CHIP.00 + +# Invalid value entries +value1 F64 aabb +value2 S32 ccdd + +# Repeated vector character +@@vector4 U8 1 2 3 4 # + +# Invalid TYPE line +TYPE + +# Duplicate TYPE +TYPE CELL EXTNAME BIASSEC CHIP +TYPE CELL EXTNAME BIASSEC CHIP + +# END with no matching METADATA +END + +# Duplicate item names within metadata type specifier +TYPE NEWCELL VALUE1 VALUE1 # + +# Not enough values in specified type +OURCELL CELL CCD00 + +# Type with no item +TYPE NEWCELL1 + Index: /trunk/psLib/test/collections/data/test3.config =================================================================== --- /trunk/psLib/test/collections/data/test3.config (revision 4231) +++ /trunk/psLib/test/collections/data/test3.config (revision 4231) @@ -0,0 +1,16 @@ +Double F64 1.23456789 # This is a comment +Float F32 0.98765#This is a comment too +String STR This is the string that forms the value #comment + + # This is a comment line and is to be ignored +boolean BOOL T # The value of 'boolean' is 'true' + +@primes U8 2,3 5 7,11,13 17 # These are prime numbers + +comment MULTI # The rest of this line is ignored, but 'comment' is set to be non-unique +comment STR This +comment STR is +comment STR a +comment STR non-unique +comment STR key +Float F64 1.23456 # This generates a warning, and, if 'overwrite' is 'false', is ignored Index: /trunk/psLib/test/collections/data/test4.config =================================================================== --- /trunk/psLib/test/collections/data/test4.config (revision 4231) +++ /trunk/psLib/test/collections/data/test4.config (revision 4231) @@ -0,0 +1,161 @@ +# +# This file contains examples from SDR-14 appendix A +# +CELL1 METADATA + EXTNAME STR CCD00 + BIASSEC STR BSEC-00 + CHIP STR CHIP.00 + NCELL S32 24 +END + +CELL2 METADATA + FOO METADATA + BAR STR BAZ + PING STR PONG + END + + EXTNAME STR CCD00 + BIASSEC STR BSEC-00 + CHIP STR CHIP.00 + NCELL S32 24 +END + +FOO1 METADATA + FOO2 METADATA + FOO3 METADATA + FOO4 METADATA + FOO5 METADATA + FOO6 METADATA + BAR STR BAZ + PING STR PONG + END + BAR STR BAZ + PING STR PONG + END + BAR STR BAZ + PING STR PONG + END + BAR STR BAZ + PING STR PONG + END + BAR STR BAZ + PING STR PONG + END + BAR STR BAZ + PING STR PONG +END + +FOO2 METADATA + BAR STR BAZ + PING STR PONG + FOO3 METADATA + BAR STR BAZ + PING STR PONG + FOO4 METADATA + BAR STR BAZ + PING STR PONG + FOO5 METADATA + BAR STR BAZ + PING STR PONG + FOO6 METADATA + BAR STR BAZ + PING STR PONG + FOO7 METADATA + BAR STR BAZ + PING STR PONG + END + END + END + END + END +END + +FOO3 METADATA + BAR STR BAZ + FOO4 METADATA + BAR STR BAZ + FOO5 METADATA + BAR STR BAZ + FOO6 METADATA + BAR STR BAZ + FOO7 METADATA + BAR STR BAZ + FOO8 METADATA + BAR STR BAZ + PING STR PONG + END + PING STR PONG + END + PING STR PONG + END + PING STR PONG + END + PING STR PONG + END + PING STR PONG +END + +FOO4 METADATA + FOO5 METADATA + BAR STR BAZ + PING STR PONG + END + FOO6 METADATA + BAR STR BAZ + PING STR PONG + END +END + +TYPE CELL EXTNAME BIASSEC CHIP +CELL.00 CELL CCD00 BSEC-00 CHIP.00 +CELL.01 CELL CCD01 BSEC-01 CHIP.00 +FOO5 METADATA + TYPE CELL EXTNAME BIASSEC + CELL.00 CELL CCD00 BSEC-00 + CELL.01 CELL CCD01 BSEC-01 + FOO6 METADATA + TYPE CELL EXTNAME + CELL.00 CELL CCD00 + CELL.01 CELL CCD01 + END +END + +foo MULTI +foo S32 -1 +foo STR bar baz +foo BOOL T + +foo1 MULTI # foo +foo1 S32 -1 # bar +foo1 STR bar baz # baz +foo1 BOOL T # + +foo2 MULTI +foo2 S32 -1 +foo2 STR bar baz +foo2 BOOL T +bar1 METADATA + foo MULTI + foo S32 -1 + foo STR bar baz + foo BOOL T +END + +foo3 MULTI +foo3 METADATA + bar BOOL T +END +foo3 METADATA + bar BOOL T +END + +foo4 MULTI +TYPE bar a b c +foo4 bar x y z +foo4 bar x y z + +TYPE bar1 a b c +foo5 MULTI +foo5 bar1 x y z +foo5 bar1 x y z + Index: /trunk/psLib/test/collections/data/test5.config =================================================================== --- /trunk/psLib/test/collections/data/test5.config (revision 4231) +++ /trunk/psLib/test/collections/data/test5.config (revision 4231) @@ -0,0 +1,32 @@ +# +# Examples from SDR-14 Appendix A which cause failures +# +TYPE CELL1 EXTNAME BIASSEC CHIP +FOO1 METADATA + CELL.00 CELL CCD00 BSEC-00 CHIP.00 +END + +FOO2 METADATA + TYPE CELL2 EXTNAME BIASSEC CHIP +END +CELL.00 CELL2 CCD00 BSEC-00 CHIP.00 + +FOO3 METADATA + TYPE CELL3 EXTNAME BIASSEC CHIP +END +BAR METADATA + CELL.00 CELL3 CCD00 BSEC-00 CHIP.00 +END + +TYPE CELL4 EXTNAME BIASSEC CHIP +CELL.00 CELL4 CCD00 BSEC-00 +CELL.01 CELL4 CCD01 BSEC-01 CHIP.00 + +TYPE CELL5 EXTNAME BIASSEC CHIP +TYPE CELL5 EXTNAME BIASSEC CHIP +CELL.02 CELL5 CCD00 BSEC-00 CHIP.00 +CELL.03 CELL5 CCD01 BSEC-01 CHIP.00 + +CELL.04 CELL6 CCD00 BSEC-00 CHIP.00 +CELL.05 CELL6 CCD01 BSEC-01 CHIP.00 + Index: unk/psLib/test/collections/test1.config =================================================================== --- /trunk/psLib/test/collections/test1.config (revision 4230) +++ (revision ) @@ -1,57 +1,0 @@ -Double F64 1.23456789 # This is a comment -Float F32 0.98765#This is a comment too -String STR This is the string that forms the value #comment - - # This is a comment line and is to be ignored -boolean BOOL T # The value of 'boolean' is 'true' - -@primes U8 2,3 5 7,11,13 17 # These are prime numbers - -comment MULTI # The rest of this line is ignored, but 'comment' is set to be non-unique -comment STR This -comment STR is -comment STR a -comment STR non-unique -comment STR key -Float F64 1.23456 # This generates a warning, and, if 'overwrite' is 'false', is ignored - -boolean1 BOOL F # The value of 'boolean' is 'false' - -@negprimes S8 -2, -3, -5, -7,-11,-13,-17,-19 - -@vector1 U16 0, 1, 2, 4, 8 -@vector2 U32 0, 8, 16, 32, 64, 128 -@vector3 U64 0, 64, 256, - -@vector4 S16 -2 -1 0 1 2 -@vector5 S32 -4, -2, 0, 2, 4, 6 -@vector6 S64 -16, -4, 0, 4 16 36 64 - -@vector7 F32 -1.03, 1.04, -1.05, 1.06 -@vector8 F64 -2.22, 2.21 -2.20, 2.19, -2.18 - -TYPE CELL EXTNAME BIASSEC CHIP # -CELL.00 CELL CCD00 BSEC-00 CHIP.00 -CELL.01 CELL CCD01 BSEC-01 CHIP.00 - -MYCELL MULTI -MYCELL METADATA - EXTNAME STR CCD00 - BIASSEC STR BSEC-00 - CHIP STR CHIP.00 - NCELL S32 24 -END -MYCELL S32 123 # A number - -cell METADATA - foo METADATA - bar STR BAZ - ping STR PONG - END - - EXTNAME STR CCD00 - BIASSEC STR BSEC-00 - CHIP STR CHIP.00 - NCELL S32 12 -END - Index: unk/psLib/test/collections/test2.config =================================================================== --- /trunk/psLib/test/collections/test2.config (revision 4230) +++ (revision ) @@ -1,44 +1,0 @@ - # This should generate error message -boolean BOOL X # The value of 'boolean' is 'true' - -value1 S32 # No value - -# Invalid vector entries -@vector U8 -@vector1 U8 x,y,z -@vector2 -@vector3 F8 ,,, - -# Multiple MULTI definitions -comment MULTI -comment MULTI - -# Type CELL not defined -MYCELL CELL CCD00 BSEC-00 CHIP.00 - -# Invalid value entries -value1 F64 aabb -value2 S32 ccdd - -# Repeated vector character -@@vector4 U8 1 2 3 4 # - -# Invalid TYPE line -TYPE - -# Duplicate TYPE -TYPE CELL EXTNAME BIASSEC CHIP -TYPE CELL EXTNAME BIASSEC CHIP - -# END with no matching METADATA -END - -# Duplicate item names within metadata type specifier -TYPE NEWCELL VALUE1 VALUE1 # - -# Not enough values in specified type -OURCELL CELL CCD00 - -# Type with no item -TYPE NEWCELL1 - Index: unk/psLib/test/collections/test3.config =================================================================== --- /trunk/psLib/test/collections/test3.config (revision 4230) +++ (revision ) @@ -1,16 +1,0 @@ -Double F64 1.23456789 # This is a comment -Float F32 0.98765#This is a comment too -String STR This is the string that forms the value #comment - - # This is a comment line and is to be ignored -boolean BOOL T # The value of 'boolean' is 'true' - -@primes U8 2,3 5 7,11,13 17 # These are prime numbers - -comment MULTI # The rest of this line is ignored, but 'comment' is set to be non-unique -comment STR This -comment STR is -comment STR a -comment STR non-unique -comment STR key -Float F64 1.23456 # This generates a warning, and, if 'overwrite' is 'false', is ignored Index: unk/psLib/test/collections/test4.config =================================================================== --- /trunk/psLib/test/collections/test4.config (revision 4230) +++ (revision ) @@ -1,161 +1,0 @@ -# -# This file contains examples from SDR-14 appendix A -# -CELL1 METADATA - EXTNAME STR CCD00 - BIASSEC STR BSEC-00 - CHIP STR CHIP.00 - NCELL S32 24 -END - -CELL2 METADATA - FOO METADATA - BAR STR BAZ - PING STR PONG - END - - EXTNAME STR CCD00 - BIASSEC STR BSEC-00 - CHIP STR CHIP.00 - NCELL S32 24 -END - -FOO1 METADATA - FOO2 METADATA - FOO3 METADATA - FOO4 METADATA - FOO5 METADATA - FOO6 METADATA - BAR STR BAZ - PING STR PONG - END - BAR STR BAZ - PING STR PONG - END - BAR STR BAZ - PING STR PONG - END - BAR STR BAZ - PING STR PONG - END - BAR STR BAZ - PING STR PONG - END - BAR STR BAZ - PING STR PONG -END - -FOO2 METADATA - BAR STR BAZ - PING STR PONG - FOO3 METADATA - BAR STR BAZ - PING STR PONG - FOO4 METADATA - BAR STR BAZ - PING STR PONG - FOO5 METADATA - BAR STR BAZ - PING STR PONG - FOO6 METADATA - BAR STR BAZ - PING STR PONG - FOO7 METADATA - BAR STR BAZ - PING STR PONG - END - END - END - END - END -END - -FOO3 METADATA - BAR STR BAZ - FOO4 METADATA - BAR STR BAZ - FOO5 METADATA - BAR STR BAZ - FOO6 METADATA - BAR STR BAZ - FOO7 METADATA - BAR STR BAZ - FOO8 METADATA - BAR STR BAZ - PING STR PONG - END - PING STR PONG - END - PING STR PONG - END - PING STR PONG - END - PING STR PONG - END - PING STR PONG -END - -FOO4 METADATA - FOO5 METADATA - BAR STR BAZ - PING STR PONG - END - FOO6 METADATA - BAR STR BAZ - PING STR PONG - END -END - -TYPE CELL EXTNAME BIASSEC CHIP -CELL.00 CELL CCD00 BSEC-00 CHIP.00 -CELL.01 CELL CCD01 BSEC-01 CHIP.00 -FOO5 METADATA - TYPE CELL EXTNAME BIASSEC - CELL.00 CELL CCD00 BSEC-00 - CELL.01 CELL CCD01 BSEC-01 - FOO6 METADATA - TYPE CELL EXTNAME - CELL.00 CELL CCD00 - CELL.01 CELL CCD01 - END -END - -foo MULTI -foo S32 -1 -foo STR bar baz -foo BOOL T - -foo1 MULTI # foo -foo1 S32 -1 # bar -foo1 STR bar baz # baz -foo1 BOOL T # - -foo2 MULTI -foo2 S32 -1 -foo2 STR bar baz -foo2 BOOL T -bar1 METADATA - foo MULTI - foo S32 -1 - foo STR bar baz - foo BOOL T -END - -foo3 MULTI -foo3 METADATA - bar BOOL T -END -foo3 METADATA - bar BOOL T -END - -foo4 MULTI -TYPE bar a b c -foo4 bar x y z -foo4 bar x y z - -TYPE bar1 a b c -foo5 MULTI -foo5 bar1 x y z -foo5 bar1 x y z - Index: unk/psLib/test/collections/test5.config =================================================================== --- /trunk/psLib/test/collections/test5.config (revision 4230) +++ (revision ) @@ -1,32 +1,0 @@ -# -# Examples from SDR-14 Appendix A which cause failures -# -TYPE CELL1 EXTNAME BIASSEC CHIP -FOO1 METADATA - CELL.00 CELL CCD00 BSEC-00 CHIP.00 -END - -FOO2 METADATA - TYPE CELL2 EXTNAME BIASSEC CHIP -END -CELL.00 CELL2 CCD00 BSEC-00 CHIP.00 - -FOO3 METADATA - TYPE CELL3 EXTNAME BIASSEC CHIP -END -BAR METADATA - CELL.00 CELL3 CCD00 BSEC-00 CHIP.00 -END - -TYPE CELL4 EXTNAME BIASSEC CHIP -CELL.00 CELL4 CCD00 BSEC-00 -CELL.01 CELL4 CCD01 BSEC-01 CHIP.00 - -TYPE CELL5 EXTNAME BIASSEC CHIP -TYPE CELL5 EXTNAME BIASSEC CHIP -CELL.02 CELL5 CCD00 BSEC-00 CHIP.00 -CELL.03 CELL5 CCD01 BSEC-01 CHIP.00 - -CELL.04 CELL6 CCD00 BSEC-00 CHIP.00 -CELL.05 CELL6 CCD01 BSEC-01 CHIP.00 -