IPP Software Navigation Tools IPP Links Communication Pan-STARRS Links

Changeset 9539 for trunk/psModules


Ignore:
Timestamp:
Oct 13, 2006, 11:22:09 AM (20 years ago)
Author:
Paul Price
Message:

Fixing psLib APIs following clean-up.

Location:
trunk/psModules
Files:
10 edited

Legend:

Unmodified
Added
Removed

  • trunk/psModules/src/camera/pmFPAConstruct.c

    r9514 r9539  
    2828
    2929    bool status = true;                 // Result of MD lookup
    30     psMetadata *cells = psMetadataLookupMD(&status, format, "CELLS"); // The CELLS
     30    psMetadata *cells = psMetadataLookupMetadata(&status, format, "CELLS"); // The CELLS
    3131    if (!status || !cells) {
    3232        psError(PS_ERR_IO, true, "Unable to determine CELLS of camera.\n");
    … …  
    3434    }
    3535
    36     psMetadata *cellData = psMetadataLookupMD(&status, cells, cellName); // The data for the particular cell
     36    psMetadata *cellData = psMetadataLookupMetadata(&status, cells, cellName); // The data for the particular cell
    3737    if (!status || !cellData) {
    3838        psLogMsg(__func__, PS_LOG_WARN, "Unable to find specs for cell %s: ignored\n", cellName);
    … …  
    389389
    390390    bool mdok = true;                   // Status of MD lookup
    391     psMetadata *file = psMetadataLookupMD(&mdok, format, "FILE"); // File information
     391    psMetadata *file = psMetadataLookupMetadata(&mdok, format, "FILE"); // File information
    392392    if (!mdok || !file) {
    393393        psError(PS_ERR_IO, true, "Unable to find FILE information in camera format configuration.\n");
    … …  
    427427
    428428    bool mdok = true;                   // Status from MD lookups
    429     psMetadata *components = psMetadataLookupMD(&mdok, camera, "FPA"); // FPA components
     429    psMetadata *components = psMetadataLookupMetadata(&mdok, camera, "FPA"); // FPA components
    430430    if (!mdok || !components) {
    431431        psError(PS_ERR_IO, true, "Failed to lookup \"FPA\"");
    … …  
    475475
    476476    bool mdok = true;                   // Status from metadata lookups
    477     psMetadata *fileInfo = psMetadataLookupMD(&mdok, format, "FILE"); // The file information
     477    psMetadata *fileInfo = psMetadataLookupMetadata(&mdok, format, "FILE"); // The file information
    478478    if (!mdok || !fileInfo) {
    479479        psError(PS_ERR_IO, false, "Unable to find FILE in the camera format configuration.\n");
    … …  
    553553    // In cases 2 and 3, the CONTENTS is of type METADATA, and is either a menu (if EXTENSIONS=NONE), or a
    554554    // list of extensions otherwise.
    555     psMetadata *contents = psMetadataLookupMD(&mdok, format, "CONTENTS"); // The contents of the FITS file
     555    psMetadata *contents = psMetadataLookupMetadata(&mdok, format, "CONTENTS"); // The contents of the FITS file
    556556    if (!mdok || !contents) {
    557557        if (mdok && !contents) {
    … …  
    775775
    776776    bool mdok = true;                   // Status from metadata lookups
    777     psMetadata *fileInfo = psMetadataLookupMD(&mdok, format, "FILE"); // The file information
     777    psMetadata *fileInfo = psMetadataLookupMetadata(&mdok, format, "FILE"); // The file information
    778778    if (!mdok || !fileInfo) {
    779779        psError(PS_ERR_IO, false, "Unable to find FILE in the camera format configuration.\n");

  • trunk/psModules/src/camera/pmFPAfileDefine.c

    r9518 r9539  
    256256
    257257        // select the format list from the selected camera
    258         psMetadata *formats = psMetadataLookupMD(&status, file->camera, "FORMATS"); // List of formats
     258        psMetadata *formats = psMetadataLookupMetadata(&status, file->camera, "FORMATS"); // List of formats
    259259
    260260        // select the desired format

  • trunk/psModules/src/camera/pmHDUGenerate.c

    r8848 r9539  
    389389    }
    390390    bool mdok = true;                   // Status of MD lookup
    391     psMetadata *file = psMetadataLookupMD(&mdok, hdu->format, "FILE"); // File information for camera format
     391    psMetadata *file = psMetadataLookupMetadata(&mdok, hdu->format, "FILE"); // File information for camera format
    392392    if (!mdok || !file) {
    393393        psError(PS_ERR_UNEXPECTED_NULL, true, "Can't file FILE information for camera format "

  • trunk/psModules/src/concepts/pmConceptsRead.c

    r8848 r9539  
    191191    psMetadata *cameraFormat = hdu->format; // The camera format
    192192    bool mdok = true;                   // Status of MD lookup
    193     psMetadata *defaults = psMetadataLookupMD(&mdok, cameraFormat, "DEFAULTS"); // The DEFAULTS spec
     193    psMetadata *defaults = psMetadataLookupMetadata(&mdok, cameraFormat, "DEFAULTS"); // The DEFAULTS spec
    194194    if (!mdok || !defaults) {
    195195        psError(PS_ERR_IO, true, "Failed to find \"DEFAULTS\"");
    … …  
    279279    psMetadata *cameraFormat = hduLow->format; // The camera format
    280280    bool mdok = true;                   // Status of MD lookup
    281     psMetadata *transSpec = psMetadataLookupMD(&mdok, cameraFormat, "TRANSLATION"); // The TRANSLATION spec
     281    psMetadata *transSpec = psMetadataLookupMetadata(&mdok, cameraFormat, "TRANSLATION"); // The TRANSLATION spec
    282282    if (!mdok || !transSpec) {
    283283        psError(PS_ERR_IO, true, "Failed to find \"TRANSLATION\"");
    … …  
    381381    psMetadata *cameraFormat = hdu->format; // The camera format
    382382    bool mdok = true;                   // Status of MD lookup
    383     psMetadata *dbSpec = psMetadataLookupMD(&mdok, cameraFormat, "DATABASE"); // The DATABASE spec
     383    psMetadata *dbSpec = psMetadataLookupMetadata(&mdok, cameraFormat, "DATABASE"); // The DATABASE spec
    384384    if (!mdok || !dbSpec) {
    385385        psError(PS_ERR_IO, true, "Unable to find DATABASE in camera configuration.\n");
    … …  
    394394        psString name = specItem->name; // The concept name
    395395
    396         psMetadata *dbLookup = psMetadataLookupMD(&mdok, dbSpec, name);
     396        psMetadata *dbLookup = psMetadataLookupMetadata(&mdok, dbSpec, name);
    397397        if (mdok && dbLookup) {
    398398            const char *tableName = psMetadataLookupStr(&mdok, dbLookup, "TABLE"); // Table name

  • trunk/psModules/src/concepts/pmConceptsStandard.c

    r9510 r9539  
    9191    // How to interpret the coordinates
    9292    bool mdok = true;           // Status of MD lookup
    93     psMetadata *formats = psMetadataLookupMD(&mdok, cameraFormat, "FORMATS");
     93    psMetadata *formats = psMetadataLookupMetadata(&mdok, cameraFormat, "FORMATS");
    9494    if (mdok && formats) {
    9595        psString format = psMetadataLookupStr(&mdok, formats, pattern->name);
    … …  
    128128    // How to interpret the coordinates
    129129    bool mdok = true;                   // Status of MD lookup
    130     psMetadata *formats = psMetadataLookupMD(&mdok,
     130    psMetadata *formats = psMetadataLookupMetadata(&mdok,
    131131                          cameraFormat,
    132132                          "FORMATS");
    … …  
    350350
    351351    // Get format
    352     psMetadata *formats = psMetadataLookupMD(&mdok, cameraFormat, "FORMATS");
     352    psMetadata *formats = psMetadataLookupMetadata(&mdok, cameraFormat, "FORMATS");
    353353    if (!mdok || !formats) {
    354354        psError(PS_ERR_UNKNOWN, true, "Unable to find FORMATS in camera configuration.\n");
    … …  
    528528{
    529529    bool mdok = false;                  // Result of MD lookup
    530     psMetadata *formats = psMetadataLookupMD(&mdok, cameraFormat, "FORMATS");
     530    psMetadata *formats = psMetadataLookupMetadata(&mdok, cameraFormat, "FORMATS");
    531531    if (mdok && formats) {
    532532        psString format = psMetadataLookupStr(&mdok, formats, name);
    … …  
    622622    assert(concept);
    623623
    624     psMetadata *translation = psMetadataLookupMD(NULL, cameraFormat, "TRANSLATION");
     624    psMetadata *translation = psMetadataLookupMetadata(NULL, cameraFormat, "TRANSLATION");
    625625    bool xBinOK = true, yBinOK = true;  // Status of MD lookups
    626626    psString xKeyword = psMetadataLookupStr(&xBinOK, translation, "CELL.XBIN");
    … …  
    649649    assert(concept);
    650650
    651     psMetadata *translation = psMetadataLookupMD(NULL, cameraFormat, "TRANSLATION");
     651    psMetadata *translation = psMetadataLookupMetadata(NULL, cameraFormat, "TRANSLATION");
    652652    bool xBinOK = true, yBinOK = true;  // Status of MD lookups
    653653    psString xKeyword = psMetadataLookupStr(&xBinOK, translation, "CELL.XBIN");
    … …  
    710710
    711711    bool mdok = true;                   // Status of MD lookup
    712     psMetadata *formats = psMetadataLookupMD(&mdok, cameraFormat, "FORMATS"); // The formats
     712    psMetadata *formats = psMetadataLookupMetadata(&mdok, cameraFormat, "FORMATS"); // The formats
    713713    if (mdok && formats) {
    714714        psString format = psMetadataLookupStr(&mdok, formats, concept->name); // The formats for eg, CELL.TIME

  • trunk/psModules/src/concepts/pmConceptsWrite.c

    r8848 r9539  
    307307    psMetadata *cameraFormat = hdu->format; // The camera format
    308308    bool mdok = true;                   // Status of MD lookup
    309     psMetadata *defaults = psMetadataLookupMD(&mdok, cameraFormat, "DEFAULTS"); // The DEFAULTS spec
     309    psMetadata *defaults = psMetadataLookupMetadata(&mdok, cameraFormat, "DEFAULTS"); // The DEFAULTS spec
    310310    if (!mdok || !defaults) {
    311311        return false;
    … …  
    373373    psMetadata *cameraFormat = hdu->format; // The camera format
    374374    bool mdok = true;                   // Status of MD lookup
    375     psMetadata *translation = psMetadataLookupMD(&mdok, cameraFormat, "TRANSLATION"); // The TRANSLATION spec
     375    psMetadata *translation = psMetadataLookupMetadata(&mdok, cameraFormat, "TRANSLATION"); // The TRANSLATION spec
    376376    if (!mdok || !translation) {
    377377        return false;
    … …  
    430430    psMetadata *cameraFormat = hdu->format; // The camera format
    431431    bool mdok = true;                   // Status of MD lookup
    432     psMetadata *database = psMetadataLookupMD(&mdok, cameraFormat, "DATABASE"); // The DATABASE spec
     432    psMetadata *database = psMetadataLookupMetadata(&mdok, cameraFormat, "DATABASE"); // The DATABASE spec
    433433    if (!mdok || !database) {
    434434        return false;

  • trunk/psModules/src/config/pmConfig.c

    r9435 r9539  
    33 *  @author PAP, IfA
    44 *
    5  *  @version $Revision: 1.46 $ $Name: not supported by cvs2svn $
    6  *  @date $Date: 2006-10-10 01:03:13 $
     5 *  @version $Revision: 1.47 $ $Name: not supported by cvs2svn $
     6 *  @date $Date: 2006-10-13 21:15:45 $
    77 *
    88 *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
    … …  
    277277            // filename
    278278            bool mdok = true;           // Status of MD lookup
    279             psMetadata *cameras = psMetadataLookupMD(&mdok, config->site, "CAMERAS");
     279            psMetadata *cameras = psMetadataLookupMetadata(&mdok, config->site, "CAMERAS");
    280280            if (mdok && cameras) {
    281281                char *newFile = psMetadataLookupStr(NULL, cameras, cameraFile); // The filename
    … …  
    377377    // XXX: This is not spec'ed in the SDRS.
    378378    //
    379     psMetadata *trace = psMetadataLookupMD(&mdok, config->site, "TRACE");
     379    psMetadata *trace = psMetadataLookupMetadata(&mdok, config->site, "TRACE");
    380380    if (mdok && trace) {
    381381        psMetadataIterator *traceIter = psMetadataIteratorAlloc(trace, PS_LIST_HEAD, NULL); // Iterator
    … …  
    446446    // Read the rule for that camera format
    447447    bool mdStatus = true;
    448     psMetadata *rule = psMetadataLookupMD(&mdStatus, cameraFormat, "RULE");
     448    psMetadata *rule = psMetadataLookupMetadata(&mdStatus, cameraFormat, "RULE");
    449449    if (! mdStatus || ! rule) {
    450450        psLogMsg(__func__, PS_LOG_WARN, "Unable to read rule for camera.\n");
    … …  
    493493    // Read the list of formats
    494494    bool mdok = true;                   // Status of MD lookup
    495     psMetadata *formats = psMetadataLookupMD(&mdok, camera, "FORMATS"); // List of formats
     495    psMetadata *formats = psMetadataLookupMetadata(&mdok, camera, "FORMATS"); // List of formats
    496496    if (!mdok || !formats) {
    497497        psLogMsg(__func__, PS_LOG_WARN, "Unable to find list of FORMATS in camera %s --- ignored\n",
    … …  
    550550    // If we don't know what sort of camera we have, we try all that we know
    551551    if (! config->camera) {
    552         psMetadata *cameras = psMetadataLookupMD(&mdok, config->site, "CAMERAS");
     552        psMetadata *cameras = psMetadataLookupMetadata(&mdok, config->site, "CAMERAS");
    553553        if (! mdok) {
    554554            psError(PS_ERR_IO, true, "Unable to find CAMERAS in the configuration.");
    … …  
    615615    PS_ASSERT_PTR_NON_NULL(config, NULL);
    616616
    617     psMetadata *cameras = psMetadataLookupMD(NULL, config->site, "CAMERAS");
     617    psMetadata *cameras = psMetadataLookupMetadata(NULL, config->site, "CAMERAS");
    618618    if (!cameras) {
    619619        psError(PS_ERR_IO, true, "Unable to find CAMERAS in the configuration.");
    … …  
    659659
    660660    bool mdok = true;                   // Status of MD lookup
    661     psMetadata *recipes = psMetadataLookupMD(&mdok, source, "RECIPES"); // The list of recipes
     661    psMetadata *recipes = psMetadataLookupMetadata(&mdok, source, "RECIPES"); // The list of recipes
    662662    if (!mdok || !recipes) {
    663663        psLogMsg(__func__, PS_LOG_WARN, "RECIPES in the %s is not of type METADATA --- ignored\n",
    … …  
    720720            if (sourceItem->data.S32 == P_PM_RECIPE_SOURCE_SYMBOLIC) {
    721721                const char *linkName = sourceItem->comment; // The name of the link
    722                 psMetadata *linkSource = psMetadataLookupMD(&mdok, config->recipes, linkName); // The source
     722                psMetadata *linkSource = psMetadataLookupMetadata(&mdok, config->recipes, linkName); // The source
    723723                if (!mdok || !linkSource) {
    724724                    // Can't yet resolve it
    … …  
    794794
    795795            // Is the source a symbolic reference?
    796             psMetadata *extant = psMetadataLookupMD(&mdok, config->recipes, recipeSource); // Does it exist?
     796            psMetadata *extant = psMetadataLookupMetadata(&mdok, config->recipes, recipeSource); // Does it exist?
    797797            if (mdok && extant) {
    798798                psString comment = psStringCopy("Recipe added from command line as symbolic link to ");
    … …  
    889889
    890890    bool mdok = true;                   // Status of MD lookup
    891     psMetadata *rules = psMetadataLookupMD(&mdok, format, "RULE"); // How to identify this format
     891    psMetadata *rules = psMetadataLookupMetadata(&mdok, format, "RULE"); // How to identify this format
    892892    if (!mdok || !rules) {
    893893        psError(PS_ERR_IO, true, "Unable to find RULE in camera format.\n");

  • trunk/psModules/src/objects/pmPSF_IO.c

    r8815 r9539  
    66 *  @author EAM, IfA
    77 *
    8  *  @version $Revision: 1.5 $ $Name: not supported by cvs2svn $
    9  *  @date $Date: 2006-09-15 09:49:01 $
     8 *  @version $Revision: 1.6 $ $Name: not supported by cvs2svn $
     9 *  @date $Date: 2006-10-13 21:15:45 $
    1010 *
    1111 *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
    … …  
    3737#include "pmSourceIO.h"
    3838
    39 psMetadata *pmPSFtoMD (psMetadata *metadata, pmPSF *psf)
     39psMetadata *pmPSFtoMetadata (psMetadata *metadata, pmPSF *psf)
    4040{
    4141
    … …  
    5454    for (int i = 0; i < nPar - 4; i++) {
    5555        psPolynomial2D *poly = psf->params->data[i];
    56         psPolynomial2DtoMD (metadata, poly, "PSF_PAR%02d", i);
    57     }
    58     psPolynomial4DtoMD (metadata, psf->ApTrend, "APTREND");
     56        psPolynomial2DtoMetadata (metadata, poly, "PSF_PAR%02d", i);
     57    }
     58    psPolynomial4DtoMetadata (metadata, psf->ApTrend, "APTREND");
    5959
    6060    psMetadataAdd (metadata, PS_LIST_TAIL, "PSF_AP_RESID", PS_DATA_F32, "aperture residual", psf->ApResid);
    … …  
    6868}
    6969
    70 pmPSF *pmPSFfromMD (psMetadata *metadata)
     70pmPSF *pmPSFfromMetadata (psMetadata *metadata)
    7171{
    7272
    … …  
    9090        sprintf (keyword, "PSF_PAR%02d", i);
    9191        psMetadata *folder = psMetadataLookupPtr (&status, metadata, keyword);
    92         psPolynomial2D *poly = psPolynomial2DfromMD (folder);
     92        psPolynomial2D *poly = psPolynomial2DfromMetadata (folder);
    9393        psFree (psf->params->data[i]);
    9494        psf->params->data[i] = poly;
    … …  
    9696    sprintf (keyword, "APTREND");
    9797    psMetadata *folder = psMetadataLookupPtr (&status, metadata, keyword);
    98     psPolynomial4D *poly = psPolynomial4DfromMD (folder);
     98    psPolynomial4D *poly = psPolynomial4DfromMetadata (folder);
    9999    psFree (psf->ApTrend);
    100100    psf->ApTrend = poly;
    … …  
    197197    case PM_FPA_FILE_PSF:
    198198        filename = pmFPAfileNameFromRule (file->filerule, file, view);
    199         psMetadata *psfData = pmPSFtoMD (NULL, psf);
     199        psMetadata *psfData = pmPSFtoMetadata (NULL, psf);
    200200        psMetadataConfigWrite (psfData, filename);
    201201        psFree (psfData);
    … …  
    299299
    300300        psMetadata *psfData = psMetadataConfigRead(NULL, &Nfail, filename, FALSE);
    301         pmPSF *psf = pmPSFfromMD (psfData);
     301        pmPSF *psf = pmPSFfromMetadata (psfData);
    302302        psMetadataAdd (readout->analysis, PS_LIST_TAIL, "PSPHOT.PSF", PS_DATA_UNKNOWN, "psphot psf", psf);
    303303

  • trunk/psModules/src/objects/pmPSF_IO.h

    r6872 r9539  
    66 *  @author EAM, IfA
    77 *
    8  *  @version $Revision: 1.2 $ $Name: not supported by cvs2svn $
    9  *  @date $Date: 2006-04-17 18:01:05 $
     8 *  @version $Revision: 1.3 $ $Name: not supported by cvs2svn $
     9 *  @date $Date: 2006-10-13 21:15:45 $
    1010 *
    1111 *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
    … …  
    1616# define PM_PSF_IO_H
    1717
    18 psMetadata *pmPSFtoMD (psMetadata *metadata, pmPSF *psf);
    19 pmPSF *pmPSFfromMD (psMetadata *metadata);
     18psMetadata *pmPSFtoMetadata (psMetadata *metadata, pmPSF *psf);
     19pmPSF *pmPSFfromMetadata (psMetadata *metadata);
    2020bool pmFPAviewWritePSFmodel (const pmFPAview *view, pmFPAfile *file);
    2121bool pmFPAWritePSFmodel (pmFPA *fpa, const pmFPAview *view, pmFPAfile *file);

  • trunk/psModules/test/config/tst_pmConfig.c

    r6414 r9539  
    1515 * XXXX: Must determine what to do with NULL arguments, then test it.
    1616 *
    17  *  @version $Revision: 1.7 $ $Name: not supported by cvs2svn $
    18  *  @date $Date: 2006-02-10 01:41:37 $
     17 *  @version $Revision: 1.8 $ $Name: not supported by cvs2svn $
     18 *  @date $Date: 2006-10-13 21:15:45 $
    1919 *
    2020 *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
    … …  
    210210        // Test the database camera metadata keywords.
    211211        //
    212         psMetadata *tmpMeta = psMetadataLookupMD(&rc, site, "CAMERAS");
     212        psMetadata *tmpMeta = psMetadataLookupMetadata(&rc, site, "CAMERAS");
    213213        if (rc == false) {
    214214            printf("TEST ERROR: failed to properly set metadata metadata CAMERAS.\n");
Note: See TracChangeset for help on using the changeset viewer.