Index: trunk/psLib/src/astro/psCoord.h =================================================================== --- trunk/psLib/src/astro/psCoord.h (revision 4613) +++ trunk/psLib/src/astro/psCoord.h (revision 4620) @@ -10,6 +10,6 @@ * @author GLG, MHPCC * -* @version $Revision: 1.39 $ $Name: not supported by cvs2svn $ -* @date $Date: 2005-07-27 00:36:01 $ +* @version $Revision: 1.40 $ $Name: not supported by cvs2svn $ +* @date $Date: 2005-07-27 19:55:15 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii @@ -112,23 +112,4 @@ } psPlaneDistort; - -/** Spherical Transform Definition - * - * We need to be able to convert between ICRS, Galactic and Ecliptic - * coordinates, and potentially between arbitrary spherical coordinate - * systems. All of these basic spherical transformations represent rotations - * of the spherical coordinate reference. We specify a general - * transformation function which takes a structure, psSphereTransform, - * defining the transformation between two spherical coordinate systems - * - */ -typedef struct -{ - double alphaP; ///< Longitude of the target system pole in the source system - double cosDeltaP; ///< Cosine of target pole latitude in the source system - double sinDeltaP; ///< Sine of target pole latitude in the source system - double phiP; ///< Longitude of the ascending node in the target system -} -psSphereTransform; /** Projection type for projection/deprojection @@ -163,31 +144,8 @@ psProjection; -/** Mode for Offset calculation between two sky positions - * - * @see psSphereGetOffset, psSphereSetOffset - * - */ -typedef enum { - PS_SPHERICAL, ///< offset corresponds to an angular offset - PS_LINEAR ///< offset corresponds to a linear offset -} psSphereOffsetMode; - -/** The units of the offset - * - * @see psSphereGetOffset, psSphereSetOffset - * - */ -typedef enum { - PS_ARCSEC, ///< Arcseconds - PS_ARCMIN, ///< Arcminutes - PS_DEGREE, ///< Degrees - PS_RADIAN ///< Radians -} psSphereOffsetUnit; - /** Allocates a psPlane * * @return psPlane* resulting plane structure. */ - psPlane* psPlaneAlloc(void); @@ -196,6 +154,11 @@ * @return psSphere* resulting sphere structure. */ - psSphere* psSphereAlloc(void); + +/** Allocates a psCube + * + * @return psCube* resulting cubic structure. + */ +psCube* psCubeAlloc(void); /** Allocates a psCube @@ -250,55 +213,4 @@ ); -/** Allocator for psSphereTransform - * - * @return psSphereTransform* newly allocated struct - */ - -psSphereTransform* psSphereTransformAlloc( - 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). -); - -/** Applies the psSphereTransform transform for a specified coordinate - * - * @return psSphere* resulting coordinate based on transform - */ -psSphere* psSphereTransformApply( - psSphere* out, ///< a psSphere to recycle. If NULL, a new one is generated. - const psSphereTransform* transform,///< the transform to apply - const psSphere* coord ///< the coordinate to apply the transform above.x -); - -/** Creates the appropriate transform for converting from ICRS to Ecliptic - * coordinate systems. - * - * @return psSphereTransform* transform for ICRS->Ecliptic coordinate systems - */ -psSphereTransform* psSphereTransformICRSToEcliptic( - psTime *time ///< the time for which the resulting transform will be valid -); - -/** Creates the appropriate transform for converting from Ecliptic to ICRS - * coordinate systems. - * - * @return psSphereTransform* transform for Ecliptic->ICRS coordinate systems - */ -psSphereTransform* psSphereTransformEclipticToICRS( - psTime *time ///< the time for which the resulting transform will be valid -); - -/** Creates the appropriate transform for converting from ICRS to Galactic - * coordinate systems. - * - */ -psSphereTransform* psSphereTransformICRSToGalactic(void); - -/** Creates the appropriate transform for converting from Galactic to ICRS - * coordinate systems. - * - */ -psSphereTransform* psSphereTransformGalacticToICRS(void); - /** Allocates memory for a psProjection structure * @@ -329,51 +241,4 @@ const psPlane* coord, ///< coordinate to project const psProjection* projection ///< parameters of the projection -); - -/** Determines the offset (RA,Dec) on the sky between two positions. - * - * Both an offset mode and an offset unit may be defined. The mode may be - * either PS_SPHERICAL, in which case the specified offset corresponds to an - * offset in angles, or it may be PS_LINEAR, in which case the offset - * corresponds to a linear offset in a local projection. The offset unit may - * be in one of PS_ARCSEC, PS_ARCMIN, PS_DEGREE, and PS_RADIAN, which - * specifies the units of the offset only. - * - * @return psSphere* the offset between position1 and position2 - */ -psSphere* psSphereGetOffset( - const psSphere* position1, ///< first position for calculating offset - const psSphere* position2, ///< second position for calculating offset - psSphereOffsetMode mode, ///< type of offset can be PS_SPHERICAL or PS_LINEAR - psSphereOffsetUnit unit ///< specifies the units of offset only -); - -/** Applies the given offset to a coordinate. - * - * Both an offset mode and an offset unit may be defined. The mode may be - * either PS_SPHERICAL, in which case the specified offset corresponds to an - * offset in angles, or it may be PS_LINEAR, in which case the offset - * corresponds to a linear offset in a local projection. The offset unit may - * be in one of PS_ARCSEC, PS_ARCMIN, PS_DEGREE, and PS_RADIAN, which - * specifies the units of the offset only. - * - * @return psSphere* the original position with the given offset applied. - */ -psSphere* psSphereSetOffset( - const psSphere* position, ///< coordinate of origin - const psSphere* offset, ///< coordinate of offset to apply - psSphereOffsetMode mode, ///< corresponds to an offset in angles or local projection - psSphereOffsetUnit unit ///< specifies the units of offset only -); - -/** Generates the complete spherical rotation to account for precession - * between two times. The equinoxes shall be Julian equinoxes. - * - * @return psSphere* the resulting spherical rotation - */ -psSphere* psSpherePrecess( - psSphere *coords, ///< coordinates (modified in-place) - const psTime *fromTime, ///< equinox of coords input - const psTime *toTime ///< equinox of coords output );