Index: /trunk/psLib/psLib.kdevelop
===================================================================
--- /trunk/psLib/psLib.kdevelop (revision 1392)
+++ /trunk/psLib/psLib.kdevelop (revision 1393)
@@ -7,5 +7,10 @@
KDevCustomProject
C
-
+
+ KDevClassView
+ KDevClearCase
+ KDevFileGroups
+ KDevPerforce
+
.
false
@@ -15,5 +20,5 @@
- psLib
+
executable
/
@@ -105,4 +110,10 @@
KDE Libraries (Doxygen)
+
+ html/
+ html/
+
+
+
Index: /trunk/psLib/psLib.kdevses
===================================================================
--- /trunk/psLib/psLib.kdevses (revision 1392)
+++ /trunk/psLib/psLib.kdevses (revision 1393)
@@ -2,5 +2,21 @@
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
Index: /trunk/psLib/src/Doxyfile
===================================================================
--- /trunk/psLib/src/Doxyfile (revision 1392)
+++ /trunk/psLib/src/Doxyfile (revision 1393)
@@ -24,5 +24,5 @@
# if some version control system is used.
-PROJECT_NUMBER =
+PROJECT_NUMBER = 2.0
# The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute)
@@ -377,5 +377,5 @@
# *.h++ *.idl *.odl *.cs *.php *.php3 *.inc
-FILE_PATTERNS = *.c *.h *.dox
+FILE_PATTERNS = *.h *.dox
# The RECURSIVE tag can be used to turn specify whether or not subdirectories
@@ -965,5 +965,5 @@
# have no effect if this option is set to NO (the default)
-HAVE_DOT = NO
+HAVE_DOT = YES
# If the CLASS_GRAPH and HAVE_DOT tags are set to YES then doxygen
Index: /trunk/psLib/src/astro/psCoord.c
===================================================================
--- /trunk/psLib/src/astro/psCoord.c (revision 1392)
+++ /trunk/psLib/src/astro/psCoord.c (revision 1393)
@@ -10,6 +10,6 @@
* @author George Gusciora, MHPCC
*
-* @version $Revision: 1.9 $ $Name: not supported by cvs2svn $
-* @date $Date: 2004-08-04 23:37:39 $
+* @version $Revision: 1.10 $ $Name: not supported by cvs2svn $
+* @date $Date: 2004-08-05 19:38:51 $
*
* Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -27,4 +27,7 @@
#include
+static float cot( float x );
+static float arg( float x, float y );
+
// This is the only function in this file which I understand.
psPlane *psPlaneTransformApply( psPlane *out,
@@ -88,10 +91,4 @@
return ( tmp );
-}
-
-// I understand this one too.
-void p_psSphereTransformFree( psSphereTransform *trans )
-{
- psFree( trans );
}
Index: /trunk/psLib/src/astro/psCoord.h
===================================================================
--- /trunk/psLib/src/astro/psCoord.h (revision 1392)
+++ /trunk/psLib/src/astro/psCoord.h (revision 1393)
@@ -10,6 +10,6 @@
* @author George Gusciora, MHPCC
*
-* @version $Revision: 1.8 $ $Name: not supported by cvs2svn $
-* @date $Date: 2004-08-04 23:37:39 $
+* @version $Revision: 1.9 $ $Name: not supported by cvs2svn $
+* @date $Date: 2004-08-05 19:38:51 $
*
* Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -29,4 +29,11 @@
/// @{
+/** Euclidiean Coordinate System.
+ *
+ * Both detector and sky positions will be used extensively in the IPP. One
+ * coordinate system to be used is linear coordinates which conform to
+ * Euclidean geometry.
+ *
+ */
typedef struct
{
@@ -38,4 +45,11 @@
psPlane;
+/** Angular Coordinate System
+ *
+ * Both detector and sky positions will be used extensively in the IPP. One
+ * coordinate system to be used is angular coordinates for which additional
+ * care must often be taken in comparison to a euclidiean coordinate system.
+ *
+ */
typedef struct
{
@@ -47,18 +61,48 @@
psSphere;
-typedef struct
-{
- psDPolynomial2D *x;
- psDPolynomial2D *y;
+/** 2D Polynomial Transform
+ *
+ * A transform between coordinate systems that consists simply of two 2D
+ * polynomials to transform both components - the output coordinates depend
+ * only on the input coordinates and no other quantities of objects at those
+ * coordinates.
+ *
+ */
+typedef struct
+{
+ psDPolynomial2D *x; ///< 2D polynomial transform of X coordinates
+ psDPolynomial2D *y; ///< 2D polynomial transform of Y coordinates
}
psPlaneTransform;
-typedef struct
-{
- psDPolynomial4D *x;
- psDPolynomial4D *y;
+/** 4D Polynomial Transform
+ *
+ * A transform between coordinate systems that consists of two 4D polynomials
+ * in which the output coordinates are also specified to be a function of the
+ * magnitude and color of the object with the given coordinates. This type of
+ * coordinate transformation is necessary to represent the (color-dependent)
+ * optical distortions caused by the atmosphere and camera optics, and the
+ * possibly effects of charge transfer inefficiency.
+ *
+ * The lowest two terms are the x and y axis of the target system. The higher
+ * two terms may represent magnitude and color terms.
+ */
+typedef struct
+{
+ psDPolynomial4D *x; ///< 4D polynomial transform of X coordinates
+ psDPolynomial4D *y; ///< 4D polynomial transform of Y coordinates
}
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
{
@@ -70,4 +114,9 @@
psSphereTransform;
+/** Projection type for projection/deprojection
+ *
+ * @seealso psProject, psDeproject
+ *
+ */
typedef enum {
PS_PROJ_TAN, ///< Tangent projection
@@ -81,4 +130,9 @@
} psProjectionType;
+/** Parameter set for projection/deprojection
+ *
+ * @seealso psProject, psDeproject
+ *
+ */
typedef struct
{
@@ -91,58 +145,100 @@
psProjection;
+/** Mode for Offset calculation between two sky positions
+ *
+ * @seealso psSphereGetOffset, psSphereSetOffset
+ *
+ */
typedef enum {
- PS_SPHERICAL,
- PS_LINEAR
+ PS_SPHERICAL, ///< offset corresponds to an angular offset
+ PS_LINEAR ///< offset corresponds to a linear offset
} psSphereOffsetMode;
+/** The units of the offset
+ *
+ * @seealso psSphereGetOffset, psSphereSetOffset
+ *
+ */
typedef enum {
- PS_ARCSEC,
- PS_ARCMIN,
- PS_DEGREE,
- PS_RADIAN
+ PS_ARCSEC, ///< Arcseconds
+ PS_ARCMIN, ///< Arcminutes
+ PS_DEGREE, ///< Degrees
+ PS_RADIAN ///< Radians
} psSphereOffsetUnit;
-psPlane *psPlaneTransformApply( psPlane *out,
- const psPlaneTransform *transform,
- const psPlane *coords );
-
-psPlane *psPlaneDistortApply( psPlane *out,
- const psPlaneDistort *transform,
- const psPlane *coords,
- float term3,
- float term4 );
-
-
-// New function prototype.
-psSphereTransform *psSphereTransformAlloc( double NPlat,
- double Xo,
- double xo );
-
-void p_psSphereTransformFree( psSphereTransform *trans );
-
-psSphere *psSphereTransformApply( psSphere *out,
- const psSphereTransform *transform,
- const psSphere *coord );
-
-psSphereTransform *psSphereTransformICRStoEcliptic( psTime time );
-psSphereTransform *psSphereTransformEcliptictoICRS( psTime time );
+/** Applies the psPlaneTransform transform to a specified coordinate
+ *
+ */
+psPlane *psPlaneTransformApply(
+ psPlane *out, ///< a psPlane to recycle. If NULL, a new one is generated.
+ const psPlaneTransform *transform, ///< the transform to apply
+ const psPlane *coords ///< the coordinate to apply the transform above.
+);
+
+/** Applies the psPlaneDistort transform to a specified coordinate
+ *
+ */
+psPlane *psPlaneDistortApply(
+ psPlane *out, ///< a psPlane to recycle. If NULL, a new one is generated.
+ const psPlaneDistort *transform, ///< the transform to apply
+ const psPlane *coords, ///< the coordinate to apply the transform above.
+ float term3, ///< third term -- maybe magnitude
+ float term4 ///< forth term -- maybe color
+);
+
+/** Allocator for psSphereTransform
+ *
+ */
+psSphereTransform *psSphereTransformAlloc(
+ double NPlat, ///< north pole latitude
+ double Xo, ///< First PT of Ares lon
+ double xo ///< First PT of Ares equiv lon
+);
+
+
+/** Applies the psSphereTransform transform for a specified coordinate
+ *
+ */
+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
+);
+
+psSphereTransform *psSphereTransformICRStoEcliptic(
+ psTime time
+);
+
+psSphereTransform *psSphereTransformEcliptictoICRS(
+ psTime time
+);
+
psSphereTransform *psSphereTransformICRStoGalatic( void );
+
psSphereTransform *psSphereTransformGalatictoICRS( void );
-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 );
+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 1392)
+++ /trunk/psLib/src/astro/psTime.c (revision 1393)
@@ -12,6 +12,6 @@
* @author Ross Harman, MHPCC
*
- * @version $Revision: 1.11 $ $Name: not supported by cvs2svn $
- * @date $Date: 2004-08-04 23:37:39 $
+ * @version $Revision: 1.12 $ $Name: not supported by cvs2svn $
+ * @date $Date: 2004-08-05 19:38:51 $
*
* Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -34,4 +34,25 @@
/* DEFINE STATEMENTS */
/******************************************************************************/
+
+/** Number of available leapsecond updates */
+#define NUM_LEAPSECOND_UPDATES 23
+
+/** Maximum length of time string */
+#define MAX_TIME_STRING_LENGTH 256
+
+/** Seconds per minute */
+#define SEC_PER_MINUTE 60.0
+
+/** Seconds per hour */
+#define SEC_PER_HOUR (60.0*SEC_PER_MINUTE)
+
+/** Seconds per day */
+#define SEC_PER_DAY (24.0*SEC_PER_HOUR)
+
+/** Seconds per year */
+#define SEC_PER_YEAR (365.0*SEC_PER_DAY)
+
+/** Microseconds per day */
+#define USEC_PER_DAY 86400000000.0
/** Preprocessor macro to generate error for negative time in struct */
Index: /trunk/psLib/src/astro/psTime.h
===================================================================
--- /trunk/psLib/src/astro/psTime.h (revision 1392)
+++ /trunk/psLib/src/astro/psTime.h (revision 1393)
@@ -12,6 +12,6 @@
* @author Ross Harman, MHPCC
*
- * @version $Revision: 1.6 $ $Name: not supported by cvs2svn $
- * @date $Date: 2004-08-04 23:37:39 $
+ * @version $Revision: 1.7 $ $Name: not supported by cvs2svn $
+ * @date $Date: 2004-08-05 19:38:51 $
*
* Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -29,29 +29,4 @@
/// @addtogroup Time
/// @{
-
-/******************************************************************************/
-/* DEFINE STATEMENTS */
-/******************************************************************************/
-
-/** Number of available leapsecond updates */
-#define NUM_LEAPSECOND_UPDATES 23
-
-/** Maximum length of time string */
-#define MAX_TIME_STRING_LENGTH 256
-
-/** Seconds per minute */
-#define SEC_PER_MINUTE 60.0
-
-/** Seconds per hour */
-#define SEC_PER_HOUR (60.0*SEC_PER_MINUTE)
-
-/** Seconds per day */
-#define SEC_PER_DAY (24.0*SEC_PER_HOUR)
-
-/** Seconds per year */
-#define SEC_PER_YEAR (365.0*SEC_PER_DAY)
-
-/** Microseconds per day */
-#define USEC_PER_DAY 86400000000.0
/******************************************************************************/
Index: /trunk/psLib/src/astronomy/psAstrometry.c
===================================================================
--- /trunk/psLib/src/astronomy/psAstrometry.c (revision 1392)
+++ /trunk/psLib/src/astronomy/psAstrometry.c (revision 1393)
@@ -8,6 +8,6 @@
* @author George Gusciora, MHPCC
*
-* @version $Revision: 1.3 $ $Name: not supported by cvs2svn $
-* @date $Date: 2004-08-04 23:37:39 $
+* @version $Revision: 1.4 $ $Name: not supported by cvs2svn $
+* @date $Date: 2004-08-05 19:38:51 $
*
* Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -20,7 +20,7 @@
#include "psMemory.h"
-void grommitFree( psGrommit *grommit );
-int checkValidChipCoords( double x, double y, psChip *tmpChip );
-int checkValidImageCoords( double x, double y, psImage *tmpImage );
+static void grommitFree( psGrommit *grommit );
+static int checkValidChipCoords( double x, double y, psChip *tmpChip );
+static int checkValidImageCoords( double x, double y, psImage *tmpImage );
psExposure* psExposureAlloc( double ra, double dec, double hourAngle,
Index: /trunk/psLib/src/astronomy/psCoord.c
===================================================================
--- /trunk/psLib/src/astronomy/psCoord.c (revision 1392)
+++ /trunk/psLib/src/astronomy/psCoord.c (revision 1393)
@@ -10,6 +10,6 @@
* @author George Gusciora, MHPCC
*
-* @version $Revision: 1.9 $ $Name: not supported by cvs2svn $
-* @date $Date: 2004-08-04 23:37:39 $
+* @version $Revision: 1.10 $ $Name: not supported by cvs2svn $
+* @date $Date: 2004-08-05 19:38:51 $
*
* Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -27,4 +27,7 @@
#include
+static float cot( float x );
+static float arg( float x, float y );
+
// This is the only function in this file which I understand.
psPlane *psPlaneTransformApply( psPlane *out,
@@ -88,10 +91,4 @@
return ( tmp );
-}
-
-// I understand this one too.
-void p_psSphereTransformFree( psSphereTransform *trans )
-{
- psFree( trans );
}
Index: /trunk/psLib/src/astronomy/psCoord.h
===================================================================
--- /trunk/psLib/src/astronomy/psCoord.h (revision 1392)
+++ /trunk/psLib/src/astronomy/psCoord.h (revision 1393)
@@ -10,6 +10,6 @@
* @author George Gusciora, MHPCC
*
-* @version $Revision: 1.8 $ $Name: not supported by cvs2svn $
-* @date $Date: 2004-08-04 23:37:39 $
+* @version $Revision: 1.9 $ $Name: not supported by cvs2svn $
+* @date $Date: 2004-08-05 19:38:51 $
*
* Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -29,4 +29,11 @@
/// @{
+/** Euclidiean Coordinate System.
+ *
+ * Both detector and sky positions will be used extensively in the IPP. One
+ * coordinate system to be used is linear coordinates which conform to
+ * Euclidean geometry.
+ *
+ */
typedef struct
{
@@ -38,4 +45,11 @@
psPlane;
+/** Angular Coordinate System
+ *
+ * Both detector and sky positions will be used extensively in the IPP. One
+ * coordinate system to be used is angular coordinates for which additional
+ * care must often be taken in comparison to a euclidiean coordinate system.
+ *
+ */
typedef struct
{
@@ -47,18 +61,48 @@
psSphere;
-typedef struct
-{
- psDPolynomial2D *x;
- psDPolynomial2D *y;
+/** 2D Polynomial Transform
+ *
+ * A transform between coordinate systems that consists simply of two 2D
+ * polynomials to transform both components - the output coordinates depend
+ * only on the input coordinates and no other quantities of objects at those
+ * coordinates.
+ *
+ */
+typedef struct
+{
+ psDPolynomial2D *x; ///< 2D polynomial transform of X coordinates
+ psDPolynomial2D *y; ///< 2D polynomial transform of Y coordinates
}
psPlaneTransform;
-typedef struct
-{
- psDPolynomial4D *x;
- psDPolynomial4D *y;
+/** 4D Polynomial Transform
+ *
+ * A transform between coordinate systems that consists of two 4D polynomials
+ * in which the output coordinates are also specified to be a function of the
+ * magnitude and color of the object with the given coordinates. This type of
+ * coordinate transformation is necessary to represent the (color-dependent)
+ * optical distortions caused by the atmosphere and camera optics, and the
+ * possibly effects of charge transfer inefficiency.
+ *
+ * The lowest two terms are the x and y axis of the target system. The higher
+ * two terms may represent magnitude and color terms.
+ */
+typedef struct
+{
+ psDPolynomial4D *x; ///< 4D polynomial transform of X coordinates
+ psDPolynomial4D *y; ///< 4D polynomial transform of Y coordinates
}
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
{
@@ -70,4 +114,9 @@
psSphereTransform;
+/** Projection type for projection/deprojection
+ *
+ * @seealso psProject, psDeproject
+ *
+ */
typedef enum {
PS_PROJ_TAN, ///< Tangent projection
@@ -81,4 +130,9 @@
} psProjectionType;
+/** Parameter set for projection/deprojection
+ *
+ * @seealso psProject, psDeproject
+ *
+ */
typedef struct
{
@@ -91,58 +145,100 @@
psProjection;
+/** Mode for Offset calculation between two sky positions
+ *
+ * @seealso psSphereGetOffset, psSphereSetOffset
+ *
+ */
typedef enum {
- PS_SPHERICAL,
- PS_LINEAR
+ PS_SPHERICAL, ///< offset corresponds to an angular offset
+ PS_LINEAR ///< offset corresponds to a linear offset
} psSphereOffsetMode;
+/** The units of the offset
+ *
+ * @seealso psSphereGetOffset, psSphereSetOffset
+ *
+ */
typedef enum {
- PS_ARCSEC,
- PS_ARCMIN,
- PS_DEGREE,
- PS_RADIAN
+ PS_ARCSEC, ///< Arcseconds
+ PS_ARCMIN, ///< Arcminutes
+ PS_DEGREE, ///< Degrees
+ PS_RADIAN ///< Radians
} psSphereOffsetUnit;
-psPlane *psPlaneTransformApply( psPlane *out,
- const psPlaneTransform *transform,
- const psPlane *coords );
-
-psPlane *psPlaneDistortApply( psPlane *out,
- const psPlaneDistort *transform,
- const psPlane *coords,
- float term3,
- float term4 );
-
-
-// New function prototype.
-psSphereTransform *psSphereTransformAlloc( double NPlat,
- double Xo,
- double xo );
-
-void p_psSphereTransformFree( psSphereTransform *trans );
-
-psSphere *psSphereTransformApply( psSphere *out,
- const psSphereTransform *transform,
- const psSphere *coord );
-
-psSphereTransform *psSphereTransformICRStoEcliptic( psTime time );
-psSphereTransform *psSphereTransformEcliptictoICRS( psTime time );
+/** Applies the psPlaneTransform transform to a specified coordinate
+ *
+ */
+psPlane *psPlaneTransformApply(
+ psPlane *out, ///< a psPlane to recycle. If NULL, a new one is generated.
+ const psPlaneTransform *transform, ///< the transform to apply
+ const psPlane *coords ///< the coordinate to apply the transform above.
+);
+
+/** Applies the psPlaneDistort transform to a specified coordinate
+ *
+ */
+psPlane *psPlaneDistortApply(
+ psPlane *out, ///< a psPlane to recycle. If NULL, a new one is generated.
+ const psPlaneDistort *transform, ///< the transform to apply
+ const psPlane *coords, ///< the coordinate to apply the transform above.
+ float term3, ///< third term -- maybe magnitude
+ float term4 ///< forth term -- maybe color
+);
+
+/** Allocator for psSphereTransform
+ *
+ */
+psSphereTransform *psSphereTransformAlloc(
+ double NPlat, ///< north pole latitude
+ double Xo, ///< First PT of Ares lon
+ double xo ///< First PT of Ares equiv lon
+);
+
+
+/** Applies the psSphereTransform transform for a specified coordinate
+ *
+ */
+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
+);
+
+psSphereTransform *psSphereTransformICRStoEcliptic(
+ psTime time
+);
+
+psSphereTransform *psSphereTransformEcliptictoICRS(
+ psTime time
+);
+
psSphereTransform *psSphereTransformICRStoGalatic( void );
+
psSphereTransform *psSphereTransformGalatictoICRS( void );
-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 );
+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/astronomy/psMetadata.c
===================================================================
--- /trunk/psLib/src/astronomy/psMetadata.c (revision 1392)
+++ /trunk/psLib/src/astronomy/psMetadata.c (revision 1393)
@@ -11,6 +11,6 @@
* @author Ross Harman, MHPCC
*
-* @version $Revision: 1.9 $ $Name: not supported by cvs2svn $
-* @date $Date: 2004-08-05 02:22:42 $
+* @version $Revision: 1.10 $ $Name: not supported by cvs2svn $
+* @date $Date: 2004-08-05 19:38:51 $
*
* Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -39,5 +39,9 @@
/******************************************************************************/
-// None
+/** Maximum length of string */
+#define MAX_STRING_LENGTH 1024
+
+/** Maximum length of FITS line */
+#define FITS_LINE_SIZE 80
/******************************************************************************/
Index: /trunk/psLib/src/astronomy/psMetadata.h
===================================================================
--- /trunk/psLib/src/astronomy/psMetadata.h (revision 1392)
+++ /trunk/psLib/src/astronomy/psMetadata.h (revision 1393)
@@ -10,6 +10,6 @@
* @author Ross Harman, MHPCC
*
-* @version $Revision: 1.13 $ $Name: not supported by cvs2svn $
-* @date $Date: 2004-08-04 23:54:05 $
+* @version $Revision: 1.14 $ $Name: not supported by cvs2svn $
+* @date $Date: 2004-08-05 19:38:51 $
*
* Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -27,10 +27,4 @@
/// @addtogroup Metadata
/// @{
-
-/** Maximum length of string */
-#define MAX_STRING_LENGTH 1024
-
-/** Maximum length of FITS line */
-#define FITS_LINE_SIZE 80
/** Metadata item type.
Index: /trunk/psLib/src/astronomy/psTime.c
===================================================================
--- /trunk/psLib/src/astronomy/psTime.c (revision 1392)
+++ /trunk/psLib/src/astronomy/psTime.c (revision 1393)
@@ -12,6 +12,6 @@
* @author Ross Harman, MHPCC
*
- * @version $Revision: 1.11 $ $Name: not supported by cvs2svn $
- * @date $Date: 2004-08-04 23:37:39 $
+ * @version $Revision: 1.12 $ $Name: not supported by cvs2svn $
+ * @date $Date: 2004-08-05 19:38:51 $
*
* Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -34,4 +34,25 @@
/* DEFINE STATEMENTS */
/******************************************************************************/
+
+/** Number of available leapsecond updates */
+#define NUM_LEAPSECOND_UPDATES 23
+
+/** Maximum length of time string */
+#define MAX_TIME_STRING_LENGTH 256
+
+/** Seconds per minute */
+#define SEC_PER_MINUTE 60.0
+
+/** Seconds per hour */
+#define SEC_PER_HOUR (60.0*SEC_PER_MINUTE)
+
+/** Seconds per day */
+#define SEC_PER_DAY (24.0*SEC_PER_HOUR)
+
+/** Seconds per year */
+#define SEC_PER_YEAR (365.0*SEC_PER_DAY)
+
+/** Microseconds per day */
+#define USEC_PER_DAY 86400000000.0
/** Preprocessor macro to generate error for negative time in struct */
Index: /trunk/psLib/src/astronomy/psTime.h
===================================================================
--- /trunk/psLib/src/astronomy/psTime.h (revision 1392)
+++ /trunk/psLib/src/astronomy/psTime.h (revision 1393)
@@ -12,6 +12,6 @@
* @author Ross Harman, MHPCC
*
- * @version $Revision: 1.6 $ $Name: not supported by cvs2svn $
- * @date $Date: 2004-08-04 23:37:39 $
+ * @version $Revision: 1.7 $ $Name: not supported by cvs2svn $
+ * @date $Date: 2004-08-05 19:38:51 $
*
* Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -29,29 +29,4 @@
/// @addtogroup Time
/// @{
-
-/******************************************************************************/
-/* DEFINE STATEMENTS */
-/******************************************************************************/
-
-/** Number of available leapsecond updates */
-#define NUM_LEAPSECOND_UPDATES 23
-
-/** Maximum length of time string */
-#define MAX_TIME_STRING_LENGTH 256
-
-/** Seconds per minute */
-#define SEC_PER_MINUTE 60.0
-
-/** Seconds per hour */
-#define SEC_PER_HOUR (60.0*SEC_PER_MINUTE)
-
-/** Seconds per day */
-#define SEC_PER_DAY (24.0*SEC_PER_HOUR)
-
-/** Seconds per year */
-#define SEC_PER_YEAR (365.0*SEC_PER_DAY)
-
-/** Microseconds per day */
-#define USEC_PER_DAY 86400000000.0
/******************************************************************************/
Index: /trunk/psLib/src/collections/psCompare.c
===================================================================
--- /trunk/psLib/src/collections/psCompare.c (revision 1392)
+++ /trunk/psLib/src/collections/psCompare.c (revision 1393)
@@ -6,6 +6,6 @@
* @author Robert Daniel DeSonia, MHPCC
*
- * @version $Revision: 1.2 $ $Name: not supported by cvs2svn $
- * @date $Date: 2004-06-29 23:19:11 $
+ * @version $Revision: 1.3 $ $Name: not supported by cvs2svn $
+ * @date $Date: 2004-08-05 19:38:52 $
*
* Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -15,65 +15,65 @@
#include "psCompare.h"
-#define compareNumericPtr(TYPE) \
+#define COMPARE_NUMERIC_PTR(TYPE) \
int psCompare##TYPE##Ptr(const void** a, const void** b) { \
return **((ps##TYPE**)a) - **((ps##TYPE**)b); \
}
-#define compareNumericPtrDescending(TYPE) \
+#define COMPARE_NUMERIC_PTR_DESCENDING(TYPE) \
int psCompareDescending##TYPE##Ptr(const void** a, const void** b) { \
return **((ps##TYPE**)b) - **((ps##TYPE**)a); \
}
-#define compareNumeric(TYPE) \
+#define COMPARE_NUMERIC(TYPE) \
int psCompare##TYPE(const void* a, const void* b) { \
return *((ps##TYPE*)a) - *((ps##TYPE*)b); \
}
-#define compareNumericDescending(TYPE) \
+#define COMPARE_NUMERIC_DESCENDING(TYPE) \
int psCompare##TYPE##Descending(const void* a, const void* b) { \
return *((ps##TYPE*)b) - *((ps##TYPE*)a); \
}
-compareNumericPtr(S8)
-compareNumericPtr(S16)
-compareNumericPtr(S32)
-compareNumericPtr(S64)
-compareNumericPtr(U8)
-compareNumericPtr(U16)
-compareNumericPtr(U32)
-compareNumericPtr(U64)
-compareNumericPtr(F32)
-compareNumericPtr(F64)
+COMPARE_NUMERIC_PTR(S8)
+COMPARE_NUMERIC_PTR(S16)
+COMPARE_NUMERIC_PTR(S32)
+COMPARE_NUMERIC_PTR(S64)
+COMPARE_NUMERIC_PTR(U8)
+COMPARE_NUMERIC_PTR(U16)
+COMPARE_NUMERIC_PTR(U32)
+COMPARE_NUMERIC_PTR(U64)
+COMPARE_NUMERIC_PTR(F32)
+COMPARE_NUMERIC_PTR(F64)
-compareNumericPtrDescending(S8)
-compareNumericPtrDescending(S16)
-compareNumericPtrDescending(S32)
-compareNumericPtrDescending(S64)
-compareNumericPtrDescending(U8)
-compareNumericPtrDescending(U16)
-compareNumericPtrDescending(U32)
-compareNumericPtrDescending(U64)
-compareNumericPtrDescending(F32)
-compareNumericPtrDescending(F64)
+COMPARE_NUMERIC_PTR_DESCENDING(S8)
+COMPARE_NUMERIC_PTR_DESCENDING(S16)
+COMPARE_NUMERIC_PTR_DESCENDING(S32)
+COMPARE_NUMERIC_PTR_DESCENDING(S64)
+COMPARE_NUMERIC_PTR_DESCENDING(U8)
+COMPARE_NUMERIC_PTR_DESCENDING(U16)
+COMPARE_NUMERIC_PTR_DESCENDING(U32)
+COMPARE_NUMERIC_PTR_DESCENDING(U64)
+COMPARE_NUMERIC_PTR_DESCENDING(F32)
+COMPARE_NUMERIC_PTR_DESCENDING(F64)
-compareNumeric(S8)
-compareNumeric(S16)
-compareNumeric(S32)
-compareNumeric(S64)
-compareNumeric(U8)
-compareNumeric(U16)
-compareNumeric(U32)
-compareNumeric(U64)
-compareNumeric(F32)
-compareNumeric(F64)
+COMPARE_NUMERIC(S8)
+COMPARE_NUMERIC(S16)
+COMPARE_NUMERIC(S32)
+COMPARE_NUMERIC(S64)
+COMPARE_NUMERIC(U8)
+COMPARE_NUMERIC(U16)
+COMPARE_NUMERIC(U32)
+COMPARE_NUMERIC(U64)
+COMPARE_NUMERIC(F32)
+COMPARE_NUMERIC(F64)
-compareNumericDescending(S8)
-compareNumericDescending(S16)
-compareNumericDescending(S32)
-compareNumericDescending(S64)
-compareNumericDescending(U8)
-compareNumericDescending(U16)
-compareNumericDescending(U32)
-compareNumericDescending(U64)
-compareNumericDescending(F32)
-compareNumericDescending(F64)
+COMPARE_NUMERIC_DESCENDING(S8)
+COMPARE_NUMERIC_DESCENDING(S16)
+COMPARE_NUMERIC_DESCENDING(S32)
+COMPARE_NUMERIC_DESCENDING(S64)
+COMPARE_NUMERIC_DESCENDING(U8)
+COMPARE_NUMERIC_DESCENDING(U16)
+COMPARE_NUMERIC_DESCENDING(U32)
+COMPARE_NUMERIC_DESCENDING(U64)
+COMPARE_NUMERIC_DESCENDING(F32)
+COMPARE_NUMERIC_DESCENDING(F64)
Index: /trunk/psLib/src/collections/psMetadata.c
===================================================================
--- /trunk/psLib/src/collections/psMetadata.c (revision 1392)
+++ /trunk/psLib/src/collections/psMetadata.c (revision 1393)
@@ -11,6 +11,6 @@
* @author Ross Harman, MHPCC
*
-* @version $Revision: 1.9 $ $Name: not supported by cvs2svn $
-* @date $Date: 2004-08-05 02:22:42 $
+* @version $Revision: 1.10 $ $Name: not supported by cvs2svn $
+* @date $Date: 2004-08-05 19:38:51 $
*
* Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -39,5 +39,9 @@
/******************************************************************************/
-// None
+/** Maximum length of string */
+#define MAX_STRING_LENGTH 1024
+
+/** Maximum length of FITS line */
+#define FITS_LINE_SIZE 80
/******************************************************************************/
Index: /trunk/psLib/src/collections/psMetadata.h
===================================================================
--- /trunk/psLib/src/collections/psMetadata.h (revision 1392)
+++ /trunk/psLib/src/collections/psMetadata.h (revision 1393)
@@ -10,6 +10,6 @@
* @author Ross Harman, MHPCC
*
-* @version $Revision: 1.13 $ $Name: not supported by cvs2svn $
-* @date $Date: 2004-08-04 23:54:05 $
+* @version $Revision: 1.14 $ $Name: not supported by cvs2svn $
+* @date $Date: 2004-08-05 19:38:51 $
*
* Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -27,10 +27,4 @@
/// @addtogroup Metadata
/// @{
-
-/** Maximum length of string */
-#define MAX_STRING_LENGTH 1024
-
-/** Maximum length of FITS line */
-#define FITS_LINE_SIZE 80
/** Metadata item type.
Index: /trunk/psLib/src/dataManip/psStats.c
===================================================================
--- /trunk/psLib/src/dataManip/psStats.c (revision 1392)
+++ /trunk/psLib/src/dataManip/psStats.c (revision 1393)
@@ -1,2 +1,18 @@
+/** @file psStats.c
+ * \brief basic statistical operations
+ * @ingroup Stats
+ *
+ * This file will hold the definition of the histogram and stats data
+ * structures. It also contains prototypes for procedures which operate
+ * on those data structures.
+ *
+ * @author George Gusciora, MHPCC
+ *
+ * @version $Revision: 1.50 $ $Name: not supported by cvs2svn $
+ * @date $Date: 2004-08-05 19:38:52 $
+ *
+ * Copyright 2004 Maui High Performance Computing Center, University of Hawaii
+ */
+
#include
#include
Index: /trunk/psLib/src/image/psImageStats.c
===================================================================
--- /trunk/psLib/src/image/psImageStats.c (revision 1392)
+++ /trunk/psLib/src/image/psImageStats.c (revision 1393)
@@ -1,2 +1,18 @@
+/** @file psImageStats.c
+* \brief Routines for calculating statistics on images.
+* @ingroup ImageStats
+*
+* This file will hold the prototypes for procedures which calculate
+* statistic on images, histograms on images, and fit/evaluate Chebyshev
+* polynomials to images.
+*
+* @author George Gusciora, MHPCC
+*
+* @version $Revision: 1.28 $ $Name: not supported by cvs2svn $
+* @date $Date: 2004-08-05 19:38:52 $
+*
+* Copyright 2004 Maui High Performance Computing Center, University of Hawaii
+*/
+
#include
#include
Index: /trunk/psLib/src/imageops/psImageStats.c
===================================================================
--- /trunk/psLib/src/imageops/psImageStats.c (revision 1392)
+++ /trunk/psLib/src/imageops/psImageStats.c (revision 1393)
@@ -1,2 +1,18 @@
+/** @file psImageStats.c
+* \brief Routines for calculating statistics on images.
+* @ingroup ImageStats
+*
+* This file will hold the prototypes for procedures which calculate
+* statistic on images, histograms on images, and fit/evaluate Chebyshev
+* polynomials to images.
+*
+* @author George Gusciora, MHPCC
+*
+* @version $Revision: 1.28 $ $Name: not supported by cvs2svn $
+* @date $Date: 2004-08-05 19:38:52 $
+*
+* Copyright 2004 Maui High Performance Computing Center, University of Hawaii
+*/
+
#include
#include
Index: /trunk/psLib/src/math/psCompare.c
===================================================================
--- /trunk/psLib/src/math/psCompare.c (revision 1392)
+++ /trunk/psLib/src/math/psCompare.c (revision 1393)
@@ -6,6 +6,6 @@
* @author Robert Daniel DeSonia, MHPCC
*
- * @version $Revision: 1.2 $ $Name: not supported by cvs2svn $
- * @date $Date: 2004-06-29 23:19:11 $
+ * @version $Revision: 1.3 $ $Name: not supported by cvs2svn $
+ * @date $Date: 2004-08-05 19:38:52 $
*
* Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -15,65 +15,65 @@
#include "psCompare.h"
-#define compareNumericPtr(TYPE) \
+#define COMPARE_NUMERIC_PTR(TYPE) \
int psCompare##TYPE##Ptr(const void** a, const void** b) { \
return **((ps##TYPE**)a) - **((ps##TYPE**)b); \
}
-#define compareNumericPtrDescending(TYPE) \
+#define COMPARE_NUMERIC_PTR_DESCENDING(TYPE) \
int psCompareDescending##TYPE##Ptr(const void** a, const void** b) { \
return **((ps##TYPE**)b) - **((ps##TYPE**)a); \
}
-#define compareNumeric(TYPE) \
+#define COMPARE_NUMERIC(TYPE) \
int psCompare##TYPE(const void* a, const void* b) { \
return *((ps##TYPE*)a) - *((ps##TYPE*)b); \
}
-#define compareNumericDescending(TYPE) \
+#define COMPARE_NUMERIC_DESCENDING(TYPE) \
int psCompare##TYPE##Descending(const void* a, const void* b) { \
return *((ps##TYPE*)b) - *((ps##TYPE*)a); \
}
-compareNumericPtr(S8)
-compareNumericPtr(S16)
-compareNumericPtr(S32)
-compareNumericPtr(S64)
-compareNumericPtr(U8)
-compareNumericPtr(U16)
-compareNumericPtr(U32)
-compareNumericPtr(U64)
-compareNumericPtr(F32)
-compareNumericPtr(F64)
+COMPARE_NUMERIC_PTR(S8)
+COMPARE_NUMERIC_PTR(S16)
+COMPARE_NUMERIC_PTR(S32)
+COMPARE_NUMERIC_PTR(S64)
+COMPARE_NUMERIC_PTR(U8)
+COMPARE_NUMERIC_PTR(U16)
+COMPARE_NUMERIC_PTR(U32)
+COMPARE_NUMERIC_PTR(U64)
+COMPARE_NUMERIC_PTR(F32)
+COMPARE_NUMERIC_PTR(F64)
-compareNumericPtrDescending(S8)
-compareNumericPtrDescending(S16)
-compareNumericPtrDescending(S32)
-compareNumericPtrDescending(S64)
-compareNumericPtrDescending(U8)
-compareNumericPtrDescending(U16)
-compareNumericPtrDescending(U32)
-compareNumericPtrDescending(U64)
-compareNumericPtrDescending(F32)
-compareNumericPtrDescending(F64)
+COMPARE_NUMERIC_PTR_DESCENDING(S8)
+COMPARE_NUMERIC_PTR_DESCENDING(S16)
+COMPARE_NUMERIC_PTR_DESCENDING(S32)
+COMPARE_NUMERIC_PTR_DESCENDING(S64)
+COMPARE_NUMERIC_PTR_DESCENDING(U8)
+COMPARE_NUMERIC_PTR_DESCENDING(U16)
+COMPARE_NUMERIC_PTR_DESCENDING(U32)
+COMPARE_NUMERIC_PTR_DESCENDING(U64)
+COMPARE_NUMERIC_PTR_DESCENDING(F32)
+COMPARE_NUMERIC_PTR_DESCENDING(F64)
-compareNumeric(S8)
-compareNumeric(S16)
-compareNumeric(S32)
-compareNumeric(S64)
-compareNumeric(U8)
-compareNumeric(U16)
-compareNumeric(U32)
-compareNumeric(U64)
-compareNumeric(F32)
-compareNumeric(F64)
+COMPARE_NUMERIC(S8)
+COMPARE_NUMERIC(S16)
+COMPARE_NUMERIC(S32)
+COMPARE_NUMERIC(S64)
+COMPARE_NUMERIC(U8)
+COMPARE_NUMERIC(U16)
+COMPARE_NUMERIC(U32)
+COMPARE_NUMERIC(U64)
+COMPARE_NUMERIC(F32)
+COMPARE_NUMERIC(F64)
-compareNumericDescending(S8)
-compareNumericDescending(S16)
-compareNumericDescending(S32)
-compareNumericDescending(S64)
-compareNumericDescending(U8)
-compareNumericDescending(U16)
-compareNumericDescending(U32)
-compareNumericDescending(U64)
-compareNumericDescending(F32)
-compareNumericDescending(F64)
+COMPARE_NUMERIC_DESCENDING(S8)
+COMPARE_NUMERIC_DESCENDING(S16)
+COMPARE_NUMERIC_DESCENDING(S32)
+COMPARE_NUMERIC_DESCENDING(S64)
+COMPARE_NUMERIC_DESCENDING(U8)
+COMPARE_NUMERIC_DESCENDING(U16)
+COMPARE_NUMERIC_DESCENDING(U32)
+COMPARE_NUMERIC_DESCENDING(U64)
+COMPARE_NUMERIC_DESCENDING(F32)
+COMPARE_NUMERIC_DESCENDING(F64)
Index: /trunk/psLib/src/math/psStats.c
===================================================================
--- /trunk/psLib/src/math/psStats.c (revision 1392)
+++ /trunk/psLib/src/math/psStats.c (revision 1393)
@@ -1,2 +1,18 @@
+/** @file psStats.c
+ * \brief basic statistical operations
+ * @ingroup Stats
+ *
+ * This file will hold the definition of the histogram and stats data
+ * structures. It also contains prototypes for procedures which operate
+ * on those data structures.
+ *
+ * @author George Gusciora, MHPCC
+ *
+ * @version $Revision: 1.50 $ $Name: not supported by cvs2svn $
+ * @date $Date: 2004-08-05 19:38:52 $
+ *
+ * Copyright 2004 Maui High Performance Computing Center, University of Hawaii
+ */
+
#include
#include
Index: unk/psLib/src/sys/psErrorCodes.h
===================================================================
--- /trunk/psLib/src/sys/psErrorCodes.h (revision 1392)
+++ (revision )
@@ -1,19 +1,0 @@
-#if !defined(PS_ERROR_CODES_H)
-#define PS_ERROR_CODES_H
-/*
- * This file was machine generated from ../../src/Utils/psErrorCodes.dat;
- * please do not modify it
- */
-typedef enum {
- PS_ERR_NONE = 0,
- PS_ERR_BASE = 256,
- PS_ERR_UNKNOWN,
- PS_ERR_IO,
- PS_ERR_BADFREE,
- PS_ERR_MEMORY_CORRUPTION,
- PS_ERR_MEMORY_EXHAUSTED,
- PS_ERR_BAD_INDEX,
- PS_ERR_N_ERR_CLASSES,
-} psErrorCode;
-
-#endif
Index: /trunk/psLib/src/sys/psLogMsg.c
===================================================================
--- /trunk/psLib/src/sys/psLogMsg.c (revision 1392)
+++ /trunk/psLib/src/sys/psLogMsg.c (revision 1393)
@@ -11,6 +11,6 @@
* @author George Gusciora, MHPCC
*
- * @version $Revision: 1.21 $ $Name: not supported by cvs2svn $
- * @date $Date: 2004-08-04 23:37:39 $
+ * @version $Revision: 1.22 $ $Name: not supported by cvs2svn $
+ * @date $Date: 2004-08-05 19:38:52 $
*
* Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -38,5 +38,4 @@
#include "psLogMsg.h"
#include "psError.h"
-#include "psErrorCodes.h"
#include "psTrace.h"
Index: /trunk/psLib/src/sys/psTrace.c
===================================================================
--- /trunk/psLib/src/sys/psTrace.c (revision 1392)
+++ /trunk/psLib/src/sys/psTrace.c (revision 1393)
@@ -9,6 +9,6 @@
* @author George Gusciora, MHPCC
*
- * @version $Revision: 1.12 $ $Name: not supported by cvs2svn $
- * @date $Date: 2004-08-04 23:37:39 $
+ * @version $Revision: 1.13 $ $Name: not supported by cvs2svn $
+ * @date $Date: 2004-08-05 19:38:52 $
*
* Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -92,5 +92,5 @@
{
if (p_psCroot == NULL) {
- p_psCroot = componentAlloc(".", DEFAULT_TRACE_LEVEL);
+ p_psCroot = componentAlloc(".", PS_DEFAULT_TRACE_LEVEL);
}
}
@@ -248,5 +248,5 @@
if (NULL == currentNode) {
- return(UNKNOWN_TRACE_LEVEL);
+ return(PS_UNKNOWN_TRACE_LEVEL);
}
@@ -256,5 +256,5 @@
if (aname[0] != '.') {
- return(UNKNOWN_TRACE_LEVEL);
+ return(PS_UNKNOWN_TRACE_LEVEL);
}
@@ -278,5 +278,5 @@
}
}
- return(UNKNOWN_TRACE_LEVEL);
+ return(PS_UNKNOWN_TRACE_LEVEL);
}
@@ -297,5 +297,5 @@
{
if (p_psCroot == NULL) {
- return(UNKNOWN_TRACE_LEVEL);
+ return(PS_UNKNOWN_TRACE_LEVEL);
}
@@ -324,7 +324,7 @@
if (comp->name[0] == '\0') {
printf("%*s%-*s %d\n", depth, "", 20 - depth,
- "(root)", (comp->level == UNKNOWN_TRACE_LEVEL) ? 0 : comp->level);
+ "(root)", (comp->level == PS_UNKNOWN_TRACE_LEVEL) ? 0 : comp->level);
} else {
- if (comp->level == UNKNOWN_TRACE_LEVEL) {
+ if (comp->level == PS_UNKNOWN_TRACE_LEVEL) {
printf("%*s%-*s %s\n", depth, "", 20 - depth,
comp->name, ".");
Index: /trunk/psLib/src/sys/psTrace.h
===================================================================
--- /trunk/psLib/src/sys/psTrace.h (revision 1392)
+++ /trunk/psLib/src/sys/psTrace.h (revision 1393)
@@ -9,6 +9,6 @@
* @author George Gusciora, MHPCC
*
- * @version $Revision: 1.10 $ $Name: not supported by cvs2svn $
- * @date $Date: 2004-06-30 01:09:12 $
+ * @version $Revision: 1.11 $ $Name: not supported by cvs2svn $
+ * @date $Date: 2004-08-05 19:38:52 $
*
* Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -17,6 +17,6 @@
#define PS_TRACE_H 1
-#define UNKNOWN_TRACE_LEVEL -9999 // we don't know this name's level
-#define DEFAULT_TRACE_LEVEL 0
+#define PS_UNKNOWN_TRACE_LEVEL -9999 // we don't know this name's level
+#define PS_DEFAULT_TRACE_LEVEL 0
Index: unk/psLib/src/sysUtils/psErrorCodes.h
===================================================================
--- /trunk/psLib/src/sysUtils/psErrorCodes.h (revision 1392)
+++ (revision )
@@ -1,19 +1,0 @@
-#if !defined(PS_ERROR_CODES_H)
-#define PS_ERROR_CODES_H
-/*
- * This file was machine generated from ../../src/Utils/psErrorCodes.dat;
- * please do not modify it
- */
-typedef enum {
- PS_ERR_NONE = 0,
- PS_ERR_BASE = 256,
- PS_ERR_UNKNOWN,
- PS_ERR_IO,
- PS_ERR_BADFREE,
- PS_ERR_MEMORY_CORRUPTION,
- PS_ERR_MEMORY_EXHAUSTED,
- PS_ERR_BAD_INDEX,
- PS_ERR_N_ERR_CLASSES,
-} psErrorCode;
-
-#endif
Index: /trunk/psLib/src/sysUtils/psLogMsg.c
===================================================================
--- /trunk/psLib/src/sysUtils/psLogMsg.c (revision 1392)
+++ /trunk/psLib/src/sysUtils/psLogMsg.c (revision 1393)
@@ -11,6 +11,6 @@
* @author George Gusciora, MHPCC
*
- * @version $Revision: 1.21 $ $Name: not supported by cvs2svn $
- * @date $Date: 2004-08-04 23:37:39 $
+ * @version $Revision: 1.22 $ $Name: not supported by cvs2svn $
+ * @date $Date: 2004-08-05 19:38:52 $
*
* Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -38,5 +38,4 @@
#include "psLogMsg.h"
#include "psError.h"
-#include "psErrorCodes.h"
#include "psTrace.h"
Index: /trunk/psLib/src/sysUtils/psTrace.c
===================================================================
--- /trunk/psLib/src/sysUtils/psTrace.c (revision 1392)
+++ /trunk/psLib/src/sysUtils/psTrace.c (revision 1393)
@@ -9,6 +9,6 @@
* @author George Gusciora, MHPCC
*
- * @version $Revision: 1.12 $ $Name: not supported by cvs2svn $
- * @date $Date: 2004-08-04 23:37:39 $
+ * @version $Revision: 1.13 $ $Name: not supported by cvs2svn $
+ * @date $Date: 2004-08-05 19:38:52 $
*
* Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -92,5 +92,5 @@
{
if (p_psCroot == NULL) {
- p_psCroot = componentAlloc(".", DEFAULT_TRACE_LEVEL);
+ p_psCroot = componentAlloc(".", PS_DEFAULT_TRACE_LEVEL);
}
}
@@ -248,5 +248,5 @@
if (NULL == currentNode) {
- return(UNKNOWN_TRACE_LEVEL);
+ return(PS_UNKNOWN_TRACE_LEVEL);
}
@@ -256,5 +256,5 @@
if (aname[0] != '.') {
- return(UNKNOWN_TRACE_LEVEL);
+ return(PS_UNKNOWN_TRACE_LEVEL);
}
@@ -278,5 +278,5 @@
}
}
- return(UNKNOWN_TRACE_LEVEL);
+ return(PS_UNKNOWN_TRACE_LEVEL);
}
@@ -297,5 +297,5 @@
{
if (p_psCroot == NULL) {
- return(UNKNOWN_TRACE_LEVEL);
+ return(PS_UNKNOWN_TRACE_LEVEL);
}
@@ -324,7 +324,7 @@
if (comp->name[0] == '\0') {
printf("%*s%-*s %d\n", depth, "", 20 - depth,
- "(root)", (comp->level == UNKNOWN_TRACE_LEVEL) ? 0 : comp->level);
+ "(root)", (comp->level == PS_UNKNOWN_TRACE_LEVEL) ? 0 : comp->level);
} else {
- if (comp->level == UNKNOWN_TRACE_LEVEL) {
+ if (comp->level == PS_UNKNOWN_TRACE_LEVEL) {
printf("%*s%-*s %s\n", depth, "", 20 - depth,
comp->name, ".");
Index: /trunk/psLib/src/sysUtils/psTrace.h
===================================================================
--- /trunk/psLib/src/sysUtils/psTrace.h (revision 1392)
+++ /trunk/psLib/src/sysUtils/psTrace.h (revision 1393)
@@ -9,6 +9,6 @@
* @author George Gusciora, MHPCC
*
- * @version $Revision: 1.10 $ $Name: not supported by cvs2svn $
- * @date $Date: 2004-06-30 01:09:12 $
+ * @version $Revision: 1.11 $ $Name: not supported by cvs2svn $
+ * @date $Date: 2004-08-05 19:38:52 $
*
* Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -17,6 +17,6 @@
#define PS_TRACE_H 1
-#define UNKNOWN_TRACE_LEVEL -9999 // we don't know this name's level
-#define DEFAULT_TRACE_LEVEL 0
+#define PS_UNKNOWN_TRACE_LEVEL -9999 // we don't know this name's level
+#define PS_DEFAULT_TRACE_LEVEL 0
Index: /trunk/psLib/src/types/psMetadata.c
===================================================================
--- /trunk/psLib/src/types/psMetadata.c (revision 1392)
+++ /trunk/psLib/src/types/psMetadata.c (revision 1393)
@@ -11,6 +11,6 @@
* @author Ross Harman, MHPCC
*
-* @version $Revision: 1.9 $ $Name: not supported by cvs2svn $
-* @date $Date: 2004-08-05 02:22:42 $
+* @version $Revision: 1.10 $ $Name: not supported by cvs2svn $
+* @date $Date: 2004-08-05 19:38:51 $
*
* Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -39,5 +39,9 @@
/******************************************************************************/
-// None
+/** Maximum length of string */
+#define MAX_STRING_LENGTH 1024
+
+/** Maximum length of FITS line */
+#define FITS_LINE_SIZE 80
/******************************************************************************/
Index: /trunk/psLib/src/types/psMetadata.h
===================================================================
--- /trunk/psLib/src/types/psMetadata.h (revision 1392)
+++ /trunk/psLib/src/types/psMetadata.h (revision 1393)
@@ -10,6 +10,6 @@
* @author Ross Harman, MHPCC
*
-* @version $Revision: 1.13 $ $Name: not supported by cvs2svn $
-* @date $Date: 2004-08-04 23:54:05 $
+* @version $Revision: 1.14 $ $Name: not supported by cvs2svn $
+* @date $Date: 2004-08-05 19:38:51 $
*
* Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -27,10 +27,4 @@
/// @addtogroup Metadata
/// @{
-
-/** Maximum length of string */
-#define MAX_STRING_LENGTH 1024
-
-/** Maximum length of FITS line */
-#define FITS_LINE_SIZE 80
/** Metadata item type.