Index: trunk/psModules/src/astrom/pmAstrometry.h =================================================================== --- trunk/psModules/src/astrom/pmAstrometry.h (revision 6205) +++ trunk/psModules/src/astrom/pmAstrometry.h (revision 6872) @@ -8,6 +8,6 @@ * @author GLG, MHPCC * -* @version $Revision: 1.6 $ $Name: not supported by cvs2svn $ -* @date $Date: 2006-01-26 21:10:50 $ +* @version $Revision: 1.7 $ $Name: not supported by cvs2svn $ +* @date $Date: 2006-04-17 18:01:04 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii @@ -30,14 +30,13 @@ { const char *extname; // Extension name, if it corresponds to this level - psArray *pixels; // The pixel data, if it corresponds to this level psMetadata *header; // The FITS header, if it corresponds to this level + psArray *images; // The pixel data, if it corresponds to this level + psArray *masks; // The mask data, if it corresponds to this level + psArray *weights; // The weight data, if it corresponds to this level } p_pmHDU; -p_pmHDU *pmHDUAlloc(); -void *pmHDUFree(p_pmHDU *hdu); - /** Focal plane data structure - * + * * A focal plane consists of one or more chips (according to the number of * pieces of contiguous silicon). It contains metadata containers for the @@ -52,5 +51,5 @@ * transformation which will be derived from numerically inverting the forward * transformation. - * + * */ typedef struct @@ -71,5 +70,5 @@ /** Chip data structure - * + * * A chip consists of one or more cells (according to the number of amplifiers * on the device). The chip contains metadata containers for the concepts and @@ -82,5 +81,5 @@ * inverting the forward transformation. A boolean indicates whether the chip is * of interest, allowing it to be excluded from analysis. - * + * */ typedef struct @@ -97,5 +96,6 @@ psArray *cells; ///< The cells (referred to by name) pmFPA *parent; ///< Parent FPA - bool valid; ///< Do we bother about reading and working with this chip? + bool process; ///< Do we bother about reading and working with this chip? + bool exists; ///< Does the chip exist --- has it been read in? p_pmHDU *hdu; ///< FITS data } @@ -126,5 +126,6 @@ psArray *readouts; ///< The readouts (referred to by number) pmChip *parent; ///< Parent chip - bool valid; ///< Do we bother about reading and working with this cell? + bool process; ///< Do we bother about reading and working with this cell? + bool exists; ///< Does the cell exist --- has it been read in? p_pmHDU *hdu; ///< FITS data } @@ -144,4 +145,5 @@ { // Position on the cell + // XXX: These may be removed in the future; use parent->concepts instead? int col0; ///< Offset from the left of chip. int row0; ///< Offset from the bottom of chip. @@ -152,5 +154,4 @@ psImage *mask; ///< Mask of input image psImage *weight; ///< Weight of input image - psList *bias; ///< List of bias section (sub-)images psMetadata *analysis; ///< Readout-level analysis metadata pmCell *parent; ///< Parent cell @@ -183,11 +184,11 @@ */ pmCell *pmCellAlloc( - pmChip *chip, ///< Parent chip - psMetadata *cameradata, - psString name + pmChip *chip, ///< Parent chip + psMetadata *cameraData, ///< Camera data + const char *name ///< Name of cell ); /** Allocates a pmChip - * + * * The constructor shall make an empty pmChip. If the parent fpa is not NULL, * the parent link is made and the chip shall be placed in the parent's array @@ -199,16 +200,15 @@ */ pmChip *pmChipAlloc( - pmFPA *fpa, - psString name - + pmFPA *fpa, ///< FPA to which the chip belongs + const char *name ///< Name of chip ); /** Allocates a pmFPA - * + * * The constructor shall make an empty pmFPA. The chips array shall be * allocated with a zero size, the camera and db pointers set to the values * provided, and the concepts metadata constructed. All other pointers in the * structure shall be initialized to NULL. - * + * */ pmFPA *pmFPAAlloc( @@ -216,12 +216,21 @@ ); +/** Allocates a p_pmHDU + * + * XXX: More detailed description + * + * @return p_pmHDU* newly allocated p_pmHDU + */ +p_pmHDU *p_pmHDUAlloc(const char *extname // Extension name + ); + /** Verify parent links. - * + * * This function checks the validity of the parent links in the FPA hierarchy. * If a parent link is not set (or not set correctly), it is corrected, and the * function shall return false. If all the parent pointers were correct, the * function shall return true. - * + * */ bool pmFPACheckParents( @@ -232,10 +241,38 @@ /** FUNC DESC - * - * - * - * - */ - + * + * + * + * + */ + + + +/** + * + * pmFPASelectChip shall set valid to true for the specified chip number + * (chipNum), and all other chips shall have valid set to false. In the event + * that the specified chip number does not exist within the fpa, the function + * shall return false. + * + */ +bool pmFPASelectChip( + pmFPA *fpa, + int chipNum +); + +/** + * + * pmFPAExcludeChip shall set valid to false only for the specified chip + * number (chipNum). In the event that the specified chip number does not exist + * within the fpa, the function shall generate a warning, and perform no action. + * The function shall return the number of chips within the fpa that have valid + * set to true. + * + */ +int pmFPAExcludeChip( + pmFPA *fpa, + int chipNum +); @@ -426,47 +463,4 @@ ); -/** - * - * pmFPASelectChip shall set valid to true for the specified chip number - * (chipNum), and all other chips shall have valid set to false. In the event - * that the specified chip number does not exist within the fpa, the function - * shall return false. - * - */ -bool pmFPASelectChip( - pmFPA *fpa, - int chipNum -); - - -/** - * - * pmFPAExcludeChip shall set valid to false only for the specified chip - * number (chipNum). In the event that the specified chip number does not exist - * within the fpa, the function shall generate a warning, and perform no action. - * The function shall return the number of chips within the fpa that have valid - * set to true. - * - */ -int pmFPAExcludeChip( - pmFPA *fpa, - int chipNum -); - - -/** - * - * pmFPAConstruct shall construct a focal plane hierarchy from a camera - * configuration. A db handle is also provided so that may be set in the pmFPA. - * The resultant pmFPA and its lower-down components shall be ready for to read a - * FITS file into it by setting the extname pointers at the appropriate levels to - * the appropriate FITS extension name. - * - */ -pmFPA *pmFPAConstruct( - const psMetadata *camera, - psDB *db -); - #endif // #ifndef PS_ASTROMETRY_H