Index: /trunk/psLib/etc/pslib/Makefile.am =================================================================== --- /trunk/psLib/etc/pslib/Makefile.am (revision 3245) +++ /trunk/psLib/etc/pslib/Makefile.am (revision 3246) @@ -7,5 +7,5 @@ EXTRA_DIST = psTime.xml psTime.config.template -psTime.config:: psTime.config.template +psTime.config: psTime.config.template sed 's|PREFIX|$(prefix)|' $? > $@ Index: /trunk/psLib/pslib.kdevses =================================================================== --- /trunk/psLib/pslib.kdevses (revision 3245) +++ /trunk/psLib/pslib.kdevses (revision 3246) @@ -2,9 +2,5 @@ - - - - - + Index: /trunk/psLib/src/astronomy/psMetadata.c =================================================================== --- /trunk/psLib/src/astronomy/psMetadata.c (revision 3245) +++ /trunk/psLib/src/astronomy/psMetadata.c (revision 3246) @@ -12,6 +12,6 @@ * @author Ross Harman, MHPCC * -* @version $Revision: 1.49 $ $Name: not supported by cvs2svn $ -* @date $Date: 2005-01-17 20:58:20 $ +* @version $Revision: 1.50 $ $Name: not supported by cvs2svn $ +* @date $Date: 2005-02-17 01:58:42 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii @@ -419,5 +419,5 @@ } -void* psMetadataLookupPtr(psMetadata *md, const char *key, psBool *status) +void* psMetadataLookupPtr(psBool *status, psMetadata *md, const char *key) { psMetadataItem *metadataItem = NULL; @@ -450,5 +450,5 @@ #define psMetadataLookupNumTYPE(TYPE) \ -ps##TYPE psMetadataLookup##TYPE(psMetadata *md, const char *key, psBool *status) \ +ps##TYPE psMetadataLookup##TYPE(psBool *status, psMetadata *md, const char *key) \ { \ psMetadataItem *metadataItem = NULL; \ Index: /trunk/psLib/src/astronomy/psMetadata.h =================================================================== --- /trunk/psLib/src/astronomy/psMetadata.h (revision 3245) +++ /trunk/psLib/src/astronomy/psMetadata.h (revision 3246) @@ -11,6 +11,6 @@ * @author Ross Harman, MHPCC * -* @version $Revision: 1.35 $ $Name: not supported by cvs2svn $ -* @date $Date: 2005-02-03 00:45:06 $ +* @version $Revision: 1.36 $ $Name: not supported by cvs2svn $ +* @date $Date: 2005-02-17 01:58:42 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii @@ -196,6 +196,6 @@ */ psMetadataItem* psMetadataLookup( - psMetadata * md, ///< Metadata collection to lookup metadata item. - const char * key ///< Name of metadata key. + psMetadata * md, ///< Metadata collection to lookup metadata item. + const char * key ///< Name of metadata key. ); @@ -209,7 +209,7 @@ */ psF64 psMetadataLookupF64( - psMetadata *md, ///< Metadata collection to lookup metadata item. - const char *key, ///< Name of metadata key. - psBool *status ///< Status of lookup. + psBool *status, ///< Status of lookup. + psMetadata *md, ///< Metadata collection to lookup metadata item. + const char *key ///< Name of metadata key. ); @@ -223,7 +223,7 @@ */ psF32 psMetadataLookupF32( - psMetadata *md, ///< Metadata collection to lookup metadata item. - const char *key, ///< Name of metadata key. - psBool *status ///< Status of lookup. + psBool *status, ///< Status of lookup. + psMetadata *md, ///< Metadata collection to lookup metadata item. + const char *key ///< Name of metadata key. ); @@ -237,7 +237,7 @@ */ psS32 psMetadataLookupS32( - psMetadata *md, ///< Metadata collection to lookup metadata item. - const char *key, ///< Name of metadata key. - psBool *status ///< Status of lookup. + psBool *status, ///< Status of lookup. + psMetadata *md, ///< Metadata collection to lookup metadata item. + const char *key ///< Name of metadata key. ); @@ -251,7 +251,7 @@ */ psBool psMetadataLookupBool( - psMetadata *md, ///< Metadata collection to lookup metadata item. - const char *key, ///< Name of metadata key. - psBool *status ///< Status of lookup. + psBool *status, ///< Status of lookup. + psMetadata *md, ///< Metadata collection to lookup metadata item. + const char *key ///< Name of metadata key. ); @@ -265,7 +265,7 @@ */ void* psMetadataLookupPtr( - psMetadata* md, ///< Metadata collection to lookup metadata item. - const char *key, ///< Name of metadata key. - psBool *status ///< Status of lookup. + psBool *status, ///< Status of lookup. + psMetadata* md, ///< Metadata collection to lookup metadata item. + const char *key ///< Name of metadata key. ); Index: /trunk/psLib/src/collections/psMetadata.c =================================================================== --- /trunk/psLib/src/collections/psMetadata.c (revision 3245) +++ /trunk/psLib/src/collections/psMetadata.c (revision 3246) @@ -12,6 +12,6 @@ * @author Ross Harman, MHPCC * -* @version $Revision: 1.49 $ $Name: not supported by cvs2svn $ -* @date $Date: 2005-01-17 20:58:20 $ +* @version $Revision: 1.50 $ $Name: not supported by cvs2svn $ +* @date $Date: 2005-02-17 01:58:42 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii @@ -419,5 +419,5 @@ } -void* psMetadataLookupPtr(psMetadata *md, const char *key, psBool *status) +void* psMetadataLookupPtr(psBool *status, psMetadata *md, const char *key) { psMetadataItem *metadataItem = NULL; @@ -450,5 +450,5 @@ #define psMetadataLookupNumTYPE(TYPE) \ -ps##TYPE psMetadataLookup##TYPE(psMetadata *md, const char *key, psBool *status) \ +ps##TYPE psMetadataLookup##TYPE(psBool *status, psMetadata *md, const char *key) \ { \ psMetadataItem *metadataItem = NULL; \ Index: /trunk/psLib/src/collections/psMetadata.h =================================================================== --- /trunk/psLib/src/collections/psMetadata.h (revision 3245) +++ /trunk/psLib/src/collections/psMetadata.h (revision 3246) @@ -11,6 +11,6 @@ * @author Ross Harman, MHPCC * -* @version $Revision: 1.35 $ $Name: not supported by cvs2svn $ -* @date $Date: 2005-02-03 00:45:06 $ +* @version $Revision: 1.36 $ $Name: not supported by cvs2svn $ +* @date $Date: 2005-02-17 01:58:42 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii @@ -196,6 +196,6 @@ */ psMetadataItem* psMetadataLookup( - psMetadata * md, ///< Metadata collection to lookup metadata item. - const char * key ///< Name of metadata key. + psMetadata * md, ///< Metadata collection to lookup metadata item. + const char * key ///< Name of metadata key. ); @@ -209,7 +209,7 @@ */ psF64 psMetadataLookupF64( - psMetadata *md, ///< Metadata collection to lookup metadata item. - const char *key, ///< Name of metadata key. - psBool *status ///< Status of lookup. + psBool *status, ///< Status of lookup. + psMetadata *md, ///< Metadata collection to lookup metadata item. + const char *key ///< Name of metadata key. ); @@ -223,7 +223,7 @@ */ psF32 psMetadataLookupF32( - psMetadata *md, ///< Metadata collection to lookup metadata item. - const char *key, ///< Name of metadata key. - psBool *status ///< Status of lookup. + psBool *status, ///< Status of lookup. + psMetadata *md, ///< Metadata collection to lookup metadata item. + const char *key ///< Name of metadata key. ); @@ -237,7 +237,7 @@ */ psS32 psMetadataLookupS32( - psMetadata *md, ///< Metadata collection to lookup metadata item. - const char *key, ///< Name of metadata key. - psBool *status ///< Status of lookup. + psBool *status, ///< Status of lookup. + psMetadata *md, ///< Metadata collection to lookup metadata item. + const char *key ///< Name of metadata key. ); @@ -251,7 +251,7 @@ */ psBool psMetadataLookupBool( - psMetadata *md, ///< Metadata collection to lookup metadata item. - const char *key, ///< Name of metadata key. - psBool *status ///< Status of lookup. + psBool *status, ///< Status of lookup. + psMetadata *md, ///< Metadata collection to lookup metadata item. + const char *key ///< Name of metadata key. ); @@ -265,7 +265,7 @@ */ void* psMetadataLookupPtr( - psMetadata* md, ///< Metadata collection to lookup metadata item. - const char *key, ///< Name of metadata key. - psBool *status ///< Status of lookup. + psBool *status, ///< Status of lookup. + psMetadata* md, ///< Metadata collection to lookup metadata item. + const char *key ///< Name of metadata key. ); Index: /trunk/psLib/src/dataIO/psFits.c =================================================================== --- /trunk/psLib/src/dataIO/psFits.c (revision 3245) +++ /trunk/psLib/src/dataIO/psFits.c (revision 3246) @@ -7,6 +7,6 @@ * @author Robert DeSonia, MHPCC * - * @version $Revision: 1.16 $ $Name: not supported by cvs2svn $ - * @date $Date: 2005-02-02 20:22:56 $ + * @version $Revision: 1.17 $ $Name: not supported by cvs2svn $ + * @date $Date: 2005-02-17 01:58:42 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii @@ -1546,6 +1546,7 @@ case PS_TYPE_S32: for (row = 0; row < table->n; row++) { - col->data.S32[row] = psMetadataLookupS32( - table->data[row],item->name,NULL); + col->data.S32[row] = psMetadataLookupS32(NULL, + table->data[row], + item->name); } fits_write_col_int(fits->p_fd, @@ -1559,6 +1560,7 @@ case PS_TYPE_F32: for (row = 0; row < table->n; row++) { - col->data.F32[row] = psMetadataLookupF32( - table->data[row],item->name,NULL); + col->data.F32[row] = psMetadataLookupF32(NULL, + table->data[row], + item->name); } fits_write_col_flt(fits->p_fd, @@ -1572,6 +1574,7 @@ case PS_TYPE_F64: for (row = 0; row < table->n; row++) { - col->data.F64[row] = psMetadataLookupF64( - table->data[row],item->name,NULL); + col->data.F64[row] = psMetadataLookupF64(NULL, + table->data[row], + item->name); } fits_write_col_dbl(fits->p_fd, @@ -1585,6 +1588,7 @@ case PS_TYPE_BOOL: for (row = 0; row < table->n; row++) { - col->data.S8[row] = psMetadataLookupBool( - table->data[row],item->name,NULL); + col->data.S8[row] = psMetadataLookupBool(NULL, + table->data[row], + item->name); } fits_write_col_log(fits->p_fd, Index: /trunk/psLib/src/fileUtils/psFits.c =================================================================== --- /trunk/psLib/src/fileUtils/psFits.c (revision 3245) +++ /trunk/psLib/src/fileUtils/psFits.c (revision 3246) @@ -7,6 +7,6 @@ * @author Robert DeSonia, MHPCC * - * @version $Revision: 1.16 $ $Name: not supported by cvs2svn $ - * @date $Date: 2005-02-02 20:22:56 $ + * @version $Revision: 1.17 $ $Name: not supported by cvs2svn $ + * @date $Date: 2005-02-17 01:58:42 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii @@ -1546,6 +1546,7 @@ case PS_TYPE_S32: for (row = 0; row < table->n; row++) { - col->data.S32[row] = psMetadataLookupS32( - table->data[row],item->name,NULL); + col->data.S32[row] = psMetadataLookupS32(NULL, + table->data[row], + item->name); } fits_write_col_int(fits->p_fd, @@ -1559,6 +1560,7 @@ case PS_TYPE_F32: for (row = 0; row < table->n; row++) { - col->data.F32[row] = psMetadataLookupF32( - table->data[row],item->name,NULL); + col->data.F32[row] = psMetadataLookupF32(NULL, + table->data[row], + item->name); } fits_write_col_flt(fits->p_fd, @@ -1572,6 +1574,7 @@ case PS_TYPE_F64: for (row = 0; row < table->n; row++) { - col->data.F64[row] = psMetadataLookupF64( - table->data[row],item->name,NULL); + col->data.F64[row] = psMetadataLookupF64(NULL, + table->data[row], + item->name); } fits_write_col_dbl(fits->p_fd, @@ -1585,6 +1588,7 @@ case PS_TYPE_BOOL: for (row = 0; row < table->n; row++) { - col->data.S8[row] = psMetadataLookupBool( - table->data[row],item->name,NULL); + col->data.S8[row] = psMetadataLookupBool(NULL, + table->data[row], + item->name); } fits_write_col_log(fits->p_fd, Index: /trunk/psLib/src/fits/psFits.c =================================================================== --- /trunk/psLib/src/fits/psFits.c (revision 3245) +++ /trunk/psLib/src/fits/psFits.c (revision 3246) @@ -7,6 +7,6 @@ * @author Robert DeSonia, MHPCC * - * @version $Revision: 1.16 $ $Name: not supported by cvs2svn $ - * @date $Date: 2005-02-02 20:22:56 $ + * @version $Revision: 1.17 $ $Name: not supported by cvs2svn $ + * @date $Date: 2005-02-17 01:58:42 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii @@ -1546,6 +1546,7 @@ case PS_TYPE_S32: for (row = 0; row < table->n; row++) { - col->data.S32[row] = psMetadataLookupS32( - table->data[row],item->name,NULL); + col->data.S32[row] = psMetadataLookupS32(NULL, + table->data[row], + item->name); } fits_write_col_int(fits->p_fd, @@ -1559,6 +1560,7 @@ case PS_TYPE_F32: for (row = 0; row < table->n; row++) { - col->data.F32[row] = psMetadataLookupF32( - table->data[row],item->name,NULL); + col->data.F32[row] = psMetadataLookupF32(NULL, + table->data[row], + item->name); } fits_write_col_flt(fits->p_fd, @@ -1572,6 +1574,7 @@ case PS_TYPE_F64: for (row = 0; row < table->n; row++) { - col->data.F64[row] = psMetadataLookupF64( - table->data[row],item->name,NULL); + col->data.F64[row] = psMetadataLookupF64(NULL, + table->data[row], + item->name); } fits_write_col_dbl(fits->p_fd, @@ -1585,6 +1588,7 @@ case PS_TYPE_BOOL: for (row = 0; row < table->n; row++) { - col->data.S8[row] = psMetadataLookupBool( - table->data[row],item->name,NULL); + col->data.S8[row] = psMetadataLookupBool(NULL, + table->data[row], + item->name); } fits_write_col_log(fits->p_fd, Index: /trunk/psLib/src/sys/psError.c =================================================================== --- /trunk/psLib/src/sys/psError.c (revision 3245) +++ /trunk/psLib/src/sys/psError.c (revision 3246) @@ -10,6 +10,6 @@ * @author Eric Van Alst, MHPCC * - * @version $Revision: 1.20 $ $Name: not supported by cvs2svn $ - * @date $Date: 2005-01-13 19:50:45 $ + * @version $Revision: 1.21 $ $Name: not supported by cvs2svn $ + * @date $Date: 2005-02-17 01:58:42 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii @@ -77,7 +77,7 @@ char errMsg[2048]; psErr* err; - char msgName[256]; + char msgName[1024]; - snprintf(msgName,256,"%s (%s:%d)",func,file,lineno); + snprintf(msgName,1024,"%s (%s:%d)",func,file,lineno); va_list argPtr; // variable list arguement pointer Index: /trunk/psLib/src/sys/psLogMsg.c =================================================================== --- /trunk/psLib/src/sys/psLogMsg.c (revision 3245) +++ /trunk/psLib/src/sys/psLogMsg.c (revision 3246) @@ -11,6 +11,6 @@ * @author George Gusciora, MHPCC * - * @version $Revision: 1.36 $ $Name: not supported by cvs2svn $ - * @date $Date: 2005-02-16 00:22:05 $ + * @version $Revision: 1.37 $ $Name: not supported by cvs2svn $ + * @date $Date: 2005-02-17 01:58:42 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii @@ -46,6 +46,5 @@ #define MAX_LOG_LEVEL 9 -#define MAX_LOG_LINE_LENGTH 128 - +#define MAX_LOG_LINE_LENGTH 256 static FILE *logDest = (FILE *) 1; // flag to initialize to stderr before using. Index: /trunk/psLib/src/sysUtils/psError.c =================================================================== --- /trunk/psLib/src/sysUtils/psError.c (revision 3245) +++ /trunk/psLib/src/sysUtils/psError.c (revision 3246) @@ -10,6 +10,6 @@ * @author Eric Van Alst, MHPCC * - * @version $Revision: 1.20 $ $Name: not supported by cvs2svn $ - * @date $Date: 2005-01-13 19:50:45 $ + * @version $Revision: 1.21 $ $Name: not supported by cvs2svn $ + * @date $Date: 2005-02-17 01:58:42 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii @@ -77,7 +77,7 @@ char errMsg[2048]; psErr* err; - char msgName[256]; + char msgName[1024]; - snprintf(msgName,256,"%s (%s:%d)",func,file,lineno); + snprintf(msgName,1024,"%s (%s:%d)",func,file,lineno); va_list argPtr; // variable list arguement pointer Index: /trunk/psLib/src/sysUtils/psLogMsg.c =================================================================== --- /trunk/psLib/src/sysUtils/psLogMsg.c (revision 3245) +++ /trunk/psLib/src/sysUtils/psLogMsg.c (revision 3246) @@ -11,6 +11,6 @@ * @author George Gusciora, MHPCC * - * @version $Revision: 1.36 $ $Name: not supported by cvs2svn $ - * @date $Date: 2005-02-16 00:22:05 $ + * @version $Revision: 1.37 $ $Name: not supported by cvs2svn $ + * @date $Date: 2005-02-17 01:58:42 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii @@ -46,6 +46,5 @@ #define MAX_LOG_LEVEL 9 -#define MAX_LOG_LINE_LENGTH 128 - +#define MAX_LOG_LINE_LENGTH 256 static FILE *logDest = (FILE *) 1; // flag to initialize to stderr before using. Index: /trunk/psLib/src/types/psMetadata.c =================================================================== --- /trunk/psLib/src/types/psMetadata.c (revision 3245) +++ /trunk/psLib/src/types/psMetadata.c (revision 3246) @@ -12,6 +12,6 @@ * @author Ross Harman, MHPCC * -* @version $Revision: 1.49 $ $Name: not supported by cvs2svn $ -* @date $Date: 2005-01-17 20:58:20 $ +* @version $Revision: 1.50 $ $Name: not supported by cvs2svn $ +* @date $Date: 2005-02-17 01:58:42 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii @@ -419,5 +419,5 @@ } -void* psMetadataLookupPtr(psMetadata *md, const char *key, psBool *status) +void* psMetadataLookupPtr(psBool *status, psMetadata *md, const char *key) { psMetadataItem *metadataItem = NULL; @@ -450,5 +450,5 @@ #define psMetadataLookupNumTYPE(TYPE) \ -ps##TYPE psMetadataLookup##TYPE(psMetadata *md, const char *key, psBool *status) \ +ps##TYPE psMetadataLookup##TYPE(psBool *status, psMetadata *md, const char *key) \ { \ psMetadataItem *metadataItem = NULL; \ Index: /trunk/psLib/src/types/psMetadata.h =================================================================== --- /trunk/psLib/src/types/psMetadata.h (revision 3245) +++ /trunk/psLib/src/types/psMetadata.h (revision 3246) @@ -11,6 +11,6 @@ * @author Ross Harman, MHPCC * -* @version $Revision: 1.35 $ $Name: not supported by cvs2svn $ -* @date $Date: 2005-02-03 00:45:06 $ +* @version $Revision: 1.36 $ $Name: not supported by cvs2svn $ +* @date $Date: 2005-02-17 01:58:42 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii @@ -196,6 +196,6 @@ */ psMetadataItem* psMetadataLookup( - psMetadata * md, ///< Metadata collection to lookup metadata item. - const char * key ///< Name of metadata key. + psMetadata * md, ///< Metadata collection to lookup metadata item. + const char * key ///< Name of metadata key. ); @@ -209,7 +209,7 @@ */ psF64 psMetadataLookupF64( - psMetadata *md, ///< Metadata collection to lookup metadata item. - const char *key, ///< Name of metadata key. - psBool *status ///< Status of lookup. + psBool *status, ///< Status of lookup. + psMetadata *md, ///< Metadata collection to lookup metadata item. + const char *key ///< Name of metadata key. ); @@ -223,7 +223,7 @@ */ psF32 psMetadataLookupF32( - psMetadata *md, ///< Metadata collection to lookup metadata item. - const char *key, ///< Name of metadata key. - psBool *status ///< Status of lookup. + psBool *status, ///< Status of lookup. + psMetadata *md, ///< Metadata collection to lookup metadata item. + const char *key ///< Name of metadata key. ); @@ -237,7 +237,7 @@ */ psS32 psMetadataLookupS32( - psMetadata *md, ///< Metadata collection to lookup metadata item. - const char *key, ///< Name of metadata key. - psBool *status ///< Status of lookup. + psBool *status, ///< Status of lookup. + psMetadata *md, ///< Metadata collection to lookup metadata item. + const char *key ///< Name of metadata key. ); @@ -251,7 +251,7 @@ */ psBool psMetadataLookupBool( - psMetadata *md, ///< Metadata collection to lookup metadata item. - const char *key, ///< Name of metadata key. - psBool *status ///< Status of lookup. + psBool *status, ///< Status of lookup. + psMetadata *md, ///< Metadata collection to lookup metadata item. + const char *key ///< Name of metadata key. ); @@ -265,7 +265,7 @@ */ void* psMetadataLookupPtr( - psMetadata* md, ///< Metadata collection to lookup metadata item. - const char *key, ///< Name of metadata key. - psBool *status ///< Status of lookup. + psBool *status, ///< Status of lookup. + psMetadata* md, ///< Metadata collection to lookup metadata item. + const char *key ///< Name of metadata key. ); Index: /trunk/psLib/test/astronomy/Makefile.am =================================================================== --- /trunk/psLib/test/astronomy/Makefile.am (revision 3245) +++ /trunk/psLib/test/astronomy/Makefile.am (revision 3246) @@ -13,4 +13,5 @@ AM_LDFLAGS = -L$(top_builddir)/src -lpslib $(PSLIB_LIBS) AM_CFLAGS = -DXML_CONFIG_FILE="\"$(top_srcdir)/etc/pslib/psTime.xml\"" + check_PROGRAMS = tst_psTime_01 \ @@ -30,5 +31,15 @@ tst_psAstrometry01 -TESTS_ENVIRONMENT = perl $(top_srcdir)/test/runTest --verified=$(srcdir)/verified +check_DATA = test.config \ + psTime.config \ + test.psTime.config1 \ + test.psTime.config2 \ + test.psTime.config3 \ + test.psTime.config4 \ + header_1.fits \ + header_2.fits \ + test.ser7.dat + +TESTS_ENVIRONMENT = export PS_CONFIG_FILE="psTime.config" && perl $(top_srcdir)/test/runTest --verified=$(srcdir)/verified TESTS = tst_psTime_01 \ @@ -48,6 +59,6 @@ tst_psAstrometry01 -tests: $(TESTS) test.psTime.config1 test.psTime.config2 test.psTime.config3 test.psTime.config4 - +tests: $(check_DATA) $(TESTS) + tst_psTime_01_SOURCES = tst_psTime_01.c tst_psTime_02_SOURCES = tst_psTime_02.c @@ -66,27 +77,35 @@ tst_psAstrometry01_SOURCES = tst_psAstrometry01.c -BUILT_SOURCES = test.psTime.config1 test.psTime.config2 test.psTime.config3 test.psTime.config4 -CLEANFILES = test.psTime.config1 test.psTime.config2 test.psTime.config3 test.psTime.config4 +EXTRA_DIST = data/test.psTime.config1.template \ + data/test.psTime.config2.template \ + data/test.psTime.config3.template \ + data/test.psTime.config4.template \ + data/header_1.fits \ + data/header_2.fits \ + data/test.config \ + data/test.ser7.dat \ + verified -EXTRA_DIST = test.psTime.config1.template \ - test.psTime.config2.template \ - test.psTime.config3.template \ - test.psTime.config4.template \ - verified \ - test.ser7.dat \ - header_1.fits \ - header_2.fits \ - test.config +psTime.config: $(top_srcdir)/etc/pslib/psTime.config.template + sed 's|PREFIX|$(top_srcdir)|' $? > $@ -test.psTime.config1: test.psTime.config1.template - sed 's|PREFIX|$(prefix)|' $? > $@ +test.psTime.config1: data/test.psTime.config1.template + cp $? $@ -test.psTime.config2: test.psTime.config2.template - sed 's|PREFIX|$(prefix)|' $? > $@ +test.psTime.config2: data/test.psTime.config2.template + sed 's|PREFIX|$(top_srcdir)|' $? > $@ -test.psTime.config3: test.psTime.config3.template - sed 's|PREFIX|$(prefix)|' $? > $@ +test.psTime.config3: data/test.psTime.config3.template + sed 's|PREFIX|$(top_srcdir)|' $? > $@ -test.psTime.config4: test.psTime.config4.template - sed 's|PREFIX|$(prefix)|' $? > $@ +test.psTime.config4: data/test.psTime.config4.template + sed 's|PREFIX|$(srcdir)|' $? > $@ +test.config: data/test.config + cp $? $@ + +header_1.fits: data/header_1.fits + cp $? $@ + +header_2.fits: data/header_2.fits + cp $? $@ Index: /trunk/psLib/test/astronomy/data/header_1.fits =================================================================== --- /trunk/psLib/test/astronomy/data/header_1.fits (revision 3246) +++ /trunk/psLib/test/astronomy/data/header_1.fits (revision 3246) @@ -0,0 +1,1 @@ +SIMPLE = T / file does conform to FITS standard BITPIX = 8 / number of bits per data pixel NAXIS = 0 / number of data axes HISTORY File modified by user 'harman' with fv on 2004-08-04T11:11:18 END Index: /trunk/psLib/test/astronomy/data/header_2.fits =================================================================== --- /trunk/psLib/test/astronomy/data/header_2.fits (revision 3246) +++ /trunk/psLib/test/astronomy/data/header_2.fits (revision 3246) @@ -0,0 +1,1 @@ +SIMPLE = T / file does conform to FITS standard BITPIX = -64 / number of bits per data pixel NAXIS = 1 / number of data axes NAXIS1 = 64 / length of data axis 1 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= 'IMAGE ' / IMAGE extension BITPIX = -64 / number of bits per data pixel NAXIS = 1 / number of data axes NAXIS1 = 64 / length of data axis 1 PCOUNT = 0 / required keyword; must = 0 GCOUNT = 1 / required keyword; must = 1 BITPIX = -64 / number of bits per data pixel EXTNAME = 'MY_DATA_1' HISTORY File modified by user 'harman' with fv on 2004-08-04T13:14:45 HISTORY File modified by user 'harman' with fv on 2004-08-04T13:15:29 HISTORY File modified by user 'harman' with fv on 2004-08-04T13:21:18 HISTORY File modified by user 'harman' with fv on 2004-08-04T13:21:46 END XTENSION= 'IMAGE ' / IMAGE extension BITPIX = -64 / number of bits per data pixel NAXIS = 1 / number of data axes NAXIS1 = 64 / length of data axis 1 PCOUNT = 0 / required keyword; must = 0 GCOUNT = 1 / required keyword; must = 1 EXTNAME = 'MY_DATA_2' HISTORY File modified by user 'harman' with fv on 2004-08-04T13:22:12 HISTORY File modified by user 'harman' with fv on 2004-08-04T13:22:52 END Index: /trunk/psLib/test/astronomy/data/psTime.config.template =================================================================== --- /trunk/psLib/test/astronomy/data/psTime.config.template (revision 3246) +++ /trunk/psLib/test/astronomy/data/psTime.config.template (revision 3246) @@ -0,0 +1,23 @@ +# This configuration file specifies values required for time calculations by psLib. +psLib.time.tables.dir STR PREFIX/share/pslib # Directory for time tables +psLib.time.tables.n S32 4 # Number of time tables +psLib.time.tables.files STR ser7.dat eopc01_1900_2004.dat finals_all.dat tai_utc.dat # These are the table file names +@psLib.time.tables.from F64 53258.0, 15020.0, 41684.0 2437300.5 # Valid from these dates +@psLib.time.tables.to F64 53622.0, 53258.0, 53627.0 2451179.5 # Valid to these dates +psLib.time.before.xp F64 0.0 # Value of XP for before the earliest MJD +psLib.time.before.yp F64 0.0 # Value of YP for before the earliest MJD +psLib.time.before.dut F64 0.0 # Value of UT1-UTC for before the earliest MJD + +# Now follows formulae for predicting ahead of the most recent available table entry. +# xp = [0] + [1]*cos A + [2]*sin A + [3]*cos C + [4]*sin C +# yp = [0] + [1]*cos A + [2]*sin A + [3]*cos C + [4]*sin C +# A = 2*pi*(MJD - pslib.time.predict.mjd)/365.25 +# C = 2*pi*(MJD - pslib.time.predict.mjd)/435.0 +# dut = ut1-utc = [0] + [1]*(MJD - [2]) - (UT2-UT1) +# ut2-ut1 = 0.022 sin(2*pi*T) - 0.012 cos(2*pi*T) - 0.006 sin(4*pi*T) + 0.007 cos(4*pi*T) +# T = 2000.0 + (MJD - 51544.03)/365.2422 +@psLib.time.predict.xp F64 0.0569, 0.0555, -0.0200, 0.0513, 0.1483 +@psLib.time.predict.yp F64 0.3498, -0.0176, -0.0498, 0.1483, -0.0513 +psLib.time.predict.mjd F64 53257.0 +@psLib.time.predict.dut F64 -0.4944, -0.00023, 53262.0 + Index: /trunk/psLib/test/astronomy/data/test.config =================================================================== --- /trunk/psLib/test/astronomy/data/test.config (revision 3246) +++ /trunk/psLib/test/astronomy/data/test.config (revision 3246) @@ -0,0 +1,129 @@ +########################################################################################################## +# test.config +# +# This is a sample metadata configuration file used to test the metadata configuration file parser. +# It tests both positive and negative cases as described in the comments below. +# +# author Ross Harman, MHPCC +# +# version $Revision: 1.1 $ $Name: not supported by cvs2svn $ +# date $Date: 2005-02-17 01:58:43 $ +# +# Copyright 2004 Maui High Performance Computing Center, University of Hawaii +########################################################################################################## +# +# +# +########## Test 1 ########## +# Lines beginning with # are comments. The line below, as well as those above are comments. They should be ignored by the parser. +# I am a comment. +# +# +# +########## Test 2 ########## +# The line below is a comment that begins with some whitespace. It should be ignored by the parser. + # Another comment +# +# +# +########## Test 3 ########## +# The line below is completely blank except for a carriage return. It should be ignored by the parser. + +# +# +# +########## Test 4 ########## +# The line below consists of spaces and tabs (whitespace). It should be ignored by the parser. + +# +# +# +########## Test 5 ########## +# The line below consists of a variable name, type, value, and trailing comment. It should be read by the parser +pi F64 3.1415926535897932384626433832795029 # Definition of pi +# +# +# +########## Test 6 ########## +# The line below consists of a variable name, type, and value, but without a trailing comment. It should be read by the parser. +altitude S32 10000 +# +# +# +########## Test 7 ########## +# The lines below contain variations in name, type, value, trailing comment, and whitespace. They should all be read by the parser. + time F32 1234.5678 + myBool BOOL F # F, f, 0, T, t, 1 are also acceptable +title1 STR Hello world #This is a comment for the string value + title2 STRING Good bye world # STRING or STR may be used as the string type +# +# +# +########## Test 8 ########## +# The line below creates a vector. It should be read by the parser. +@primes S32 2, 3, 5, 7, 11, 13, 17 # These are prime numbers +# +# +# +########## Test 9 ########## +# The line below creates a vector with commas mixed with spaces in the values. It should be read by the parser. +@negatives S32 -1, -2 -3 -4, -5, -6, -7 +# +# +# +########## Test 10 ########## +# The lines below should create a folder node with children that are strings. They should be read by the parser. +comment * +comment STR This +comment STR is +comment STR an +comment STR ugly +comment STR comment +comment STR but +comment STR still +comment STR valid +# +# +# +########## Test 11 ########## +# The line below contains an incorrect value. It should produce an error. +xPosition F64 9876.54qqq32 +# +# +# +########## Test 12 ########## +# The line below contains no value. It should produce an error. +yPosition F64 +# +# +# +########## Test 13 ########## +# The line below contains no type. It should produce an error. +zPosition 99.999 +# +# +# +########## Test 14 ########## +# The line below contains two * characters. It should produce an error. +aPosition ** +# +# +# +########## Test 15 ########## +# The line below contains two @ characters. It should produce an error. +@@bPosition F64 22.33 +# +# +# +########## Test 16 ########## +# The line below contains a ~ character used for special processing. It should produce an error. +range F64 140.0 ~ +# +# +# +########## Test 17 ########## +# The variable name below is repeated. It should produce an error if the overwrite function argument is set to false. +# If overwrite is true, then the last name and value will be stored and there will be no error. +speed F32 55.55 +speed F32 66.66 + Index: /trunk/psLib/test/astronomy/data/test.psTime.config1.template =================================================================== --- /trunk/psLib/test/astronomy/data/test.psTime.config1.template (revision 3246) +++ /trunk/psLib/test/astronomy/data/test.psTime.config1.template (revision 3246) @@ -0,0 +1,23 @@ +# This configuration file specifies values required for time calculations by psLib. +psLib.time.tables.dir STR bogus # Directory for time tables +psLib.time.tables.n S32 4 # Number of time tables +psLib.time.tables.files STR ser7.dat eopc01_1900_2004.dat finals_all.dat tai_utc.dat # These are the table file names +@psLib.time.tables.from F64 53258.0, 15020.0, 41684.0 2437300.5 # Valid from these dates +@psLib.time.tables.to F64 53622.0, 53258.0, 53627.0 2451179.5 # Valid to these dates +psLib.time.before.xp F64 0.0 # Value of XP for before the earliest MJD +psLib.time.before.yp F64 0.0 # Value of YP for before the earliest MJD +psLib.time.before.dut F64 0.0 # Value of UT1-UTC for before the earliest MJD + +# Now follows formulae for predicting ahead of the most recent available table entry. +# xp = [0] + [1]*cos A + [2]*sin A + [3]*cos C + [4]*sin C +# yp = [0] + [1]*cos A + [2]*sin A + [3]*cos C + [4]*sin C +# A = 2*pi*(MJD - pslib.time.predict.mjd)/365.25 +# C = 2*pi*(MJD - pslib.time.predict.mjd)/435.0 +# dut = ut1-utc = [0] + [1]*(MJD - [2]) - (UT2-UT1) +# ut2-ut1 = 0.022 sin(2*pi*T) - 0.012 cos(2*pi*T) - 0.006 sin(4*pi*T) + 0.007 cos(4*pi*T) +# T = 2000.0 + (MJD - 51544.03)/365.2422 +@psLib.time.predict.xp F64 0.0569, 0.0555, -0.0200, 0.0513, 0.1483 +@psLib.time.predict.yp F64 0.3498, -0.0176, -0.0498, 0.1483, -0.0513 +psLib.time.predict.mjd F64 53257.0 +@psLib.time.predict.dut F64 -0.4944, -0.00023, 53262.0 + Index: /trunk/psLib/test/astronomy/data/test.psTime.config2.template =================================================================== --- /trunk/psLib/test/astronomy/data/test.psTime.config2.template (revision 3246) +++ /trunk/psLib/test/astronomy/data/test.psTime.config2.template (revision 3246) @@ -0,0 +1,23 @@ +# This configuration file specifies values required for time calculations by psLib. +psLib.time.tables.dir STR PREFIX/share/pslib # Directory for time tables +psLib.time.tables.n S32 4 # Number of time tables +psLib.time.tables.files STR eopc01_1900_2004.dat finals_all.dat tai_utc.dat # These are the table file names +@psLib.time.tables.from F64 53258.0, 15020.0, 41684.0 2437300.5 # Valid from these dates +@psLib.time.tables.to F64 53622.0, 53258.0, 53627.0 2451179.5 # Valid to these dates +psLib.time.before.xp F64 0.0 # Value of XP for before the earliest MJD +psLib.time.before.yp F64 0.0 # Value of YP for before the earliest MJD +psLib.time.before.dut F64 0.0 # Value of UT1-UTC for before the earliest MJD + +# Now follows formulae for predicting ahead of the most recent available table entry. +# xp = [0] + [1]*cos A + [2]*sin A + [3]*cos C + [4]*sin C +# yp = [0] + [1]*cos A + [2]*sin A + [3]*cos C + [4]*sin C +# A = 2*pi*(MJD - pslib.time.predict.mjd)/365.25 +# C = 2*pi*(MJD - pslib.time.predict.mjd)/435.0 +# dut = ut1-utc = [0] + [1]*(MJD - [2]) - (UT2-UT1) +# ut2-ut1 = 0.022 sin(2*pi*T) - 0.012 cos(2*pi*T) - 0.006 sin(4*pi*T) + 0.007 cos(4*pi*T) +# T = 2000.0 + (MJD - 51544.03)/365.2422 +@psLib.time.predict.xp F64 0.0569, 0.0555, -0.0200, 0.0513, 0.1483 +@psLib.time.predict.yp F64 0.3498, -0.0176, -0.0498, 0.1483, -0.0513 +psLib.time.predict.mjd F64 53257.0 +@psLib.time.predict.dut F64 -0.4944, -0.00023, 53262.0 + Index: /trunk/psLib/test/astronomy/data/test.psTime.config3.template =================================================================== --- /trunk/psLib/test/astronomy/data/test.psTime.config3.template (revision 3246) +++ /trunk/psLib/test/astronomy/data/test.psTime.config3.template (revision 3246) @@ -0,0 +1,23 @@ +# This configuration file specifies values required for time calculations by psLib. +psLib.time.tables.dir STR PREFIX/share/pslib # Directory for time tables +psLib.time.tables.n S32 4 # Number of time tables +psLib.time.tables.files STR ser7.dat eopc01_1900_2004.dat finals_all.dat tai_utc.dat # These are the table file names +@psLib.time.tables.from F64 15020.0, 41684.0 2437300.5 # Valid from these dates +@psLib.time.tables.to F64 53622.0, 53258.0, 53627.0 2451179.5 # Valid to these dates +psLib.time.before.xp F64 0.0 # Value of XP for before the earliest MJD +psLib.time.before.yp F64 0.0 # Value of YP for before the earliest MJD +psLib.time.before.dut F64 0.0 # Value of UT1-UTC for before the earliest MJD + +# Now follows formulae for predicting ahead of the most recent available table entry. +# xp = [0] + [1]*cos A + [2]*sin A + [3]*cos C + [4]*sin C +# yp = [0] + [1]*cos A + [2]*sin A + [3]*cos C + [4]*sin C +# A = 2*pi*(MJD - pslib.time.predict.mjd)/365.25 +# C = 2*pi*(MJD - pslib.time.predict.mjd)/435.0 +# dut = ut1-utc = [0] + [1]*(MJD - [2]) - (UT2-UT1) +# ut2-ut1 = 0.022 sin(2*pi*T) - 0.012 cos(2*pi*T) - 0.006 sin(4*pi*T) + 0.007 cos(4*pi*T) +# T = 2000.0 + (MJD - 51544.03)/365.2422 +@psLib.time.predict.xp F64 0.0569, 0.0555, -0.0200, 0.0513, 0.1483 +@psLib.time.predict.yp F64 0.3498, -0.0176, -0.0498, 0.1483, -0.0513 +psLib.time.predict.mjd F64 53257.0 +@psLib.time.predict.dut F64 -0.4944, -0.00023, 53262.0 + Index: /trunk/psLib/test/astronomy/data/test.psTime.config4.template =================================================================== --- /trunk/psLib/test/astronomy/data/test.psTime.config4.template (revision 3246) +++ /trunk/psLib/test/astronomy/data/test.psTime.config4.template (revision 3246) @@ -0,0 +1,23 @@ +# This configuration file specifies values required for time calculations by psLib. +psLib.time.tables.dir STR PREFIX # Directory for time tables +psLib.time.tables.n S32 1 # Number of time tables +psLib.time.tables.files STR test.ser7.dat # This the table file +@psLib.time.tables.from F64 53258.0 # Valid from this date +@psLib.time.tables.to F64 53622.0 # Valid to this date +psLib.time.before.xp F64 0.0 # Value of XP for before the earliest MJD +psLib.time.before.yp F64 0.0 # Value of YP for before the earliest MJD +psLib.time.before.dut F64 0.0 # Value of UT1-UTC for before the earliest MJD + +# Now follows formulae for predicting ahead of the most recent available table entry. +# xp = [0] + [1]*cos A + [2]*sin A + [3]*cos C + [4]*sin C +# yp = [0] + [1]*cos A + [2]*sin A + [3]*cos C + [4]*sin C +# A = 2*pi*(MJD - pslib.time.predict.mjd)/365.25 +# C = 2*pi*(MJD - pslib.time.predict.mjd)/435.0 +# dut = ut1-utc = [0] + [1]*(MJD - [2]) - (UT2-UT1) +# ut2-ut1 = 0.022 sin(2*pi*T) - 0.012 cos(2*pi*T) - 0.006 sin(4*pi*T) + 0.007 cos(4*pi*T) +# T = 2000.0 + (MJD - 51544.03)/365.2422 +@psLib.time.predict.xp F64 0.0569 +@psLib.time.predict.yp F64 0.3498 +psLib.time.predict.mjd F64 53257.0 +@psLib.time.predict.dut F64 -0.4944 + Index: /trunk/psLib/test/astronomy/data/test.ser7.dat =================================================================== --- /trunk/psLib/test/astronomy/data/test.ser7.dat (revision 3246) +++ /trunk/psLib/test/astronomy/data/test.ser7.dat (revision 3246) @@ -0,0 +1,380 @@ +# ser7.dat +# +# This file comes from http://maia.usno.navy.mil (Click on General Information about Earth Orientation). This +# file may also be directly downloaded from ftp://maia.usno.navy.mil/ser7/ser7.dat. See readme.ser7 (located +# in the psLib/data directory) for details. +# +# @author Ross Harman, MHPCC +# +# @version $Revision: 1.1 $ $Name: not supported by cvs2svn $ +# @date $Date: 2005-02-17 01:58:43 $ +# +# +# MJD PM-x PM-y UT1-UTC +# (days) (arcsec) (arcsec) (sec) + psF64 psF64 psF64 psF64 + 53yyy244 0.1377 0.5027 -0.45210 + 53245 0.1394 0.5015 -0.45190 + 53246 0.1411 0.5002 -0.45197 + 53247 0.1429 0.4989 -0.45234 + 53248 0.1447 0.4976 -0.45293 + 53249 0.1465 0.4962 -0.45361 + 53250 0.1484 0.4948 -0.45424 + 53251 0.1503 0.4934 -0.45476 + 53252 0.1521 0.4920 -0.45512 + 53253 0.1540 0.4905 -0.45530 + 53254 0.1558 0.4890 -0.45531 + 53255 0.1577 0.4874 -0.45519 + 53256 0.1595 0.4859 -0.45497 + 53257 0.1613 0.4843 -0.45474 + 53258 0.1631 0.4827 -0.45458 + 53259 0.1649 0.4810 -0.45456 + 53260 0.1667 0.4794 -0.45474 + 53261 0.1684 0.4777 -0.45514 + 53262 0.1701 0.4760 -0.45578 + 53263 0.1717 0.4742 -0.45660 + 53264 0.1734 0.4725 -0.45754 + 53265 0.1750 0.4707 -0.45849 + 53266 0.1765 0.4689 -0.45932 + 53267 0.1780 0.4671 -0.45996 + 53268 0.1795 0.4652 -0.46036 + 53269 0.1810 0.4634 -0.46055 + 53270 0.1824 0.4615 -0.46061 + 53271 0.1838 0.4596 -0.46068 + 53272 0.1852 0.4576 -0.46086 + 53273 0.1865 0.4557 -0.46126 + 53274 0.1878 0.4537 -0.46192 + 53275 0.1890 0.4517 -0.46280 + 53276 0.1902 0.4497 -0.46382 + 53277 0.1914 0.4477 -0.46486 + 53278 0.1925 0.4457 -0.46581 + 53279 0.1936 0.4436 -0.46658 + 53280 0.1946 0.4415 -0.46715 + 53281 0.1956 0.4394 -0.46750 + 53282 0.1966 0.4373 -0.46766 + 53283 0.1976 0.4352 -0.46772 + 53284 0.1985 0.4331 -0.46773 + 53285 0.1993 0.4309 -0.46778 + 53286 0.2001 0.4288 -0.46795 + 53287 0.2009 0.4266 -0.46830 + 53288 0.2017 0.4244 -0.46887 + 53289 0.2024 0.4222 -0.46968 + 53290 0.2031 0.4200 -0.47071 + 53291 0.2037 0.4178 -0.47191 + 53292 0.2043 0.4155 -0.47317 + 53293 0.2049 0.4133 -0.47435 + 53294 0.2054 0.4111 -0.47536 + 53295 0.2059 0.4088 -0.47610 + 53296 0.2063 0.4065 -0.47659 + 53297 0.2067 0.4042 -0.47691 + 53298 0.2071 0.4020 -0.47718 + 53299 0.2075 0.3997 -0.47755 + 53300 0.2078 0.3974 -0.47811 + 53301 0.2080 0.3951 -0.47893 + 53302 0.2083 0.3928 -0.47998 + 53303 0.2085 0.3905 -0.48119 + 53304 0.2086 0.3881 -0.48247 + 53305 0.2088 0.3858 -0.48369 + 53306 0.2089 0.3835 -0.48477 + 53307 0.2089 0.3812 -0.48565 + 53308 0.2090 0.3789 -0.48630 + 53309 0.2089 0.3765 -0.48674 + 53310 0.2089 0.3742 -0.48701 + 53311 0.2088 0.3719 -0.48718 + 53312 0.2088 0.3696 -0.48732 + 53313 0.2086 0.3672 -0.48753 + 53314 0.2085 0.3649 -0.48785 + 53315 0.2082 0.3626 -0.48835 + 53316 0.2080 0.3603 -0.48906 + 53317 0.2077 0.3579 -0.48997 + 53318 0.2074 0.3556 -0.49106 + 53319 0.2071 0.3533 -0.49226 + 53320 0.2067 0.3510 -0.49344 + 53321 0.2063 0.3487 -0.49449 + 53322 0.2059 0.3464 -0.49531 + 53323 0.2054 0.3441 -0.49585 + 53324 0.2049 0.3418 -0.49618 + 53325 0.2044 0.3396 -0.49639 + 53326 0.2038 0.3373 -0.49664 + 53327 0.2032 0.3350 -0.49705 + 53328 0.2026 0.3328 -0.49769 + 53329 0.2020 0.3305 -0.49854 + 53330 0.2013 0.3283 -0.49953 + 53331 0.2006 0.3261 -0.50058 + 53332 0.1999 0.3239 -0.50158 + 53333 0.1991 0.3217 -0.50243 + 53334 0.1983 0.3195 -0.50308 + 53335 0.1975 0.3173 -0.50350 + 53336 0.1967 0.3151 -0.50369 + 53337 0.1958 0.3130 -0.50370 + 53338 0.1949 0.3108 -0.50358 + 53339 0.1940 0.3087 -0.50342 + 53340 0.1931 0.3066 -0.50329 + 53341 0.1921 0.3045 -0.50327 + 53342 0.1911 0.3024 -0.50340 + 53343 0.1901 0.3004 -0.50372 + 53344 0.1890 0.2983 -0.50423 + 53345 0.1880 0.2963 -0.50493 + 53346 0.1869 0.2943 -0.50574 + 53347 0.1858 0.2923 -0.50660 + 53348 0.1846 0.2903 -0.50739 + 53349 0.1835 0.2883 -0.50808 + 53350 0.1823 0.2864 -0.50851 + 53351 0.1811 0.2844 -0.50870 + 53352 0.1799 0.2825 -0.50874 + 53353 0.1786 0.2807 -0.50875 + 53354 0.1773 0.2788 -0.50890 + 53355 0.1760 0.2769 -0.50927 + 53356 0.1747 0.2751 -0.50987 + 53357 0.1734 0.2733 -0.51064 + 53358 0.1720 0.2715 -0.51148 + 53359 0.1707 0.2698 -0.51228 + 53360 0.1693 0.2680 -0.51295 + 53361 0.1679 0.2663 -0.51342 + 53362 0.1664 0.2646 -0.51367 + 53363 0.1650 0.2629 -0.51371 + 53364 0.1635 0.2613 -0.51357 + 53365 0.1620 0.2596 -0.51330 + 53366 0.1605 0.2580 -0.51298 + 53367 0.1590 0.2565 -0.51268 + 53368 0.1575 0.2549 -0.51247 + 53369 0.1559 0.2534 -0.51241 + 53370 0.1543 0.2519 -0.51253 + 53371 0.1528 0.2504 -0.51283 + 53372 0.1511 0.2489 -0.51331 + 53373 0.1495 0.2475 -0.51391 + 53374 0.1479 0.2461 -0.51458 + 53375 0.1463 0.2447 -0.51522 + 53376 0.1446 0.2434 -0.51574 + 53377 0.1429 0.2420 -0.51605 + 53378 0.1412 0.2407 -0.51614 + 53379 0.1395 0.2395 -0.51605 + 53380 0.1378 0.2382 -0.51590 + 53381 0.1361 0.2370 -0.51585 + 53382 0.1344 0.2358 -0.51603 + 53383 0.1326 0.2347 -0.51648 + 53384 0.1308 0.2335 -0.51717 + 53385 0.1291 0.2324 -0.51800 + 53386 0.1273 0.2313 -0.51881 + 53387 0.1255 0.2303 -0.51951 + 53388 0.1237 0.2293 -0.52000 + 53389 0.1219 0.2283 -0.52027 + 53390 0.1200 0.2273 -0.52032 + 53391 0.1182 0.2264 -0.52018 + 53392 0.1164 0.2255 -0.51992 + 53393 0.1145 0.2246 -0.51959 + 53394 0.1126 0.2237 -0.51928 + 53395 0.1108 0.2229 -0.51905 + 53396 0.1089 0.2221 -0.51897 + 53397 0.1070 0.2213 -0.51908 + 53398 0.1051 0.2206 -0.51939 + 53399 0.1032 0.2199 -0.51987 + 53400 0.1013 0.2192 -0.52050 + 53401 0.0994 0.2186 -0.52119 + 53402 0.0975 0.2180 -0.52187 + 53403 0.0956 0.2174 -0.52246 + 53404 0.0936 0.2168 -0.52288 + 53405 0.0917 0.2163 -0.52309 + 53406 0.0898 0.2158 -0.52311 + 53407 0.0878 0.2153 -0.52305 + 53408 0.0859 0.2149 -0.52303 + 53409 0.0840 0.2144 -0.52321 + 53410 0.0820 0.2141 -0.52368 + 53411 0.0801 0.2137 -0.52444 + 53412 0.0781 0.2134 -0.52542 + 53413 0.0761 0.2131 -0.52646 + 53414 0.0742 0.2128 -0.52744 + 53415 0.0722 0.2126 -0.52822 + 53416 0.0703 0.2124 -0.52877 + 53417 0.0683 0.2122 -0.52907 + 53418 0.0663 0.2120 -0.52916 + 53419 0.0644 0.2119 -0.52910 + 53420 0.0624 0.2118 -0.52897 + 53421 0.0605 0.2117 -0.52883 + 53422 0.0585 0.2117 -0.52876 + 53423 0.0566 0.2117 -0.52882 + 53424 0.0546 0.2117 -0.52907 + 53425 0.0526 0.2118 -0.52951 + 53426 0.0507 0.2118 -0.53014 + 53427 0.0487 0.2119 -0.53091 + 53428 0.0468 0.2121 -0.53174 + 53429 0.0449 0.2122 -0.53254 + 53430 0.0429 0.2124 -0.53321 + 53431 0.0410 0.2126 -0.53368 + 53432 0.0391 0.2129 -0.53392 + 53433 0.0372 0.2131 -0.53393 + 53434 0.0352 0.2134 -0.53380 + 53435 0.0333 0.2138 -0.53366 + 53436 0.0314 0.2141 -0.53365 + 53437 0.0296 0.2145 -0.53389 + 53438 0.0277 0.2149 -0.53443 + 53439 0.0258 0.2154 -0.53526 + 53440 0.0239 0.2159 -0.53627 + 53441 0.0221 0.2164 -0.53733 + 53442 0.0202 0.2169 -0.53830 + 53443 0.0184 0.2174 -0.53908 + 53444 0.0166 0.2180 -0.53964 + 53445 0.0147 0.2186 -0.53998 + 53446 0.0129 0.2192 -0.54014 + 53447 0.0111 0.2198 -0.54018 + 53448 0.0093 0.2205 -0.54018 + 53449 0.0076 0.2212 -0.54022 + 53450 0.0058 0.2219 -0.54037 + 53451 0.0040 0.2227 -0.54069 + 53452 0.0023 0.2234 -0.54118 + 53453 0.0005 0.2242 -0.54185 + 53454 -0.0012 0.2250 -0.54266 + 53455 -0.0029 0.2258 -0.54356 + 53456 -0.0046 0.2267 -0.54447 + 53457 -0.0063 0.2276 -0.54530 + 53458 -0.0079 0.2285 -0.54598 + 53459 -0.0096 0.2294 -0.54647 + 53460 -0.0112 0.2303 -0.54675 + 53461 -0.0128 0.2313 -0.54688 + 53462 -0.0144 0.2323 -0.54699 + 53463 -0.0160 0.2333 -0.54724 + 53464 -0.0176 0.2343 -0.54775 + 53465 -0.0191 0.2353 -0.54858 + 53466 -0.0207 0.2364 -0.54970 + 53467 -0.0222 0.2375 -0.55097 + 53468 -0.0237 0.2386 -0.55228 + 53469 -0.0252 0.2397 -0.55354 + 53470 -0.0267 0.2408 -0.55465 + 53471 -0.0281 0.2420 -0.55556 + 53472 -0.0295 0.2431 -0.55626 + 53473 -0.0310 0.2443 -0.55677 + 53474 -0.0323 0.2455 -0.55715 + 53475 -0.0337 0.2468 -0.55748 + 53476 -0.0351 0.2480 -0.55785 + 53477 -0.0364 0.2493 -0.55833 + 53478 -0.0377 0.2505 -0.55899 + 53479 -0.0390 0.2518 -0.55988 + 53480 -0.0403 0.2531 -0.56095 + 53481 -0.0415 0.2545 -0.56216 + 53482 -0.0427 0.2558 -0.56347 + 53483 -0.0439 0.2572 -0.56478 + 53484 -0.0451 0.2585 -0.56599 + 53485 -0.0463 0.2599 -0.56699 + 53486 -0.0474 0.2613 -0.56769 + 53487 -0.0485 0.2627 -0.56808 + 53488 -0.0496 0.2641 -0.56824 + 53489 -0.0507 0.2656 -0.56830 + 53490 -0.0517 0.2670 -0.56839 + 53491 -0.0527 0.2685 -0.56860 + 53492 -0.0537 0.2700 -0.56897 + 53493 -0.0547 0.2714 -0.56955 + 53494 -0.0556 0.2729 -0.57032 + 53495 -0.0565 0.2744 -0.57119 + 53496 -0.0574 0.2760 -0.57204 + 53497 -0.0583 0.2775 -0.57277 + 53498 -0.0591 0.2790 -0.57329 + 53499 -0.0600 0.2806 -0.57354 + 53500 -0.0607 0.2821 -0.57350 + 53501 -0.0615 0.2837 -0.57328 + 53502 -0.0622 0.2853 -0.57298 + 53503 -0.0630 0.2869 -0.57261 + 53504 -0.0636 0.2885 -0.57218 + 53505 -0.0643 0.2901 -0.57175 + 53506 -0.0649 0.2917 -0.57143 + 53507 -0.0655 0.2933 -0.57124 + 53508 -0.0661 0.2949 -0.57117 + 53509 -0.0667 0.2966 -0.57124 + 53510 -0.0672 0.2982 -0.57139 + 53511 -0.0677 0.2999 -0.57158 + 53512 -0.0682 0.3015 -0.57166 + 53513 -0.0686 0.3032 -0.57155 + 53514 -0.0690 0.3048 -0.57116 + 53515 -0.0694 0.3065 -0.57057 + 53516 -0.0698 0.3082 -0.56989 + 53517 -0.0701 0.3098 -0.56921 + 53518 -0.0704 0.3115 -0.56860 + 53519 -0.0707 0.3132 -0.56818 + 53520 -0.0710 0.3149 -0.56799 + 53521 -0.0712 0.3166 -0.56800 + 53522 -0.0714 0.3183 -0.56809 + 53523 -0.0716 0.3200 -0.56815 + 53524 -0.0717 0.3217 -0.56808 + 53525 -0.0718 0.3234 -0.56781 + 53526 -0.0719 0.3251 -0.56728 + 53527 -0.0720 0.3268 -0.56651 + 53528 -0.0720 0.3285 -0.56557 + 53529 -0.0720 0.3302 -0.56454 + 53530 -0.0720 0.3319 -0.56347 + 53531 -0.0720 0.3336 -0.56244 + 53532 -0.0719 0.3353 -0.56148 + 53533 -0.0718 0.3370 -0.56060 + 53534 -0.0717 0.3387 -0.55990 + 53535 -0.0715 0.3404 -0.55943 + 53536 -0.0713 0.3421 -0.55916 + 53537 -0.0711 0.3438 -0.55897 + 53538 -0.0709 0.3455 -0.55881 + 53539 -0.0707 0.3472 -0.55859 + 53540 -0.0704 0.3489 -0.55820 + 53541 -0.0701 0.3506 -0.55751 + 53542 -0.0697 0.3523 -0.55650 + 53543 -0.0694 0.3540 -0.55529 + 53544 -0.0690 0.3557 -0.55402 + 53545 -0.0686 0.3573 -0.55279 + 53546 -0.0682 0.3590 -0.55173 + 53547 -0.0677 0.3607 -0.55093 + 53548 -0.0673 0.3623 -0.55037 + 53549 -0.0668 0.3640 -0.54994 + 53550 -0.0662 0.3656 -0.54947 + 53551 -0.0657 0.3673 -0.54884 + 53552 -0.0651 0.3689 -0.54798 + 53553 -0.0645 0.3705 -0.54689 + 53554 -0.0639 0.3721 -0.54560 + 53555 -0.0633 0.3738 -0.54414 + 53556 -0.0626 0.3754 -0.54257 + 53557 -0.0620 0.3770 -0.54101 + 53558 -0.0613 0.3786 -0.53952 + 53559 -0.0605 0.3801 -0.53819 + 53560 -0.0598 0.3817 -0.53705 + 53561 -0.0590 0.3833 -0.53611 + 53562 -0.0583 0.3848 -0.53535 + 53563 -0.0575 0.3864 -0.53475 + 53564 -0.0566 0.3879 -0.53425 + 53565 -0.0558 0.3895 -0.53374 + 53566 -0.0549 0.3910 -0.53315 + 53567 -0.0541 0.3925 -0.53243 + 53568 -0.0532 0.3940 -0.53152 + 53569 -0.0523 0.3955 -0.53042 + 53570 -0.0513 0.3969 -0.52913 + 53571 -0.0504 0.3984 -0.52776 + 53572 -0.0494 0.3998 -0.52644 + 53573 -0.0485 0.4013 -0.52532 + 53574 -0.0475 0.4027 -0.52451 + 53575 -0.0464 0.4041 -0.52400 + 53576 -0.0454 0.4055 -0.52377 + 53577 -0.0444 0.4069 -0.52366 + 53578 -0.0433 0.4083 -0.52344 + 53579 -0.0423 0.4096 -0.52299 + 53580 -0.0412 0.4110 -0.52228 + 53581 -0.0401 0.4123 -0.52130 + 53582 -0.0390 0.4136 -0.52010 + 53583 -0.0378 0.4149 -0.51872 + 53584 -0.0367 0.4162 -0.51725 + 53585 -0.0356 0.4175 -0.51578 + 53586 -0.0344 0.4188 -0.51436 + 53587 -0.0332 0.4200 -0.51310 + 53588 -0.0320 0.4212 -0.51204 + 53589 -0.0309 0.4224 -0.51120 + 53590 -0.0297 0.4236 -0.51055 + 53591 -0.0284 0.4248 -0.51006 + 53592 -0.0272 0.4260 -0.50966 + 53593 -0.0260 0.4271 -0.50922 + 53594 -0.0247 0.4283 -0.50872 + 53595 -0.0235 0.4294 -0.50809 + 53596 -0.0222 0.4305 -0.50729 + 53597 -0.0210 0.4315 -0.50638 + 53598 -0.0197 0.4326 -0.50535 + 53599 -0.0184 0.4336 -0.50431 + 53600 -0.0171 0.4347 -0.50339 + 53601 -0.0158 0.4357 -0.50273 + 53602 -0.0145 0.4367 -0.50244 + 53603 -0.0132 0.4376 -0.50247 + 53604 -0.0119 0.4386 -0.50267 + 53605 -0.0106 0.4395 -0.50286 + 53606 -0.0093 0.4404 -0.50287 + 53607 -0.0079 0.4413 -0.50263 + 53608 -0.0066 0.4422 -0.50217 Index: unk/psLib/test/astronomy/header_1.fits =================================================================== --- /trunk/psLib/test/astronomy/header_1.fits (revision 3245) +++ (revision ) @@ -1,1 +1,0 @@ -SIMPLE = T / file does conform to FITS standard BITPIX = 8 / number of bits per data pixel NAXIS = 0 / number of data axes HISTORY File modified by user 'harman' with fv on 2004-08-04T11:11:18 END Index: unk/psLib/test/astronomy/header_2.fits =================================================================== --- /trunk/psLib/test/astronomy/header_2.fits (revision 3245) +++ (revision ) @@ -1,1 +1,0 @@ -SIMPLE = T / file does conform to FITS standard BITPIX = -64 / number of bits per data pixel NAXIS = 1 / number of data axes NAXIS1 = 64 / length of data axis 1 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= 'IMAGE ' / IMAGE extension BITPIX = -64 / number of bits per data pixel NAXIS = 1 / number of data axes NAXIS1 = 64 / length of data axis 1 PCOUNT = 0 / required keyword; must = 0 GCOUNT = 1 / required keyword; must = 1 BITPIX = -64 / number of bits per data pixel EXTNAME = 'MY_DATA_1' HISTORY File modified by user 'harman' with fv on 2004-08-04T13:14:45 HISTORY File modified by user 'harman' with fv on 2004-08-04T13:15:29 HISTORY File modified by user 'harman' with fv on 2004-08-04T13:21:18 HISTORY File modified by user 'harman' with fv on 2004-08-04T13:21:46 END XTENSION= 'IMAGE ' / IMAGE extension BITPIX = -64 / number of bits per data pixel NAXIS = 1 / number of data axes NAXIS1 = 64 / length of data axis 1 PCOUNT = 0 / required keyword; must = 0 GCOUNT = 1 / required keyword; must = 1 EXTNAME = 'MY_DATA_2' HISTORY File modified by user 'harman' with fv on 2004-08-04T13:22:12 HISTORY File modified by user 'harman' with fv on 2004-08-04T13:22:52 END Index: unk/psLib/test/astronomy/test.config =================================================================== --- /trunk/psLib/test/astronomy/test.config (revision 3245) +++ (revision ) @@ -1,129 +1,0 @@ -########################################################################################################## -# test.config -# -# This is a sample metadata configuration file used to test the metadata configuration file parser. -# It tests both positive and negative cases as described in the comments below. -# -# author Ross Harman, MHPCC -# -# version $Revision: 1.2 $ $Name: not supported by cvs2svn $ -# date $Date: 2004-10-06 22:51:52 $ -# -# Copyright 2004 Maui High Performance Computing Center, University of Hawaii -########################################################################################################## -# -# -# -########## Test 1 ########## -# Lines beginning with # are comments. The line below, as well as those above are comments. They should be ignored by the parser. -# I am a comment. -# -# -# -########## Test 2 ########## -# The line below is a comment that begins with some whitespace. It should be ignored by the parser. - # Another comment -# -# -# -########## Test 3 ########## -# The line below is completely blank except for a carriage return. It should be ignored by the parser. - -# -# -# -########## Test 4 ########## -# The line below consists of spaces and tabs (whitespace). It should be ignored by the parser. - -# -# -# -########## Test 5 ########## -# The line below consists of a variable name, type, value, and trailing comment. It should be read by the parser -pi F64 3.1415926535897932384626433832795029 # Definition of pi -# -# -# -########## Test 6 ########## -# The line below consists of a variable name, type, and value, but without a trailing comment. It should be read by the parser. -altitude S32 10000 -# -# -# -########## Test 7 ########## -# The lines below contain variations in name, type, value, trailing comment, and whitespace. They should all be read by the parser. - time F32 1234.5678 - myBool BOOL F # F, f, 0, T, t, 1 are also acceptable -title1 STR Hello world #This is a comment for the string value - title2 STRING Good bye world # STRING or STR may be used as the string type -# -# -# -########## Test 8 ########## -# The line below creates a vector. It should be read by the parser. -@primes S32 2, 3, 5, 7, 11, 13, 17 # These are prime numbers -# -# -# -########## Test 9 ########## -# The line below creates a vector with commas mixed with spaces in the values. It should be read by the parser. -@negatives S32 -1, -2 -3 -4, -5, -6, -7 -# -# -# -########## Test 10 ########## -# The lines below should create a folder node with children that are strings. They should be read by the parser. -comment * -comment STR This -comment STR is -comment STR an -comment STR ugly -comment STR comment -comment STR but -comment STR still -comment STR valid -# -# -# -########## Test 11 ########## -# The line below contains an incorrect value. It should produce an error. -xPosition F64 9876.54qqq32 -# -# -# -########## Test 12 ########## -# The line below contains no value. It should produce an error. -yPosition F64 -# -# -# -########## Test 13 ########## -# The line below contains no type. It should produce an error. -zPosition 99.999 -# -# -# -########## Test 14 ########## -# The line below contains two * characters. It should produce an error. -aPosition ** -# -# -# -########## Test 15 ########## -# The line below contains two @ characters. It should produce an error. -@@bPosition F64 22.33 -# -# -# -########## Test 16 ########## -# The line below contains a ~ character used for special processing. It should produce an error. -range F64 140.0 ~ -# -# -# -########## Test 17 ########## -# The variable name below is repeated. It should produce an error if the overwrite function argument is set to false. -# If overwrite is true, then the last name and value will be stored and there will be no error. -speed F32 55.55 -speed F32 66.66 - Index: unk/psLib/test/astronomy/test.psTime.config1.template =================================================================== --- /trunk/psLib/test/astronomy/test.psTime.config1.template (revision 3245) +++ (revision ) @@ -1,23 +1,0 @@ -# This configuration file specifies values required for time calculations by psLib. -psLib.time.tables.dir STR bogus # Directory for time tables -psLib.time.tables.n S32 4 # Number of time tables -psLib.time.tables.files STR ser7.dat eopc01_1900_2004.dat finals_all.dat tai_utc.dat # These are the table file names -@psLib.time.tables.from F64 53258.0, 15020.0, 41684.0 2437300.5 # Valid from these dates -@psLib.time.tables.to F64 53622.0, 53258.0, 53627.0 2451179.5 # Valid to these dates -psLib.time.before.xp F64 0.0 # Value of XP for before the earliest MJD -psLib.time.before.yp F64 0.0 # Value of YP for before the earliest MJD -psLib.time.before.dut F64 0.0 # Value of UT1-UTC for before the earliest MJD - -# Now follows formulae for predicting ahead of the most recent available table entry. -# xp = [0] + [1]*cos A + [2]*sin A + [3]*cos C + [4]*sin C -# yp = [0] + [1]*cos A + [2]*sin A + [3]*cos C + [4]*sin C -# A = 2*pi*(MJD - pslib.time.predict.mjd)/365.25 -# C = 2*pi*(MJD - pslib.time.predict.mjd)/435.0 -# dut = ut1-utc = [0] + [1]*(MJD - [2]) - (UT2-UT1) -# ut2-ut1 = 0.022 sin(2*pi*T) - 0.012 cos(2*pi*T) - 0.006 sin(4*pi*T) + 0.007 cos(4*pi*T) -# T = 2000.0 + (MJD - 51544.03)/365.2422 -@psLib.time.predict.xp F64 0.0569, 0.0555, -0.0200, 0.0513, 0.1483 -@psLib.time.predict.yp F64 0.3498, -0.0176, -0.0498, 0.1483, -0.0513 -psLib.time.predict.mjd F64 53257.0 -@psLib.time.predict.dut F64 -0.4944, -0.00023, 53262.0 - Index: unk/psLib/test/astronomy/test.psTime.config2.template =================================================================== --- /trunk/psLib/test/astronomy/test.psTime.config2.template (revision 3245) +++ (revision ) @@ -1,23 +1,0 @@ -# This configuration file specifies values required for time calculations by psLib. -psLib.time.tables.dir STR PREFIX/share/pslib # Directory for time tables -psLib.time.tables.n S32 4 # Number of time tables -psLib.time.tables.files STR eopc01_1900_2004.dat finals_all.dat tai_utc.dat # These are the table file names -@psLib.time.tables.from F64 53258.0, 15020.0, 41684.0 2437300.5 # Valid from these dates -@psLib.time.tables.to F64 53622.0, 53258.0, 53627.0 2451179.5 # Valid to these dates -psLib.time.before.xp F64 0.0 # Value of XP for before the earliest MJD -psLib.time.before.yp F64 0.0 # Value of YP for before the earliest MJD -psLib.time.before.dut F64 0.0 # Value of UT1-UTC for before the earliest MJD - -# Now follows formulae for predicting ahead of the most recent available table entry. -# xp = [0] + [1]*cos A + [2]*sin A + [3]*cos C + [4]*sin C -# yp = [0] + [1]*cos A + [2]*sin A + [3]*cos C + [4]*sin C -# A = 2*pi*(MJD - pslib.time.predict.mjd)/365.25 -# C = 2*pi*(MJD - pslib.time.predict.mjd)/435.0 -# dut = ut1-utc = [0] + [1]*(MJD - [2]) - (UT2-UT1) -# ut2-ut1 = 0.022 sin(2*pi*T) - 0.012 cos(2*pi*T) - 0.006 sin(4*pi*T) + 0.007 cos(4*pi*T) -# T = 2000.0 + (MJD - 51544.03)/365.2422 -@psLib.time.predict.xp F64 0.0569, 0.0555, -0.0200, 0.0513, 0.1483 -@psLib.time.predict.yp F64 0.3498, -0.0176, -0.0498, 0.1483, -0.0513 -psLib.time.predict.mjd F64 53257.0 -@psLib.time.predict.dut F64 -0.4944, -0.00023, 53262.0 - Index: unk/psLib/test/astronomy/test.psTime.config3.template =================================================================== --- /trunk/psLib/test/astronomy/test.psTime.config3.template (revision 3245) +++ (revision ) @@ -1,23 +1,0 @@ -# This configuration file specifies values required for time calculations by psLib. -psLib.time.tables.dir STR PREFIX/share/pslib # Directory for time tables -psLib.time.tables.n S32 4 # Number of time tables -psLib.time.tables.files STR ser7.dat eopc01_1900_2004.dat finals_all.dat tai_utc.dat # These are the table file names -@psLib.time.tables.from F64 15020.0, 41684.0 2437300.5 # Valid from these dates -@psLib.time.tables.to F64 53622.0, 53258.0, 53627.0 2451179.5 # Valid to these dates -psLib.time.before.xp F64 0.0 # Value of XP for before the earliest MJD -psLib.time.before.yp F64 0.0 # Value of YP for before the earliest MJD -psLib.time.before.dut F64 0.0 # Value of UT1-UTC for before the earliest MJD - -# Now follows formulae for predicting ahead of the most recent available table entry. -# xp = [0] + [1]*cos A + [2]*sin A + [3]*cos C + [4]*sin C -# yp = [0] + [1]*cos A + [2]*sin A + [3]*cos C + [4]*sin C -# A = 2*pi*(MJD - pslib.time.predict.mjd)/365.25 -# C = 2*pi*(MJD - pslib.time.predict.mjd)/435.0 -# dut = ut1-utc = [0] + [1]*(MJD - [2]) - (UT2-UT1) -# ut2-ut1 = 0.022 sin(2*pi*T) - 0.012 cos(2*pi*T) - 0.006 sin(4*pi*T) + 0.007 cos(4*pi*T) -# T = 2000.0 + (MJD - 51544.03)/365.2422 -@psLib.time.predict.xp F64 0.0569, 0.0555, -0.0200, 0.0513, 0.1483 -@psLib.time.predict.yp F64 0.3498, -0.0176, -0.0498, 0.1483, -0.0513 -psLib.time.predict.mjd F64 53257.0 -@psLib.time.predict.dut F64 -0.4944, -0.00023, 53262.0 - Index: unk/psLib/test/astronomy/test.psTime.config4.template =================================================================== --- /trunk/psLib/test/astronomy/test.psTime.config4.template (revision 3245) +++ (revision ) @@ -1,23 +1,0 @@ -# This configuration file specifies values required for time calculations by psLib. -psLib.time.tables.dir STR . # Directory for time tables -psLib.time.tables.n S32 1 # Number of time tables -psLib.time.tables.files STR test.ser7.dat # This the table file -@psLib.time.tables.from F64 53258.0 # Valid from this date -@psLib.time.tables.to F64 53622.0 # Valid to this date -psLib.time.before.xp F64 0.0 # Value of XP for before the earliest MJD -psLib.time.before.yp F64 0.0 # Value of YP for before the earliest MJD -psLib.time.before.dut F64 0.0 # Value of UT1-UTC for before the earliest MJD - -# Now follows formulae for predicting ahead of the most recent available table entry. -# xp = [0] + [1]*cos A + [2]*sin A + [3]*cos C + [4]*sin C -# yp = [0] + [1]*cos A + [2]*sin A + [3]*cos C + [4]*sin C -# A = 2*pi*(MJD - pslib.time.predict.mjd)/365.25 -# C = 2*pi*(MJD - pslib.time.predict.mjd)/435.0 -# dut = ut1-utc = [0] + [1]*(MJD - [2]) - (UT2-UT1) -# ut2-ut1 = 0.022 sin(2*pi*T) - 0.012 cos(2*pi*T) - 0.006 sin(4*pi*T) + 0.007 cos(4*pi*T) -# T = 2000.0 + (MJD - 51544.03)/365.2422 -@psLib.time.predict.xp F64 0.0569 -@psLib.time.predict.yp F64 0.3498 -psLib.time.predict.mjd F64 53257.0 -@psLib.time.predict.dut F64 -0.4944 - Index: /trunk/psLib/test/astronomy/tst_psAstrometry.c =================================================================== --- /trunk/psLib/test/astronomy/tst_psAstrometry.c (revision 3245) +++ /trunk/psLib/test/astronomy/tst_psAstrometry.c (revision 3246) @@ -5,6 +5,6 @@ * @author Robert DeSonia, MHPCC * - * @version $Revision: 1.13 $ $Name: not supported by cvs2svn $ - * @date $Date: 2005-02-16 00:22:05 $ + * @version $Revision: 1.14 $ $Name: not supported by cvs2svn $ + * @date $Date: 2005-02-17 01:58:43 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii @@ -129,4 +129,5 @@ { char* name = "The Kaiser Royal Observatory"; + psObservatory* obs = psObservatoryAlloc(name, 20.7*M_PI/180.0, 156.3*M_PI/180.0, 3055.0, 9.0); Index: /trunk/psLib/test/astronomy/tst_psMetadata_04.c =================================================================== --- /trunk/psLib/test/astronomy/tst_psMetadata_04.c (revision 3245) +++ /trunk/psLib/test/astronomy/tst_psMetadata_04.c (revision 3246) @@ -23,6 +23,6 @@ * @author Ross Harman, MHPCC * -* @version $Revision: 1.12 $ $Name: not supported by cvs2svn $ -* @date $Date: 2005-02-03 00:54:12 $ +* @version $Revision: 1.13 $ $Name: not supported by cvs2svn $ +* @date $Date: 2005-02-17 01:58:43 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii @@ -165,5 +165,5 @@ printPositiveTestHeader(stdout, "psMetadata", "Test G - Lookup metadata item and return psS32 value"); psS32 valueS32 = 0; - valueS32 = psMetadataLookupS32(metadata, "myItem2", &status); + valueS32 = psMetadataLookupS32(&status, metadata, "myItem2"); if(valueS32 != 55) { printf("ERROR: Bad value, %d, Expected 55\n", valueS32); @@ -178,5 +178,5 @@ printPositiveTestHeader(stdout, "psMetadata", "Test H - Lookup metadata item and return psF64 value"); psF64 valueF64 = 0.0; - valueF64 = psMetadataLookupF64(metadata, "myItem5", &status); + valueF64 = psMetadataLookupF64(&status, metadata, "myItem5"); if(fabs(valueF64-3.14) > FLT_EPSILON) { printf("ERROR: Bad value, %g, Expected 3.14\n", valueF64); @@ -191,5 +191,5 @@ printPositiveTestHeader(stdout, "psMetadata", "Test I - Lookup metadata item and return psVector pointer"); psVector *valueVec = NULL; - valueVec = psMetadataLookupPtr(metadata, "myItem6", &status); + valueVec = psMetadataLookupPtr(&status, metadata, "myItem6"); if(valueVec != vec) { printf("ERROR: Bad vector pointer\n"); @@ -248,5 +248,5 @@ // Test N - Attempt get psS32 value of non-existant metadata item printPositiveTestHeader(stdout, "psMetadata", "Test N - Attempt get psS32 value of non-existant metadata item"); - valueS32 = psMetadataLookupS32(metadata, "myItem22", &status); + valueS32 = psMetadataLookupS32(&status, metadata, "myItem22"); if(status) { printf("ERROR: Bad status, %d, \n", status); @@ -257,5 +257,5 @@ // Test O - Attempt get psF64 value of non-existant metadata item printPositiveTestHeader(stdout, "psMetadata", "Test O - Attempt get psF64 value of non-existant metadata item"); - valueF64 = psMetadataLookupF64(metadata, "myItem22", &status); + valueF64 = psMetadataLookupF64(&status, metadata, "myItem22"); if(status) { printf("ERROR: Bad status, %d, \n", status); @@ -266,5 +266,5 @@ // Test P - Attempt get psVector value of non-existant metadata item printPositiveTestHeader(stdout, "psMetadata", "Test P - Attempt get psVector value of non-existant metadata item"); - valueVec = psMetadataLookupPtr(metadata, "myItem22", &status); + valueVec = psMetadataLookupPtr(&status, metadata, "myItem22"); if(status) { printf("ERROR: Bad status, %d, \n", status); Index: /trunk/psLib/test/astronomy/tst_psMetadata_05.c =================================================================== --- /trunk/psLib/test/astronomy/tst_psMetadata_05.c (revision 3245) +++ /trunk/psLib/test/astronomy/tst_psMetadata_05.c (revision 3246) @@ -22,6 +22,6 @@ * @author Ross Harman, MHPCC * -* @version $Revision: 1.17 $ $Name: not supported by cvs2svn $ -* @date $Date: 2005-02-03 00:54:12 $ +* @version $Revision: 1.18 $ $Name: not supported by cvs2svn $ +* @date $Date: 2005-02-17 01:58:43 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii @@ -161,5 +161,5 @@ // Test F - Write metadata item to file printPositiveTestHeader(stdout, "psMetadata", "Test F - Write metadata item to file"); - fd = fopen("./tst_psMetadata05_OUT", "w"); + fd = fopen("temp/tst_psMetadata05_OUT", "w"); if(fd == NULL) { printf("ERROR: Couldn't open file for writing\n"); @@ -198,5 +198,5 @@ fclose(fd); - fd = fopen("./tst_psMetadata05_OUT", "r"); + fd = fopen("temp/tst_psMetadata05_OUT", "r"); if(fd == NULL) { printf("ERROR: Couldn't open file for reading\n"); Index: /trunk/psLib/test/astronomy/tst_psTime_01.c =================================================================== --- /trunk/psLib/test/astronomy/tst_psTime_01.c (revision 3245) +++ /trunk/psLib/test/astronomy/tst_psTime_01.c (revision 3246) @@ -23,6 +23,6 @@ * @author Ross Harman, MHPCC * - * @version $Revision: 1.18 $ $Name: not supported by cvs2svn $ - * @date $Date: 2005-02-03 00:54:12 $ + * @version $Revision: 1.19 $ $Name: not supported by cvs2svn $ + * @date $Date: 2005-02-17 01:58:43 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii @@ -38,4 +38,6 @@ psTime *testTime; char *testString = "2004-07-21T18:22:24.272Z"; + + psLibInit(true,"psTime.config"); // Test time was taken at July 21, 2004 at 18:22:24.272044 Index: /trunk/psLib/test/astronomy/tst_psTime_03.c =================================================================== --- /trunk/psLib/test/astronomy/tst_psTime_03.c (revision 3245) +++ /trunk/psLib/test/astronomy/tst_psTime_03.c (revision 3246) @@ -19,6 +19,6 @@ * @author Ross Harman, MHPCC * - * @version $Revision: 1.10 $ $Name: not supported by cvs2svn $ - * @date $Date: 2005-01-13 01:58:10 $ + * @version $Revision: 1.11 $ $Name: not supported by cvs2svn $ + * @date $Date: 2005-02-17 01:58:43 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii @@ -34,4 +34,6 @@ psS32 main(psS32 argc, char* argv[]) { + + psLibInit(true,"psTime.config"); // Test A - Add two times Index: /trunk/psLib/test/astronomy/tst_psTime_04.c =================================================================== --- /trunk/psLib/test/astronomy/tst_psTime_04.c (revision 3245) +++ /trunk/psLib/test/astronomy/tst_psTime_04.c (revision 3246) @@ -14,6 +14,6 @@ * @author Ross Harman, MHPCC * - * @version $Revision: 1.8 $ $Name: not supported by cvs2svn $ - * @date $Date: 2005-02-15 03:02:53 $ + * @version $Revision: 1.9 $ $Name: not supported by cvs2svn $ + * @date $Date: 2005-02-17 01:58:43 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii @@ -30,5 +30,5 @@ // Test A - Initialize time printPositiveTestHeader(stdout, "psTime", "Test A - Initialize time"); - psLibInit(true, p_psGetConfigFileName()); + psLibInit(true, "psTime.config"); psLibFinalize(); printFooter(stdout, "psTime", "Test A - Initialize time", true); @@ -45,5 +45,5 @@ printNegativeTestHeader(stdout,"psTime", "Test C - Attempt to open non-existant time data files", "Failed to open file 'zzz'. Check if it exists and it has the proper permissions.", 0); - psLibInit(true, "./test.psTime.config1"); + psLibInit(true, "test.psTime.config1"); psLibFinalize(); printFooter(stdout, "psTime", "Test C - Attempt to open non-existant time data files", true); @@ -53,5 +53,5 @@ printNegativeTestHeader(stdout,"psTime", "Test D - Attempt to read incorrect number of files", "Incorrect number of table files entered. Found: 3. Expected: 4.", 0); - psLibInit(true, "./test.psTime.config2"); + psLibInit(true, "test.psTime.config2"); psLibFinalize(); printFooter(stdout, "psTime", "Test D - Attempt to read incorrect number of files", true); @@ -61,5 +61,5 @@ printNegativeTestHeader(stdout,"psTime", "Test E - Attempt to read incorrect number of from values", "Incorrect vector size. Size: 3, Expected 4.", 0); - psLibInit(true, "./test.psTime.config3"); + psLibInit(true, "test.psTime.config3"); psLibFinalize(); printFooter(stdout, "psTime", "Test E - Attempt to read incorrect number of from values", true); @@ -69,5 +69,5 @@ printNegativeTestHeader(stdout,"psTime", "Test F - Attempt to read data file with typo in number", "Unable to parse string, number on line 16.", 0); - psLibInit(true, "./test.psTime.config4"); + psLibInit(true, "test.psTime.config4"); psLibFinalize(); printFooter(stdout, "psTime", "Test F - Attempt to read data file with typo in number", true); Index: /trunk/psLib/test/collections/tst_psMetadata_04.c =================================================================== --- /trunk/psLib/test/collections/tst_psMetadata_04.c (revision 3245) +++ /trunk/psLib/test/collections/tst_psMetadata_04.c (revision 3246) @@ -23,6 +23,6 @@ * @author Ross Harman, MHPCC * -* @version $Revision: 1.12 $ $Name: not supported by cvs2svn $ -* @date $Date: 2005-02-03 00:54:12 $ +* @version $Revision: 1.13 $ $Name: not supported by cvs2svn $ +* @date $Date: 2005-02-17 01:58:43 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii @@ -165,5 +165,5 @@ printPositiveTestHeader(stdout, "psMetadata", "Test G - Lookup metadata item and return psS32 value"); psS32 valueS32 = 0; - valueS32 = psMetadataLookupS32(metadata, "myItem2", &status); + valueS32 = psMetadataLookupS32(&status, metadata, "myItem2"); if(valueS32 != 55) { printf("ERROR: Bad value, %d, Expected 55\n", valueS32); @@ -178,5 +178,5 @@ printPositiveTestHeader(stdout, "psMetadata", "Test H - Lookup metadata item and return psF64 value"); psF64 valueF64 = 0.0; - valueF64 = psMetadataLookupF64(metadata, "myItem5", &status); + valueF64 = psMetadataLookupF64(&status, metadata, "myItem5"); if(fabs(valueF64-3.14) > FLT_EPSILON) { printf("ERROR: Bad value, %g, Expected 3.14\n", valueF64); @@ -191,5 +191,5 @@ printPositiveTestHeader(stdout, "psMetadata", "Test I - Lookup metadata item and return psVector pointer"); psVector *valueVec = NULL; - valueVec = psMetadataLookupPtr(metadata, "myItem6", &status); + valueVec = psMetadataLookupPtr(&status, metadata, "myItem6"); if(valueVec != vec) { printf("ERROR: Bad vector pointer\n"); @@ -248,5 +248,5 @@ // Test N - Attempt get psS32 value of non-existant metadata item printPositiveTestHeader(stdout, "psMetadata", "Test N - Attempt get psS32 value of non-existant metadata item"); - valueS32 = psMetadataLookupS32(metadata, "myItem22", &status); + valueS32 = psMetadataLookupS32(&status, metadata, "myItem22"); if(status) { printf("ERROR: Bad status, %d, \n", status); @@ -257,5 +257,5 @@ // Test O - Attempt get psF64 value of non-existant metadata item printPositiveTestHeader(stdout, "psMetadata", "Test O - Attempt get psF64 value of non-existant metadata item"); - valueF64 = psMetadataLookupF64(metadata, "myItem22", &status); + valueF64 = psMetadataLookupF64(&status, metadata, "myItem22"); if(status) { printf("ERROR: Bad status, %d, \n", status); @@ -266,5 +266,5 @@ // Test P - Attempt get psVector value of non-existant metadata item printPositiveTestHeader(stdout, "psMetadata", "Test P - Attempt get psVector value of non-existant metadata item"); - valueVec = psMetadataLookupPtr(metadata, "myItem22", &status); + valueVec = psMetadataLookupPtr(&status, metadata, "myItem22"); if(status) { printf("ERROR: Bad status, %d, \n", status); Index: /trunk/psLib/test/collections/tst_psMetadata_05.c =================================================================== --- /trunk/psLib/test/collections/tst_psMetadata_05.c (revision 3245) +++ /trunk/psLib/test/collections/tst_psMetadata_05.c (revision 3246) @@ -22,6 +22,6 @@ * @author Ross Harman, MHPCC * -* @version $Revision: 1.17 $ $Name: not supported by cvs2svn $ -* @date $Date: 2005-02-03 00:54:12 $ +* @version $Revision: 1.18 $ $Name: not supported by cvs2svn $ +* @date $Date: 2005-02-17 01:58:43 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii @@ -161,5 +161,5 @@ // Test F - Write metadata item to file printPositiveTestHeader(stdout, "psMetadata", "Test F - Write metadata item to file"); - fd = fopen("./tst_psMetadata05_OUT", "w"); + fd = fopen("temp/tst_psMetadata05_OUT", "w"); if(fd == NULL) { printf("ERROR: Couldn't open file for writing\n"); @@ -198,5 +198,5 @@ fclose(fd); - fd = fopen("./tst_psMetadata05_OUT", "r"); + fd = fopen("temp/tst_psMetadata05_OUT", "r"); if(fd == NULL) { printf("ERROR: Couldn't open file for reading\n"); Index: /trunk/psLib/test/dataIO/tst_psFits.c =================================================================== --- /trunk/psLib/test/dataIO/tst_psFits.c (revision 3245) +++ /trunk/psLib/test/dataIO/tst_psFits.c (revision 3246) @@ -6,6 +6,6 @@ * @author Robert DeSonia, MHPCC * -* @version $Revision: 1.15 $ $Name: not supported by cvs2svn $ -* @date $Date: 2005-02-03 00:54:12 $ +* @version $Revision: 1.16 $ $Name: not supported by cvs2svn $ +* @date $Date: 2005-02-17 01:58:43 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii @@ -623,9 +623,9 @@ // check for the extra metadata items - psS32 intItem = psMetadataLookupS32(header, "MYINT",NULL); - psF32 fltItem = psMetadataLookupF32(header, "MYFLT",NULL); - psF64 dblItem = psMetadataLookupF64(header, "MYDBL",NULL); + psS32 intItem = psMetadataLookupS32(NULL,header, "MYINT"); + psF32 fltItem = psMetadataLookupF32(NULL,header, "MYFLT"); + psF64 dblItem = psMetadataLookupF64(NULL,header, "MYDBL"); psMetadataItem* boolItem = psMetadataLookup(header, "MYBOOL"); - char* strItem = psMetadataLookupPtr(header, "MYSTR",NULL); + char* strItem = psMetadataLookupPtr(NULL, header, "MYSTR"); if (intItem != hdunum) { @@ -739,5 +739,5 @@ } - psS32 intItem = psMetadataLookupS32(header, "MYINT",NULL); + psS32 intItem = psMetadataLookupS32(NULL, header, "MYINT"); if (intItem != i) { @@ -783,5 +783,5 @@ } - psS32 intItem = psMetadataLookupS32(header, "MYINT",NULL); + psS32 intItem = psMetadataLookupS32(NULL, header, "MYINT"); if (intItem != i) { @@ -842,8 +842,8 @@ psMetadata* rowData = table->data[row]; - psS32 intItem = psMetadataLookupS32(rowData, "MYINT",NULL); - psF32 fltItem = psMetadataLookupF32(rowData, "MYFLT",NULL); - psF64 dblItem = psMetadataLookupF64(rowData, "MYDBL",NULL); - psBool boolItem = psMetadataLookupBool(rowData, "MYBOOL",NULL); + psS32 intItem = psMetadataLookupS32(NULL, rowData, "MYINT"); + psF32 fltItem = psMetadataLookupF32(NULL, rowData, "MYFLT"); + psF64 dblItem = psMetadataLookupF64(NULL, rowData, "MYDBL"); + psBool boolItem = psMetadataLookupBool(NULL, rowData, "MYBOOL"); if (intItem != row) { Index: /trunk/psLib/test/fileUtils/tst_psFits.c =================================================================== --- /trunk/psLib/test/fileUtils/tst_psFits.c (revision 3245) +++ /trunk/psLib/test/fileUtils/tst_psFits.c (revision 3246) @@ -6,6 +6,6 @@ * @author Robert DeSonia, MHPCC * -* @version $Revision: 1.15 $ $Name: not supported by cvs2svn $ -* @date $Date: 2005-02-03 00:54:12 $ +* @version $Revision: 1.16 $ $Name: not supported by cvs2svn $ +* @date $Date: 2005-02-17 01:58:43 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii @@ -623,9 +623,9 @@ // check for the extra metadata items - psS32 intItem = psMetadataLookupS32(header, "MYINT",NULL); - psF32 fltItem = psMetadataLookupF32(header, "MYFLT",NULL); - psF64 dblItem = psMetadataLookupF64(header, "MYDBL",NULL); + psS32 intItem = psMetadataLookupS32(NULL,header, "MYINT"); + psF32 fltItem = psMetadataLookupF32(NULL,header, "MYFLT"); + psF64 dblItem = psMetadataLookupF64(NULL,header, "MYDBL"); psMetadataItem* boolItem = psMetadataLookup(header, "MYBOOL"); - char* strItem = psMetadataLookupPtr(header, "MYSTR",NULL); + char* strItem = psMetadataLookupPtr(NULL, header, "MYSTR"); if (intItem != hdunum) { @@ -739,5 +739,5 @@ } - psS32 intItem = psMetadataLookupS32(header, "MYINT",NULL); + psS32 intItem = psMetadataLookupS32(NULL, header, "MYINT"); if (intItem != i) { @@ -783,5 +783,5 @@ } - psS32 intItem = psMetadataLookupS32(header, "MYINT",NULL); + psS32 intItem = psMetadataLookupS32(NULL, header, "MYINT"); if (intItem != i) { @@ -842,8 +842,8 @@ psMetadata* rowData = table->data[row]; - psS32 intItem = psMetadataLookupS32(rowData, "MYINT",NULL); - psF32 fltItem = psMetadataLookupF32(rowData, "MYFLT",NULL); - psF64 dblItem = psMetadataLookupF64(rowData, "MYDBL",NULL); - psBool boolItem = psMetadataLookupBool(rowData, "MYBOOL",NULL); + psS32 intItem = psMetadataLookupS32(NULL, rowData, "MYINT"); + psF32 fltItem = psMetadataLookupF32(NULL, rowData, "MYFLT"); + psF64 dblItem = psMetadataLookupF64(NULL, rowData, "MYDBL"); + psBool boolItem = psMetadataLookupBool(NULL, rowData, "MYBOOL"); if (intItem != row) { Index: /trunk/psLib/test/image/Makefile.am =================================================================== --- /trunk/psLib/test/image/Makefile.am (revision 3245) +++ /trunk/psLib/test/image/Makefile.am (revision 3246) @@ -29,4 +29,10 @@ tst_psImageInterpolate +check_DATA = \ + fBiOut.fits \ + fOut.fits \ + sBiOut.fits \ + sOut.fits + TESTS_ENVIRONMENT = perl $(top_srcdir)/test/runTest -verified=$(srcdir)/verified TESTS = \ @@ -57,2 +63,15 @@ tst_psImageIO_SOURCES = tst_psImageIO.c tst_psImageInterpolate_SOURCES = tst_psImageInterpolate.c + +fBiOut.fits: verified/fBiOut.fits + cp $? $@ + +fOut.fits: verified/fOut.fits + cp $? $@ + +sBiOut.fits: verified/sBiOut.fits + cp $? $@ + +sOut.fits: verified/sOut.fits + cp $? $@ + Index: /trunk/psLib/test/image/tst_psImageManip.c =================================================================== --- /trunk/psLib/test/image/tst_psImageManip.c (revision 3245) +++ /trunk/psLib/test/image/tst_psImageManip.c (revision 3246) @@ -6,6 +6,6 @@ * @author Robert DeSonia, MHPCC * - * @version $Revision: 1.36 $ $Name: not supported by cvs2svn $ - * @date $Date: 2005-01-18 03:15:04 $ + * @version $Revision: 1.37 $ $Name: not supported by cvs2svn $ + * @date $Date: 2005-02-17 01:58:43 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii @@ -1356,8 +1356,8 @@ // now, let's compare this with the verified file - fTruth = psImageReadSection(fTruth,0,0,0,0,0,NULL,index,"verified/fOut.fits"); - sTruth = psImageReadSection(sTruth,0,0,0,0,0,NULL,index,"verified/sOut.fits"); - fBiTruth = psImageReadSection(fBiTruth,0,0,0,0,0,NULL,index,"verified/fBiOut.fits"); - sBiTruth = psImageReadSection(sBiTruth,0,0,0,0,0,NULL,index,"verified/sBiOut.fits"); + fTruth = psImageReadSection(fTruth,0,0,0,0,0,NULL,index,"fOut.fits"); + sTruth = psImageReadSection(sTruth,0,0,0,0,0,NULL,index,"sOut.fits"); + fBiTruth = psImageReadSection(fBiTruth,0,0,0,0,0,NULL,index,"fBiOut.fits"); + sBiTruth = psImageReadSection(sBiTruth,0,0,0,0,0,NULL,index,"sBiOut.fits"); if (fTruth == NULL) { psError(PS_ERR_UNKNOWN, true,"verified psF32 image failed to be read (%d deg. rotation)", Index: /trunk/psLib/test/runTest =================================================================== --- /trunk/psLib/test/runTest (revision 3245) +++ /trunk/psLib/test/runTest (revision 3246) @@ -26,5 +26,5 @@ # # $Revison: $ $Name: not supported by cvs2svn $ -# $Date: 2005-02-15 19:53:19 $ +# $Date: 2005-02-17 01:58:42 $ # # Copyright 2004 Maui High Performance Computering Center, University of Hawaii @@ -119,97 +119,97 @@ $exitValue |= 64; } - else { - - # Test driver succeeded. - - # Create filtered version of stdout and stderr - - # Open the STDOUT file for reading - open( OUTFILE, "< temp/$testFile.stdout" ); - - # Open mod file to place filtered STDOUT - open( MODFILE, "> temp/$testFile.stdout.mod" ); - open( MODFILE2, "> $verifiedDir/$testFile.stdout" ) if $resetStdout; - - # Replace the variable date, time and host information with constants - $hostname = `hostname`; - chop $hostname; - while () { - s/\s+\d+:\d+:\d+\w/