Index: trunk/psModules/src/camera/pmFPAConstruct.c =================================================================== --- trunk/psModules/src/camera/pmFPAConstruct.c (revision 9531) +++ trunk/psModules/src/camera/pmFPAConstruct.c (revision 9539) @@ -28,5 +28,5 @@ bool status = true; // Result of MD lookup - psMetadata *cells = psMetadataLookupMD(&status, format, "CELLS"); // The CELLS + psMetadata *cells = psMetadataLookupMetadata(&status, format, "CELLS"); // The CELLS if (!status || !cells) { psError(PS_ERR_IO, true, "Unable to determine CELLS of camera.\n"); @@ -34,5 +34,5 @@ } - psMetadata *cellData = psMetadataLookupMD(&status, cells, cellName); // The data for the particular cell + psMetadata *cellData = psMetadataLookupMetadata(&status, cells, cellName); // The data for the particular cell if (!status || !cellData) { psLogMsg(__func__, PS_LOG_WARN, "Unable to find specs for cell %s: ignored\n", cellName); @@ -389,5 +389,5 @@ bool mdok = true; // Status of MD lookup - psMetadata *file = psMetadataLookupMD(&mdok, format, "FILE"); // File information + psMetadata *file = psMetadataLookupMetadata(&mdok, format, "FILE"); // File information if (!mdok || !file) { psError(PS_ERR_IO, true, "Unable to find FILE information in camera format configuration.\n"); @@ -427,5 +427,5 @@ bool mdok = true; // Status from MD lookups - psMetadata *components = psMetadataLookupMD(&mdok, camera, "FPA"); // FPA components + psMetadata *components = psMetadataLookupMetadata(&mdok, camera, "FPA"); // FPA components if (!mdok || !components) { psError(PS_ERR_IO, true, "Failed to lookup \"FPA\""); @@ -475,5 +475,5 @@ bool mdok = true; // Status from metadata lookups - psMetadata *fileInfo = psMetadataLookupMD(&mdok, format, "FILE"); // The file information + psMetadata *fileInfo = psMetadataLookupMetadata(&mdok, format, "FILE"); // The file information if (!mdok || !fileInfo) { psError(PS_ERR_IO, false, "Unable to find FILE in the camera format configuration.\n"); @@ -553,5 +553,5 @@ // In cases 2 and 3, the CONTENTS is of type METADATA, and is either a menu (if EXTENSIONS=NONE), or a // list of extensions otherwise. - psMetadata *contents = psMetadataLookupMD(&mdok, format, "CONTENTS"); // The contents of the FITS file + psMetadata *contents = psMetadataLookupMetadata(&mdok, format, "CONTENTS"); // The contents of the FITS file if (!mdok || !contents) { if (mdok && !contents) { @@ -775,5 +775,5 @@ bool mdok = true; // Status from metadata lookups - psMetadata *fileInfo = psMetadataLookupMD(&mdok, format, "FILE"); // The file information + psMetadata *fileInfo = psMetadataLookupMetadata(&mdok, format, "FILE"); // The file information if (!mdok || !fileInfo) { psError(PS_ERR_IO, false, "Unable to find FILE in the camera format configuration.\n"); Index: trunk/psModules/src/camera/pmFPAfileDefine.c =================================================================== --- trunk/psModules/src/camera/pmFPAfileDefine.c (revision 9531) +++ trunk/psModules/src/camera/pmFPAfileDefine.c (revision 9539) @@ -256,5 +256,5 @@ // select the format list from the selected camera - psMetadata *formats = psMetadataLookupMD(&status, file->camera, "FORMATS"); // List of formats + psMetadata *formats = psMetadataLookupMetadata(&status, file->camera, "FORMATS"); // List of formats // select the desired format Index: trunk/psModules/src/camera/pmHDUGenerate.c =================================================================== --- trunk/psModules/src/camera/pmHDUGenerate.c (revision 9531) +++ trunk/psModules/src/camera/pmHDUGenerate.c (revision 9539) @@ -389,5 +389,5 @@ } bool mdok = true; // Status of MD lookup - psMetadata *file = psMetadataLookupMD(&mdok, hdu->format, "FILE"); // File information for camera format + psMetadata *file = psMetadataLookupMetadata(&mdok, hdu->format, "FILE"); // File information for camera format if (!mdok || !file) { psError(PS_ERR_UNEXPECTED_NULL, true, "Can't file FILE information for camera format " Index: trunk/psModules/src/concepts/pmConceptsRead.c =================================================================== --- trunk/psModules/src/concepts/pmConceptsRead.c (revision 9531) +++ trunk/psModules/src/concepts/pmConceptsRead.c (revision 9539) @@ -191,5 +191,5 @@ psMetadata *cameraFormat = hdu->format; // The camera format bool mdok = true; // Status of MD lookup - psMetadata *defaults = psMetadataLookupMD(&mdok, cameraFormat, "DEFAULTS"); // The DEFAULTS spec + psMetadata *defaults = psMetadataLookupMetadata(&mdok, cameraFormat, "DEFAULTS"); // The DEFAULTS spec if (!mdok || !defaults) { psError(PS_ERR_IO, true, "Failed to find \"DEFAULTS\""); @@ -279,5 +279,5 @@ psMetadata *cameraFormat = hduLow->format; // The camera format bool mdok = true; // Status of MD lookup - psMetadata *transSpec = psMetadataLookupMD(&mdok, cameraFormat, "TRANSLATION"); // The TRANSLATION spec + psMetadata *transSpec = psMetadataLookupMetadata(&mdok, cameraFormat, "TRANSLATION"); // The TRANSLATION spec if (!mdok || !transSpec) { psError(PS_ERR_IO, true, "Failed to find \"TRANSLATION\""); @@ -381,5 +381,5 @@ psMetadata *cameraFormat = hdu->format; // The camera format bool mdok = true; // Status of MD lookup - psMetadata *dbSpec = psMetadataLookupMD(&mdok, cameraFormat, "DATABASE"); // The DATABASE spec + psMetadata *dbSpec = psMetadataLookupMetadata(&mdok, cameraFormat, "DATABASE"); // The DATABASE spec if (!mdok || !dbSpec) { psError(PS_ERR_IO, true, "Unable to find DATABASE in camera configuration.\n"); @@ -394,5 +394,5 @@ psString name = specItem->name; // The concept name - psMetadata *dbLookup = psMetadataLookupMD(&mdok, dbSpec, name); + psMetadata *dbLookup = psMetadataLookupMetadata(&mdok, dbSpec, name); if (mdok && dbLookup) { const char *tableName = psMetadataLookupStr(&mdok, dbLookup, "TABLE"); // Table name Index: trunk/psModules/src/concepts/pmConceptsStandard.c =================================================================== --- trunk/psModules/src/concepts/pmConceptsStandard.c (revision 9531) +++ trunk/psModules/src/concepts/pmConceptsStandard.c (revision 9539) @@ -91,5 +91,5 @@ // How to interpret the coordinates bool mdok = true; // Status of MD lookup - psMetadata *formats = psMetadataLookupMD(&mdok, cameraFormat, "FORMATS"); + psMetadata *formats = psMetadataLookupMetadata(&mdok, cameraFormat, "FORMATS"); if (mdok && formats) { psString format = psMetadataLookupStr(&mdok, formats, pattern->name); @@ -128,5 +128,5 @@ // How to interpret the coordinates bool mdok = true; // Status of MD lookup - psMetadata *formats = psMetadataLookupMD(&mdok, + psMetadata *formats = psMetadataLookupMetadata(&mdok, cameraFormat, "FORMATS"); @@ -350,5 +350,5 @@ // Get format - psMetadata *formats = psMetadataLookupMD(&mdok, cameraFormat, "FORMATS"); + psMetadata *formats = psMetadataLookupMetadata(&mdok, cameraFormat, "FORMATS"); if (!mdok || !formats) { psError(PS_ERR_UNKNOWN, true, "Unable to find FORMATS in camera configuration.\n"); @@ -528,5 +528,5 @@ { bool mdok = false; // Result of MD lookup - psMetadata *formats = psMetadataLookupMD(&mdok, cameraFormat, "FORMATS"); + psMetadata *formats = psMetadataLookupMetadata(&mdok, cameraFormat, "FORMATS"); if (mdok && formats) { psString format = psMetadataLookupStr(&mdok, formats, name); @@ -622,5 +622,5 @@ assert(concept); - psMetadata *translation = psMetadataLookupMD(NULL, cameraFormat, "TRANSLATION"); + psMetadata *translation = psMetadataLookupMetadata(NULL, cameraFormat, "TRANSLATION"); bool xBinOK = true, yBinOK = true; // Status of MD lookups psString xKeyword = psMetadataLookupStr(&xBinOK, translation, "CELL.XBIN"); @@ -649,5 +649,5 @@ assert(concept); - psMetadata *translation = psMetadataLookupMD(NULL, cameraFormat, "TRANSLATION"); + psMetadata *translation = psMetadataLookupMetadata(NULL, cameraFormat, "TRANSLATION"); bool xBinOK = true, yBinOK = true; // Status of MD lookups psString xKeyword = psMetadataLookupStr(&xBinOK, translation, "CELL.XBIN"); @@ -710,5 +710,5 @@ bool mdok = true; // Status of MD lookup - psMetadata *formats = psMetadataLookupMD(&mdok, cameraFormat, "FORMATS"); // The formats + psMetadata *formats = psMetadataLookupMetadata(&mdok, cameraFormat, "FORMATS"); // The formats if (mdok && formats) { psString format = psMetadataLookupStr(&mdok, formats, concept->name); // The formats for eg, CELL.TIME Index: trunk/psModules/src/concepts/pmConceptsWrite.c =================================================================== --- trunk/psModules/src/concepts/pmConceptsWrite.c (revision 9531) +++ trunk/psModules/src/concepts/pmConceptsWrite.c (revision 9539) @@ -307,5 +307,5 @@ psMetadata *cameraFormat = hdu->format; // The camera format bool mdok = true; // Status of MD lookup - psMetadata *defaults = psMetadataLookupMD(&mdok, cameraFormat, "DEFAULTS"); // The DEFAULTS spec + psMetadata *defaults = psMetadataLookupMetadata(&mdok, cameraFormat, "DEFAULTS"); // The DEFAULTS spec if (!mdok || !defaults) { return false; @@ -373,5 +373,5 @@ psMetadata *cameraFormat = hdu->format; // The camera format bool mdok = true; // Status of MD lookup - psMetadata *translation = psMetadataLookupMD(&mdok, cameraFormat, "TRANSLATION"); // The TRANSLATION spec + psMetadata *translation = psMetadataLookupMetadata(&mdok, cameraFormat, "TRANSLATION"); // The TRANSLATION spec if (!mdok || !translation) { return false; @@ -430,5 +430,5 @@ psMetadata *cameraFormat = hdu->format; // The camera format bool mdok = true; // Status of MD lookup - psMetadata *database = psMetadataLookupMD(&mdok, cameraFormat, "DATABASE"); // The DATABASE spec + psMetadata *database = psMetadataLookupMetadata(&mdok, cameraFormat, "DATABASE"); // The DATABASE spec if (!mdok || !database) { return false; Index: trunk/psModules/src/config/pmConfig.c =================================================================== --- trunk/psModules/src/config/pmConfig.c (revision 9531) +++ trunk/psModules/src/config/pmConfig.c (revision 9539) @@ -3,6 +3,6 @@ * @author PAP, IfA * - * @version $Revision: 1.46 $ $Name: not supported by cvs2svn $ - * @date $Date: 2006-10-10 01:03:13 $ + * @version $Revision: 1.47 $ $Name: not supported by cvs2svn $ + * @date $Date: 2006-10-13 21:15:45 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii @@ -277,5 +277,5 @@ // filename bool mdok = true; // Status of MD lookup - psMetadata *cameras = psMetadataLookupMD(&mdok, config->site, "CAMERAS"); + psMetadata *cameras = psMetadataLookupMetadata(&mdok, config->site, "CAMERAS"); if (mdok && cameras) { char *newFile = psMetadataLookupStr(NULL, cameras, cameraFile); // The filename @@ -377,5 +377,5 @@ // XXX: This is not spec'ed in the SDRS. // - psMetadata *trace = psMetadataLookupMD(&mdok, config->site, "TRACE"); + psMetadata *trace = psMetadataLookupMetadata(&mdok, config->site, "TRACE"); if (mdok && trace) { psMetadataIterator *traceIter = psMetadataIteratorAlloc(trace, PS_LIST_HEAD, NULL); // Iterator @@ -446,5 +446,5 @@ // Read the rule for that camera format bool mdStatus = true; - psMetadata *rule = psMetadataLookupMD(&mdStatus, cameraFormat, "RULE"); + psMetadata *rule = psMetadataLookupMetadata(&mdStatus, cameraFormat, "RULE"); if (! mdStatus || ! rule) { psLogMsg(__func__, PS_LOG_WARN, "Unable to read rule for camera.\n"); @@ -493,5 +493,5 @@ // Read the list of formats bool mdok = true; // Status of MD lookup - psMetadata *formats = psMetadataLookupMD(&mdok, camera, "FORMATS"); // List of formats + psMetadata *formats = psMetadataLookupMetadata(&mdok, camera, "FORMATS"); // List of formats if (!mdok || !formats) { psLogMsg(__func__, PS_LOG_WARN, "Unable to find list of FORMATS in camera %s --- ignored\n", @@ -550,5 +550,5 @@ // If we don't know what sort of camera we have, we try all that we know if (! config->camera) { - psMetadata *cameras = psMetadataLookupMD(&mdok, config->site, "CAMERAS"); + psMetadata *cameras = psMetadataLookupMetadata(&mdok, config->site, "CAMERAS"); if (! mdok) { psError(PS_ERR_IO, true, "Unable to find CAMERAS in the configuration."); @@ -615,5 +615,5 @@ PS_ASSERT_PTR_NON_NULL(config, NULL); - psMetadata *cameras = psMetadataLookupMD(NULL, config->site, "CAMERAS"); + psMetadata *cameras = psMetadataLookupMetadata(NULL, config->site, "CAMERAS"); if (!cameras) { psError(PS_ERR_IO, true, "Unable to find CAMERAS in the configuration."); @@ -659,5 +659,5 @@ bool mdok = true; // Status of MD lookup - psMetadata *recipes = psMetadataLookupMD(&mdok, source, "RECIPES"); // The list of recipes + psMetadata *recipes = psMetadataLookupMetadata(&mdok, source, "RECIPES"); // The list of recipes if (!mdok || !recipes) { psLogMsg(__func__, PS_LOG_WARN, "RECIPES in the %s is not of type METADATA --- ignored\n", @@ -720,5 +720,5 @@ if (sourceItem->data.S32 == P_PM_RECIPE_SOURCE_SYMBOLIC) { const char *linkName = sourceItem->comment; // The name of the link - psMetadata *linkSource = psMetadataLookupMD(&mdok, config->recipes, linkName); // The source + psMetadata *linkSource = psMetadataLookupMetadata(&mdok, config->recipes, linkName); // The source if (!mdok || !linkSource) { // Can't yet resolve it @@ -794,5 +794,5 @@ // Is the source a symbolic reference? - psMetadata *extant = psMetadataLookupMD(&mdok, config->recipes, recipeSource); // Does it exist? + psMetadata *extant = psMetadataLookupMetadata(&mdok, config->recipes, recipeSource); // Does it exist? if (mdok && extant) { psString comment = psStringCopy("Recipe added from command line as symbolic link to "); @@ -889,5 +889,5 @@ bool mdok = true; // Status of MD lookup - psMetadata *rules = psMetadataLookupMD(&mdok, format, "RULE"); // How to identify this format + psMetadata *rules = psMetadataLookupMetadata(&mdok, format, "RULE"); // How to identify this format if (!mdok || !rules) { psError(PS_ERR_IO, true, "Unable to find RULE in camera format.\n"); Index: trunk/psModules/src/objects/pmPSF_IO.c =================================================================== --- trunk/psModules/src/objects/pmPSF_IO.c (revision 9531) +++ trunk/psModules/src/objects/pmPSF_IO.c (revision 9539) @@ -6,6 +6,6 @@ * @author EAM, IfA * - * @version $Revision: 1.5 $ $Name: not supported by cvs2svn $ - * @date $Date: 2006-09-15 09:49:01 $ + * @version $Revision: 1.6 $ $Name: not supported by cvs2svn $ + * @date $Date: 2006-10-13 21:15:45 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii @@ -37,5 +37,5 @@ #include "pmSourceIO.h" -psMetadata *pmPSFtoMD (psMetadata *metadata, pmPSF *psf) +psMetadata *pmPSFtoMetadata (psMetadata *metadata, pmPSF *psf) { @@ -54,7 +54,7 @@ for (int i = 0; i < nPar - 4; i++) { psPolynomial2D *poly = psf->params->data[i]; - psPolynomial2DtoMD (metadata, poly, "PSF_PAR%02d", i); - } - psPolynomial4DtoMD (metadata, psf->ApTrend, "APTREND"); + psPolynomial2DtoMetadata (metadata, poly, "PSF_PAR%02d", i); + } + psPolynomial4DtoMetadata (metadata, psf->ApTrend, "APTREND"); psMetadataAdd (metadata, PS_LIST_TAIL, "PSF_AP_RESID", PS_DATA_F32, "aperture residual", psf->ApResid); @@ -68,5 +68,5 @@ } -pmPSF *pmPSFfromMD (psMetadata *metadata) +pmPSF *pmPSFfromMetadata (psMetadata *metadata) { @@ -90,5 +90,5 @@ sprintf (keyword, "PSF_PAR%02d", i); psMetadata *folder = psMetadataLookupPtr (&status, metadata, keyword); - psPolynomial2D *poly = psPolynomial2DfromMD (folder); + psPolynomial2D *poly = psPolynomial2DfromMetadata (folder); psFree (psf->params->data[i]); psf->params->data[i] = poly; @@ -96,5 +96,5 @@ sprintf (keyword, "APTREND"); psMetadata *folder = psMetadataLookupPtr (&status, metadata, keyword); - psPolynomial4D *poly = psPolynomial4DfromMD (folder); + psPolynomial4D *poly = psPolynomial4DfromMetadata (folder); psFree (psf->ApTrend); psf->ApTrend = poly; @@ -197,5 +197,5 @@ case PM_FPA_FILE_PSF: filename = pmFPAfileNameFromRule (file->filerule, file, view); - psMetadata *psfData = pmPSFtoMD (NULL, psf); + psMetadata *psfData = pmPSFtoMetadata (NULL, psf); psMetadataConfigWrite (psfData, filename); psFree (psfData); @@ -299,5 +299,5 @@ psMetadata *psfData = psMetadataConfigRead(NULL, &Nfail, filename, FALSE); - pmPSF *psf = pmPSFfromMD (psfData); + pmPSF *psf = pmPSFfromMetadata (psfData); psMetadataAdd (readout->analysis, PS_LIST_TAIL, "PSPHOT.PSF", PS_DATA_UNKNOWN, "psphot psf", psf); Index: trunk/psModules/src/objects/pmPSF_IO.h =================================================================== --- trunk/psModules/src/objects/pmPSF_IO.h (revision 9531) +++ trunk/psModules/src/objects/pmPSF_IO.h (revision 9539) @@ -6,6 +6,6 @@ * @author EAM, IfA * - * @version $Revision: 1.2 $ $Name: not supported by cvs2svn $ - * @date $Date: 2006-04-17 18:01:05 $ + * @version $Revision: 1.3 $ $Name: not supported by cvs2svn $ + * @date $Date: 2006-10-13 21:15:45 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii @@ -16,6 +16,6 @@ # define PM_PSF_IO_H -psMetadata *pmPSFtoMD (psMetadata *metadata, pmPSF *psf); -pmPSF *pmPSFfromMD (psMetadata *metadata); +psMetadata *pmPSFtoMetadata (psMetadata *metadata, pmPSF *psf); +pmPSF *pmPSFfromMetadata (psMetadata *metadata); bool pmFPAviewWritePSFmodel (const pmFPAview *view, pmFPAfile *file); bool pmFPAWritePSFmodel (pmFPA *fpa, const pmFPAview *view, pmFPAfile *file); Index: trunk/psModules/test/config/tst_pmConfig.c =================================================================== --- trunk/psModules/test/config/tst_pmConfig.c (revision 9531) +++ trunk/psModules/test/config/tst_pmConfig.c (revision 9539) @@ -15,6 +15,6 @@ * XXXX: Must determine what to do with NULL arguments, then test it. * - * @version $Revision: 1.7 $ $Name: not supported by cvs2svn $ - * @date $Date: 2006-02-10 01:41:37 $ + * @version $Revision: 1.8 $ $Name: not supported by cvs2svn $ + * @date $Date: 2006-10-13 21:15:45 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii @@ -210,5 +210,5 @@ // Test the database camera metadata keywords. // - psMetadata *tmpMeta = psMetadataLookupMD(&rc, site, "CAMERAS"); + psMetadata *tmpMeta = psMetadataLookupMetadata(&rc, site, "CAMERAS"); if (rc == false) { printf("TEST ERROR: failed to properly set metadata metadata CAMERAS.\n");