IPP Software Navigation Tools IPP Links Communication Pan-STARRS Links

Changeset 16088


Ignore:
Timestamp:
Jan 15, 2008, 4:33:46 PM (18 years ago)
Author:
jhoblitt
Message:

convert to PXOPT_* macros

File:
1 edited

Legend:

Unmodified
Added
Removed

  • branches/end_stage/ippTools/src/chiptool.c

    r16049 r16088  
    140140    // convert exp_id into a psS64
    141141{
    142     bool status = false;
    143     psString var = psMetadataLookupStr(&status, config->args, "-exp_id");
    144     if (!status) {
    145         psError(PS_ERR_UNKNOWN, false, "failed to lookup value for -exp_id");
    146         return false;
    147     }
     142    PXOPT_LOOKUP_STR(var, config->args, "-exp_id", false, false);
     143
    148144    if (var) {
    149145        if (!psMetadataAddS64(where, PS_LIST_TAIL, "exp_id", 0, "==", (psS64)atoll(var))) {
    … …  
    197193    }
    198194
    199     bool status = false;
    200     psString workdir = psMetadataLookupStr(&status, config->args, "-set_workdir");
    201     if (!status) {
    202         psError(PS_ERR_UNKNOWN, false, "failed to lookup value for -set_workdir");
    203         return false;
    204     }
    205 
    206     psString label = psMetadataLookupStr(&status, config->args, "-set_label");
    207     if (!status) {
    208         psError(PS_ERR_UNKNOWN, false, "failed to lookup value for -set_label");
    209         return false;
    210     }
    211 
    212     psString reduction = psMetadataLookupStr(&status, config->args, "-set_reduction");
    213     if (!status) {
    214         psError(PS_ERR_UNKNOWN, false, "failed to lookup value for -set_reduction");
    215         return false;
    216     }
    217 
    218     psString expgroup = psMetadataLookupStr(&status, config->args, "-set_expgroup");
    219     if (!status) {
    220         psError(PS_ERR_UNKNOWN, false, "failed to lookup value for -set_expgroup");
    221         return false;
    222     }
    223 
    224     psString dvodb = psMetadataLookupStr(&status, config->args, "-set_dvodb");
    225     if (!status) {
    226         psError(PS_ERR_UNKNOWN, false, "failed to lookup value for -set_dvodb");
    227         return false;
    228     }
    229 
    230     psString tess_id = psMetadataLookupStr(&status, config->args, "-set_tess_id");
    231     if (!status) {
    232         psError(PS_ERR_UNKNOWN, false, "failed to lookup value for -set_tess_id");
    233         return false;
    234     }
    235 
    236     psString end_stage = psMetadataLookupStr(&status, config->args, "-set_end_stage");
    237     if (!status) {
    238         psError(PS_ERR_UNKNOWN, false, "failed to lookup value for -set_end_stage");
    239         return false;
    240     }
     195    PXOPT_LOOKUP_STR(workdir, config->args, "-set_workdir", false, false);
     196    PXOPT_LOOKUP_STR(label, config->args, "-set_label", false, false);
     197    PXOPT_LOOKUP_STR(reduction, config->args, "-set_reduction", false, false);
     198    PXOPT_LOOKUP_STR(expgroup, config->args, "-set_expgroup", false, false);
     199    PXOPT_LOOKUP_STR(dvodb, config->args, "-set_dvodb", false, false);
     200    PXOPT_LOOKUP_STR(tess_id, config->args, "-set_tess_id", false, false);
     201    PXOPT_LOOKUP_STR(end_stage, config->args, "-set_end_stage", false, false);
    241202
    242203    // find the exp_id of all the exposures that we want to queue up.
    … …  
    284245        psMetadata *md = output->data[i];
    285246
     247        bool status;
    286248        psS64 exp_id = psMetadataLookupS64(&status, md, "exp_id");
    287249        if (!status) {
    … …  
    316278    PS_ASSERT_PTR_NON_NULL(config, NULL);
    317279
    318     bool status = false;
    319     psU64 limit = psMetadataLookupU64(&status, config->args, "-limit");
    320     if (!status) {
    321         psError(PS_ERR_UNKNOWN, false, "failed to lookup value for -limit");
    322         return false;
    323     }
     280    PXOPT_LOOKUP_U64(limit, config->args, "-limit", false, false);
     281    PXOPT_LOOKUP_BOOL(simple, config->args, "-simple", false);
    324282
    325283    // XXX does this need to be constrained so that it won't return any results
    … …  
    362320    }
    363321
    364     bool simple = false;
    365     {
    366         bool status = false;
    367         simple = psMetadataLookupBool(&status, config->args, "-simple");
    368         if (!status) {
    369             psError(PS_ERR_UNKNOWN, false, "failed to lookup value for -simple");
    370             return false;
    371         }
    372     }
    373 
    374322    if (!convertIdToStr(output)) {
    375323        psError(PS_ERR_UNKNOWN, false, "failed to convert id fields into a strings");
    … …  
    395343    PS_ASSERT_PTR_NON_NULL(config, false);
    396344
    397     bool status = false;
    398345    // chip_id, ext_tag, class_id are required
    399     psString chip_id = psMetadataLookupStr(&status, config->args, "-chip_id");
    400     if (!status) {
    401         psError(PS_ERR_UNKNOWN, false, "failed to lookup value for -chip_id");
    402         return false;
    403     }
    404     if (!chip_id) {
    405         psError(PS_ERR_UNKNOWN, true, "-chip_id is required");
    406         return false;
    407     }
    408 
    409     psString exp_id = psMetadataLookupStr(&status, config->args, "-exp_id");
    410     if (!status) {
    411         psError(PS_ERR_UNKNOWN, false, "failed to lookup value for -exp_id");
    412         return false;
    413     }
    414     if (!exp_id) {
    415         psError(PS_ERR_UNKNOWN, true, "-exp_id is required");
    416         return false;
    417     }
    418 
    419     psString class_id = psMetadataLookupStr(&status, config->args, "-class_id");
    420     if (!status) {
    421         psError(PS_ERR_UNKNOWN, false, "failed to lookup value for -class_id");
    422         return false;
    423     }
    424     if (!class_id) {
    425         psError(PS_ERR_UNKNOWN, true, "-class_id is required");
    426         return false;
    427     }
    428 
    429     psString uri = psMetadataLookupStr(&status, config->args, "-uri");
    430     if (!status) {
    431         psError(PS_ERR_UNKNOWN, false, "failed to lookup value for -uri");
    432         return false;
    433     }
    434 
    435     psF32 bg = psMetadataLookupF32(&status, config->args, "-bg");
    436     if (!status) {
    437         psError(PS_ERR_UNKNOWN, false, "failed to lookup value for -bg");
    438         return false;
    439     }
    440 
    441     psF32 bg_stdev = psMetadataLookupF32(&status, config->args, "-bg_stdev");
    442     if (!status) {
    443         psError(PS_ERR_UNKNOWN, false, "failed to lookup value for -bg_stdev");
    444         return false;
    445     }
    446 
    447     psF32 bg_mean_stdev = psMetadataLookupF32(&status, config->args, "-bg_mean_stdev");
    448     if (!status) {
    449         psError(PS_ERR_UNKNOWN, false, "failed to lookup value for -bg_mean_stdev");
    450         return false;
    451     }
    452 
    453     psF32 bias = psMetadataLookupF32(&status, config->args, "-bias");
    454     if (!status) {
    455         psError(PS_ERR_UNKNOWN, false, "failed to lookup value for -bias");
    456         return false;
    457     }
    458 
    459     psF32 bias_stdev = psMetadataLookupF32(&status, config->args, "-bias_stdev");
    460     if (!status) {
    461         psError(PS_ERR_UNKNOWN, false, "failed to lookup value for -bias_stdev");
    462         return false;
    463     }
    464 
    465     psF32 fringe_0 = psMetadataLookupF32(&status, config->args, "-fringe_0");
    466     if (!status) {
    467         psError(PS_ERR_UNKNOWN, false, "failed to lookup value for -fringe_0");
    468         return false;
    469     }
    470 
    471     psF32 fringe_1 = psMetadataLookupF32(&status, config->args, "-fringe_1");
    472     if (!status) {
    473         psError(PS_ERR_UNKNOWN, false, "failed to lookup value for -fringe_1");
    474         return false;
    475     }
    476 
    477     psF32 fringe_2 = psMetadataLookupF32(&status, config->args, "-fringe_2");
    478     if (!status) {
    479         psError(PS_ERR_UNKNOWN, false, "failed to lookup value for -fringe_2");
    480         return false;
    481     }
    482 
    483     psF32 sigma_ra = psMetadataLookupF32(&status, config->args, "-sigma_ra");
    484     if (!status) {
    485         psError(PS_ERR_UNKNOWN, false, "failed to lookup value for -sigma_ra");
    486         return false;
    487     }
    488 
    489     psF32 sigma_dec = psMetadataLookupF32(&status, config->args, "-sigma_dec");
    490     if (!status) {
    491         psError(PS_ERR_UNKNOWN, false, "failed to lookup value for -sigma_dec");
    492         return false;
    493     }
    494 
    495     psF32 ap_resid = psMetadataLookupF32(&status, config->args, "-ap_resid");
    496     if (!status) {
    497         psError(PS_ERR_UNKNOWN, false, "failed to lookup value for -ap_resid");
    498         return false;
    499     }
    500 
    501     psF32 ap_resid_stdev = psMetadataLookupF32(&status, config->args, "-ap_resid_stdev");
    502     if (!status) {
    503         psError(PS_ERR_UNKNOWN, false, "failed to lookup value for -ap_resid_stdev");
    504         return false;
    505     }
    506 
    507     psF32 fwhm = psMetadataLookupF32(&status, config->args, "-fwhm");
    508     if (!status) {
    509         psError(PS_ERR_UNKNOWN, false, "failed to lookup value for -fwhm");
    510         return false;
    511     }
    512 
    513     psF32 fwhm_range = psMetadataLookupF32(&status, config->args, "-fwhm_range");
    514     if (!status) {
    515         psError(PS_ERR_UNKNOWN, false, "failed to lookup value for -fwhm_range");
    516         return false;
    517     }
    518 
    519     psS32 n_stars = psMetadataLookupS32(&status, config->args, "-n_stars");
    520     if (!status) {
    521         psError(PS_ERR_UNKNOWN, false, "failed to lookup value for -n_stars");
    522         return false;
    523     }
    524 
    525     psS32 n_extended = psMetadataLookupS32(&status, config->args, "-n_extended");
    526     if (!status) {
    527         psError(PS_ERR_UNKNOWN, false, "failed to lookup value for -n_extended");
    528         return false;
    529     }
    530 
    531     psS32 n_cr = psMetadataLookupS32(&status, config->args, "-n_cr");
    532     if (!status) {
    533         psError(PS_ERR_UNKNOWN, false, "failed to lookup value for -n_cr");
    534         return false;
    535     }
    536 
    537     psS32 n_astrom = psMetadataLookupS32(&status, config->args, "-n_astrom");
    538     if (!status) {
    539         psError(PS_ERR_UNKNOWN, false, "failed to lookup value for -n_astrom");
    540         return false;
    541     }
     346    PXOPT_LOOKUP_STR(chip_id, config->args, "-chip_id", true, false);
     347    PXOPT_LOOKUP_STR(exp_id, config->args, "-exp_id", true, false);
     348    PXOPT_LOOKUP_STR(class_id, config->args, "-class_id", true, false);
    542349
    543350    // optional
    544     psString path_base = psMetadataLookupStr(&status, config->args, "-path_base");
    545     if (!status) {
    546         psError(PS_ERR_UNKNOWN, false, "failed to lookup value for -path_base");
    547         return false;
    548     }
     351    PXOPT_LOOKUP_STR(uri, config->args, "-uri", false, false);
     352    PXOPT_LOOKUP_F32(bg, config->args, "-bg", false, false);
     353    PXOPT_LOOKUP_F32(bg_stdev, config->args, "-bg_stdev", false, false);
     354    PXOPT_LOOKUP_F32(bg_mean_stdev, config->args, "-bg_mean_stdev", false, false);
     355    PXOPT_LOOKUP_F32(bias, config->args, "-bias", false, false);
     356    PXOPT_LOOKUP_F32(bias_stdev, config->args, "-bias_stdev", false, false);
     357    PXOPT_LOOKUP_F32(fringe_0, config->args, "-fringe_0", false, false);
     358    PXOPT_LOOKUP_F32(fringe_1, config->args, "-fringe_1", false, false);
     359    PXOPT_LOOKUP_F32(fringe_2, config->args, "-fringe_2", false, false);
     360    PXOPT_LOOKUP_F32(sigma_ra, config->args, "-sigma_ra", false, false);
     361    PXOPT_LOOKUP_F32(sigma_dec, config->args, "-sigma_dec", false, false);
     362    PXOPT_LOOKUP_F32(ap_resid, config->args, "-ap_resid", false, false);
     363    PXOPT_LOOKUP_F32(ap_resid_stdev, config->args, "-ap_resid_stdev", false, false);
     364    PXOPT_LOOKUP_F32(fwhm, config->args, "-fwhm", false, false);
     365    PXOPT_LOOKUP_F32(fwhm_range, config->args, "-fwhm_range", false, false);
     366    PXOPT_LOOKUP_F32(n_stars, config->args, "-n_stars", false, false);
     367    PXOPT_LOOKUP_F32(n_extended, config->args, "-n_extended", false, false);
     368    PXOPT_LOOKUP_F32(n_cr, config->args, "-n_cr", false, false);
     369    PXOPT_LOOKUP_F32(n_astrom, config->args, "-n_astrom", false, false);
     370    PXOPT_LOOKUP_STR(path_base, config->args, "-path_base", false, false);
    549371
    550372    // default values
    551     psS16 code = psMetadataLookupS16(&status, config->args, "-code");
    552     if (!status) {
    553         psError(PS_ERR_UNKNOWN, false, "failed to lookup value for -code");
    554         return false;
    555     }
     373    PXOPT_LOOKUP_S16(code, config->args, "-code", false, false);
    556374
    557375    if (!psDBTransaction(config->dbh)) {
    … …  
    633451    PS_ASSERT_PTR_NON_NULL(config, NULL);
    634452
    635     bool status = false;
    636     psU64 limit = psMetadataLookupU64(&status, config->args, "-limit");
    637     if (!status) {
    638         psError(PS_ERR_UNKNOWN, false, "failed to lookup value for -limit");
    639         return false;
    640     }
    641 
    642     bool faulted = psMetadataLookupU64(&status, config->args, "-faulted");
    643     if (!status) {
    644         psError(PS_ERR_UNKNOWN, false, "failed to lookup value for -faulted");
    645         return false;
    646     }
     453    PXOPT_LOOKUP_U64(limit, config->args, "-limit", false, false);
     454    PXOPT_LOOKUP_BOOL(simple, config->args, "-simple", false);
     455    PXOPT_LOOKUP_BOOL(faulted, config->args, "-faulted", false);
    647456
    648457    // XXX does this need to be constrained so that it won't return any results
    … …  
    693502    }
    694503
    695     bool simple = false;
    696     {
    697         bool status = false;
    698         simple = psMetadataLookupBool(&status, config->args, "-simple");
    699         if (!status) {
    700             psError(PS_ERR_UNKNOWN, false, "failed to lookup value for -simple");
    701             return false;
    702         }
    703     }
    704 
    705504    if (!convertIdToStr(output)) {
    706505        psError(PS_ERR_UNKNOWN, false, "failed to convert id fields into a strings");
    … …  
    756555    PS_ASSERT_PTR_NON_NULL(config, false);
    757556
    758     bool status = false;
    759     psS16 code = psMetadataLookupS16(&status, config->args, "-code");
    760     if (!status) {
    761         psError(PS_ERR_UNKNOWN, false, "failed to lookup value for -code");
    762         return false;
    763     }
    764     if (code == INT16_MAX) {
    765         psError(PS_ERR_UNKNOWN, true, "-code is required");
    766         return false;
    767     }
     557    PXOPT_LOOKUP_S16(code, config->args, "-code", true, false);
    768558
    769559    if (!pxSetFaultCode(config->dbh, "chipProcessedImfile", config->where, code)) {
    … …  
    780570    PS_ASSERT_PTR_NON_NULL(config, false);
    781571
    782     bool status = false;
    783     psString label = psMetadataLookupStr(&status, config->args, "-label");
    784     if (!status) {
    785         psError(PS_ERR_UNKNOWN, false, "failed to lookup value for -label");
    786         return false;
    787     }
    788     if (!label) {
    789         psError(PS_ERR_UNKNOWN, true, "-label is required");
    790         return false;
    791     }
     572    PXOPT_LOOKUP_STR(label, config->args, "-label", true, false);
    792573
    793574    if (!chipMaskInsert(config->dbh, label)) {
    … …  
    803584{
    804585    PS_ASSERT_PTR_NON_NULL(config, false);
     586
     587    PXOPT_LOOKUP_BOOL(simple, config->args, "-simple", false);
    805588
    806589    psString query = psStringCopy("SELECT * FROM chipMask");
    … …  
    822605        psFree(output);
    823606        return true;
    824     }
    825 
    826     bool simple = false;
    827     {
    828         bool status = false;
    829         simple = psMetadataLookupBool(&status, config->args, "-simple");
    830         if (!status) {
    831             psError(PS_ERR_UNKNOWN, false, "failed to lookup value for -simple");
    832             return false;
    833         }
    834607    }
    835608
    … …  
    857630    PS_ASSERT_PTR_NON_NULL(config, false);
    858631
    859     bool status = false;
    860     psString label = psMetadataLookupStr(&status, config->args, "-label");
    861     if (!status) {
    862         psError(PS_ERR_UNKNOWN, false, "failed to lookup value for -label");
    863         return false;
    864     }
    865     if (!label) {
    866         psError(PS_ERR_UNKNOWN, true, "-label is required");
    867         return false;
    868     }
     632    PXOPT_LOOKUP_STR(label, config->args, "-label", true, false);
    869633
    870634    char *query = "DELETE FROM chipMask WHERE label = '%s'";
    … …  
    872636    if (!p_psDBRunQuery(config->dbh, query, label)) {
    873637        psError(PS_ERR_UNKNOWN, false, "database error");
    874         psFree(query);
    875638        return false;
    876639    }
Note: See TracChangeset for help on using the changeset viewer.