IPP Software Navigation Tools IPP Links Communication Pan-STARRS Links

Changeset 16089


Ignore:
Timestamp:
Jan 15, 2008, 4:49:03 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

    r16086 r16089  
    435435    PS_ASSERT_PTR_NON_NULL(config, false);
    436436
    437     bool status = false;
    438     psU64 limit = psMetadataLookupU64(&status, config->args, "-limit");
    439     if (!status) {
    440         psError(PXTOOLS_ERR_PROG, false, "failed to lookup value for -limit");
    441         return false;
    442     }
     437    PXOPT_LOOKUP_U64(limit, config->args, "-limit", false, false);
     438    PXOPT_LOOKUP_BOOL(simple, config->args, "-simple", false);
    443439
    444440    // return only exps that:
    … …  
    487483    }
    488484
    489     bool simple = false;
    490     simple = psMetadataLookupBool(&status, config->args, "-simple");
    491     if (!status) {
    492         psError(PXTOOLS_ERR_PROG, false, "failed to lookup value for -simple");
    493         return false;
    494     }
    495 
    496485    // negate simple so the default is true
    497486    if (!ippdbPrintMetadatas(stdout, output, "regPendingExp", !simple)) {
    … …  
    516505    // that the correct count of imfiles is in rawImfile
    517506
    518     bool status = false;
    519     psString exp_id = psMetadataLookupStr(&status, config->args, "-exp_id");
    520     if (!status) {
    521         psError(PS_ERR_UNKNOWN, false, "failed to lookup value for -exp_id");
    522         return false;
    523     }
    524     if (!exp_id) {
    525         psError(PS_ERR_UNKNOWN, true, "-exp_id is required");
    526         return false;
    527     }
    528 
    529     bool detrend = psMetadataLookupBool(&status, config->args, "-detrend");
    530     if (!status) {
    531         psError(PS_ERR_UNKNOWN, false, "failed to lookup value for -detrend");
    532         return false;
    533     }
    534 
    535     psString dvodb = psMetadataLookupStr(&status, config->args, "-dvodb");
    536     if (!status) {
    537         psError(PS_ERR_UNKNOWN, false, "failed to lookup value for -dvodb");
    538         return false;
    539     }
    540 
    541     psString tess_id = psMetadataLookupStr(&status, config->args, "-tess_id");
    542     if (!status) {
    543         psError(PS_ERR_UNKNOWN, false, "failed to lookup value for -tess_id");
    544         return false;
    545     }
    546 
    547     psString end_stage = psMetadataLookupStr(&status, config->args, "-end_stage");
    548     if (!status) {
    549         psError(PS_ERR_UNKNOWN, false, "failed to lookup value for -end_stage");
    550         return false;
    551     }
    552 
    553     psString exp_name = psMetadataLookupStr(&status, config->args, "-exp_name");
    554     if (!status) {
    555         psError(PS_ERR_UNKNOWN, false, "failed to lookup value for -exp_name");
    556         return false;
    557     }
    558     if (!exp_name) {
    559         psError(PS_ERR_UNKNOWN, true, "-exp_name is required");
    560         return false;
    561     }
    562 
    563     psString camera = psMetadataLookupStr(&status, config->args, "-inst");
    564     if (!status) {
    565         psError(PS_ERR_UNKNOWN, false, "failed to lookup value for -inst");
    566         return false;
    567     }
    568     if (!camera) {
    569         psError(PS_ERR_UNKNOWN, true, "-inst is required");
    570         return false;
    571     }
    572 
    573     psString telescope = psMetadataLookupStr(&status, config->args, "-telescope");
    574     if (!status) {
    575         psError(PS_ERR_UNKNOWN, false, "failed to lookup value for -telescope");
    576         return false;
    577     }
    578     if (!telescope) {
    579         psError(PS_ERR_UNKNOWN, true, "-telescope is required");
    580         return false;
    581     }
    582 
    583     psString exp_tag = psMetadataLookupStr(&status, config->args, "-exp_tag");
    584     if (!status) {
    585         psError(PS_ERR_UNKNOWN, false, "failed to lookup value for -exp_tag");
    586         return false;
    587     }
    588     if (!exp_tag) {
    589         psError(PS_ERR_UNKNOWN, true, "-exp_tag is required");
    590         return false;
    591     }
     507    // required
     508    PXOPT_LOOKUP_STR(exp_id, config->args, "-exp_id", true, false);
     509    PXOPT_LOOKUP_STR(exp_name, config->args, "-exp_name", true, false);
     510    PXOPT_LOOKUP_STR(camera, config->args, "-inst", true, false);
     511    PXOPT_LOOKUP_STR(telescope, config->args, "-telescope", true, false);
     512    PXOPT_LOOKUP_STR(exp_tag, config->args, "-exp_tag", true, false);
     513    PXOPT_LOOKUP_STR(filelevel, config->args, "-filelevel", true, false);
    592514
    593515    // optional
    594     psString exp_type = psMetadataLookupStr(&status, config->args, "-exp_type");
    595     if (!status) {
    596         psError(PS_ERR_UNKNOWN, false, "failed to lookup value for -exp_type");
    597         return false;
    598     }
    599 
    600     psString filelevel = psMetadataLookupStr(&status, config->args, "-filelevel");
    601     if (!status) {
    602         psError(PS_ERR_UNKNOWN, false, "failed to lookup value for -filelevel");
    603         return false;
    604     }
    605     if (!filelevel) {
    606         psError(PS_ERR_UNKNOWN, true, "-filelevel is required");
    607         return false;
    608     }
    609 
    610     psString workdir = psMetadataLookupStr(&status, config->args, "-workdir");
    611     if (!status) {
    612         psError(PS_ERR_UNKNOWN, false, "failed to lookup value for -workdir");
    613         return false;
    614     }
    615 
    616     psString reduction = psMetadataLookupStr(&status, config->args, "-reduction");
    617     if (!status) {
    618         psError(PS_ERR_UNKNOWN, false, "failed to lookup value for -reduction");
    619         return false;
    620     }
    621 
    622     psString filter = psMetadataLookupStr(&status, config->args, "-filter");
    623     if (!status) {
    624         psError(PS_ERR_UNKNOWN, false, "failed to lookup value for -filter");
    625         return false;
    626     }
    627 
    628     psString comment = psMetadataLookupStr(&status, config->args, "-comment");
    629     if (!status) {
    630         psError(PS_ERR_UNKNOWN, false, "failed to lookup value for -comment");
    631         return false;
    632     }
    633 
    634     psF32 airmass = psMetadataLookupF32(&status, config->args, "-airmass");
    635     if (!status) {
    636         psError(PS_ERR_UNKNOWN, false, "failed to lookup value for -airmass");
    637         return false;
    638     }
    639 
    640     psF64 ra = psMetadataLookupF64(&status, config->args, "-ra");
    641     if (!status) {
    642         psError(PS_ERR_UNKNOWN, false, "failed to lookup value for -ra");
    643         return false;
    644     }
    645 
    646     psF64 decl = psMetadataLookupF64(&status, config->args, "-decl");
    647     if (!status) {
    648         psError(PS_ERR_UNKNOWN, false, "failed to lookup value for -decl");
    649         return false;
    650     }
    651 
    652     psF32 exp_time = psMetadataLookupF32(&status, config->args, "-exp_time");
    653     if (!status) {
    654         psError(PS_ERR_UNKNOWN, false, "failed to lookup value for -exp_time");
    655         return false;
    656     }
    657 
    658     psF32 sat_pixel_frac = psMetadataLookupF32(&status, config->args, "-sat_pixel_frac");
    659     if (!status) {
    660         psError(PS_ERR_UNKNOWN, false, "failed to lookup value for -sat_pixel_frac");
    661         return false;
    662     }
    663 
    664     psF64 bg = psMetadataLookupF64(&status, config->args, "-bg");
    665     if (!status) {
    666         psError(PS_ERR_UNKNOWN, false, "failed to lookup value for -bg");
    667         return false;
    668     }
    669 
    670     psF64 bg_stdev = psMetadataLookupF64(&status, config->args, "-bg_stdev");
    671     if (!status) {
    672         psError(PS_ERR_UNKNOWN, false, "failed to lookup value for -bg_stdev");
    673         return false;
    674     }
    675 
    676     psF64 bg_mean_stdev = psMetadataLookupF64(&status, config->args, "-bg_mean_stdev");
    677     if (!status) {
    678         psError(PS_ERR_UNKNOWN, false, "failed to lookup value for -bg_mean_stdev");
    679         return false;
    680     }
    681 
    682     psF64 alt = psMetadataLookupF64(&status, config->args, "-alt");
    683     if (!status) {
    684         psError(PS_ERR_UNKNOWN, false, "failed to lookup value for -alt");
    685         return false;
    686     }
    687 
    688     psF64 az = psMetadataLookupF64(&status, config->args, "-az");
    689     if (!status) {
    690         psError(PS_ERR_UNKNOWN, false, "failed to lookup value for -az");
    691         return false;
    692     }
    693 
    694     psF32 ccd_temp = psMetadataLookupF32(&status, config->args, "-ccd_temp");
    695     if (!status) {
    696         psError(PS_ERR_UNKNOWN, false, "failed to lookup value for -ccd_temp");
    697         return false;
    698     }
    699 
    700     psF64 posang = psMetadataLookupF32(&status, config->args, "-posang");
    701     if (!status) {
    702         psError(PS_ERR_UNKNOWN, false, "failed to lookup value for -posang");
    703         return false;
    704     }
    705 
    706     psF32 m1_x = psMetadataLookupF32(&status, config->args, "-m1_x");
    707     if (!status) {
    708         psError(PS_ERR_UNKNOWN, false, "failed to lookup value for -m1_x");
    709         return false;
    710     }
    711     psF32 m1_y = psMetadataLookupF32(&status, config->args, "-m1_y");
    712     if (!status) {
    713         psError(PS_ERR_UNKNOWN, false, "failed to lookup value for -m1_y");
    714         return false;
    715     }
    716     psF32 m1_z = psMetadataLookupF32(&status, config->args, "-m1_z");
    717     if (!status) {
    718         psError(PS_ERR_UNKNOWN, false, "failed to lookup value for -m1_z");
    719         return false;
    720     }
    721     psF32 m1_tip = psMetadataLookupF32(&status, config->args, "-m1_tip");
    722     if (!status) {
    723         psError(PS_ERR_UNKNOWN, false, "failed to lookup value for -m1_tip");
    724         return false;
    725     }
    726     psF32 m1_tilt = psMetadataLookupF32(&status, config->args, "-m1_tilt");
    727     if (!status) {
    728         psError(PS_ERR_UNKNOWN, false, "failed to lookup value for -m1_tilt");
    729         return false;
    730     }
    731 
    732     psF32 m2_x = psMetadataLookupF32(&status, config->args, "-m2_x");
    733     if (!status) {
    734         psError(PS_ERR_UNKNOWN, false, "failed to lookup value for -m2_x");
    735         return false;
    736     }
    737     psF32 m2_y = psMetadataLookupF32(&status, config->args, "-m2_y");
    738     if (!status) {
    739         psError(PS_ERR_UNKNOWN, false, "failed to lookup value for -m2_y");
    740         return false;
    741     }
    742     psF32 m2_z = psMetadataLookupF32(&status, config->args, "-m2_z");
    743     if (!status) {
    744         psError(PS_ERR_UNKNOWN, false, "failed to lookup value for -m2_z");
    745         return false;
    746     }
    747     psF32 m2_tip = psMetadataLookupF32(&status, config->args, "-m2_tip");
    748     if (!status) {
    749         psError(PS_ERR_UNKNOWN, false, "failed to lookup value for -m2_tip");
    750         return false;
    751     }
    752     psF32 m2_tilt = psMetadataLookupF32(&status, config->args, "-m2_tilt");
    753     if (!status) {
    754         psError(PS_ERR_UNKNOWN, false, "failed to lookup value for -m2_tilt");
    755         return false;
    756     }
    757 
    758     psF32 env_temp = psMetadataLookupF32(&status, config->args, "-env_temperature");
    759     if (!status) {
    760         psError(PS_ERR_UNKNOWN, false, "failed to lookup value for -env_temperature");
    761         return false;
    762     }
    763     psF32 env_humid = psMetadataLookupF32(&status, config->args, "-env_humidity");
    764     if (!status) {
    765         psError(PS_ERR_UNKNOWN, false, "failed to lookup value for -env_humidity");
    766         return false;
    767     }
    768     psF32 env_wind = psMetadataLookupF32(&status, config->args, "-env_wind_speed");
    769     if (!status) {
    770         psError(PS_ERR_UNKNOWN, false, "failed to lookup value for -env_wind_speed");
    771         return false;
    772     }
    773     psF32 env_dir = psMetadataLookupF32(&status, config->args, "-env_wind_dir");
    774     if (!status) {
    775         psError(PS_ERR_UNKNOWN, false, "failed to lookup value for -env_wind_dir");
    776         return false;
    777     }
    778 
    779     psF32 teltemp_m1 = psMetadataLookupF32(&status, config->args, "-teltemp_m1");
    780     if (!status) {
    781         psError(PS_ERR_UNKNOWN, false, "failed to lookup value for -teltemp_m1");
    782         return false;
    783     }
    784     psF32 teltemp_m1cell = psMetadataLookupF32(&status, config->args, "-teltemp_m1cell");
    785     if (!status) {
    786         psError(PS_ERR_UNKNOWN, false, "failed to lookup value for -teltemp_m1cell");
    787         return false;
    788     }
    789     psF32 teltemp_m2 = psMetadataLookupF32(&status, config->args, "-teltemp_m2");
    790     if (!status) {
    791         psError(PS_ERR_UNKNOWN, false, "failed to lookup value for -teltemp_m2");
    792         return false;
    793     }
    794     psF32 teltemp_spider = psMetadataLookupF32(&status, config->args, "-teltemp_spider");
    795     if (!status) {
    796         psError(PS_ERR_UNKNOWN, false, "failed to lookup value for -teltemp_spider");
    797         return false;
    798     }
    799     psF32 teltemp_truss = psMetadataLookupF32(&status, config->args, "-teltemp_truss");
    800     if (!status) {
    801         psError(PS_ERR_UNKNOWN, false, "failed to lookup value for -teltemp_truss");
    802         return false;
    803     }
    804     psF32 teltemp_extra = psMetadataLookupF32(&status, config->args, "-teltemp_extra");
    805     if (!status) {
    806         psError(PS_ERR_UNKNOWN, false, "failed to lookup value for -teltemp_extra");
    807         return false;
    808     }
    809 
    810     psF32 pon_time = psMetadataLookupF32(&status, config->args, "-pon_time");
    811     if (!status) {
    812         psError(PS_ERR_UNKNOWN, false, "failed to lookup value for -pon_time");
    813         return false;
    814     }
    815 
    816     psF64 user_1 = psMetadataLookupF64(&status, config->args, "-user_1");
    817     if (!status) {
    818         psError(PS_ERR_UNKNOWN, false, "failed to lookup value for -user_1");
    819         return false;
    820     }
    821     psF64 user_2 = psMetadataLookupF64(&status, config->args, "-user_2");
    822     if (!status) {
    823         psError(PS_ERR_UNKNOWN, false, "failed to lookup value for -user_2");
    824         return false;
    825     }
    826     psF64 user_3 = psMetadataLookupF64(&status, config->args, "-user_3");
    827     if (!status) {
    828         psError(PS_ERR_UNKNOWN, false, "failed to lookup value for -user_3");
    829         return false;
    830     }
    831     psF64 user_4 = psMetadataLookupF64(&status, config->args, "-user_4");
    832     if (!status) {
    833         psError(PS_ERR_UNKNOWN, false, "failed to lookup value for -user_4");
    834         return false;
    835     }
    836     psF64 user_5 = psMetadataLookupF64(&status, config->args, "-user_5");
    837     if (!status) {
    838         psError(PS_ERR_UNKNOWN, false, "failed to lookup value for -user_5");
    839         return false;
    840     }
    841 
    842     psString object = psMetadataLookupStr(&status, config->args, "-object");
    843     if (!status) {
    844         psError(PS_ERR_UNKNOWN, false, "failed to lookup value for -object");
    845         return false;
    846     }
     516    PXOPT_LOOKUP_BOOL(detrend, config->args, "-detrend", false);
     517    PXOPT_LOOKUP_STR(dvodb, config->args, "-dvodb", false, false);
     518    PXOPT_LOOKUP_STR(tess_id, config->args, "-tess_id", false, false);
     519    PXOPT_LOOKUP_STR(end_stage, config->args, "-end_stage", false, false);
     520    PXOPT_LOOKUP_STR(exp_type, config->args, "-exp_type", false, false);
     521    PXOPT_LOOKUP_STR(workdir, config->args, "-workdir", false, false);
     522    PXOPT_LOOKUP_STR(reduction, config->args, "-reduction", false, false);
     523    PXOPT_LOOKUP_STR(filter, config->args, "-filter", false, false);
     524    PXOPT_LOOKUP_STR(comment, config->args, "-comment", false, false);
     525    PXOPT_LOOKUP_F32(airmass, config->args, "-airmass", false, false);
     526    PXOPT_LOOKUP_F64(ra, config->args, "-ra", false, false);
     527    PXOPT_LOOKUP_F64(decl, config->args, "-decl", false, false);
     528    PXOPT_LOOKUP_F32(exp_time, config->args, "-exp_time", false, false);
     529    PXOPT_LOOKUP_F32(sat_pixel_frac, config->args, "-sat_pixel_frac", false, false);
     530    PXOPT_LOOKUP_F64(bg, config->args, "-bg", false, false);
     531    PXOPT_LOOKUP_F64(bg_stdev, config->args, "-bg_stdev", false, false);
     532    PXOPT_LOOKUP_F64(bg_mean_stdev, config->args, "-bg_mean_stdev", false, false);
     533    PXOPT_LOOKUP_F64(alt, config->args, "-alt", false, false);
     534    PXOPT_LOOKUP_F64(az, config->args, "-az", false, false);
     535    PXOPT_LOOKUP_F32(ccd_temp, config->args, "-ccd_temp", false, false);
     536    PXOPT_LOOKUP_F64(posang, config->args, "-posang", false, false);
     537    PXOPT_LOOKUP_F32(m1_x, config->args, "-m1_x", false, false);
     538    PXOPT_LOOKUP_F32(m1_y, config->args, "-m1_y", false, false);
     539    PXOPT_LOOKUP_F32(m1_z, config->args, "-m1_z", false, false);
     540    PXOPT_LOOKUP_F32(m1_tip, config->args, "-m1_tip", false, false);
     541    PXOPT_LOOKUP_F32(m1_tilt, config->args, "-m1_tilt", false, false);
     542    PXOPT_LOOKUP_F32(m2_x, config->args, "-m2_x", false, false);
     543    PXOPT_LOOKUP_F32(m2_y, config->args, "-m2_y", false, false);
     544    PXOPT_LOOKUP_F32(m2_z, config->args, "-m2_z", false, false);
     545    PXOPT_LOOKUP_F32(m2_tip, config->args, "-m2_tip", false, false);
     546    PXOPT_LOOKUP_F32(m2_tilt, config->args, "-m2_tilt", false, false);
     547
     548    PXOPT_LOOKUP_F32(env_temp, config->args, "-env_temperature", false, false);
     549    PXOPT_LOOKUP_F32(env_humid, config->args, "-env_humidity", false, false);
     550    PXOPT_LOOKUP_F32(env_wind, config->args, "-env_wind_speed", false, false);
     551    PXOPT_LOOKUP_F32(env_dir, config->args, "-env_wind_dir", false, false);
     552    PXOPT_LOOKUP_F32(teltemp_m1, config->args, "-teltemp_m1", false, false);
     553    PXOPT_LOOKUP_F32(teltemp_m1cell, config->args, "-teltemp_m1cell", false, false);
     554    PXOPT_LOOKUP_F32(teltemp_m2, config->args, "-teltemp_m2", false, false);
     555    PXOPT_LOOKUP_F32(teltemp_spider, config->args, "-teltemp_spider", false, false);
     556    PXOPT_LOOKUP_F32(teltemp_truss, config->args, "-teltemp_truss", false, false);
     557    PXOPT_LOOKUP_F32(teltemp_extra, config->args, "-teltemp_extra", false, false);
     558    PXOPT_LOOKUP_F32(pon_time, config->args, "-pon_time", false, false);
     559    PXOPT_LOOKUP_F64(user_1, config->args, "-user_1", false, false);
     560    PXOPT_LOOKUP_F64(user_2, config->args, "-user_2", false, false);
     561    PXOPT_LOOKUP_F64(user_3, config->args, "-user_3", false, false);
     562    PXOPT_LOOKUP_F64(user_4, config->args, "-user_4", false, false);
     563    PXOPT_LOOKUP_F64(user_5, config->args, "-user_5", false, false);
     564    PXOPT_LOOKUP_STR(object, config->args, "-object", false, false);
    847565
    848566    psTime *dateobs = NULL;
    849567    {
     568        bool status;
    850569        psString dateobsStr = psMetadataLookupStr(&status, config->args, "-dateobs");
    851570        if (!status) {
    … …  
    862581
    863582    // default
    864     psS16 code = psMetadataLookupS16(&status, config->args, "-code");
    865     if (!status) {
    866         psError(PS_ERR_UNKNOWN, false, "failed to lookup value for -code");
    867         return false;
    868     }
     583    PXOPT_LOOKUP_S16(code, config->args, "-code", false, false);
    869584
    870585    psString query = pxDataGet("regtool_pendingexp.sql");
    … …  
    1061776    PS_ASSERT_PTR_NON_NULL(config, false);
    1062777
    1063     bool status = false;
    1064     psU64 limit = psMetadataLookupU64(&status, config->args, "-limit");
    1065     if (!status) {
    1066         psError(PXTOOLS_ERR_PROG, false, "failed to lookup value for -limit");
    1067         return false;
    1068     }
    1069 
    1070     bool faulted = psMetadataLookupU64(&status, config->args, "-faulted");
    1071     if (!status) {
    1072         psError(PXTOOLS_ERR_PROG, false, "failed to lookup value for -faulted");
    1073         return false;
    1074     }
     778    PXOPT_LOOKUP_U64(limit, config->args, "-limit", false, false);
     779    PXOPT_LOOKUP_BOOL(simple, config->args, "-simple", false);
     780    PXOPT_LOOKUP_BOOL(faulted, config->args, "-simple", false);
    1075781
    1076782    psString query = pxDataGet("regtool_processedexp.sql");
    … …  
    1127833    }
    1128834
    1129     bool simple = false;
    1130     {
    1131         bool status = false;
    1132         simple = psMetadataLookupBool(&status, config->args, "-simple");
    1133         if (!status) {
    1134             psError(PS_ERR_UNKNOWN, false, "failed to lookup value for -simple");
    1135             return false;
    1136         }
    1137     }
    1138 
    1139835    if (psArrayLength(output)) {
    1140836        // negative simple so the default is true
    … …  
    1185881static bool updateprocessedexpMode(pxConfig *config)
    1186882{
    1187     bool status = false;
    1188     psS16 code = psMetadataLookupS16(&status, config->args, "-code");
    1189     if (!status) {
    1190         psError(PS_ERR_UNKNOWN, false, "failed to lookup value for -code");
    1191         return false;
    1192     }
    1193     if (code == INT16_MAX) {
    1194         psError(PS_ERR_UNKNOWN, true, "-code is required");
    1195         return false;
    1196     }
     883    PS_ASSERT_PTR_NON_NULL(config, false);
     884
     885    PXOPT_LOOKUP_S16(code, config->args, "-code", true, false);
    1197886
    1198887    if (!pxSetFaultCode(config->dbh, "rawExp", config->where, code)) {
Note: See TracChangeset for help on using the changeset viewer.