Index: /trunk/psLib/test/sys/table.fits =================================================================== --- /trunk/psLib/test/sys/table.fits (revision 4899) +++ /trunk/psLib/test/sys/table.fits (revision 4899) @@ -0,0 +1,9 @@ +SIMPLE = T / file does conform to FITS standard BITPIX = -32 / number of bits per data pixel NAXIS = 2 / number of data axes NAXIS1 = 16 / length of data axis 1 NAXIS2 = 16 / length of data axis 2 EXTEND = T / FITS dataset may contain extensions COMMENT FITS (Flexible Image Transport System) format is defined in 'AstronomyCOMMENT and Astrophysics', volume 376, page 359; bibcode: 2001A&A...376..359H END XTENSION= 'BINTABLE' / binary table extension BITPIX = 8 / 8-bit bytes NAXIS = 2 / 2-dimensional binary table NAXIS1 = 17 / width of table in bytes NAXIS2 = 11 / number of rows in table PCOUNT = 0 / size of special data area GCOUNT = 1 / one data group (required keyword) TFIELDS = 4 / number of fields in each row TTYPE1 = 'MYINT ' / label for field 1 TFORM1 = '1J ' / data format of field: 4-byte INTEGER TTYPE2 = 'MYFLT ' / label for field 2 TFORM2 = '1E ' / data format of field: 4-byte REAL TTYPE3 = 'MYDBL ' / label for field 3 TFORM3 = '1D ' / data format of field: 8-byte DOUBLE TTYPE4 = 'MYBOOL ' / label for field 4 TFORM4 = '1L ' / data format of field: 1-byte LOGICAL END €€TÿÿÿÿœÌÌÍ¿„záG®{FÿÿÿþŸLÌÍ¿”záG®{TÿÿÿýŸ™™š¿žžQë + +žFÿÿÿüŸÌÌÍ¿€záG®{Tÿÿÿû¿¿©™™™™™šFÿÿÿú¿™š¿®žQë + +žTÿÿÿù¿333¿±ë + +žQìFÿÿÿø¿LÌÍ¿ŽzáG®{Tÿÿÿ÷¿fff¿· +=p£× +Fÿÿÿö¿€¿¹™™™™™š Index: /trunk/psLib/test/sys/tableF32.dat =================================================================== --- /trunk/psLib/test/sys/tableF32.dat (revision 4899) +++ /trunk/psLib/test/sys/tableF32.dat (revision 4899) @@ -0,0 +1,9 @@ +# Table with valid types and index-values +# +#psF32 psU16 psU32 psU64 psS8 psS16 psS32 psS64 psU8 psF64 +-10.05 2 4 8 0 -2 -4 -8 5 -1.5 + 1.009 4 8 16 -1 -4 -8 -16 0 -1.0 +23.45 6 12 24 -2 -6 -12 -24 5 -0.25 +3500.67 8 16 32 -3 -8 -16 -32 75 1.75 + +# Index: /trunk/psLib/test/sys/tst_psMemory.c =================================================================== --- /trunk/psLib/test/sys/tst_psMemory.c (revision 4898) +++ /trunk/psLib/test/sys/tst_psMemory.c (revision 4899) @@ -6,6 +6,6 @@ * @author Robert DeSonia, MHPCC * -* @version $Revision: 1.3 $ $Name: not supported by cvs2svn $ -* @date $Date: 2005-08-30 01:14:13 $ +* @version $Revision: 1.4 $ $Name: not supported by cvs2svn $ +* @date $Date: 2005-08-30 01:51:59 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii @@ -539,8 +539,8 @@ static psS32 memCheckTypes( void ) { - // psArray *negative; - // negative = psArrayAlloc(2); - // psMetadata *neg; - // neg = psMetadataAlloc(); + psArray *negative; + negative = psArrayAlloc(2); + psMetadata *neg; + neg = psMetadataAlloc(); psArray *array; @@ -551,9 +551,8 @@ return 1; } - // if ( psMemCheckType(PS_DATA_ARRAY, neg) ) - // { - // psError(PS_ERR_BAD_PARAMETER_VALUE, true, "psMemCheckArray failed in memCheckType. \n"); - // return 1; - // } + psLogMsg( __func__, PS_LOG_INFO, "Next should error from invalid datatype." ); + if ( !psMemCheckType(PS_DATA_ARRAY, neg) ) { + psError(PS_ERR_BAD_PARAMETER_VALUE, true, "psMemCheckArray failed in memCheckType. \n"); + } psFree(array); @@ -565,9 +564,8 @@ return 1; } - // if ( psMemCheckType(PS_DATA_BITSET, negative) ) - // { - // psError(PS_ERR_BAD_PARAMETER_VALUE, true, "psMemCheckBitSet failed in memCheckType. \n"); - // return 1; - // } + psLogMsg( __func__, PS_LOG_INFO, "Next should error from invalid datatype." ); + if ( !psMemCheckType(PS_DATA_BITSET, negative) ) { + psError(PS_ERR_BAD_PARAMETER_VALUE, true, "psMemCheckBitSet failed in memCheckType. \n"); + } psFree(bits); @@ -581,16 +579,14 @@ psFree(cube); - /* - psFits *fits; - char *filename = ""; - fits = psFitsAlloc(filename); - if ( !psMemCheckType(PS_DATA_FITS, fits) ) - { - psError(PS_ERR_BAD_PARAMETER_VALUE, true, "psMemCheckFits failed in memCheckType. \n"); - psFree(fits); - return 1; - } + psFits *fits; + char *filename = "table.fits"; + fits = psFitsAlloc(filename); + if ( !psMemCheckType(PS_DATA_FITS, fits) ) { + psError(PS_ERR_BAD_PARAMETER_VALUE, true, "psMemCheckFits failed in memCheckType. \n"); psFree(fits); - */ + return 1; + } + psFree(fits); + psHash *hash; hash = psHashAlloc(100); @@ -638,17 +634,15 @@ psFree(list); - /* - psLookupTable *lookup; - char *filename = ""; - char *format = "%d"; - lookup = psLookupTableAlloc(filename, format, 0); - if ( !psMemCheckType(PS_DATA_LOOKUPTABLE, lookup) ) - { - psError(PS_ERR_BAD_PARAMETER_VALUE, true, "psMemCheckLookupTable failed in memCheckType. \n"); - psFree(lookup); - return 1; - } + psLookupTable *lookup; + char *file = "tableF32.dat"; + char *format = "\%f \%lf \%d \%ld"; + lookup = psLookupTableAlloc(file, format, 10); + if ( !psMemCheckType(PS_DATA_LOOKUPTABLE, lookup) ) { + psError(PS_ERR_BAD_PARAMETER_VALUE, true, "psMemCheckLookupTable failed in memCheckType. \n"); psFree(lookup); - */ + return 1; + } + psFree(lookup); + psMetadata *metadata; metadata = psMetadataAlloc(); @@ -805,14 +799,13 @@ psFree(stats); - /* psTime *time; - time = psTimeAlloc(PS_TIME_UT1); - if ( !psMemCheckType(PS_DATA_TIME, time) ) - { - psError(PS_ERR_BAD_PARAMETER_VALUE, true, "psMemCheckTime failed in memCheckType. \n"); - psFree(time); - return 1; - } + psTime *time; + time = psTimeAlloc(PS_TIME_UT1); + if ( !psMemCheckType(PS_DATA_TIME, time) ) { + psError(PS_ERR_BAD_PARAMETER_VALUE, true, "psMemCheckTime failed in memCheckType. \n"); psFree(time); - */ + return 1; + } + psFree(time); + psVector *vector; vector = psVectorAlloc(100, PS_TYPE_F32); @@ -825,6 +818,6 @@ - // psFree(negative); - // psFree(neg); + psFree(negative); + psFree(neg); return 0; Index: /trunk/psLib/test/sys/verified/tst_psMemory.stderr =================================================================== --- /trunk/psLib/test/sys/verified/tst_psMemory.stderr (revision 4898) +++ /trunk/psLib/test/sys/verified/tst_psMemory.stderr (revision 4899) @@ -157,4 +157,16 @@ \**********************************************************************************/ +