Index: /trunk/psLib/src/astro/psCoord.c =================================================================== --- /trunk/psLib/src/astro/psCoord.c (revision 2599) +++ /trunk/psLib/src/astro/psCoord.c (revision 2600) @@ -8,8 +8,8 @@ * @ingroup CoordinateTransform * -* @author George Gusciora, MHPCC +* @author GLG, MHPCC * -* @version $Revision: 1.36 $ $Name: not supported by cvs2svn $ -* @date $Date: 2004-12-01 19:56:05 $ +* @version $Revision: 1.37 $ $Name: not supported by cvs2svn $ +* @date $Date: 2004-12-02 21:12:51 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii @@ -164,14 +164,14 @@ This function prototype has been modified since the SDRS. *****************************************************************************/ -psSphereTransform* psSphereTransformAlloc(double NPlat, - double Xo, - double xo) +psSphereTransform* psSphereTransformAlloc(double alphaP, + double deltaP, + double phiP) { psSphereTransform* tmp = (psSphereTransform* ) psAlloc(sizeof(psSphereTransform)); - tmp->sinPhi = sin(NPlat); - tmp->cosPhi = cos(NPlat); - tmp->Xo = Xo; - tmp->xo = xo; + tmp->cosDeltaP = cos(deltaP); + tmp->sinDeltaP = cos(deltaP); + tmp->alphaP = alphaP; + tmp->phiP = phiP; return (tmp); @@ -207,11 +207,11 @@ x = coord->r; y = coord->d; - dx = x - transform->xo; - sinY = cos(y) * sin(dx) * transform->sinPhi + sin(y) * transform->cosPhi; + dx = x - transform->phiP; + sinY = cos(y) * sin(dx) * transform->sinDeltaP + sin(y) * transform->cosDeltaP; cosY = sqrt(1.0 - sinY * sinY); - sinX = (cos(y) * sin(dx) * transform->cosPhi - sin(y) * transform->sinPhi) / cos(y); + sinX = (cos(y) * sin(dx) * transform->cosDeltaP - sin(y) * transform->sinDeltaP) / cos(y); cosX = cos(y) * cos(dx) / cos(y); - out->r = atan2(sinX, cosX) + transform->Xo; + out->r = atan2(sinX, cosX) + transform->alphaP; out->d = atan2(sinY, cosY); @@ -227,9 +227,9 @@ double T = year / 100.0; double phi = -23.452294 + 0.013013 * T + 0.000001639 * T * T - 0.000000503 * T * T * T; - double Xo = 0.0; - double xo = 0.0; + double alphaP = 0.0; + double phiP = 0.0; psFree(tmTime); - return (psSphereTransformAlloc(phi, Xo, xo)); + return (psSphereTransformAlloc(phi, alphaP, phiP)); } @@ -242,9 +242,9 @@ double T = year / 100.0; double phi = +23.452294 - 0.013013 * T - 0.000001639 * T * T + 0.000000503 * T * T * T; - double Xo = 0.0; - double xo = 0.0; + double alphaP = 0.0; + double phiP = 0.0; psFree(tmTime); - return (psSphereTransformAlloc(phi, Xo, xo)); + return (psSphereTransformAlloc(phi, alphaP, phiP)); } @@ -536,10 +536,9 @@ const psTime *toTime) { - psF64 fromMJD = fromTime->sec/86400.0 + fromTime->usec/86400000000.0 + 40587.0; - psF64 toMJD = toTime->sec/86400.0 + toTime->usec/86400000000.0 + 40587.0; - psF64 = (toMJD - fromMJD) / 36525.0; - - - + /* + psF64 fromMJD = fromTime->sec/86400.0 + fromTime->usec/86400000000.0 + 40587.0; + psF64 toMJD = toTime->sec/86400.0 + toTime->usec/86400000000.0 + 40587.0; + psF64 = (toMJD - fromMJD) / 36525.0; + */ return(NULL); } Index: /trunk/psLib/src/astro/psCoord.h =================================================================== --- /trunk/psLib/src/astro/psCoord.h (revision 2599) +++ /trunk/psLib/src/astro/psCoord.h (revision 2600) @@ -8,8 +8,8 @@ * @ingroup CoordinateTransform * -* @author George Gusciora, MHPCC -* -* @version $Revision: 1.19 $ $Name: not supported by cvs2svn $ -* @date $Date: 2004-11-24 19:48:17 $ +* @author GLG, MHPCC +* +* @version $Revision: 1.20 $ $Name: not supported by cvs2svn $ +* @date $Date: 2004-12-02 21:12:51 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii @@ -107,8 +107,8 @@ 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 cosDeltaP; ///< Cosine of target pole latitude in the source system + double sinDeltaP; ///< Sine of target pole latitude in the source system + double alphaP; ///< Longitude of the target system pole in the source system + double phiP; ///< Longitude of the ascending node in the target system } psSphereTransform; @@ -216,8 +216,9 @@ * @return psSphereTransform* newly allocated struct */ + psSphereTransform* psSphereTransformAlloc( - double NPlat, ///< north pole latitude - double Xo, ///< First PT of Ares lon - double xo ///< First PT of Ares equiv lon + double alphaP, ///< north pole latitude + double deltaP, ///< north pole longitude? + double phiP ///< defines the longitude in the input system of the equatorial intersection between the two systems (e.g, the first point of Ares). ); Index: /trunk/psLib/src/astronomy/Makefile =================================================================== --- /trunk/psLib/src/astronomy/Makefile (revision 2599) +++ /trunk/psLib/src/astronomy/Makefile (revision 2600) @@ -6,5 +6,5 @@ include ../Makefile.Globals CFLAGS := $(CFLAGS_RELOC) -I. -I../sysUtils -I../collections -I../dataManip \ - -I.. -I../image -I../fileUtils -I/usr/include/libxml2 \ + -I.. -I../image -I../fileUtils -I/usr/local/include/libxml2 \ -DTIME_CONFIG_FILE="\"$(TIME_CONFIG_FILE)\"" Index: /trunk/psLib/src/astronomy/psAstrometry.c =================================================================== --- /trunk/psLib/src/astronomy/psAstrometry.c (revision 2599) +++ /trunk/psLib/src/astronomy/psAstrometry.c (revision 2600) @@ -6,8 +6,8 @@ * @ingroup AstroImage * - * @author George Gusciora, MHPCC + * @author GLG, MHPCC * - * @version $Revision: 1.51 $ $Name: not supported by cvs2svn $ - * @date $Date: 2004-11-24 20:27:46 $ + * @version $Revision: 1.52 $ $Name: not supported by cvs2svn $ + * @date $Date: 2004-12-02 21:12:51 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii Index: /trunk/psLib/src/astronomy/psAstrometry.h =================================================================== --- /trunk/psLib/src/astronomy/psAstrometry.h (revision 2599) +++ /trunk/psLib/src/astronomy/psAstrometry.h (revision 2600) @@ -6,8 +6,8 @@ * @ingroup AstroImage * -* @author George Gusciora, MHPCC +* @author GLG, MHPCC * -* @version $Revision: 1.31 $ $Name: not supported by cvs2svn $ -* @date $Date: 2004-11-24 20:27:46 $ +* @version $Revision: 1.32 $ $Name: not supported by cvs2svn $ +* @date $Date: 2004-12-02 21:12:51 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii Index: /trunk/psLib/src/astronomy/psCoord.c =================================================================== --- /trunk/psLib/src/astronomy/psCoord.c (revision 2599) +++ /trunk/psLib/src/astronomy/psCoord.c (revision 2600) @@ -8,8 +8,8 @@ * @ingroup CoordinateTransform * -* @author George Gusciora, MHPCC +* @author GLG, MHPCC * -* @version $Revision: 1.36 $ $Name: not supported by cvs2svn $ -* @date $Date: 2004-12-01 19:56:05 $ +* @version $Revision: 1.37 $ $Name: not supported by cvs2svn $ +* @date $Date: 2004-12-02 21:12:51 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii @@ -164,14 +164,14 @@ This function prototype has been modified since the SDRS. *****************************************************************************/ -psSphereTransform* psSphereTransformAlloc(double NPlat, - double Xo, - double xo) +psSphereTransform* psSphereTransformAlloc(double alphaP, + double deltaP, + double phiP) { psSphereTransform* tmp = (psSphereTransform* ) psAlloc(sizeof(psSphereTransform)); - tmp->sinPhi = sin(NPlat); - tmp->cosPhi = cos(NPlat); - tmp->Xo = Xo; - tmp->xo = xo; + tmp->cosDeltaP = cos(deltaP); + tmp->sinDeltaP = cos(deltaP); + tmp->alphaP = alphaP; + tmp->phiP = phiP; return (tmp); @@ -207,11 +207,11 @@ x = coord->r; y = coord->d; - dx = x - transform->xo; - sinY = cos(y) * sin(dx) * transform->sinPhi + sin(y) * transform->cosPhi; + dx = x - transform->phiP; + sinY = cos(y) * sin(dx) * transform->sinDeltaP + sin(y) * transform->cosDeltaP; cosY = sqrt(1.0 - sinY * sinY); - sinX = (cos(y) * sin(dx) * transform->cosPhi - sin(y) * transform->sinPhi) / cos(y); + sinX = (cos(y) * sin(dx) * transform->cosDeltaP - sin(y) * transform->sinDeltaP) / cos(y); cosX = cos(y) * cos(dx) / cos(y); - out->r = atan2(sinX, cosX) + transform->Xo; + out->r = atan2(sinX, cosX) + transform->alphaP; out->d = atan2(sinY, cosY); @@ -227,9 +227,9 @@ double T = year / 100.0; double phi = -23.452294 + 0.013013 * T + 0.000001639 * T * T - 0.000000503 * T * T * T; - double Xo = 0.0; - double xo = 0.0; + double alphaP = 0.0; + double phiP = 0.0; psFree(tmTime); - return (psSphereTransformAlloc(phi, Xo, xo)); + return (psSphereTransformAlloc(phi, alphaP, phiP)); } @@ -242,9 +242,9 @@ double T = year / 100.0; double phi = +23.452294 - 0.013013 * T - 0.000001639 * T * T + 0.000000503 * T * T * T; - double Xo = 0.0; - double xo = 0.0; + double alphaP = 0.0; + double phiP = 0.0; psFree(tmTime); - return (psSphereTransformAlloc(phi, Xo, xo)); + return (psSphereTransformAlloc(phi, alphaP, phiP)); } @@ -536,10 +536,9 @@ const psTime *toTime) { - psF64 fromMJD = fromTime->sec/86400.0 + fromTime->usec/86400000000.0 + 40587.0; - psF64 toMJD = toTime->sec/86400.0 + toTime->usec/86400000000.0 + 40587.0; - psF64 = (toMJD - fromMJD) / 36525.0; - - - + /* + psF64 fromMJD = fromTime->sec/86400.0 + fromTime->usec/86400000000.0 + 40587.0; + psF64 toMJD = toTime->sec/86400.0 + toTime->usec/86400000000.0 + 40587.0; + psF64 = (toMJD - fromMJD) / 36525.0; + */ return(NULL); } Index: /trunk/psLib/src/astronomy/psCoord.h =================================================================== --- /trunk/psLib/src/astronomy/psCoord.h (revision 2599) +++ /trunk/psLib/src/astronomy/psCoord.h (revision 2600) @@ -8,8 +8,8 @@ * @ingroup CoordinateTransform * -* @author George Gusciora, MHPCC -* -* @version $Revision: 1.19 $ $Name: not supported by cvs2svn $ -* @date $Date: 2004-11-24 19:48:17 $ +* @author GLG, MHPCC +* +* @version $Revision: 1.20 $ $Name: not supported by cvs2svn $ +* @date $Date: 2004-12-02 21:12:51 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii @@ -107,8 +107,8 @@ 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 cosDeltaP; ///< Cosine of target pole latitude in the source system + double sinDeltaP; ///< Sine of target pole latitude in the source system + double alphaP; ///< Longitude of the target system pole in the source system + double phiP; ///< Longitude of the ascending node in the target system } psSphereTransform; @@ -216,8 +216,9 @@ * @return psSphereTransform* newly allocated struct */ + psSphereTransform* psSphereTransformAlloc( - double NPlat, ///< north pole latitude - double Xo, ///< First PT of Ares lon - double xo ///< First PT of Ares equiv lon + double alphaP, ///< north pole latitude + double deltaP, ///< north pole longitude? + double phiP ///< defines the longitude in the input system of the equatorial intersection between the two systems (e.g, the first point of Ares). ); Index: /trunk/psLib/src/dataIO/psFileUtilsErrors.h =================================================================== --- /trunk/psLib/src/dataIO/psFileUtilsErrors.h (revision 2599) +++ /trunk/psLib/src/dataIO/psFileUtilsErrors.h (revision 2600) @@ -7,6 +7,6 @@ * @author Robert DeSonia, MHPCC * - * @version $Revision: 1.2 $ $Name: not supported by cvs2svn $ - * @date $Date: 2004-11-16 20:00:21 $ + * @version $Revision: 1.3 $ $Name: not supported by cvs2svn $ + * @date $Date: 2004-12-02 21:12:52 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii @@ -31,7 +31,7 @@ //~Start #define PS_ERRORTEXT_$1 "$2" #define PS_ERRORTEXT_psLookupTable_FILE_NOT_FOUND "Failed to open file %s." -#define PS_ERRORTEXT_psLookupTable_PARSE_VALUE "Unable to parse string, %s on line %d." -#define PS_ERRORTEXT_psLookupTable_PARSE_TYPE "Unable to parse type, %s on line %d." -#define PS_ERRORTEXT_psLookupTable_PARSE_GENERAL "Unable to read lookup table item, %s on line %d " +#define PS_ERRORTEXT_psLookupTable_PARSE_VALUE "Unable to parse string, %s on line %lld." +#define PS_ERRORTEXT_psLookupTable_PARSE_TYPE "Unable to parse type, %s on line %lld." +#define PS_ERRORTEXT_psLookupTable_PARSE_GENERAL "Unable to read lookup table item, %s on line %lld " #define PS_ERRORTEXT_psLookupTable_INTERPOLATE_HIGH "High index too big, %d." #define PS_ERRORTEXT_psLookupTable_INTERPOLATE_LOW "Low index too small, %d." Index: /trunk/psLib/src/dataManip/psFunctions.h =================================================================== --- /trunk/psLib/src/dataManip/psFunctions.h (revision 2599) +++ /trunk/psLib/src/dataManip/psFunctions.h (revision 2600) @@ -10,8 +10,8 @@ * * @author Someone at IfA -* @author George Gusciora, MHPCC +* @author GLG, MHPCC * -* @version $Revision: 1.36 $ $Name: not supported by cvs2svn $ -* @date $Date: 2004-11-24 22:33:21 $ +* @version $Revision: 1.37 $ $Name: not supported by cvs2svn $ +* @date $Date: 2004-12-02 21:12:51 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii Index: /trunk/psLib/src/fileUtils/psFileUtilsErrors.h =================================================================== --- /trunk/psLib/src/fileUtils/psFileUtilsErrors.h (revision 2599) +++ /trunk/psLib/src/fileUtils/psFileUtilsErrors.h (revision 2600) @@ -7,6 +7,6 @@ * @author Robert DeSonia, MHPCC * - * @version $Revision: 1.2 $ $Name: not supported by cvs2svn $ - * @date $Date: 2004-11-16 20:00:21 $ + * @version $Revision: 1.3 $ $Name: not supported by cvs2svn $ + * @date $Date: 2004-12-02 21:12:52 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii @@ -31,7 +31,7 @@ //~Start #define PS_ERRORTEXT_$1 "$2" #define PS_ERRORTEXT_psLookupTable_FILE_NOT_FOUND "Failed to open file %s." -#define PS_ERRORTEXT_psLookupTable_PARSE_VALUE "Unable to parse string, %s on line %d." -#define PS_ERRORTEXT_psLookupTable_PARSE_TYPE "Unable to parse type, %s on line %d." -#define PS_ERRORTEXT_psLookupTable_PARSE_GENERAL "Unable to read lookup table item, %s on line %d " +#define PS_ERRORTEXT_psLookupTable_PARSE_VALUE "Unable to parse string, %s on line %lld." +#define PS_ERRORTEXT_psLookupTable_PARSE_TYPE "Unable to parse type, %s on line %lld." +#define PS_ERRORTEXT_psLookupTable_PARSE_GENERAL "Unable to read lookup table item, %s on line %lld " #define PS_ERRORTEXT_psLookupTable_INTERPOLATE_HIGH "High index too big, %d." #define PS_ERRORTEXT_psLookupTable_INTERPOLATE_LOW "Low index too small, %d." Index: /trunk/psLib/src/image/psImageStats.h =================================================================== --- /trunk/psLib/src/image/psImageStats.h (revision 2599) +++ /trunk/psLib/src/image/psImageStats.h (revision 2600) @@ -7,8 +7,8 @@ * polynomials to images. * -* @author George Gusciora, MHPCC +* @author GLG, MHPCC * -* @version $Revision: 1.18 $ $Name: not supported by cvs2svn $ -* @date $Date: 2004-10-27 00:57:31 $ +* @version $Revision: 1.19 $ $Name: not supported by cvs2svn $ +* @date $Date: 2004-12-02 21:12:52 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii Index: /trunk/psLib/src/imageops/psImageStats.h =================================================================== --- /trunk/psLib/src/imageops/psImageStats.h (revision 2599) +++ /trunk/psLib/src/imageops/psImageStats.h (revision 2600) @@ -7,8 +7,8 @@ * polynomials to images. * -* @author George Gusciora, MHPCC +* @author GLG, MHPCC * -* @version $Revision: 1.18 $ $Name: not supported by cvs2svn $ -* @date $Date: 2004-10-27 00:57:31 $ +* @version $Revision: 1.19 $ $Name: not supported by cvs2svn $ +* @date $Date: 2004-12-02 21:12:52 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii Index: /trunk/psLib/src/math/psPolynomial.h =================================================================== --- /trunk/psLib/src/math/psPolynomial.h (revision 2599) +++ /trunk/psLib/src/math/psPolynomial.h (revision 2600) @@ -10,8 +10,8 @@ * * @author Someone at IfA -* @author George Gusciora, MHPCC +* @author GLG, MHPCC * -* @version $Revision: 1.36 $ $Name: not supported by cvs2svn $ -* @date $Date: 2004-11-24 22:33:21 $ +* @version $Revision: 1.37 $ $Name: not supported by cvs2svn $ +* @date $Date: 2004-12-02 21:12:51 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii Index: /trunk/psLib/src/math/psSpline.h =================================================================== --- /trunk/psLib/src/math/psSpline.h (revision 2599) +++ /trunk/psLib/src/math/psSpline.h (revision 2600) @@ -10,8 +10,8 @@ * * @author Someone at IfA -* @author George Gusciora, MHPCC +* @author GLG, MHPCC * -* @version $Revision: 1.36 $ $Name: not supported by cvs2svn $ -* @date $Date: 2004-11-24 22:33:21 $ +* @version $Revision: 1.37 $ $Name: not supported by cvs2svn $ +* @date $Date: 2004-12-02 21:12:51 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii Index: /trunk/psLib/src/sys/psTrace.c =================================================================== --- /trunk/psLib/src/sys/psTrace.c (revision 2599) +++ /trunk/psLib/src/sys/psTrace.c (revision 2600) @@ -7,8 +7,8 @@ * * @author Robert Lupton, Princeton University - * @author George Gusciora, MHPCC + * @author GLG, MHPCC * - * @version $Revision: 1.39 $ $Name: not supported by cvs2svn $ - * @date $Date: 2004-11-24 20:12:28 $ + * @version $Revision: 1.40 $ $Name: not supported by cvs2svn $ + * @date $Date: 2004-12-02 21:12:52 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii Index: /trunk/psLib/src/sysUtils/psSysUtilsErrors.h =================================================================== --- /trunk/psLib/src/sysUtils/psSysUtilsErrors.h (revision 2599) +++ /trunk/psLib/src/sysUtils/psSysUtilsErrors.h (revision 2600) @@ -7,6 +7,6 @@ * @author Robert DeSonia, MHPCC * - * @version $Revision: 1.12 $ $Name: not supported by cvs2svn $ - * @date $Date: 2004-11-10 18:36:10 $ + * @version $Revision: 1.13 $ $Name: not supported by cvs2svn $ + * @date $Date: 2004-12-02 21:12:52 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii @@ -36,8 +36,8 @@ #define PS_ERRORTEXT_psLogMsg_UNKNOWN_KEY "Unknown logging keyword %c." #define PS_ERRORTEXT_psMemory_NULL_BLOCK "NULL memory block found." -#define PS_ERRORTEXT_psMemory_DEREF_BLOCK_USE "Memory block %ld was freed but still being used." -#define PS_ERRORTEXT_psMemory_UNDERFLOW "Memory block %ld is corrupted; buffer underflow detected." -#define PS_ERRORTEXT_psMemory_OVERFLOW "Memory block %ld is corrupted; buffer overflow detected." -#define PS_ERRORTEXT_psMemory_MULTIPLE_FREE "Block %ld, allocated at %s:%d, freed multiple times at %s:%d." +#define PS_ERRORTEXT_psMemory_DEREF_BLOCK_USE "Memory block %lld was freed but still being used." +#define PS_ERRORTEXT_psMemory_UNDERFLOW "Memory block %lld is corrupted; buffer underflow detected." +#define PS_ERRORTEXT_psMemory_OVERFLOW "Memory block %lld is corrupted; buffer overflow detected." +#define PS_ERRORTEXT_psMemory_MULTIPLE_FREE "Block %lld, allocated at %s:%d, freed multiple times at %s:%d." #define PS_ERRORTEXT_psString_NCHAR_NEGATIVE "Can not copy a negative number of characters (%d)." #define PS_ERRORTEXT_psTrace_NULL_SUBCOMPONENT "Sub-component %d of node %s in trace tree is NULL." Index: /trunk/psLib/src/sysUtils/psTrace.c =================================================================== --- /trunk/psLib/src/sysUtils/psTrace.c (revision 2599) +++ /trunk/psLib/src/sysUtils/psTrace.c (revision 2600) @@ -7,8 +7,8 @@ * * @author Robert Lupton, Princeton University - * @author George Gusciora, MHPCC + * @author GLG, MHPCC * - * @version $Revision: 1.39 $ $Name: not supported by cvs2svn $ - * @date $Date: 2004-11-24 20:12:28 $ + * @version $Revision: 1.40 $ $Name: not supported by cvs2svn $ + * @date $Date: 2004-12-02 21:12:52 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii