IPP Software Navigation Tools IPP Links Communication Pan-STARRS Links

Changeset 16086


Ignore:
Timestamp:
Jan 15, 2008, 3:45:17 PM (18 years ago)
Author:
jhoblitt
Message:

convert to PXOPT_* macros

File:
1 edited

Legend:

Unmodified
Added
Removed

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

    r16083 r16086  
    100100    PS_ASSERT_PTR_NON_NULL(config, false);
    101101
    102     bool status = false;
    103     psU64 limit = psMetadataLookupU64(&status, config->args, "-limit");
    104     if (!status) {
    105         psError(PXTOOLS_ERR_PROG, false, "failed to lookup value for -limit");
    106         return false;
    107     }
     102    PXOPT_LOOKUP_U64(limit, config->args, "-limit", false, false);
     103    PXOPT_LOOKUP_BOOL(simple, config->args, "-simple", false);
    108104
    109105    // select newImfiles that:
    … …  
    154150    }
    155151
    156     bool simple = false;
    157     simple = psMetadataLookupBool(&status, config->args, "-simple");
    158     if (!status) {
    159         psError(PXTOOLS_ERR_PROG, false, "failed to lookup value for -simple");
    160         return false;
    161     }
    162 
    163152    // negate simple so the default is true
    164153    if (!ippdbPrintMetadatas(stdout, output, "regPendingImfile", !simple)) {
    … …  
    180169    bool status = false;
    181170    // required
    182     psString exp_id = psMetadataLookupStr(&status, config->args, "-exp_id");
    183     if (!status) {
    184         psError(PS_ERR_UNKNOWN, false, "failed to lookup value for -exp_id");
    185         return false;
    186     }
    187     if (!exp_id) {
    188         psError(PS_ERR_UNKNOWN, true, "-exp_id is required");
    189         return false;
    190     }
    191 
    192     psString exp_name = psMetadataLookupStr(&status, config->args, "-exp_name");
    193     if (!status) {
    194         psError(PS_ERR_UNKNOWN, false, "failed to lookup value for -exp_name");
    195         return false;
    196     }
    197     if (!exp_name) {
    198         psError(PS_ERR_UNKNOWN, true, "-exp_name is required");
    199         return false;
    200     }
    201 
    202     psString camera = psMetadataLookupStr(&status, config->args, "-inst");
    203     if (!status) {
    204         psError(PS_ERR_UNKNOWN, false, "failed to lookup value for -inst");
    205         return false;
    206     }
    207     if (!camera) {
    208         psError(PS_ERR_UNKNOWN, true, "-inst is required");
    209         return false;
    210     }
    211 
    212     psString telescope = psMetadataLookupStr(&status, config->args, "-telescope");
    213     if (!status) {
    214         psError(PS_ERR_UNKNOWN, false, "failed to lookup value for -telescope");
    215         return false;
    216     }
    217     if (!telescope) {
    218         psError(PS_ERR_UNKNOWN, true, "-telescope is required");
    219         return false;
    220     }
    221 
    222     psString tmp_class_id = psMetadataLookupStr(&status, config->args, "-tmp_class_id");
    223     if (!status) {
    224         psError(PS_ERR_UNKNOWN, false, "failed to lookup value for -tmp_class_id");
    225         return false;
    226     }
    227     if (!tmp_class_id) {
    228         psError(PS_ERR_UNKNOWN, true, "-tmp_class_id is required");
    229     }
    230 
    231     psString class_id = psMetadataLookupStr(&status, config->args, "-class_id");
    232     if (!status) {
    233         psError(PS_ERR_UNKNOWN, false, "failed to lookup value for -class_id");
    234         return false;
    235     }
    236     if (!class_id) {
    237         psError(PS_ERR_UNKNOWN, true, "-class_id is required");
    238         return false;
    239     }
    240 
    241     psString uri = psMetadataLookupStr(&status, config->args, "-uri");
    242     if (!status) {
    243         psError(PS_ERR_UNKNOWN, false, "failed to lookup value for -uri");
    244         return false;
    245     }
    246     if (!uri) {
    247         psError(PS_ERR_UNKNOWN, true, "-uri is required");
    248         return false;
    249     }
     171    PXOPT_LOOKUP_STR(exp_id, config->args, "-exp_id", true, false);
     172    PXOPT_LOOKUP_STR(exp_name, config->args, "-exp_name", true, false);
     173    PXOPT_LOOKUP_STR(camera, config->args, "-inst", true, false);
     174    PXOPT_LOOKUP_STR(telescope, config->args, "-telescope", true, false);
     175    PXOPT_LOOKUP_STR(tmp_class_id, config->args, "-tmp_class_id", true, false);
     176    PXOPT_LOOKUP_STR(class_id, config->args, "-class_id", true, false);
     177    PXOPT_LOOKUP_STR(uri, config->args, "-uri", true, false);
    250178
    251179    // optional
    252     psString exp_type = psMetadataLookupStr(&status, config->args, "-exp_type");
    253     if (!status) {
    254         psError(PS_ERR_UNKNOWN, false, "failed to lookup value for -exp_type");
    255         return false;
    256     }
    257 
    258     psString filelevel = psMetadataLookupStr(&status, config->args, "-filelevel");
    259     if (!status) {
    260         psError(PS_ERR_UNKNOWN, false, "failed to lookup value for -filelevel");
    261         return false;
    262     }
    263 
    264     psString filter = psMetadataLookupStr(&status, config->args, "-filter");
    265     if (!status) {
    266         psError(PS_ERR_UNKNOWN, false, "failed to lookup value for -filter");
    267         return false;
    268     }
    269 
    270     psString comment = psMetadataLookupStr(&status, config->args, "-comment");
    271     if (!status) {
    272         psError(PS_ERR_UNKNOWN, false, "failed to lookup value for -comment");
    273         return false;
    274     }
    275 
    276     psF32 airmass = psMetadataLookupF32(&status, config->args, "-airmass");
    277     if (!status) {
    278         psError(PS_ERR_UNKNOWN, false, "failed to lookup value for -airmass");
    279         return false;
    280     }
    281 
    282     psF64 ra = psMetadataLookupF64(&status, config->args, "-ra");
    283     if (!status) {
    284         psError(PS_ERR_UNKNOWN, false, "failed to lookup value for -ra");
    285         return false;
    286     }
    287 
    288     psF64 decl = psMetadataLookupF64(&status, config->args, "-decl");
    289     if (!status) {
    290         psError(PS_ERR_UNKNOWN, false, "failed to lookup value for -decl");
    291         return false;
    292     }
    293 
    294     psF32 exp_time = psMetadataLookupF32(&status, config->args, "-exp_time");
    295     if (!status) {
    296         psError(PS_ERR_UNKNOWN, false, "failed to lookup value for -exp_time");
    297         return false;
    298     }
    299 
    300     psF32 sat_pixel_frac = psMetadataLookupF32(&status, config->args, "-sat_pixel_frac");
    301     if (!status) {
    302         psError(PS_ERR_UNKNOWN, false, "failed to lookup value for -sat_pixel_frac");
    303         return false;
    304     }
    305 
    306     psF64 bg = psMetadataLookupF64(&status, config->args, "-bg");
    307     if (!status) {
    308         psError(PS_ERR_UNKNOWN, false, "failed to lookup value for -bg");
    309         return false;
    310     }
    311 
    312     psF64 bg_stdev = psMetadataLookupF64(&status, config->args, "-bg_stdev");
    313     if (!status) {
    314         psError(PS_ERR_UNKNOWN, false, "failed to lookup value for -bg_stdev");
    315         return false;
    316     }
    317 
    318     psF64 bg_mean_stdev = psMetadataLookupF64(&status, config->args, "-bg_mean_stdev");
    319     if (!status) {
    320         psError(PS_ERR_UNKNOWN, false, "failed to lookup value for -bg_mean_stdev");
    321         return false;
    322     }
    323 
    324     psF64 alt = psMetadataLookupF64(&status, config->args, "-alt");
    325     if (!status) {
    326         psError(PS_ERR_UNKNOWN, false, "failed to lookup value for -alt");
    327         return false;
    328     }
    329 
    330     psF64 az = psMetadataLookupF64(&status, config->args, "-az");
    331     if (!status) {
    332         psError(PS_ERR_UNKNOWN, false, "failed to lookup value for -az");
    333         return false;
    334     }
    335 
    336     psF32 ccd_temp = psMetadataLookupF32(&status, config->args, "-ccd_temp");
    337     if (!status) {
    338         psError(PS_ERR_UNKNOWN, false, "failed to lookup value for -ccd_temp");
    339         return false;
    340     }
    341 
    342     psF64 posang = psMetadataLookupF32(&status, config->args, "-posang");
    343     if (!status) {
    344         psError(PS_ERR_UNKNOWN, false, "failed to lookup value for -posang");
    345         return false;
    346     }
    347 
    348     psF32 m1_x = psMetadataLookupF32(&status, config->args, "-m1_x");
    349     if (!status) {
    350         psError(PS_ERR_UNKNOWN, false, "failed to lookup value for -m1_x");
    351         return false;
    352     }
    353     psF32 m1_y = psMetadataLookupF32(&status, config->args, "-m1_y");
    354     if (!status) {
    355         psError(PS_ERR_UNKNOWN, false, "failed to lookup value for -m1_y");
    356         return false;
    357     }
    358     psF32 m1_z = psMetadataLookupF32(&status, config->args, "-m1_z");
    359     if (!status) {
    360         psError(PS_ERR_UNKNOWN, false, "failed to lookup value for -m1_z");
    361         return false;
    362     }
    363     psF32 m1_tip = psMetadataLookupF32(&status, config->args, "-m1_tip");
    364     if (!status) {
    365         psError(PS_ERR_UNKNOWN, false, "failed to lookup value for -m1_tip");
    366         return false;
    367     }
    368     psF32 m1_tilt = psMetadataLookupF32(&status, config->args, "-m1_tilt");
    369     if (!status) {
    370         psError(PS_ERR_UNKNOWN, false, "failed to lookup value for -m1_tilt");
    371         return false;
    372     }
    373 
    374     psF32 m2_x = psMetadataLookupF32(&status, config->args, "-m2_x");
    375     if (!status) {
    376         psError(PS_ERR_UNKNOWN, false, "failed to lookup value for -m2_x");
    377         return false;
    378     }
    379     psF32 m2_y = psMetadataLookupF32(&status, config->args, "-m2_y");
    380     if (!status) {
    381         psError(PS_ERR_UNKNOWN, false, "failed to lookup value for -m2_y");
    382         return false;
    383     }
    384     psF32 m2_z = psMetadataLookupF32(&status, config->args, "-m2_z");
    385     if (!status) {
    386         psError(PS_ERR_UNKNOWN, false, "failed to lookup value for -m2_z");
    387         return false;
    388     }
    389     psF32 m2_tip = psMetadataLookupF32(&status, config->args, "-m2_tip");
    390     if (!status) {
    391         psError(PS_ERR_UNKNOWN, false, "failed to lookup value for -m2_tip");
    392         return false;
    393     }
    394     psF32 m2_tilt = psMetadataLookupF32(&status, config->args, "-m2_tilt");
    395     if (!status) {
    396         psError(PS_ERR_UNKNOWN, false, "failed to lookup value for -m2_tilt");
    397         return false;
    398     }
    399 
    400     psF32 env_temp = psMetadataLookupF32(&status, config->args, "-env_temperature");
    401     if (!status) {
    402         psError(PS_ERR_UNKNOWN, false, "failed to lookup value for -env_temperature");
    403         return false;
    404     }
    405     psF32 env_humid = psMetadataLookupF32(&status, config->args, "-env_humidity");
    406     if (!status) {
    407         psError(PS_ERR_UNKNOWN, false, "failed to lookup value for -env_humidity");
    408         return false;
    409     }
    410     psF32 env_wind = psMetadataLookupF32(&status, config->args, "-env_wind_speed");
    411     if (!status) {
    412         psError(PS_ERR_UNKNOWN, false, "failed to lookup value for -env_wind_speed");
    413         return false;
    414     }
    415     psF32 env_dir = psMetadataLookupF32(&status, config->args, "-env_wind_dir");
    416     if (!status) {
    417         psError(PS_ERR_UNKNOWN, false, "failed to lookup value for -env_wind_dir");
    418         return false;
    419     }
    420 
    421     psF32 teltemp_m1 = psMetadataLookupF32(&status, config->args, "-teltemp_m1");
    422     if (!status) {
    423         psError(PS_ERR_UNKNOWN, false, "failed to lookup value for -teltemp_m1");
    424         return false;
    425     }
    426     psF32 teltemp_m1cell = psMetadataLookupF32(&status, config->args, "-teltemp_m1cell");
    427     if (!status) {
    428         psError(PS_ERR_UNKNOWN, false, "failed to lookup value for -teltemp_m1cell");
    429         return false;
    430     }
    431     psF32 teltemp_m2 = psMetadataLookupF32(&status, config->args, "-teltemp_m2");
    432     if (!status) {
    433         psError(PS_ERR_UNKNOWN, false, "failed to lookup value for -teltemp_m2");
    434         return false;
    435     }
    436     psF32 teltemp_spider = psMetadataLookupF32(&status, config->args, "-teltemp_spider");
    437     if (!status) {
    438         psError(PS_ERR_UNKNOWN, false, "failed to lookup value for -teltemp_spider");
    439         return false;
    440     }
    441     psF32 teltemp_truss = psMetadataLookupF32(&status, config->args, "-teltemp_truss");
    442     if (!status) {
    443         psError(PS_ERR_UNKNOWN, false, "failed to lookup value for -teltemp_truss");
    444         return false;
    445     }
    446     psF32 teltemp_extra = psMetadataLookupF32(&status, config->args, "-teltemp_extra");
    447     if (!status) {
    448         psError(PS_ERR_UNKNOWN, false, "failed to lookup value for -teltemp_extra");
    449         return false;
    450     }
    451 
    452     psF32 pon_time = psMetadataLookupF32(&status, config->args, "-pon_time");
    453     if (!status) {
    454         psError(PS_ERR_UNKNOWN, false, "failed to lookup value for -pon_time");
    455         return false;
    456     }
    457 
    458     psF64 user_1 = psMetadataLookupF64(&status, config->args, "-user_1");
    459     if (!status) {
    460         psError(PS_ERR_UNKNOWN, false, "failed to lookup value for -user_1");
    461         return false;
    462     }
    463     psF64 user_2 = psMetadataLookupF64(&status, config->args, "-user_2");
    464     if (!status) {
    465         psError(PS_ERR_UNKNOWN, false, "failed to lookup value for -user_2");
    466         return false;
    467     }
    468     psF64 user_3 = psMetadataLookupF64(&status, config->args, "-user_3");
    469     if (!status) {
    470         psError(PS_ERR_UNKNOWN, false, "failed to lookup value for -user_3");
    471         return false;
    472     }
    473     psF64 user_4 = psMetadataLookupF64(&status, config->args, "-user_4");
    474     if (!status) {
    475         psError(PS_ERR_UNKNOWN, false, "failed to lookup value for -user_4");
    476         return false;
    477     }
    478     psF64 user_5 = psMetadataLookupF64(&status, config->args, "-user_5");
    479     if (!status) {
    480         psError(PS_ERR_UNKNOWN, false, "failed to lookup value for -user_5");
    481         return false;
    482     }
    483 
    484     psString object = psMetadataLookupStr(&status, config->args, "-object");
    485     if (!status) {
    486         psError(PS_ERR_UNKNOWN, false, "failed to lookup value for -object");
    487         return false;
    488     }
     180    PXOPT_LOOKUP_STR(exp_type, config->args, "-exp_type", false, false);
     181    PXOPT_LOOKUP_STR(filelevel, config->args, "-filelevel", false, false);
     182    PXOPT_LOOKUP_STR(filter, config->args, "-filter", false, false);
     183    PXOPT_LOOKUP_STR(comment, config->args, "-comment", false, false);
     184
     185    PXOPT_LOOKUP_F32(airmass, config->args, "-airmass", false, false);
     186    PXOPT_LOOKUP_F64(ra, config->args, "-ra", false, false);
     187    PXOPT_LOOKUP_F64(decl, config->args, "-decl", false, false);
     188    PXOPT_LOOKUP_F32(exp_time, config->args, "-exp_time", false, false);
     189    PXOPT_LOOKUP_F32(sat_pixel_frac, config->args, "-sat_pixel_frac", false, false);
     190    PXOPT_LOOKUP_F64(bg, config->args, "-bg", false, false);
     191    PXOPT_LOOKUP_F64(bg_stdev, config->args, "-bg_stdev", false, false);
     192    PXOPT_LOOKUP_F64(bg_mean_stdev, config->args, "-bg_mean_stdev", false, false);
     193    PXOPT_LOOKUP_F64(alt, config->args, "-alt", false, false);
     194    PXOPT_LOOKUP_F64(az, config->args, "-az", false, false);
     195    PXOPT_LOOKUP_F32(ccd_temp, config->args, "-ccd_temp", false, false);
     196    PXOPT_LOOKUP_F64(posang, config->args, "-posang", false, false);
     197    PXOPT_LOOKUP_F32(m1_x, config->args, "-m1_x", false, false);
     198    PXOPT_LOOKUP_F32(m1_y, config->args, "-m1_y", false, false);
     199    PXOPT_LOOKUP_F32(m1_z, config->args, "-m1_z", false, false);
     200    PXOPT_LOOKUP_F32(m1_tip, config->args, "-m1_tip", false, false);
     201    PXOPT_LOOKUP_F32(m1_tilt, config->args, "-m1_tilt", false, false);
     202    PXOPT_LOOKUP_F32(m2_x, config->args, "-m2_x", false, false);
     203    PXOPT_LOOKUP_F32(m2_y, config->args, "-m2_y", false, false);
     204    PXOPT_LOOKUP_F32(m2_z, config->args, "-m2_z", false, false);
     205    PXOPT_LOOKUP_F32(m2_tip, config->args, "-m2_tip", false, false);
     206    PXOPT_LOOKUP_F32(m2_tilt, config->args, "-m2_tilt", false, false);
     207
     208    PXOPT_LOOKUP_F32(env_temp, config->args, "-env_temperature", false, false);
     209    PXOPT_LOOKUP_F32(env_humid, config->args, "-env_humidity", false, false);
     210    PXOPT_LOOKUP_F32(env_wind, config->args, "-env_wind_speed", false, false);
     211    PXOPT_LOOKUP_F32(env_dir, config->args, "-env_wind_dir", false, false);
     212    PXOPT_LOOKUP_F32(teltemp_m1, config->args, "-teltemp_m1", false, false);
     213    PXOPT_LOOKUP_F32(teltemp_m1cell, config->args, "-teltemp_m1cell", false, false);
     214    PXOPT_LOOKUP_F32(teltemp_m2, config->args, "-teltemp_m2", false, false);
     215    PXOPT_LOOKUP_F32(teltemp_spider, config->args, "-teltemp_spider", false, false);
     216    PXOPT_LOOKUP_F32(teltemp_truss, config->args, "-teltemp_truss", false, false);
     217    PXOPT_LOOKUP_F32(teltemp_extra, config->args, "-teltemp_extra", false, false);
     218    PXOPT_LOOKUP_F32(pon_time, config->args, "-pon_time", false, false);
     219    PXOPT_LOOKUP_F64(user_1, config->args, "-user_1", false, false);
     220    PXOPT_LOOKUP_F64(user_2, config->args, "-user_2", false, false);
     221    PXOPT_LOOKUP_F64(user_3, config->args, "-user_3", false, false);
     222    PXOPT_LOOKUP_F64(user_4, config->args, "-user_4", false, false);
     223    PXOPT_LOOKUP_F64(user_5, config->args, "-user_5", false, false);
     224    PXOPT_LOOKUP_STR(object, config->args, "-object", false, false);
    489225
    490226    psTime *dateobs = NULL;
    … …  
    503239    }
    504240
    505     psS16 code = psMetadataLookupS16(&status, config->args, "-code");
    506     if (!status) {
    507         psError(PS_ERR_UNKNOWN, false, "failed to lookup value for -code");
    508         return false;
    509     }
     241    PXOPT_LOOKUP_S16(code, config->args, "-code", false, false);
    510242
    511243    if (!rawImfileInsert(
    … …  
    579311    PS_ASSERT_PTR_NON_NULL(config, false);
    580312
    581     bool status = false;
    582     psU64 limit = psMetadataLookupU64(&status, config->args, "-limit");
    583     if (!status) {
    584         psError(PXTOOLS_ERR_PROG, false, "failed to lookup value for -limit");
    585         return false;
    586     }
    587 
    588     bool faulted = psMetadataLookupU64(&status, config->args, "-faulted");
    589     if (!status) {
    590         psError(PXTOOLS_ERR_PROG, false, "failed to lookup value for -faulted");
    591         return false;
    592     }
     313    PXOPT_LOOKUP_U64(limit, config->args, "-limit", false, false);
     314    PXOPT_LOOKUP_BOOL(simple, config->args, "-simple", false);
     315    PXOPT_LOOKUP_BOOL(faulted, config->args, "-faulted", false);
    593316
    594317    psString query = pxDataGet("regtool_processedimfile.sql");
    … …  
    646369    }
    647370
    648     bool simple = false;
    649     {
    650         bool status = false;
    651         simple = psMetadataLookupBool(&status, config->args, "-simple");
    652         if (!status) {
    653             psError(PS_ERR_UNKNOWN, false, "failed to lookup value for -simple");
    654             return false;
    655         }
    656     }
    657 
    658371    if (psArrayLength(output)) {
    659372        // negative simple so the default is true
    … …  
    707420    PS_ASSERT_PTR_NON_NULL(config, false);
    708421
    709     bool status = false;
    710     psS16 code = psMetadataLookupS16(&status, config->args, "-code");
    711     if (!status) {
    712         psError(PS_ERR_UNKNOWN, false, "failed to lookup value for -code");
    713         return false;
    714     }
    715     if (code == INT16_MAX) {
    716         psError(PS_ERR_UNKNOWN, true, "-code is required");
    717         return false;
    718     }
     422    PXOPT_LOOKUP_S16(code, config->args, "-code", true, false);
    719423
    720424    if (!pxSetFaultCode(config->dbh, "rawImfile", config->where, code)) {
Note: See TracChangeset for help on using the changeset viewer.