Index: trunk/psLib/test/astronomy/Makefile =================================================================== --- trunk/psLib/test/astronomy/Makefile (revision 2999) +++ trunk/psLib/test/astronomy/Makefile (revision 3056) @@ -3,6 +3,6 @@ ## Makefile: test/astronomy ## -## $Revision: 1.25 $ $Name: not supported by cvs2svn $ -## $Date: 2005-01-07 23:52:00 $ +## $Revision: 1.26 $ $Name: not supported by cvs2svn $ +## $Date: 2005-01-19 01:53:00 $ ## ## Copyright 2004 Maui High Performance Computing Center, University of Hawaii @@ -16,5 +16,9 @@ include ../../src/Makefile.Globals -CFLAGS := -I../../include -I/usr/include/libxml $(CFLAGS) +CFLAGS := -I../../include \ + -DTIME_XML_FILE="\"$(TIME_XML_FILE)\"" \ + -DTIME_CONFIG_FILE="\"$(TIME_CONFIG_FILE)\"" \ + $(CFLAGS) + LDFLAGS := -L../../lib -lpslib -lpstest -lxml2 $(LDFLAGS) @@ -38,4 +42,8 @@ all: $(TARGET) + sed 's|PREFIX|$(prefix)|' test.psTime.config1.template > test.psTime.config1 + sed 's|PREFIX|$(prefix)|' test.psTime.config2.template > test.psTime.config2 + sed 's|PREFIX|$(prefix)|' test.psTime.config3.template > test.psTime.config3 + sed 's|PREFIX|$(prefix)|' test.psTime.config4.template > test.psTime.config4 clean: @@ -49,4 +57,5 @@ install test.config header_1.fits header_2.fits $(TARGET) $(testbindir) install verified/*.stderr verified/*.stdout $(testbindir)/verified + install test.ser7.dat test.psTime.config1 test.psTime.config2 test.psTime.config3 test.psTime.config4 $(testbindir) $(testbindir): Index: trunk/psLib/test/astronomy/test.psTime.config1 =================================================================== --- trunk/psLib/test/astronomy/test.psTime.config1 (revision 2999) +++ trunk/psLib/test/astronomy/test.psTime.config1 (revision 3056) @@ -1,4 +1,4 @@ # This configuration file specifies values required for time calculations by psLib. -psLib.time.tables.dir STR ../../dataxz # Directory for time tables +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 Index: trunk/psLib/test/astronomy/test.psTime.config1.template =================================================================== --- trunk/psLib/test/astronomy/test.psTime.config1.template (revision 3056) +++ trunk/psLib/test/astronomy/test.psTime.config1.template (revision 3056) @@ -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/test.psTime.config2 =================================================================== --- trunk/psLib/test/astronomy/test.psTime.config2 (revision 2999) +++ trunk/psLib/test/astronomy/test.psTime.config2 (revision 3056) @@ -1,4 +1,4 @@ # This configuration file specifies values required for time calculations by psLib. -psLib.time.tables.dir STR ../../data # Directory for time tables +psLib.time.tables.dir STR /home/desonia/psLib/data # 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 Index: trunk/psLib/test/astronomy/test.psTime.config2.template =================================================================== --- trunk/psLib/test/astronomy/test.psTime.config2.template (revision 3056) +++ trunk/psLib/test/astronomy/test.psTime.config2.template (revision 3056) @@ -0,0 +1,23 @@ +# This configuration file specifies values required for time calculations by psLib. +psLib.time.tables.dir STR PREFIX/data # 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/test.psTime.config3 =================================================================== --- trunk/psLib/test/astronomy/test.psTime.config3 (revision 2999) +++ trunk/psLib/test/astronomy/test.psTime.config3 (revision 3056) @@ -1,4 +1,4 @@ # This configuration file specifies values required for time calculations by psLib. -psLib.time.tables.dir STR ../../data # Directory for time tables +psLib.time.tables.dir STR /home/desonia/psLib/data # 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 Index: trunk/psLib/test/astronomy/test.psTime.config3.template =================================================================== --- trunk/psLib/test/astronomy/test.psTime.config3.template (revision 3056) +++ trunk/psLib/test/astronomy/test.psTime.config3.template (revision 3056) @@ -0,0 +1,23 @@ +# This configuration file specifies values required for time calculations by psLib. +psLib.time.tables.dir STR PREFIX/data # 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/test.psTime.config4.template =================================================================== --- trunk/psLib/test/astronomy/test.psTime.config4.template (revision 3056) +++ trunk/psLib/test/astronomy/test.psTime.config4.template (revision 3056) @@ -0,0 +1,23 @@ +# 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_psMetadata_07.c =================================================================== --- trunk/psLib/test/astronomy/tst_psMetadata_07.c (revision 2999) +++ trunk/psLib/test/astronomy/tst_psMetadata_07.c (revision 3056) @@ -9,6 +9,6 @@ * @author Ross Harman, MHPCC * -* @version $Revision: 1.5 $ $Name: not supported by cvs2svn $ -* @date $Date: 2004-12-03 23:38:41 $ +* @version $Revision: 1.6 $ $Name: not supported by cvs2svn $ +* @date $Date: 2005-01-19 01:53:00 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii @@ -17,4 +17,9 @@ #include "pslib.h" #include "psTest.h" + +#ifndef TIME_XML_FILE +#define TIME_XML_FILE "../../config/psTime.xml" +#pragma warning TIME_XML_FILE was not defined in the makefile. +#endif @@ -26,5 +31,5 @@ psU32 nFail = 0; psMetadata *md = NULL; - md = psMetadataParseConfigXml(md, &nFail, "../../config/psTime.xml", true); + md = psMetadataParseConfigXml(md, &nFail, TIME_XML_FILE, true); if (nFail != 0) { printf("psMetadataParseConfigXml returned error %d\n", res); Index: trunk/psLib/test/astronomy/tst_psTime_04.c =================================================================== --- trunk/psLib/test/astronomy/tst_psTime_04.c (revision 2999) +++ trunk/psLib/test/astronomy/tst_psTime_04.c (revision 3056) @@ -14,6 +14,6 @@ * @author Ross Harman, MHPCC * - * @version $Revision: 1.5 $ $Name: not supported by cvs2svn $ - * @date $Date: 2004-12-16 18:53:35 $ + * @version $Revision: 1.6 $ $Name: not supported by cvs2svn $ + * @date $Date: 2005-01-19 01:53:00 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii @@ -29,5 +29,5 @@ // Test A - Initialize time printPositiveTestHeader(stdout, "psTime", "Test A - Initialize time"); - psLibInit(true, "../../config/psTime.config"); + psLibInit(true, TIME_CONFIG_FILE); psLibFinalize(); printFooter(stdout, "psTime", "Test A - Initialize time", true); Index: trunk/psLib/test/astronomy/verified/tst_psTime_04.stderr =================================================================== --- trunk/psLib/test/astronomy/verified/tst_psTime_04.stderr (revision 2999) +++ trunk/psLib/test/astronomy/verified/tst_psTime_04.stderr (revision 3056) @@ -4,11 +4,11 @@ Failed to initialize psTime.