Index: trunk/psLib/src/astro/psCoord.c =================================================================== --- trunk/psLib/src/astro/psCoord.c (revision 1374) +++ trunk/psLib/src/astro/psCoord.c (revision 1385) @@ -10,6 +10,6 @@ * @author George Gusciora, MHPCC * -* @version $Revision: 1.8 $ $Name: not supported by cvs2svn $ -* @date $Date: 2004-08-04 00:55:17 $ +* @version $Revision: 1.9 $ $Name: not supported by cvs2svn $ +* @date $Date: 2004-08-04 23:37:39 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii @@ -33,14 +33,14 @@ { if ( out == NULL ) { - out = ( psPlane * ) psAlloc( sizeof( psPlane ) ); - } + out = ( psPlane * ) psAlloc( sizeof( psPlane ) ); + } out->x = transform->x->coeff[ 0 ][ 0 ] + ( transform->x->coeff[ 1 ][ 0 ] * coords->x ) + ( transform->x->coeff[ 0 ][ 1 ] * coords->y ); - + out->y = transform->y->coeff[ 0 ][ 0 ] + ( transform->y->coeff[ 1 ][ 0 ] * coords->x ) + ( transform->y->coeff[ 0 ][ 1 ] * coords->y ); - + return ( out ); } @@ -56,7 +56,7 @@ { if ( out == NULL ) { - out = ( psPlane * ) psAlloc( sizeof( psPlane ) ); - } - + out = ( psPlane * ) psAlloc( sizeof( psPlane ) ); + } + out->x = transform->x->coeff[ 0 ][ 0 ][ 0 ][ 0 ] + ( transform->x->coeff[ 1 ][ 0 ][ 0 ][ 0 ] * coords->x ) + @@ -64,5 +64,5 @@ ( transform->x->coeff[ 0 ][ 0 ][ 1 ][ 0 ] * term3 ) + ( transform->x->coeff[ 0 ][ 0 ][ 0 ][ 1 ] * term4 ); - + out->y = transform->y->coeff[ 0 ][ 0 ][ 0 ][ 0 ] + ( transform->y->coeff[ 1 ][ 0 ][ 0 ][ 0 ] * coords->x ) + @@ -70,5 +70,5 @@ ( transform->y->coeff[ 0 ][ 0 ][ 1 ][ 0 ] * term3 ) + ( transform->y->coeff[ 0 ][ 0 ][ 0 ][ 1 ] * term4 ); - + return ( out ); } @@ -81,10 +81,10 @@ { psSphereTransform * tmp = ( psSphereTransform * ) psAlloc( sizeof( psSphereTransform ) ); - + tmp->sinPhi = sin( NPlat ); tmp->cosPhi = cos( NPlat ); tmp->Xo = Xo; tmp->xo = xo; - + return ( tmp ); } @@ -114,9 +114,9 @@ double y = 0.0; double dx = 0.0; - + if ( out == NULL ) { - out = ( psSphere * ) psAlloc( sizeof( psSphere ) ); - } - + out = ( psSphere * ) psAlloc( sizeof( psSphere ) ); + } + x = coord->r; y = coord->d; @@ -127,8 +127,8 @@ cos( y ); cosX = cos( y ) * cos( dx ) / cos( y ); - + out->r = atan2( sinX, cosX ) + transform->Xo; out->d = atan2( sinY, cosY ); - + return ( out ); } @@ -142,5 +142,5 @@ double Xo = 0.0; double xo = 0.0; - + return ( psSphereTransformAlloc( phi, Xo, xo ) ); } @@ -154,5 +154,5 @@ double Xo = 0.0; double xo = 0.0; - + return ( psSphereTransformAlloc( phi, Xo, xo ) ); } @@ -178,15 +178,19 @@ { if ( x > 0 ) { - return ( atan( y / x ) ); - } else if ( ( x == 0 ) && ( y == 0 ) ) { + return ( atan( y / x ) ); + } else + if ( ( x == 0 ) && ( y == 0 ) ) { return ( 0.5 * M_PI ); - } else if ( ( x == 0 ) && ( y == 0 ) ) { - return ( -0.5 * M_PI ); - } else if ( ( x == 0 ) && ( y == 0 ) ) { - return ( M_PI + atan( y / x ) ); - } else if ( ( x == 0 ) && ( y == 0 ) ) { - return ( -M_PI + atan( y / x ) ); - } - + } else + if ( ( x == 0 ) && ( y == 0 ) ) { + return ( -0.5 * M_PI ); + } else + if ( ( x == 0 ) && ( y == 0 ) ) { + return ( M_PI + atan( y / x ) ); + } else + if ( ( x == 0 ) && ( y == 0 ) ) { + return ( -M_PI + atan( y / x ) ); + } + psAbort( __func__, "Unacceptable range for (arg(%f, %f).\n", x, y ); return ( 0.0 ); @@ -201,37 +205,43 @@ float alpha = 0.0; psPlane *tmp = ( psPlane * ) psAlloc( sizeof( psPlane ) ); - + if ( projection->type == PS_PROJ_TAN ) { - R = cot( coord->r ) * ( 180.0 / M_PI ); - tmp->x = R * sin( coord->d ); - tmp->y = R * cos( coord->d ); - - } else if ( projection->type == PS_PROJ_SIN ) { + R = cot( coord->r ) * ( 180.0 / M_PI ); + tmp->x = R * sin( coord->d ); + tmp->y = R * cos( coord->d ); + + } else + if ( projection->type == PS_PROJ_SIN ) { R = cos( coord->r ) * ( 180.0 / M_PI ); tmp->x = R * sin( coord->d ); tmp->y = R * cos( coord->d ); - - } else if ( projection->type == PS_PROJ_CAR ) { - tmp->x = coord->d; - tmp->y = coord->r; - - } else if ( projection->type == PS_PROJ_MER ) { - tmp->x = coord->d; - tmp->y = log( tan( 45.0 + ( 0.5 * coord->r ) ) ) * 180.0 / M_PI; - - } else if ( projection->type == PS_PROJ_AIT ) { - alpha = 1.0 / ( ( 180.0 / M_PI ) * - sqrt( 1.0 + ( cos( coord->r ) * cos( 0.5 * coord->d ) * 0.5 ) ) ); - - tmp->x = 2.0 * alpha * cos( coord->r ) * sin( 0.5 * coord->d ); - tmp->y = alpha * sin( coord->d ); - - } else if ( projection->type == PS_PROJ_PAR ) { - psAbort( __func__, "The projection type PS_PROJ_PAR is undefined.\n" ); - - } else if ( projection->type == PS_PROJ_GLS ) { - psAbort( __func__, "The projection type PS_PROJ_GLS is undefined.\n" ); - } - + + } else + if ( projection->type == PS_PROJ_CAR ) { + tmp->x = coord->d; + tmp->y = coord->r; + + } else + if ( projection->type == PS_PROJ_MER ) { + tmp->x = coord->d; + tmp->y = log( tan( 45.0 + ( 0.5 * coord->r ) ) ) * 180.0 / M_PI; + + } else + if ( projection->type == PS_PROJ_AIT ) { + alpha = 1.0 / ( ( 180.0 / M_PI ) * + sqrt( 1.0 + ( cos( coord->r ) * cos( 0.5 * coord->d ) * 0.5 ) ) ); + + tmp->x = 2.0 * alpha * cos( coord->r ) * sin( 0.5 * coord->d ); + tmp->y = alpha * sin( coord->d ); + + } else + if ( projection->type == PS_PROJ_PAR ) { + psAbort( __func__, "The projection type PS_PROJ_PAR is undefined.\n" ); + + } else + if ( projection->type == PS_PROJ_GLS ) { + psAbort( __func__, "The projection type PS_PROJ_GLS is undefined.\n" ); + } + return ( tmp ); } @@ -247,40 +257,46 @@ float chu2 = 0.0; psSphere *tmp = ( psSphere * ) psAlloc( sizeof( psSphere ) ); - + if ( projection->type == PS_PROJ_TAN ) { - R = sqrt( ( coord->x * coord->x ) + ( coord->y * coord->y ) ); - tmp->d = arg( -coord->y, coord->x ); - tmp->r = atan( 180.0 / ( R * M_PI ) ); - - } else if ( projection->type == PS_PROJ_SIN ) { + R = sqrt( ( coord->x * coord->x ) + ( coord->y * coord->y ) ); + tmp->d = arg( -coord->y, coord->x ); + tmp->r = atan( 180.0 / ( R * M_PI ) ); + + } else + if ( projection->type == PS_PROJ_SIN ) { R = sqrt( ( coord->x * coord->x ) + ( coord->y * coord->y ) ); tmp->d = arg( -coord->y, coord->x ); tmp->r = acos( ( R * M_PI ) / 180.0 ); - - } else if ( projection->type == PS_PROJ_CAR ) { - tmp->d = coord->x; - tmp->r = coord->y; - - } else if ( projection->type == PS_PROJ_MER ) { - tmp->d = coord->x; - tmp->r = ( 2.0 * atan( exp( ( coord->y * M_PI / 180.0 ) ) ) ) - 180.0; - - } else if ( projection->type == PS_PROJ_AIT ) { - chu1 = ( coord->x * M_PI ) / 720.0; - chu1 *= chu1; - chu2 = ( coord->y * M_PI ) / 360.0; - chu2 *= chu2; - chu = sqrt( 1.0 - chu1 - chu2 ); - tmp->d = 2.0 * arg( ( 2.0 * chu * chu ) - 1.0, - ( coord->x * chu * M_PI ) / 360.0 ); - tmp->r = asin( ( coord->y * chu * M_PI ) / 180.0 ); - - } else if ( projection->type == PS_PROJ_PAR ) { - psAbort( __func__, "The projection type PS_PROJ_PAR is undefined.\n" ); - - } else if ( projection->type == PS_PROJ_GLS ) { - psAbort( __func__, "The projection type PS_PROJ_GLG is undefined.\n" ); - } - + + } else + if ( projection->type == PS_PROJ_CAR ) { + tmp->d = coord->x; + tmp->r = coord->y; + + } else + if ( projection->type == PS_PROJ_MER ) { + tmp->d = coord->x; + tmp->r = ( 2.0 * atan( exp( ( coord->y * M_PI / 180.0 ) ) ) ) - 180.0; + + } else + if ( projection->type == PS_PROJ_AIT ) { + chu1 = ( coord->x * M_PI ) / 720.0; + chu1 *= chu1; + chu2 = ( coord->y * M_PI ) / 360.0; + chu2 *= chu2; + chu = sqrt( 1.0 - chu1 - chu2 ); + tmp->d = 2.0 * arg( ( 2.0 * chu * chu ) - 1.0, + ( coord->x * chu * M_PI ) / 360.0 ); + tmp->r = asin( ( coord->y * chu * M_PI ) / 180.0 ); + + } else + if ( projection->type == PS_PROJ_PAR ) { + psAbort( __func__, "The projection type PS_PROJ_PAR is undefined.\n" ); + + } else + if ( projection->type == PS_PROJ_GLS ) { + psAbort( __func__, "The projection type PS_PROJ_GLG is undefined.\n" ); + } + return ( tmp ); } @@ -298,41 +314,45 @@ double tmpR = 0.0; double tmpD = 0.0; - + if ( mode == PS_LINEAR ) { - // XXX: I have no idea how to construct this. Maybe project both - // sperical positions onto the plane, set the origin at one of the - // points on the plane, then deproject? - - // XXX: Do I need to somehow scale this projection? - // project position1? Will it project to (0.0, 0.0)? - proj.R = position1->r; - proj.D = position1->d; - proj.Xs = 1.0; - proj.Ys = 1.0; - proj.type = PS_PROJ_TAN; - - // lin = psProject(position2, proj); - // tmp = psDeproject(lin, proj); - - // XXX: Do we need to convert units in tmp? - return ( tmp ); - } else if ( mode == PS_SPHERICAL ) { + // XXX: I have no idea how to construct this. Maybe project both + // sperical positions onto the plane, set the origin at one of the + // points on the plane, then deproject? + + // XXX: Do I need to somehow scale this projection? + // project position1? Will it project to (0.0, 0.0)? + proj.R = position1->r; + proj.D = position1->d; + proj.Xs = 1.0; + proj.Ys = 1.0; + proj.type = PS_PROJ_TAN; + + // lin = psProject(position2, proj); + // tmp = psDeproject(lin, proj); + + // XXX: Do we need to convert units in tmp? + return ( tmp ); + } else + if ( mode == PS_SPHERICAL ) { tmpR = position2->r - position1->r; tmpD = position2->d - position1->d; - + if ( unit == PS_ARCSEC ) { - tmpR = ( tmpR * 180.0 * 60.0 * 60.0 ) / M_PI; - tmpD = ( tmpR * 180.0 * 60.0 * 60.0 ) / M_PI; - } else if ( unit == PS_ARCMIN ) { + tmpR = ( tmpR * 180.0 * 60.0 * 60.0 ) / M_PI; + tmpD = ( tmpR * 180.0 * 60.0 * 60.0 ) / M_PI; + } else + if ( unit == PS_ARCMIN ) { tmpR = ( tmpR * 180.0 * 60.0 ) / M_PI; tmpD = ( tmpR * 180.0 * 60.0 ) / M_PI; - } else if ( unit == PS_DEGREE ) { - tmpR = ( tmpR * 180.0 ) / M_PI; - tmpD = ( tmpR * 180.0 ) / M_PI; - } else if ( unit == PS_RADIAN ) {} - else { - psAbort( __func__, "Unknown offset unit: 0x%x\n", unit ); - } - + } else + if ( unit == PS_DEGREE ) { + tmpR = ( tmpR * 180.0 ) / M_PI; + tmpD = ( tmpR * 180.0 ) / M_PI; + } else + if ( unit == PS_RADIAN ) {} + else { + psAbort( __func__, "Unknown offset unit: 0x%x\n", unit ); + } + tmp = ( psSphere * ) psAlloc( sizeof( psSphere ) ); tmp->r = tmpR; @@ -361,35 +381,39 @@ double tmpR = 0.0; double tmpD = 0.0; - + if ( mode == PS_LINEAR ) { - proj.R = position->r; - proj.D = position->d; - proj.Xs = 1.0; - proj.Ys = 1.0; - proj.type = PS_PROJ_TAN; - - lin.x = offset->r; - lin.y = offset->d; - - tmp = psDeproject( &lin, &proj ); - return ( tmp ); - - } else if ( mode == PS_SPHERICAL ) { + proj.R = position->r; + proj.D = position->d; + proj.Xs = 1.0; + proj.Ys = 1.0; + proj.type = PS_PROJ_TAN; + + lin.x = offset->r; + lin.y = offset->d; + + tmp = psDeproject( &lin, &proj ); + return ( tmp ); + + } else + if ( mode == PS_SPHERICAL ) { if ( unit == PS_ARCSEC ) { - tmpR = ( M_PI * offset->r ) / ( 180.0 * 60.0 * 60.0 ); - tmpD = ( M_PI * offset->d ) / ( 180.0 * 60.0 * 60.0 ); - } else if ( unit == PS_ARCMIN ) { + tmpR = ( M_PI * offset->r ) / ( 180.0 * 60.0 * 60.0 ); + tmpD = ( M_PI * offset->d ) / ( 180.0 * 60.0 * 60.0 ); + } else + if ( unit == PS_ARCMIN ) { tmpR = ( M_PI * offset->r ) / ( 180.0 * 60.0 ); tmpD = ( M_PI * offset->d ) / ( 180.0 * 60.0 ); - } else if ( unit == PS_DEGREE ) { - tmpR = ( M_PI * offset->r ) / ( 180.0 ); - tmpD = ( M_PI * offset->d ) / ( 180.0 ); - } else if ( unit == PS_RADIAN ) { - tmpR = offset->r; - tmpD = offset->d; - } else { - psAbort( __func__, "Unknown offset unit: 0x%x\n", unit ); - } - + } else + if ( unit == PS_DEGREE ) { + tmpR = ( M_PI * offset->r ) / ( 180.0 ); + tmpD = ( M_PI * offset->d ) / ( 180.0 ); + } else + if ( unit == PS_RADIAN ) { + tmpR = offset->r; + tmpD = offset->d; + } else { + psAbort( __func__, "Unknown offset unit: 0x%x\n", unit ); + } + tmp = ( psSphere * ) psAlloc( sizeof( psSphere ) ); tmp->r = position->r + tmpR; @@ -397,5 +421,5 @@ tmp->rErr = 0.0; tmp->dErr = 0.0; - + // XXX: wrap tmp->r and tmp->d to the allowed range (-PI to PI) // and (0 to 2*PI). Index: trunk/psLib/src/astro/psCoord.h =================================================================== --- trunk/psLib/src/astro/psCoord.h (revision 1374) +++ trunk/psLib/src/astro/psCoord.h (revision 1385) @@ -10,6 +10,6 @@ * @author George Gusciora, MHPCC * -* @version $Revision: 1.7 $ $Name: not supported by cvs2svn $ -* @date $Date: 2004-08-04 00:55:17 $ +* @version $Revision: 1.8 $ $Name: not supported by cvs2svn $ +* @date $Date: 2004-08-04 23:37:39 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii @@ -30,42 +30,42 @@ typedef struct - { - double x; ///< x position - double y; ///< y position - double xErr; ///< Error in x position - double yErr; ///< Error in y position - } +{ + double x; ///< x position + double y; ///< y position + double xErr; ///< Error in x position + double yErr; ///< Error in y position +} psPlane; typedef struct - { - double r; ///< RA - double d; ///< Dec - double rErr; ///< Error in RA - double dErr; ///< Error in Dec - } +{ + double r; ///< RA + double d; ///< Dec + double rErr; ///< Error in RA + double dErr; ///< Error in Dec +} psSphere; typedef struct - { - psDPolynomial2D *x; - psDPolynomial2D *y; - } +{ + psDPolynomial2D *x; + psDPolynomial2D *y; +} psPlaneTransform; typedef struct - { - psDPolynomial4D *x; - psDPolynomial4D *y; - } +{ + psDPolynomial4D *x; + psDPolynomial4D *y; +} psPlaneDistort; typedef struct - { - double sinPhi; ///< sin of North Pole lattitude - double cosPhi; ///< cos of North Pole lattitude - double Xo; ///< First PT of Ares lon - double xo; ///< First PT of Ares equiv lon - } +{ + double sinPhi; ///< sin of North Pole lattitude + double cosPhi; ///< cos of North Pole lattitude + double Xo; ///< First PT of Ares lon + double xo; ///< First PT of Ares equiv lon +} psSphereTransform; @@ -82,11 +82,11 @@ typedef struct - { - double R; ///< Coordinates of projection center - double D; ///< Coordinates of projection center - double Xs; ///< plate-scale in X direction - double Ys; ///< plate-scale in Y direction - psProjectionType type; ///< Projection type - } +{ + double R; ///< Coordinates of projection center + double D; ///< Coordinates of projection center + double Xs; ///< plate-scale in X direction + double Ys; ///< plate-scale in Y direction + psProjectionType type; ///< Projection type +} psProjection; @@ -106,5 +106,5 @@ const psPlaneTransform *transform, const psPlane *coords ); - + psPlane *psPlaneDistortApply( psPlane *out, const psPlaneDistort *transform, @@ -112,11 +112,11 @@ float term3, float term4 ); - - + + // New function prototype. psSphereTransform *psSphereTransformAlloc( double NPlat, double Xo, double xo ); - + void p_psSphereTransformFree( psSphereTransform *trans ); @@ -124,5 +124,5 @@ const psSphereTransform *transform, const psSphere *coord ); - + psSphereTransform *psSphereTransformICRStoEcliptic( psTime time ); psSphereTransform *psSphereTransformEcliptictoICRS( psTime time ); @@ -132,18 +132,18 @@ psPlane *psProject( const psSphere *coord, const psProjection *projection ); - + psSphere *psDeproject( const psPlane *coord, const psProjection *projection ); - + psSphere *psSphereGetOffset( const psSphere *restrict position1, const psSphere *restrict position2, psSphereOffsetMode mode, psSphereOffsetUnit unit ); - + psSphere *psSphereSetOffset( const psSphere *restrict position, const psSphere *restrict offset, psSphereOffsetMode mode, psSphereOffsetUnit unit ); - + /// @} Index: trunk/psLib/src/astro/psTime.c =================================================================== --- trunk/psLib/src/astro/psTime.c (revision 1374) +++ trunk/psLib/src/astro/psTime.c (revision 1385) @@ -12,6 +12,6 @@ * @author Ross Harman, MHPCC * - * @version $Revision: 1.10 $ $Name: not supported by cvs2svn $ - * @date $Date: 2004-07-22 21:24:54 $ + * @version $Revision: 1.11 $ $Name: not supported by cvs2svn $ + * @date $Date: 2004-08-04 23:37:39 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii @@ -100,27 +100,73 @@ static double leapseconds[NUM_LEAPSECOND_UPDATES][2] = { - {2441317.5, 10.0}, - {2441499.5, 11.0}, - {2441683.5, 12.0}, - {2442048.5, 13.0}, - {2442413.5, 14.0}, - {2442778.5, 15.0}, - {2443144.5, 16.0}, - {2443509.5, 17.0}, - {2443874.5, 18.0}, - {2444239.5, 19.0}, - {2444786.5, 20.0}, - {2445151.5, 21.0}, - {2445516.5, 22.0}, - {2446247.5, 23.0}, - {2447161.5, 24.0}, - {2447892.5, 25.0}, - {2448257.5, 26.0}, - {2448804.5, 27.0}, - {2449169.5, 28.0}, - {2449534.5, 29.0}, - {2450083.5, 30.0}, - {2450630.5, 31.0}, - {2451179.5, 32.0} + { + 2441317.5, 10.0 + }, + { + 2441499.5, 11.0 + }, + { + 2441683.5, 12.0 + }, + { + 2442048.5, 13.0 + }, + { + 2442413.5, 14.0 + }, + { + 2442778.5, 15.0 + }, + { + 2443144.5, 16.0 + }, + { + 2443509.5, 17.0 + }, + { + 2443874.5, 18.0 + }, + { + 2444239.5, 19.0 + }, + { + 2444786.5, 20.0 + }, + { + 2445151.5, 21.0 + }, + { + 2445516.5, 22.0 + }, + { + 2446247.5, 23.0 + }, + { + 2447161.5, 24.0 + }, + { + 2447892.5, 25.0 + }, + { + 2448257.5, 26.0 + }, + { + 2448804.5, 27.0 + }, + { + 2449169.5, 28.0 + }, + { + 2449534.5, 29.0 + }, + { + 2450083.5, 30.0 + }, + { + 2450630.5, 31.0 + }, + { + 2451179.5, 32.0 + } }; @@ -395,13 +441,15 @@ psError(__func__,"Null value for timeval arg not allowed"); return outTime; - } else if(time->tv_sec < 0) - { - psError(__func__,"Negative seconds are not allowed: %ld", time->tv_sec); - return outTime; - } else if(time->tv_usec<0) - { - psError(__func__,"Negative microseconds are not allowed: %ld", time->tv_usec); - return outTime; - } + } else + if(time->tv_sec < 0) + { + psError(__func__,"Negative seconds are not allowed: %ld", time->tv_sec); + return outTime; + } else + if(time->tv_usec<0) + { + psError(__func__,"Negative microseconds are not allowed: %ld", time->tv_usec); + return outTime; + } // Convert to psTime/TAI @@ -420,5 +468,8 @@ int n; int y; - int mon [] = { 31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31 }; + int mon [] = + { + 31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31 + }; long epoch; psTime outTime; @@ -433,29 +484,35 @@ psError(__func__,"Null value for tm arg not allowed"); return outTime; - } else if(time->tm_year < 70) - { - psError(__func__,"Input times earlier than 1970 not allowed. Value: %d", time->tm_year+1900); - return outTime; - } else if(time->tm_mon<0 || time->tm_mon>11) - { - psError(__func__,"Month must have a value from 0 to 11. Value: %d", time->tm_mon); - return outTime; - } else if(time->tm_mday<1 || time->tm_mday>31) - { - psError(__func__,"Day must have a value from 1 to 31. Value: %d", time->tm_mday); - return outTime; - } else if(time->tm_hour<0 || time->tm_hour>23) - { - psError(__func__,"Hour must have a value from 0 to 23. Value: %d", time->tm_hour); - return outTime; - } else if(time->tm_min<0 || time->tm_min>59) - { - psError(__func__,"Minute must have a value from 0 to 59. Value: %d", time->tm_min); - return outTime; - } else if(time->tm_sec<0 || time->tm_sec>59) - { - psError(__func__,"Second must have a value from 0 to 59. Value: %d", time->tm_sec); - return outTime; - } + } else + if(time->tm_year < 70) + { + psError(__func__,"Input times earlier than 1970 not allowed. Value: %d", time->tm_year+1900); + return outTime; + } else + if(time->tm_mon<0 || time->tm_mon>11) + { + psError(__func__,"Month must have a value from 0 to 11. Value: %d", time->tm_mon); + return outTime; + } else + if(time->tm_mday<1 || time->tm_mday>31) + { + psError(__func__,"Day must have a value from 1 to 31. Value: %d", time->tm_mday); + return outTime; + } else + if(time->tm_hour<0 || time->tm_hour>23) + { + psError(__func__,"Hour must have a value from 0 to 23. Value: %d", time->tm_hour); + return outTime; + } else + if(time->tm_min<0 || time->tm_min>59) + { + psError(__func__,"Minute must have a value from 0 to 59. Value: %d", time->tm_min); + return outTime; + } else + if(time->tm_sec<0 || time->tm_sec>59) + { + psError(__func__,"Second must have a value from 0 to 59. Value: %d", time->tm_sec); + return outTime; + } n = time->tm_year + 1900 - 1; Index: trunk/psLib/src/astro/psTime.h =================================================================== --- trunk/psLib/src/astro/psTime.h (revision 1374) +++ trunk/psLib/src/astro/psTime.h (revision 1385) @@ -12,6 +12,6 @@ * @author Ross Harman, MHPCC * - * @version $Revision: 1.5 $ $Name: not supported by cvs2svn $ - * @date $Date: 2004-07-22 01:03:00 $ + * @version $Revision: 1.6 $ $Name: not supported by cvs2svn $ + * @date $Date: 2004-08-04 23:37:39 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii