Index: /trunk/ippTools/src/chiptool.c =================================================================== --- /trunk/ippTools/src/chiptool.c (revision 9538) +++ /trunk/ippTools/src/chiptool.c (revision 9539) @@ -113,5 +113,5 @@ if (strcmp(rawFrame->exposure->exp_tag, pendingFrame->exposure->exp_tag) == 0) { - psArrayRemove(rawFrames, rawFrame); + psArrayRemoveData(rawFrames, rawFrame); // dec the counter as the array just got shorter // and we don't want to skip elemnts @@ -132,5 +132,5 @@ if (strcmp(rawFrame->exposure->exp_tag, doneFrame->exposure->exp_tag) == 0) { - psArrayRemove(rawFrames, rawFrame); + psArrayRemoveData(rawFrames, rawFrame); // dec the counter as the array just got shorter // and we don't want to skip elemnts Index: /trunk/ippTools/src/dettool.c =================================================================== --- /trunk/ippTools/src/dettool.c (revision 9538) +++ /trunk/ippTools/src/dettool.c (revision 9539) @@ -387,5 +387,5 @@ return false; } - psMetadataRemove(md, 0, "det_id"); + psMetadataRemoveKey(md, "det_id"); psString det_idStr = psDBIntToString((psU64)det_id); psMetadataAddStr(mds->data[i], PS_LIST_HEAD, "det_id", 0, NULL, det_idStr); Index: /trunk/ippTools/src/pzgetexp.c =================================================================== --- /trunk/ippTools/src/pzgetexp.c (revision 9538) +++ /trunk/ippTools/src/pzgetexp.c (revision 9539) @@ -94,5 +94,5 @@ if (strcmp(newSummitExp->exp_id, summitExp->exp_id) == 0) { - psArrayRemove(newSummitExps, newSummitExp); + psArrayRemoveData(newSummitExps, newSummitExp); // dec the counter as the array just got shorter // and we don't want to skip elemnts Index: /trunk/ippTools/src/pzgetimfiles.c =================================================================== --- /trunk/ippTools/src/pzgetimfiles.c (revision 9538) +++ /trunk/ippTools/src/pzgetimfiles.c (revision 9539) @@ -83,5 +83,5 @@ if (strcmp(newImfile->exp_id, pendingImfile->exp_id) == 0) { - psArrayRemove(newImfiles, newImfile); + psArrayRemoveData(newImfiles, newImfile); // dec the counter as the array just got shorter // and we don't want to skip elemnts Index: /trunk/ippTools/src/pztool.c =================================================================== --- /trunk/ippTools/src/pztool.c (revision 9538) +++ /trunk/ippTools/src/pztool.c (revision 9539) @@ -97,5 +97,5 @@ newExpRow *newExp = new->data[j]; if (strcmp(summitExp->exp_id, newExp->exp_id) == 0) { - psArrayRemove(summit, summitExp); + psArrayRemoveData(summit, summitExp); // dec the counter as the array just got shorter //and we don't want to skip elemnts Index: /trunk/ppFringe/src/ppFringeLoop.c =================================================================== --- /trunk/ppFringe/src/ppFringeLoop.c (revision 9538) +++ /trunk/ppFringe/src/ppFringeLoop.c (revision 9539) @@ -81,5 +81,5 @@ if (contents && contents->list->n > 0) { bool mdok; // Status of MD lookup - psMetadata *header = psMetadataLookupMD(&mdok, contents, extname); // Header + psMetadata *header = psMetadataLookupMetadata(&mdok, contents, extname); // Header if (mdok && header) { regions = pmFringeRegionsReadFits(NULL, data->outFile, extname); @@ -141,5 +141,5 @@ psString checkName = NULL; // Extension name to check psStringAppend(&checkName, "%s:%d", extname, version); - header = psMetadataLookupMD(&mdok, contents, checkName); + header = psMetadataLookupMetadata(&mdok, contents, checkName); psFree(checkName); } while (mdok && header); Index: /trunk/ppFringe/src/ppFringeSetup.c =================================================================== --- /trunk/ppFringe/src/ppFringeSetup.c (revision 9538) +++ /trunk/ppFringe/src/ppFringeSetup.c (revision 9539) @@ -77,5 +77,5 @@ // Now we have a camera format, we can read the recipe bool mdok; // Status of MD lookup - psMetadata *recipe = psMetadataLookupMD(&mdok, config->recipes, RECIPE); // The recipe + psMetadata *recipe = psMetadataLookupMetadata(&mdok, config->recipes, RECIPE); // The recipe if (!recipe) { psError(PS_ERR_IO, true, "Unable to find recipe %s.\n", RECIPE); Index: /trunk/ppImage/src/ppImageLoop.c =================================================================== --- /trunk/ppImage/src/ppImageLoop.c (revision 9538) +++ /trunk/ppImage/src/ppImageLoop.c (revision 9539) @@ -14,5 +14,5 @@ bool mdok; // Status of MD lookup - psMetadata *extraOpts = psMetadataLookupMD(&mdok, config->arguments, "PPIMAGE.OPTIONS"); // Extra options + psMetadata *extraOpts = psMetadataLookupMetadata(&mdok, config->arguments, "PPIMAGE.OPTIONS"); // Extra options const char *statsName = psMetadataLookupStr(&mdok, extraOpts, "STATS"); // Filename for statistics psMetadata *stats = NULL; // Container for statistics Index: /trunk/ppImage/src/ppImageOptions.c =================================================================== --- /trunk/ppImage/src/ppImageOptions.c (revision 9538) +++ /trunk/ppImage/src/ppImageOptions.c (revision 9539) @@ -65,5 +65,5 @@ // select the recipe for this analysis bool mdStatus = false; // Result of MD lookup - psMetadata *recipe = psMetadataLookupMD(&mdStatus, config->recipes, RECIPE_NAME); + psMetadata *recipe = psMetadataLookupMetadata(&mdStatus, config->recipes, RECIPE_NAME); if (! mdStatus || !recipe) { psLogMsg("ppImage", PS_LOG_ERROR, "Can't find recipe %s in the RECIPES.\n", RECIPE_NAME); Index: /trunk/ppImage/src/ppTest.c =================================================================== --- /trunk/ppImage/src/ppTest.c (revision 9538) +++ /trunk/ppImage/src/ppTest.c (revision 9539) @@ -100,4 +100,7 @@ ////////////////////////////////////////////////////////////////////////////////////////////////////////////// + pmFPAPrint(stdout, fpa, false, true); + exit(0); + #if 0 Index: /trunk/ppMerge/src/ppMergeOptions.c =================================================================== --- /trunk/ppMerge/src/ppMergeOptions.c (revision 9538) +++ /trunk/ppMerge/src/ppMergeOptions.c (revision 9539) @@ -115,5 +115,5 @@ // Now we can read the recipe bool mdok = true; // Status of MD lookup - psMetadata *recipe = psMetadataLookupMD(&mdok, config->recipes, PPMERGE_RECIPE); // Recipe information + psMetadata *recipe = psMetadataLookupMetadata(&mdok, config->recipes, PPMERGE_RECIPE); // Recipe information if (!mdok || !recipe) { psError(PS_ERR_IO, true, "Unable to find recipe %s", PPMERGE_RECIPE); Index: /trunk/ppStats/src/ppStatsLoop.c =================================================================== --- /trunk/ppStats/src/ppStatsLoop.c (revision 9538) +++ /trunk/ppStats/src/ppStatsLoop.c (revision 9539) @@ -89,5 +89,5 @@ // Cell-level results bool mdok; // Status of MD lookup - psMetadata *cellResults = psMemIncrRefCounter(psMetadataLookupMD(&mdok, chipResults, cellName)); + psMetadata *cellResults = psMemIncrRefCounter(psMetadataLookupMetadata(&mdok, chipResults, cellName)); if (!mdok || !cellResults) { cellResults = psMetadataAlloc(); @@ -242,5 +242,5 @@ // Chip-level results bool mdok; // Status of MD lookup - psMetadata *chipResults = psMemIncrRefCounter(psMetadataLookupMD(&mdok, fpaResults, chipName)); + psMetadata *chipResults = psMemIncrRefCounter(psMetadataLookupMetadata(&mdok, fpaResults, chipName)); if (!mdok || !chipResults) { chipResults = psMetadataAlloc(); Index: /trunk/ppStats/src/ppStatsSetupFromRecipe.c =================================================================== --- /trunk/ppStats/src/ppStatsSetupFromRecipe.c (revision 9538) +++ /trunk/ppStats/src/ppStatsSetupFromRecipe.c (revision 9539) @@ -69,5 +69,5 @@ // Determine recipe parameters bool mdok; // Status of MD lookup - psMetadata *recipe = psMetadataLookupMD(&mdok, config->recipes, PPSTATS_RECIPE); + psMetadata *recipe = psMetadataLookupMetadata(&mdok, config->recipes, PPSTATS_RECIPE); if (!mdok || !recipe) { psLogMsg(__func__, PS_LOG_WARN, "Unable to find recipe %s.\n", PPSTATS_RECIPE); Index: /trunk/psModules/src/camera/pmFPAConstruct.c =================================================================== --- /trunk/psModules/src/camera/pmFPAConstruct.c (revision 9538) +++ /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 9538) +++ /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 9538) +++ /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 9538) +++ /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 9538) +++ /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 9538) +++ /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 9538) +++ /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 9538) +++ /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 9538) +++ /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 9538) +++ /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"); Index: /trunk/psphot/src/psphotModelTest.c =================================================================== --- /trunk/psphot/src/psphotModelTest.c (revision 9538) +++ /trunk/psphot/src/psphotModelTest.c (revision 9539) @@ -25,5 +25,5 @@ char *fitModeWord = psMetadataLookupStr (&status, recipe, "TEST_FIT_MODE"); if (!status) { - fitModeWord = DEFAULT_MODE; + fitModeWord = DEFAULT_MODE; } fitMode = PM_SOURCE_FIT_EXT; @@ -32,32 +32,32 @@ // in fitMode, psf sets the model type if (fitMode == PM_SOURCE_FIT_PSF) { - char *psfFile = psMetadataLookupStr (&status, recipe, "PSF_INPUT_FILE"); - if (!status) psAbort ("psphotModelTest", "PSF_INPUT_FILE not supplied"); - psMetadata *psfData = psMetadataConfigRead(NULL, &Nfail, psfFile, FALSE); - psf = pmPSFfromMD (psfData); - modelType = psf->type; + char *psfFile = psMetadataLookupStr (&status, recipe, "PSF_INPUT_FILE"); + if (!status) psAbort ("psphotModelTest", "PSF_INPUT_FILE not supplied"); + psMetadata *psfData = psMetadataConfigRead(NULL, &Nfail, psfFile, FALSE); + psf = pmPSFfromMetadata (psfData); + modelType = psf->type; } else { - // find the model: supplied by user or first in the PSF_MODEL list - char *modelName = psMetadataLookupStr (&status, recipe, "TEST_FIT_MODEL"); - if (modelName == NULL) { - // get the list pointers for the PSF_MODEL entries + // find the model: supplied by user or first in the PSF_MODEL list + char *modelName = psMetadataLookupStr (&status, recipe, "TEST_FIT_MODEL"); + if (modelName == NULL) { + // get the list pointers for the PSF_MODEL entries - psList *list = NULL; - psMetadataItem *mdi = psMetadataLookup (recipe, "PSF_MODEL"); - if (mdi == NULL) psAbort ("psphotModelTest", "missing PSF_MODEL selection"); - if (mdi->type == PS_DATA_STRING) { - list = psListAlloc(NULL); - psListAdd (list, PS_LIST_HEAD, mdi); - } else { - if (mdi->type != PS_DATA_METADATA_MULTI) psAbort ("psphotChoosePSF", "missing PSF_MODEL selection"); - list = psMemIncrRefCounter(mdi->data.list); - } + psList *list = NULL; + psMetadataItem *mdi = psMetadataLookup (recipe, "PSF_MODEL"); + if (mdi == NULL) psAbort ("psphotModelTest", "missing PSF_MODEL selection"); + if (mdi->type == PS_DATA_STRING) { + list = psListAlloc(NULL); + psListAdd (list, PS_LIST_HEAD, mdi); + } else { + if (mdi->type != PS_DATA_METADATA_MULTI) psAbort ("psphotChoosePSF", "missing PSF_MODEL selection"); + list = psMemIncrRefCounter(mdi->data.list); + } - // take the first list element - item = psListGet (list, PS_LIST_HEAD); - modelName = item->data.V; - } - modelType = pmModelSetType (modelName); - if (modelType < 0) psAbort ("fitsource", "unknown model %s", modelName); + // take the first list element + item = psListGet (list, PS_LIST_HEAD); + modelName = item->data.V; + } + modelType = pmModelSetType (modelName); + if (modelType < 0) psAbort ("fitsource", "unknown model %s", modelName); } @@ -65,20 +65,20 @@ float INNER = psMetadataLookupF32 (&status, recipe, "TEST_FIT_INNER_RADIUS"); if (!status) { - INNER = psMetadataLookupF32 (&status, recipe, "SKY_INNER_RADIUS"); + INNER = psMetadataLookupF32 (&status, recipe, "SKY_INNER_RADIUS"); } float OUTER = psMetadataLookupF32 (&status, recipe, "TEST_FIT_OUTER_RADIUS"); if (!status) { - OUTER = psMetadataLookupF32 (&status, recipe, "SKY_OUTER_RADIUS"); + OUTER = psMetadataLookupF32 (&status, recipe, "SKY_OUTER_RADIUS"); } float RADIUS = psMetadataLookupF32 (&status, recipe, "TEST_FIT_RADIUS"); if (!status) { - RADIUS = psMetadataLookupF32 (&status, recipe, "PSF_FIT_RADIUS"); + RADIUS = psMetadataLookupF32 (&status, recipe, "PSF_FIT_RADIUS"); } float mRADIUS = psMetadataLookupF32 (&status, recipe, "TEST_MOMENTS_RADIUS"); if (!status) { - mRADIUS = psMetadataLookupF32 (&status, recipe, "PSF_MOMENTS_RADIUS"); + mRADIUS = psMetadataLookupF32 (&status, recipe, "PSF_MOMENTS_RADIUS"); } @@ -117,17 +117,17 @@ psF32 *params = model->params->data.F32; for (int i = 0; i < nParams; i++) { - if (i == 2) { - params[i] = xObj; - continue; - } - if (i == 3) { - params[i] = yObj; - continue; - } - sprintf (name, "TEST_FIT_PAR%d", i); - value = psMetadataLookupF32 (&status, recipe, name); - if (status) { - params[i] = value; - } + if (i == 2) { + params[i] = xObj; + continue; + } + if (i == 3) { + params[i] = yObj; + continue; + } + sprintf (name, "TEST_FIT_PAR%d", i); + value = psMetadataLookupF32 (&status, recipe, name); + if (status) { + params[i] = value; + } } @@ -136,8 +136,8 @@ if (fitMode == PM_SOURCE_FIT_PSF) { - pmModel *modelPSF = pmModelFromPSF (model, psf); - psFree (model); - model = modelPSF; - params = model->params->data.F32; + pmModel *modelPSF = pmModelFromPSF (model, psf); + psFree (model); + model = modelPSF; + params = model->params->data.F32; } @@ -154,5 +154,5 @@ fprintf (stderr, "input parameters: \n"); for (int i = 0; i < nParams; i++) { - fprintf (stderr, "%d : %f\n", i, params[i]); + fprintf (stderr, "%d : %f\n", i, params[i]); } @@ -162,6 +162,6 @@ char *fitset = psMetadataLookupStr (&status, recipe, "TEST_FIT_SET"); if (status) { - status = psphotFitSet (source, model, fitset, fitMode); - exit (0); + status = psphotFitSet (source, model, fitset, fitMode); + exit (0); } @@ -178,11 +178,11 @@ // subtract object, leave local sky pmModelSub (source->pixels, source->mask, model, false, false); - + fprintf (stderr, "output parameters: \n"); for (int i = 0; i < nParams; i++) { - fprintf (stderr, "%d : %f\n", i, params[i]); + fprintf (stderr, "%d : %f\n", i, params[i]); } - // write out + // write out psphotSaveImage (NULL, source->pixels, "resid.fits"); psphotSaveImage (NULL, source->mask, "mask.fits");