Index: /trunk/archive/pslib/include/psAstrom.h =================================================================== --- /trunk/archive/pslib/include/psAstrom.h (revision 398) +++ /trunk/archive/pslib/include/psAstrom.h (revision 399) @@ -79,5 +79,5 @@ struct psChip *chips; ///< Chips in the Focal Plane Array - psMetaDataSet *md; ///< FPA-level metadata + psMetadata *md; ///< FPA-level metadata psDistortion *TPtoFP; ///< Transformation term from psDistortion *FPtoTP; ///< Transformation term from @@ -96,5 +96,5 @@ struct psCell *cells; ///< Cells in the Chip - psMetaDataSet *md; ///< Chip-level metadata + psMetadata *md; ///< Chip-level metadata psCoordXform *chipToFPA; ///< Transformations from chip coordinates to FPA coordinates psCoordXform *FPAtoChip; ///< Transformations from FPA coordinates to chip @@ -109,5 +109,5 @@ ///< own image, objects and overscan. struct psReadout *readouts; ///< Readouts from the cell - psMetaDataSet *md; ///< Cell-level metadata + psMetadata *md; ///< Cell-level metadata psCoordXform *cellToChip; ///< Transformations from cell coordinates to chip coordinates @@ -125,5 +125,5 @@ psDlist *objects; ///< objects derived from cell psImage *overscan; ///< bias region (subimage) of cell - psMetaDataSet *md; ///< Readout-level metadata + psMetadata *md; ///< Readout-level metadata } psReadout; Index: unk/archive/pslib/include/psMetaData.h =================================================================== --- /trunk/archive/pslib/include/psMetaData.h (revision 398) +++ (revision ) @@ -1,112 +1,0 @@ -#if !defined(PS_META_DATA_H) -#define PS_META_DATA_H 1 - -/** \file psMetaData.h - * \brief Metadata handling structures and functions - * \ingroup AstroGroup - */ - -/** Possible types of metadata. */ -typedef enum { ///< type of val is: - PS_META_ITEM_SET = 0, ///< NULL; metadata is in psMetaDataType.items - PS_META_FLOAT, ///< float (.f) - PS_META_INT, ///< int (.i) - PS_META_STR, ///< string (.v) - PS_META_IMG, ///< image (.v) - PS_META_JPEG, ///< JPEG (.v) - PS_META_PNG, ///< PNG (.v) - PS_META_ASTROM, ///< astrometric coefficients (.v) - PS_META_UNKNOWN, ///< other (.v) - PS_META_NTYPE ///< Number of types; must be last -} psMetaDataType; - -/** Metadata flags (not exclusive with psMetaDataType). */ -typedef enum { - PS_META_TYPE_MASK = 0xffff, ///< the type enum must fit in this mask - PS_META_UNIQUE = 0x10000, ///< the name must be unique (default) - PS_META_NON_UNIQUE = 0x20000, ///< the name may be repeated, and should be disambiguated for us -} psMetaDataFlags; - -/** A struct to define a single item of metadata */ -typedef struct { - const int id; ///< unique ID for this item - char *restrict name; ///< Name of item - psMetaDataType type; ///< type of this item - psMetaDataFlags flags; ///< flags associated with this item - const union { - double d; ///< double value - float f; ///< floating value - int i; ///< integer value - void *v; ///< other type - } val; ///< value of metadata - char *comment; ///< optional comment ("", not NULL) - psDlist *restrict items; ///< list of psMetaDataItems with the same name -} psMetaDataItem; - -/** A set of metadata */ -typedef struct { - psDlist *restrict list; ///< list of psMetaDataItem - psHash *restrict table; ///< hash table of the same metadata -} psMetaDataSet; - -/** Metadata is actually a "set of metadata" */ -typedef psMetaDataSet psMetadata; - -/** Functions **************************************************************/ -/** \addtogroup AstroGroup Astronomy-Specific Utilities - * \{ - */ - -/** Constructor */ -psMetaDataItem *psMetaDataItemAlloc(int typeFlags, ///< type of this piece of metadata + flags - const void *val, ///< value of new item N.b. a pointer even if the item - ///< is of type e.g. int - const char *comment, ///< comment associated with item - const char *name, ///< name of new item of metadata (may be in sprintf - ///< format) - ... ///< possible arguments for name format - ); - -/** Destructor */ -void psMetaDataItemFree(psMetaDataItem *ms ///< piece of metadata to destroy - ); -/** Constructor */ -psMetaDataSet *psMetaDataSetAlloc(void); ///< make a new set of metadata - -/** Destructor */ -void psMetaDataSetFree(psMetaDataSet *ms ///< destroy a set of metadata - ); - -/**** Utilities **********************************************************************/ - -/// Add entry to the end of the metadata set -psMetaDataItem *psMetaDataAppend(psMetaDataSet *restrict ms, ///< Metadata set to add to - psMetaDataItem *restrict item ///< Metatdata to add - ); - -/// delete entry from the metadata set -psMetaDataItem *psMetaDataRemove(psMetaDataSet *restrict ms, ///< Metadata set to delete from - const char *restrict key ///< Key to delete - ); - -/// reset the iterator to the start of the list -void psMetaDataSetIterator(psMetaDataSet *ms ///< Metadata set to set iterator for - ); - -/// get the next entry in the sequence -psMetaDataItem *psMetaDataGetNext(psMetaDataSet *restrict ms, ///< Metadata set to get from - const char *restrict match ///< Match this - ); - -/// find the metadata with the specified key -psMetaDataItem *psMetaDataLookup(const psMetaDataSet *restrict ms, ///< Metadata set to look up - const char *restrict key ///< Key to find - ); - -/// print metadata item to the specified stream -void psMetaDataItemPrint(FILE *fd, ///< file descriptor to write to - const psMetaDataItem *restrict ms, ///< item of metadata to print - const char *prefix ///< print this at the beginning of each line - ); -/* \} */ // End of AstroGroup Functions -#endif Index: /trunk/archive/pslib/include/psMetadata.h =================================================================== --- /trunk/archive/pslib/include/psMetadata.h (revision 399) +++ /trunk/archive/pslib/include/psMetadata.h (revision 399) @@ -0,0 +1,112 @@ +#if !defined(PS_META_DATA_H) +#define PS_META_DATA_H 1 + +/** \file psMetadata.h + * \brief Metadata handling structures and functions + * \ingroup AstroGroup + */ + +/** Possible types of metadata. */ +typedef enum { ///< type of val is: + PS_META_ITEM_SET = 0, ///< NULL; metadata is in psMetadataType.items + PS_META_FLOAT, ///< float (.f) + PS_META_INT, ///< int (.i) + PS_META_STR, ///< string (.v) + PS_META_IMG, ///< image (.v) + PS_META_JPEG, ///< JPEG (.v) + PS_META_PNG, ///< PNG (.v) + PS_META_ASTROM, ///< astrometric coefficients (.v) + PS_META_UNKNOWN, ///< other (.v) + PS_META_NTYPE ///< Number of types; must be last +} psMetadataType; + +/** Metadata flags (not exclusive with psMetadataType). */ +typedef enum { + PS_META_TYPE_MASK = 0xffff, ///< the type enum must fit in this mask + PS_META_UNIQUE = 0x10000, ///< the name must be unique (default) + PS_META_NON_UNIQUE = 0x20000, ///< the name may be repeated, and should be disambiguated for us +} psMetadataFlags; + +/** A struct to define a single item of metadata */ +typedef struct { + const int id; ///< unique ID for this item + char *restrict name; ///< Name of item + psMetadataType type; ///< type of this item + psMetadataFlags flags; ///< flags associated with this item + const union { + double d; ///< double value + float f; ///< floating value + int i; ///< integer value + void *v; ///< other type + } val; ///< value of metadata + char *comment; ///< optional comment ("", not NULL) + psDlist *restrict items; ///< list of psMetadataItems with the same name +} psMetadataItem; + +/** A set of metadata */ +typedef struct { + psDlist *restrict list; ///< list of psMetadataItem + psHash *restrict table; ///< hash table of the same metadata +} psMetadata; + +/** Metadata is actually a "set of metadata" */ +typedef psMetadata psMetadata; + +/** Functions **************************************************************/ +/** \addtogroup AstroGroup Astronomy-Specific Utilities + * \{ + */ + +/** Constructor */ +psMetadataItem *psMetadataItemAlloc(int typeFlags, ///< type of this piece of metadata + flags + const void *val, ///< value of new item N.b. a pointer even if the item + ///< is of type e.g. int + const char *comment, ///< comment associated with item + const char *name, ///< name of new item of metadata (may be in sprintf + ///< format) + ... ///< possible arguments for name format + ); + +/** Destructor */ +void psMetadataItemFree(psMetadataItem *ms ///< piece of metadata to destroy + ); +/** Constructor */ +psMetadata *psMetadataAlloc(void); ///< make a new set of metadata + +/** Destructor */ +void psMetadataFree(psMetadata *ms ///< destroy a set of metadata + ); + +/**** Utilities **********************************************************************/ + +/// Add entry to the end of the metadata set +psMetadataItem *psMetadataAppend(psMetadata *restrict ms, ///< Metadata set to add to + psMetadataItem *restrict item ///< Metatdata to add + ); + +/// delete entry from the metadata set +psMetadataItem *psMetadataRemove(psMetadata *restrict ms, ///< Metadata set to delete from + const char *restrict key ///< Key to delete + ); + +/// reset the iterator to the start of the list +void psMetadataIterator(psMetadata *ms ///< Metadata set to set iterator for + ); + +/// get the next entry in the sequence +psMetadataItem *psMetadataGetNext(psMetadata *restrict ms, ///< Metadata set to get from + const char *restrict match ///< Match this + ); + +/// find the metadata with the specified key +psMetadataItem *psMetadataLookup(const psMetadata *restrict ms, ///< Metadata set to look up + const char *restrict key ///< Key to find + ); + +/// print metadata item to the specified stream +void psMetadataItemPrint(FILE *fd, ///< file descriptor to write to + const psMetadataItem *restrict ms, ///< item of metadata to print + const char *prefix ///< print this at the beginning of each line + ); +/* \} */ // End of AstroGroup Functions +#endif