IPP Software Navigation Tools IPP Links Communication Pan-STARRS Links

Changeset 14214


Ignore:
Timestamp:
Jul 13, 2007, 5:44:48 PM (19 years ago)
Author:
jhoblitt
Message:

update chiptool -queue

Location:
trunk/ippTools/src
Files:
5 edited

Legend:

Unmodified
Added
Removed

  • trunk/ippTools/src/chiptool.c

    r14120 r14214  
    9393}
    9494
    95 #define ADDRENAMEPARAMSTR(from, to, oldname, newname) \
     95#define ADDRENAMEPARAMSTR(from, to, oldname, newname, comment) \
    9696{ \
    9797    bool status = false; \
    … …  
    102102    } \
    103103    if (str) { \
    104         if (!psMetadataAddStr(to, PS_LIST_TAIL, newname, 0, "==", str)) { \
     104        if (!psMetadataAddStr(to, PS_LIST_TAIL, newname, PS_META_DUPLICATE_OK, comment, str)) { \
    105105            psError(PS_ERR_UNKNOWN, false, "failed to add item " newname); \
    106106            psFree(to); \
    … …  
    110110}
    111111
    112 #define ADDPARAMSTR(from, to, name) ADDRENAMEPARAMSTR(from, to, name, name)
    113 
    114 #define ADDPARAMF(from, to, type, name) \
     112#define ADDPARAMSTR(from, to, name) \
     113  ADDRENAMEPARAMSTR(from, to, name, name, "==")
     114
     115#define ADDRENAMEPARAMF(from, to, type, oldname, newname, comment) \
    115116{ \
    116117    bool status = false; \
    117     ps##type var = psMetadataLookup##type(&status, from, "-" name); \
     118    ps##type var = psMetadataLookup##type(&status, from, "-" oldname); \
    118119    if (!status) { \
    119         psError(PS_ERR_UNKNOWN, false, "failed to lookup value for -" name); \
     120        psError(PS_ERR_UNKNOWN, false, "failed to lookup value for -" oldname); \
    120121        return false; \
    121122    } \
    122123    if (!isnan(var)) { \
    123         if (!psMetadataAdd##type(to, PS_LIST_TAIL, #name, 0, "==", var)) { \
    124             psError(PS_ERR_UNKNOWN, false, "failed to add item " name); \
     124        if (!psMetadataAdd##type(to, PS_LIST_TAIL, newname, PS_META_DUPLICATE_OK, comment, var)) { \
     125            psError(PS_ERR_UNKNOWN, false, "failed to add item " newname); \
    125126            psFree(to); \
    126127            return false; \
    … …  
    129130}
    130131
     132#define ADDPARAMF(from, to, type, name) \
     133  ADDRENAMEPARAMF(from, to, type, name, name, "==")
     134
    131135static bool queueMode(pxConfig *config)
    132136{
    … …  
    134138
    135139    psMetadata *where = psMetadataAlloc();
    136     ADDPARAMSTR(config->args, where, "exp_id");
     140    // convert exp_id into a psS64
     141{
     142    bool status = false;
     143    psString var = psMetadataLookupStr(&status, config->args, "-exp_id");
     144    if (!status) {
     145        psError(PS_ERR_UNKNOWN, false, "failed to lookup value for -exp_id");
     146        return false;
     147    }
     148    if (var) {
     149        if (!psMetadataAddS64(where, PS_LIST_TAIL, "exp_id", 0, "==", (psS64)atoll(var))) {
     150            psError(PS_ERR_UNKNOWN, false, "failed to add item exp_id");
     151            psFree(where);
     152            return false;
     153        }
     154    }
     155}
    137156    ADDPARAMSTR(config->args, where, "exp_name");
    138     ADDRENAMEPARAMSTR(config->args, where, "inst", "camera");
     157    ADDRENAMEPARAMSTR(config->args, where, "inst", "camera", "==");
    139158    ADDPARAMSTR(config->args, where, "telescope");
    140     ADDPARAMSTR(config->args, where, "dateobs");
     159    ADDPARAMSTR(config->args, where, "dateobs_begin");
     160    ADDPARAMSTR(config->args, where, "dateobs_end");
     161    ADDPARAMSTR(config->args, where, "exp_tag");
    141162    ADDPARAMSTR(config->args, where, "exp_type");
    142     ADDPARAMSTR(config->args, where, "imfiles");
    143     ADDPARAMSTR(config->args, where, "workdir");
     163    ADDPARAMSTR(config->args, where, "filelevel");
     164    ADDPARAMSTR(config->args, where, "reduction");
    144165    ADDPARAMSTR(config->args, where, "filter");
    145     ADDPARAMF(config->args, where, F32, "airmass");
    146     ADDPARAMF(config->args, where, F32, "ra");
    147     ADDPARAMF(config->args, where, F32, "decl");
    148     ADDPARAMF(config->args, where, F32, "exp_time");
    149     ADDPARAMF(config->args, where, F32, "bg");
    150     ADDPARAMF(config->args, where, F32, "bg_stdev");
    151     ADDPARAMF(config->args, where, F32, "bg_mean_stdev");
    152     ADDPARAMF(config->args, where, F64, "alt");
    153     ADDPARAMF(config->args, where, F64, "az");
    154     ADDPARAMF(config->args, where, F32, "ccd_temp");
    155     ADDPARAMF(config->args, where, F64, "posang");
     166    ADDRENAMEPARAMF(config->args, where, F64, "airmass_min", "airmass", ">=");
     167    ADDRENAMEPARAMF(config->args, where, F64, "airmass_max", "airmass", "<");
     168    ADDRENAMEPARAMF(config->args, where, F64, "ra_min", "ra", ">=");
     169    ADDRENAMEPARAMF(config->args, where, F64, "ra_max", "ra", "<");
     170    ADDRENAMEPARAMF(config->args, where, F64, "decl_min", "decl", ">=");
     171    ADDRENAMEPARAMF(config->args, where, F64, "decl_max", "decl", "<");
     172    ADDRENAMEPARAMF(config->args, where, F32, "exp_time_min", "exp_time", ">=");
     173    ADDRENAMEPARAMF(config->args, where, F32, "exp_time_max", "exp_time", "<");
     174    ADDRENAMEPARAMF(config->args, where, F32, "sat_pixel_frac_min", "sat_pixel_frac", ">=");
     175    ADDRENAMEPARAMF(config->args, where, F32, "sat_pixel_frac_max", "sat_pixel_frac", "<");
     176    ADDRENAMEPARAMF(config->args, where, F64, "bg_min", "bt", ">=");
     177    ADDRENAMEPARAMF(config->args, where, F64, "bg_max", "bt", "<");
     178    ADDRENAMEPARAMF(config->args, where, F64, "bg_stdev_min", "bg_stdev", ">=");
     179    ADDRENAMEPARAMF(config->args, where, F64, "bg_stdev_max", "bg_stdev", "<");
     180    ADDRENAMEPARAMF(config->args, where, F64, "bg_mean_stdev_min", "bg_mean_stdev", ">=");
     181    ADDRENAMEPARAMF(config->args, where, F64, "bg_mean_stdev_max", "bg_mean_stdev", "<");
     182    ADDRENAMEPARAMF(config->args, where, F64, "alt_min", "alt", ">=");
     183    ADDRENAMEPARAMF(config->args, where, F64, "alt_max", "alt", "<");
     184    ADDRENAMEPARAMF(config->args, where, F64, "az_min", "az", ">=");
     185    ADDRENAMEPARAMF(config->args, where, F64, "az_max", "az", "<");
     186    ADDRENAMEPARAMF(config->args, where, F32, "ccd_temp_min", "ccd_temp", ">=");
     187    ADDRENAMEPARAMF(config->args, where, F32, "ccd_temp_max", "ccd_temp", "<");
     188    ADDRENAMEPARAMF(config->args, where, F64, "posang_min", "posang", ">=");
     189    ADDRENAMEPARAMF(config->args, where, F64, "posang_max", "posang", "<");
    156190    ADDPARAMSTR(config->args, where, "object");
     191    ADDRENAMEPARAMF(config->args, where, F32, "solang_min", "solang", ">=");
     192    ADDRENAMEPARAMF(config->args, where, F32, "solang_max", "solang", "<");
    157193
    158194    if (where->list->n < 1) {
    … …  
    236272        psMetadata *md = output->data[i];
    237273
    238         psString exp_id = psMetadataLookupStr(&status, md, "exp_id");
     274        psS64 exp_id = psMetadataLookupS64(&status, md, "exp_id");
    239275        if (!status) {
    240276            psError(PS_ERR_UNKNOWN, false, "failed to lookup value for exp_id");
    … …  
    249285            }
    250286            psError(PS_ERR_UNKNOWN, false,
    251                     "failed to trying to queue exp_id: %s", exp_id);
     287                    "failed to trying to queue exp_id: %" PRId64, exp_id);
    252288            psFree(output);
    253289            return false;

  • trunk/ippTools/src/chiptoolConfig.c

    r14121 r14214  
    5151            "search by exp_name", NULL);
    5252    psMetadataAddStr(queueArgs, PS_LIST_TAIL, "-inst",  0,
    53             "search by camera", NULL);
     53            "search for camera", NULL);
    5454    psMetadataAddStr(queueArgs, PS_LIST_TAIL, "-telescope",  0,
    55             "search by telescope", NULL);
    56     psMetadataAddStr(queueArgs, PS_LIST_TAIL, "-dateobs",  0,
    57             "search by observation time", NULL);
     55            "search for telescope", NULL);
     56    psMetadataAddStr(queueArgs, PS_LIST_TAIL, "-dateobs_begin", 0,   
     57            "search for exposures by time (>=)", NULL);
     58    psMetadataAddStr(queueArgs, PS_LIST_TAIL, "-dateobs_end", 0,
     59            "search for exposures by time (<)", NULL);
     60    psMetadataAddStr(queueArgs, PS_LIST_TAIL, "-exp_tag",  0,
     61            "search by exp_tag", NULL);
    5862    psMetadataAddStr(queueArgs, PS_LIST_TAIL, "-exp_type",  0,
    59             "search by exposure type", NULL);
    60     psMetadataAddStr(queueArgs, PS_LIST_TAIL, "-imfiles",  0,
    61             "search by number of imfiles", NULL);
    62     psMetadataAddStr(queueArgs, PS_LIST_TAIL, "-workdir",  0,
    63             "search by workdir", NULL);
     63            "search by exp_type", NULL);
     64    psMetadataAddStr(queueArgs, PS_LIST_TAIL, "-filelevel",  0,
     65            "search by filelevel", NULL);
     66    psMetadataAddStr(queueArgs, PS_LIST_TAIL, "-reduction",  0,
     67            "search by reduction class", NULL);
    6468    psMetadataAddStr(queueArgs, PS_LIST_TAIL, "-filter",  0,
    65             "search by filter ", NULL);
    66     psMetadataAddF32(queueArgs, PS_LIST_TAIL, "-airmass",  0,
    67             "search by airmass", NAN);
    68     psMetadataAddF64(queueArgs, PS_LIST_TAIL, "-ra",  0,
    69             "search by RA", NAN);
    70     psMetadataAddF64(queueArgs, PS_LIST_TAIL, "-decl",  0,
    71             "search by DEC", NAN);
    72     psMetadataAddF32(queueArgs, PS_LIST_TAIL, "-exp_time",  0,
    73             "search by exposure time", NAN);
    74 
    75     // XXX EAM : are these selecting based on the rawExp value or the chipImfile value?
    76     psMetadataAddF64(queueArgs, PS_LIST_TAIL, "-bg",  0,
    77             "search by exposure background", NAN);
    78     psMetadataAddF64(queueArgs, PS_LIST_TAIL, "-bg_stdev",  0,
    79             "search by exposure background stdev", NAN);
    80     psMetadataAddF64(queueArgs, PS_LIST_TAIL, "-bg_mean_stdev",  0,
    81             "search by exposure background mean stdev", NAN);
    82     psMetadataAddF64(queueArgs, PS_LIST_TAIL, "-alt",  0,
    83             "search by altitute", NAN);
    84     psMetadataAddF64(queueArgs, PS_LIST_TAIL, "-az",  0,
    85             "search by azimuth", NAN);
    86     psMetadataAddF32(queueArgs, PS_LIST_TAIL, "-ccd_temp",  0,
    87             "search by ccd tempature", NAN);
    88     psMetadataAddF64(queueArgs, PS_LIST_TAIL, "-posang",  0,
    89             "search by rotator position angle", NAN);
     69            "search for filter", NULL);
     70    psMetadataAddF32(queueArgs, PS_LIST_TAIL, "-airmass_min",  0,
     71            "define min airmass", NAN);
     72    psMetadataAddF32(queueArgs, PS_LIST_TAIL, "-airmass_max",  0,
     73            "define max airmass", NAN);
     74    psMetadataAddF64(queueArgs, PS_LIST_TAIL, "-ra_min",  0,
     75            "define min airmass", NAN);
     76    psMetadataAddF64(queueArgs, PS_LIST_TAIL, "-ra_max",  0,
     77            "define max airmass", NAN);
     78    psMetadataAddF64(queueArgs, PS_LIST_TAIL, "-decl_min",  0,
     79            "define min airmass", NAN);
     80    psMetadataAddF64(queueArgs, PS_LIST_TAIL, "-decl_max",  0,
     81            "define max airmass", NAN);
     82    psMetadataAddF32(queueArgs, PS_LIST_TAIL, "-exp_time_min",  0,
     83            "define min airmass", NAN);
     84    psMetadataAddF32(queueArgs, PS_LIST_TAIL, "-exp_time_max",  0,
     85            "define max airmass", NAN);
     86    psMetadataAddF32(queueArgs, PS_LIST_TAIL, "-sat_pixel_frac_min",  0,
     87            "define max fraction of saturated pixels", NAN);
     88    psMetadataAddF32(queueArgs, PS_LIST_TAIL, "-sat_pixel_frac_max",  0,
     89            "define max fraction of saturated pixels", NAN);
     90    psMetadataAddF64(queueArgs, PS_LIST_TAIL, "-bg_min",  0,
     91            "define max fraction of saturated pixels", NAN);
     92    psMetadataAddF64(queueArgs, PS_LIST_TAIL, "-bg_max",  0,
     93            "define max fraction of saturated pixels", NAN);
     94    psMetadataAddF64(queueArgs, PS_LIST_TAIL, "-bg_stdev_min",  0,
     95            "define max fraction of saturated pixels", NAN);
     96    psMetadataAddF64(queueArgs, PS_LIST_TAIL, "-bg_stdev_max",  0,
     97            "define max fraction of saturated pixels", NAN);
     98    psMetadataAddF64(queueArgs, PS_LIST_TAIL, "-bg_mean_stdev_min",  0,
     99            "define max fraction of saturated pixels", NAN);
     100    psMetadataAddF64(queueArgs, PS_LIST_TAIL, "-bg_mean_stdev_max",  0,
     101            "define max fraction of saturated pixels", NAN);
     102    psMetadataAddF64(queueArgs, PS_LIST_TAIL, "-alt_min",  0,
     103            "define min airmass", NAN);
     104    psMetadataAddF64(queueArgs, PS_LIST_TAIL, "-alt_max",  0,
     105            "define max airmass", NAN);
     106    psMetadataAddF64(queueArgs, PS_LIST_TAIL, "-az_min",  0,
     107            "define min airmass", NAN);
     108    psMetadataAddF64(queueArgs, PS_LIST_TAIL, "-az_max",  0,
     109            "define max airmass", NAN);
     110    psMetadataAddF64(queueArgs, PS_LIST_TAIL, "-ccd_temp_min",  0,   
     111            "define min ccd tempature", NAN);
     112    psMetadataAddF64(queueArgs, PS_LIST_TAIL, "-ccd_temp_max",  0,
     113            "define max ccd tempature", NAN);
     114    psMetadataAddF64(queueArgs, PS_LIST_TAIL, "-posang_min",  0,
     115            "define min rotator position angle", NAN);
     116    psMetadataAddF64(queueArgs, PS_LIST_TAIL, "-posang_max",  0,
     117            "define max rotator position angle", NAN);
    90118    psMetadataAddStr(queueArgs, PS_LIST_TAIL, "-object",  0,
    91119            "search by exposure object", NULL);
     120    psMetadataAddF32(queueArgs, PS_LIST_TAIL, "-solang_min",  0,
     121            "define min solar angle", NAN);
     122    psMetadataAddF32(queueArgs, PS_LIST_TAIL, "-solang_max",  0,
     123            "define max solar angle", NAN);
    92124    psMetadataAddStr(queueArgs, PS_LIST_TAIL, "-set_workdir",  0,
    93125            "define workdir", NULL);

  • trunk/ippTools/src/pxchip.c

    r14091 r14214  
    5757
    5858bool pxchipQueueByExpTag(pxConfig *config,
    59                          psString exp_id,
     59                         psS64 exp_id,
    6060                         psString workdir,
    6161                         psString label,
    … …  
    7575    if (!chipRunInsert(config->dbh,
    7676            0x0, // chip_id
    77             (psS64)atoll(exp_id),
     77            exp_id,
    7878            "run",      // state               
    7979            workdir,

  • trunk/ippTools/src/pxchip.h

    r14091 r14214  
    2828
    2929bool pxchipQueueByExpTag(pxConfig *config,
    30                          psString exp_id,
     30                         psS64 exp_id,
    3131                         psString workdir,
    3232                         psString label,

  • trunk/ippTools/src/regtool.c

    r14098 r14214  
    702702        // this can only be run as the newExp's state has been set to stop
    703703        if (!pxchipQueueByExpTag(config,
    704                     exp_id, // exp_id is the string version, rawExp->exp_id isa int
     704                    rawExp->exp_id,
    705705                    rawExp->workdir,
    706706                    NULL, // label
Note: See TracChangeset for help on using the changeset viewer.