Index: trunk/psLib/src/astronomy/psAstrometry.h =================================================================== --- trunk/psLib/src/astronomy/psAstrometry.h (revision 1406) +++ trunk/psLib/src/astronomy/psAstrometry.h (revision 1407) @@ -1,2 +1,3 @@ + /** @file psAstrometry.h * @@ -8,21 +9,21 @@ * @author George Gusciora, MHPCC * -* @version $Revision: 1.5 $ $Name: not supported by cvs2svn $ -* @date $Date: 2004-08-06 22:34:05 $ +* @version $Revision: 1.6 $ $Name: not supported by cvs2svn $ +* @date $Date: 2004-08-07 00:06:06 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii */ -# ifndef PS_ASTROMETRY_H -# define PS_ASTROMETRY_H - -#include "psType.h" -#include "psImage.h" -#include "psArray.h" -#include "psList.h" -#include "psFunctions.h" -#include "psMetadata.h" -#include "psCoord.h" -#include "psPhotometry.h" +#ifndef PS_ASTROMETRY_H +# define PS_ASTROMETRY_H + +# include "psType.h" +# include "psImage.h" +# include "psArray.h" +# include "psList.h" +# include "psFunctions.h" +# include "psMetadata.h" +# include "psCoord.h" +# include "psPhotometry.h" struct psCell; @@ -44,18 +45,18 @@ typedef struct { - const double latitude; ///< geodetic latitude (radians) - const double sinLat; ///< sine of geodetic latitude - const double cosLat; ///< cosine of geodetic latitude - const double abberationMag; ///< magnitude of diurnal aberration vector - const double height; ///< height (HM) - const double temperature; ///< ambient temperature (TDK) - const double pressure; ///< pressure (PMB) - const double humidity; ///< relative humidity (RH) - const double wavelength; ///< wavelength (WL) - const double lapseRate; ///< lapse rate (TLR) - const double refractA; ///< refraction constant A (radians) - const double refractB; ///< refraction constant B (radians) - const double longitudeOffset; ///< longitude + ... (radians) - const double siderealTime; ///< local apparent sidereal time (radians) + const double latitude; // /< geodetic latitude (radians) + const double sinLat; // /< sine of geodetic latitude + const double cosLat; // /< cosine of geodetic latitude + const double abberationMag; // /< magnitude of diurnal aberration vector + const double height; // /< height (HM) + const double temperature; // /< ambient temperature (TDK) + const double pressure; // /< pressure (PMB) + const double humidity; // /< relative humidity (RH) + const double wavelength; // /< wavelength (WL) + const double lapseRate; // /< lapse rate (TLR) + const double refractA; // /< refraction constant A (radians) + const double refractB; // /< refraction constant B (radians) + const double longitudeOffset; // /< longitude + ... (radians) + const double siderealTime; // /< local apparent sidereal time (radians) } psGrommit; @@ -72,12 +73,12 @@ typedef struct { - int nX; ///< Number of elements in x direction - int nY; ///< Number of elements in y direction - double x0; ///< X Position of 0,0 corner on focal plane - double y0; ///< Y Position of 0,0 corner on focal plane - double xScale; ///< Scale of the grid in x direction - double yScale; ///< Scale of the grid in x direction - double **x; ///< The grid of offsets in x - double **y; ///< The grid of offsets in y + int nX; // /< Number of elements in x direction + int nY; // /< Number of elements in y direction + double x0; // /< X Position of 0,0 corner on focal plane + double y0; // /< Y Position of 0,0 corner on focal plane + double xScale; // /< Scale of the grid in x direction + double yScale; // /< Scale of the grid in x direction + double **x; // /< The grid of offsets in x + double **y; // /< The grid of offsets in y } psFixedPattern; @@ -94,12 +95,12 @@ typedef struct { - const unsigned int colBins; ///< Amount of binning in x-dimension - const unsigned int rowBins; ///< Amount of binning in y-dimension - const int col0; ///< Offset from the left of chip. - const int row0; ///< Offset from the bottom of chip. - - psImage* image; ///< imaging area of Readout - psList* objects; ///< objects derived from Readout - psMetadata* metadata; ///< readout-level metadata + const unsigned int colBins; // /< Amount of binning in x-dimension + const unsigned int rowBins; // /< Amount of binning in y-dimension + const int col0; // /< Offset from the left of chip. + const int row0; // /< Offset from the bottom of chip. + + psImage *image; // /< imaging area of Readout + psList *objects; // /< objects derived from Readout + psMetadata *metadata; // /< readout-level metadata } psReadout; @@ -116,13 +117,13 @@ typedef struct psCell { - psArray* readouts; ///< readouts from the cell - psMetadata* metadata; ///< cell-level metadata - - psPlaneTransform* toChip; ///< transformations from cell to chip coordinates - psPlaneTransform* fromChip; ///< transformations from chip to cell coordinates - psPlaneTransform* toFPA; ///< transformations from cell to FPA coordinates - psPlaneTransform* toSky; ///< transformations from cell to sky coordinates - - struct psChip* parent; ///< chip in which contains this cell + psArray *readouts; // /< readouts from the cell + psMetadata *metadata; // /< cell-level metadata + + psPlaneTransform *toChip; // /< transformations from cell to chip coordinates + psPlaneTransform *fromChip; // /< transformations from chip to cell coordinates + psPlaneTransform *toFPA; // /< transformations from cell to FPA coordinates + psPlaneTransform *toSky; // /< transformations from cell to sky coordinates + + struct psChip *parent; // /< chip in which contains this cell } psCell; @@ -138,11 +139,11 @@ typedef struct psChip { - psArray* cells; ///< cells in the chip - psMetadata* metadata; ///< chip-level metadata - - psPlaneTransform* toFPA; ///< transformation from chip to FPA coordinates - psPlaneTransform* fromFPA; ///< transformation from FPA to chip coordinates - - struct psFPA* parent; ///< FPA which contains this chip + psArray *cells; // /< cells in the chip + psMetadata *metadata; // /< chip-level metadata + + psPlaneTransform *toFPA; // /< transformation from chip to FPA coordinates + psPlaneTransform *fromFPA; // /< transformation from FPA to chip coordinates + + struct psFPA *parent; // /< FPA which contains this chip } psChip; @@ -163,19 +164,19 @@ typedef struct psFPA { - psArray* chips; ///< chips in the focal plane array - psMetadata* metadata; ///< focal-plane's metadata - - psPlaneDistort* fromTangentPlane; ///< transformation from tangent plane to focal plane - psPlaneDistort* toTangentPlane; ///< transformation from focal plane to tangent plane - psFixedPattern* pattern; ///< fixed pattern residual offsets - - const struct psExposure* exposure; ///< information about this exposure - - psPhotSystem* colorPlus; ///< Color reference - psPhotSystem* colorMinus; ///< Color reference - - float rmsX; ///< RMS for x transformation fits - float rmsY; ///< RMS for y transformation fits - float chi2; ///< chi^2 of astrometric solution + psArray *chips; // /< chips in the focal plane array + psMetadata *metadata; // /< focal-plane's metadata + + psPlaneDistort *fromTangentPlane; // /< transformation from tangent plane to focal plane + psPlaneDistort *toTangentPlane; // /< transformation from focal plane to tangent plane + psFixedPattern *pattern; // /< fixed pattern residual offsets + + const struct psExposure *exposure; // /< information about this exposure + + psPhotSystem *colorPlus; // /< Color reference + psPhotSystem *colorMinus; // /< Color reference + + float rmsX; // /< RMS for x transformation fits + float rmsY; // /< RMS for y transformation fits + float chi2; // /< chi^2 of astrometric solution } psFPA; @@ -190,41 +191,40 @@ typedef struct psExposure { - const double ra; ///< Telescope boresight, right ascention - const double dec; ///< Telescope boresight, declination - const double hourAngle; ///< Hour angle - const double zenith; ///< Zenith distance - const double azimuth; ///< Azimuth - const double localTime; ///< Local Sidereal Time - const float date; ///< Modified Jullian Date of observation - const float rotAngle; ///< Rotator position angle - const float temperature; ///< Air temperature, for estimating refraction - const float pressure; ///< Air pressure, for calculating refraction - const float humidity; ///< Relative humidity, for refraction - const float exposureTime; ///< Exposure time + const double ra; // /< Telescope boresight, right ascention + const double dec; // /< Telescope boresight, declination + const double hourAngle; // /< Hour angle + const double zenith; // /< Zenith distance + const double azimuth; // /< Azimuth + const double localTime; // /< Local Sidereal Time + const float date; // /< Modified Jullian Date of observation + const float rotAngle; // /< Rotator position angle + const float temperature; // /< Air temperature, for estimating refraction + const float pressure; // /< Air pressure, for calculating refraction + const float humidity; // /< Relative humidity, for refraction + const float exposureTime; // /< Exposure time /* Derived quantities */ - const float positionAngle; ///< Position angle - const float parallacticAngle; ///< Parallactic angle - const float airmass; ///< Airmass, calculated from zenith distance - const float parallacticFactor; ///< Parallactic factor - const char *cameraName; ///< name of camera which provided exposure - const char *telescopeName; ///< name of telescope which provided exposure + const float positionAngle; // /< Position angle + const float parallacticAngle; // /< Parallactic angle + const float airmass; // /< Airmass, calculated from zenith distance + const float parallacticFactor; // /< Parallactic factor + const char *cameraName; // /< name of camera which provided exposure + const char *telescopeName; // /< name of telescope which provided exposure } psExposure; -psExposure* psExposureAlloc( - double ra, ///< Telescope boresight, right ascention - double dec, ///< Telescope boresight, declination - double hourAngle, ///< Hour angle - double zenith, ///< Zenith distance - double azimuth, ///< Azimuth - double localTime, ///< Local Sidereal Time - float date, ///< MJD - float rotAngle, ///< Rotator position angle - float temperature, ///< Temperature - float pressure, ///< Pressure - float humidity, ///< Relative humidity - float exposureTime ///< Exposure time -); +psExposure *psExposureAlloc(double ra, // /< Telescope boresight, right ascention + double dec, // /< Telescope boresight, declination + double hourAngle, // /< Hour angle + double zenith, // /< Zenith distance + double azimuth, // /< Azimuth + double localTime, // /< Local Sidereal Time + float date, // /< MJD + float rotAngle, // /< Rotator position angle + float temperature, // /< Temperature + float pressure, // /< Pressure + float humidity, // /< Relative humidity + float exposureTime // /< Exposure time + ); /** Allocates a Wallace's Grommit structure. @@ -235,103 +235,38 @@ * @return psGrommit* New grommit structure. */ -psGrommit* psGrommitAlloc( - const psExposure* exp ///< the cooresponding exposure structure. -); - -psCell *psCellinFPA( - psCell *out, - const psPlane *coord, - const psFPA *FPA -); - -psChip *psChipinFPA( - psChip *out, - const psPlane *coord, - const psFPA *FPA -); - -psCell *psCellinChip( - psCell *out, - const psPlane *coord, - const psChip *chip -); - -psPlane *psCoordCelltoChip( - psPlane *out, - const psPlane *in, - const psCell *cell -); - -psPlane *psCoordChipToFPA( - psPlane *out, - const psPlane *in, - const psChip *chip -); - -psPlane *psCoordFPAtoTP( - psPlane *out, - const psPlane *in, - const psFPA *fpa -); - -psSphere *psCoordTPtoSky( - psSphere *out, - const psPlane *in, - const psGrommit *grommit -); - -psPlane *psCoordCellToFPA( - psPlane *out, - const psPlane *in, - const psCell *cell -); - -psSphere *psCoordCelltoSky( - psSphere *out, - const psPlane *in, - const psCell *cell -); - -psSphere *psCoordCelltoSkyQuick( - psSphere *out, - const psPlane *in, - const psCell *cell -); - -psPlane *psCoordSkytoTP( - psPlane *out, - const psSphere *in, - const psGrommit *grommit -); - -psPlane *psCoordTPtoFPA( - psPlane *out, - const psPlane *in, - const psFPA *fpa -); - -psPlane *psCoordFPAtoChip( - psPlane *out, - const psPlane *in, - const psChip *chip -); - -psPlane *psCoordChiptoCell( - psPlane *out, - const psPlane *in, - const psCell *cell -); - -psPlane *psCoordSkytoCell( - psPlane *out, - const psSphere *in, - const psCell *cell -); - -psPlane *psCoordSkytoCellQuick( - psPlane *out, - const psSphere *in, - const psCell *cell -); +psGrommit *psGrommitAlloc(const psExposure * exp // /< the cooresponding exposure structure. + ); + +psCell *psCellinFPA(psCell * out, const psPlane * coord, const psFPA * FPA); + +psChip *psChipinFPA(psChip * out, const psPlane * coord, const psFPA * FPA); + +psCell *psCellinChip(psCell * out, const psPlane * coord, const psChip * chip); + +psPlane *psCoordCelltoChip(psPlane * out, const psPlane * in, const psCell * cell); + +psPlane *psCoordChipToFPA(psPlane * out, const psPlane * in, const psChip * chip); + +psPlane *psCoordFPAtoTP(psPlane * out, const psPlane * in, const psFPA * fpa); + +psSphere *psCoordTPtoSky(psSphere * out, const psPlane * in, const psGrommit * grommit); + +psPlane *psCoordCellToFPA(psPlane * out, const psPlane * in, const psCell * cell); + +psSphere *psCoordCelltoSky(psSphere * out, const psPlane * in, const psCell * cell); + +psSphere *psCoordCelltoSkyQuick(psSphere * out, const psPlane * in, const psCell * cell); + +psPlane *psCoordSkytoTP(psPlane * out, const psSphere * in, const psGrommit * grommit); + +psPlane *psCoordTPtoFPA(psPlane * out, const psPlane * in, const psFPA * fpa); + +psPlane *psCoordFPAtoChip(psPlane * out, const psPlane * in, const psChip * chip); + +psPlane *psCoordChiptoCell(psPlane * out, const psPlane * in, const psCell * cell); + +psPlane *psCoordSkytoCell(psPlane * out, const psSphere * in, const psCell * cell); + +psPlane *psCoordSkytoCellQuick(psPlane * out, const psSphere * in, const psCell * cell); #endif