Index: trunk/psLib/test/astronomy/tst_psCoord.c
===================================================================
--- trunk/psLib/test/astronomy/tst_psCoord.c	(revision 4541)
+++ 	(revision )
@@ -1,1351 +1,0 @@
-/** @file  tst_psCoord.c
-*
-*  @brief The code will ...
-*
-*
-*  @author GLG, MHPCC
-*
-*  @version $Revision: 1.30 $ $Name: not supported by cvs2svn $
-*  @date $Date: 2005-07-12 19:27:28 $
-*
-*  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
-*/
-
-#include "psTest.h"
-#include "pslib_strict.h"
-static psS32 testSphereRotAlloc(void);
-static psS32 testPlaneTransformAlloc(void);
-static psS32 testPlaneDistortAlloc(void);
-static psS32 testPlaneTransformApply(void);
-static psS32 testPlaneDistortApply(void);
-static psS32 testSphereRotApply1(void);
-static psS32 testSphereRotApply2(void);
-static psS32 testSphereRotApply3(void);
-static psS32 testSphereRotApply4(void);
-static psS32 testSphereRotApply5(void);
-static psS32 testSphereRotICRSToEcliptic(void);
-static psS32 testSphereRotEclipticToICRS(void);
-static psS32 testSphereRotICRSToGalactic(void);
-static psS32 testSphereRotGalacticToICRS(void);
-static psS32 testSphereRotPrecess(void);
-testDescription tests[] = {
-                              {testSphereRotAlloc, 819, "psSphereRotAlloc()", 0, false},
-                              {testPlaneTransformAlloc, 826, "psPlaneTransformAlloc()", 0, false},
-                              {testPlaneDistortAlloc, 827, "psPlaneDistortAlloc()", 0, false},
-                              {testPlaneTransformApply, 831, "psPlaneTransformApply()", 0, false},
-                              {testPlaneDistortApply, 832, "psPlaneDistortApply()", 0, false},
-                              {testSphereRotApply1, 820, "psSphereRotApply()", 0, false},
-                              {testSphereRotApply2, 820, "psSphereRotApply()", 0, false},
-                              {testSphereRotApply3, 820, "psSphereRotApply()", 0, false},
-                              {testSphereRotApply4, 820, "psSphereRotApply()", 0, false},
-                              {testSphereRotApply5, 820, "psSphereRotApply()", 0, false},
-                              {testSphereRotICRSToEcliptic, 821, "psSphereRotICRSToEcliptic()", 0, false},
-                              {testSphereRotEclipticToICRS, 822, "psSphereRotEclipticToICRS()", 0, false},
-                              {testSphereRotICRSToGalactic, 824, "psSphereRotICRSToGalactic()", 0, false},
-                              {testSphereRotGalacticToICRS, 823, "psSphereRotGalacticToICRS()", 0, false},
-                              {testSphereRotPrecess, 825, "psSphereRotPrecess()", 0, false},
-                              {NULL}
-                          };
-
-psS32 main( psS32 argc, char* argv[] )
-{
-    psLogSetLevel( PS_LOG_INFO );
-
-    return ( ! runTestSuite( stderr, "psCoord", tests, argc, argv ) );
-}
-
-#define DEG_INC   30.0
-
-#define MJD_1900  15021.0        // Modified Julian Day 1/1/1900 00:00:00
-#define MJD_2000  51544.0        // Modified Julian Day 1/1/2000 00:00:00
-#define MJD_2100  88069.0        // Modified Julian Day 1/1/2100 00:00:00
-
-#define ERROR_TOL   0.0001
-
-#define ALPHA_P 1.0
-#define DELTA_P 2.0
-#define PHI_P 3.0
-
-psS32 testSphereRotAlloc( void )
-{
-    // Allocate data structure
-    psSphereRot* myST = psSphereRotAlloc(ALPHA_P, DELTA_P, PHI_P);
-
-    // Verify null not returned
-    if(myST == NULL) {
-        psError(PS_ERR_UNKNOWN,true,"Returned NULL with valid parameters");
-        return 1;
-    }
-    // Verify sin member is updated
-    double vx = cos(DELTA_P)*cos(ALPHA_P);
-    double vy = cos(DELTA_P)*sin(ALPHA_P);
-    double vz = sin(DELTA_P);
-    double q0 = vx * sin(PHI_P/2.0);
-    double q1 = vy * sin(PHI_P/2.0);
-    double q2 = vz * sin(PHI_P/2.0);
-    double q3 = cos(PHI_P/2.0);
-
-    if (FLT_EPSILON < fabs(q0 - myST->q0)) {
-        psError(PS_ERR_UNKNOWN,true,"myST->q0 is %f, should be %f\n", myST->q0, q0);
-        return 2;
-    }
-    if (FLT_EPSILON < fabs(q1 - myST->q1)) {
-        psError(PS_ERR_UNKNOWN,true,"myST->q1 is %f, should be %f\n", myST->q1, q1);
-        return 3;
-    }
-    if (FLT_EPSILON < fabs(q2 - myST->q2)) {
-        psError(PS_ERR_UNKNOWN,true,"myST->q2 is %f, should be %f\n", myST->q2, q2);
-        return 4;
-    }
-    if (FLT_EPSILON < fabs(q3 - myST->q3)) {
-        psError(PS_ERR_UNKNOWN,true,"myST->q0 is %f, should be %f\n", myST->q3, q3);
-        return 5;
-    }
-
-    // Free data structure
-    psFree(myST);
-
-    return 0;
-}
-
-#define NX_TERMS 2
-#define NY_TERMS 3
-#define NZ_TERMS 4
-#define NT_TERMS 5
-
-psS32 testPlaneTransformAlloc( void )
-{
-    // Allocate psPlaneTransform with known x and y terms
-    psPlaneTransform *myPT = psPlaneTransformAlloc(NX_TERMS, NY_TERMS);
-
-    // Verify returned value is not NULL
-    if(myPT == NULL) {
-        psError(PS_ERR_UNKNOWN,true,"Function returned NULL not expected.");
-        return 1;
-    }
-
-    // Verify returned transform has members set properly
-    if (myPT->x->nX != NX_TERMS) {
-        psError(PS_ERR_UNKNOWN,true,"myPT->x->nX is %d, should be %d",
-                myPT->x->nX, NX_TERMS);
-        return 2;
-    }
-    if (myPT->y->nX != NX_TERMS) {
-        psError(PS_ERR_UNKNOWN,true,"myPT->y->nX is %d, should be %d",
-                myPT->y->nX, NX_TERMS);
-        return 3;
-    }
-    if (myPT->x->nY != NY_TERMS) {
-        psError(PS_ERR_UNKNOWN,true,"myPT->x->nY is %d, should be %d",
-                myPT->x->nY, NY_TERMS);
-        return 4;
-    }
-    if (myPT->y->nY != NY_TERMS) {
-        psError(PS_ERR_UNKNOWN,true,"myPT->y->nY is %d, should be %d",
-                myPT->y->nY, NY_TERMS);
-        return 5;
-    }
-
-    // Free plane transform
-    psFree(myPT);
-
-    // Attempt to specify negative x terms and verify NULL returned and errror message generated
-    psLogMsg(__func__,PS_LOG_INFO,"Following should generate an error message: negative x terms");
-    myPT = psPlaneTransformAlloc(-1.0, 1.0);
-    if (myPT != NULL) {
-        psError(PS_ERR_UNKNOWN,true,"psPlaneTransformAlloc() did not return NULL.");
-        return 6;
-    }
-
-    // Attempt to specify negative y terms and verify NULL returned and error message generated
-    psLogMsg(__func__,PS_LOG_INFO,"Following should generate an error message: negative y terms");
-    myPT = psPlaneTransformAlloc(1.0, -1.0);
-    if (myPT != NULL) {
-        psError(PS_ERR_UNKNOWN,true,"psPlaneTransformAlloc() did not return NULL.");
-        return 7;
-    }
-
-    psFree(myPT);
-
-    return 0;
-}
-
-
-psS32 testPlaneDistortAlloc( void )
-{
-    // Invoke function with known parameters
-    psPlaneDistort *myPD = psPlaneDistortAlloc(NX_TERMS, NY_TERMS, NZ_TERMS, NT_TERMS);
-
-    // Verify NULL is not returned
-    if(myPD == NULL) {
-        psError(PS_ERR_UNKNOWN,true,"Return of NULL not expected");
-        return 1;
-    }
-    // Verify the terms are properly set after allocation
-    if (myPD->x->nX != NX_TERMS) {
-        psError(PS_ERR_UNKNOWN,true,"myPD->x->nX is %d, should be %d",
-                myPD->x->nX, NX_TERMS);
-        return 2;
-    }
-    if (myPD->y->nX != NX_TERMS) {
-        psError(PS_ERR_UNKNOWN,true,"myPD->y->nX is %d, should be %d",
-                myPD->y->nX, NX_TERMS);
-        return 3;
-    }
-    if (myPD->x->nY != NY_TERMS) {
-        psError(PS_ERR_UNKNOWN,true,"myPD->x->nY is %d, should be %d",
-                myPD->x->nY, NY_TERMS);
-        return 4;
-    }
-    if (myPD->y->nY != NY_TERMS) {
-        psError(PS_ERR_UNKNOWN,true,"myPD->y->nY is %d, should be %d",
-                myPD->y->nY, NY_TERMS);
-        return 5;
-    }
-    if (myPD->x->nZ != NZ_TERMS) {
-        psError(PS_ERR_UNKNOWN,true,"myPD->x->nZ is %d, should be %d",
-                myPD->x->nZ, NZ_TERMS);
-        return 6;
-    }
-    if (myPD->y->nZ != NZ_TERMS) {
-        psError(PS_ERR_UNKNOWN,true,"myPD->y->nZ is %d, should be %d",
-                myPD->y->nZ, NZ_TERMS);
-        return 7;
-    }
-    if (myPD->x->nT != NT_TERMS) {
-        psError(PS_ERR_UNKNOWN,true,"myPD->x->nT is %d, should be %d",
-                myPD->x->nT, NT_TERMS);
-        return 8;
-    }
-    if (myPD->y->nT != NT_TERMS) {
-        psError(PS_ERR_UNKNOWN,true,"myPD->y->nT is %d, should be %d",
-                myPD->y->nT, NT_TERMS);
-        return 9;
-    }
-    // Free psPlaneTransform
-    psFree(myPD);
-
-    // Invoke function with negative x term parameter
-    psLogMsg(__func__,PS_LOG_INFO,"Following should generate an error message for negative x term");
-    myPD = psPlaneDistortAlloc(-1.0, 1.0, 1.0, 1.0);
-    if (myPD != NULL) {
-        psError(PS_ERR_UNKNOWN,true,"psPlaneDistortAlloc() did not return NULL.");
-        return 10;
-    }
-
-    // Invoke function with negative y term parameter
-    psLogMsg(__func__,PS_LOG_INFO,"Following should generate an error message for negative y term");
-    myPD = psPlaneDistortAlloc(1.0, -1.0, 1.0, 1.0);
-    if (myPD != NULL) {
-        psError(PS_ERR_UNKNOWN,true,"psPlaneDistortAlloc() did not return NULL.");
-        return 11;
-    }
-
-    // Invoke function with negative z term parameter
-    psLogMsg(__func__,PS_LOG_INFO,"Following should generate an error message for negative z term");
-    myPD = psPlaneDistortAlloc(1.0, 1.0, -1.0, 1.0);
-    if (myPD != NULL) {
-        psError(PS_ERR_UNKNOWN,true,"psPlaneDistortAlloc() did not return NULL.");
-        return 12;
-    }
-
-    // Invoke function with negative w term parameter
-    psLogMsg(__func__,PS_LOG_INFO,"Following should generate an error message for negative w term");
-    myPD = psPlaneDistortAlloc(1.0, 1.0, 1.0, -1.0);
-    if (myPD != NULL) {
-        psError(PS_ERR_UNKNOWN,true,"psPlaneDistortAlloc() did not return NULL.");
-    }
-
-    return 0;
-}
-
-#define N 10
-// We do a simple identity transformation on a few x,y pairs.
-psS32 testPlaneTransformApply( void )
-{
-    psPlane*          out = NULL;
-    psDPolynomial2D*  tmp2DPoly = NULL;
-    psPlane*          rc;
-
-    // Create input coordinate
-    psPlane* in = psPlaneAlloc();
-    if(in == NULL) {
-        psError(PS_ERR_UNKNOWN,true,"Did not expect NULL return from psPlaneAlloc");
-        return 1;
-    }
-
-    // Create transform
-    psPlaneTransform* pt = psPlaneTransformAlloc(2,2);
-
-    // Set transform coefficients so the x coord input will equal x coord output, same for y
-    pt->x->coeff[1][0] = 1.0;
-    pt->y->coeff[0][1] = 1.0;
-
-    // Apply transform for several points
-    for (psS32 i = 0; i < N; i++) {
-        in->x = (psF64) i;
-        in->y = (psF64) (i + 5.0);
-        in->xErr = 0.0;
-        in->yErr = 0.0;
-
-        // Verify function does not return NULL
-        out = psPlaneTransformApply(out, pt, in);
-        if( out  == NULL) {
-            psError(PS_ERR_UNKNOWN,true,"Expected non-NULL return value");
-            return 1;
-        }
-        // Verify the expected values are returned
-        if (FLT_EPSILON < fabs(out->x - in->x)) {
-            psError(PS_ERR_UNKNOWN,true,"out.x is %lf, should be %lf", out->x, in->x);
-            return 3;
-        }
-        if (FLT_EPSILON < fabs(out->y - in->y)) {
-            psError(PS_ERR_UNKNOWN,true,"out.y is %lf, should be %lf", out->y, in->y);
-            return 4;
-        }
-    }
-    psFree(out);
-
-    // Verify return null and error message generater for null specified transform
-    psLogMsg(__func__,PS_LOG_INFO,"Following should generate error message for NULL psPlaneTransform");
-    rc = psPlaneTransformApply(NULL, NULL, in);
-    if (rc != NULL) {
-        psError(PS_ERR_UNKNOWN,true,"Function did not return NULL as expected for NULL psPlaneTransform.");
-        return 5;
-    }
-
-    // Verify return null and error message generated for null psPlaneTransform x coeff
-    psLogMsg(__func__,PS_LOG_INFO,"Following should generate error message for NULL x coeff psPlaneTransform");
-    tmp2DPoly = pt->x;
-    pt->x = NULL;
-    rc = psPlaneTransformApply(NULL, pt, in);
-    if (rc != NULL) {
-        psError(PS_ERR_UNKNOWN,true,"Function did not return NULL as expected for NULL x coeff psPlaneTransform");
-        return 6;
-    }
-    pt->x = tmp2DPoly;
-
-    // Verify return null and error message generated for null psPlaneTransform y coeff
-    psLogMsg(__func__,PS_LOG_INFO,"Following should generate error message for NULL y coeff psPlaneTransform");
-    tmp2DPoly = pt->y;
-    pt->y = NULL;
-    rc = psPlaneTransformApply(NULL, pt, in);
-    if (rc != NULL) {
-        psError(PS_ERR_UNKNOWN,true,"Function did not return NULL as expected for NULL y coeff psPlaneTransform");
-        return 7;
-    }
-    pt->y = tmp2DPoly;
-
-    // Verify return null and error message generated for null psPlane coordinate
-    psLogMsg(__func__,PS_LOG_INFO,"Following should generate error message for NULL psPlane");
-    rc = psPlaneTransformApply(NULL, pt, NULL);
-    if (rc != NULL) {
-        psError(PS_ERR_UNKNOWN,true,"Function did not return NULL as expected for NULL psPlane");
-        return 8;
-    }
-
-    psFree(pt);
-    psFree(in);
-
-    return 0;
-}
-
-#define COLOR 1.0
-#define MAGNITUDE 1.0
-// We do a simple identity transformation on a few x,y pairs.  For x and y,
-// we add in the COLOR and MAGNITUDE.
-psS32 testPlaneDistortApply( void )
-{
-    psPlane*         out       = NULL;
-    psPlane*         rc        = NULL;
-    psDPolynomial4D* tmp4DPoly = NULL;
-
-    // Allocate input coordinate
-    psPlane* in = psPlaneAlloc();
-
-    // Create psPlaneTransform structure
-    psPlaneDistort*  pt = psPlaneDistortAlloc(2, 2, 2, 2);
-
-    pt->x->coeff[1][0][0][0] = 1.0;
-    pt->x->coeff[0][0][1][0] = 1.0;
-    pt->x->coeff[0][0][0][1] = 1.0;
-
-    pt->y->coeff[0][1][0][0] = 1.0;
-    pt->y->coeff[0][0][1][0] = 1.0;
-    pt->y->coeff[0][0][0][1] = 1.0;
-
-    for (psS32 i = 0; i < N; i++) {
-        in->x = (psF64) i;
-        in->y = (psF64) (i + 5.0);
-        in->xErr = 0.0;
-        in->yErr = 0.0;
-        out = psPlaneDistortApply(out, pt, in, COLOR, MAGNITUDE);
-
-        // Verify return value is not NULL
-        if(out == NULL) {
-            psError(PS_ERR_UNKNOWN,true,"Expected non-NULL return");
-            return 1;
-        }
-        // Verify return value contains expected values
-        if (FLT_EPSILON < fabs(out->x - COLOR - MAGNITUDE - in->x)) {
-            psError(PS_ERR_UNKNOWN,true,"out->x is %lf, should be %lf",
-                    out->x, in->x + COLOR + MAGNITUDE);
-            return 2;
-        }
-        if (FLT_EPSILON < fabs(out->y - COLOR - MAGNITUDE - in->y)) {
-            psError(PS_ERR_UNKNOWN,true,"out->y is %lf, should be %lf",
-                    out->y, in->y + COLOR + MAGNITUDE);
-            return 3;
-        }
-    }
-    psFree(out);
-
-    // Attempt to invoke psPlaneDistortApply with NULL psPlaneDistort
-    psLogMsg(__func__,PS_LOG_INFO,"Following should generate an error message for null psPlaneDistort");
-    rc = psPlaneDistortApply(NULL, NULL, in, COLOR, MAGNITUDE);
-    if (rc != NULL) {
-        psError(PS_ERR_UNKNOWN,true,"Did not return NULL.");
-        return 4;
-    }
-
-    // Attempt to invoke psPlaneDistortApply with NULL psPlaneDistort x member
-    psLogMsg(__func__,PS_LOG_INFO,"Following should generate an error message for null x member psPlaneDistort");
-    tmp4DPoly = pt->x;
-    pt->x = NULL;
-    rc = psPlaneDistortApply(NULL, pt, in, COLOR, MAGNITUDE);
-    if (rc != NULL) {
-        psError(PS_ERR_UNKNOWN,true,"Did not return NULL.");
-        return 5;
-    }
-    pt->x = tmp4DPoly;
-
-    // Attempt to invoke psPlaneDistortApply with NULL psPlaneDistort y member
-    psLogMsg(__func__,PS_LOG_INFO,"Following should generate an error message for null y member psPlaneDistort");
-    tmp4DPoly = pt->y;
-    pt->y = NULL;
-    rc = psPlaneDistortApply(NULL, pt, in, COLOR, MAGNITUDE);
-    if (rc != NULL) {
-        psError(PS_ERR_UNKNOWN,true,"Did not return NULL.");
-        return 6;
-    }
-    pt->y = tmp4DPoly;
-
-    // Attempt to invoke psPlaneDistortApply with NULL input psPlane
-    psLogMsg(__func__,PS_LOG_INFO,"Following should generate an error message for null input psPlane");
-    rc = psPlaneDistortApply(NULL, pt, NULL, COLOR, MAGNITUDE);
-    if (rc != NULL) {
-        psError(PS_ERR_UNKNOWN,true,"Did not return NULL");
-        return 7;
-    }
-
-    psFree(pt);
-    psFree(in);
-
-    return 0;
-}
-
-// We do a simple identity transformation on a few RA, DEC pairs.
-psS32 testSphereRotApply1( void )
-{
-    psSphere *in = psSphereAlloc();
-    psSphere *out = psSphereAlloc();
-    psSphere *temp = NULL;
-    psSphere *rc = NULL;
-    psSphereRot *myST = psSphereRotAlloc(0.0, 0.0, 0.0);
-
-    for (float r=0.0;r<180.0;r+=DEG_INC) {
-        for (float d=0.0;d<90.0;d+=DEG_INC) {
-            in->r = DEG_TO_RAD(r);
-            in->d = DEG_TO_RAD(d);
-            in->rErr = 0.0;
-            in->dErr = 0.0;
-
-            if(psSphereRotApply(out, myST, in) != out) {
-                psError(PS_ERR_UNKNOWN,true,"Did not return output pointer.");
-                return 1;
-            }
-            if (ERROR_TOL < fabs(out->r - in->r)) {
-                psError(PS_ERR_UNKNOWN,true,"out->r is %f, should be %f\n", out->r, in->r);
-                return 2;
-            }
-            if (ERROR_TOL < fabs(out->d - in->d)) {
-                psError(PS_ERR_UNKNOWN,true,"out->d is %f, should be %f\n", out->d, in->d);
-                return 3;
-            }
-        }
-    }
-
-    // Verify new sphere object is created if out parameter NULL
-    temp = psSphereRotApply(NULL, myST, in);
-    if ( temp == NULL) {
-        psError(PS_ERR_UNKNOWN,true,"Returned NULL when out parameter was null");
-        return 4;
-    }
-    psFree(temp);
-
-    // Verify NULL returned if transform structure null
-    psLogMsg(__func__,PS_LOG_INFO,"Following should generate an error");
-    rc = psSphereRotApply(NULL, NULL, in);
-    if (rc != NULL) {
-        psError(PS_ERR_UNKNOWN,true,"psSphereRotApply() did not return NULL.");
-        return 5;
-    }
-
-    // Verify NULL returned when input sphere is NULL
-    psLogMsg(__func__,PS_LOG_INFO,"Following should generate an error");
-    rc = psSphereRotApply(NULL, myST, NULL);
-    if (rc != NULL) {
-        psError(PS_ERR_UNKNOWN,true,"psSphereRotApply() did not return NULL");
-        return 6;
-    }
-
-    psFree(myST);
-    psFree(out);
-    psFree(in);
-
-    return 0;
-}
-
-/******************************************************************************
-testSphereRotApply2(): This test verifies that psSphereRotApply()
-works properly.  We create two psSphereRots: a forward transform and a
-reverse transform (which is the mathematical inverse of the forward transform).
-We apply both transforms to several spherical coordinates and ensure that the
-original input coordinate is obtained after applying both transforms.
- 
-XXX: We currently test the alpha and delta offsets independently.  Attempts to
-test them both concurrently failed.  Determine why this is.  Are the following
-spherical transforms not mathematical inverses?
-    psSphereRotAlloc(X, Y, 0.0)
-    psSphereRotAlloc(-X, -Y, 0.0)
- *****************************************************************************/
-#define ERROR_PERCENT 0.01
-psS32 testSphereRotApply2( void )
-{
-    psS32 testStatus = 0;
-    psSphere in;
-    psSphere out;
-    psSphere out2;
-    psSphereRot *mySphereRotForward = NULL;
-    psSphereRot *mySphereRotReverse = NULL;
-
-
-    mySphereRotForward = psSphereRotAlloc(DEG_TO_RAD(22.0),
-                                          0.0,
-                                          0.0);
-    mySphereRotReverse = psSphereRotAlloc(DEG_TO_RAD(-22.0),
-                                          0.0,
-                                          0.0);
-
-    for (float r=0.1;r<180.0;r+=(DEG_INC/5.0)) {
-        for (float d=0.1;d<90.0;d+=(DEG_INC/5.0)) {
-            in.r = DEG_TO_RAD(r);
-            in.d = DEG_TO_RAD(d);
-            in.rErr = 0.0;
-            in.dErr = 0.0;
-
-            psSphereRotApply(&out, mySphereRotForward, &in);
-            psSphereRotApply(&out2, mySphereRotReverse, &out);
-
-            if ((fabs((in.r - out2.r) / in.r) > ERROR_PERCENT) ||
-                    (fabs((in.d - out2.d) / in.d) > ERROR_PERCENT)) {
-                printf("ERROR: \n");
-                printf("Input  coords (R, D) are (%f, %f)\n", in.r, in.d);
-                printf("Output coords (R, D) are (%f, %f)\n", out2.r, out2.d);
-                testStatus = 4;
-            }
-        }
-    }
-    psFree(mySphereRotForward);
-    psFree(mySphereRotReverse);
-
-    mySphereRotForward = psSphereRotAlloc(0.0,
-                                          DEG_TO_RAD(33.0),
-                                          0.0);
-    mySphereRotReverse = psSphereRotAlloc(0.0,
-                                          DEG_TO_RAD(-33.0),
-                                          0.0);
-    for (float r=0.1;r<180.0;r+=(DEG_INC/5.0)) {
-        for (float d=0.1;d<90.0;d+=(DEG_INC/5.0)) {
-            in.r = DEG_TO_RAD(r);
-            in.d = DEG_TO_RAD(d);
-            in.rErr = 0.0;
-            in.dErr = 0.0;
-
-            psSphereRotApply(&out, mySphereRotForward, &in);
-            psSphereRotApply(&out2, mySphereRotReverse, &out);
-
-            if ((fabs((in.r - out2.r) / in.r) > ERROR_PERCENT) ||
-                    (fabs((in.d - out2.d) / in.d) > ERROR_PERCENT)) {
-                printf("ERROR: \n");
-                printf("Input  coords (R, D) are (%f, %f)\n", in.r, in.d);
-                printf("Output coords (R, D) are (%f, %f)\n", out2.r, out2.d);
-                testStatus = 4;
-            }
-        }
-    }
-    psFree(mySphereRotForward);
-    psFree(mySphereRotReverse);
-
-    return(testStatus);
-}
-
-// Test point 1  ADD  ICRS(0,0) to Galactic (96.337272,-60.188553)
-//                              to Ecliptic (0,0) with T=1
-#define SPHERE_COORD_TP1_GAL_R           1.681409       //  96.337272 degrees
-#define SPHERE_COORD_TP1_GAL_D          -1.050488       // -60.188553 degrees
-#define SPHERE_COORD_TP1_ECL_R           0.0
-#define SPHERE_COORD_TP1_ECL_D           0.0
-#define SPHERE_COORD_TP1_INVERSE_R       0.0
-#define SPHERE_COORD_TP1_INVERSE_D       0.0
-
-// Test point 2 ADD  ICRS(0,90) to Galactic (122.93192, 27.12825)
-//                              to Ecliptic (90,66.560719) with T=1
-#define SPHERE_COORD_TP2_GAL_R           2.145567       // 122.93192 degrees
-#define SPHERE_COORD_TP2_GAL_D           0.473477       // 27.12825  degrees
-#define SPHERE_COORD_TP2_ECL_R           1.570796       // 90        degrees
-#define SPHERE_COORD_TP2_ECL_D           1.161704       // 66.560719 degrees
-#define SPHERE_COORD_TP2_INVERSE_R       0.0            // 0         degrees
-#define SPHERE_COORD_TP2_INVERSE_D       1.570796       // 90        degrees
-
-// Test point 3 ADD  ICRS(180,30) to Galactic (195.639488, 78.353806)
-//                                to Ecliptic (167.072470, 27.308813) with T=2
-#define SPHERE_COORD_TP3_GAL_R           3.414553       // 195.639488 degrees
-#define SPHERE_COORD_TP3_GAL_D           1.367532       // 78.353806  degrees
-#define SPHERE_COORD_TP3_ECL_R           2.915965       // 167.07247  degrees
-#define SPHERE_COORD_TP3_ECL_D           0.476629       // 27.308813  degrees
-#define SPHERE_COORD_TP3_INVERSE_R       3.141593       // 180.0      degrees
-#define SPHERE_COORD_TP3_INVERSE_D       0.523599       // 30.0       degrees
-
-psS32 testSphereRotApply3( void)
-{
-
-    psSphereRot*  testTransform;
-    psSphere*           inputCoord = psSphereAlloc();
-    psSphere*           outputCoord = NULL;
-    psSphere*           inverseOutputCoord = NULL;
-
-    inputCoord->r = SPHERE_COORD_TP1_INVERSE_R;
-    inputCoord->d = SPHERE_COORD_TP1_INVERSE_D;
-    inputCoord->rErr = 0.0;
-    inputCoord->dErr = 0.0;
-
-    // Set test date time to 1/1/2000 00:00:00
-    psTime* testDateTime = psTimeFromMJD(MJD_2000);
-
-    // Create transform ICRS to Galactic
-    testTransform = psSphereRotICRSToGalactic();
-
-    // Perform transform from ICRS to Galactic
-    outputCoord = psSphereRotApply(outputCoord,testTransform,inputCoord);
-    // Verify output not NULL and member values set correctly
-    if(outputCoord == NULL) {
-        psError(PS_ERR_UNKNOWN,true,"psSphereRotApply returned NULL");
-        return 1;
-    }
-    if(fabs(outputCoord->r - SPHERE_COORD_TP1_GAL_R) > ERROR_TOL) {
-        psError(PS_ERR_UNKNOWN,true,"psSphereRotApply return coord r %lg not as expected %lg",
-                outputCoord->r, SPHERE_COORD_TP1_GAL_R);
-        return 2;
-    }
-    if(fabs(outputCoord->d - SPHERE_COORD_TP1_GAL_D) > ERROR_TOL) {
-        psError(PS_ERR_UNKNOWN,true,"psSphereRotApply return coord d %ld not as expected %lg",
-                outputCoord->d, SPHERE_COORD_TP1_GAL_D);
-        return 3;
-    }
-    psFree(testTransform);
-
-    // Create inverse transform Galactic to ICRS
-    testTransform = psSphereRotGalacticToICRS();
-
-    // Perform transform from Galactic to ICRS
-    inverseOutputCoord = psSphereRotApply(inverseOutputCoord,testTransform,outputCoord);
-    // Verify output not NULL and member values set correctly
-    if(inverseOutputCoord == NULL) {
-        psError(PS_ERR_UNKNOWN,true,"psSphereRotApply returned NULL");
-        return 4;
-    }
-
-    if(fabs(inverseOutputCoord->r - SPHERE_COORD_TP1_INVERSE_R) > ERROR_TOL) {
-        psError(PS_ERR_UNKNOWN,true,"psSphereRotApply return coord r %lg not as expected %lg",
-                inverseOutputCoord->r, SPHERE_COORD_TP1_INVERSE_R);
-        return 5;
-    }
-    if(fabs(inverseOutputCoord->d - SPHERE_COORD_TP1_INVERSE_D) > ERROR_TOL) {
-        psError(PS_ERR_UNKNOWN,true,"psSphereRotApply return coord d %ld not as expected %lg",
-                inverseOutputCoord->d, SPHERE_COORD_TP1_INVERSE_D);
-        return 6;
-    }
-    psFree(testTransform);
-
-    // Create transform ICRS to Ecliptic
-    testTransform = psSphereRotICRSToEcliptic(testDateTime);
-
-    // Perform transform from ICRS to Ecliptic
-    outputCoord = psSphereRotApply(outputCoord,testTransform,inputCoord);
-    // Verify output not NULL and member values set correctly
-    if(outputCoord == NULL) {
-        psError(PS_ERR_UNKNOWN,true,"psSphereRotApply returned NULL");
-        return 7;
-    }
-    if(fabs(outputCoord->r - SPHERE_COORD_TP1_ECL_R) > ERROR_TOL) {
-        psError(PS_ERR_UNKNOWN,true,"psSphereRotApply return coord r %lg not as expected %lg",
-                outputCoord->r, SPHERE_COORD_TP1_ECL_R);
-        return 8;
-    }
-    if(fabs(outputCoord->d - SPHERE_COORD_TP1_ECL_D) > ERROR_TOL) {
-        psError(PS_ERR_UNKNOWN,true,"psSphereRotApply return coord d %ld not as expected %lg",
-                outputCoord->d, SPHERE_COORD_TP1_ECL_D);
-        return 9;
-    }
-    psFree(testTransform);
-
-    // Create inverse transform Ecliptic to ICRS
-    testTransform = psSphereRotEclipticToICRS(testDateTime);
-
-    // Perform transform from Ecliptic to ICRS
-    inverseOutputCoord = psSphereRotApply(inverseOutputCoord,testTransform,outputCoord);
-    // Verify output not NULL and member values set correctly
-    if(inverseOutputCoord == NULL) {
-        psError(PS_ERR_UNKNOWN,true,"psSphereRotApply returned NULL");
-        return 10;
-    }
-    if(fabs(inverseOutputCoord->r - SPHERE_COORD_TP1_INVERSE_R) > ERROR_TOL) {
-        psError(PS_ERR_UNKNOWN,true,"psSphereRotApply return coord r %lg not as expected %lg",
-                inverseOutputCoord->r, SPHERE_COORD_TP1_INVERSE_R);
-        return 11;
-    }
-    if(fabs(inverseOutputCoord->d - SPHERE_COORD_TP1_INVERSE_D) > ERROR_TOL) {
-        psError(PS_ERR_UNKNOWN,true,"psSphereRotApply return coord d %ld not as expected %lg",
-                inverseOutputCoord->d, SPHERE_COORD_TP1_INVERSE_D);
-        return 12;
-    }
-    psFree(testTransform);
-
-    psFree(testDateTime);
-    psFree(outputCoord);
-    psFree(inputCoord);
-    psFree(inverseOutputCoord);
-
-    return 0;
-}
-
-psS32 testSphereRotApply4( void)
-{
-
-    psSphereRot*  testTransform;
-    psSphere*           inputCoord = psSphereAlloc();
-    psSphere*           outputCoord = NULL;
-    psSphere*           inverseOutputCoord = NULL;
-
-    inputCoord->r = SPHERE_COORD_TP2_INVERSE_R;
-    inputCoord->d = SPHERE_COORD_TP2_INVERSE_D;
-    inputCoord->rErr = 0.0;
-    inputCoord->dErr = 0.0;
-
-    // Set test date time to 1/1/2000 00:00:00
-    psTime* testDateTime = psTimeFromMJD(MJD_2000);
-
-    // Create transform ICRS to Galactic
-    testTransform = psSphereRotICRSToGalactic();
-
-    // Perform transform from ICRS to Galactic
-    outputCoord = psSphereRotApply(outputCoord,testTransform,inputCoord);
-    // Verify output not NULL and member values set correctly
-    if(outputCoord == NULL) {
-        psError(PS_ERR_UNKNOWN,true,"psSphereRotApply returned NULL");
-        return 1;
-    }
-    if(fabs(outputCoord->r - SPHERE_COORD_TP2_GAL_R) > ERROR_TOL) {
-        psError(PS_ERR_UNKNOWN,true,"psSphereRotApply return coord r %lg not as expected %lg",
-                outputCoord->r, SPHERE_COORD_TP2_GAL_R);
-        return 2;
-    }
-    if(fabs(outputCoord->d - SPHERE_COORD_TP2_GAL_D) > ERROR_TOL) {
-        psError(PS_ERR_UNKNOWN,true,"psSphereRotApply return coord d %ld not as expected %lg",
-                outputCoord->d, SPHERE_COORD_TP2_GAL_D);
-        return 3;
-    }
-    psFree(testTransform);
-
-    // Create inverse transform Galactic to ICRS
-    testTransform = psSphereRotGalacticToICRS();
-
-    // Perform transform from Galactic to ICRS
-    inverseOutputCoord = psSphereRotApply(inverseOutputCoord,testTransform,outputCoord);
-    // Verify output not NULL and member values set correctly
-    if(inverseOutputCoord == NULL) {
-        psError(PS_ERR_UNKNOWN,true,"psSphereRotApply returned NULL");
-        return 4;
-    }
-    // atan2 function introduces some error with y close to zero, increased error tolerance
-    if(fabs(inverseOutputCoord->r - SPHERE_COORD_TP2_INVERSE_R) > ERROR_TOL+0.1) {
-        psError(PS_ERR_UNKNOWN,true,"psSphereRotApply return coord r %lg not as expected %lg",
-                inverseOutputCoord->r, SPHERE_COORD_TP2_INVERSE_R);
-        return 5;
-    }
-    if(fabs(inverseOutputCoord->d - SPHERE_COORD_TP2_INVERSE_D) > ERROR_TOL) {
-        psError(PS_ERR_UNKNOWN,true,"psSphereRotApply return coord d %ld not as expected %lg",
-                inverseOutputCoord->d, SPHERE_COORD_TP2_INVERSE_D);
-        return 6;
-    }
-    psFree(testTransform);
-
-    // Create transform ICRS to Ecliptic
-    testTransform = psSphereRotICRSToEcliptic(testDateTime);
-
-    // Perform transform from ICRS to Ecliptic
-    outputCoord = psSphereRotApply(outputCoord,testTransform,inputCoord);
-    // Verify output not NULL and member values set correctly
-    if(outputCoord == NULL) {
-        psError(PS_ERR_UNKNOWN,true,"psSphereRotApply returned NULL");
-        return 7;
-    }
-    if(fabs(outputCoord->r - SPHERE_COORD_TP2_ECL_R) > ERROR_TOL) {
-        psError(PS_ERR_UNKNOWN,true,"psSphereRotApply return coord r %lg not as expected %lg",
-                outputCoord->r, SPHERE_COORD_TP2_ECL_R);
-        return 8;
-    }
-    if(fabs(outputCoord->d - SPHERE_COORD_TP2_ECL_D) > ERROR_TOL) {
-        psError(PS_ERR_UNKNOWN,true,"psSphereRotApply return coord d %ld not as expected %lg",
-                outputCoord->d, SPHERE_COORD_TP2_ECL_D);
-        return 9;
-    }
-    psFree(testTransform);
-
-    // Create inverse transform Ecliptic to ICRS
-    testTransform = psSphereRotEclipticToICRS(testDateTime);
-
-    // Perform transform from Ecliptic to ICRS
-    inverseOutputCoord = psSphereRotApply(inverseOutputCoord,testTransform,outputCoord);
-    // Verify output not NULL and member values set correctly
-    if(inverseOutputCoord == NULL) {
-        psError(PS_ERR_UNKNOWN,true,"psSphereRotApply returned NULL");
-        return 10;
-    }
-    if(fabs(inverseOutputCoord->r - SPHERE_COORD_TP2_INVERSE_R) > ERROR_TOL) {
-        psError(PS_ERR_UNKNOWN,true,"psSphereRotApply return coord r %lg not as expected %lg",
-                inverseOutputCoord->r, SPHERE_COORD_TP2_INVERSE_R);
-        return 11;
-    }
-    if(fabs(inverseOutputCoord->d - SPHERE_COORD_TP2_INVERSE_D) > ERROR_TOL) {
-        psError(PS_ERR_UNKNOWN,true,"psSphereRotApply return coord d %ld not as expected %lg",
-                inverseOutputCoord->d, SPHERE_COORD_TP2_INVERSE_D);
-        return 12;
-    }
-    psFree(testTransform);
-
-    psFree(testDateTime);
-    psFree(outputCoord);
-    psFree(inputCoord);
-    psFree(inverseOutputCoord);
-
-    return 0;
-}
-
-psS32 testSphereRotApply5( void)
-{
-    psSphereRot*  testTransform;
-    psSphere*           inputCoord = psSphereAlloc();
-    psSphere*           outputCoord = NULL;
-    psSphere*           inverseOutputCoord = NULL;
-
-    inputCoord->r = SPHERE_COORD_TP3_INVERSE_R;
-    inputCoord->d = SPHERE_COORD_TP3_INVERSE_D;
-    inputCoord->rErr = 0.0;
-    inputCoord->dErr = 0.0;
-
-    // Set test date time to 1/1/2100 00:00:00
-    psTime* testDateTime = psTimeFromMJD(MJD_2100);
-
-    // Create transform ICRS to Galactic
-    testTransform = psSphereRotICRSToGalactic();
-
-    // Perform transform from ICRS to Galactic
-    outputCoord = psSphereRotApply(outputCoord,testTransform,inputCoord);
-    // Verify output not NULL and member values set correctly
-    if(outputCoord == NULL) {
-        psError(PS_ERR_UNKNOWN,true,"psSphereRotApply returned NULL");
-        return 1;
-    }
-    if(fabs(outputCoord->r - SPHERE_COORD_TP3_GAL_R) > ERROR_TOL) {
-        psError(PS_ERR_UNKNOWN,true,"psSphereRotApply return coord r %lg not as expected %lg",
-                outputCoord->r, SPHERE_COORD_TP3_GAL_R);
-        return 2;
-    }
-    if(fabs(outputCoord->d - SPHERE_COORD_TP3_GAL_D) > ERROR_TOL) {
-        psError(PS_ERR_UNKNOWN,true,"psSphereRotApply return coord d %ld not as expected %lg",
-                outputCoord->d, SPHERE_COORD_TP3_GAL_D);
-        return 3;
-    }
-    psFree(testTransform);
-
-    // Create inverse transform Galactic to ICRS
-    testTransform = psSphereRotGalacticToICRS();
-
-    // Perform transform from Galactic to ICRS
-    inverseOutputCoord = psSphereRotApply(inverseOutputCoord,testTransform,outputCoord);
-    // Verify output not NULL and member values set correctly
-    if(inverseOutputCoord == NULL) {
-        psError(PS_ERR_UNKNOWN,true,"psSphereRotApply returned NULL");
-        return 4;
-    }
-    if(fabs(inverseOutputCoord->r - SPHERE_COORD_TP3_INVERSE_R) > ERROR_TOL+0.1) {
-        psError(PS_ERR_UNKNOWN,true,"psSphereRotApply return coord r %lg not as expected %lg",
-                inverseOutputCoord->r, SPHERE_COORD_TP3_INVERSE_R);
-        return 5;
-    }
-    if(fabs(inverseOutputCoord->d - SPHERE_COORD_TP3_INVERSE_D) > ERROR_TOL) {
-        psError(PS_ERR_UNKNOWN,true,"psSphereRotApply return coord d %ld not as expected %lg",
-                inverseOutputCoord->d, SPHERE_COORD_TP3_INVERSE_D);
-        return 6;
-    }
-    psFree(testTransform);
-
-    // Create transform ICRS to Ecliptic
-    testTransform = psSphereRotICRSToEcliptic(testDateTime);
-
-    // Perform transform from ICRS to Ecliptic
-    outputCoord = psSphereRotApply(outputCoord,testTransform,inputCoord);
-    // Verify output not NULL and member values set correctly
-    if(outputCoord == NULL) {
-        psError(PS_ERR_UNKNOWN,true,"psSphereRotApply returned NULL");
-        return 7;
-    }
-    if(fabs(outputCoord->r - SPHERE_COORD_TP3_ECL_R) > ERROR_TOL) {
-        psError(PS_ERR_UNKNOWN,true,"psSphereRotApply return coord r %lg not as expected %lg",
-                outputCoord->r, SPHERE_COORD_TP3_ECL_R);
-        return 8;
-    }
-    if(fabs(outputCoord->d - SPHERE_COORD_TP3_ECL_D) > ERROR_TOL) {
-        psError(PS_ERR_UNKNOWN,true,"psSphereRotApply return coord d %ld not as expected %lg",
-                outputCoord->d, SPHERE_COORD_TP3_ECL_D);
-        return 9;
-    }
-    psFree(testTransform);
-
-    // Create inverse transform Ecliptic to ICRS
-    testTransform = psSphereRotEclipticToICRS(testDateTime);
-
-    // Perform transform from Ecliptic to ICRS
-    inverseOutputCoord = psSphereRotApply(inverseOutputCoord,testTransform,outputCoord);
-    // Verify output not NULL and member values set correctly
-    if(inverseOutputCoord == NULL) {
-        psError(PS_ERR_UNKNOWN,true,"psSphereRotApply returned NULL");
-        return 10;
-    }
-    if(fabs(inverseOutputCoord->r - SPHERE_COORD_TP3_INVERSE_R) > ERROR_TOL) {
-        psError(PS_ERR_UNKNOWN,true,"psSphereRotApply return coord r %lg not as expected %lg",
-                inverseOutputCoord->r, SPHERE_COORD_TP3_INVERSE_R);
-        return 11;
-    }
-    if(fabs(inverseOutputCoord->d - SPHERE_COORD_TP3_INVERSE_D) > ERROR_TOL) {
-        psError(PS_ERR_UNKNOWN,true,"psSphereRotApply return coord d %ld not as expected %lg",
-                inverseOutputCoord->d, SPHERE_COORD_TP3_INVERSE_D);
-        return 12;
-    }
-    psFree(testTransform);
-
-    psFree(testDateTime);
-    psFree(outputCoord);
-    psFree(inputCoord);
-    psFree(inverseOutputCoord);
-
-    return 0;
-}
-
-#define SPHERE_PRECESS_TP1_R            0.0               //    0.0       degrees
-#define SPHERE_PRECESS_TP1_D            0.0               //    0.0       degrees
-#define SPHERE_PRECESS_TP1_EXPECT_R     6.238453          //  357.437     degrees
-#define SPHERE_PRECESS_TP1_EXPECT_D    -0.019426          //   -1.113     degrees
-#define SPHERE_PRECESS_TP2_R            0.0               //    0.0       degrees
-#define SPHERE_PRECESS_TP2_D            1.570796          //   90.0       degrees
-#define SPHERE_PRECESS_TP2_EXPECT_R     6.260828          //  358.719     degrees
-#define SPHERE_PRECESS_TP2_EXPECT_D     1.551353          //   88.886     degrees
-#define SPHERE_PRECESS_TP3_R            3.141593          //  180.0       degrees
-#define SPHERE_PRECESS_TP3_D            0.523599          //   30.0       degrees
-#define SPHERE_PRECESS_TP3_EXPECT_R     3.096616          //  177.423     degrees
-#define SPHERE_PRECESS_TP3_EXPECT_D     0.543024          //   31.113     degrees
-
-psS32 testSphereRotPrecess( void )
-{
-    psSphere*     inputCoord  = psSphereAlloc();
-    psSphere*     outputCoord = NULL;
-    psTime*       fromTime    = psTimeFromMJD(MJD_2100);
-    psTime*       toTime      = psTimeFromMJD(MJD_1900);
-
-    // Set input coordinate
-    inputCoord->r = SPHERE_PRECESS_TP1_R;
-    inputCoord->d = SPHERE_PRECESS_TP1_D;
-    inputCoord->rErr = 0.0;
-    inputCoord->dErr = 0.0;
-
-    // Calculate precess
-    outputCoord = psSpherePrecess(inputCoord, fromTime, toTime);
-    // Verify return is not NULL
-    if(outputCoord == NULL) {
-        psError(PS_ERR_UNKNOWN,true,"Returned NULL not expected");
-        return 1;
-    }
-    // Verify return with expected values
-    if( fabs(outputCoord->r - SPHERE_PRECESS_TP1_EXPECT_R) > ERROR_TOL) {
-        psError(PS_ERR_UNKNOWN,true,"Precess r = %lg not equal to expected = %lg",
-                outputCoord->r,SPHERE_PRECESS_TP1_EXPECT_R);
-        return 2;
-    }
-    if( fabs(outputCoord->d - SPHERE_PRECESS_TP1_EXPECT_D) > ERROR_TOL) {
-        psError(PS_ERR_UNKNOWN,true,"Precess d = %lg not equal to expected = %lg",
-                outputCoord->d,SPHERE_PRECESS_TP1_EXPECT_D);
-        return 3;
-    }
-    psFree(outputCoord);
-
-    // Set input coordinate
-    inputCoord->r = SPHERE_PRECESS_TP2_R;
-    inputCoord->d = SPHERE_PRECESS_TP2_D;
-    inputCoord->rErr = 0.0;
-    inputCoord->dErr = 0.0;
-
-    // Calculate precess
-    outputCoord = psSpherePrecess(inputCoord, fromTime, toTime);
-    // Verify return is not NULL
-    if(outputCoord == NULL) {
-        psError(PS_ERR_UNKNOWN,true,"Returned NULL not expected");
-        return 4;
-    }
-    // Verify return with expected values
-    if( fabs(outputCoord->r - SPHERE_PRECESS_TP2_EXPECT_R) > ERROR_TOL) {
-        psError(PS_ERR_UNKNOWN,true,"Precess r = %lg not equal to expected = %lg",
-                outputCoord->r,SPHERE_PRECESS_TP2_EXPECT_R);
-        return 5;
-    }
-    if( fabs(outputCoord->d - SPHERE_PRECESS_TP2_EXPECT_D) > ERROR_TOL) {
-        psError(PS_ERR_UNKNOWN,true,"Precess d = %lg not equal to expected = %lg",
-                outputCoord->d,SPHERE_PRECESS_TP2_EXPECT_D);
-        return 6;
-    }
-    psFree(outputCoord);
-
-    // Set input coordinate
-    inputCoord->r = SPHERE_PRECESS_TP3_R;
-    inputCoord->d = SPHERE_PRECESS_TP3_D;
-    inputCoord->rErr = 0.0;
-    inputCoord->dErr = 0.0;
-
-    // Calculate precess
-    outputCoord = psSpherePrecess(inputCoord, fromTime, toTime);
-    // Verify return is not NULL
-    if(outputCoord == NULL) {
-        psError(PS_ERR_UNKNOWN,true,"Returned NULL not expected");
-        return 7;
-    }
-    // Verify return with expected values
-    if( fabs(outputCoord->r - SPHERE_PRECESS_TP3_EXPECT_R) > ERROR_TOL) {
-        psError(PS_ERR_UNKNOWN,true,"Precess r = %lg not equal to expected = %lg",
-                outputCoord->r,SPHERE_PRECESS_TP3_EXPECT_R);
-        return 8;
-    }
-    if( fabs(outputCoord->d - SPHERE_PRECESS_TP3_EXPECT_D) > ERROR_TOL) {
-        psError(PS_ERR_UNKNOWN,true,"Precess d = %lg not equal to expected = %lg",
-                outputCoord->d,SPHERE_PRECESS_TP3_EXPECT_D);
-        return 9;
-    }
-    psFree(outputCoord);
-
-    // Invoke precess with invalid parameter
-    psLogMsg(__func__,PS_LOG_INFO,"Following should generate an error message");
-    outputCoord = psSpherePrecess(inputCoord, fromTime, NULL);
-    if(outputCoord != NULL) {
-        psError(PS_ERR_UNKNOWN,true,"Did not return NULL with invalid input");
-        return 10;
-    }
-
-    // Invoke precess with invalid parameter
-    psLogMsg(__func__,PS_LOG_INFO,"Following should generate an error message");
-    outputCoord = psSpherePrecess(inputCoord, NULL, toTime);
-    if(outputCoord != NULL) {
-        psError(PS_ERR_UNKNOWN,true,"Did not return NULL with invalid input");
-        return 11;
-    }
-
-    // Invoke precess with invalid parameter
-    psLogMsg(__func__,PS_LOG_INFO,"Following should generate an error message");
-    outputCoord = psSpherePrecess(NULL, fromTime, toTime);
-    if(outputCoord != NULL) {
-        psError(PS_ERR_UNKNOWN,true,"Did not return NULL with invalid input");
-        return 12;
-    }
-
-    // Free objects
-    psFree(fromTime);
-    psFree(toTime);
-    psFree(inputCoord);
-
-    return 0;
-}
-
-psS32 testSphereRotICRSToEcliptic( void )
-{
-    psF64  expectedQ0 = 0.0;
-    psF64  expectedQ1 = 0.0;
-    psF64  expectedQ2 = 0.0;
-    psF64  expectedQ3 = 0.0;
-
-    // Set test date time to 1/1/2000 00:00:00
-    psTime* testDateTime = psTimeFromMJD(MJD_2000);
-
-    // Invoke function to set psSphereRota objec
-    psSphereRot *myST = psSphereRotICRSToEcliptic(testDateTime);
-
-    // Verify expected values for the specified time
-    if (ERROR_TOL < fabs(expectedQ0 - myST->q0)) {
-        psError(PS_ERR_UNKNOWN,true,"myST->q0 is %f, should be %f",
-                myST->q0, expectedQ0);
-        return 1;
-    }
-    if (ERROR_TOL < fabs(expectedQ1 - myST->q1)) {
-        psError(PS_ERR_UNKNOWN,true,"myST->q1 is %f, should be %f",
-                myST->q1, expectedQ1);
-        return 2;
-    }
-    if (ERROR_TOL < fabs(expectedQ2 - myST->q2)) {
-        psError(PS_ERR_UNKNOWN,true,"myST->q2 is %f, should be %f",
-                myST->q2, expectedQ2);
-        return 3;
-    }
-    if (ERROR_TOL < fabs(expectedQ3 - myST->q3)) {
-        psError(PS_ERR_UNKNOWN,true,"myST->q3 is %f, should be %f",
-                myST->q3, expectedQ3);
-        return 4;
-    }
-    psFree(myST);
-    psFree(testDateTime);
-
-    // Set test date time to 1/1/2100 00:00:00
-    testDateTime = psTimeFromMJD(MJD_2100);
-
-    // Invoke function to set psSphereRota objec
-    myST = psSphereRotICRSToEcliptic(testDateTime);
-
-    // Verify expected values for the specified time
-    // Verify expected values for the specified time
-    if (ERROR_TOL < fabs(expectedQ0 - myST->q0)) {
-        psError(PS_ERR_UNKNOWN,true,"myST->q0 is %f, should be %f",
-                myST->q0, expectedQ0);
-        return 5;
-    }
-    if (ERROR_TOL < fabs(expectedQ1 - myST->q1)) {
-        psError(PS_ERR_UNKNOWN,true,"myST->q1 is %f, should be %f",
-                myST->q1, expectedQ1);
-        return 6;
-    }
-    if (ERROR_TOL < fabs(expectedQ2 - myST->q2)) {
-        psError(PS_ERR_UNKNOWN,true,"myST->q2 is %f, should be %f",
-                myST->q2, expectedQ2);
-        return 7;
-    }
-    if (ERROR_TOL < fabs(expectedQ3 - myST->q3)) {
-        psError(PS_ERR_UNKNOWN,true,"myST->q3 is %f, should be %f",
-                myST->q3, expectedQ3);
-        return 8;
-    }
-    psFree(myST);
-    psFree(testDateTime);
-
-    // Verify if argument psTime is NULL, function returns NULL and error message generated
-    psLogMsg(__func__,PS_LOG_INFO,"Following should generate an error message");
-    myST = psSphereRotICRSToEcliptic(NULL);
-    if (myST != NULL) {
-        psError(PS_ERR_UNKNOWN,true,"psSphereRotICRSToEcliptic() did not return NULL.");
-        return 9;
-    }
-
-    // Verify if argument psTime is less than 1900, function return NULL and error msg generated
-    psLogMsg(__func__,PS_LOG_INFO,"Following should generate an error message");
-    testDateTime = psTimeFromMJD(MJD_1900 - 1.0);
-    myST = psSphereRotICRSToEcliptic(testDateTime);
-    if (myST != NULL) {
-        psError(PS_ERR_UNKNOWN,true,"psSphereRotICRSToEcliptic() did not return NULL.");
-        return 10;
-    }
-    psFree(testDateTime);
-
-    return 0;
-}
-
-
-psS32 testSphereRotEclipticToICRS( void )
-{
-    psF64  expectedPhiP = 0.0;
-    psF64  expectedAlphaP = 0.0;
-    psF64  expectedCosDeltaP = 0.0;
-    psF64  expectedSinDeltaP = 0.0;
-
-    // Set test date time to 1/1/2000 00:00:00
-    psTime* testDateTime = psTimeFromMJD(MJD_2000);
-
-    // Invoke function to set psSphereRota object
-    psSphereRot *myST = psSphereRotEclipticToICRS(testDateTime);
-
-    // Verify expected values for the specified time
-    if (ERROR_TOL < fabs(expectedSinDeltaP - myST->sinDeltaP)) {
-        psError(PS_ERR_UNKNOWN,true,"myST->sinDeltaP is %f, should be %f",
-                myST->sinDeltaP, expectedSinDeltaP);
-        return 1;
-    }
-    if (ERROR_TOL < fabs(expectedCosDeltaP - myST->cosDeltaP)) {
-        psError(PS_ERR_UNKNOWN,true,"myST->cosDeltaP is %f, should be %f",
-                myST->cosDeltaP, expectedCosDeltaP);
-        return 2;
-    }
-    if (ERROR_TOL < fabs(expectedAlphaP - myST->alphaP)) {
-        psError(PS_ERR_UNKNOWN,true,"myST->alphaP is %f, should be %f",
-                myST->alphaP, expectedAlphaP);
-        return 3;
-    }
-    if (ERROR_TOL < fabs(expectedPhiP - myST->phiP)) {
-        psError(PS_ERR_UNKNOWN,true,"myST->phiP is %f, should be %f",
-                myST->phiP, expectedPhiP);
-        return 4;
-    }
-    psFree(myST);
-    psFree(testDateTime);
-
-    expectedCosDeltaP = EXPECT_COS_DELTAP_2100;
-    expectedSinDeltaP = -EXPECT_SIN_DELTAP_2100;
-
-    // Set test date time to 1/1/2100 00:00:00
-    testDateTime = psTimeFromMJD(MJD_2100);
-
-    // Invoke function to set psSphereRota objec
-    myST = psSphereRotEclipticToICRS(testDateTime);
-
-    // Verify expected values for the specified time
-    if (ERROR_TOL < fabs(expectedSinDeltaP - myST->sinDeltaP)) {
-        psError(PS_ERR_UNKNOWN,true,"myST->sinDeltaP is %f, should be %f",
-                myST->sinDeltaP, expectedSinDeltaP);
-        return 5;
-    }
-    if (ERROR_TOL < fabs(expectedCosDeltaP - myST->cosDeltaP)) {
-        psError(PS_ERR_UNKNOWN,true,"myST->cosDeltaP is %f, should be %f",
-                myST->cosDeltaP, expectedCosDeltaP);
-        return 6;
-    }
-    if (ERROR_TOL < fabs(expectedAlphaP - myST->alphaP)) {
-        psError(PS_ERR_UNKNOWN,true,"myST->alphaP is %f, should be %f",
-                myST->alphaP, expectedAlphaP);
-        return 7;
-    }
-    if (ERROR_TOL < fabs(expectedPhiP - myST->phiP)) {
-        psError(PS_ERR_UNKNOWN,true,"myST->phiP is %f, should be %f",
-                myST->phiP, expectedPhiP);
-        return 8;
-    }
-    psFree(myST);
-    psFree(testDateTime);
-
-    // Verify if argument psTime is NULL, function returns NULL and error message generated
-    psLogMsg(__func__,PS_LOG_INFO,"Following should generate an error message");
-    myST = psSphereRotEclipticToICRS(NULL);
-    if (myST != NULL) {
-        psError(PS_ERR_UNKNOWN,true,"psSphereRotEclipticICRS() did not return NULL.");
-        return 9;
-    }
-
-    // Verify if argument psTime is less than 1900, function return NULL and error msg generated
-    psLogMsg(__func__,PS_LOG_INFO,"Following should generate an error message");
-    testDateTime = psTimeFromMJD(MJD_1900 - 1.0);
-    myST = psSphereRotEclipticToICRS(testDateTime);
-    if (myST != NULL) {
-        psError(PS_ERR_UNKNOWN,true,"psSphereRotEclipticToICRS() did not return NULL.");
-        return 10;
-    }
-    psFree(testDateTime);
-
-    return 0;
-}
-
-#define ITG_EXPECT_ALPHAP      4.93683
-#define ITG_EXPECT_SINDELTAP   0.88999
-#define ITG_EXPECT_COSDELTAP   0.45598
-#define ITG_EXPECT_PHIP        0.57477
-
-psS32 testSphereRotICRSToGalactic( void )
-{
-    // Invoke function
-    psSphereRot *myST = psSphereRotICRSToGalactic();
-
-    // Verify did not return NULL
-    if(myST == NULL) {
-        psError(PS_ERR_UNKNOWN,true,"psSphereRotICRSToGalactic returned NULL");
-        return 1;
-    }
-    // Verify returned structure has members set properly
-    if (ERROR_TOL < fabs(ITG_EXPECT_SINDELTAP - myST->sinDeltaP)) {
-        psError(PS_ERR_UNKNOWN,true,"myST->sinDeltaP is %f, should be %f",
-                myST->sinDeltaP, ITG_EXPECT_SINDELTAP);
-        return 2;
-    }
-    if (ERROR_TOL < fabs(ITG_EXPECT_COSDELTAP - myST->cosDeltaP)) {
-        psError(PS_ERR_UNKNOWN,true,"myST->cosDeltaP is %f, should be %f",
-                myST->cosDeltaP, ITG_EXPECT_COSDELTAP);
-        return 3;
-    }
-    if (ERROR_TOL < fabs(ITG_EXPECT_ALPHAP - myST->alphaP)) {
-        psError(PS_ERR_UNKNOWN,true,"myST->alphaP is %f, should be %f",
-                myST->alphaP, ITG_EXPECT_ALPHAP);
-        return 4;
-    }
-    if (ERROR_TOL < fabs(ITG_EXPECT_PHIP - myST->phiP)) {
-        psError(PS_ERR_UNKNOWN,true,"myST->phiP is %f, should be %f",
-                myST->phiP, ITG_EXPECT_PHIP);
-        return 5;
-    }
-    // Free data structure created
-    psFree(myST);
-
-    return 0;
-}
-
-#define GTI_EXPECT_PHIP        4.93683
-#define GTI_EXPECT_SINDELTAP  -0.88999
-#define GTI_EXPECT_COSDELTAP   0.45598
-#define GTI_EXPECT_ALPHAP      0.57477
-
-psS32 testSphereRotGalacticToICRS( void )
-{
-    // Invoke function
-    psSphereRot *myST = psSphereRotGalacticToICRS();
-
-    // Verify did not return NULL
-    if(myST == NULL) {
-        psError(PS_ERR_UNKNOWN,true,"psSphereRotGalacticToICRS returned NULL");
-        return 1;
-    }
-    // Verify returned structure has members set properly
-    if (ERROR_TOL < fabs(GTI_EXPECT_SINDELTAP - myST->sinDeltaP)) {
-        psError(PS_ERR_UNKNOWN,true,"myST->sinDeltaP is %f, should be %f",
-                myST->sinDeltaP, GTI_EXPECT_SINDELTAP);
-        return 2;
-    }
-    if (ERROR_TOL < fabs(GTI_EXPECT_COSDELTAP - myST->cosDeltaP)) {
-        psError(PS_ERR_UNKNOWN,true,"myST->cosDeltaP is %f, should be %f",
-                myST->cosDeltaP, GTI_EXPECT_COSDELTAP);
-        return 3;
-    }
-    if (ERROR_TOL < fabs(GTI_EXPECT_ALPHAP - myST->alphaP)) {
-        psError(PS_ERR_UNKNOWN,true,"myST->alphaP is %f, should be %f",
-                myST->alphaP, GTI_EXPECT_ALPHAP);
-        return 4;
-    }
-    if (ERROR_TOL < fabs(GTI_EXPECT_PHIP - myST->phiP)) {
-        psError(PS_ERR_UNKNOWN,true,"myST->phiP is %f, should be %f",
-                myST->phiP, GTI_EXPECT_PHIP);
-        return 5;
-    }
-    // Free data structure created
-    psFree(myST);
-
-    return 0;
-}
-
Index: trunk/psLib/test/astronomy/tst_psCoord01.c
===================================================================
--- trunk/psLib/test/astronomy/tst_psCoord01.c	(revision 4541)
+++ 	(revision )
@@ -1,917 +1,0 @@
-/**  @file  tst_psCoord01.c
-*
-*    @brief  The code will test several functions with PSLib source file
-*            psCoord.c
-*
-*    @author Eric Van Alst, MHPCC
-*
-*    @version $Revision: 1.4 $ $Name: not supported by cvs2svn $
-*    @date  $Date: 2005-04-07 20:27:41 $
-*
-*    Copyright 2005 Maui High Performance Computing Center, Univ. of Hawaii
-*/
-
-#include "pslib_strict.h"
-#include "psTest.h"
-
-static psS32 testProjectionAlloc(void);
-static psS32 testProjectTan(void);
-static psS32 testDeprojectTan(void);
-static psS32 testProjectSin(void);
-static psS32 testDeprojectSin(void);
-static psS32 testProjectAit(void);
-static psS32 testDeprojectAit(void);
-static psS32 testProjectPar(void);
-static psS32 testDeprojectPar(void);
-static psS32 testProjectFail(void);
-static psS32 testDeprojectFail(void);
-static psS32 testSetOffsetSphere(void);
-static psS32 testSetOffsetLinear(void);
-static psS32 testGetOffsetSphere(void);
-static psS32 testGetOffsetLinear(void);
-
-testDescription tests[] = {
-                              {testProjectionAlloc, 833, "psProjectionAlloc",0,false},
-                              {testProjectTan, 834, "psProject(TAN)",0,false},
-                              {testDeprojectTan, 835, "psDeproject(TAN)",0,false},
-                              {testProjectSin, 834, "psProject(SIN)",0,false},
-                              {testDeprojectSin, 835, "psDeproject(SIN)",0,false},
-                              {testProjectAit, 834, "psProject(AIT)",0,false},
-                              {testDeprojectAit, 835, "psDeproject(AIT)",0,false},
-                              {testProjectPar, 834, "psProject(PAR)",0,false},
-                              {testDeprojectPar, 835, "psDeproject(PAR)",0,false},
-                              {testProjectFail, 834, "psProject",0,false},
-                              {testDeprojectFail, 835, "psProject",0,false},
-                              {testSetOffsetSphere, 0000, "psSphereSetOffset",0,false},
-                              {testSetOffsetLinear, 0000, "psSphereSetOffset",0,false},
-                              {testGetOffsetSphere, 0000, "psSphereGetOffset",0,false},
-                              {testGetOffsetLinear, 0000, "psSphereGetOffset",0,false},
-                              {NULL}
-                          };
-
-
-#define ERROR_TOL    0.0001
-#define TESTPOINTS   4
-#define DEG_INC   30.0
-
-#define MY_TINY 0.0001
-#define PS_COMPARE_TINY_THEN_PRINT_ERROR(ACTUAL, EXPECT, TESTSTATUS) \
-if (MY_TINY < fabs(EXPECT - ACTUAL)) { \
-    psError(PS_ERR_UNKNOWN,true,"%s is %lg, should be %lg", #ACTUAL, ACTUAL, EXPECT, TESTSTATUS); \
-    return TESTSTATUS; \
-}
-
-
-//  alpha, delta, alpha-center, delta-center, scale-x, scale-y
-psF64 projectionTestPoint[TESTPOINTS][6] = {
-            {  0.785398,  0.785398,  0.000000,  0.000000,  1.000000,  1.000000 },
-            {  0.100000,  1.500000,  0.500000,  0.250000,  1.000000,  1.000000 },
-            {  0.628319,  0.448799,  0.000000,  0.000000,  0.250000,  0.750000 },
-            { -1.047196,  0.222222, -0.250000,  0.000000,  1.500000,  1.250000 }
-        };
-
-// Expected values for TAN
-psF64 projectionTanExpected[TESTPOINTS][2] = {
-            { -1.000000, -1.414214 },
-            {  0.088884, -3.066567 },
-            { -0.181636, -0.446444 },
-            {  1.535818, -0.404231 }
-        };
-
-// Expected values for SIN
-psF64 projectionSinExpected[TESTPOINTS][2] = {
-            { -0.500000, -0.707101 },
-            {  0.027546, -0.950366 },
-            { -0.132394, -0.325413 },
-            {  1.046712, -0.275497 }
-        };
-
-// Expected values for AIT
-psF64 projectionAitExpected[TESTPOINTS][2] = {
-            { -0.549175,  0.523375 },
-            {  0.027895,  0.313807 },
-            { -0.162822,  0.607646 },
-            {  1.455312,  0.955388 }
-        };
-
-// Expected values for PAR
-psF64 projectionParExpected[TESTPOINTS][2] = {
-            { -0.541244,  0.545532 },
-            {  0.027703,  0.329366 },
-            { -0.157157,  0.633550 },
-            {  1.432951,  0.971372 }
-        };
-
-// Testpoints, offset and expected values for psSphereSetOffset test
-#define TESTPOINTS_OFFSET  4
-psF64 setOffsetTestpoint[TESTPOINTS_OFFSET][2] = {
-            { 0.50,  0.50 },
-            {-0.50,  0.50 },
-            { 0.00,  0.00 },
-            { 1.50, -0.10 }
-        };
-
-psF64 setOffsetOffset[TESTPOINTS_OFFSET][2] = {
-            { 0.190761, -0.272205 },
-            {-0.553049, -0.460926 },
-            { 0.100335,-14.172222 },
-            {14.172222, -0.100335 }
-        };
-
-psF64 setOffsetResult[TESTPOINTS_OFFSET][2] = {
-            { 0.25,  0.75 },
-            { 0.20,  0.80 },
-            {-0.10,  1.50 },
-            { 0.00,  0.00 }
-        };
-
-psF64 getOffsetTestpoint1[TESTPOINTS_OFFSET][2] = {
-            { 0.00,  0.00 },
-            {-0.25,  0.50 },
-            { 0.50, -0.25 },
-            { 0.25, -0.10 }
-        };
-
-psF64 getOffsetTestpoint2[TESTPOINTS_OFFSET][2] = {
-            { 0.75,  0.25 },
-            { 0.40, -0.60 },
-            { 1.50,  0.50 },
-            { 0.10,  0.75 }
-        };
-
-psF64 getOffsetResult[TESTPOINTS_OFFSET][2] = {
-            { -0.931596, -0.348976 },
-            { -1.632830,  2.649629 },
-            { -2.166795, -1.707211 },
-            {  0.167752, -1.151351 }
-        };
-
-
-psS32 main( psS32 argc, char* argv[] )
-{
-    psLogSetLevel( PS_LOG_INFO );
-
-    return ( !runTestSuite(stderr,"psCoord",tests,argc,argv) );
-}
-
-psS32 testProjectionAlloc(void)
-{
-    // Allocate new psProjection structure
-    psProjection*  myProjection = psProjectionAlloc(1.1, 2.2, 3.3, 4.4, PS_PROJ_AIT);
-
-    // Verify NULL is not returned
-    if(myProjection == NULL) {
-        psError(PS_ERR_UNKNOWN,true,"Unexpected return of NULL");
-        return 1;
-    }
-    // Verify the members are set correctly
-    if(myProjection->R != 1.1) {
-        psError(PS_ERR_UNKNOWN,true,"R member set to %lg, but expected %lg",
-                myProjection->R, 1.1);
-        return 2;
-    }
-    if(myProjection->D != 2.2) {
-        psError(PS_ERR_UNKNOWN,true,"D member set to %lg, but expected %lg",
-                myProjection->D, 2.2);
-        return 3;
-    }
-    if(myProjection->Xs != 3.3) {
-        psError(PS_ERR_UNKNOWN,true,"Xs member set to %lg, but expected %lg",
-                myProjection->Xs, 3.3);
-        return 4;
-    }
-    if(myProjection->Ys != 4.4) {
-        psError(PS_ERR_UNKNOWN,true,"Ys member set to %lg, but expected %lg",
-                myProjection->Ys, 4.4);
-        return 5;
-    }
-    if(myProjection->type != PS_PROJ_AIT) {
-        psError(PS_ERR_UNKNOWN,true,"type member set to %d, but expected %d",
-                myProjection->type, PS_PROJ_AIT);
-        return 6;
-    }
-
-    // Free projection
-    psFree(myProjection);
-
-    return 0;
-}
-
-psS32 testProjectTan(void)
-{
-    psPlane*       out = NULL;
-    psSphere*      in = psSphereAlloc();
-    psProjection*  myProjection = psProjectionAlloc(0.0,0.0,1.0,1.0,PS_PROJ_TAN);
-
-    // Perform projecton on various test points
-    for(psS32 i = 0; i < TESTPOINTS; i++) {
-
-        // Initialize input and project members
-        in->r = projectionTestPoint[i][0];
-        in->d = projectionTestPoint[i][1];
-        myProjection->R = projectionTestPoint[i][2];
-        myProjection->D = projectionTestPoint[i][3];
-        myProjection->Xs = projectionTestPoint[i][4];
-        myProjection->Ys = projectionTestPoint[i][5];
-
-        // Perform projection
-        out = psProject(in, myProjection);
-
-        // Verify output not NULL
-        if(out == NULL) {
-            psError(PS_ERR_UNKNOWN,true,"Return null not expected");
-            return i*10;
-        }
-
-        // Verify output is as expected
-        if(fabs(out->x - projectionTanExpected[i][0]) > ERROR_TOL) {
-            psError(PS_ERR_UNKNOWN,true,"Testpoint %d  psPlane->x = %lg  expected %lg",
-                    i,out->x, projectionTanExpected[i][0]);
-            return i*10+1;
-        }
-        if(fabs(out->y - projectionTanExpected[i][1]) > ERROR_TOL) {
-            psError(PS_ERR_UNKNOWN,true,"Testpoint % d  psPlane->y = %lg  expected %lg",
-                    i,out->y, projectionTanExpected[i][1]);
-            return i*10+2;
-        }
-        psFree(out);
-    }
-
-    psFree(in);
-    psFree(myProjection);
-
-    return 0;
-}
-
-psS32 testDeprojectTan(void)
-{
-    psSphere*       out = NULL;
-    psPlane*        in = psPlaneAlloc();
-    psProjection*   myProjection = psProjectionAlloc(0.0,0.0,1.0,1.0,PS_PROJ_TAN);
-
-    // Perform deprojection on various test points
-    for(psS32 i = 0; i < TESTPOINTS; i++) {
-
-        // Initialize input and projection members
-        in->x = projectionTanExpected[i][0];
-        in->y = projectionTanExpected[i][1];
-        myProjection->R = projectionTestPoint[i][2];
-        myProjection->D = projectionTestPoint[i][3];
-        myProjection->Xs = projectionTestPoint[i][4];
-        myProjection->Ys = projectionTestPoint[i][5];
-
-        // Perform deprojection
-        out = psDeproject(in, myProjection);
-
-        // Verify output is not NULL
-        if(out == NULL) {
-            psError(PS_ERR_UNKNOWN,true,"Return null not expected");
-            return 20*i;
-        }
-
-        // Verify output is as expected
-        if(fabs(out->r - projectionTestPoint[i][0]) > ERROR_TOL) {
-            psError(PS_ERR_UNKNOWN,true,"Testpoint %d  psSphere->r = %lg  expected %lg",
-                    i,out->r,projectionTestPoint[i][0]);
-            return 20*i + 1;
-        }
-        if(fabs(out->d - projectionTestPoint[i][1]) > ERROR_TOL) {
-            psError(PS_ERR_UNKNOWN,true,"Testpoint %d  psSphere->d = %lg expected %lg",
-                    i, out->d, projectionTestPoint[i][1]);
-            return 20*i + 2;
-        }
-        psFree(out);
-    }
-
-    psFree(in);
-    psFree(myProjection);
-
-    return 0;
-}
-
-psS32 testProjectSin(void)
-{
-    psPlane*       out = NULL;
-    psSphere*      in = psSphereAlloc();
-    psProjection*  myProjection = psProjectionAlloc(0.0,0.0,1.0,1.0,PS_PROJ_SIN);
-
-    // Perform projecton on various test points
-    for(psS32 i = 0; i < TESTPOINTS; i++) {
-
-        // Initialize input and project members
-        in->r = projectionTestPoint[i][0];
-        in->d = projectionTestPoint[i][1];
-        myProjection->R = projectionTestPoint[i][2];
-        myProjection->D = projectionTestPoint[i][3];
-        myProjection->Xs = projectionTestPoint[i][4];
-        myProjection->Ys = projectionTestPoint[i][5];
-
-        // Perform projection
-        out = psProject(in, myProjection);
-
-        // Verify output not NULL
-        if(out == NULL) {
-            psError(PS_ERR_UNKNOWN,true,"Return null not expected");
-            return i*10;
-        }
-
-        // Verify output is as expected
-        if(fabs(out->x - projectionSinExpected[i][0]) > ERROR_TOL) {
-            psError(PS_ERR_UNKNOWN,true,"Testpoint %d  psPlane->x = %lg  expected %lg",
-                    i,out->x, projectionSinExpected[i][0]);
-            return i*10+1;
-        }
-        if(fabs(out->y - projectionSinExpected[i][1]) > ERROR_TOL) {
-            psError(PS_ERR_UNKNOWN,true,"Testpoint % d  psPlane->y = %lg  expected %lg",
-                    i,out->y, projectionSinExpected[i][1]);
-            return i*10+2;
-        }
-        psFree(out);
-    }
-
-    psFree(in);
-    psFree(myProjection);
-
-    return 0;
-}
-
-psS32 testDeprojectSin(void)
-{
-    psSphere*       out = NULL;
-    psPlane*        in = psPlaneAlloc();
-    psProjection*   myProjection = psProjectionAlloc(0.0,0.0,1.0,1.0,PS_PROJ_SIN);
-
-    // Perform deprojection on various test points
-    for(psS32 i = 0; i < TESTPOINTS; i++) {
-
-        // Initialize input and projection members
-        in->x = projectionSinExpected[i][0];
-        in->y = projectionSinExpected[i][1];
-        myProjection->R = projectionTestPoint[i][2];
-        myProjection->D = projectionTestPoint[i][3];
-        myProjection->Xs = projectionTestPoint[i][4];
-        myProjection->Ys = projectionTestPoint[i][5];
-
-        // Perform deprojection
-        out = psDeproject(in, myProjection);
-
-        // Verify output is not NULL
-        if(out == NULL) {
-            psError(PS_ERR_UNKNOWN,true,"Return null not expected");
-            return 20*i;
-        }
-
-        // Verify output is as expected
-        if(fabs(out->r - projectionTestPoint[i][0]) > ERROR_TOL) {
-            psError(PS_ERR_UNKNOWN,true,"Testpoint %d  psSphere->r = %lg  expected %lg",
-                    i,out->r,projectionTestPoint[i][0]);
-            return 20*i + 1;
-        }
-        if(fabs(out->d - projectionTestPoint[i][1]) > ERROR_TOL) {
-            psError(PS_ERR_UNKNOWN,true,"Testpoint %d  psSphere->d = %lg expected %lg",
-                    i, out->d, projectionTestPoint[i][1]);
-            return 20*i + 2;
-        }
-        psFree(out);
-    }
-
-    psFree(in);
-    psFree(myProjection);
-
-    return 0;
-}
-
-psS32 testProjectAit(void)
-{
-    psPlane*       out = NULL;
-    psSphere*      in = psSphereAlloc();
-    psProjection*  myProjection = psProjectionAlloc(0.0,0.0,1.0,1.0,PS_PROJ_AIT);
-
-    // Perform projecton on various test points
-    for(psS32 i = 0; i < TESTPOINTS; i++) {
-
-        // Initialize input and project members
-        in->r = projectionTestPoint[i][0];
-        in->d = projectionTestPoint[i][1];
-        myProjection->R = projectionTestPoint[i][2];
-        myProjection->D = projectionTestPoint[i][3];
-        myProjection->Xs = projectionTestPoint[i][4];
-        myProjection->Ys = projectionTestPoint[i][5];
-
-        // Perform projection
-        out = psProject(in, myProjection);
-
-        // Verify output not NULL
-        if(out == NULL) {
-            psError(PS_ERR_UNKNOWN,true,"Return null not expected");
-            return i*10;
-        }
-
-        // Verify output is as expected
-        if(fabs(out->x - projectionAitExpected[i][0]) > ERROR_TOL) {
-            psError(PS_ERR_UNKNOWN,true,"Testpoint %d  psPlane->x = %lg  expected %lg",
-                    i,out->x, projectionAitExpected[i][0]);
-            return i*10+1;
-        }
-        if(fabs(out->y - projectionAitExpected[i][1]) > ERROR_TOL) {
-            psError(PS_ERR_UNKNOWN,true,"Testpoint % d  psPlane->y = %lg  expected %lg",
-                    i,out->y, projectionAitExpected[i][1]);
-            return i*10+2;
-        }
-        psFree(out);
-    }
-
-    psFree(in);
-    psFree(myProjection);
-
-    return 0;
-}
-
-psS32 testDeprojectAit(void)
-{
-    psSphere*       out = NULL;
-    psPlane*        in = psPlaneAlloc();
-    psProjection*   myProjection = psProjectionAlloc(0.0,0.0,1.0,1.0,PS_PROJ_AIT);
-
-    // Perform deprojection on various test points
-    for(psS32 i = 0; i < TESTPOINTS; i++) {
-
-        // Initialize input and projection members
-        in->x = projectionAitExpected[i][0];
-        in->y = projectionAitExpected[i][1];
-        myProjection->R = projectionTestPoint[i][2];
-        myProjection->D = projectionTestPoint[i][3];
-        myProjection->Xs = projectionTestPoint[i][4];
-        myProjection->Ys = projectionTestPoint[i][5];
-
-        // Perform deprojection
-        out = psDeproject(in, myProjection);
-
-        // Verify output is not NULL
-        if(out == NULL) {
-            psError(PS_ERR_UNKNOWN,true,"Return null not expected");
-            return 20*i;
-        }
-
-        // Verify output is as expected
-        if(fabs(out->r - projectionTestPoint[i][0]) > ERROR_TOL) {
-            psError(PS_ERR_UNKNOWN,true,"Testpoint %d  psSphere->r = %lg  expected %lg",
-                    i,out->r,projectionTestPoint[i][0]);
-            return 20*i + 1;
-        }
-        if(fabs(out->d - projectionTestPoint[i][1]) > ERROR_TOL) {
-            psError(PS_ERR_UNKNOWN,true,"Testpoint %d  psSphere->d = %lg expected %lg",
-                    i, out->d, projectionTestPoint[i][1]);
-            return 20*i + 2;
-        }
-        psFree(out);
-    }
-
-    psFree(in);
-    psFree(myProjection);
-
-    return 0;
-}
-
-psS32 testProjectPar(void)
-{
-    psPlane*       out = NULL;
-    psSphere*      in = psSphereAlloc();
-    psProjection*  myProjection = psProjectionAlloc(0.0,0.0,1.0,1.0,PS_PROJ_PAR);
-
-    // Perform projecton on various test points
-    for(psS32 i = 0; i < TESTPOINTS; i++) {
-
-        // Initialize input and project members
-        in->r = projectionTestPoint[i][0];
-        in->d = projectionTestPoint[i][1];
-        myProjection->R = projectionTestPoint[i][2];
-        myProjection->D = projectionTestPoint[i][3];
-        myProjection->Xs = projectionTestPoint[i][4];
-        myProjection->Ys = projectionTestPoint[i][5];
-
-        // Perform projection
-        out = psProject(in, myProjection);
-
-        // Verify output not NULL
-        if(out == NULL) {
-            psError(PS_ERR_UNKNOWN,true,"Return null not expected");
-            return i*10;
-        }
-
-        // Verify output is as expected
-        if(fabs(out->x - projectionParExpected[i][0]) > ERROR_TOL) {
-            psError(PS_ERR_UNKNOWN,true,"Testpoint %d  psPlane->x = %lg  expected %lg",
-                    i,out->x, projectionParExpected[i][0]);
-            return i*10+1;
-        }
-        if(fabs(out->y - projectionParExpected[i][1]) > ERROR_TOL) {
-            psError(PS_ERR_UNKNOWN,true,"Testpoint % d  psPlane->y = %lg  expected %lg",
-                    i,out->y, projectionParExpected[i][1]);
-            return i*10+2;
-        }
-        psFree(out);
-    }
-
-    psFree(in);
-    psFree(myProjection);
-
-    return 0;
-}
-
-psS32 testDeprojectPar(void)
-{
-    psSphere*       out = NULL;
-    psPlane*        in = psPlaneAlloc();
-    psProjection*   myProjection = psProjectionAlloc(0.0,0.0,1.0,1.0,PS_PROJ_PAR);
-
-    // Perform deprojection on various test points
-    for(psS32 i = 0; i < TESTPOINTS; i++) {
-
-        // Initialize input and projection members
-        in->x = projectionParExpected[i][0];
-        in->y = projectionParExpected[i][1];
-        myProjection->R = projectionTestPoint[i][2];
-        myProjection->D = projectionTestPoint[i][3];
-        myProjection->Xs = projectionTestPoint[i][4];
-        myProjection->Ys = projectionTestPoint[i][5];
-
-        // Perform deprojection
-        out = psDeproject(in, myProjection);
-
-        // Verify output is not NULL
-        if(out == NULL) {
-            psError(PS_ERR_UNKNOWN,true,"Return null not expected");
-            return 20*i;
-        }
-
-        // Verify output is as expected
-        if(fabs(out->r - projectionTestPoint[i][0]) > ERROR_TOL) {
-            psError(PS_ERR_UNKNOWN,true,"Testpoint %d  psSphere->r = %lg  expected %lg",
-                    i,out->r,projectionTestPoint[i][0]);
-            return 20*i + 1;
-        }
-        if(fabs(out->d - projectionTestPoint[i][1]) > ERROR_TOL) {
-            psError(PS_ERR_UNKNOWN,true,"Testpoint %d  psSphere->d = %lg expected %lg",
-                    i, out->d, projectionTestPoint[i][1]);
-            return 20*i + 2;
-        }
-        psFree(out);
-    }
-
-    psFree(in);
-    psFree(myProjection);
-
-    return 0;
-}
-
-psS32 testProjectFail(void)
-{
-    psPlane*       out          = NULL;
-    psProjection*  myProjection = psProjectionAlloc(0.0,0.0,1.0,1.0,PS_PROJ_TAN);
-    psSphere*      in           = psSphereAlloc();
-
-    // Invoke function with null coordinate argument
-    psLogMsg(__func__,PS_LOG_INFO,"Following should generate an error message for null coord arg");
-    out = psProject(NULL, myProjection);
-    if(out != NULL) {
-        psError(PS_ERR_UNKNOWN,true,"Did not return null as expected");
-        return 1;
-    }
-
-    // Invoke function with null projection argument
-    psLogMsg(__func__,PS_LOG_INFO,"Following should generate an error message for null projection arg");
-    out = psProject(in, NULL);
-    if(out != NULL) {
-        psError(PS_ERR_UNKNOWN,true,"Did not return null as expected");
-        return 2;
-    }
-
-    // Invoke function with invalid projection type
-    psLogMsg(__func__,PS_LOG_INFO,"Following should generate an error message for invalid projection type");
-    myProjection->type = PS_PROJ_NTYPE;
-    out = psProject(in,myProjection);
-    if(out != NULL) {
-        psError(PS_ERR_UNKNOWN,true,"Did not return null as expected");
-        return 3;
-    }
-
-    psFree(myProjection);
-    psFree(in);
-
-    return 0;
-}
-
-psS32 testDeprojectFail(void)
-{
-    psSphere*      out          = NULL;
-    psProjection*  myProjection = psProjectionAlloc(0.0,0.0,1.0,1.0,PS_PROJ_TAN);
-    psPlane*       in           = psPlaneAlloc();
-
-    // Invoke function with null coordinate argument
-    psLogMsg(__func__,PS_LOG_INFO,"Following should generate an error message for null coord arg");
-    out = psDeproject(NULL, myProjection);
-    if(out != NULL) {
-        psError(PS_ERR_UNKNOWN,true,"Did not return null as expected");
-        return 1;
-    }
-
-    // Invoke function with null projection argument
-    psLogMsg(__func__,PS_LOG_INFO,"Following should generate an error message for null projection arg");
-    out = psDeproject(in, NULL);
-    if(out != NULL) {
-        psError(PS_ERR_UNKNOWN,true,"Did not return null as expected");
-        return 2;
-    }
-
-    // Invoke function with invalid projection type
-    psLogMsg(__func__,PS_LOG_INFO,"Following should generate an error message for invalid projection type");
-    myProjection->type = PS_PROJ_NTYPE;
-    out = psDeproject(in,myProjection);
-    if(out != NULL) {
-        psError(PS_ERR_UNKNOWN,true,"Did not return null as expected");
-        return 3;
-    }
-
-    psFree(myProjection);
-    psFree(in);
-
-    return 0;
-}
-
-psS32 testSetOffsetSphere( void )
-{
-    psSphere* position1 = psSphereAlloc();
-    psSphere* position2 = NULL;
-    psSphere* offset    = psSphereAlloc();
-    psSphere* tmpOffset = psSphereAlloc();
-
-    // Initialize first position
-    position1->r = DEG_TO_RAD(90.0);
-    position1->d = DEG_TO_RAD(45.0);
-    position1->rErr = 0.0;
-    position1->dErr = 0.0;
-
-    //  Using various offset verify spherical offset
-    //  Use all the valid unit types
-    for (psF64 r = 0.0; r < 180.0; r += DEG_INC) {
-        for (psF64 d = 0.0; d < 90.0; d += DEG_INC) {
-
-            offset->r = DEG_TO_RAD(r);
-            offset->d = DEG_TO_RAD(d);
-            offset->rErr = 0.0;
-            offset->dErr = 0.0;
-
-            position2 = psSphereSetOffset(position1, offset, PS_SPHERICAL, PS_RADIAN);
-            PS_COMPARE_TINY_THEN_PRINT_ERROR(position2->r, (position1->r + offset->r), 1);
-            PS_COMPARE_TINY_THEN_PRINT_ERROR(position2->d, (position1->d + offset->d), 2);
-            psFree(position2);
-
-            tmpOffset->r = RAD_TO_DEG(offset->r);
-            tmpOffset->d = RAD_TO_DEG(offset->d);
-            tmpOffset->rErr = 0.0;
-            tmpOffset->dErr = 0.0;
-            position2 = psSphereSetOffset(position1, tmpOffset, PS_SPHERICAL, PS_DEGREE);
-            PS_COMPARE_TINY_THEN_PRINT_ERROR(position2->r, (position1->r + offset->r), 3);
-            PS_COMPARE_TINY_THEN_PRINT_ERROR(position2->d, (position1->d + offset->d), 4);
-            psFree(position2);
-
-            tmpOffset->r = RAD_TO_MIN(offset->r);
-            tmpOffset->d = RAD_TO_MIN(offset->d);
-            tmpOffset->rErr = 0.0;
-            tmpOffset->dErr = 0.0;
-            position2 = psSphereSetOffset(position1, tmpOffset, PS_SPHERICAL, PS_ARCMIN);
-            PS_COMPARE_TINY_THEN_PRINT_ERROR(position2->r, (position1->r + offset->r), 5);
-            PS_COMPARE_TINY_THEN_PRINT_ERROR(position2->d, (position1->d + offset->d), 6);
-            psFree(position2);
-
-            tmpOffset->r = RAD_TO_SEC(offset->r);
-            tmpOffset->d = RAD_TO_SEC(offset->d);
-            tmpOffset->rErr = 0.0;
-            tmpOffset->dErr = 0.0;
-            position2 = psSphereSetOffset(position1, tmpOffset, PS_SPHERICAL, PS_ARCSEC);
-            PS_COMPARE_TINY_THEN_PRINT_ERROR(position2->r, (position1->r + offset->r), 7);
-            PS_COMPARE_TINY_THEN_PRINT_ERROR(position2->d, (position1->d + offset->d), 8);
-            psFree(position2);
-        }
-    }
-
-    // Attempt to call function with null input coordinate
-    psLogMsg(__func__,PS_LOG_INFO,"Following should generate error message null input coord");
-    position2 = psSphereSetOffset(NULL, offset, PS_LINEAR, PS_ARCSEC);
-    if (position2 != NULL) {
-        psError(PS_ERR_UNKNOWN,true,"Did not return NULL");
-        return 30;
-    }
-
-    // Attempt to call function with null offset
-    psLogMsg(__func__,PS_LOG_INFO,"Following should generate error message null offset");
-    position2 = psSphereSetOffset(position1, NULL, PS_LINEAR, PS_ARCSEC);
-    if (position2 != NULL) {
-        psError(PS_ERR_UNKNOWN,true,"Did not return NULL");
-        return 31;
-    }
-
-    // Attempt to call function with invalid mode
-    psLogMsg(__func__,PS_LOG_INFO,"Following should generate error message invalid mode");
-    position2 = psSphereSetOffset(position1, offset, 0x54321, 0);
-    if (position2 != NULL) {
-        psError(PS_ERR_UNKNOWN,true,"Did not return NULL");
-        return 32;
-    }
-
-    // Attempt to call function with invalid unit
-    psLogMsg(__func__,PS_LOG_INFO,"Following should generate an error message invalid unit");
-    position2 = psSphereSetOffset(position1, offset, PS_SPHERICAL, 0x54321);
-    if (position2 != NULL) {
-        psError(PS_ERR_UNKNOWN,true,"Did not return NULL");
-        return 33;
-    }
-
-    psFree(position1);
-    psFree(offset);
-    psFree(tmpOffset);
-
-    return 0;
-}
-
-psS32 testSetOffsetLinear(void)
-{
-    psSphere*   coord = psSphereAlloc();
-    psSphere*   offset = psSphereAlloc();
-    psSphere*   out = NULL;
-
-    for(psS32 i = 0; i < TESTPOINTS_OFFSET; i++) {
-
-        coord->r = setOffsetTestpoint[i][0];
-        coord->d = setOffsetTestpoint[i][1];
-
-        offset->r = setOffsetOffset[i][0];
-        offset->d = setOffsetOffset[i][1];
-
-        out = psSphereSetOffset(coord, offset, PS_LINEAR, PS_RADIAN);
-
-        if(fabs(out->r - setOffsetResult[i][0]) > ERROR_TOL) {
-            psError(PS_ERR_UNKNOWN,true,"Testpoint %d: Result out->r = %lg not equal to expected %lg",
-                    i, out->r, setOffsetResult[i][0]);
-            return i*10;
-        }
-        if(fabs(out->d - setOffsetResult[i][1]) > ERROR_TOL) {
-            psError(PS_ERR_UNKNOWN,true,"Testpoint %d: Result out->d = %lg not equal to expected %lg",
-                    i,out->d, setOffsetResult[i][1]);
-            return i*10+1;
-        }
-
-        psFree(out);
-    }
-
-    psFree(coord);
-    psFree(offset);
-
-    return 0;
-}
-
-psS32 testGetOffsetSphere( void )
-{
-    psSphere* position1 = psSphereAlloc();
-    psSphere* position2 = psSphereAlloc();
-    psSphere *offset = NULL;
-
-    position1->r = DEG_TO_RAD(90.0);
-    position1->d = DEG_TO_RAD(45.0);
-    position1->rErr = 0.0;
-    position1->dErr = 0.0;
-
-    for (psF64 r = 0.0; r < 180.0;r += DEG_INC) {
-        for (psF64 d = 0.0;d < 90.0; d += DEG_INC) {
-            position2->r = DEG_TO_RAD(r);
-            position2->d = DEG_TO_RAD(d);
-            position2->rErr = 0.0;
-            position2->dErr = 0.0;
-
-            offset = psSphereGetOffset( position1,  position2,
-                                        PS_SPHERICAL, PS_RADIAN);
-            PS_COMPARE_TINY_THEN_PRINT_ERROR(offset->r, (position2->r - position1->r), 1);
-            PS_COMPARE_TINY_THEN_PRINT_ERROR(offset->d, (position2->d - position1->d), 1);
-            psFree(offset);
-
-            offset = psSphereGetOffset( position1, position2,
-                                        PS_SPHERICAL, PS_DEGREE);
-            offset->r = DEG_TO_RAD(offset->r);
-            offset->d = DEG_TO_RAD(offset->d);
-            PS_COMPARE_TINY_THEN_PRINT_ERROR(offset->r, (position2->r - position1->r), 2);
-            PS_COMPARE_TINY_THEN_PRINT_ERROR(offset->d, (position2->d - position1->d), 3);
-            psFree(offset);
-
-            offset = psSphereGetOffset( position1,  position2,
-                                        PS_SPHERICAL, PS_ARCMIN);
-            offset->r = MIN_TO_RAD(offset->r);
-            offset->d = MIN_TO_RAD(offset->d);
-            PS_COMPARE_TINY_THEN_PRINT_ERROR(offset->r, (position2->r - position1->r), 2);
-            PS_COMPARE_TINY_THEN_PRINT_ERROR(offset->d, (position2->d - position1->d), 3);
-            psFree(offset);
-
-            offset = psSphereGetOffset( position1,  position2,
-                                        PS_SPHERICAL, PS_ARCSEC);
-            offset->r = SEC_TO_RAD(offset->r);
-            offset->d = SEC_TO_RAD(offset->d);
-            PS_COMPARE_TINY_THEN_PRINT_ERROR(offset->r, (position2->r - position1->r), 2);
-            PS_COMPARE_TINY_THEN_PRINT_ERROR(offset->d, (position2->d - position1->d), 3);
-            psFree(offset);
-        }
-    }
-
-    // Attempt to invoke function with null position 1 parameter
-    psLogMsg(__func__,PS_LOG_INFO,"Following should generate an error message for null position");
-    offset = psSphereGetOffset(NULL, position2, PS_LINEAR, 0);
-    if (offset != NULL) {
-        psError(PS_ERR_UNKNOWN,true,"Did not return NULL as expected");
-        return 10;
-    }
-
-    // Attempt to invoke function with null position 2 parameter
-    psLogMsg(__func__,PS_LOG_INFO,"Following should generate an error message for null position");
-    offset = psSphereGetOffset(position1, NULL, PS_LINEAR, 0);
-    if (offset != NULL) {
-        psError(PS_ERR_UNKNOWN,true,"Did not return NULL as expected");
-        return 11;
-    }
-
-    // Attempt to invoke function with invalid mode
-    psLogMsg(__func__,PS_LOG_INFO,"Following should generate an error message for invalid mode");
-    offset = psSphereGetOffset(position1, position2, 0x54321, 0);
-    if (offset != NULL) {
-        psError(PS_ERR_UNKNOWN,true,"Did not return NULL as expected");
-        return 12;
-    }
-
-    // Attempt to invoke function with invalid unit type
-    psLogMsg(__func__,PS_LOG_INFO,"Following should generate an error message for invalid unit type");
-    offset = psSphereGetOffset(position1, position2, PS_SPHERICAL, 0x54321);
-    if (offset != NULL) {
-        psError(PS_ERR_UNKNOWN,true,"Did not return NULL as expected");
-        return 13;
-    }
-
-    // Attempt to invoke function with coordinate 1 declination value 90.0 degree
-    position1->d = DEG_TO_RAD(90.0);
-    psLogMsg(__func__,PS_LOG_INFO,"Following should generate warning message");
-    offset = psSphereGetOffset(position1, position2, PS_SPHERICAL, PS_RADIAN);
-    if (offset != NULL) {
-        psError(PS_ERR_UNKNOWN,true,"Did not return NULL as expected");
-        return 14;
-    }
-
-    // Attempt to invoke function with coordinate 2 declination value 90.0 degree
-    position1->d = DEG_TO_RAD(45.0);
-    position2->d = DEG_TO_RAD(90.0);
-    psLogMsg(__func__,PS_LOG_INFO,"Following should generate warning message");
-    offset = psSphereGetOffset(position1, position2, PS_SPHERICAL, PS_RADIAN);
-    if (offset != NULL) {
-        psError(PS_ERR_UNKNOWN,true,"Did not return NULL as expected");
-        return 15;
-    }
-
-    psFree(position1);
-    psFree(position2);
-
-    return 0;
-}
-
-psS32 testGetOffsetLinear(void)
-{
-    psSphere*   coord1 = psSphereAlloc();
-    psSphere*   coord2 = psSphereAlloc();
-    psSphere*   out = NULL;
-
-    for(psS32 i = 0; i < TESTPOINTS_OFFSET; i++) {
-
-        coord1->r = getOffsetTestpoint1[i][0];
-        coord1->d = getOffsetTestpoint1[i][1];
-
-        coord2->r = getOffsetTestpoint2[i][0];
-        coord2->d = getOffsetTestpoint2[i][1];
-
-        out = psSphereGetOffset(coord1, coord2, PS_LINEAR, PS_RADIAN);
-
-        if(fabs(out->r - getOffsetResult[i][0]) > ERROR_TOL) {
-            psError(PS_ERR_UNKNOWN,true,"Testpoint %d: Result out->r = %lg not equal to expected %lg",
-                    i, out->r, getOffsetResult[i][0]);
-            return i*10;
-        }
-        if(fabs(out->d - getOffsetResult[i][1]) > ERROR_TOL) {
-            psError(PS_ERR_UNKNOWN,true,"Testpoint %d: Result out->d = %lg not equal to expected %lg",
-                    i,out->d, getOffsetResult[i][1]);
-            return i*10+1;
-        }
-
-        psFree(out);
-    }
-
-    psFree(coord1);
-    psFree(coord2);
-
-    return 0;
-}
-
-
Index: trunk/psLib/test/astronomy/tst_psTime_01.c
===================================================================
--- trunk/psLib/test/astronomy/tst_psTime_01.c	(revision 4541)
+++ 	(revision )
@@ -1,1160 +1,0 @@
-/** @file  tst_psTime_01.c
- *
- *  @brief Test driver for psTime functions
- *
- *  This test driver contains the following tests for psTime:
- *     1) Allocate psTime structure
- *     2) Get current time
- *     3) Get UT1 UTC delta
- *     4) Convert psTime to MJD
- *     5) Convert psTime to JD
- *     6) Convert psTime to ISO
- *     7) Convert psTime to timeval
- *     8) Create psTime from MJD
- *     9) Create psTime from JD
- *    10) Create psTime from ISO
- *    11) Create psTime from timeval
- *    12) Create psTime from TM
- *    13) Convert time between different types
- *
- *     O) Convert psTime time to LMST
- *
- *  @author  Ross Harman, MHPCC
- *  @author  Eric Van Alst, MHPCC
- *
- *  @version $Revision: 1.27 $  $Name: not supported by cvs2svn $
- *  @date  $Date: 2005-06-10 01:41:35 $
- *
- *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
- *
- */
-
-#include "pslib_strict.h"
-#include "psTest.h"
-#include <string.h>
-
-#define ERROR_TOL    0.0001
-
-static psS32 testTimeAlloc(void);
-static psS32 testTimeGetNow(void);
-static psS32 testTimeGetUT1Delta(void);
-static psS32 testTimeToMJD(void);
-static psS32 testTimeToJD(void);
-static psS32 testTimeToISO(void);
-static psS32 testTimeToTimeval(void);
-static psS32 testTimeFromMJD(void);
-static psS32 testTimeFromJD(void);
-static psS32 testTimeFromISO(void);
-static psS32 testTimeFromTimeval(void);
-static psS32 testTimeFromTM(void);
-static psS32 testTimeConvert(void);
-
-testDescription tests[] = {
-                              {testTimeAlloc,000,"psTimeAlloc",0,false},
-                              {testTimeGetNow,000,"psTimeGetNow",0,false},
-                              {testTimeGetUT1Delta,000,"psTimeGetUT1Delta",0,false},
-                              {testTimeToMJD,000,"psTimeToMJD",0,false},
-                              {testTimeToJD,000,"psTimeToJD",0,false},
-                              {testTimeToISO,000,"psTimeToISO",0,false},
-                              {testTimeToTimeval,000,"psTimeToTimeval",0,false},
-                              {testTimeFromMJD,000,"psTimeFromMJD",0,false},
-                              {testTimeFromJD,000,"psTimeFromJD",0,false},
-                              {testTimeFromISO,000,"psTimeFromISO",0,false},
-                              {testTimeFromTimeval,000,"psTimeFromTimeval",0,false},
-                              {testTimeFromTM,000,"p_psTimeFromTM",0,false},
-                              {testTimeConvert,000,"psTimeConvert",0,false},
-                              {NULL}
-                          };
-
-// Test Time 1 : July 21, 2004  18:22:24.3
-//               MJD = 53207.765559
-//               JD = 2453208.265559
-// UTC Test Time 1
-const psS64 testTime1SecondsUTC     = 1090434144;
-const psU32 testTime1NanosecondsUTC = 272044000;
-// TAI Test Time 1
-const psS64 testTime1SecondsTAI     = 1090434176;
-const psU32 testTime1NanosecondsTAI = 272044000;
-const psF64 testTime1MJDTAI         = 53207.76592937;
-const psF64 testTime1JDTAI          = 2453208.26592937;
-
-// TT Test Time 1
-const psS64 testTime1SecondsTT      = 1090434208;
-const psU32 testTime1NanosecondsTT  = 456044000;
-// Expected UT1-UTC IERS A & B
-const psF64 testTime1UT1DeltaBullA  = -0.457233186;
-const psF64 testTime1UT1DeltaBullB  = -0.457227;
-// UT1 Test Time 1
-const psS64 testTime1SecondsUT1     = 1090434143;
-const psU32 testTime1NanosecondsUT1 = 814810814;
-// Expected MJD & JD
-const psF64 testTime1MJD            = 53207.765559;
-const psF64 testTime1JD             = 2453208.265559;
-// Expected ISO string
-const char* testTime1Str     = "2004-07-21T18:22:24,2Z";
-const char* testTime1StrLeap = "2004-07-21T18:22:60,2Z";
-// Expected timeval values
-const psS32 testTime1TimevalSec = 1090434144;
-const psS32 testTime1TimevalUsec = 272044;
-
-// Test Time 2 : Jan. 1, 1973 00:00:00.0000
-//               MJD = 41683.0000
-//               JD = 2441683.5000
-const psS64 testTime2SecondsUTC     = 94694400;
-const psU32 testTime2NanosecondsUTC = 0;
-
-// Expected UT1-UTC IERS A & B
-const psF64 testTime2UT1DeltaBullA  = 0.000000;
-const psF64 testTime2UT1DeltaBullB  = 0.000000;
-
-// Test Time 3 : Sept. 21, 2006 00:00:00.0000
-//               MJD = 53999
-//               JD = 2453999.5
-const psS64 testTime3SecondsUTC     = 1158796800;
-const psU32 testTime3NanosecondsUTC = 0;
-// Expected UT1-UTC IERS A & B
-const psF64 testTime3UT1DeltaBullA  = -0.63574;
-const psF64 testTime3UT1DeltaBullB  = -0.63574;
-
-// Test Time 4 : Jan. 1, 1969 00:00:00.0000
-//               MJD = 40222
-//               JD = 2440222.5
-const psS64 testTime4SecondsUTC     = -31536000;
-const psU32 testTime4NanosecondsUTC = 0;
-// Expected MJD and JD
-const psF64 testTime4MJD            = 40222.0;
-const psF64 testTime4JD             = 2440222.5;
-
-// Test Time 5 : Dec 31, 0001 BC 23:59:59
-//               MJD = -1397755
-//               JD = 1002245.4999
-const psS64 testTime5SecondsUTC     = -62125920001;
-const psU32 testTime5NanosecondsUTC  = 0;
-
-// Test Time 6 : Jan. 1, 10000 AD 00:00:00
-const psS64 testTime6SecondsUTC      = 253202544001;
-const psU32 testTime6NanosecondsUTC  = 0;
-
-// Test Time 7 : Jan. 1, 2004 00:00:00,0
-const psS64 testTime7Seconds         = 1072915200;
-const psU32 testTime7Nanoseconds     = 0;
-const psS32 testTime7TmYear          = 104;
-const psS32 testTime7TmMon           = 0;
-const psS32 testTime7TmDay           = 1;
-const psS32 testTime7TmHour          = 0;
-const psS32 testTime7TmMin           = 0;
-const psS32 testTime7TmSec           = 0;
-
-// Test Time 8 : Dec. 31, 2003 00:00:00,0
-const psS64 testTime8Seconds         = 1072828800;
-const psU32 testTime8Nanoseconds     = 0;
-const psS32 testTime8TmYear          = 103;
-const psS32 testTime8TmMon           = 11;
-const psS32 testTime8TmDay           = 31;
-const psS32 testTime8TmHour          = 0;
-const psS32 testTime8TmMin           = 0;
-const psS32 testTime8TmSec           = 0;
-
-psS32 main(psS32 argc, char* argv[])
-{
-    psLogSetLevel(PS_LOG_INFO);
-
-    // Initialize library internal structures
-    psLibInit("psTime.config");
-
-    if( !runTestSuite(stderr,"psTime",tests,argc,argv)) {
-        return 1;
-    }
-
-    // Cleanup library
-    psLibFinalize();
-
-    return 0;
-}
-
-psS32 testTimeAlloc(void)
-{
-    psTime*  time = NULL;
-
-    // Allocate new psTime with valid time type
-    time = psTimeAlloc(PS_TIME_TAI);
-    if(time == NULL) {
-        psError(PS_ERR_UNKNOWN,true,"Return NULL when psTime object ptr expected");
-        return 1;
-    }
-    // Verify members set properly
-    if(time->type != PS_TIME_TAI) {
-        psError(PS_ERR_UNKNOWN,true,"Member type = %d not as expected %d",time->type,PS_TIME_TAI);
-        return 2;
-    }
-    if((time->sec != 0) && (time->nsec != 0) && (time->leapsecond != false)) {
-        psError(PS_ERR_UNKNOWN,true,"Members not set appropriately");
-        return 3;
-    }
-    psFree(time);
-
-    // Allocate new psTime with invalid time type
-    psLogMsg(__func__,PS_LOG_INFO,"Following should generate error message");
-    time = psTimeAlloc(-100);
-    if(time != NULL) {
-        psError(PS_ERR_UNKNOWN,true,"Did not return NULL for invalid time type");
-        return 4;
-    }
-
-    return 0;
-}
-psS32 testTimeGetNow(void)
-{
-    psTime*  timeNow = NULL;
-
-    // Get current time and verify return is psTime structure
-    timeNow = psTimeGetNow(PS_TIME_TAI);
-    if(timeNow == NULL) {
-        psError(PS_ERR_UNKNOWN,true,"Did not return valid psTime struct");
-        return 1;
-    }
-    if(timeNow->type != PS_TIME_TAI) {
-        psError(PS_ERR_UNKNOWN,true,"Time type %d not as expected %d",
-                timeNow->type, PS_TIME_TAI);
-        return 2;
-    }
-    psFree(timeNow);
-
-    // Attempt to get time with invalid type
-    psLogMsg(__func__,PS_LOG_INFO,"Following should generate an error message for invalid time type");
-    timeNow = psTimeGetNow(-100);
-    if(timeNow != NULL) {
-        psError(PS_ERR_UNKNOWN,true,"Did not return NULL for invalid time type");
-        return 3;
-    }
-
-    return 0;
-}
-
-psS32 testTimeGetUT1Delta(void)
-{
-    psTime*    time      = NULL;
-    psF64      ut1Delta  = 0.0;
-
-    // Attempt to convert NULL time
-    psLogMsg(__func__,PS_LOG_INFO,"Following should generate an error message for NULL time");
-    ut1Delta = psTimeGetUT1Delta(time,PS_IERS_B);
-    if( !isnan(ut1Delta)) {
-        psError(PS_ERR_UNKNOWN,true,"Did not return NAN for NULL psTime");
-        return 1;
-    }
-
-    // Attempt to convert invalid time
-    time = psTimeAlloc(PS_TIME_TAI);
-    time->sec = 1;
-    time->nsec = 2e9;
-    time->leapsecond = false;
-    psLogMsg(__func__,PS_LOG_INFO,"Following should generate an error message for invalid time");
-    ut1Delta = psTimeGetUT1Delta(time,PS_IERS_B);
-    if( !isnan(ut1Delta)) {
-        psError(PS_ERR_UNKNOWN,true,"Did not return NAN for invalid time");
-        return 2;
-    }
-
-    // Attempt to convert time with invalid bulletin
-    psLogMsg(__func__,PS_LOG_INFO,"Following should generate an error message for invalid bulletin");
-    time->nsec = 2;
-    ut1Delta = psTimeGetUT1Delta(time,-100);
-    if( !isnan(ut1Delta)) {
-        psError(PS_ERR_UNKNOWN,true,"Did not return NAN for invalid bulletin");
-        return 3;
-    }
-
-    // Attempt to get delta with valid time and bulletin A
-    time->sec  = testTime1SecondsUTC;
-    time->nsec = testTime1NanosecondsUTC;
-    time->type = PS_TIME_UTC;
-    ut1Delta = psTimeGetUT1Delta(time,PS_IERS_A);
-    if(fabs(ut1Delta - testTime1UT1DeltaBullA) > ERROR_TOL) {
-        psError(PS_ERR_UNKNOWN,true,"UT1 Delta %lf not as expected %lf test time 1 bulletin A",
-                ut1Delta,testTime1UT1DeltaBullA);
-        return 4;
-    }
-
-    // Attempt to get delta with valid time and bulletin B
-    ut1Delta = psTimeGetUT1Delta(time,PS_IERS_B);
-    if(fabs(ut1Delta - testTime1UT1DeltaBullB) > ERROR_TOL) {
-        psError(PS_ERR_UNKNOWN,true,"UT1 Delta %lf not as expected %lf test time 1 bulletin B",
-                ut1Delta,testTime1UT1DeltaBullB);
-        return 5;
-    }
-
-    // Attempt to get delta with valid time and bulletin A
-    time->sec  = testTime2SecondsUTC;
-    time->nsec = testTime2NanosecondsUTC;
-    time->type = PS_TIME_UTC;
-    psLogMsg(__func__,PS_LOG_INFO,"Following should generate a warning message predating table");
-    ut1Delta = psTimeGetUT1Delta(time,PS_IERS_A);
-    if(fabs(ut1Delta - testTime2UT1DeltaBullA) > ERROR_TOL) {
-        psError(PS_ERR_UNKNOWN,true,"UT1 Delta %lf not as expected %lf test time 2 bulletin A",
-                ut1Delta,testTime2UT1DeltaBullA);
-        return 6;
-    }
-
-    // Attempt to get delta with valid time and bulletin B
-    psLogMsg(__func__,PS_LOG_INFO,"Following should generate a warning message predating table");
-    ut1Delta = psTimeGetUT1Delta(time,PS_IERS_B);
-    if(fabs(ut1Delta - testTime2UT1DeltaBullB) > ERROR_TOL) {
-        psError(PS_ERR_UNKNOWN,true,"UT1 Delta %lf not as expected %lf test time 2 bulletin B",
-                ut1Delta,testTime2UT1DeltaBullB);
-        return 7;
-    }
-
-    // Attempt to get delta with valid time and bulletin A
-    time->sec  = testTime3SecondsUTC;
-    time->nsec = testTime3NanosecondsUTC;
-    time->type = PS_TIME_UTC;
-    psLogMsg(__func__,PS_LOG_INFO,"Following should generate a warning message postdating table");
-    ut1Delta = psTimeGetUT1Delta(time,PS_IERS_A);
-    if(fabs(ut1Delta - testTime3UT1DeltaBullA) > ERROR_TOL) {
-        psError(PS_ERR_UNKNOWN,true,"UT1 Delta %lf not as expected %lf test time 3 bulletin A",
-                ut1Delta,testTime3UT1DeltaBullA);
-        return 8;
-    }
-
-    // Attempt to get delta with valid time and bulletin B
-    psLogMsg(__func__,PS_LOG_INFO,"Following should generate a warning message postdating table");
-    ut1Delta = psTimeGetUT1Delta(time,PS_IERS_B);
-    if(fabs(ut1Delta - testTime3UT1DeltaBullB) > ERROR_TOL) {
-        psError(PS_ERR_UNKNOWN,true,"UT1 Delta %lf not as expected %lf test time 3 bulletin B",
-                ut1Delta,testTime3UT1DeltaBullB);
-        return 9;
-    }
-
-    psFree(time);
-
-    return 0;
-}
-
-psS32 testTimeToMJD(void)
-{
-    psTime*  time = NULL;
-    psF64    mjd  = 0.0;
-
-    // Attempt to convert with time NULL
-    psLogMsg(__func__,PS_LOG_INFO,"Following should generate an error message for NULL time");
-    mjd = psTimeToMJD(NULL);
-    if(!isnan(mjd)) {
-        psError(PS_ERR_UNKNOWN,true,"Expected NaN for NULL time");
-        return 1;
-    }
-
-    // Attempt to convert invalid time
-    time = psTimeAlloc(PS_TIME_UTC);
-    time->sec = 1;
-    time->nsec = 2e9;
-    time->leapsecond = false;
-    psLogMsg(__func__,PS_LOG_INFO,"Following should generate an error message for invalid time");
-    mjd = psTimeToMJD(time);
-    if( !isnan(mjd)) {
-        psError(PS_ERR_UNKNOWN,true,"Did not return NAN for invalid time");
-        return 2;
-    }
-
-    // Check valid time conversion to MJD after 1/1/1970 epoch
-    time->sec = testTime1SecondsUTC;
-    time->nsec = testTime1NanosecondsUTC;
-    mjd = psTimeToMJD(time);
-    if(fabs(mjd - testTime1MJD) > ERROR_TOL) {
-        psError(PS_ERR_UNKNOWN,true,"Expected MJD = %lf not as expected %lf",
-                mjd, testTime1MJD);
-        return 3;
-    }
-
-    // Check valid time conversion to MJD before 1/1/1970 epoch
-    time->sec = testTime4SecondsUTC;
-    time->nsec = testTime4NanosecondsUTC;
-    mjd = psTimeToMJD(time);
-    if(fabs(mjd - testTime4MJD) > ERROR_TOL) {
-        psError(PS_ERR_UNKNOWN,true,"Expected MJD = %lf not as expected %lf",
-                mjd, testTime4MJD);
-        return 4;
-    }
-
-    psFree(time);
-
-    return 0;
-}
-
-psS32 testTimeToJD(void)
-{
-    psTime*  time = NULL;
-    psF64    jd  = 0.0;
-
-    // Attempt to convert with time NULL
-    psLogMsg(__func__,PS_LOG_INFO,"Following should generate an error message for NULL time");
-    jd = psTimeToJD(NULL);
-    if(!isnan(jd)) {
-        psError(PS_ERR_UNKNOWN,true,"Expected NaN for NULL time");
-        return 1;
-    }
-
-    // Attempt to convert invalid time
-    time = psTimeAlloc(PS_TIME_UTC);
-    time->sec = 1;
-    time->nsec = 2e9;
-    time->leapsecond = false;
-    psLogMsg(__func__,PS_LOG_INFO,"Following should generate an error message for invalid time");
-    jd = psTimeToJD(time);
-    if( !isnan(jd)) {
-        psError(PS_ERR_UNKNOWN,true,"Did not return NAN for invalid time");
-        return 2;
-    }
-
-    // Check valid time conversion to MJD after 1/1/1970 epoch
-    time->sec = testTime1SecondsUTC;
-    time->nsec = testTime1NanosecondsUTC;
-    jd = psTimeToJD(time);
-    if(fabs(jd - testTime1JD) > ERROR_TOL) {
-        psError(PS_ERR_UNKNOWN,true,"Expected JD = %lf not as expected %lf",
-                jd, testTime1JD);
-        return 3;
-    }
-
-    // Check valid time conversion to MJD before 1/1/1970 epoch
-    time->sec = testTime4SecondsUTC;
-    time->nsec = testTime4NanosecondsUTC;
-    jd = psTimeToJD(time);
-    if(fabs(jd - testTime4JD) > ERROR_TOL) {
-        psError(PS_ERR_UNKNOWN,true,"Expected JD = %lf not as expected %lf",
-                jd, testTime4JD);
-        return 4;
-    }
-
-    psFree(time);
-
-    return 0;
-}
-
-psS32 testTimeToISO(void)
-{
-    psTime*    time    = NULL;
-    char*      timeStr = NULL;
-
-    // Attempt to convert with NULL time
-    psLogMsg(__func__,PS_LOG_INFO,"Following should generate error message for NULL time");
-    timeStr = psTimeToISO(time);
-    if(timeStr != NULL) {
-        psError(PS_ERR_UNKNOWN,true,"Did not return NULL as expected");
-        return 1;
-    }
-
-    // Attempt to convert invalid time
-    time = psTimeAlloc(PS_TIME_UTC);
-    time->sec = 1;
-    time->nsec = 2e9;
-    time->leapsecond = false;
-    psLogMsg(__func__,PS_LOG_INFO,"Following should generate an error message for invalid time");
-    timeStr = psTimeToISO(time);
-    if( timeStr != NULL) {
-        psError(PS_ERR_UNKNOWN,true,"Did not return NULL for invalid time");
-        return 2;
-    }
-
-    // Verify return NULL for time prior to year 0000
-    time->sec = testTime5SecondsUTC;
-    time->nsec = testTime5NanosecondsUTC;
-    psLogMsg(__func__,PS_LOG_INFO,"Following should generate error message for time prior year 0000");
-    timeStr = psTimeToISO(time);
-    if(timeStr != NULL) {
-        psError(PS_ERR_UNKNOWN,true,"Did not return NULL for time prior to year 0000");
-        return 3;
-    }
-
-    // Verify return NULL for time after to year 9999
-    time->sec = testTime6SecondsUTC;
-    time->nsec = testTime6NanosecondsUTC;
-    psLogMsg(__func__,PS_LOG_INFO,"Following should generate error message for time after year 9999");
-    timeStr = psTimeToISO(time);
-    if(timeStr != NULL) {
-        psError(PS_ERR_UNKNOWN,true,"Did not return NULL for time after to year 9999");
-        return 4;
-    }
-
-    // Verify return string with valid time
-    time->sec = testTime1SecondsUTC;
-    time->nsec = testTime1NanosecondsUTC;
-    timeStr = psTimeToISO(time);
-    if(strcmp(timeStr,testTime1Str) != 0) {
-        psError(PS_ERR_UNKNOWN,true,"String %s not as expected %s",
-                timeStr, testTime1Str);
-        return 5;
-    }
-    psFree(timeStr);
-
-    // Verify return string with valid time and leap second set
-    time->sec = testTime1SecondsUTC;
-    time->nsec = testTime1NanosecondsUTC;
-    time->leapsecond = true;
-    timeStr = psTimeToISO(time);
-    if(strcmp(timeStr,testTime1StrLeap) != 0) {
-        psError(PS_ERR_UNKNOWN,true,"String %s not as expected %s",
-                timeStr, testTime1StrLeap);
-        return 6;
-    }
-    psFree(timeStr);
-    psFree(time);
-
-    return 0;
-}
-
-psS32 testTimeToTimeval(void)
-{
-    psTime*           time         = NULL;
-    struct timeval*   timevalTime  = NULL;
-
-    // Attempt to convert with NULL time
-    psLogMsg(__func__,PS_LOG_INFO,"Following should generate error message for NULL time");
-    timevalTime = psTimeToTimeval(time);
-    if(timevalTime != NULL) {
-        psError(PS_ERR_UNKNOWN,true,"Did not return NULL as expected");
-        return 1;
-    }
-
-    // Attempt to convert invalid time
-    time = psTimeAlloc(PS_TIME_UTC);
-    time->sec = 1;
-    time->nsec = 2e9;
-    time->leapsecond = false;
-    psLogMsg(__func__,PS_LOG_INFO,"Following should generate an error message for invalid time");
-    timevalTime = psTimeToTimeval(time);
-    if( timevalTime != NULL) {
-        psError(PS_ERR_UNKNOWN,true,"Did not return NULL for invalid time");
-        return 2;
-    }
-
-    // Attempt to convert invalid time
-    time->sec = -1;
-    time->nsec = 0;
-    psLogMsg(__func__,PS_LOG_INFO,"Following should generate an error message for invalid time");
-    timevalTime = psTimeToTimeval(time);
-    if( timevalTime != NULL) {
-        psError(PS_ERR_UNKNOWN,true,"Did not return NULL for invalid time");
-        return 2;
-    }
-
-    // Verify convert to timeval with valid time
-    time->sec = testTime1SecondsUTC;
-    time->nsec = testTime1NanosecondsUTC;
-    timevalTime = psTimeToTimeval(time);
-    if(timevalTime->tv_sec != testTime1TimevalSec) {
-        psError(PS_ERR_UNKNOWN,true,"Timeval seconds %ld not as expectd %ld",
-                timevalTime->tv_sec,testTime1TimevalSec);
-        return 4;
-    }
-    if(timevalTime->tv_usec != testTime1TimevalUsec) {
-        psError(PS_ERR_UNKNOWN,true,"Timeval useconds %ld not as expected %ld",
-                timevalTime->tv_usec,testTime1TimevalUsec);
-        return 5;
-    }
-
-    psFree(timevalTime);
-    psFree(time);
-
-    return 0;
-}
-
-psS32 testTimeFromMJD(void)
-{
-    psTime*   time = NULL;
-
-    // Attempt to convert valid time to psTime
-    time = psTimeFromMJD(testTime1MJDTAI);
-    if(time->type != PS_TIME_TAI) {
-        psError(PS_ERR_UNKNOWN,true,"Type %d not as expected %d",
-                time->type,PS_TIME_TAI);
-        return 1;
-    }
-    if(time->sec != testTime1SecondsTAI) {
-        psError(PS_ERR_UNKNOWN,true,"psTime seconds %ld not as expected %ld",
-                (long int)time->sec,testTime1SecondsTAI);
-        return 2;
-    }
-    psFree(time);
-
-    // Attempt to convert valid time before 1970 epoch
-    time = psTimeFromMJD(testTime4MJD);
-    if(time->type != PS_TIME_TAI) {
-        psError(PS_ERR_UNKNOWN,true,"Type %d not as expected %d",
-                time->type,PS_TIME_TAI);
-        return 3;
-    }
-    if(time->sec != testTime4SecondsUTC) {
-        psError(PS_ERR_UNKNOWN,true,"psTime seconds %ld not as expected %ld",
-                (long int)time->sec,testTime4SecondsUTC);
-        return 4;
-    }
-    psFree(time);
-
-    return 0;
-}
-
-psS32 testTimeFromJD(void)
-{
-    psTime*   time = NULL;
-
-    // Attempt to convert valid time to psTime
-    time = psTimeFromJD(testTime1JDTAI);
-    if(time->type != PS_TIME_TAI) {
-        psError(PS_ERR_UNKNOWN,true,"Type %d not as expected %d",
-                time->type,PS_TIME_TAI);
-        return 1;
-    }
-    if(time->sec != testTime1SecondsTAI) {
-        psError(PS_ERR_UNKNOWN,true,"psTime seconds %ld not as expected %ld",
-                (long int)time->sec,(long int)testTime1SecondsTAI);
-        return 2;
-    }
-    psFree(time);
-
-    // Attempt to convert valid time before 1970 epoch
-    time = psTimeFromJD(testTime4JD);
-    if(time->type != PS_TIME_TAI) {
-        psError(PS_ERR_UNKNOWN,true,"Type %d not as expected %d",
-                time->type,PS_TIME_TAI);
-        return 3;
-    }
-    if(time->sec != testTime4SecondsUTC) {
-        psError(PS_ERR_UNKNOWN,true,"psTime seconds %ld not as expected %ld",
-                (long int)time->sec,testTime4SecondsUTC);
-        return 4;
-    }
-    psFree(time);
-
-    return 0;
-}
-
-psS32 testTimeFromISO(void)
-{
-    psTime*   time = NULL;
-
-    // Attempt to convert NULL string
-    psLogMsg(__func__,PS_LOG_INFO,"Following should generate error message for NULL ISO string");
-    time = psTimeFromISO(NULL);
-    if(time != NULL) {
-        psError(PS_ERR_UNKNOWN,true,"Did not return NULL as expected for NULL ISO string");
-        return 1;
-    }
-
-    // Convert valid ISO string
-    time = psTimeFromISO(testTime1Str);
-    if(time->type != PS_TIME_TAI) {
-        psError(PS_ERR_UNKNOWN,true,"Type %d not as expected %d",
-                time->type, PS_TIME_TAI);
-        return 2;
-    }
-    if(time->sec != testTime1SecondsUTC) {
-        psError(PS_ERR_UNKNOWN,true,"psTime seconds %ld not as expected %ld",
-                (long int)time->sec,testTime1SecondsTAI);
-        return 3;
-    }
-    psFree(time);
-
-    // Attempt to convert invalid ISO string
-    psLogMsg(__func__,PS_LOG_INFO,"Following should generate an error for invalid ISO string");
-    time = psTimeFromISO("Here I am");
-    if(time != NULL) {
-        psError(PS_ERR_UNKNOWN,true,"Did not return NULL as expected for invalid ISO string");
-        return 4;
-    }
-    psFree(time);
-
-    return 0;
-}
-
-psS32 testTimeFromTimeval(void)
-{
-    psTime*          time        = NULL;
-    struct timeval*  timevalTime = NULL;
-
-    // Attempt to create psTime from NULL timeval ptr
-    psLogMsg(__func__,PS_LOG_INFO,"Following should generate error message for NULL timeval");
-    time = psTimeFromTimeval(NULL);
-    if(time != NULL) {
-        psError(PS_ERR_UNKNOWN,true,"Did not return NULL for NULL timeval ptr");
-        return 1;
-    }
-
-    // Convert valid timeval structure
-    timevalTime = (struct timeval*)psAlloc(sizeof(struct timeval));
-    timevalTime->tv_sec = testTime1SecondsTAI;
-    timevalTime->tv_usec = testTime1NanosecondsTAI / 1000;
-    time = psTimeFromTimeval(timevalTime);
-    if(time == NULL) {
-        psError(PS_ERR_UNKNOWN,true,"Did not expect NULL return value for valid timeval");
-        return 2;
-    }
-    if(time->type != PS_TIME_TAI) {
-        psError(PS_ERR_UNKNOWN,true,"psTime type %d not as expected %d",
-                time->type, PS_TIME_TAI);
-        return 3;
-    }
-    if(time->sec != testTime1SecondsTAI) {
-        psError(PS_ERR_UNKNOWN,true,"psTime seconds %ld not as expected %ld",
-                time->sec, testTime1SecondsTAI);
-        return 4;
-    }
-    if(time->nsec != testTime1NanosecondsTAI) {
-        psError(PS_ERR_UNKNOWN,true,"psTime nanosec %ld not as expected %ld",
-                time->nsec, testTime1NanosecondsTAI);
-        return 5;
-    }
-    psFree(timevalTime);
-    psFree(time);
-
-    return 0;
-}
-
-psS32 testTimeFromTM(void)
-{
-    psTime*     time   = NULL;
-    struct tm*  tmTime = NULL;
-
-    // Attempt to convert from NULL tm structure ptr
-    psLogMsg(__func__,PS_LOG_INFO,"Following should generate error message for NULL tm ptr");
-    time = p_psTimeFromTM(tmTime);
-    if(time != NULL) {
-        psError(PS_ERR_UNKNOWN,true,"Did not return NULL for NULL tm ptr");
-        return 1;
-    }
-
-    // Verify convert for valid tm structure
-    tmTime = (struct tm*)psAlloc(sizeof(struct tm));
-    tmTime->tm_year = testTime7TmYear;
-    tmTime->tm_mon  = testTime7TmMon;
-    tmTime->tm_mday = testTime7TmDay;
-    tmTime->tm_hour = testTime7TmHour;
-    tmTime->tm_min  = testTime7TmMin;
-    tmTime->tm_sec  = testTime7TmSec;
-    time = p_psTimeFromTM(tmTime);
-    if(time == NULL) {
-        psError(PS_ERR_UNKNOWN,true,"Did not expect NULL return value for valid tm structure");
-        return 2;
-    }
-    if(time->sec != testTime7Seconds) {
-        psError(PS_ERR_UNKNOWN,true,"psTime seconds %ld not as expected %ld",
-                (long int)time->sec, (long int)testTime7Seconds);
-        return 3;
-    }
-    if(time->nsec != testTime7Nanoseconds) {
-        psError(PS_ERR_UNKNOWN,true,"psTime nanoseconds %ld not as expected %ld",
-                time->nsec, testTime7Nanoseconds);
-        return 4;
-    }
-    psFree(tmTime);
-    psFree(time);
-
-    // Verify convert for valid tm structure
-    tmTime = (struct tm*)psAlloc(sizeof(struct tm));
-    tmTime->tm_year = testTime8TmYear;
-    tmTime->tm_mon  = testTime8TmMon;
-    tmTime->tm_mday = testTime8TmDay;
-    tmTime->tm_hour = testTime8TmHour;
-    tmTime->tm_min  = testTime8TmMin;
-    tmTime->tm_sec  = testTime8TmSec;
-    time = p_psTimeFromTM(tmTime);
-    if(time == NULL) {
-        psError(PS_ERR_UNKNOWN,true,"Did not expect NULL return value for valid tm structure");
-        return 2;
-    }
-    if(time->sec != testTime8Seconds) {
-        psError(PS_ERR_UNKNOWN,true,"psTime seconds %ld not as expected %ld",
-                (long int)time->sec, (long int)testTime8Seconds);
-        return 3;
-    }
-    if(time->nsec != testTime8Nanoseconds) {
-        psError(PS_ERR_UNKNOWN,true,"psTime nanoseconds %ld not as expected %ld",
-                time->nsec, testTime8Nanoseconds);
-        return 4;
-    }
-    psFree(tmTime);
-    psFree(time);
-
-    return 0;
-}
-
-psS32 testTimeConvert(void)
-{
-    psTime*  time1 = NULL;
-    psTime*  time2 = NULL;
-
-    // Attempt to convert NULL time
-    psLogMsg(__func__,PS_LOG_INFO,"Following should generate an error message for NULL time");
-    time2 = psTimeConvert(time1,PS_TIME_TAI);
-    // Verify return value is NULL
-    if(time2 != NULL) {
-        psError(PS_ERR_UNKNOWN,true,"Did not return NULL for NULL time specified");
-        return 1;
-    }
-
-    // Attempt to convert to invalid type
-    time1 = psTimeAlloc(PS_TIME_TAI);
-    psLogMsg(__func__,PS_LOG_INFO,"Following should generate an error message for invalid type");
-    time2 = psTimeConvert(time1,-100);
-    // Verify return value is NULL
-    if(time2 != time1) {
-        psError(PS_ERR_UNKNOWN,true,"Did not return time for invalid type to convert to");
-        return 2;
-    }
-    time1->type = PS_TIME_UTC;
-    psLogMsg(__func__,PS_LOG_INFO,"Following should generate an error message for invalid type");
-    time2 = psTimeConvert(time1,-100);
-    // Verify return value is NULL
-    if(time2 != time1) {
-        psError(PS_ERR_UNKNOWN,true,"Did not return time for invalid type to convert to");
-        return 2;
-    }
-    time1->type = PS_TIME_TT;
-    psLogMsg(__func__,PS_LOG_INFO,"Following should generate an error message for invalid type");
-    time2 = psTimeConvert(time1,-100);
-    // Verify return value is NULL
-    if(time2 != time1) {
-        psError(PS_ERR_UNKNOWN,true,"Did not return time for invalid type to convert to");
-        return 2;
-    }
-    time1->type = -100;
-    psLogMsg(__func__,PS_LOG_INFO,"Following should generate an error message for invalid type");
-    time2 = psTimeConvert(time1,PS_TIME_TAI);
-    // Verify return value is NULL
-    if(time2 != time1) {
-        psError(PS_ERR_UNKNOWN,true,"Did not return time for invalid type to convert to");
-        return 2;
-    }
-
-    // Attempt to convert with invalid time nsec > 1e9
-    time1->nsec = 2e9;
-    psLogMsg(__func__,PS_LOG_INFO,"Following should generate an error message for invalid time");
-    time2 = psTimeConvert(time1,PS_TIME_TAI);
-    if(time2 != time1) {
-        psError(PS_ERR_UNKNOWN,true,"Did not return time for invalid time specified");
-        return 3;
-    }
-
-    //Attempt to convert a time to the same type
-    time2 = NULL;
-    time1->sec = 1;
-    time1->nsec = 2;
-    time1->type = PS_TIME_TAI;
-    time1->leapsecond = false;
-    time2 = psTimeConvert(time1,PS_TIME_TAI);
-    if(time2 != time1) {
-        psError(PS_ERR_UNKNOWN,true,"Did not return time for conversion to same type");
-        return 4;
-    }
-    // Verify time not changed
-    if((time2->sec != 1) || (time2->nsec != 2) || (time2->type != PS_TIME_TAI) ||
-            (time2->leapsecond != false) ) {
-        psError(PS_ERR_UNKNOWN,true,"Time member changes when no change expected");
-        return 5;
-    }
-
-    // Attempt to convert a UTC time to a TAI
-    time2 = NULL;
-    time1->sec = testTime1SecondsUTC;
-    time1->nsec = testTime1NanosecondsUTC;
-    time1->type = PS_TIME_UTC;
-    time1->leapsecond = false;
-    time2 = psTimeConvert(time1,PS_TIME_TAI);
-    if(time2 != time1) {
-        psError(PS_ERR_UNKNOWN,true,"Did not return time for conversion from UTC to TAI");
-        return 6;
-    }
-    // Verify time type
-    if(time2->type != PS_TIME_TAI) {
-        psError(PS_ERR_UNKNOWN,true,"Returned time type %d not as expected %d",
-                time2->type, PS_TIME_TAI);
-        return 7;
-    }
-    // Verify time is TAI as expected
-    if(time2->sec != testTime1SecondsTAI) {
-        psError(PS_ERR_UNKNOWN,true,"TAI seconds = %ld not as expected %ld",(long int)time2->sec,
-                (long int)testTime1SecondsTAI);
-        return 7;
-    }
-    if(time2->nsec != testTime1NanosecondsTAI) {
-        psError(PS_ERR_UNKNOWN,true,"TAI nanoseconds = %ld not as expected %ld",(long int)time2->nsec,
-                (long int)testTime1NanosecondsTAI);
-        return 8;
-    }
-
-    // Attempt to convert a UTC time to a TT
-    time2 = NULL;
-    time1->sec = testTime1SecondsUTC;
-    time1->nsec = testTime1NanosecondsUTC;
-    time1->type = PS_TIME_UTC;
-    time1->leapsecond = false;
-    time2 = psTimeConvert(time1,PS_TIME_TT);
-    if(time2 != time1) {
-        psError(PS_ERR_UNKNOWN,true,"Did not return time for conversion from UTC to TT");
-        return 6;
-    }
-    // Verify time type
-    if(time2->type != PS_TIME_TT) {
-        psError(PS_ERR_UNKNOWN,true,"Returned time type %d not as expected %d",
-                time2->type, PS_TIME_TT);
-        return 7;
-    }
-    // Verify time is TT as expected
-    if(time2->sec != testTime1SecondsTT) {
-        psError(PS_ERR_UNKNOWN,true,"TT seconds = %ld not as expected %ld",(long int)time2->sec,
-                (long int)testTime1SecondsTT);
-        return 7;
-    }
-    if(time2->nsec != testTime1NanosecondsTT) {
-        psError(PS_ERR_UNKNOWN,true,"TT nanoseconds = %ld not as expected %ld",(long int)time2->nsec,
-                (long int)testTime1NanosecondsTT);
-        return 8;
-    }
-
-    // Attempt to convert a UTC time to UT1
-    time2 = NULL;
-    time1->sec = testTime1SecondsUTC;
-    time1->nsec = testTime1NanosecondsUTC;
-    time1->type = PS_TIME_UTC;
-    time1->leapsecond = false;
-    time2 = psTimeConvert(time1,PS_TIME_UT1);
-    if(time1 != time2) {
-        psError(PS_ERR_UNKNOWN,true,"Did not return time for conversion from UTC to UT1");
-        return 9;
-    }
-    // Verify time type
-    if(time2->type != PS_TIME_UT1) {
-        psError(PS_ERR_UNKNOWN,true,"Returned time type %d not as expected %d",
-                time2->type, PS_TIME_UT1);
-        return 7;
-    }
-    // Verify time is UT1 as expected
-    if(time2->sec != testTime1SecondsUT1) {
-        psError(PS_ERR_UNKNOWN,true,"UT1 seconds = %ld not as expected %ld",(long int)time2->sec,
-                (long int)testTime1SecondsUT1);
-        return 9;
-    }
-    if(time2->nsec != testTime1NanosecondsUT1) {
-        psError(PS_ERR_UNKNOWN,true,"UT1 nanoseconds = %d not as expected %d",time2->nsec,
-                testTime1NanosecondsUT1);
-        return 10;
-    }
-
-    // Attempt to convert a TAI time to UTC
-    time2 = NULL;
-    time1->sec = testTime1SecondsTAI;
-    time1->nsec = testTime1NanosecondsTAI;
-    time1->type = PS_TIME_TAI;
-    time1->leapsecond = false;
-    time2 = psTimeConvert(time1,PS_TIME_UTC);
-    if(time2 != time1) {
-        psError(PS_ERR_UNKNOWN,true,"Did not return time for conversion from TAI to UTC");
-        return 11;
-    }
-    // Verify time type
-    if(time2->type != PS_TIME_UTC) {
-        psError(PS_ERR_UNKNOWN,true,"Returned time type %d not as expected %d",
-                time2->type, PS_TIME_UTC);
-        return 7;
-    }
-    // Verify time is UTC as expected
-    if(time2->sec != testTime1SecondsUTC) {
-        psError(PS_ERR_UNKNOWN,true,"UTC seconds = %ld not as expected %ld",(long int)time2->sec,
-                (long int)testTime1SecondsUTC);
-        return 12;
-    }
-    if(time2->nsec != testTime1NanosecondsUTC) {
-        psError(PS_ERR_UNKNOWN,true,"UTC nanoseconds = %ld not as expected %ld",(long int)time2->nsec,
-                (long int)testTime1NanosecondsUTC);
-        return 13;
-    }
-
-    // Attempt to convert a TAI time to TT
-    time2 = NULL;
-    time1->sec = testTime1SecondsTAI;
-    time1->nsec = testTime1NanosecondsTAI;
-    time1->type = PS_TIME_TAI;
-    time1->leapsecond = false;
-    time2 = psTimeConvert(time1,PS_TIME_TT);
-    if(time2 != time1) {
-        psError(PS_ERR_UNKNOWN,true,"Did not return time for conversion from TAI to TT");
-        return 14;
-    }
-    // Verify time type
-    if(time2->type != PS_TIME_TT) {
-        psError(PS_ERR_UNKNOWN,true,"Returned time type %d not as expected %d",
-                time2->type, PS_TIME_TT);
-        return 7;
-    }
-    // Verify time is TT as expected
-    if(time2->sec != testTime1SecondsTT) {
-        psError(PS_ERR_UNKNOWN,true,"TT seconds = %ld not as expected %ld",(long int)time2->sec,
-                (long int)testTime1SecondsTT);
-        return 15;
-    }
-    if(time2->nsec != testTime1NanosecondsTT) {
-        psError(PS_ERR_UNKNOWN,true,"TT nanoseconds = %ld not as expected %ld",(long int)time2->nsec,
-                (long int)testTime1NanosecondsTT);
-        return 16;
-    }
-
-    // Attempt to convert a TAI time to UT1
-    time2 = NULL;
-    time1->sec = testTime1SecondsTAI;
-    time1->nsec = testTime1NanosecondsTAI;
-    time1->type = PS_TIME_TAI;
-    time1->leapsecond = false;
-    time2 = psTimeConvert(time1,PS_TIME_UT1);
-    if(time1 != time2) {
-        psError(PS_ERR_UNKNOWN,true,"Did not return time for conversion from TAI to UT1");
-        return 9;
-    }
-    // Verify time type
-    if(time2->type != PS_TIME_UT1) {
-        psError(PS_ERR_UNKNOWN,true,"Returned time type %d not as expected %d",
-                time2->type, PS_TIME_UT1);
-        return 7;
-    }
-    // Verify time is UT1 as expected
-    if(time2->sec != testTime1SecondsUT1) {
-        psError(PS_ERR_UNKNOWN,true,"UT1 seconds = %ld not as expected %ld",(long int)time2->sec,
-                (long int)testTime1SecondsUT1);
-        return 9;
-    }
-    if(time2->nsec != testTime1NanosecondsUT1) {
-        psError(PS_ERR_UNKNOWN,true,"UT1 nanoseconds = %d not as expected %d",time2->nsec,
-                testTime1NanosecondsUT1);
-        return 10;
-    }
-
-    // Attempt to convert a TT time to UTC
-    time2 = NULL;
-    time1->sec = testTime1SecondsTT;
-    time1->nsec = testTime1NanosecondsTT;
-    time1->type = PS_TIME_TT;
-    time1->leapsecond = false;
-    time2 = psTimeConvert(time1,PS_TIME_UTC);
-    if(time2 != time1) {
-        psError(PS_ERR_UNKNOWN,true,"Did not return time for conversion from TT to UTC");
-        return 17;
-    }
-    // Verify time type
-    if(time2->type != PS_TIME_UTC) {
-        psError(PS_ERR_UNKNOWN,true,"Returned time type %d not as expected %d",
-                time2->type, PS_TIME_UTC);
-        return 7;
-    }
-    // Verify time is UTC as expected
-    if(time2->sec != testTime1SecondsUTC) {
-        psError(PS_ERR_UNKNOWN,true,"UTC seconds = %ld not as expected %ld",(long int)time2->sec,
-                (long int)testTime1SecondsUTC);
-        return 18;
-    }
-    if(time2->nsec != testTime1NanosecondsUTC) {
-        psError(PS_ERR_UNKNOWN,true,"UTC nanoseconds = %ld not as expected %ld",(long int)time2->nsec,
-                (long int)testTime1NanosecondsUTC);
-        return 19;
-    }
-
-    // Attempt to convert a TT time to TAI
-    time2 = NULL;
-    time1->sec = testTime1SecondsTT;
-    time1->nsec = testTime1NanosecondsTT;
-    time1->type = PS_TIME_TT;
-    time1->leapsecond = false;
-    time2 = psTimeConvert(time1,PS_TIME_TAI);
-    if(time2 != time1) {
-        psError(PS_ERR_UNKNOWN,true,"Did not return time for conversion from TT to TAI");
-        return 20;
-    }
-    // Verify time type
-    if(time2->type != PS_TIME_TAI) {
-        psError(PS_ERR_UNKNOWN,true,"Returned time type %d not as expected %d",
-                time2->type, PS_TIME_TAI);
-        return 7;
-    }
-    // Verify time is TAI as expected
-    if(time2->sec != testTime1SecondsTAI) {
-        psError(PS_ERR_UNKNOWN,true,"TAI seconds = %ld not as expected %ld",(long int)time2->sec,
-                (long int)testTime1SecondsTAI);
-        return 21;
-    }
-    if(time2->nsec != testTime1NanosecondsTAI) {
-        psError(PS_ERR_UNKNOWN,true,"TT nanoseconds = %ld not as expected %ld",(long int)time2->nsec,
-                (long int)testTime1NanosecondsTAI);
-        return 22;
-    }
-
-    // Attempt to convert a TT time to UT1
-    time2 = NULL;
-    time1->sec = testTime1SecondsTT;
-    time1->nsec = testTime1NanosecondsTT;
-    time1->type = PS_TIME_TT;
-    time1->leapsecond = false;
-    time2 = psTimeConvert(time1,PS_TIME_UT1);
-    if(time1 != time2) {
-        psError(PS_ERR_UNKNOWN,true,"Did not return time for conversion from TT to UT1");
-        return 9;
-    }
-    // Verify time type
-    if(time2->type != PS_TIME_UT1) {
-        psError(PS_ERR_UNKNOWN,true,"Returned time type %d not as expected %d",
-                time2->type, PS_TIME_UT1);
-        return 7;
-    }
-    // Verify time is UT1 as expected
-    if(time2->sec != testTime1SecondsUT1) {
-        psError(PS_ERR_UNKNOWN,true,"UT1 seconds = %ld not as expected %ld",(long int)time2->sec,
-                (long int)testTime1SecondsUT1);
-        return 9;
-    }
-    if(time2->nsec != testTime1NanosecondsUT1) {
-        psError(PS_ERR_UNKNOWN,true,"UT1 nanoseconds = %d not as expected %d",time2->nsec,
-                testTime1NanosecondsUT1);
-        return 10;
-    }
-
-    // Attempt to convert from UT1 to TAI, UTC, TT
-    time2 = NULL;
-    time1->sec = 1;
-    time1->nsec = 2;
-    time1->type = PS_TIME_UT1;
-    time1->leapsecond = false;
-    psLogMsg(__func__,PS_LOG_INFO,"Following should generate an error message converting from UT1");
-    time2 = psTimeConvert(time1,PS_TIME_UTC);
-    if(time2 != time1) {
-        psError(PS_ERR_UNKNOWN,true,"Did not return time for conversion from UT1");
-        return 23;
-    }
-
-    psFree(time1);
-
-    return 0;
-}
-
-//psS32 testTimeOther(void)
-//{
-//    psTime *testTime;
-//    char *testString = "2004-07-21T18:22:24.272Z";
-//
-//    psLibInit("psTime.config");
-//
-// Test time was taken at July 21, 2004 at 18:22:24.272044
-//    testTime = (psTime*)psAlloc(sizeof(psTime));
-//    testTime->sec = 1090434144;
-//    testTime->nsec = 272044000;
-//    testTime->type = PS_TIME_TAI;
-
-// Test O - psTime to LMST
-//    printPositiveTestHeader(stdout, "psTime", "Convert psTime time to LST");
-//    char *testString2 = "2004-09-10T1:00:00.00Z";
-//    psTime* testTime2 = NULL;
-//    testTime2 = psTimeFromISO(testString2);
-//    double dblTime = psTimeToLMST(testTime2, 1);
-//    printf("LST (rad): %lf\n", dblTime);
-//    psFree(testTime2);
-//    printFooter(stdout, "psTime", "Convert psTime time to LST", true);
-
-
-//    return 0;
-//}
Index: trunk/psLib/test/astronomy/tst_psTime_02.c
===================================================================
--- trunk/psLib/test/astronomy/tst_psTime_02.c	(revision 4541)
+++ 	(revision )
@@ -1,368 +1,0 @@
-/** @file  tst_psTime_02.c
- *
- *  @brief Test driver for psTime functions
- *
- *  This test driver contains the following tests for psTime:
- *     1) Convert psTime to Local Mean Sidereal Time (LMST)
- *     2) Calculate leap second delta between times
- *     3) Creation of psTime of type TT
- *     4) Creation of psTime of type UTC
- *
- *  @author  Ross Harman, MHPCC
- *  @author  Eric Van Alst, MHPCC
- *
- *  @version $Revision: 1.13 $  $Name: not supported by cvs2svn $
- *  @date  $Date: 2005-06-10 01:41:35 $
- *
- *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
- *
- */
-
-#include "pslib_strict.h"
-#include "psTest.h"
-
-#define ERROR_TOL  0.001
-
-static psS32 testTimeLMST(void);
-static psS32 testTimeLeapSecondDelta(void);
-static psS32 testTimeIsLeapSecond(void);
-static psS32 testTimeFromTT(void);
-static psS32 testTimeFromUTC(void);
-
-// Test Time 1 : May 9, 2005  00:00:00,0
-//               MJD = 53499.000
-//               JD = 2453499.5
-// UTC Test Time 1
-const psS64 testTime1SecondsUTC     = 1115596900;
-const psU32 testTime1NanosecondsUTC = 0;
-// Expected LMST  15:09:18
-const psF64 testTime1LMST0          = 3.967604;
-
-// Test Time 2 : May 9, 1995 00:00:00,0
-//               MJD = 49846.00
-//               JD = 2449846.5
-// UTC Test Time 2
-const psS64 testTime2SecondsUTC     = 799977600;
-const psU32 testTime2NanosecondsUTC = 0;
-// Expected leap second delta
-const psS64 testTimeLeapSecondDelta1 = 3;
-
-// Test Time 3: Jan 1, 1999 00:00:00,0
-//              MJD = 51179
-//              JD = 2451179.5
-const psS64 testTime3SecondsUTC     = 915148800;
-const psU32 testTime3NanosecondsUTC = 0;
-
-testDescription tests[] = {
-                              {testTimeLMST,000,"psTimeToLMST",0,false},
-                              {testTimeLeapSecondDelta,000,"psTimeLeapSecondDelta",0,false},
-                              {testTimeIsLeapSecond,000,"psTimeIsLeapSecond",0,false},
-                              {testTimeFromTT,000,"psTimeFromTT",0,false},
-                              {testTimeFromUTC,000,"psTimeFromUTC",0,false},
-                              {NULL}
-                          };
-psS32 main(psS32 argc, char* argv[])
-{
-    psLogSetLevel(PS_LOG_INFO);
-
-    // Initialize library internal structures
-    psLibInit("psTime.config");
-
-    if( !runTestSuite(stderr,"psTime",tests,argc,argv)) {
-        return 1;
-    }
-
-    // Clean up library
-    psLibFinalize();
-
-    return 0;
-}
-
-psS32 testTimeLMST(void)
-{
-    psTime*       time      = NULL;
-    psF64         lmst      = 0.0;
-
-    // Attempt to get LMST with NULL time
-    psLogMsg(__func__,PS_LOG_INFO,"Following should generate an error message for NULL time");
-    lmst = psTimeToLMST(time,0);
-    if(!isnan(lmst)) {
-        psError(PS_ERR_UNKNOWN,true,"Did not return NaN as expected %lf",lmst);
-        return 1;
-    }
-
-    // Attempt to get LMST with valid test time
-    // Allocate test time
-    time = psTimeAlloc(PS_TIME_UTC);
-    time->sec = testTime1SecondsUTC;
-    time->nsec = testTime1NanosecondsUTC;
-    time->leapsecond = false;
-    lmst = psTimeToLMST(time,0.0);
-    if(fabs(lmst-testTime1LMST0) > ERROR_TOL) {
-        psError(PS_ERR_UNKNOWN,true,"LMST %lf not as expected %lf",lmst,testTime1LMST0);
-        return 2;
-    }
-
-    // Attempt to get LMST with invalid input time UT1
-    psLogMsg(__func__,PS_LOG_INFO,"Following should generate error message for incorrect type");
-    time->type = PS_TIME_UT1;
-    lmst = psTimeToLMST(time,0.0);
-    if(!isnan(lmst)) {
-        psError(PS_ERR_UNKNOWN,true,"Did not return NaN as expected %lf",lmst);
-        return 3;
-    }
-    psFree(time);
-
-    return 0;
-}
-
-psS32 testTimeLeapSecondDelta(void)
-{
-    psTime*       time1   = NULL;
-    psTime*       time2   = NULL;
-    psS64         delta   = 0;
-
-    // Attempt to get delta with NULL time1 argument
-    psLogMsg(__func__,PS_LOG_INFO,"Following should generate an error message for NULL time");
-    delta = psTimeLeapSecondDelta(time1,time2);
-    if(delta != 0) {
-        psError(PS_ERR_UNKNOWN,true,"Delta of %ld not as expected 0",(long int)delta);
-        return 1;
-    }
-
-    // Set test time 1
-    time1 = psTimeAlloc(PS_TIME_UTC);
-    time1->sec = testTime1SecondsUTC;
-    time1->nsec = testTime1NanosecondsUTC;
-    time1->leapsecond = false;
-
-    // Attempt to get delta with NULL time2 argument
-    psLogMsg(__func__,PS_LOG_INFO,"Following should generate an error message for NULL time");
-    delta = psTimeLeapSecondDelta(time1,time2);
-    if(delta != 0) {
-        psError(PS_ERR_UNKNOWN,true,"Delta of %ld not as expected 0",(long int)delta);
-        return 2;
-    }
-
-    // Set test time 2 with invalid time
-    time2 = psTimeAlloc(PS_TIME_UTC);
-    time2->sec = 0;
-    time2->nsec = 2e9;
-    time2->leapsecond = false;
-
-    // Attempt to get delta with invalid time2
-    psLogMsg(__func__,PS_LOG_INFO,"Following should generate an error message for invalid time");
-    delta = psTimeLeapSecondDelta(time1,time2);
-    if(delta != 0) {
-        psError(PS_ERR_UNKNOWN,true,"Delta of %ld not as expected 0",(long int)delta);
-        return 3;
-    }
-
-    // Set test time 2 valid
-    time2->sec = testTime2SecondsUTC;
-    time2->nsec = testTime2NanosecondsUTC;
-
-    // Set test time 1 invalid
-    time1->sec = 0;
-    time1->nsec = 2e9;
-
-    // Attempt to get delta with invalid time1
-    psLogMsg(__func__,PS_LOG_INFO,"Following should generate an error message for invalid time");
-    delta = psTimeLeapSecondDelta(time1,time2);
-    if(delta != 0) {
-        psError(PS_ERR_UNKNOWN,true,"Delta of %ld not as expected 0",(long int)delta);
-        return 4;
-    }
-
-    // Set test time 1 to greater time
-    time1->sec = testTime1SecondsUTC;
-    time1->nsec = testTime1NanosecondsUTC;
-    delta = psTimeLeapSecondDelta(time1,time2);
-    if(delta != testTimeLeapSecondDelta1) {
-        psError(PS_ERR_UNKNOWN,true,"Delta %ld not as expected %ld",
-                (long int)delta,(long int)testTimeLeapSecondDelta1);
-        return 5;
-    }
-
-    // Set test time 1 to lesser time
-    delta = psTimeLeapSecondDelta(time2,time1);
-    if(delta != testTimeLeapSecondDelta1) {
-        psError(PS_ERR_UNKNOWN,true,"Delta %ld not as expected %ld",
-                (long int)delta,(long int)testTimeLeapSecondDelta1);
-        return 6;
-    }
-
-    // Attempt to get delta with times equal
-    delta = psTimeLeapSecondDelta(time1,time1);
-    if(delta != 0) {
-        psError(PS_ERR_UNKNOWN,true,"Delta %ld not as expected 0",(long int)delta);
-        return 7;
-    }
-
-    psFree(time2);
-    psFree(time1);
-
-    return 0;
-}
-
-psS32 testTimeIsLeapSecond(void)
-{
-    psTime*     time        = NULL;
-    psBool      leapsecond  = false;
-
-    // Attempt to determine if leap second with NULL time
-    psLogMsg(__func__,PS_LOG_INFO,"Following should generate an error message for NULL time");
-    leapsecond = psTimeIsLeapSecond(time);
-    if(leapsecond) {
-        psError(PS_ERR_UNKNOWN,true,"Leapsecond flag %d not as expected 0",leapsecond);
-        return 1;
-    }
-
-    // Set time
-    time = psTimeAlloc(PS_TIME_TAI);
-    time->sec = testTime1SecondsUTC;
-    time->nsec = testTime1NanosecondsUTC;
-    time->leapsecond = false;
-
-    // Attempt to determine if leap second with non-UTC time
-    psLogMsg(__func__,PS_LOG_INFO,"Following should generate an error message for invalid type");
-    leapsecond = psTimeIsLeapSecond(time);
-    if(leapsecond) {
-        psError(PS_ERR_UNKNOWN,true,"Leapsecond flag %d not as expected 0",leapsecond);
-        return 2;
-    }
-
-    // Set time to UTC
-    time->type = PS_TIME_UTC;
-
-    // Attempt to determine if leap second with valid time
-    leapsecond = psTimeIsLeapSecond(time);
-    if(leapsecond) {
-        psError(PS_ERR_UNKNOWN,true,"Leapsecond flag %d not a expected 0",leapsecond);
-        return 3;
-    }
-
-    // Set time to UTC with leap second
-    time->sec = testTime3SecondsUTC;
-    time->nsec = testTime3NanosecondsUTC;
-    leapsecond = psTimeIsLeapSecond(time);
-    if(!leapsecond) {
-        psError(PS_ERR_UNKNOWN,true,"Leapsecond flag %d not a expected 1",leapsecond);
-        return 4;
-    }
-
-    // Set time to 1 second before a known leap second
-    time->sec--;
-    leapsecond = psTimeIsLeapSecond(time);
-    if(leapsecond) {
-        psError(PS_ERR_UNKNOWN,true,"Leapsecond flag %d not as expected 0",leapsecond);
-        return 5;
-    }
-
-    // Set time to 1 second after a known leap second
-    time->sec +=2;
-    leapsecond = psTimeIsLeapSecond(time);
-    if(leapsecond) {
-        psError(PS_ERR_UNKNOWN,true,"Leapsecond flag %d not as expected 0",leapsecond);
-        return 6;
-    }
-
-    psFree(time);
-
-    return 0;
-}
-
-psS32 testTimeFromTT(void)
-{
-    psTime*       time = NULL;
-
-    // Attempt to create psTime with invalid time
-    psLogMsg(__func__,PS_LOG_INFO,"Following should generate an error message for invalid time");
-    time = psTimeFromTT(0,2e9);
-    if(time != NULL) {
-        psError(PS_ERR_UNKNOWN,true,"Did not return NULL as expected");
-        return 1;
-    }
-
-    // Attempt to create psTime with valid time
-    time = psTimeFromTT(testTime1SecondsUTC,testTime1NanosecondsUTC);
-    if(time == NULL) {
-        psError(PS_ERR_UNKNOWN,true,"Return NULL when not expected");
-        return 2;
-    }
-    if(time->type != PS_TIME_TT) {
-        psError(PS_ERR_UNKNOWN,true,"Type of time object %d not as expected %d",
-                time->type,PS_TIME_TT);
-        return 3;
-    }
-    if((time->sec != testTime1SecondsUTC) || (time->nsec != testTime1NanosecondsUTC)) {
-        psError(PS_ERR_UNKNOWN,true,"Seconds %ld nanoseconds %d not as expected seconds %ld nanoseconds %d",
-                (long int)time->sec,time->nsec,(long int)testTime1SecondsUTC,testTime1NanosecondsUTC);
-        return 4;
-    }
-    psFree(time);
-
-    return 0;
-}
-
-psS32 testTimeFromUTC(void)
-{
-    psTime*       time = NULL;
-
-    // Attempt to create psTime with invalid time
-    psLogMsg(__func__,PS_LOG_INFO,"Following should generate an error message for invalid time");
-    time = psTimeFromUTC(0,2e9,true);
-    if(time != NULL) {
-        psError(PS_ERR_UNKNOWN,true,"Did not return NULL as expected");
-        return 1;
-    }
-
-    // Attempt to create psTime with valid non-leapsecond time and leapsecond flag true
-    time = psTimeFromUTC(testTime1SecondsUTC,testTime1NanosecondsUTC,true);
-    if(time == NULL) {
-        psError(PS_ERR_UNKNOWN,true,"Return NULL when not expected");
-        return 2;
-    }
-    if(time->type != PS_TIME_UTC) {
-        psError(PS_ERR_UNKNOWN,true,"Type of time object %d not as expected %d",
-                time->type,PS_TIME_UTC);
-        return 3;
-    }
-    if((time->sec != testTime1SecondsUTC) || (time->nsec != testTime1NanosecondsUTC)) {
-        psError(PS_ERR_UNKNOWN,true,"Seconds %ld nanoseconds %d not as expected seconds %ld nanoseconds %d",
-                (long int)time->sec,time->nsec,(long int)testTime1SecondsUTC,testTime1NanosecondsUTC);
-        return 4;
-    }
-    if(time->leapsecond) {
-        psError(PS_ERR_UNKNOWN,true,"Leapsecond flag %d not as expected 0",time->leapsecond);
-        return 5;
-    }
-    psFree(time);
-
-    // Attempt to create psTime with valid leapsecond time but leapsecond flag false
-    time = psTimeFromUTC(testTime3SecondsUTC,testTime3NanosecondsUTC,false);
-    if(time == NULL) {
-        psError(PS_ERR_UNKNOWN,true,"Return NULL when not expected");
-        return 6;
-    }
-    if(time->type != PS_TIME_UTC) {
-        psError(PS_ERR_UNKNOWN,true,"Type of time object %d not as expected %d",
-                time->type,PS_TIME_UTC);
-        return 7;
-    }
-    if((time->sec != testTime3SecondsUTC) || (time->nsec != testTime3NanosecondsUTC)) {
-        psError(PS_ERR_UNKNOWN,true,"Seconds %ld nanoseconds %d not as expected seconds %ld nanoseconds %d",
-                (long int)time->sec,time->nsec,(long int)testTime1SecondsUTC,testTime1NanosecondsUTC);
-        return 8;
-    }
-    if(!time->leapsecond) {
-        psError(PS_ERR_UNKNOWN,true,"Leapsecond flag %d not as expected 1",time->leapsecond);
-        return 9;
-    }
-
-
-    psFree(time);
-
-    return 0;
-}
-
Index: trunk/psLib/test/astronomy/tst_psTime_03.c
===================================================================
--- trunk/psLib/test/astronomy/tst_psTime_03.c	(revision 4541)
+++ 	(revision )
@@ -1,501 +1,0 @@
-/** @file  tst_psTime_03.c
- *
- *  @brief Test driver for psTime functions
- *
- *  This test driver contains the following tests for psTime:
- *   1) psTimeMath invalid times
- *   2) psTimeMath valid time of different types
- *   3) psTimeDelta valid times with different types
- *
- *  @author  Ross Harman, MHPCC
- *  @author  Eric Van Alst, MHPCC
- *
- *  @version $Revision: 1.18 $  $Name: not supported by cvs2svn $
- *  @date  $Date: 2005-06-10 01:41:35 $
- *
- *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
- *
- */
-
-#include "pslib_strict.h"
-#include "psTest.h"
-#include <string.h>
-
-#define ERROR_TOL    0.001
-
-static psS32 testTimeMath(void);
-static psS32 testTimeDelta(void);
-static psS32 testTimeConvert1(void);
-
-// Test Time 1 : May 9, 2005 00:00:00,0
-//               MJD = 53499.00
-//               JD = 2453499.5
-// UTC Test Time 1
-const psS64 testTime1SecondsUTC         = 1115596900;
-const psU32 testTime1NanosecondsUTC     = 0;
-// TAI Test Time 1
-const psS64 testTime1SecondsTAI         = 1115596932;
-const psU32 testTime1NanosecondsTAI     = 0;
-// TT Test Time 1
-const psS64 testTime1SecondsTT          = 1115596964;
-const psU32 testTime1NanosecondsTT      = 184000000;
-// UT1 Test Time 1
-const psS64 testTime1SecondsUT1         = 1115596900;
-const psU32 testTime1NanosecondsUT1     = 184000000;
-// Delta 1
-const psF64 deltaTime1                  = -15.5;
-// Expected UTC Time 1
-const psS64 newTestTime1SecondsUTC      = 1115596884;
-const psU32 newTestTime1NanosecondsUTC  = 500000000;
-// Expected TAI Time 1
-const psS64 newTestTime1SecondsTAI      = 1115596916;
-const psU32 newTestTime1NanosecondsTAI  = 500000000;
-// Delta 2
-const psF64 deltaTime2                  = 123.066;
-// Expected TT Time 1 w/ delta 2
-const psS64 newTestTime1SecondsTT       = 1115597087;
-const psU32 newTestTime1NanosecondsTT   = 250000000;
-// Expected UT1 Time 1 w/ delta 2
-const psS64 newTestTime1SecondsUT1      = 1115597023;
-const psU32 newTestTime1NanosecondsUT1  = 250000000;
-
-// Test Time 2 : Dec. 31 1998 23:59:45,0
-//               MJD = 51178.99983
-//               JD = 2451179.49983
-// UTC Test Time 1
-const psS64 testTime2SecondsUTC         = 915148785;
-const psU32 testTime2NanosecondsUTC     = 0;
-// Delta 3
-const psF64 deltaTime3                    = 30.0;
-// Expected UTC Time
-const psS64 newTestTime2SecondsUTC      = 915148814;
-const psU32 newTestTime2NanosecondsUTC  = 0;
-
-// Appendix B time conversion tests
-//
-#define APPB_TESTS    8
-const psS64 testTimeBSeconds[APPB_TESTS] =
-    {
-        915148829,
-        915148829,
-        915148830,
-        915148830,
-        915148831,
-        915148831,
-        915148832,
-        915148832
-    };
-const psU32 testTimeBNanoseconds[APPB_TESTS] =
-    {
-        0,
-        500000000,
-        0,
-        500000000,
-        0,
-        500000000,
-        0,
-        500000000
-    };
-const psBool testTimeBLeapsecond[APPB_TESTS] =
-    {
-        false,
-        false,
-        false,
-        false,
-        true,
-        true,
-        false,
-        false
-    };
-// Expected results
-const char* testTimeBStrUTC[APPB_TESTS] =
-    {
-        "1998-12-31T23:59:58,0Z",
-        "1998-12-31T23:59:58,5Z",
-        "1998-12-31T23:59:59,0Z",
-        "1998-12-31T23:59:59,5Z",
-        "1998-12-31T23:59:60,0Z",
-        "1998-12-31T23:59:60,5Z",
-        "1999-01-01T00:00:00,0Z",
-        "1999-01-01T00:00:00,5Z"
-    };
-const char* testTimeBStrTAI[APPB_TESTS] =
-    {
-        "1999-01-01T00:00:29,0Z",
-        "1999-01-01T00:00:29,5Z",
-        "1999-01-01T00:00:30,0Z",
-        "1999-01-01T00:00:30,5Z",
-        "1999-01-01T00:00:31,0Z",
-        "1999-01-01T00:00:31,5Z",
-        "1999-01-01T00:00:32,0Z",
-        "1999-01-01T00:00:32,5Z"
-    };
-const char* testTimeBStrTT[APPB_TESTS] =
-    {
-        "1999-01-01T00:01:01,1Z",
-        "1999-01-01T00:01:01,6Z",
-        "1999-01-01T00:01:02,1Z",
-        "1999-01-01T00:01:02,6Z",
-        "1999-01-01T00:01:03,1Z",
-        "1999-01-01T00:01:03,6Z",
-        "1999-01-01T00:01:04,1Z",
-        "1999-01-01T00:01:04,6Z"
-    };
-const char* testTimeBStrUT1[APPB_TESTS] =
-    {
-        "1998-12-31T23:59:58,7Z",
-        "1998-12-31T23:59:59,2Z",
-        "1998-12-31T23:59:59,7Z",
-        "1998-12-31T23:59:60,2Z",
-        "1998-12-31T23:59:60,7Z",
-        "1999-01-01T00:00:00,2Z",
-        "1999-01-01T00:00:00,7Z",
-        "1999-01-01T00:00:01,2Z"
-    };
-
-// Test Time B1 : Dec 31, 1998 23:59:58,0
-//                MJD = 51178.99998
-//                JD = 2451179.49998
-//const psS64 testTimeB1SecondsUTC        = 915148798;
-//const psU32 testTimeB1NanosecondsUTC    = 0;
-// Expected ISO times
-//const char testTimeB1StrUTC[] = "1998-12-31T23:59:58,0Z";
-//const char testTimeB1StrTAI[] = "1999-01-01T00:00:29,0Z";
-//const char testTimeB1StrTT[]  = "1999-01-01T00:01:01,1Z";
-//const char testTimeB1StrUT1[] = "1998-12-31T23:59:57,7Z";
-//
-// Test Time B2 : Dec 31, 1998 23:59:58,5
-//
-//
-//const psS64 testTimeB2SecondsUTC       = 915148798;
-//const psU32 testTimeB2NanosecondsUTC   = 500000000;
-// Expected ISO times
-//const char testTimeB2StrUTC[] = "1998-12-31T23:59:58,5Z";
-//const char testTimeB2StrTAI[] = "1991-01-01T00:00:29,5Z";
-//const char testTimeB2StrTT[]  = "1999-01-01T00:01:01,6Z";
-//const char testTimeB2StrUT1[] = "1998-12-31T23:59:58,2Z";
-
-testDescription tests[] = {
-                              {testTimeMath,000,"psTimeMath",0,false},
-                              {testTimeDelta,000,"psTimeDelta",0,false},
-                              {testTimeConvert1,000,"psTimeConvert",0,false},
-                              {NULL}
-                          };
-
-psS32 main(psS32 argc, char* argv[])
-{
-    psLogSetLevel(PS_LOG_INFO);
-
-    // Initialize library internal structures
-    psLibInit("psTime.config");
-
-    if( !runTestSuite(stderr,"psTime",tests,argc,argv)) {
-        return 1;
-    }
-
-    // Clean up library
-    psLibFinalize();
-
-    return 0;
-}
-
-psS32 testTimeMath(void)
-{
-    psTime*     time      = NULL;
-    psTime*     newTime   = NULL;
-
-    // Attempt to perform math operation on NULL time
-    psLogMsg(__func__,PS_LOG_INFO,"Following should generate error message for NULL time");
-    if(psTimeMath(time,-1.1) != NULL) {
-        psError(PS_ERR_UNKNOWN,true,"Did not return NULL for NULL time");
-        return 1;
-    }
-
-    // Set up input time with invalid nanoseconds
-    time = psTimeAlloc(PS_TIME_UTC);
-    time->sec = 0;
-    time->nsec = 2e9;
-    psLogMsg(__func__,PS_LOG_INFO,"Following should generate error message for invalid time");
-    if(psTimeMath(time,-1.1) != NULL) {
-        psError(PS_ERR_UNKNOWN,true,"Did not return NULL for invalid time");
-        return 2;
-    }
-
-    // Set up input time with valid time
-    time->sec = testTime1SecondsUTC;
-    time->nsec = testTime1NanosecondsUTC;
-    newTime = psTimeMath(time,deltaTime1);
-    if(newTime == NULL) {
-        psError(PS_ERR_UNKNOWN,true,"Did not expect NULL return");
-        return 3;
-    }
-    if(newTime->type != PS_TIME_UTC) {
-        psError(PS_ERR_UNKNOWN,true,"New time type %d not as expected %d",
-                newTime->type,PS_TIME_UTC);
-        return 4;
-    }
-    if((newTime->sec != newTestTime1SecondsUTC) || (newTime->nsec != newTestTime1NanosecondsUTC)) {
-        psError(PS_ERR_UNKNOWN,true,"UTC sec %ld nsec %d not as expected sec %ld nsec %d",
-                (long int)newTime->sec,newTime->nsec,(long int)newTestTime1SecondsUTC,
-                newTestTime1NanosecondsUTC);
-        return 5;
-    }
-    psFree(newTime);
-
-    // Set up input time with valid TAI time
-    time->sec = testTime1SecondsTAI;
-    time->nsec = testTime1NanosecondsTAI;
-    time->type = PS_TIME_TAI;
-    newTime = psTimeMath(time,deltaTime1);
-    if(newTime == NULL) {
-        psError(PS_ERR_UNKNOWN,true,"Did not expect NULL return");
-        return 3;
-    }
-    if(newTime->type != PS_TIME_TAI) {
-        psError(PS_ERR_UNKNOWN,true,"New time type %d not as expected %d",
-                newTime->type,PS_TIME_TAI);
-        return 4;
-    }
-    if((newTime->sec != newTestTime1SecondsTAI) || (newTime->nsec != newTestTime1NanosecondsTAI)) {
-        psError(PS_ERR_UNKNOWN,true,"TAI sec %ld nsec %d not as expected sec %ld nsec %d",
-                (long int)newTime->sec,newTime->nsec,(long int)newTestTime1SecondsTAI,
-                newTestTime1NanosecondsTAI);
-        return 5;
-    }
-    psFree(newTime);
-
-    // Set up input time with valid TT time
-    time->sec = testTime1SecondsTT;
-    time->nsec = testTime1NanosecondsTT;
-    time->type = PS_TIME_TT;
-    newTime = psTimeMath(time,deltaTime2);
-    if(newTime == NULL) {
-        psError(PS_ERR_UNKNOWN,true,"Did not expect NULL return");
-        return 3;
-    }
-    if(newTime->type != PS_TIME_TT) {
-        psError(PS_ERR_UNKNOWN,true,"New time type %d not as expected %d",
-                newTime->type,PS_TIME_TT);
-        return 4;
-    }
-    if((newTime->sec != newTestTime1SecondsTT) || (newTime->nsec != newTestTime1NanosecondsTT)) {
-        psError(PS_ERR_UNKNOWN,true,"TT sec %ld nsec %d not as expected sec %ld nsec %d",
-                (long int)newTime->sec,newTime->nsec,(long int)newTestTime1SecondsTT,
-                newTestTime1NanosecondsTT);
-        return 5;
-    }
-    psFree(newTime);
-
-    // Set up input time with valid TT time
-    time->sec = testTime1SecondsUT1;
-    time->nsec = testTime1NanosecondsUT1;
-    time->type = PS_TIME_UT1;
-    newTime = psTimeMath(time,deltaTime2);
-    if(newTime == NULL) {
-        psError(PS_ERR_UNKNOWN,true,"Did not expect NULL return");
-        return 3;
-    }
-    if(newTime->type != PS_TIME_UT1) {
-        psError(PS_ERR_UNKNOWN,true,"New time type %d not as expected %d",
-                newTime->type,PS_TIME_UT1);
-        return 4;
-    }
-    if((newTime->sec != newTestTime1SecondsUT1) || (newTime->nsec != newTestTime1NanosecondsUT1)) {
-        psError(PS_ERR_UNKNOWN,true,"UT1 sec %ld nsec %d not as expected sec %ld nsec %d",
-                (long int)newTime->sec,newTime->nsec,(long int)newTestTime1SecondsUT1,
-                newTestTime1NanosecondsUT1);
-        return 5;
-    }
-    psFree(newTime);
-
-    // Set up input time with valid UTC time and delt which crosses leap second
-    time->sec = testTime2SecondsUTC;
-    time->nsec = testTime2NanosecondsUTC;
-    time->type = PS_TIME_UTC;
-    newTime = psTimeMath(time,deltaTime3);
-    if(newTime == NULL) {
-        psError(PS_ERR_UNKNOWN,true,"Did not expect NULL return");
-        return 3;
-    }
-    if(newTime->type != PS_TIME_UTC) {
-        psError(PS_ERR_UNKNOWN,true,"New time type %d not as expected %d",
-                newTime->type,PS_TIME_UTC);
-        return 4;
-    }
-    if((newTime->sec != newTestTime2SecondsUTC) || (newTime->nsec != newTestTime2NanosecondsUTC)) {
-        psError(PS_ERR_UNKNOWN,true,"UTC sec %ld nsec %d not as expected sec %ld nsec %d",
-                (long int)newTime->sec,newTime->nsec,(long int)newTestTime2SecondsUTC,
-                newTestTime2NanosecondsUTC);
-        return 5;
-    }
-    psFree(newTime);
-
-    psFree(time);
-
-    return 0;
-}
-
-psS32 testTimeDelta(void)
-{
-    psTime*   time1   = NULL;
-    psTime*   time2   = NULL;
-    psF64     delta   = 0.0;
-
-    // Attempt to get delta with time1 NULL
-    psLogMsg(__func__,PS_LOG_INFO,"Following should generate error message for NULL time");
-    delta = psTimeDelta(time1,time2);
-    if(fabs(delta-0.0) > ERROR_TOL) {
-        psError(PS_ERR_UNKNOWN,true,"Did not return 0 for NULL time argument");
-        return 1;
-    }
-
-    // Set time 1
-    time1 = psTimeAlloc(PS_TIME_UTC);
-
-    // Attempt to get delta with time2 NULL
-    psLogMsg(__func__,PS_LOG_INFO,"Following should generate error message for NULL time");
-    delta = psTimeDelta(time1,time2);
-    if(fabs(delta-0.0) > ERROR_TOL) {
-        psError(PS_ERR_UNKNOWN,true,"Did not return 0 for NULL time argument");
-        return 2;
-    }
-
-    // Set time 2
-    time2 = psTimeAlloc(PS_TIME_UTC);
-
-    // Set time1 invalid
-    time1->sec = 0;
-    time1->nsec = 2e9;
-    // Attempt to get delta with time1 invalid
-    psLogMsg(__func__,PS_LOG_INFO,"Following should generate error message for invalid time");
-    delta = psTimeDelta(time1,time2);
-    if(fabs(delta-0.0) > ERROR_TOL) {
-        psError(PS_ERR_UNKNOWN,true,"Did not return 0 for invalid time argument");
-        return 3;
-    }
-
-    // Set time 1 valid
-    time1->sec = testTime1SecondsUTC;
-    time1->nsec = testTime1NanosecondsUTC;
-
-    // Set time 2 invalid
-    time2->sec = 0;
-    time2->nsec = 2e9;
-    // Attempt to get delta with time2 invalid
-    psLogMsg(__func__,PS_LOG_INFO,"Following should generate error message for invalid time");
-    delta = psTimeDelta(time1,time2);
-    if(fabs(delta-0.0) > ERROR_TOL) {
-        psError(PS_ERR_UNKNOWN,true,"Did not return 0 for invalid time argument");
-        return 4;
-    }
-
-    // Set time 2 valid but different type
-    time2->sec = newTestTime1SecondsUTC;
-    time2->nsec = newTestTime1NanosecondsUTC;
-    time2->type = PS_TIME_TAI;
-    // Attempt to get delta with different time types
-    psLogMsg(__func__,PS_LOG_INFO,"Following should generate error message for incorrect type");
-    delta = psTimeDelta(time1,time2);
-    if(fabs(delta-0.0) > ERROR_TOL) {
-        psError(PS_ERR_UNKNOWN,true,"Did not return 0 for invalid time argument");
-        return 5;
-    }
-
-    // Set time 2 to same as time 1
-    time2->type = PS_TIME_UTC;
-    // Attempt to get delta with valid times of the same type
-    delta = psTimeDelta(time2,time1);
-    if(fabs(delta-deltaTime1) > ERROR_TOL) {
-        psError(PS_ERR_UNKNOWN,true,"Delta %lf not as expected %lf",
-                delta,deltaTime1);
-        return 6;
-    }
-
-    // Set time 1 and 2 as different times with same type
-    time1->sec = testTime1SecondsTT;
-    time1->nsec = testTime1NanosecondsTT;
-    time1->type = PS_TIME_TT;
-    time2->sec = newTestTime1SecondsTT;
-    time2->nsec = newTestTime1NanosecondsTT;
-    time2->type = PS_TIME_TT;
-    // Attempt to get delta with valid times of the same type
-    delta = psTimeDelta(time2,time1);
-    if(fabs(delta-deltaTime2) > ERROR_TOL) {
-        psError(PS_ERR_UNKNOWN,true,"Delta %lf not as expected %lf",
-                delta,deltaTime2);
-        return 7;
-    }
-
-    // Set time 1 and 2 as different times with same type
-    time1->sec = testTime2SecondsUTC;
-    time1->nsec = testTime2NanosecondsUTC;
-    time1->type = PS_TIME_UTC;
-    time2->sec = newTestTime2SecondsUTC;
-    time2->nsec = newTestTime2NanosecondsUTC;
-    time2->type = PS_TIME_UTC;
-    // Attempt to get delta with valid times of the same type
-    delta = psTimeDelta(time2,time1);
-    if(fabs(delta-deltaTime3) > ERROR_TOL) {
-        psError(PS_ERR_UNKNOWN,true,"Delta %lf not as expected %lf",
-                delta,deltaTime3);
-        return 7;
-    }
-
-    psFree(time1);
-    psFree(time2);
-
-    return 0;
-}
-
-psS32 testTimeConvert1(void)
-{
-    psTime*     time    = NULL;
-    char*       timeStr = NULL;
-
-    for(psS32 i = 0; i < APPB_TESTS; i++) {
-
-        // Initialize time for test time B1
-        time = psTimeAlloc(PS_TIME_TAI);
-        time->sec = testTimeBSeconds[i];
-        time->nsec = testTimeBNanoseconds[i];
-
-        // Verify TAI ISO string
-        timeStr = psTimeToISO(time);
-        if(strcmp(timeStr,testTimeBStrTAI[i]) != 0) {
-            psError(PS_ERR_UNKNOWN,true,"TAI ISO string %s not as expected %s",timeStr,testTimeBStrTAI[i]);
-            return i+1;
-        }
-        psFree(timeStr);
-
-        time = psTimeConvert(time,PS_TIME_TT);
-        timeStr = psTimeToISO(time);
-        if(strcmp(timeStr,testTimeBStrTT[i]) != 0) {
-            psError(PS_ERR_UNKNOWN,true,"TT ISO string %s not as expected %s",timeStr,testTimeBStrTT[i]);
-            return i+10;
-        }
-        psFree(timeStr);
-
-        // Verify UTC ISO string
-        time = psTimeConvert(time,PS_TIME_UTC);
-        time->leapsecond = testTimeBLeapsecond[i];
-        timeStr = psTimeToISO(time);
-        if(strcmp(timeStr,testTimeBStrUTC[i]) != 0) {
-            psError(PS_ERR_UNKNOWN,true,"UTC ISO string %s not as expected %s",timeStr,testTimeBStrUTC[i]);
-            return i+20;
-        }
-        psFree(timeStr);
-
-        time = psTimeConvert(time,PS_TIME_UT1);
-        timeStr = psTimeToISO(time);
-        if(strcmp(timeStr,testTimeBStrUT1[i]) != 0) {
-            psError(PS_ERR_UNKNOWN,true,"UT1 ISO string %s not as expected %s",timeStr,testTimeBStrUT1[i]);
-            return i+30;
-        }
-        psFree(timeStr);
-
-        psFree(time);
-    }
-
-    return 0;
-}
-
Index: trunk/psLib/test/astronomy/tst_psTime_04.c
===================================================================
--- trunk/psLib/test/astronomy/tst_psTime_04.c	(revision 4541)
+++ 	(revision )
@@ -1,106 +1,0 @@
-/** @file  tst_psTime_04.c
- *
- *  @brief Test driver for psTime functions
- *
- *  This test driver contains the following tests for psTime:
- *      Test A - Initialize time
- *      Test B - Attempt to open non-existant time config file
- *      Test C - Attempt to open non-existant time data files
- *      Test D - Attempt to read incorrect number of files
- *      Test E - Attempt to read incorrect number of from values
- *      Test F - Attempt to read data file with typo in number
- *      Test G - Free data
- *
- *  @author  Ross Harman, MHPCC
- *  @author  Eric Van Alst, MHPCC
- *
- *  @version $Revision: 1.13 $  $Name: not supported by cvs2svn $
- *  @date  $Date: 2005-06-10 01:41:35 $
- *
- *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
- *
- */
-#include "config.h"
-
-#include "pslib_strict.h"
-#include "psTest.h"
-
-static psS32 testTimeInit1(void);
-static psS32 testTimeInit2(void);
-static psS32 testTimeInit3(void);
-static psS32 testTimeInit4(void);
-static psS32 testTimeInit5(void);
-static psS32 testTimeInit6(void);
-
-testDescription tests[] = {
-                              {testTimeInit1,000,"p_psTimeInit",0,false},
-                              {testTimeInit2,000,"p_psTimeInit",0,false},
-                              {testTimeInit3,000,"p_psTimeInit",0,false},
-                              {testTimeInit4,000,"p_psTimeInit",0,false},
-                              {testTimeInit5,000,"p_psTimeInit",0,false},
-                              {testTimeInit6,000,"p_psTimeInit",0,false},
-                              {NULL}
-                          };
-
-psS32 main(psS32 argc, char* argv[])
-{
-    if(!runTestSuite(stderr,"psTime",tests,argc,argv)) {
-        return 1;
-    }
-
-    return 0;
-}
-
-psS32 testTimeInit1(void)
-{
-    // Test A - Initialize time
-    psLibInit("psTime.config");
-    psLibFinalize();
-
-    return 0;
-}
-
-psS32 testTimeInit2(void)
-{
-    // Test B - Attempt to open non-existant time config file
-    psLibInit("zzz");
-
-    return 0;
-}
-
-psS32 testTimeInit3(void)
-{
-    // Test C - Attempt to open non-existant time data files
-    psLibInit("test.psTime.config1");
-    psLibFinalize();
-
-    return 0;
-}
-
-psS32 testTimeInit4(void)
-{
-    // Test D - Attempt to read incorrect number of files
-    psLibInit("test.psTime.config2");
-    psLibFinalize();
-
-    return 0;
-}
-
-psS32 testTimeInit5(void)
-{
-    // Test E - Attempt to read incorrect number of from values
-    psLibInit("test.psTime.config3");
-    psLibFinalize();
-
-    return 0;
-}
-
-psS32 testTimeInit6(void)
-{
-    // Test F - Attempt to read data file with typo in number
-    psLibInit("test.psTime.config4");
-    psLibFinalize();
-
-    return 0;
-}
-
Index: trunk/psLib/test/astronomy/verified/tst_psCoord.stderr
===================================================================
--- trunk/psLib/test/astronomy/verified/tst_psCoord.stderr	(revision 4541)
+++ 	(revision )
@@ -1,227 +1,0 @@
-/***************************** TESTPOINT ******************************************\
-*             TestFile: tst_psCoord.c                                              *
-*            TestPoint: psCoord{psSphereTransformAlloc()}                          *
-*             TestType: Positive                                                   *
-\**********************************************************************************/
-
-
----> TESTPOINT PASSED (psCoord{psSphereTransformAlloc()} | tst_psCoord.c)
-
-/***************************** TESTPOINT ******************************************\
-*             TestFile: tst_psCoord.c                                              *
-*            TestPoint: psCoord{psPlaneTransformAlloc()}                           *
-*             TestType: Positive                                                   *
-\**********************************************************************************/
-
-<DATE><TIME>|<HOST>|I|testPlaneTransformAlloc
-    Following should generate an error message: negative x terms
-<DATE><TIME>|<HOST>|E|psPlaneTransformAlloc (FILE:LINENO)
-    Error: n1 is less than 0.
-<DATE><TIME>|<HOST>|I|testPlaneTransformAlloc
-    Following should generate an error message: negative y terms
-<DATE><TIME>|<HOST>|E|psPlaneTransformAlloc (FILE:LINENO)
-    Error: n2 is less than 0.
-
----> TESTPOINT PASSED (psCoord{psPlaneTransformAlloc()} | tst_psCoord.c)
-
-/***************************** TESTPOINT ******************************************\
-*             TestFile: tst_psCoord.c                                              *
-*            TestPoint: psCoord{psPlaneDistortAlloc()}                             *
-*             TestType: Positive                                                   *
-\**********************************************************************************/
-
-<DATE><TIME>|<HOST>|I|testPlaneDistortAlloc
-    Following should generate an error message for negative x term
-<DATE><TIME>|<HOST>|E|psPlaneDistortAlloc (FILE:LINENO)
-    Error: n1 is less than 0.
-<DATE><TIME>|<HOST>|I|testPlaneDistortAlloc
-    Following should generate an error message for negative y term
-<DATE><TIME>|<HOST>|E|psPlaneDistortAlloc (FILE:LINENO)
-    Error: n2 is less than 0.
-<DATE><TIME>|<HOST>|I|testPlaneDistortAlloc
-    Following should generate an error message for negative z term
-<DATE><TIME>|<HOST>|E|psPlaneDistortAlloc (FILE:LINENO)
-    Error: n3 is less than 0.
-<DATE><TIME>|<HOST>|I|testPlaneDistortAlloc
-    Following should generate an error message for negative w term
-<DATE><TIME>|<HOST>|E|psPlaneDistortAlloc (FILE:LINENO)
-    Error: n4 is less than 0.
-
----> TESTPOINT PASSED (psCoord{psPlaneDistortAlloc()} | tst_psCoord.c)
-
-/***************************** TESTPOINT ******************************************\
-*             TestFile: tst_psCoord.c                                              *
-*            TestPoint: psCoord{psPlaneTransformApply()}                           *
-*             TestType: Positive                                                   *
-\**********************************************************************************/
-
-<DATE><TIME>|<HOST>|I|testPlaneTransformApply
-    Following should generate error message for NULL psPlaneTransform
-<DATE><TIME>|<HOST>|E|psPlaneTransformApply (FILE:LINENO)
-    Unallowable operation: transform is NULL.
-<DATE><TIME>|<HOST>|I|testPlaneTransformApply
-    Following should generate error message for NULL x coeff psPlaneTransform
-<DATE><TIME>|<HOST>|E|psPlaneTransformApply (FILE:LINENO)
-    Unallowable operation: transform->x is NULL.
-<DATE><TIME>|<HOST>|I|testPlaneTransformApply
-    Following should generate error message for NULL y coeff psPlaneTransform
-<DATE><TIME>|<HOST>|E|psPlaneTransformApply (FILE:LINENO)
-    Unallowable operation: transform->y is NULL.
-<DATE><TIME>|<HOST>|I|testPlaneTransformApply
-    Following should generate error message for NULL psPlane
-<DATE><TIME>|<HOST>|E|psPlaneTransformApply (FILE:LINENO)
-    Unallowable operation: coords is NULL.
-
----> TESTPOINT PASSED (psCoord{psPlaneTransformApply()} | tst_psCoord.c)
-
-/***************************** TESTPOINT ******************************************\
-*             TestFile: tst_psCoord.c                                              *
-*            TestPoint: psCoord{psPlaneDistortApply()}                             *
-*             TestType: Positive                                                   *
-\**********************************************************************************/
-
-<DATE><TIME>|<HOST>|I|testPlaneDistortApply
-    Following should generate an error message for null psPlaneDistort
-<DATE><TIME>|<HOST>|E|psPlaneDistortApply (FILE:LINENO)
-    Unallowable operation: distort is NULL.
-<DATE><TIME>|<HOST>|I|testPlaneDistortApply
-    Following should generate an error message for null x member psPlaneDistort
-<DATE><TIME>|<HOST>|E|psPlaneDistortApply (FILE:LINENO)
-    Unallowable operation: distort->x is NULL.
-<DATE><TIME>|<HOST>|I|testPlaneDistortApply
-    Following should generate an error message for null y member psPlaneDistort
-<DATE><TIME>|<HOST>|E|psPlaneDistortApply (FILE:LINENO)
-    Unallowable operation: distort->y is NULL.
-<DATE><TIME>|<HOST>|I|testPlaneDistortApply
-    Following should generate an error message for null input psPlane
-<DATE><TIME>|<HOST>|E|psPlaneDistortApply (FILE:LINENO)
-    Unallowable operation: coords is NULL.
-
----> TESTPOINT PASSED (psCoord{psPlaneDistortApply()} | tst_psCoord.c)
-
-/***************************** TESTPOINT ******************************************\
-*             TestFile: tst_psCoord.c                                              *
-*            TestPoint: psCoord{psSphereTransformApply()}                          *
-*             TestType: Positive                                                   *
-\**********************************************************************************/
-
-<DATE><TIME>|<HOST>|I|testSphereTransformApply1
-    Following should generate an error
-<DATE><TIME>|<HOST>|E|psSphereTransformApply (FILE:LINENO)
-    Unallowable operation: transform is NULL.
-<DATE><TIME>|<HOST>|I|testSphereTransformApply1
-    Following should generate an error
-<DATE><TIME>|<HOST>|E|psSphereTransformApply (FILE:LINENO)
-    Unallowable operation: coord is NULL.
-
----> TESTPOINT PASSED (psCoord{psSphereTransformApply()} | tst_psCoord.c)
-
-/***************************** TESTPOINT ******************************************\
-*             TestFile: tst_psCoord.c                                              *
-*            TestPoint: psCoord{psSphereTransformApply()}                          *
-*             TestType: Positive                                                   *
-\**********************************************************************************/
-
-
----> TESTPOINT PASSED (psCoord{psSphereTransformApply()} | tst_psCoord.c)
-
-/***************************** TESTPOINT ******************************************\
-*             TestFile: tst_psCoord.c                                              *
-*            TestPoint: psCoord{psSphereTransformApply()}                          *
-*             TestType: Positive                                                   *
-\**********************************************************************************/
-
-
----> TESTPOINT PASSED (psCoord{psSphereTransformApply()} | tst_psCoord.c)
-
-/***************************** TESTPOINT ******************************************\
-*             TestFile: tst_psCoord.c                                              *
-*            TestPoint: psCoord{psSphereTransformApply()}                          *
-*             TestType: Positive                                                   *
-\**********************************************************************************/
-
-
----> TESTPOINT PASSED (psCoord{psSphereTransformApply()} | tst_psCoord.c)
-
-/***************************** TESTPOINT ******************************************\
-*             TestFile: tst_psCoord.c                                              *
-*            TestPoint: psCoord{psSphereTransformApply()}                          *
-*             TestType: Positive                                                   *
-\**********************************************************************************/
-
-
----> TESTPOINT PASSED (psCoord{psSphereTransformApply()} | tst_psCoord.c)
-
-/***************************** TESTPOINT ******************************************\
-*             TestFile: tst_psCoord.c                                              *
-*            TestPoint: psCoord{psSphereTransformICRSToEcliptic()}                 *
-*             TestType: Positive                                                   *
-\**********************************************************************************/
-
-<DATE><TIME>|<HOST>|I|testSphereTransformICRSToEcliptic
-    Following should generate an error message
-<DATE><TIME>|<HOST>|E|psSphereTransformICRSToEcliptic (FILE:LINENO)
-    Unallowable operation: time is NULL.
-<DATE><TIME>|<HOST>|I|testSphereTransformICRSToEcliptic
-    Following should generate an error message
-<DATE><TIME>|<HOST>|E|psSphereTransformICRSToEcliptic (FILE:LINENO)
-    Specified time is less than 1900.
-
----> TESTPOINT PASSED (psCoord{psSphereTransformICRSToEcliptic()} | tst_psCoord.c)
-
-/***************************** TESTPOINT ******************************************\
-*             TestFile: tst_psCoord.c                                              *
-*            TestPoint: psCoord{psSphereTransformEclipticToICRS()}                 *
-*             TestType: Positive                                                   *
-\**********************************************************************************/
-
-<DATE><TIME>|<HOST>|I|testSphereTransformEclipticToICRS
-    Following should generate an error message
-<DATE><TIME>|<HOST>|E|psSphereTransformEclipticToICRS (FILE:LINENO)
-    Unallowable operation: time is NULL.
-<DATE><TIME>|<HOST>|I|testSphereTransformEclipticToICRS
-    Following should generate an error message
-<DATE><TIME>|<HOST>|E|psSphereTransformEclipticToICRS (FILE:LINENO)
-    Specified time is less than 1900.
-
----> TESTPOINT PASSED (psCoord{psSphereTransformEclipticToICRS()} | tst_psCoord.c)
-
-/***************************** TESTPOINT ******************************************\
-*             TestFile: tst_psCoord.c                                              *
-*            TestPoint: psCoord{psSphereTransformICRSToGalactic()}                 *
-*             TestType: Positive                                                   *
-\**********************************************************************************/
-
-
----> TESTPOINT PASSED (psCoord{psSphereTransformICRSToGalactic()} | tst_psCoord.c)
-
-/***************************** TESTPOINT ******************************************\
-*             TestFile: tst_psCoord.c                                              *
-*            TestPoint: psCoord{psSphereTransformGalacticToICRS()}                 *
-*             TestType: Positive                                                   *
-\**********************************************************************************/
-
-
----> TESTPOINT PASSED (psCoord{psSphereTransformGalacticToICRS()} | tst_psCoord.c)
-
-/***************************** TESTPOINT ******************************************\
-*             TestFile: tst_psCoord.c                                              *
-*            TestPoint: psCoord{psSphereTransformPrecess()}                        *
-*             TestType: Positive                                                   *
-\**********************************************************************************/
-
-<DATE><TIME>|<HOST>|I|testSphereTransformPrecess
-    Following should generate an error message
-<DATE><TIME>|<HOST>|E|psSpherePrecess (FILE:LINENO)
-    Unallowable operation: toTime is NULL.
-<DATE><TIME>|<HOST>|I|testSphereTransformPrecess
-    Following should generate an error message
-<DATE><TIME>|<HOST>|E|psSpherePrecess (FILE:LINENO)
-    Unallowable operation: fromTime is NULL.
-<DATE><TIME>|<HOST>|I|testSphereTransformPrecess
-    Following should generate an error message
-<DATE><TIME>|<HOST>|E|psSpherePrecess (FILE:LINENO)
-    Unallowable operation: coords is NULL.
-
----> TESTPOINT PASSED (psCoord{psSphereTransformPrecess()} | tst_psCoord.c)
-
Index: trunk/psLib/test/astronomy/verified/tst_psCoord01.stderr
===================================================================
--- trunk/psLib/test/astronomy/verified/tst_psCoord01.stderr	(revision 4541)
+++ 	(revision )
@@ -1,199 +1,0 @@
-/***************************** TESTPOINT ******************************************\
-*             TestFile: tst_psCoord01.c                                            *
-*            TestPoint: psCoord{psProjectionAlloc}                                 *
-*             TestType: Positive                                                   *
-\**********************************************************************************/
-
-
----> TESTPOINT PASSED (psCoord{psProjectionAlloc} | tst_psCoord01.c)
-
-/***************************** TESTPOINT ******************************************\
-*             TestFile: tst_psCoord01.c                                            *
-*            TestPoint: psCoord{psProject(TAN)}                                    *
-*             TestType: Positive                                                   *
-\**********************************************************************************/
-
-
----> TESTPOINT PASSED (psCoord{psProject(TAN)} | tst_psCoord01.c)
-
-/***************************** TESTPOINT ******************************************\
-*             TestFile: tst_psCoord01.c                                            *
-*            TestPoint: psCoord{psDeproject(TAN)}                                  *
-*             TestType: Positive                                                   *
-\**********************************************************************************/
-
-
----> TESTPOINT PASSED (psCoord{psDeproject(TAN)} | tst_psCoord01.c)
-
-/***************************** TESTPOINT ******************************************\
-*             TestFile: tst_psCoord01.c                                            *
-*            TestPoint: psCoord{psProject(SIN)}                                    *
-*             TestType: Positive                                                   *
-\**********************************************************************************/
-
-
----> TESTPOINT PASSED (psCoord{psProject(SIN)} | tst_psCoord01.c)
-
-/***************************** TESTPOINT ******************************************\
-*             TestFile: tst_psCoord01.c                                            *
-*            TestPoint: psCoord{psDeproject(SIN)}                                  *
-*             TestType: Positive                                                   *
-\**********************************************************************************/
-
-
----> TESTPOINT PASSED (psCoord{psDeproject(SIN)} | tst_psCoord01.c)
-
-/***************************** TESTPOINT ******************************************\
-*             TestFile: tst_psCoord01.c                                            *
-*            TestPoint: psCoord{psProject(AIT)}                                    *
-*             TestType: Positive                                                   *
-\**********************************************************************************/
-
-
----> TESTPOINT PASSED (psCoord{psProject(AIT)} | tst_psCoord01.c)
-
-/***************************** TESTPOINT ******************************************\
-*             TestFile: tst_psCoord01.c                                            *
-*            TestPoint: psCoord{psDeproject(AIT)}                                  *
-*             TestType: Positive                                                   *
-\**********************************************************************************/
-
-
----> TESTPOINT PASSED (psCoord{psDeproject(AIT)} | tst_psCoord01.c)
-
-/***************************** TESTPOINT ******************************************\
-*             TestFile: tst_psCoord01.c                                            *
-*            TestPoint: psCoord{psProject(PAR)}                                    *
-*             TestType: Positive                                                   *
-\**********************************************************************************/
-
-
----> TESTPOINT PASSED (psCoord{psProject(PAR)} | tst_psCoord01.c)
-
-/***************************** TESTPOINT ******************************************\
-*             TestFile: tst_psCoord01.c                                            *
-*            TestPoint: psCoord{psDeproject(PAR)}                                  *
-*             TestType: Positive                                                   *
-\**********************************************************************************/
-
-
----> TESTPOINT PASSED (psCoord{psDeproject(PAR)} | tst_psCoord01.c)
-
-/***************************** TESTPOINT ******************************************\
-*             TestFile: tst_psCoord01.c                                            *
-*            TestPoint: psCoord{psProject}                                         *
-*             TestType: Positive                                                   *
-\**********************************************************************************/
-
-<DATE><TIME>|<HOST>|I|testProjectFail
-    Following should generate an error message for null coord arg
-<DATE><TIME>|<HOST>|E|psProject (FILE:LINENO)
-    Unallowable operation: coord is NULL.
-<DATE><TIME>|<HOST>|I|testProjectFail
-    Following should generate an error message for null projection arg
-<DATE><TIME>|<HOST>|E|psProject (FILE:LINENO)
-    Unallowable operation: projection is NULL.
-<DATE><TIME>|<HOST>|I|testProjectFail
-    Following should generate an error message for invalid projection type
-<DATE><TIME>|<HOST>|E|psProject (FILE:LINENO)
-    The projection type, 4, is unknown.
-
----> TESTPOINT PASSED (psCoord{psProject} | tst_psCoord01.c)
-
-/***************************** TESTPOINT ******************************************\
-*             TestFile: tst_psCoord01.c                                            *
-*            TestPoint: psCoord{psProject}                                         *
-*             TestType: Positive                                                   *
-\**********************************************************************************/
-
-<DATE><TIME>|<HOST>|I|testDeprojectFail
-    Following should generate an error message for null coord arg
-<DATE><TIME>|<HOST>|E|psDeproject (FILE:LINENO)
-    Unallowable operation: coord is NULL.
-<DATE><TIME>|<HOST>|I|testDeprojectFail
-    Following should generate an error message for null projection arg
-<DATE><TIME>|<HOST>|E|psDeproject (FILE:LINENO)
-    Unallowable operation: projection is NULL.
-<DATE><TIME>|<HOST>|I|testDeprojectFail
-    Following should generate an error message for invalid projection type
-<DATE><TIME>|<HOST>|E|psDeproject (FILE:LINENO)
-    The projection type, 4, is unknown.
-
----> TESTPOINT PASSED (psCoord{psProject} | tst_psCoord01.c)
-
-/***************************** TESTPOINT ******************************************\
-*             TestFile: tst_psCoord01.c                                            *
-*            TestPoint: psCoord{psSphereSetOffset}                                 *
-*             TestType: Positive                                                   *
-\**********************************************************************************/
-
-<DATE><TIME>|<HOST>|I|testSetOffsetSphere
-    Following should generate error message null input coord
-<DATE><TIME>|<HOST>|E|psSphereSetOffset (FILE:LINENO)
-    Unallowable operation: position is NULL.
-<DATE><TIME>|<HOST>|I|testSetOffsetSphere
-    Following should generate error message null offset
-<DATE><TIME>|<HOST>|E|psSphereSetOffset (FILE:LINENO)
-    Unallowable operation: offset is NULL.
-<DATE><TIME>|<HOST>|I|testSetOffsetSphere
-    Following should generate error message invalid mode
-<DATE><TIME>|<HOST>|E|psSphereSetOffset (FILE:LINENO)
-    Specified offset mode, 0x54321, is not supported.
-<DATE><TIME>|<HOST>|I|testSetOffsetSphere
-    Following should generate an error message invalid unit
-<DATE><TIME>|<HOST>|E|psSphereSetOffset (FILE:LINENO)
-    Specified units, 0x54321, is not supported.
-
----> TESTPOINT PASSED (psCoord{psSphereSetOffset} | tst_psCoord01.c)
-
-/***************************** TESTPOINT ******************************************\
-*             TestFile: tst_psCoord01.c                                            *
-*            TestPoint: psCoord{psSphereSetOffset}                                 *
-*             TestType: Positive                                                   *
-\**********************************************************************************/
-
-
----> TESTPOINT PASSED (psCoord{psSphereSetOffset} | tst_psCoord01.c)
-
-/***************************** TESTPOINT ******************************************\
-*             TestFile: tst_psCoord01.c                                            *
-*            TestPoint: psCoord{psSphereGetOffset}                                 *
-*             TestType: Positive                                                   *
-\**********************************************************************************/
-
-<DATE><TIME>|<HOST>|I|testGetOffsetSphere
-    Following should generate an error message for null position
-<DATE><TIME>|<HOST>|E|psSphereGetOffset (FILE:LINENO)
-    Unallowable operation: position1 is NULL.
-<DATE><TIME>|<HOST>|I|testGetOffsetSphere
-    Following should generate an error message for null position
-<DATE><TIME>|<HOST>|E|psSphereGetOffset (FILE:LINENO)
-    Unallowable operation: position2 is NULL.
-<DATE><TIME>|<HOST>|I|testGetOffsetSphere
-    Following should generate an error message for invalid mode
-<DATE><TIME>|<HOST>|E|psSphereGetOffset (FILE:LINENO)
-    Specified offset mode, 0x54321, is not supported.
-<DATE><TIME>|<HOST>|I|testGetOffsetSphere
-    Following should generate an error message for invalid unit type
-<DATE><TIME>|<HOST>|E|psSphereGetOffset (FILE:LINENO)
-    Specified units, 0x54321, is not supported.
-<DATE><TIME>|<HOST>|I|testGetOffsetSphere
-    Following should generate warning message
-<DATE><TIME>|<HOST>|W|psSphereGetOffset
-    WARNING: psDeproject(): position1->d is larger than 90 degrees.  Returning NULL.
-<DATE><TIME>|<HOST>|I|testGetOffsetSphere
-    Following should generate warning message
-<DATE><TIME>|<HOST>|W|psSphereGetOffset
-    WARNING: psDeproject(): position2->d is larger than 90 degrees.  Returning NULL.
-
----> TESTPOINT PASSED (psCoord{psSphereGetOffset} | tst_psCoord01.c)
-
-/***************************** TESTPOINT ******************************************\
-*             TestFile: tst_psCoord01.c                                            *
-*            TestPoint: psCoord{psSphereGetOffset}                                 *
-*             TestType: Positive                                                   *
-\**********************************************************************************/
-
-
----> TESTPOINT PASSED (psCoord{psSphereGetOffset} | tst_psCoord01.c)
-
Index: trunk/psLib/test/astronomy/verified/tst_psTime_01.stderr
===================================================================
--- trunk/psLib/test/astronomy/verified/tst_psTime_01.stderr	(revision 4541)
+++ 	(revision )
@@ -1,241 +1,0 @@
-/***************************** TESTPOINT ******************************************\
-*             TestFile: tst_psTime_01.c                                            *
-*            TestPoint: psTime{psTimeAlloc}                                        *
-*             TestType: Positive                                                   *
-\**********************************************************************************/
-
-<DATE><TIME>|<HOST>|I|testTimeAlloc
-    Following should generate error message
-<DATE><TIME>|<HOST>|E|psTimeAlloc (FILE:LINENO)
-    Specified type, -100, is not supported.
-
----> TESTPOINT PASSED (psTime{psTimeAlloc} | tst_psTime_01.c)
-
-/***************************** TESTPOINT ******************************************\
-*             TestFile: tst_psTime_01.c                                            *
-*            TestPoint: psTime{psTimeGetNow}                                       *
-*             TestType: Positive                                                   *
-\**********************************************************************************/
-
-<DATE><TIME>|<HOST>|I|testTimeGetNow
-    Following should generate an error message for invalid time type
-<DATE><TIME>|<HOST>|E|psTimeAlloc (FILE:LINENO)
-    Specified type, -100, is not supported.
-
----> TESTPOINT PASSED (psTime{psTimeGetNow} | tst_psTime_01.c)
-
-/***************************** TESTPOINT ******************************************\
-*             TestFile: tst_psTime_01.c                                            *
-*            TestPoint: psTime{psTimeGetUT1Delta}                                  *
-*             TestType: Positive                                                   *
-\**********************************************************************************/
-
-<DATE><TIME>|<HOST>|I|testTimeGetUT1Delta
-    Following should generate an error message for NULL time
-<DATE><TIME>|<HOST>|E|psTimeGetUT1Delta (FILE:LINENO)
-    Unallowable operation: time is NULL.
-<DATE><TIME>|<HOST>|I|testTimeGetUT1Delta
-    Following should generate an error message for invalid time
-<DATE><TIME>|<HOST>|E|psTimeGetUT1Delta (FILE:LINENO)
-    Error: time->nsec, 2000000000, is out of range.  Must be between 0 and 999999999.
-<DATE><TIME>|<HOST>|I|testTimeGetUT1Delta
-    Following should generate an error message for invalid bulletin
-<DATE><TIME>|<HOST>|E|psTimeGetUT1Delta (FILE:LINENO)
-    Invalid bulletin specified -100
-<DATE><TIME>|<HOST>|I|testTimeGetUT1Delta
-    Following should generate a warning message predating table
-<DATE><TIME>|<HOST>|W|psTimeGetUT1Delta
-    Specified psTime predates (41683) all tables of UT1-UTC information.
-<DATE><TIME>|<HOST>|I|testTimeGetUT1Delta
-    Following should generate a warning message predating table
-<DATE><TIME>|<HOST>|W|psTimeGetUT1Delta
-    Specified psTime predates (41683) all tables of UT1-UTC information.
-<DATE><TIME>|<HOST>|I|testTimeGetUT1Delta
-    Following should generate a warning message postdating table
-<DATE><TIME>|<HOST>|W|psTimeGetUT1Delta
-    Specified psTime postdates (53999) all tables of UT1-UTC information.
-<DATE><TIME>|<HOST>|I|testTimeGetUT1Delta
-    Following should generate a warning message postdating table
-<DATE><TIME>|<HOST>|W|psTimeGetUT1Delta
-    Specified psTime postdates (53999) all tables of UT1-UTC information.
-
----> TESTPOINT PASSED (psTime{psTimeGetUT1Delta} | tst_psTime_01.c)
-
-/***************************** TESTPOINT ******************************************\
-*             TestFile: tst_psTime_01.c                                            *
-*            TestPoint: psTime{psTimeToMJD}                                        *
-*             TestType: Positive                                                   *
-\**********************************************************************************/
-
-<DATE><TIME>|<HOST>|I|testTimeToMJD
-    Following should generate an error message for NULL time
-<DATE><TIME>|<HOST>|E|psTimeToMJD (FILE:LINENO)
-    Unallowable operation: time is NULL.
-<DATE><TIME>|<HOST>|I|testTimeToMJD
-    Following should generate an error message for invalid time
-<DATE><TIME>|<HOST>|E|psTimeToMJD (FILE:LINENO)
-    Error: time->nsec, 2000000000, is out of range.  Must be between 0 and 999999999.
-
----> TESTPOINT PASSED (psTime{psTimeToMJD} | tst_psTime_01.c)
-
-/***************************** TESTPOINT ******************************************\
-*             TestFile: tst_psTime_01.c                                            *
-*            TestPoint: psTime{psTimeToJD}                                         *
-*             TestType: Positive                                                   *
-\**********************************************************************************/
-
-<DATE><TIME>|<HOST>|I|testTimeToJD
-    Following should generate an error message for NULL time
-<DATE><TIME>|<HOST>|E|psTimeToJD (FILE:LINENO)
-    Unallowable operation: time is NULL.
-<DATE><TIME>|<HOST>|I|testTimeToJD
-    Following should generate an error message for invalid time
-<DATE><TIME>|<HOST>|E|psTimeToJD (FILE:LINENO)
-    Error: time->nsec, 2000000000, is out of range.  Must be between 0 and 999999999.
-
----> TESTPOINT PASSED (psTime{psTimeToJD} | tst_psTime_01.c)
-
-/***************************** TESTPOINT ******************************************\
-*             TestFile: tst_psTime_01.c                                            *
-*            TestPoint: psTime{psTimeToISO}                                        *
-*             TestType: Positive                                                   *
-\**********************************************************************************/
-
-<DATE><TIME>|<HOST>|I|testTimeToISO
-    Following should generate error message for NULL time
-<DATE><TIME>|<HOST>|E|psTimeToISO (FILE:LINENO)
-    Unallowable operation: time is NULL.
-<DATE><TIME>|<HOST>|I|testTimeToISO
-    Following should generate an error message for invalid time
-<DATE><TIME>|<HOST>|E|psTimeToISO (FILE:LINENO)
-    Error: time->nsec, 2000000000, is out of range.  Must be between 0 and 999999999.
-<DATE><TIME>|<HOST>|I|testTimeToISO
-    Following should generate error message for time prior year 0000
-<DATE><TIME>|<HOST>|E|psTimeToISO (FILE:LINENO)
-    Error: time->sec, -62125920001, is out of range.
-<DATE><TIME>|<HOST>|I|testTimeToISO
-    Following should generate error message for time after year 9999
-<DATE><TIME>|<HOST>|E|psTimeToISO (FILE:LINENO)
-    Error: time->sec, 253202544001, is out of range.
-
----> TESTPOINT PASSED (psTime{psTimeToISO} | tst_psTime_01.c)
-
-/***************************** TESTPOINT ******************************************\
-*             TestFile: tst_psTime_01.c                                            *
-*            TestPoint: psTime{psTimeToTimeval}                                    *
-*             TestType: Positive                                                   *
-\**********************************************************************************/
-
-<DATE><TIME>|<HOST>|I|testTimeToTimeval
-    Following should generate error message for NULL time
-<DATE><TIME>|<HOST>|E|psTimeToTimeval (FILE:LINENO)
-    Unallowable operation: time is NULL.
-<DATE><TIME>|<HOST>|I|testTimeToTimeval
-    Following should generate an error message for invalid time
-<DATE><TIME>|<HOST>|E|psTimeToTimeval (FILE:LINENO)
-    Error: time->nsec, 2000000000, is out of range.  Must be between 0 and 999999999.
-<DATE><TIME>|<HOST>|I|testTimeToTimeval
-    Following should generate an error message for invalid time
-<DATE><TIME>|<HOST>|E|psTimeToTimeval (FILE:LINENO)
-    Error: time->sec, -1, is out of range.  Must be between 0 and 2147483647.
-
----> TESTPOINT PASSED (psTime{psTimeToTimeval} | tst_psTime_01.c)
-
-/***************************** TESTPOINT ******************************************\
-*             TestFile: tst_psTime_01.c                                            *
-*            TestPoint: psTime{psTimeFromMJD}                                      *
-*             TestType: Positive                                                   *
-\**********************************************************************************/
-
-
----> TESTPOINT PASSED (psTime{psTimeFromMJD} | tst_psTime_01.c)
-
-/***************************** TESTPOINT ******************************************\
-*             TestFile: tst_psTime_01.c                                            *
-*            TestPoint: psTime{psTimeFromJD}                                       *
-*             TestType: Positive                                                   *
-\**********************************************************************************/
-
-
----> TESTPOINT PASSED (psTime{psTimeFromJD} | tst_psTime_01.c)
-
-/***************************** TESTPOINT ******************************************\
-*             TestFile: tst_psTime_01.c                                            *
-*            TestPoint: psTime{psTimeFromISO}                                      *
-*             TestType: Positive                                                   *
-\**********************************************************************************/
-
-<DATE><TIME>|<HOST>|I|testTimeFromISO
-    Following should generate error message for NULL ISO string
-<DATE><TIME>|<HOST>|E|psTimeFromISO (FILE:LINENO)
-    Unallowable operation: input is NULL.
-<DATE><TIME>|<HOST>|I|testTimeFromISO
-    Following should generate an error for invalid ISO string
-<DATE><TIME>|<HOST>|E|psTimeFromISO (FILE:LINENO)
-    Specified ISO Time string, 'Here I am', is malformed.  Must be in 'YYYY-MM-DDThh:mm:ss.sss' format.
-
----> TESTPOINT PASSED (psTime{psTimeFromISO} | tst_psTime_01.c)
-
-/***************************** TESTPOINT ******************************************\
-*             TestFile: tst_psTime_01.c                                            *
-*            TestPoint: psTime{psTimeFromTimeval}                                  *
-*             TestType: Positive                                                   *
-\**********************************************************************************/
-
-<DATE><TIME>|<HOST>|I|testTimeFromTimeval
-    Following should generate error message for NULL timeval
-<DATE><TIME>|<HOST>|E|psTimeFromTimeval (FILE:LINENO)
-    Unallowable operation: input is NULL.
-
----> TESTPOINT PASSED (psTime{psTimeFromTimeval} | tst_psTime_01.c)
-
-/***************************** TESTPOINT ******************************************\
-*             TestFile: tst_psTime_01.c                                            *
-*            TestPoint: psTime{p_psTimeFromTM}                                     *
-*             TestType: Positive                                                   *
-\**********************************************************************************/
-
-<DATE><TIME>|<HOST>|I|testTimeFromTM
-    Following should generate error message for NULL tm ptr
-<DATE><TIME>|<HOST>|E|p_psTimeFromTM (FILE:LINENO)
-    Unallowable operation: time is NULL.
-
----> TESTPOINT PASSED (psTime{p_psTimeFromTM} | tst_psTime_01.c)
-
-/***************************** TESTPOINT ******************************************\
-*             TestFile: tst_psTime_01.c                                            *
-*            TestPoint: psTime{psTimeConvert}                                      *
-*             TestType: Positive                                                   *
-\**********************************************************************************/
-
-<DATE><TIME>|<HOST>|I|testTimeConvert
-    Following should generate an error message for NULL time
-<DATE><TIME>|<HOST>|E|psTimeConvert (FILE:LINENO)
-    Unallowable operation: time is NULL.
-<DATE><TIME>|<HOST>|I|testTimeConvert
-    Following should generate an error message for invalid type
-<DATE><TIME>|<HOST>|E|psTimeConvert (FILE:LINENO)
-    Specified type, -100, is not supported.
-<DATE><TIME>|<HOST>|I|testTimeConvert
-    Following should generate an error message for invalid type
-<DATE><TIME>|<HOST>|E|psTimeConvert (FILE:LINENO)
-    Specified type, -100, is not supported.
-<DATE><TIME>|<HOST>|I|testTimeConvert
-    Following should generate an error message for invalid type
-<DATE><TIME>|<HOST>|E|psTimeConvert (FILE:LINENO)
-    Specified type, -100, is not supported.
-<DATE><TIME>|<HOST>|I|testTimeConvert
-    Following should generate an error message for invalid type
-<DATE><TIME>|<HOST>|E|psTimeConvert (FILE:LINENO)
-    Specified type, -100, is not supported.
-<DATE><TIME>|<HOST>|I|testTimeConvert
-    Following should generate an error message for invalid time
-<DATE><TIME>|<HOST>|E|psTimeConvert (FILE:LINENO)
-    Error: time->nsec, 2000000000, is out of range.  Must be between 0 and 999999999.
-<DATE><TIME>|<HOST>|I|testTimeConvert
-    Following should generate an error message converting from UT1
-<DATE><TIME>|<HOST>|E|psTimeConvert (FILE:LINENO)
-    Cannot convert from UT1 time type
-
----> TESTPOINT PASSED (psTime{psTimeConvert} | tst_psTime_01.c)
-
Index: trunk/psLib/test/astronomy/verified/tst_psTime_02.stderr
===================================================================
--- trunk/psLib/test/astronomy/verified/tst_psTime_02.stderr	(revision 4541)
+++ 	(revision )
@@ -1,85 +1,0 @@
-/***************************** TESTPOINT ******************************************\
-*             TestFile: tst_psTime_02.c                                            *
-*            TestPoint: psTime{psTimeToLMST}                                       *
-*             TestType: Positive                                                   *
-\**********************************************************************************/
-
-<DATE><TIME>|<HOST>|I|testTimeLMST
-    Following should generate an error message for NULL time
-<DATE><TIME>|<HOST>|E|psTimeToLMST (FILE:LINENO)
-    Unallowable operation: time is NULL.
-<DATE><TIME>|<HOST>|I|testTimeLMST
-    Following should generate error message for incorrect type
-<DATE><TIME>|<HOST>|E|psTimeToLMST (FILE:LINENO)
-    Specified type, 2, is incorrect.
-
----> TESTPOINT PASSED (psTime{psTimeToLMST} | tst_psTime_02.c)
-
-/***************************** TESTPOINT ******************************************\
-*             TestFile: tst_psTime_02.c                                            *
-*            TestPoint: psTime{psTimeLeapSecondDelta}                              *
-*             TestType: Positive                                                   *
-\**********************************************************************************/
-
-<DATE><TIME>|<HOST>|I|testTimeLeapSecondDelta
-    Following should generate an error message for NULL time
-<DATE><TIME>|<HOST>|E|psTimeLeapSecondDelta (FILE:LINENO)
-    Unallowable operation: time1 is NULL.
-<DATE><TIME>|<HOST>|I|testTimeLeapSecondDelta
-    Following should generate an error message for NULL time
-<DATE><TIME>|<HOST>|E|psTimeLeapSecondDelta (FILE:LINENO)
-    Unallowable operation: time2 is NULL.
-<DATE><TIME>|<HOST>|I|testTimeLeapSecondDelta
-    Following should generate an error message for invalid time
-<DATE><TIME>|<HOST>|E|psTimeLeapSecondDelta (FILE:LINENO)
-    Error: time2->nsec, 2000000000, is out of range.  Must be between 0 and 999999999.
-<DATE><TIME>|<HOST>|I|testTimeLeapSecondDelta
-    Following should generate an error message for invalid time
-<DATE><TIME>|<HOST>|E|psTimeLeapSecondDelta (FILE:LINENO)
-    Error: time1->nsec, 2000000000, is out of range.  Must be between 0 and 999999999.
-
----> TESTPOINT PASSED (psTime{psTimeLeapSecondDelta} | tst_psTime_02.c)
-
-/***************************** TESTPOINT ******************************************\
-*             TestFile: tst_psTime_02.c                                            *
-*            TestPoint: psTime{psTimeIsLeapSecond}                                 *
-*             TestType: Positive                                                   *
-\**********************************************************************************/
-
-<DATE><TIME>|<HOST>|I|testTimeIsLeapSecond
-    Following should generate an error message for NULL time
-<DATE><TIME>|<HOST>|E|psTimeIsLeapSecond (FILE:LINENO)
-    Unallowable operation: utc is NULL.
-<DATE><TIME>|<HOST>|I|testTimeIsLeapSecond
-    Following should generate an error message for invalid type
-<DATE><TIME>|<HOST>|E|psTimeIsLeapSecond (FILE:LINENO)
-    Specified type, 0, is incorrect.
-
----> TESTPOINT PASSED (psTime{psTimeIsLeapSecond} | tst_psTime_02.c)
-
-/***************************** TESTPOINT ******************************************\
-*             TestFile: tst_psTime_02.c                                            *
-*            TestPoint: psTime{psTimeFromTT}                                       *
-*             TestType: Positive                                                   *
-\**********************************************************************************/
-
-<DATE><TIME>|<HOST>|I|testTimeFromTT
-    Following should generate an error message for invalid time
-<DATE><TIME>|<HOST>|E|psTimeFromTT (FILE:LINENO)
-    Error: nsec, 2000000000, is out of range.  Must be between 0 and 999999999.
-
----> TESTPOINT PASSED (psTime{psTimeFromTT} | tst_psTime_02.c)
-
-/***************************** TESTPOINT ******************************************\
-*             TestFile: tst_psTime_02.c                                            *
-*            TestPoint: psTime{psTimeFromUTC}                                      *
-*             TestType: Positive                                                   *
-\**********************************************************************************/
-
-<DATE><TIME>|<HOST>|I|testTimeFromUTC
-    Following should generate an error message for invalid time
-<DATE><TIME>|<HOST>|E|psTimeFromUTC (FILE:LINENO)
-    Error: nsec, 2000000000, is out of range.  Must be between 0 and 999999999.
-
----> TESTPOINT PASSED (psTime{psTimeFromUTC} | tst_psTime_02.c)
-
Index: trunk/psLib/test/astronomy/verified/tst_psTime_03.stderr
===================================================================
--- trunk/psLib/test/astronomy/verified/tst_psTime_03.stderr	(revision 4541)
+++ 	(revision )
@@ -1,55 +1,0 @@
-/***************************** TESTPOINT ******************************************\
-*             TestFile: tst_psTime_03.c                                            *
-*            TestPoint: psTime{psTimeMath}                                         *
-*             TestType: Positive                                                   *
-\**********************************************************************************/
-
-<DATE><TIME>|<HOST>|I|testTimeMath
-    Following should generate error message for NULL time
-<DATE><TIME>|<HOST>|E|psTimeMath (FILE:LINENO)
-    Unallowable operation: time is NULL.
-<DATE><TIME>|<HOST>|I|testTimeMath
-    Following should generate error message for invalid time
-<DATE><TIME>|<HOST>|E|psTimeMath (FILE:LINENO)
-    Error: time->nsec, 2000000000, is out of range.  Must be between 0 and 999999999.
-
----> TESTPOINT PASSED (psTime{psTimeMath} | tst_psTime_03.c)
-
-/***************************** TESTPOINT ******************************************\
-*             TestFile: tst_psTime_03.c                                            *
-*            TestPoint: psTime{psTimeDelta}                                        *
-*             TestType: Positive                                                   *
-\**********************************************************************************/
-
-<DATE><TIME>|<HOST>|I|testTimeDelta
-    Following should generate error message for NULL time
-<DATE><TIME>|<HOST>|E|psTimeDelta (FILE:LINENO)
-    Unallowable operation: time1 is NULL.
-<DATE><TIME>|<HOST>|I|testTimeDelta
-    Following should generate error message for NULL time
-<DATE><TIME>|<HOST>|E|psTimeDelta (FILE:LINENO)
-    Unallowable operation: time2 is NULL.
-<DATE><TIME>|<HOST>|I|testTimeDelta
-    Following should generate error message for invalid time
-<DATE><TIME>|<HOST>|E|psTimeDelta (FILE:LINENO)
-    Error: time1->nsec, 2000000000, is out of range.  Must be between 0 and 999999999.
-<DATE><TIME>|<HOST>|I|testTimeDelta
-    Following should generate error message for invalid time
-<DATE><TIME>|<HOST>|E|psTimeDelta (FILE:LINENO)
-    Error: time2->nsec, 2000000000, is out of range.  Must be between 0 and 999999999.
-<DATE><TIME>|<HOST>|I|testTimeDelta
-    Following should generate error message for incorrect type
-<DATE><TIME>|<HOST>|E|psTimeDelta (FILE:LINENO)
-    Specified type, 1, is incorrect.
-
----> TESTPOINT PASSED (psTime{psTimeDelta} | tst_psTime_03.c)
-
-/***************************** TESTPOINT ******************************************\
-*             TestFile: tst_psTime_03.c                                            *
-*            TestPoint: psTime{psTimeConvert}                                      *
-*             TestType: Positive                                                   *
-\**********************************************************************************/
-
-
----> TESTPOINT PASSED (psTime{psTimeConvert} | tst_psTime_03.c)
-
Index: trunk/psLib/test/astronomy/verified/tst_psTime_04.stderr
===================================================================
--- trunk/psLib/test/astronomy/verified/tst_psTime_04.stderr	(revision 4541)
+++ 	(revision )
@@ -1,74 +1,0 @@
-/***************************** TESTPOINT ******************************************\
-*             TestFile: tst_psTime_04.c                                            *
-*            TestPoint: psTime{p_psTimeInit}                                       *
-*             TestType: Positive                                                   *
-\**********************************************************************************/
-
-
----> TESTPOINT PASSED (psTime{p_psTimeInit} | tst_psTime_04.c)
-
-/***************************** TESTPOINT ******************************************\
-*             TestFile: tst_psTime_04.c                                            *
-*            TestPoint: psTime{p_psTimeInit}                                       *
-*             TestType: Positive                                                   *
-\**********************************************************************************/
-
-<DATE><TIME>|<HOST>|E|psMetadataConfigParse (FILE:LINENO)
-    Failed to open file 'zzz'. Check if it exists and it has the proper permissions.
-<DATE><TIME>|<HOST>|E|psLibInit (FILE:LINENO)
-    Failed to initialize psTime.
-
----> TESTPOINT PASSED (psTime{p_psTimeInit} | tst_psTime_04.c)
-
-/***************************** TESTPOINT ******************************************\
-*             TestFile: tst_psTime_04.c                                            *
-*            TestPoint: psTime{p_psTimeInit}                                       *
-*             TestType: Positive                                                   *
-\**********************************************************************************/
-
-<DATE><TIME>|<HOST>|E|p_psTimeInit (FILE:LINENO)
-    Failed find 'psLib.time.tables.index' in time metadata.
-<DATE><TIME>|<HOST>|E|psLibInit (FILE:LINENO)
-    Failed to initialize psTime.
-
----> TESTPOINT PASSED (psTime{p_psTimeInit} | tst_psTime_04.c)
-
-/***************************** TESTPOINT ******************************************\
-*             TestFile: tst_psTime_04.c                                            *
-*            TestPoint: psTime{p_psTimeInit}                                       *
-*             TestType: Positive                                                   *
-\**********************************************************************************/
-
-<DATE><TIME>|<HOST>|E|p_psTimeInit (FILE:LINENO)
-    Failed find 'psLib.time.tables.index' in time metadata.
-<DATE><TIME>|<HOST>|E|psLibInit (FILE:LINENO)
-    Failed to initialize psTime.
-
----> TESTPOINT PASSED (psTime{p_psTimeInit} | tst_psTime_04.c)
-
-/***************************** TESTPOINT ******************************************\
-*             TestFile: tst_psTime_04.c                                            *
-*            TestPoint: psTime{p_psTimeInit}                                       *
-*             TestType: Positive                                                   *
-\**********************************************************************************/
-
-<DATE><TIME>|<HOST>|E|p_psTimeInit (FILE:LINENO)
-    Incorrect vector size. Size: 3, Expected 4.
-<DATE><TIME>|<HOST>|E|psLibInit (FILE:LINENO)
-    Failed to initialize psTime.
-
----> TESTPOINT PASSED (psTime{p_psTimeInit} | tst_psTime_04.c)
-
-/***************************** TESTPOINT ******************************************\
-*             TestFile: tst_psTime_04.c                                            *
-*            TestPoint: psTime{p_psTimeInit}                                       *
-*             TestType: Positive                                                   *
-\**********************************************************************************/
-
-<DATE><TIME>|<HOST>|E|p_psTimeInit (FILE:LINENO)
-    Failed find 'psLib.time.tables.index' in time metadata.
-<DATE><TIME>|<HOST>|E|psLibInit (FILE:LINENO)
-    Failed to initialize psTime.
-
----> TESTPOINT PASSED (psTime{p_psTimeInit} | tst_psTime_04.c)
-
