IPP Software Navigation Tools IPP Links Communication Pan-STARRS Links

Changeset 226


Ignore:
Timestamp:
Mar 12, 2004, 3:06:45 PM (22 years ago)
Author:
rhl
Message:

Made files compile again

Location:
trunk/archive/pslib/include
Files:
7 edited

Legend:

Unmodified
Added
Removed
  • trunk/archive/pslib/include/psAstrom.h

    r221 r226  
    8888/** Array of cell descriptions */
    8989typedef struct {
    90     enum psType type;                   //!< Type of data.  THIS STRUCT ELEMENT MUST BE FIRST IN THE STRUCT!
     90    psType type;                        //!< Type of data.  THIS STRUCT ELEMENT MUST BE FIRST IN THE STRUCT!
    9191    int size;                           //!< Total number of elements available
    9292    int n;                              //!< Number of elements in use
     
    116116    double rotation;                    //!< Rotation of OTA on the focal plane.  Specified from +x through +y
    117117    psCellDescriptionArray *restrict cells; //!< Cell descriptions
    118     psOTAAstrom *astrom;                //!< OTA astrometry
     118    struct psOTAAstrom *astrom;         //!< OTA astrometry
    119119    psExposure *exp;                    //!< Exposure data
    120120} psOTADescription;
     
    158158    psDoubleArray *restrict tp;         //!< Data needed to convert from the sky to the tangent plane and back;
    159159                                        //!< produced by and used by SLALib (a.k.a. "Wallace's Grommit")
    160     enum psColorrRef colorRef;          //!< Colour reference
     160    psColourRef colorRef;               //!< Colour reference
    161161    /* Characterisation of the solution */
    162162    float rmsX, rmsY;                   //!< Dispersion in astrometric solution
  • trunk/archive/pslib/include/psFunctions.h

    r224 r226  
    1 \#if !defined(PS_FUNCTIONS_H)
     1#if !defined(PS_FUNCTIONS_H)
    22#define PS_FUNCTIONS_H
    33
  • trunk/archive/pslib/include/psImages.h

    r215 r226  
    3131/*** Image structure manipulation ***/
    3232/// Create an image of the specified size and type.
     33typedef int PS_IMAGE_DEPTH;             // RHL Added this to make the psImage compile XXX
     34
    3335psImage *
    3436psImageAlloc (int nx,                   ///< image width
     
    99101
    100102/// Extract a 2-d contour from an image at the given threshold.
    101 psFloatArrayArray *
     103psFloatArray *
    102104psImageContour (psImage *input,         ///< create contour for this image
    103105                float threshold,        ///< contour image at this threshold
  • trunk/archive/pslib/include/psObjects.h

    r211 r226  
    4646/** An assembly of objects */
    4747typedef struct {
    48     enum psType type;                   //!< Type of data.  THIS STRUCT ELEMENT MUST BE FIRST IN THE STRUCT!
     48    psType type;                        //!< Type of data.  THIS STRUCT ELEMENT MUST BE FIRST IN THE STRUCT!
    4949    int size;                           //!< Total number of elements available
    5050    int n;                              //!< Number of elements in use
    5151    psObject *arr;                      //!< The array data
    52 } psVectorArray;
     52} psObjectArray;
    5353
    5454/** Constructor */
  • trunk/archive/pslib/include/psPosition.h

    r209 r226  
    6868/** An array of detector positions */
    6969typedef struct {
    70     enum psType type;                   //!< Type of data.  THIS STRUCT ELEMENT MUST BE FIRST IN THE STRUCT!
     70    psType type;                        //!< Type of data.  THIS STRUCT ELEMENT MUST BE FIRST IN THE STRUCT!
    7171    int size;                           //!< Total number of elements available
    7272    int n;                              //!< Number of elements in use
     
    112112/** An array of sky positions */
    113113typedef struct {
    114     enum psType type;                   //!< Type of data.  THIS STRUCT ELEMENT MUST BE FIRST IN THE STRUCT!
     114    psType type;                        //!< Type of data.  THIS STRUCT ELEMENT MUST BE FIRST IN THE STRUCT!
    115115    int size;                           //!< Total number of elements available
    116116    int n;                              //!< Number of elements in use
  • trunk/archive/pslib/include/psStats.h

    r215 r226  
    3333/** generic statistics structure */
    3434typedef struct {
    35     double sampleMean                   //<! formal mean of sample
     35    double sampleMean;                  //<! formal mean of sample
    3636    double sampleMeanError;             //<! error on formal mean
    37     double sampleMedian                 //<! formal median of sample
     37    double sampleMedian;                //<! formal median of sample
    3838    double sampleMedianError;           //<! error on formal median
    3939    double sampleStdev;                 //<! standard deviation of sample
    4040    double sampleUQ;                    //<! upper quartile of sample
    4141    double sampleLQ;                    //<! lower quartile of sample
    42     double robustMean                   //<! robust mean of array
     42    double robustMean;                  //<! robust mean of array
    4343    double robustMeanError;             //<! error on robust mean
    4444    int    robustMeanNvalues;           //<! number of measurements used for robust mean
    45     double robustMedian                 //<! robust median of array
     45    double robustMedian;                //<! robust median of array
    4646    double robustMedianError;           //<! error on robust median
    4747    int    robustMedianNvalues;         //<! number of measurements used for robust median
     
    4949    double robustUQ;                    //<! robust upper quartile
    5050    double robustLQ;                    //<! robust lower quartile
    51     double clippedMean                  //<! Nsigma clipped mean
     51    double clippedMean;                 //<! Nsigma clipped mean
    5252    double clippedMeanError;            //<! error on clipped mean
    5353    int    clippedMeanNvalues;          //<! number of data points used for clipped mean
  • trunk/archive/pslib/include/psStdArrays.h

    r218 r226  
    33
    44#include <complex.h>
     5#include <stdint.h>
    56#include "psArray.h"
    67
    78
    89/** Types of the elements of vectors, matrices, etc. */
    9 enum {
     10typedef enum {
    1011    PS_TYPE_CHAR,                       ///< Character
    1112    PS_TYPE_SHORT,                      ///< Short integer
     
    1819    PS_TYPE_FLOAT,                      ///< Floating point
    1920    PS_TYPE_DOUBLE,                     ///< Double-precision floating point
    20     PS_TYPE_COMPLEX                     ///< Complex numbers consisting of floating point
    21     PS_TYPE_OTHER                       ///< Something else that's not supported for arithmetic
     21    PS_TYPE_COMPLEX,                    ///< Complex numbers consisting of floating point
     22    PS_TYPE_OTHER,                      ///< Something else that's not supported for arithmetic
    2223} psElemType;
    2324
    2425/** Dimensions of a data type */
    25 enum {
     26typedef enum {
    2627    PS_DIMEN_SCALAR,                    ///< Scalar
    2728    PS_DIMEN_VECTOR,                    ///< A vector
     
    3334/** The type of a data type */
    3435typedef struct {
    35     enum psElemType type;               ///< The type
    36     enum psDimen dimen;                 ///< The dimensionality
     36    psElemType type;                    ///< The type
     37    psDimen dimen;                      ///< The dimensionality
    3738} psType;
    3839
     
    7273/** An array of real numbers */
    7374typedef struct {
    74     enum psType type;                   ///< Type of data.  THIS STRUCT ELEMENT MUST BE FIRST IN THE STRUCT!
     75    psType type;                        ///< Type of data.  THIS STRUCT ELEMENT MUST BE FIRST IN THE STRUCT!
    7576    int size;                           ///< Total number of elements available
    7677    int n;                              ///< Number of elements in use
     
    102103/** An array of complex numbers */
    103104typedef struct {
    104     enum psType type;                   ///< Type of data.  THIS STRUCT ELEMENT MUST BE FIRST IN THE STRUCT!
     105    psType type;                        ///< Type of data.  THIS STRUCT ELEMENT MUST BE FIRST IN THE STRUCT!
    105106    int size;                           ///< Total number of elements available
    106107    int n;                              ///< Number of elements in use
     
    124125/** An array of integers */
    125126typedef struct {
    126     enum psType type;                   ///< Type of data.  THIS STRUCT ELEMENT MUST BE FIRST IN THE STRUCT!
     127    psType type;                        ///< Type of data.  THIS STRUCT ELEMENT MUST BE FIRST IN THE STRUCT!
    127128    int size;                           ///< Total number of elements available
    128129    int n;                              ///< Number of elements in use
     
    146147/** An array of double-precision real numbers */
    147148typedef struct {
    148     enum psType type;                   ///< Type of data.  THIS STRUCT ELEMENT MUST BE FIRST IN THE STRUCT!
     149    psType type;                        ///< Type of data.  THIS STRUCT ELEMENT MUST BE FIRST IN THE STRUCT!
    149150    int size;                           ///< Total number of elements available
    150151    int n;                              ///< Number of elements in use
     
    168169/** An array of real vectors */
    169170typedef struct {
    170     enum psType type;                   ///< Type of data.  THIS STRUCT ELEMENT MUST BE FIRST IN THE STRUCT!
     171    psType type;                        ///< Type of data.  THIS STRUCT ELEMENT MUST BE FIRST IN THE STRUCT!
    171172    int size;                           ///< Total number of elements available
    172173    int n;                              ///< Number of elements in use
Note: See TracChangeset for help on using the changeset viewer.