IPP Software Navigation Tools IPP Links Communication Pan-STARRS Links

Ignore:
Timestamp:
Jul 15, 2008, 10:30:59 AM (18 years ago)
Author:
eugene
Message:

completely deprecate config->where; make all command-line handling consistent; move nearly all sql into share/*.sql; ensure consistency between args supplied and used

File:
1 edited

Legend:

Unmodified
Added
Removed

  • trunk/ippTools/src/warptoolConfig.c

    r18461 r18561  
    4949    // -definerun
    5050    psMetadata *definerunArgs = psMetadataAlloc();
    51     psMetadataAddS64(definerunArgs, PS_LIST_TAIL, "-fake_id", 0,
    52             "define camtool ID (required)", 0);
    53     psMetadataAddStr(definerunArgs, PS_LIST_TAIL, "-mode", 0,
    54             "define mode (required)", NULL);
    55     psMetadataAddStr(definerunArgs, PS_LIST_TAIL, "-workdir", 0,
    56             "define workdir (required)", NULL);
    57     psMetadataAddStr(definerunArgs, PS_LIST_TAIL, "-label", 0,
    58             "define label", NULL);
    59     psMetadataAddStr(definerunArgs, PS_LIST_TAIL, "-dvodb", 0,
    60             "define dvodb", NULL);
    61     psMetadataAddStr(definerunArgs, PS_LIST_TAIL, "-tess_id", 0,
    62             "define tess_id", NULL);
    63     psMetadataAddStr(definerunArgs, PS_LIST_TAIL, "-end_stage", 0,
    64             "define end stage", NULL);
    65     psMetadataAddTime(definerunArgs, PS_LIST_TAIL, "-registered",  0,
    66             "time detrend run was registered", now);
    67     psMetadataAddBool(definerunArgs, PS_LIST_TAIL, "-magiced",  0,
    68             "has this exposure been magiced", false);
    69     psMetadataAddBool(definerunArgs, PS_LIST_TAIL, "-simple",  0,
    70             "use the simple output format", false);
     51    psMetadataAddS64(definerunArgs, PS_LIST_TAIL, "-fake_id", 0,            "define camtool ID (required)", 0);
     52    psMetadataAddStr(definerunArgs, PS_LIST_TAIL, "-mode", 0,            "define mode (required)", NULL);
     53    psMetadataAddStr(definerunArgs, PS_LIST_TAIL, "-workdir", 0,            "define workdir (required)", NULL);
     54    psMetadataAddStr(definerunArgs, PS_LIST_TAIL, "-label", 0,            "define label", NULL);
     55    psMetadataAddStr(definerunArgs, PS_LIST_TAIL, "-dvodb", 0,            "define dvodb", NULL);
     56    psMetadataAddStr(definerunArgs, PS_LIST_TAIL, "-tess_id", 0,            "define tess_id", NULL);
     57    psMetadataAddStr(definerunArgs, PS_LIST_TAIL, "-end_stage", 0,            "define end stage", NULL);
     58    psMetadataAddTime(definerunArgs, PS_LIST_TAIL, "-registered",  0,            "time detrend run was registered", now);
     59    psMetadataAddBool(definerunArgs, PS_LIST_TAIL, "-magiced",  0,            "has this exposure been magiced", false);
     60    psMetadataAddBool(definerunArgs, PS_LIST_TAIL, "-simple",  0,            "use the simple output format", false);
    7161
    7262    // -updaterun
     63    // XXX need to allow multiple fake_ids
     64    // XXX need to allow multiple fake_ids
     65    // XXX need to allow multiple chip_ids
     66    // XXX need to allow multiple exp_ids
    7367    psMetadata *updaterunArgs = psMetadataAlloc();
    74     // XXX need to allow multiple fake_ids
    75     psMetadataAddS64(updaterunArgs, PS_LIST_TAIL, "-warp_id", 0,
    76             "search by warptool ID", 0);
    77     // XXX need to allow multiple fake_ids
    78     psMetadataAddS64(updaterunArgs, PS_LIST_TAIL, "-fake_id",  0,
    79             "search by fake_id", 0);
    80     // XXX need to allow multiple chip_ids
    81     psMetadataAddS64(updaterunArgs, PS_LIST_TAIL, "-chip_id",  0,
    82             "search by chip_id", 0);
    83     // XXX need to allow multiple exp_ids
    84     psMetadataAddS64(updaterunArgs, PS_LIST_TAIL, "-exp_id",  0,
    85             "search by exp_id", 0);
    86     psMetadataAddStr(updaterunArgs, PS_LIST_TAIL, "-exp_name",  0,
    87             "search by exp_name", NULL);
    88     psMetadataAddStr(updaterunArgs, PS_LIST_TAIL, "-inst",  0,
    89             "search for camera", NULL);
    90     psMetadataAddStr(updaterunArgs, PS_LIST_TAIL, "-telescope",  0,
    91             "search for telescope", NULL);
    92     psMetadataAddTime(updaterunArgs, PS_LIST_TAIL, "-dateobs_begin", 0,
    93             "search for exposures by time (>=)", NULL);
    94     psMetadataAddTime(updaterunArgs, PS_LIST_TAIL, "-dateobs_end", 0,
    95             "search for exposures by time (<)", NULL);
    96     psMetadataAddStr(updaterunArgs, PS_LIST_TAIL, "-exp_tag",  0,
    97             "search by exp_tag", NULL);
    98     psMetadataAddStr(updaterunArgs, PS_LIST_TAIL, "-exp_type",  0,
    99             "search by exp_type", NULL);
    100     psMetadataAddStr(updaterunArgs, PS_LIST_TAIL, "-filelevel",  0,
    101             "search by filelevel", NULL);
    102     psMetadataAddStr(updaterunArgs, PS_LIST_TAIL, "-reduction",  0,
    103             "search by reduction class", NULL);
    104     psMetadataAddStr(updaterunArgs, PS_LIST_TAIL, "-filter",  0,
    105             "search for filter", NULL);
    106     psMetadataAddF32(updaterunArgs, PS_LIST_TAIL, "-airmass_min",  0,
    107             "define min airmass", NAN);
    108     psMetadataAddF32(updaterunArgs, PS_LIST_TAIL, "-airmass_max",  0,
    109             "define max airmass", NAN);
    110     psMetadataAddF64(updaterunArgs, PS_LIST_TAIL, "-ra_min",  0,
    111             "define min", NAN);
    112     psMetadataAddF64(updaterunArgs, PS_LIST_TAIL, "-ra_max",  0,
    113             "define max", NAN);
    114     psMetadataAddF64(updaterunArgs, PS_LIST_TAIL, "-decl_min",  0,
    115             "define min", NAN);
    116     psMetadataAddF64(updaterunArgs, PS_LIST_TAIL, "-decl_max",  0,
    117             "define max", NAN);
    118     psMetadataAddF32(updaterunArgs, PS_LIST_TAIL, "-exp_time_min",  0,
    119             "define min", NAN);
    120     psMetadataAddF32(updaterunArgs, PS_LIST_TAIL, "-exp_time_max",  0,
    121             "define max", NAN);
    122     psMetadataAddF32(updaterunArgs, PS_LIST_TAIL, "-sat_pixel_frac_min",  0,
    123             "define max fraction of saturated pixels", NAN);
    124     psMetadataAddF32(updaterunArgs, PS_LIST_TAIL, "-sat_pixel_frac_max",  0,
    125             "define min fraction of saturated pixels", NAN);
    126     psMetadataAddF64(updaterunArgs, PS_LIST_TAIL, "-bg_min",  0,
    127             "define max", NAN);
    128     psMetadataAddF64(updaterunArgs, PS_LIST_TAIL, "-bg_max",  0,
    129             "define max", NAN);
    130     psMetadataAddF64(updaterunArgs, PS_LIST_TAIL, "-bg_stdev_min",  0,
    131             "define max", NAN);
    132     psMetadataAddF64(updaterunArgs, PS_LIST_TAIL, "-bg_stdev_max",  0,
    133             "define max", NAN);
    134     psMetadataAddF64(updaterunArgs, PS_LIST_TAIL, "-bg_mean_stdev_min",  0,
    135             "define max", NAN);
    136     psMetadataAddF64(updaterunArgs, PS_LIST_TAIL, "-bg_mean_stdev_max",  0,
    137             "define max", NAN);
    138     psMetadataAddF64(updaterunArgs, PS_LIST_TAIL, "-alt_min",  0,
    139             "define min", NAN);
    140     psMetadataAddF64(updaterunArgs, PS_LIST_TAIL, "-alt_max",  0,
    141             "define max", NAN);
    142     psMetadataAddF64(updaterunArgs, PS_LIST_TAIL, "-az_min",  0,
    143             "define min", NAN);
    144     psMetadataAddF64(updaterunArgs, PS_LIST_TAIL, "-az_max",  0,
    145             "define max", NAN);
    146     psMetadataAddF64(updaterunArgs, PS_LIST_TAIL, "-ccd_temp_min",  0,
    147             "define min ccd tempature", NAN);
    148     psMetadataAddF64(updaterunArgs, PS_LIST_TAIL, "-ccd_temp_max",  0,
    149             "define max ccd tempature", NAN);
    150     psMetadataAddF64(updaterunArgs, PS_LIST_TAIL, "-posang_min",  0,
    151             "define min rotator position angle", NAN);
    152     psMetadataAddF64(updaterunArgs, PS_LIST_TAIL, "-posang_max",  0,
    153             "define max rotator position angle", NAN);
    154     psMetadataAddStr(updaterunArgs, PS_LIST_TAIL, "-object",  0,
    155             "search by exposure object", NULL);
    156     psMetadataAddF32(updaterunArgs, PS_LIST_TAIL, "-solang_min",  0,
    157             "define min solar angle", NAN);
    158     psMetadataAddF32(updaterunArgs, PS_LIST_TAIL, "-solang_max",  0,
    159             "define max solar angle", NAN);
    160 
    161     psMetadataAddBool(updaterunArgs, PS_LIST_TAIL, "-all",  0,
    162             "allow everything to be queued without search terms", false);
    163     psMetadataAddStr(updaterunArgs, PS_LIST_TAIL, "-state", 0,
    164             "set state", NULL);
    165     psMetadataAddStr(updaterunArgs, PS_LIST_TAIL, "-label", 0,
    166             "set label", NULL);
     68    psMetadataAddS64(updaterunArgs, PS_LIST_TAIL, "-warp_id", 0,            "search by warptool ID", 0);
     69    psMetadataAddS64(updaterunArgs, PS_LIST_TAIL, "-fake_id",  0,            "search by fake_id", 0);
     70    psMetadataAddS64(updaterunArgs, PS_LIST_TAIL, "-chip_id",  0,            "search by chip_id", 0);
     71    psMetadataAddS64(updaterunArgs, PS_LIST_TAIL, "-exp_id",  0,            "search by exp_id", 0);
     72    psMetadataAddStr(updaterunArgs, PS_LIST_TAIL, "-exp_name",  0,            "search by exp_name", NULL);
     73    psMetadataAddStr(updaterunArgs, PS_LIST_TAIL, "-inst",  0,            "search for camera", NULL);
     74    psMetadataAddStr(updaterunArgs, PS_LIST_TAIL, "-telescope",  0,            "search for telescope", NULL);
     75    psMetadataAddTime(updaterunArgs, PS_LIST_TAIL, "-dateobs_begin", 0,            "search for exposures by time (>=)", NULL);
     76    psMetadataAddTime(updaterunArgs, PS_LIST_TAIL, "-dateobs_end", 0,            "search for exposures by time (<)", NULL);
     77    psMetadataAddStr(updaterunArgs, PS_LIST_TAIL, "-exp_tag",  0,            "search by exp_tag", NULL);
     78    psMetadataAddStr(updaterunArgs, PS_LIST_TAIL, "-exp_type",  0,            "search by exp_type", NULL);
     79    psMetadataAddStr(updaterunArgs, PS_LIST_TAIL, "-filelevel",  0,            "search by filelevel", NULL);
     80    psMetadataAddStr(updaterunArgs, PS_LIST_TAIL, "-reduction",  0,            "search by reduction class", NULL);
     81    psMetadataAddStr(updaterunArgs, PS_LIST_TAIL, "-filter",  0,            "search for filter", NULL);
     82    psMetadataAddF32(updaterunArgs, PS_LIST_TAIL, "-airmass_min",  0,            "define min airmass", NAN);
     83    psMetadataAddF32(updaterunArgs, PS_LIST_TAIL, "-airmass_max",  0,            "define max airmass", NAN);
     84    psMetadataAddF64(updaterunArgs, PS_LIST_TAIL, "-ra_min",  0,            "define min", NAN);
     85    psMetadataAddF64(updaterunArgs, PS_LIST_TAIL, "-ra_max",  0,            "define max", NAN);
     86    psMetadataAddF64(updaterunArgs, PS_LIST_TAIL, "-decl_min",  0,            "define min", NAN);
     87    psMetadataAddF64(updaterunArgs, PS_LIST_TAIL, "-decl_max",  0,            "define max", NAN);
     88    psMetadataAddF32(updaterunArgs, PS_LIST_TAIL, "-exp_time_min",  0,            "define min", NAN);
     89    psMetadataAddF32(updaterunArgs, PS_LIST_TAIL, "-exp_time_max",  0,            "define max", NAN);
     90    psMetadataAddF32(updaterunArgs, PS_LIST_TAIL, "-sat_pixel_frac_min",  0,            "define max fraction of saturated pixels", NAN);
     91    psMetadataAddF32(updaterunArgs, PS_LIST_TAIL, "-sat_pixel_frac_max",  0,            "define min fraction of saturated pixels", NAN);
     92    psMetadataAddF64(updaterunArgs, PS_LIST_TAIL, "-bg_min",  0,            "define max", NAN);
     93    psMetadataAddF64(updaterunArgs, PS_LIST_TAIL, "-bg_max",  0,            "define max", NAN);
     94    psMetadataAddF64(updaterunArgs, PS_LIST_TAIL, "-bg_stdev_min",  0,            "define max", NAN);
     95    psMetadataAddF64(updaterunArgs, PS_LIST_TAIL, "-bg_stdev_max",  0,            "define max", NAN);
     96    psMetadataAddF64(updaterunArgs, PS_LIST_TAIL, "-bg_mean_stdev_min",  0,            "define max", NAN);
     97    psMetadataAddF64(updaterunArgs, PS_LIST_TAIL, "-bg_mean_stdev_max",  0,            "define max", NAN);
     98    psMetadataAddF64(updaterunArgs, PS_LIST_TAIL, "-alt_min",  0,            "define min", NAN);
     99    psMetadataAddF64(updaterunArgs, PS_LIST_TAIL, "-alt_max",  0,            "define max", NAN);
     100    psMetadataAddF64(updaterunArgs, PS_LIST_TAIL, "-az_min",  0,            "define min", NAN);
     101    psMetadataAddF64(updaterunArgs, PS_LIST_TAIL, "-az_max",  0,            "define max", NAN);
     102    psMetadataAddF64(updaterunArgs, PS_LIST_TAIL, "-ccd_temp_min",  0,            "define min ccd tempature", NAN);
     103    psMetadataAddF64(updaterunArgs, PS_LIST_TAIL, "-ccd_temp_max",  0,            "define max ccd tempature", NAN);
     104    psMetadataAddF64(updaterunArgs, PS_LIST_TAIL, "-posang_min",  0,            "define min rotator position angle", NAN);
     105    psMetadataAddF64(updaterunArgs, PS_LIST_TAIL, "-posang_max",  0,            "define max rotator position angle", NAN);
     106    psMetadataAddStr(updaterunArgs, PS_LIST_TAIL, "-object",  0,            "search by exposure object", NULL);
     107    psMetadataAddF32(updaterunArgs, PS_LIST_TAIL, "-solang_min",  0,            "define min solar angle", NAN);
     108    psMetadataAddF32(updaterunArgs, PS_LIST_TAIL, "-solang_max",  0,            "define max solar angle", NAN);
     109
     110    psMetadataAddBool(updaterunArgs, PS_LIST_TAIL, "-all",  0,            "allow everything to be queued without search terms", false);
     111    psMetadataAddStr(updaterunArgs, PS_LIST_TAIL, "-state", 0,            "set state", NULL);
     112    psMetadataAddStr(updaterunArgs, PS_LIST_TAIL, "-label", 0,            "set label", NULL);
     113
    167114#if 0
    168     psMetadataAddStr(updaterunArgs, PS_LIST_TAIL, "-workdir", 0,
    169             "define workdir (required)", NULL);
    170     psMetadataAddStr(updaterunArgs, PS_LIST_TAIL, "-registered",  0,
    171             "time detrend run was registered", now);
     115    psMetadataAddStr(updaterunArgs, PS_LIST_TAIL, "-workdir", 0,            "define workdir (required)", NULL);
     116    psMetadataAddStr(updaterunArgs, PS_LIST_TAIL, "-registered",  0,            "time detrend run was registered", now);
    172117#endif
    173118
    174119    // -exp
    175120    psMetadata *expArgs = psMetadataAlloc();
    176     psMetadataAddS64(expArgs, PS_LIST_TAIL, "-warp_id", 0,
    177             "search by warptool ID", 0);
    178     psMetadataAddS64(expArgs, PS_LIST_TAIL, "-fake_id", 0,
    179             "search by camtool ID", 0);
    180     psMetadataAddU64(expArgs, PS_LIST_TAIL, "-limit",  0,
    181             "limit result set to N items", 0);
    182     psMetadataAddBool(expArgs, PS_LIST_TAIL, "-simple",  0,
    183             "use the simple output format", false);
     121    psMetadataAddS64(expArgs, PS_LIST_TAIL, "-warp_id", 0,            "search by warptool ID", 0);
     122    psMetadataAddS64(expArgs, PS_LIST_TAIL, "-fake_id", 0,            "search by camtool ID", 0);
     123    psMetadataAddU64(expArgs, PS_LIST_TAIL, "-limit",  0,            "limit result set to N items", 0);
     124    psMetadataAddBool(expArgs, PS_LIST_TAIL, "-simple",  0,            "use the simple output format", false);
    184125
    185126    // -imfile
    186127    psMetadata *imfileArgs = psMetadataAlloc();
    187     psMetadataAddS64(imfileArgs, PS_LIST_TAIL, "-warp_id", 0,
    188             "search by warptool ID", 0);
    189     psMetadataAddS64(imfileArgs, PS_LIST_TAIL, "-fake_id", 0,
    190             "search by camtool ID", 0);
    191     psMetadataAddU64(imfileArgs, PS_LIST_TAIL, "-limit",  0,
    192             "limit result set to N items", 0);
    193     psMetadataAddBool(imfileArgs, PS_LIST_TAIL, "-simple",  0,
    194             "use the simple output format", false);
     128    psMetadataAddS64(imfileArgs, PS_LIST_TAIL, "-warp_id", 0,            "search by warptool ID", 0);
     129    psMetadataAddS64(imfileArgs, PS_LIST_TAIL, "-fake_id", 0,            "search by camtool ID", 0);
     130    psMetadataAddU64(imfileArgs, PS_LIST_TAIL, "-limit",  0,            "limit result set to N items", 0);
     131    psMetadataAddBool(imfileArgs, PS_LIST_TAIL, "-simple",  0,            "use the simple output format", false);
    195132
    196133    // -tooverlap
    197134    psMetadata *tooverlapArgs = psMetadataAlloc();
    198     psMetadataAddS64(tooverlapArgs, PS_LIST_TAIL, "-warp_id", 0,
    199             "search by warp ID", 0);
    200     psMetadataAddU64(tooverlapArgs, PS_LIST_TAIL, "-limit",  0,
    201             "limit result set to N items", 0);
    202     psMetadataAddBool(tooverlapArgs, PS_LIST_TAIL, "-simple",  0,
    203             "use the simple output format", false);
     135    psMetadataAddS64(tooverlapArgs, PS_LIST_TAIL, "-warp_id", 0,            "search by warp ID", 0);
     136    psMetadataAddU64(tooverlapArgs, PS_LIST_TAIL, "-limit",  0,            "limit result set to N items", 0);
     137    psMetadataAddBool(tooverlapArgs, PS_LIST_TAIL, "-simple",  0,            "use the simple output format", false);
    204138
    205139    // -addoverlap
    206140    psMetadata *addoverlapArgs = psMetadataAlloc();
    207     psMetadataAddStr(addoverlapArgs, PS_LIST_TAIL, "-mapfile", 0,
    208             "path to skycell <-> imfile mapping file", NULL);
    209     psMetadataAddS64(addoverlapArgs, PS_LIST_TAIL, "-warp_id",  0,
    210             "set warp ID", 0);
    211     psMetadataAddS16(addoverlapArgs, PS_LIST_TAIL, "-code",  0,
    212             "set fault code", 0);
     141    psMetadataAddStr(addoverlapArgs, PS_LIST_TAIL, "-mapfile", 0,            "path to skycell <-> imfile mapping file", NULL);
     142    psMetadataAddS64(addoverlapArgs, PS_LIST_TAIL, "-warp_id",  0,            "set warp ID", 0);
     143    psMetadataAddS16(addoverlapArgs, PS_LIST_TAIL, "-code",  0,            "set fault code", 0);
    213144
    214145    // -scmap
    215146    psMetadata *scmapArgs = psMetadataAlloc();
    216     psMetadataAddS64(scmapArgs, PS_LIST_TAIL, "-warp_id", 0,
    217             "search by warptool ID", 0);
    218     psMetadataAddStr(scmapArgs, PS_LIST_TAIL, "-skycell_id", 0,
    219             "search by skycell ID", NULL);
    220     psMetadataAddStr(scmapArgs, PS_LIST_TAIL, "-tess_id", 0,
    221             "search by tess ID", NULL);
    222     psMetadataAddU64(scmapArgs, PS_LIST_TAIL, "-limit",  0,
    223             "limit result set to N items", 0);
    224     psMetadataAddBool(scmapArgs, PS_LIST_TAIL, "-simple",  0,
    225             "use the simple output format", false);
     147    psMetadataAddS64(scmapArgs, PS_LIST_TAIL, "-warp_id", 0,            "search by warptool ID", 0);
     148    psMetadataAddStr(scmapArgs, PS_LIST_TAIL, "-skycell_id", 0,            "search by skycell ID", NULL);
     149    psMetadataAddStr(scmapArgs, PS_LIST_TAIL, "-tess_id", 0,            "search by tess ID", NULL);
     150    psMetadataAddU64(scmapArgs, PS_LIST_TAIL, "-limit",  0,            "limit result set to N items", 0);
     151    psMetadataAddBool(scmapArgs, PS_LIST_TAIL, "-simple",  0,            "use the simple output format", false);
    226152
    227153    // -towarped
    228154    psMetadata *towarpedArgs = psMetadataAlloc();
    229     psMetadataAddS64(towarpedArgs, PS_LIST_TAIL, "-warp_id", 0,
    230             "search by warptool ID", 0);
    231     psMetadataAddU64(towarpedArgs, PS_LIST_TAIL, "-limit",  0,
    232             "limit result set to N items", 0);
    233     psMetadataAddBool(towarpedArgs, PS_LIST_TAIL, "-simple",  0,
    234             "use the simple output format", false);
     155    psMetadataAddS64(towarpedArgs, PS_LIST_TAIL, "-warp_id", 0,            "search by warptool ID", 0);
     156    psMetadataAddU64(towarpedArgs, PS_LIST_TAIL, "-limit",  0,            "limit result set to N items", 0);
     157    psMetadataAddBool(towarpedArgs, PS_LIST_TAIL, "-simple",  0,            "use the simple output format", false);
    235158
    236159    // -addwarped
    237160    psMetadata *addwarpedArgs = psMetadataAlloc();
    238     psMetadataAddS64(addwarpedArgs, PS_LIST_TAIL, "-warp_id", 0,
    239             "define warptool ID (required)", 0);
    240     psMetadataAddStr(addwarpedArgs, PS_LIST_TAIL, "-skycell_id",  0,
    241             "define skycell ID (required)", NULL);
    242     psMetadataAddStr(addwarpedArgs, PS_LIST_TAIL, "-tess_id",  0,
    243             "define tessellation ID (required)", NULL);
    244     psMetadataAddStr(addwarpedArgs, PS_LIST_TAIL, "-uri", 0,
    245             "define URI of file", 0);
    246     psMetadataAddStr(addwarpedArgs, PS_LIST_TAIL, "-path_base", 0,
    247             "define base output location", 0);
    248     psMetadataAddF64(addwarpedArgs, PS_LIST_TAIL, "-bg",  0,
    249             "define exposure background", NAN);
    250     psMetadataAddF64(addwarpedArgs, PS_LIST_TAIL, "-bg_stdev",  0,
    251             "define exposure background stdev", NAN);
    252     psMetadataAddF32(addwarpedArgs, PS_LIST_TAIL, "-dtime_warp",  0,
    253             "define elapsed processing time", NAN);
    254     psMetadataAddS32(addwarpedArgs, PS_LIST_TAIL, "-xmin",  0,
    255             "define minimum x value", INT_MAX);
    256     psMetadataAddS32(addwarpedArgs, PS_LIST_TAIL, "-xmax",  0,
    257             "define maximum x value", -INT_MAX);
    258     psMetadataAddS32(addwarpedArgs, PS_LIST_TAIL, "-ymin",  0,
    259             "define minimum y value", INT_MAX);
    260     psMetadataAddS32(addwarpedArgs, PS_LIST_TAIL, "-ymax",  0,
    261             "define maximum y value", -INT_MAX);
    262     psMetadataAddStr(addwarpedArgs, PS_LIST_TAIL, "-hostname", 0,
    263             "define hostname", 0);
    264     psMetadataAddF32(addwarpedArgs, PS_LIST_TAIL, "-good_frac",  0,
    265             "define %% of good pixels", NAN);
    266     psMetadataAddBool(addwarpedArgs, PS_LIST_TAIL, "-ignore",  0,
    267             "define if this skycell should be ignored", false);
    268     psMetadataAddS16(addwarpedArgs, PS_LIST_TAIL, "-code",  0,
    269             "set fault code", 0);
     161    psMetadataAddS64(addwarpedArgs, PS_LIST_TAIL, "-warp_id", 0,            "define warptool ID (required)", 0);
     162    psMetadataAddStr(addwarpedArgs, PS_LIST_TAIL, "-skycell_id",  0,            "define skycell ID (required)", NULL);
     163    psMetadataAddStr(addwarpedArgs, PS_LIST_TAIL, "-tess_id",  0,            "define tessellation ID (required)", NULL);
     164    psMetadataAddStr(addwarpedArgs, PS_LIST_TAIL, "-uri", 0,            "define URI of file", 0);
     165    psMetadataAddStr(addwarpedArgs, PS_LIST_TAIL, "-path_base", 0,            "define base output location", 0);
     166    psMetadataAddF64(addwarpedArgs, PS_LIST_TAIL, "-bg",  0,            "define exposure background", NAN);
     167    psMetadataAddF64(addwarpedArgs, PS_LIST_TAIL, "-bg_stdev",  0,            "define exposure background stdev", NAN);
     168    psMetadataAddF32(addwarpedArgs, PS_LIST_TAIL, "-dtime_warp",  0,            "define elapsed processing time", NAN);
     169    psMetadataAddS32(addwarpedArgs, PS_LIST_TAIL, "-xmin",  0,            "define minimum x value", INT_MAX);
     170    psMetadataAddS32(addwarpedArgs, PS_LIST_TAIL, "-xmax",  0,            "define maximum x value", -INT_MAX);
     171    psMetadataAddS32(addwarpedArgs, PS_LIST_TAIL, "-ymin",  0,            "define minimum y value", INT_MAX);
     172    psMetadataAddS32(addwarpedArgs, PS_LIST_TAIL, "-ymax",  0,            "define maximum y value", -INT_MAX);
     173    psMetadataAddStr(addwarpedArgs, PS_LIST_TAIL, "-hostname", 0,            "define hostname", 0);
     174    psMetadataAddF32(addwarpedArgs, PS_LIST_TAIL, "-good_frac",  0,            "define %% of good pixels", NAN);
     175    psMetadataAddBool(addwarpedArgs, PS_LIST_TAIL, "-ignore",  0,            "define if this skycell should be ignored", false);
     176    psMetadataAddS16(addwarpedArgs, PS_LIST_TAIL, "-code",  0,            "set fault code", 0);
    270177
    271178    // -warped
    272179    psMetadata *warpedArgs = psMetadataAlloc();
    273     psMetadataAddS64(warpedArgs, PS_LIST_TAIL, "-warp_id", 0,
    274             "search by warptool ID", 0);
    275     psMetadataAddStr(warpedArgs, PS_LIST_TAIL, "-skycell_id",  0,
    276             "define skycell ID", NULL);
    277     psMetadataAddStr(warpedArgs, PS_LIST_TAIL, "-tess_id",  0,
    278             "define tessellation ID", NULL);
    279     psMetadataAddS64(warpedArgs, PS_LIST_TAIL, "-exp_id", 0,
    280             "define exposure tag", 0);
    281     psMetadataAddS64(warpedArgs, PS_LIST_TAIL, "-fake_id", 0,
    282             "define phase 3 version of exposure tag", 0);
    283     psMetadataAddU64(warpedArgs, PS_LIST_TAIL, "-limit",  0,
    284             "limit result set to N items", 0);
    285     psMetadataAddBool(warpedArgs, PS_LIST_TAIL, "-simple",  0,
    286             "use the simple output format", false);
     180    psMetadataAddS64(warpedArgs, PS_LIST_TAIL, "-warp_id", 0,            "search by warptool ID", 0);
     181    psMetadataAddStr(warpedArgs, PS_LIST_TAIL, "-skycell_id",  0,            "define skycell ID", NULL);
     182    psMetadataAddStr(warpedArgs, PS_LIST_TAIL, "-tess_id",  0,            "define tessellation ID", NULL);
     183    psMetadataAddS64(warpedArgs, PS_LIST_TAIL, "-exp_id", 0,            "define exposure tag", 0);
     184    psMetadataAddS64(warpedArgs, PS_LIST_TAIL, "-fake_id", 0,            "define phase 3 version of exposure tag", 0);
     185    psMetadataAddU64(warpedArgs, PS_LIST_TAIL, "-limit",  0,            "limit result set to N items", 0);
     186    psMetadataAddBool(warpedArgs, PS_LIST_TAIL, "-simple",  0,            "use the simple output format", false);
    287187
    288188    // -revertwarped
     189    // XXX need to allow multiple fake_ids
     190    // XXX need to allow multiple fake_ids
     191    // XXX need to allow multiple chip_ids
     192    // XXX need to allow multiple exp_ids
    289193    psMetadata *revertwarpedArgs = psMetadataAlloc();
    290     // XXX need to allow multiple fake_ids
    291     psMetadataAddS64(revertwarpedArgs, PS_LIST_TAIL, "-warp_id", 0,
    292             "search by warptool ID", 0);
    293     psMetadataAddStr(revertwarpedArgs, PS_LIST_TAIL, "-skycell_id",  0,
    294             "search by skycell ID", NULL);
    295     psMetadataAddStr(revertwarpedArgs, PS_LIST_TAIL, "-tess_id",  0,
    296             "searcy by tessellation ID", NULL);
    297     // XXX need to allow multiple fake_ids
    298     psMetadataAddS64(revertwarpedArgs, PS_LIST_TAIL, "-fake_id",  0,
    299             "search by fake_id", 0);
    300     // XXX need to allow multiple chip_ids
    301     psMetadataAddS64(revertwarpedArgs, PS_LIST_TAIL, "-chip_id",  0,
    302             "search by chip_id", 0);
    303     // XXX need to allow multiple exp_ids
    304     psMetadataAddS64(revertwarpedArgs, PS_LIST_TAIL, "-exp_id",  0,
    305             "search by exp_id", 0);
    306     psMetadataAddStr(revertwarpedArgs, PS_LIST_TAIL, "-exp_name",  0,
    307             "search by exp_name", NULL);
    308     psMetadataAddStr(revertwarpedArgs, PS_LIST_TAIL, "-inst",  0,
    309             "search for camera", NULL);
    310     psMetadataAddStr(revertwarpedArgs, PS_LIST_TAIL, "-telescope",  0,
    311             "search for telescope", NULL);
    312     psMetadataAddTime(revertwarpedArgs, PS_LIST_TAIL, "-dateobs_begin", 0,
    313             "search for exposures by time (>=)", NULL);
    314     psMetadataAddTime(revertwarpedArgs, PS_LIST_TAIL, "-dateobs_end", 0,
    315             "search for exposures by time (<)", NULL);
    316     psMetadataAddStr(revertwarpedArgs, PS_LIST_TAIL, "-exp_tag",  0,
    317             "search by exp_tag", NULL);
    318     psMetadataAddStr(revertwarpedArgs, PS_LIST_TAIL, "-exp_type",  0,
    319             "search by exp_type", NULL);
    320     psMetadataAddStr(revertwarpedArgs, PS_LIST_TAIL, "-filelevel",  0,
    321             "search by filelevel", NULL);
    322     psMetadataAddStr(revertwarpedArgs, PS_LIST_TAIL, "-reduction",  0,
    323             "search by reduction class", NULL);
    324     psMetadataAddStr(revertwarpedArgs, PS_LIST_TAIL, "-filter",  0,
    325             "search for filter", NULL);
    326     psMetadataAddF32(revertwarpedArgs, PS_LIST_TAIL, "-airmass_min",  0,
    327             "define min airmass", NAN);
    328     psMetadataAddF32(revertwarpedArgs, PS_LIST_TAIL, "-airmass_max",  0,
    329             "define max airmass", NAN);
    330     psMetadataAddF64(revertwarpedArgs, PS_LIST_TAIL, "-ra_min",  0,
    331             "define min", NAN);
    332     psMetadataAddF64(revertwarpedArgs, PS_LIST_TAIL, "-ra_max",  0,
    333             "define max", NAN);
    334     psMetadataAddF64(revertwarpedArgs, PS_LIST_TAIL, "-decl_min",  0,
    335             "define min", NAN);
    336     psMetadataAddF64(revertwarpedArgs, PS_LIST_TAIL, "-decl_max",  0,
    337             "define max", NAN);
    338     psMetadataAddF32(revertwarpedArgs, PS_LIST_TAIL, "-exp_time_min",  0,
    339             "define min", NAN);
    340     psMetadataAddF32(revertwarpedArgs, PS_LIST_TAIL, "-exp_time_max",  0,
    341             "define max", NAN);
    342     psMetadataAddF32(revertwarpedArgs, PS_LIST_TAIL, "-sat_pixel_frac_min",  0,
    343             "define max fraction of saturated pixels", NAN);
    344     psMetadataAddF32(revertwarpedArgs, PS_LIST_TAIL, "-sat_pixel_frac_max",  0,
    345             "define min fraction of saturated pixels", NAN);
    346     psMetadataAddF64(revertwarpedArgs, PS_LIST_TAIL, "-bg_min",  0,
    347             "define max", NAN);
    348     psMetadataAddF64(revertwarpedArgs, PS_LIST_TAIL, "-bg_max",  0,
    349             "define max", NAN);
    350     psMetadataAddF64(revertwarpedArgs, PS_LIST_TAIL, "-bg_stdev_min",  0,
    351             "define max", NAN);
    352     psMetadataAddF64(revertwarpedArgs, PS_LIST_TAIL, "-bg_stdev_max",  0,
    353             "define max", NAN);
    354     psMetadataAddF64(revertwarpedArgs, PS_LIST_TAIL, "-bg_mean_stdev_min",  0,
    355             "define max", NAN);
    356     psMetadataAddF64(revertwarpedArgs, PS_LIST_TAIL, "-bg_mean_stdev_max",  0,
    357             "define max", NAN);
    358     psMetadataAddF64(revertwarpedArgs, PS_LIST_TAIL, "-alt_min",  0,
    359             "define min", NAN);
    360     psMetadataAddF64(revertwarpedArgs, PS_LIST_TAIL, "-alt_max",  0,
    361             "define max", NAN);
    362     psMetadataAddF64(revertwarpedArgs, PS_LIST_TAIL, "-az_min",  0,
    363             "define min", NAN);
    364     psMetadataAddF64(revertwarpedArgs, PS_LIST_TAIL, "-az_max",  0,
    365             "define max", NAN);
    366     psMetadataAddF64(revertwarpedArgs, PS_LIST_TAIL, "-ccd_temp_min",  0,
    367             "define min ccd tempature", NAN);
    368     psMetadataAddF64(revertwarpedArgs, PS_LIST_TAIL, "-ccd_temp_max",  0,
    369             "define max ccd tempature", NAN);
    370     psMetadataAddF64(revertwarpedArgs, PS_LIST_TAIL, "-posang_min",  0,
    371             "define min rotator position angle", NAN);
    372     psMetadataAddF64(revertwarpedArgs, PS_LIST_TAIL, "-posang_max",  0,
    373             "define max rotator position angle", NAN);
    374     psMetadataAddStr(revertwarpedArgs, PS_LIST_TAIL, "-object",  0,
    375             "search by exposure object", NULL);
    376     psMetadataAddF32(revertwarpedArgs, PS_LIST_TAIL, "-solang_min",  0,
    377             "define min solar angle", NAN);
    378     psMetadataAddF32(revertwarpedArgs, PS_LIST_TAIL, "-solang_max",  0,
    379             "define max solar angle", NAN);
    380 
    381     psMetadataAddS16(revertwarpedArgs, PS_LIST_TAIL, "-code",  0,
    382             "search by fault code", 0);
    383     psMetadataAddBool(revertwarpedArgs, PS_LIST_TAIL, "-all",  0,
    384             "allow everything to be queued without search terms", false);
     194    psMetadataAddS64(revertwarpedArgs, PS_LIST_TAIL, "-warp_id", 0,            "search by warptool ID", 0);
     195    psMetadataAddStr(revertwarpedArgs, PS_LIST_TAIL, "-skycell_id",  0,            "search by skycell ID", NULL);
     196    psMetadataAddStr(revertwarpedArgs, PS_LIST_TAIL, "-tess_id",  0,            "searcy by tessellation ID", NULL);
     197    psMetadataAddS64(revertwarpedArgs, PS_LIST_TAIL, "-fake_id",  0,            "search by fake_id", 0);
     198    psMetadataAddS64(revertwarpedArgs, PS_LIST_TAIL, "-chip_id",  0,            "search by chip_id", 0);
     199    psMetadataAddS64(revertwarpedArgs, PS_LIST_TAIL, "-exp_id",  0,            "search by exp_id", 0);
     200    psMetadataAddStr(revertwarpedArgs, PS_LIST_TAIL, "-exp_name",  0,            "search by exp_name", NULL);
     201    psMetadataAddStr(revertwarpedArgs, PS_LIST_TAIL, "-inst",  0,            "search for camera", NULL);
     202    psMetadataAddStr(revertwarpedArgs, PS_LIST_TAIL, "-telescope",  0,            "search for telescope", NULL);
     203    psMetadataAddTime(revertwarpedArgs, PS_LIST_TAIL, "-dateobs_begin", 0,            "search for exposures by time (>=)", NULL);
     204    psMetadataAddTime(revertwarpedArgs, PS_LIST_TAIL, "-dateobs_end", 0,            "search for exposures by time (<)", NULL);
     205    psMetadataAddStr(revertwarpedArgs, PS_LIST_TAIL, "-exp_tag",  0,            "search by exp_tag", NULL);
     206    psMetadataAddStr(revertwarpedArgs, PS_LIST_TAIL, "-exp_type",  0,            "search by exp_type", NULL);
     207    psMetadataAddStr(revertwarpedArgs, PS_LIST_TAIL, "-filelevel",  0,            "search by filelevel", NULL);
     208    psMetadataAddStr(revertwarpedArgs, PS_LIST_TAIL, "-reduction",  0,            "search by reduction class", NULL);
     209    psMetadataAddStr(revertwarpedArgs, PS_LIST_TAIL, "-filter",  0,            "search for filter", NULL);
     210    psMetadataAddF32(revertwarpedArgs, PS_LIST_TAIL, "-airmass_min",  0,            "define min airmass", NAN);
     211    psMetadataAddF32(revertwarpedArgs, PS_LIST_TAIL, "-airmass_max",  0,            "define max airmass", NAN);
     212    psMetadataAddF64(revertwarpedArgs, PS_LIST_TAIL, "-ra_min",  0,            "define min", NAN);
     213    psMetadataAddF64(revertwarpedArgs, PS_LIST_TAIL, "-ra_max",  0,            "define max", NAN);
     214    psMetadataAddF64(revertwarpedArgs, PS_LIST_TAIL, "-decl_min",  0,            "define min", NAN);
     215    psMetadataAddF64(revertwarpedArgs, PS_LIST_TAIL, "-decl_max",  0,            "define max", NAN);
     216    psMetadataAddF32(revertwarpedArgs, PS_LIST_TAIL, "-exp_time_min",  0,            "define min", NAN);
     217    psMetadataAddF32(revertwarpedArgs, PS_LIST_TAIL, "-exp_time_max",  0,            "define max", NAN);
     218    psMetadataAddF32(revertwarpedArgs, PS_LIST_TAIL, "-sat_pixel_frac_min",  0,            "define max fraction of saturated pixels", NAN);
     219    psMetadataAddF32(revertwarpedArgs, PS_LIST_TAIL, "-sat_pixel_frac_max",  0,            "define min fraction of saturated pixels", NAN);
     220    psMetadataAddF64(revertwarpedArgs, PS_LIST_TAIL, "-bg_min",  0,            "define max", NAN);
     221    psMetadataAddF64(revertwarpedArgs, PS_LIST_TAIL, "-bg_max",  0,            "define max", NAN);
     222    psMetadataAddF64(revertwarpedArgs, PS_LIST_TAIL, "-bg_stdev_min",  0,            "define max", NAN);
     223    psMetadataAddF64(revertwarpedArgs, PS_LIST_TAIL, "-bg_stdev_max",  0,            "define max", NAN);
     224    psMetadataAddF64(revertwarpedArgs, PS_LIST_TAIL, "-bg_mean_stdev_min",  0,            "define max", NAN);
     225    psMetadataAddF64(revertwarpedArgs, PS_LIST_TAIL, "-bg_mean_stdev_max",  0,            "define max", NAN);
     226    psMetadataAddF64(revertwarpedArgs, PS_LIST_TAIL, "-alt_min",  0,            "define min", NAN);
     227    psMetadataAddF64(revertwarpedArgs, PS_LIST_TAIL, "-alt_max",  0,            "define max", NAN);
     228    psMetadataAddF64(revertwarpedArgs, PS_LIST_TAIL, "-az_min",  0,            "define min", NAN);
     229    psMetadataAddF64(revertwarpedArgs, PS_LIST_TAIL, "-az_max",  0,            "define max", NAN);
     230    psMetadataAddF64(revertwarpedArgs, PS_LIST_TAIL, "-ccd_temp_min",  0,            "define min ccd tempature", NAN);
     231    psMetadataAddF64(revertwarpedArgs, PS_LIST_TAIL, "-ccd_temp_max",  0,            "define max ccd tempature", NAN);
     232    psMetadataAddF64(revertwarpedArgs, PS_LIST_TAIL, "-posang_min",  0,            "define min rotator position angle", NAN);
     233    psMetadataAddF64(revertwarpedArgs, PS_LIST_TAIL, "-posang_max",  0,            "define max rotator position angle", NAN);
     234    psMetadataAddStr(revertwarpedArgs, PS_LIST_TAIL, "-object",  0,            "search by exposure object", NULL);
     235    psMetadataAddF32(revertwarpedArgs, PS_LIST_TAIL, "-solang_min",  0,            "define min solar angle", NAN);
     236    psMetadataAddF32(revertwarpedArgs, PS_LIST_TAIL, "-solang_max",  0,            "define max solar angle", NAN);
     237
     238    psMetadataAddS16(revertwarpedArgs, PS_LIST_TAIL, "-code",  0,            "search by fault code", 0);
     239    psMetadataAddBool(revertwarpedArgs, PS_LIST_TAIL, "-all",  0,            "allow everything to be queued without search terms", false);
    385240
    386241    // -block
    387242    psMetadata *blockArgs = psMetadataAlloc();
    388     psMetadataAddStr(blockArgs, PS_LIST_TAIL, "-label",  0,
    389             "name of a label to mask out (required)", NULL);
     243    psMetadataAddStr(blockArgs, PS_LIST_TAIL, "-label",  0,            "name of a label to mask out (required)", NULL);
    390244
    391245    // -masked
    392246    psMetadata *maskedArgs = psMetadataAlloc();
    393     psMetadataAddBool(maskedArgs, PS_LIST_TAIL, "-simple",  0,
    394             "use the simple output format", false);
     247    psMetadataAddBool(maskedArgs, PS_LIST_TAIL, "-simple",  0,            "use the simple output format", false);
    395248
    396249    // -unblock
    397250    psMetadata *unblockArgs = psMetadataAlloc();
    398     psMetadataAddStr(unblockArgs, PS_LIST_TAIL, "-label",  0,
    399             "name of a label to unmask (required)", NULL);
     251    psMetadataAddStr(unblockArgs, PS_LIST_TAIL, "-label",  0,            "name of a label to unmask (required)", NULL);
    400252
    401253    psFree(now);
    … …  
    429281    psFree(modes);
    430282
    431     // setup search criterion
    432 #define addWhereStr(name) \
    433 { \
    434     psString str = NULL; \
    435     bool status = false; \
    436     if ((str = psMetadataLookupStr(&status, config->args, "-" #name))) { \
    437         if (!psMetadataAddStr(config->where, PS_LIST_TAIL, #name, 0, "==", str)) {\
    438             psError(PS_ERR_UNKNOWN, false, "failed to add item " #name); \
    439             psFree(config); \
    440             return NULL; \
    441         } \
    442     } \
    443 }
    444 
    445 #define addWhereS32(name) \
    446 { \
    447     psS32 s32 = 0; \
    448     bool status = false; \
    449     if ((s32= psMetadataLookupS32(&status, config->args, "-" #name))) { \
    450         if (!psMetadataAddS32(config->where, PS_LIST_TAIL, #name, 0, "==", s32)) { \
    451             psError(PS_ERR_UNKNOWN, false, "failed to add item " #name); \
    452             psFree(config); \
    453             return NULL; \
    454         } \
    455     } \
    456 }
    457 
    458 
    459     // generate SQL where clause
    460     config->where = psMetadataAlloc();
    461 
    462 {
    463     psS64 warp_id = -1;
    464     bool status = false;
    465     if ((warp_id = psMetadataLookupS64(&status, config->args, "-warp_id"))) {
    466         if (!psMetadataAddS64(config->where, PS_LIST_TAIL, "warp_id", 0, "==", warp_id)) {
    467             psError(PS_ERR_UNKNOWN, false, "failed to add item warp_id");
    468             psFree(config);
    469             return NULL;
    470         }
    471     }
    472 }
    473     addWhereStr(skycell_id);
    474     addWhereStr(tess_id);
    475     addWhereStr(exp_id);
    476 
    477     // convert '-code' to 'fault'
    478     {
    479         psS16 fault = 0;
    480         bool status = false;
    481         if ((fault = psMetadataLookupS16(&status, config->args, "-code"))) {
    482             if (!psMetadataAddS16(config->where, PS_LIST_TAIL, "fault", 0, "==", fault)) {
    483                 psError(PS_ERR_UNKNOWN, false, "failed to add item fault");
    484                 psFree(config);
    485                 return NULL;
    486             }
    487         }
    488     }
    489 
    490     if (config->where->list->n < 1) {
    491         psFree(config->where);
    492         config->where = NULL;
    493     }
    494 
    495283    // define Database handle, if used
    496284    // do this last so we don't setup a connection before CLI options are
Note: See TracChangeset for help on using the changeset viewer.