IPP Software Navigation Tools IPP Links Communication Pan-STARRS Links

Changeset 16118


Ignore:
Timestamp:
Jan 17, 2008, 1:11:55 PM (18 years ago)
Author:
jhoblitt
Message:

handle input times as psTimes instead of strings

Location:
branches/end_stage/ippTools/src
Files:
12 edited

Legend:

Unmodified
Added
Removed

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

    r16100 r16118  
    101101    PXOPT_LOOKUP_STR(tess_id, config->args, "-tess_id", true, false);
    102102
    103     // optional
     103    // default
    104104    PXOPT_LOOKUP_BOOL(simple, config->args, "-simple", false);
    105 
    106     psTime *registered = NULL;
    107     {
    108         bool status;
    109         psString registeredStr = psMetadataLookupStr(&status, config->args, "-registered");
    110         if (!status) {
    111             psError(PS_ERR_UNKNOWN, false, "failed to lookup value for -registered");
    112             return false;
    113         }
    114         // pass through NULL as this is an optional field
    115         if (registeredStr) {
    116             registered = psTimeFromISO(registeredStr, PS_TIME_UTC);
    117         } else {
    118             registered = NULL;
    119         }
    120     }
     105    PXOPT_LOOKUP_TIME(registered, config->args, "-registered", false, false);
    121106
    122107    diffRunRow *run = diffRunRowAlloc(
    … …  
    129114            tess_id
    130115    );
    131     psFree(registered);
    132116    if (!run) {
    133117        psError(PS_ERR_UNKNOWN, false, "failed to alloc diffRun object");
    … …  
    676660    }
    677661
    678     psTime *registered = NULL;
    679     {
    680         bool status;
    681         psString registeredStr = psMetadataLookupStr(&status, config->args, "-registered");
    682         if (!status) {
    683             psError(PS_ERR_UNKNOWN, false, "failed to lookup value for -registered");
    684             return false;
    685         }
    686         // pass through NULL as this is an optional field
    687         if (registeredStr) {
    688             registered = psTimeFromISO(registeredStr, PS_TIME_UTC);
    689         } else {
    690             registered = NULL;
    691         }
    692     }
    693 
     662    // default
    694663    PXOPT_LOOKUP_BOOL(simple, config->args, "-simple", false);
     664    PXOPT_LOOKUP_TIME(registered, config->args, "-registered", false, false);
    695665
    696666    diffRunRow *run = diffRunRowAlloc(
    … …  
    703673            tess_id
    704674    );
    705     psFree(registered);
    706675
    707676    if (!run) {

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

    r16103 r16118  
    124124  ADDRENAMEPARAMF(from, to, type, name, name, "==")
    125125
     126#define ADDRENAMEPARAMTIME(from, to, oldname, newname, comment) \
     127{ \
     128    bool status = false; \
     129    psTime *time = psMetadataLookupTime(&status, from, "-" oldname); \
     130    if (!status) { \
     131        psError(PS_ERR_UNKNOWN, false, "failed to lookup value for -" oldname); \
     132        return false; \
     133    } \
     134    if (time) { \
     135        if (!psMetadataAddTime(to, PS_LIST_TAIL, newname, PS_META_DUPLICATE_OK, comment, time)) { \
     136            psError(PS_ERR_UNKNOWN, false, "failed to add item " newname); \
     137            psFree(to); \
     138            return false; \
     139        } \
     140    } \
     141}
     142
     143#define ADDPARAMTIME(from, to, name) \
     144  ADDRENAMEPARAMTIME(from, to, name, name, "==")
     145
    126146static bool newrunMode(pxConfig *config)
    127147{
    … …  
    143163    ADDRENAMEPARAMSTR(config->args, where, "inst", "camera", "==");
    144164    ADDPARAMSTR(config->args, where, "telescope");
    145     ADDPARAMSTR(config->args, where, "dateobs_begin");
    146     ADDPARAMSTR(config->args, where, "dateobs_end");
     165    ADDPARAMTIME(config->args, where, "dateobs_begin");
     166    ADDPARAMTIME(config->args, where, "dateobs_end");
    147167    ADDPARAMSTR(config->args, where, "exp_tag");
    148168    ADDPARAMSTR(config->args, where, "exp_type");

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

    r15765 r16118  
    4343    }
    4444
    45     psTime *time = psTimeGetNow(PS_TIME_TAI);
    46     psString now = psTimeToISO(time);
    47     psFree(time);
     45    psTime *now = psTimeGetNow(PS_TIME_TAI);
    4846
    4947    // -newrun
    … …  
    5856    psMetadataAddStr(newrunArgs, PS_LIST_TAIL, "-telescope",  0,
    5957            "search for telescope", NULL);
    60     psMetadataAddStr(newrunArgs, PS_LIST_TAIL, "-dateobs_begin", 0,   
     58    psMetadataAddTime(newrunArgs, PS_LIST_TAIL, "-dateobs_begin", 0,   
    6159            "search for exposures by time (>=)", NULL);
    62     psMetadataAddStr(newrunArgs, PS_LIST_TAIL, "-dateobs_end", 0,
     60    psMetadataAddTime(newrunArgs, PS_LIST_TAIL, "-dateobs_end", 0,
    6361            "search for exposures by time (<)", NULL);
    6462    psMetadataAddStr(newrunArgs, PS_LIST_TAIL, "-exp_tag",  0,

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

    r16102 r16118  
    269269    PXOPT_LOOKUP_STR(dvodb, config->args, "-dvodb", false, false);
    270270    PXOPT_LOOKUP_BOOL(simple, config->args, "-simple", false);
    271 
    272     psTime *registered = NULL;
    273     {
    274         bool status;
    275         psString registeredStr = psMetadataLookupStr(&status, config->args, "-registered");
    276         if (!status) {
    277             psError(PS_ERR_UNKNOWN, false, "failed to lookup value for -registered");
    278             return false;
    279         }
    280         // pass through NULL as this is an optional field
    281         if (registeredStr) {
    282             registered = psTimeFromISO(registeredStr, PS_TIME_UTC);
    283         } else {
    284             registered = NULL;
    285         }
    286     }
    287 
    288    magicRunRow *run = magicRunRowAlloc(
     271    PXOPT_LOOKUP_TIME(registered, config->args, "-registered", false, false);
     272
     273    magicRunRow *run = magicRunRowAlloc(
    289274            0,          // ID
    290275            "reg",      // state

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

    r15501 r16118  
    4545    }
    4646
    47     psTime *time = psTimeGetNow(PS_TIME_TAI);
    48     psString now = psTimeToISO(time);
    49     psFree(time);
     47    psTime *now = psTimeGetNow(PS_TIME_TAI);
    5048
    5149    // -queue
    … …  
    6058    psMetadataAddStr(definerunArgs, PS_LIST_TAIL, "-dvodb", 0,
    6159            "define dvodb", NULL);
    62     psMetadataAddStr(definerunArgs, PS_LIST_TAIL, "-registered",  0,
     60    psMetadataAddTime(definerunArgs, PS_LIST_TAIL, "-registered",  0,
    6361            "time detrend run was registered", now);
    6462    psMetadataAddBool(definerunArgs, PS_LIST_TAIL, "-simple",  0,

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

    r14122 r16118  
    197197                goto ARG_REQUIRED;
    198198            case PS_DATA_STRING:
     199            case PS_DATA_TIME:
    199200            case PS_DATA_METADATA:
    200201                if (item->data.V) {

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

    r16104 r16118  
    222222    PXOPT_LOOKUP_F64(user_5, config->args, "-user_5", false, false);
    223223    PXOPT_LOOKUP_STR(object, config->args, "-object", false, false);
    224 
    225     psTime *dateobs = NULL;
    226     {
    227         bool status;
    228         psString dateobsStr = psMetadataLookupStr(&status, config->args, "-dateobs");
    229         if (!status) {
    230             psError(PS_ERR_UNKNOWN, false, "failed to lookup value for -dateobs");
    231             return false;
    232         }
    233         // pass through NULL as this is an optional field
    234         if (dateobsStr) {
    235             dateobs = psTimeFromISO(dateobsStr, PS_TIME_UTC);
    236         } else {
    237             dateobs = NULL;
    238         }
    239     }
    240 
     224    PXOPT_LOOKUP_TIME(dateobs, config->args, "-dateobs", false, false);
    241225    PXOPT_LOOKUP_S16(code, config->args, "-code", false, false);
    242226
    … …  
    297281    )) {
    298282        psError(PS_ERR_UNKNOWN, false, "database error");
    299         psFree(dateobs);
    300         return false;
    301     }
    302 
    303     psFree(dateobs);
     283        return false;
     284    }
    304285
    305286    return true;
    … …  
    563544    PXOPT_LOOKUP_F64(user_5, config->args, "-user_5", false, false);
    564545    PXOPT_LOOKUP_STR(object, config->args, "-object", false, false);
    565 
    566     psTime *dateobs = NULL;
    567     {
    568         bool status;
    569         psString dateobsStr = psMetadataLookupStr(&status, config->args, "-dateobs");
    570         if (!status) {
    571             psError(PS_ERR_UNKNOWN, false, "failed to lookup value for -dateobs");
    572             return false;
    573         }
    574         // pass through NULL as this is an optional field
    575         if (dateobsStr) {
    576             dateobs = psTimeFromISO(dateobsStr, PS_TIME_UTC);
    577         } else {
    578             dateobs = NULL;
    579         }
    580     }
     546    PXOPT_LOOKUP_TIME(dateobs, config->args, "-dateobs", false, false);
    581547
    582548    // default

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

    r16049 r16118  
    161161    psMetadataAddStr(addprocessedimfileArgs, PS_LIST_TAIL, "-object",  0,
    162162        "define exposure object", NULL);
    163     psMetadataAddStr(addprocessedimfileArgs, PS_LIST_TAIL, "-dateobs",  0,
     163    psMetadataAddTime(addprocessedimfileArgs, PS_LIST_TAIL, "-dateobs",  0,
    164164        "define observation time", NULL);
    165165    psMetadataAddS16(addprocessedimfileArgs, PS_LIST_TAIL, "-code",  0,
    … …  
    226226    psMetadataAddStr(addprocessedexpArgs, PS_LIST_TAIL, "-exp_tag",  0,
    227227        "define the external exposure tag name (required)", NULL);
    228     psMetadataAddStr(addprocessedexpArgs, PS_LIST_TAIL, "-dateobs",  0,
     228    psMetadataAddTime(addprocessedexpArgs, PS_LIST_TAIL, "-dateobs",  0,
    229229        "define observation time", NULL);
    230230    psMetadataAddStr(addprocessedexpArgs, PS_LIST_TAIL, "-exp_type",  0,

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

    r16097 r16118  
    9999    PXOPT_LOOKUP_STR(tess_id, config->args, "-tess_id", true, false);
    100100
    101     // optional
     101    // default
    102102    PXOPT_LOOKUP_BOOL(simple, config->args, "-simple", false);
     103    PXOPT_LOOKUP_TIME(registered, config->args, "-registered", false, false);
    103104
    104105    // we have to support multipe exp_ids
    … …  
    108109        psError(PS_ERR_UNKNOWN, true, "-warp_id is required");
    109110        return false;
    110     }
    111 
    112     psTime *registered = NULL;
    113     {
    114         bool status;
    115         psString registeredStr = psMetadataLookupStr(&status, config->args, "-registered");
    116         if (!status) {
    117             psError(PS_ERR_UNKNOWN, false, "failed to lookup value for -registered");
    118             return false;
    119         }
    120         // pass through NULL as this is an optional field
    121         if (registeredStr) {
    122             registered = psTimeFromISO(registeredStr, PS_TIME_UTC);
    123         } else {
    124             registered = NULL;
    125         }
    126111    }
    127112
    … …  
    135120            tess_id
    136121    );
    137     psFree(registered);
    138122    if (!run) {
    139123        psError(PS_ERR_UNKNOWN, false, "failed to alloc stackRun object");

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

    r15376 r16118  
    4343    }
    4444
    45     psTime *time = psTimeGetNow(PS_TIME_TAI);
    46     psString now = psTimeToISO(time);
    47     psFree(time);
     45    psTime *now = psTimeGetNow(PS_TIME_TAI);
    4846
    4947    // -definerun
    … …  
    5149    psMetadataAddStr(definerunArgs, PS_LIST_TAIL, "-workdir", 0,
    5250            "define workdir (required)", NULL);
    53     psMetadataAddStr(definerunArgs, PS_LIST_TAIL, "-registered",  0,
     51    psMetadataAddTime(definerunArgs, PS_LIST_TAIL, "-registered",  0,
    5452            "time detrend run was registered", now);
    5553    psMetadataAddStr(definerunArgs, PS_LIST_TAIL, "-skycell_id",  0,

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

    r16096 r16118  
    120120    PXOPT_LOOKUP_STR(tess_id, config->args, "-tess_id", false, false);
    121121    PXOPT_LOOKUP_STR(end_stage, config->args, "-end_stage", false, false);
     122
     123    // default
    122124    PXOPT_LOOKUP_BOOL(simple, config->args, "-simple", false);
    123 
    124     psTime *registered = NULL;
    125     {
    126         bool status;
    127         psString registeredStr = psMetadataLookupStr(&status, config->args, "-registered");
    128         if (!status) {
    129             psError(PS_ERR_UNKNOWN, false, "failed to lookup value for -registered");
    130             return false;
    131         }
    132         // pass through NULL as this is an optional field
    133         if (registeredStr) {
    134             registered = psTimeFromISO(registeredStr, PS_TIME_UTC);
    135         } else {
    136             registered = NULL;
    137         }
    138     }
     125    PXOPT_LOOKUP_TIME(registered, config->args, "-registered", false, false);
    139126
    140127    warpRunRow *warpRun = warpRunRowAlloc(
    … …  
    149136            registered
    150137    );
    151     psFree(registered);
    152138    if (!warpRun) {
    153139        psError(PS_ERR_UNKNOWN, false, "failed to alloc warpRun object");

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

    r16049 r16118  
    4545    }
    4646
    47     psTime *time = psTimeGetNow(PS_TIME_TAI);
    48     psString now = psTimeToISO(time);
    49     psFree(time);
     47    psTime *now = psTimeGetNow(PS_TIME_TAI);
    5048
    5149    // -definerun
    … …  
    6159    psMetadataAddStr(definerunArgs, PS_LIST_TAIL, "-end_stage", 0,
    6260            "define end stage", NULL);
    63     psMetadataAddStr(definerunArgs, PS_LIST_TAIL, "-registered",  0,
     61    psMetadataAddTime(definerunArgs, PS_LIST_TAIL, "-registered",  0,
    6462            "time detrend run was registered", now);
    6563    psMetadataAddBool(definerunArgs, PS_LIST_TAIL, "-simple",  0,
    … …  
    7270    psMetadataAddStr(runoneArgs, PS_LIST_TAIL, "-workdir", 0,
    7371            "define workdir (required)", NULL);
    74     psMetadataAddStr(runoneArgs, PS_LIST_TAIL, "-registered",  0,
     72    psMetadataAddTime(runoneArgs, PS_LIST_TAIL, "-registered",  0,
    7573            "time detrend run was registered", now);
    7674    psMetadataAddStr(runoneArgs, PS_LIST_TAIL, "-cam_id", 0,
Note: See TracChangeset for help on using the changeset viewer.