IPP Software Navigation Tools IPP Links Communication Pan-STARRS Links

Changeset 18093


Ignore:
Timestamp:
Jun 12, 2008, 11:53:45 AM (18 years ago)
Author:
jhoblitt
Message:

-queue -> -definebyquery rename

Location:
trunk/ippTools/src
Files:
19 edited

Legend:

Unmodified
Added
Removed

  • trunk/ippTools/src/camtool.c

    r18029 r18093  
    3030#include "camtool.h"
    3131
    32 static bool queueMode(pxConfig *config);
     32static bool definebyqueryMode(pxConfig *config);
    3333static bool updaterunMode(pxConfig *config);
    3434static bool pendingexpMode(pxConfig *config);
    … …  
    6060
    6161    switch (config->mode) {
    62         MODECASE(CAMTOOL_MODE_QUEUE,                queueMode);
     62        MODECASE(CAMTOOL_MODE_DEFINEBYQUERY,        definebyqueryMode);
    6363        MODECASE(CAMTOOL_MODE_UPDATERUN,            updaterunMode);
    6464        MODECASE(CAMTOOL_MODE_PENDINGEXP,           pendingexpMode);
    … …  
    9393
    9494
    95 static bool queueMode(pxConfig *config)
     95static bool definebyqueryMode(pxConfig *config)
    9696{
    9797    PS_ASSERT_PTR_NON_NULL(config, NULL);

  • trunk/ippTools/src/camtool.h

    r17171 r18093  
    2525typedef enum {
    2626    CAMTOOL_MODE_NONE      = 0x0,
    27     CAMTOOL_MODE_QUEUE,
     27    CAMTOOL_MODE_DEFINEBYQUERY,
    2828    CAMTOOL_MODE_UPDATERUN,
    2929    CAMTOOL_MODE_PENDINGEXP,

  • trunk/ippTools/src/camtoolConfig.c

    r17216 r18093  
    4646    }
    4747
    48     // -queue
    49     psMetadata *queueArgs = psMetadataAlloc();
     48    // -definebyquery
     49    psMetadata *definebydefinebyqueryArgs = psMetadataAlloc();
    5050    // XXX need to allow multiple chip_ids
    51     psMetadataAddStr(queueArgs, PS_LIST_TAIL, "-chip_id",  0,
     51    psMetadataAddStr(definebydefinebyqueryArgs, PS_LIST_TAIL, "-chip_id",  0,
    5252            "search by chip_id", NULL);
    5353    // XXX need to allow multiple exp_ids
    54     psMetadataAddStr(queueArgs, PS_LIST_TAIL, "-exp_id",  0,
     54    psMetadataAddStr(definebydefinebyqueryArgs, PS_LIST_TAIL, "-exp_id",  0,
    5555            "search by exp_id", NULL);
    56     psMetadataAddStr(queueArgs, PS_LIST_TAIL, "-exp_name",  0,
     56    psMetadataAddStr(definebydefinebyqueryArgs, PS_LIST_TAIL, "-exp_name",  0,
    5757            "search by exp_name", NULL);
    58     psMetadataAddStr(queueArgs, PS_LIST_TAIL, "-inst",  0,
     58    psMetadataAddStr(definebydefinebyqueryArgs, PS_LIST_TAIL, "-inst",  0,
    5959            "search for camera", NULL);
    60     psMetadataAddStr(queueArgs, PS_LIST_TAIL, "-telescope",  0,
     60    psMetadataAddStr(definebydefinebyqueryArgs, PS_LIST_TAIL, "-telescope",  0,
    6161            "search for telescope", NULL);
    62     psMetadataAddTime(queueArgs, PS_LIST_TAIL, "-dateobs_begin", 0,
     62    psMetadataAddTime(definebydefinebyqueryArgs, PS_LIST_TAIL, "-dateobs_begin", 0,
    6363            "search for exposures by time (>=)", NULL);
    64     psMetadataAddTime(queueArgs, PS_LIST_TAIL, "-dateobs_end", 0,
     64    psMetadataAddTime(definebydefinebyqueryArgs, PS_LIST_TAIL, "-dateobs_end", 0,
    6565            "search for exposures by time (<)", NULL);
    66     psMetadataAddStr(queueArgs, PS_LIST_TAIL, "-exp_tag",  0,
     66    psMetadataAddStr(definebydefinebyqueryArgs, PS_LIST_TAIL, "-exp_tag",  0,
    6767            "search by exp_tag", NULL);
    68     psMetadataAddStr(queueArgs, PS_LIST_TAIL, "-exp_type",  0,
     68    psMetadataAddStr(definebydefinebyqueryArgs, PS_LIST_TAIL, "-exp_type",  0,
    6969            "search by exp_type", NULL);
    70     psMetadataAddStr(queueArgs, PS_LIST_TAIL, "-filelevel",  0,
     70    psMetadataAddStr(definebydefinebyqueryArgs, PS_LIST_TAIL, "-filelevel",  0,
    7171            "search by filelevel", NULL);
    72     psMetadataAddStr(queueArgs, PS_LIST_TAIL, "-reduction",  0,
     72    psMetadataAddStr(definebydefinebyqueryArgs, PS_LIST_TAIL, "-reduction",  0,
    7373            "search by reduction class", NULL);
    74     psMetadataAddStr(queueArgs, PS_LIST_TAIL, "-filter",  0,
     74    psMetadataAddStr(definebydefinebyqueryArgs, PS_LIST_TAIL, "-filter",  0,
    7575            "search for filter", NULL);
    76     psMetadataAddF32(queueArgs, PS_LIST_TAIL, "-airmass_min",  0,
     76    psMetadataAddF32(definebydefinebyqueryArgs, PS_LIST_TAIL, "-airmass_min",  0,
    7777            "define min airmass", NAN);
    78     psMetadataAddF32(queueArgs, PS_LIST_TAIL, "-airmass_max",  0,
     78    psMetadataAddF32(definebydefinebyqueryArgs, PS_LIST_TAIL, "-airmass_max",  0,
    7979            "define max airmass", NAN);
    80     psMetadataAddF64(queueArgs, PS_LIST_TAIL, "-ra_min",  0,
    81             "define min", NAN);
    82     psMetadataAddF64(queueArgs, PS_LIST_TAIL, "-ra_max",  0,
    83             "define max", NAN);
    84     psMetadataAddF64(queueArgs, PS_LIST_TAIL, "-decl_min",  0,
    85             "define min", NAN);
    86     psMetadataAddF64(queueArgs, PS_LIST_TAIL, "-decl_max",  0,
    87             "define max", NAN);
    88     psMetadataAddF32(queueArgs, PS_LIST_TAIL, "-exp_time_min",  0,
    89             "define min", NAN);
    90     psMetadataAddF32(queueArgs, PS_LIST_TAIL, "-exp_time_max",  0,
    91             "define max", NAN);
    92     psMetadataAddF32(queueArgs, PS_LIST_TAIL, "-sat_pixel_frac_min",  0,
     80    psMetadataAddF64(definebydefinebyqueryArgs, PS_LIST_TAIL, "-ra_min",  0,
     81            "define min", NAN);
     82    psMetadataAddF64(definebydefinebyqueryArgs, PS_LIST_TAIL, "-ra_max",  0,
     83            "define max", NAN);
     84    psMetadataAddF64(definebydefinebyqueryArgs, PS_LIST_TAIL, "-decl_min",  0,
     85            "define min", NAN);
     86    psMetadataAddF64(definebydefinebyqueryArgs, PS_LIST_TAIL, "-decl_max",  0,
     87            "define max", NAN);
     88    psMetadataAddF32(definebydefinebyqueryArgs, PS_LIST_TAIL, "-exp_time_min",  0,
     89            "define min", NAN);
     90    psMetadataAddF32(definebydefinebyqueryArgs, PS_LIST_TAIL, "-exp_time_max",  0,
     91            "define max", NAN);
     92    psMetadataAddF32(definebydefinebyqueryArgs, PS_LIST_TAIL, "-sat_pixel_frac_min",  0,
    9393            "define max fraction of saturated pixels", NAN);
    94     psMetadataAddF32(queueArgs, PS_LIST_TAIL, "-sat_pixel_frac_max",  0,
     94    psMetadataAddF32(definebydefinebyqueryArgs, PS_LIST_TAIL, "-sat_pixel_frac_max",  0,
    9595            "define min fraction of saturated pixels", NAN);
    96     psMetadataAddF64(queueArgs, PS_LIST_TAIL, "-bg_min",  0,
    97             "define max", NAN);
    98     psMetadataAddF64(queueArgs, PS_LIST_TAIL, "-bg_max",  0,
    99             "define max", NAN);
    100     psMetadataAddF64(queueArgs, PS_LIST_TAIL, "-bg_stdev_min",  0,
    101             "define max", NAN);
    102     psMetadataAddF64(queueArgs, PS_LIST_TAIL, "-bg_stdev_max",  0,
    103             "define max", NAN);
    104     psMetadataAddF64(queueArgs, PS_LIST_TAIL, "-bg_mean_stdev_min",  0,
    105             "define max", NAN);
    106     psMetadataAddF64(queueArgs, PS_LIST_TAIL, "-bg_mean_stdev_max",  0,
    107             "define max", NAN);
    108     psMetadataAddF64(queueArgs, PS_LIST_TAIL, "-alt_min",  0,
    109             "define min", NAN);
    110     psMetadataAddF64(queueArgs, PS_LIST_TAIL, "-alt_max",  0,
    111             "define max", NAN);
    112     psMetadataAddF64(queueArgs, PS_LIST_TAIL, "-az_min",  0,
    113             "define min", NAN);
    114     psMetadataAddF64(queueArgs, PS_LIST_TAIL, "-az_max",  0,
    115             "define max", NAN);
    116     psMetadataAddF64(queueArgs, PS_LIST_TAIL, "-ccd_temp_min",  0,
     96    psMetadataAddF64(definebydefinebyqueryArgs, PS_LIST_TAIL, "-bg_min",  0,
     97            "define max", NAN);
     98    psMetadataAddF64(definebydefinebyqueryArgs, PS_LIST_TAIL, "-bg_max",  0,
     99            "define max", NAN);
     100    psMetadataAddF64(definebydefinebyqueryArgs, PS_LIST_TAIL, "-bg_stdev_min",  0,
     101            "define max", NAN);
     102    psMetadataAddF64(definebydefinebyqueryArgs, PS_LIST_TAIL, "-bg_stdev_max",  0,
     103            "define max", NAN);
     104    psMetadataAddF64(definebydefinebyqueryArgs, PS_LIST_TAIL, "-bg_mean_stdev_min",  0,
     105            "define max", NAN);
     106    psMetadataAddF64(definebydefinebyqueryArgs, PS_LIST_TAIL, "-bg_mean_stdev_max",  0,
     107            "define max", NAN);
     108    psMetadataAddF64(definebydefinebyqueryArgs, PS_LIST_TAIL, "-alt_min",  0,
     109            "define min", NAN);
     110    psMetadataAddF64(definebydefinebyqueryArgs, PS_LIST_TAIL, "-alt_max",  0,
     111            "define max", NAN);
     112    psMetadataAddF64(definebydefinebyqueryArgs, PS_LIST_TAIL, "-az_min",  0,
     113            "define min", NAN);
     114    psMetadataAddF64(definebydefinebyqueryArgs, PS_LIST_TAIL, "-az_max",  0,
     115            "define max", NAN);
     116    psMetadataAddF64(definebydefinebyqueryArgs, PS_LIST_TAIL, "-ccd_temp_min",  0,
    117117            "define min ccd tempature", NAN);
    118     psMetadataAddF64(queueArgs, PS_LIST_TAIL, "-ccd_temp_max",  0,
     118    psMetadataAddF64(definebydefinebyqueryArgs, PS_LIST_TAIL, "-ccd_temp_max",  0,
    119119            "define max ccd tempature", NAN);
    120     psMetadataAddF64(queueArgs, PS_LIST_TAIL, "-posang_min",  0,
     120    psMetadataAddF64(definebydefinebyqueryArgs, PS_LIST_TAIL, "-posang_min",  0,
    121121            "define min rotator position angle", NAN);
    122     psMetadataAddF64(queueArgs, PS_LIST_TAIL, "-posang_max",  0,
     122    psMetadataAddF64(definebydefinebyqueryArgs, PS_LIST_TAIL, "-posang_max",  0,
    123123            "define max rotator position angle", NAN);
    124     psMetadataAddStr(queueArgs, PS_LIST_TAIL, "-object",  0,
     124    psMetadataAddStr(definebydefinebyqueryArgs, PS_LIST_TAIL, "-object",  0,
    125125            "search by exposure object", NULL);
    126     psMetadataAddF32(queueArgs, PS_LIST_TAIL, "-solang_min",  0,
     126    psMetadataAddF32(definebydefinebyqueryArgs, PS_LIST_TAIL, "-solang_min",  0,
    127127            "define min solar angle", NAN);
    128     psMetadataAddF32(queueArgs, PS_LIST_TAIL, "-solang_max",  0,
     128    psMetadataAddF32(definebydefinebyqueryArgs, PS_LIST_TAIL, "-solang_max",  0,
    129129            "define max solar angle", NAN);
    130     psMetadataAddStr(queueArgs, PS_LIST_TAIL, "-set_workdir",  0,
     130    psMetadataAddStr(definebydefinebyqueryArgs, PS_LIST_TAIL, "-set_workdir",  0,
    131131            "define workdir", NULL);
    132     psMetadataAddStr(queueArgs, PS_LIST_TAIL, "-set_label",  0,
     132    psMetadataAddStr(definebydefinebyqueryArgs, PS_LIST_TAIL, "-set_label",  0,
    133133            "define label", NULL);
    134     psMetadataAddStr(queueArgs, PS_LIST_TAIL, "-set_reduction",  0,
     134    psMetadataAddStr(definebydefinebyqueryArgs, PS_LIST_TAIL, "-set_reduction",  0,
    135135            "define reduction class", NULL);
    136     psMetadataAddStr(queueArgs, PS_LIST_TAIL, "-set_expgroup",  0,
     136    psMetadataAddStr(definebydefinebyqueryArgs, PS_LIST_TAIL, "-set_expgroup",  0,
    137137            "define exposure group", NULL);
    138     psMetadataAddStr(queueArgs, PS_LIST_TAIL, "-set_dvodb",  0,
     138    psMetadataAddStr(definebydefinebyqueryArgs, PS_LIST_TAIL, "-set_dvodb",  0,
    139139            "define DVO db", NULL);
    140     psMetadataAddStr(queueArgs, PS_LIST_TAIL, "-set_tess_id",  0,
     140    psMetadataAddStr(definebydefinebyqueryArgs, PS_LIST_TAIL, "-set_tess_id",  0,
    141141            "define tess ID", NULL);
    142     psMetadataAddStr(queueArgs, PS_LIST_TAIL, "-set_end_stage",  0,
     142    psMetadataAddStr(definebydefinebyqueryArgs, PS_LIST_TAIL, "-set_end_stage",  0,
    143143            "define end stage", NULL);
    144     psMetadataAddBool(queueArgs, PS_LIST_TAIL, "-all",  0,
     144    psMetadataAddBool(definebydefinebyqueryArgs, PS_LIST_TAIL, "-all",  0,
    145145            "allow everything to be queued without search terms", false);
    146146
    … …  
    462462    psMetadata *modes = psMetadataAlloc();
    463463
    464     PXOPT_ADD_MODE("-queue",               "", CAMTOOL_MODE_QUEUE,         queueArgs);
     464    PXOPT_ADD_MODE("-definebyquery",       "", CAMTOOL_MODE_DEFINEBYQUERY, definebydefinebyqueryArgs);
    465465    PXOPT_ADD_MODE("-updaterun",           "", CAMTOOL_MODE_UPDATERUN,      updaterunArgs);
    466466    PXOPT_ADD_MODE("-pendingexp",          "", CAMTOOL_MODE_PENDINGEXP,    pendingexpArgs);

  • trunk/ippTools/src/chiptool.c

    r17859 r18093  
    3434#include "camtool.h"
    3535
    36 static bool queueMode(pxConfig *config);
     36static bool definebyqueryMode(pxConfig *config);
    3737static bool updaterunMode(pxConfig *config);
    3838static bool pendingimfileMode(pxConfig *config);
    … …  
    6767
    6868    switch (config->mode) {
    69         MODECASE(CHIPTOOL_MODE_QUEUE,                   queueMode);
     69        MODECASE(CHIPTOOL_MODE_DEFINEBYQUERY,                   definebyqueryMode);
    7070        MODECASE(CHIPTOOL_MODE_UPDATERUN,               updaterunMode);
    7171        MODECASE(CHIPTOOL_MODE_PENDINGIMFILE,           pendingimfileMode);
    … …  
    102102
    103103
    104 static bool queueMode(pxConfig *config)
     104static bool definebyqueryMode(pxConfig *config)
    105105{
    106106    PS_ASSERT_PTR_NON_NULL(config, NULL);

  • trunk/ippTools/src/chiptool.h

    r17859 r18093  
    2525typedef enum {
    2626    CHIPTOOL_MODE_NONE      = 0x0,
    27     CHIPTOOL_MODE_QUEUE,
     27    CHIPTOOL_MODE_DEFINEBYQUERY,
    2828    CHIPTOOL_MODE_UPDATERUN,
    2929    CHIPTOOL_MODE_PENDINGIMFILE,

  • trunk/ippTools/src/chiptoolConfig.c

    r17859 r18093  
    4444    }
    4545
    46     // -queue
     46    // -definebyquery
    4747    psMetadata *queueArgs = psMetadataAlloc();
    4848    // XXX need to allow multiple exp_ids
    … …  
    286286    psMetadata *modes = psMetadataAlloc();
    287287
    288     PXOPT_ADD_MODE("-queue",                "create runs from raw exposures",
    289         CHIPTOOL_MODE_QUEUE,                queueArgs);
     288    PXOPT_ADD_MODE("-definebyquery",                "create runs from raw exposures",
     289        CHIPTOOL_MODE_DEFINEBYQUERY,                queueArgs);
    290290    PXOPT_ADD_MODE("-updaterun",            "change chip run properties",
    291291        CHIPTOOL_MODE_UPDATERUN,            updaterunArgs);

  • trunk/ippTools/src/dettoolConfig.c

    r18088 r18093  
    121121
    122122    // -definebyquery
    123     psMetadata *definebyqueryArgs = psMetadataAlloc();
    124     psMetadataAddStr(definebyqueryArgs, PS_LIST_TAIL, "-det_type",  0,
     123    psMetadata *definebydefinebyqueryArgs = psMetadataAlloc();
     124    psMetadataAddStr(definebydefinebyqueryArgs, PS_LIST_TAIL, "-det_type",  0,
    125125            "define the type of detrend run (required)", NULL);
    126     psMetadataAddStr(definebyqueryArgs, PS_LIST_TAIL, "-mode",  0,
     126    psMetadataAddStr(definebydefinebyqueryArgs, PS_LIST_TAIL, "-mode",  0,
    127127            "define the mode of this detrend run", "master");
    128     psMetadataAddStr(definebyqueryArgs, PS_LIST_TAIL, "-filelevel",  0,
     128    psMetadataAddStr(definebydefinebyqueryArgs, PS_LIST_TAIL, "-filelevel",  0,
    129129            "define filelevel", NULL);
    130     psMetadataAddStr(definebyqueryArgs, PS_LIST_TAIL, "-workdir",  0,
     130    psMetadataAddStr(definebydefinebyqueryArgs, PS_LIST_TAIL, "-workdir",  0,
    131131            "define workdir (required)", NULL);
    132     psMetadataAddStr(definebyqueryArgs, PS_LIST_TAIL, "-inst",  0,
     132    psMetadataAddStr(definebydefinebyqueryArgs, PS_LIST_TAIL, "-inst",  0,
    133133            "define camera (required)", NULL);
    134     psMetadataAddStr(definebyqueryArgs, PS_LIST_TAIL, "-telescope",  0,
     134    psMetadataAddStr(definebydefinebyqueryArgs, PS_LIST_TAIL, "-telescope",  0,
    135135            "define telescope", NULL);
    136     psMetadataAddStr(definebyqueryArgs, PS_LIST_TAIL, "-filter",  0,
     136    psMetadataAddStr(definebydefinebyqueryArgs, PS_LIST_TAIL, "-filter",  0,
    137137            "define filter ", NULL);
    138     psMetadataAddF32(definebyqueryArgs, PS_LIST_TAIL, "-airmass_min",  0,
     138    psMetadataAddF32(definebydefinebyqueryArgs, PS_LIST_TAIL, "-airmass_min",  0,
    139139            "define min airmass", NAN);
    140     psMetadataAddF32(definebyqueryArgs, PS_LIST_TAIL, "-airmass_max",  0,
     140    psMetadataAddF32(definebydefinebyqueryArgs, PS_LIST_TAIL, "-airmass_max",  0,
    141141            "define max airmass", NAN);
    142     psMetadataAddF32(definebyqueryArgs, PS_LIST_TAIL, "-exp_time_min",  0,
     142    psMetadataAddF32(definebydefinebyqueryArgs, PS_LIST_TAIL, "-exp_time_min",  0,
    143143            "define min exposure time", NAN);
    144     psMetadataAddF32(definebyqueryArgs, PS_LIST_TAIL, "-exp_time_max",  0,
     144    psMetadataAddF32(definebydefinebyqueryArgs, PS_LIST_TAIL, "-exp_time_max",  0,
    145145            "define max exposure time", NAN);
    146     psMetadataAddF64(definebyqueryArgs, PS_LIST_TAIL, "-ccd_temp_min",  0,
     146    psMetadataAddF64(definebydefinebyqueryArgs, PS_LIST_TAIL, "-ccd_temp_min",  0,
    147147            "define min ccd tempature", NAN);
    148     psMetadataAddF64(definebyqueryArgs, PS_LIST_TAIL, "-ccd_temp_max",  0,
     148    psMetadataAddF64(definebydefinebyqueryArgs, PS_LIST_TAIL, "-ccd_temp_max",  0,
    149149            "define max ccd tempature", NAN);
    150     psMetadataAddF64(definebyqueryArgs, PS_LIST_TAIL, "-posang_min",  0,
     150    psMetadataAddF64(definebydefinebyqueryArgs, PS_LIST_TAIL, "-posang_min",  0,
    151151            "define min rotator position angle", NAN);
    152     psMetadataAddF64(definebyqueryArgs, PS_LIST_TAIL, "-posang_max",  0,
     152    psMetadataAddF64(definebydefinebyqueryArgs, PS_LIST_TAIL, "-posang_max",  0,
    153153            "define max rotator position angle", NAN);
    154     psMetadataAddF64(definebyqueryArgs, PS_LIST_TAIL, "-solang_min",  0,
     154    psMetadataAddF64(definebydefinebyqueryArgs, PS_LIST_TAIL, "-solang_min",  0,
    155155            "define min solar angle", NAN);
    156     psMetadataAddF64(definebyqueryArgs, PS_LIST_TAIL, "-solang_max",  0,
     156    psMetadataAddF64(definebydefinebyqueryArgs, PS_LIST_TAIL, "-solang_max",  0,
    157157            "define max solar angle", NAN);
    158     psMetadataAddTime(definebyqueryArgs, PS_LIST_TAIL, "-registered",  0,
     158    psMetadataAddTime(definebydefinebyqueryArgs, PS_LIST_TAIL, "-registered",  0,
    159159            "time detrend run was registered", now);
    160     psMetadataAddTime(definebyqueryArgs, PS_LIST_TAIL, "-time_begin",  0,
     160    psMetadataAddTime(definebydefinebyqueryArgs, PS_LIST_TAIL, "-time_begin",  0,
    161161            "detrend applies to exposures taken during this period", NULL);
    162     psMetadataAddTime(definebyqueryArgs, PS_LIST_TAIL, "-time_end",  0,
     162    psMetadataAddTime(definebydefinebyqueryArgs, PS_LIST_TAIL, "-time_end",  0,
    163163            "detrend applies to exposures taken during this period", NULL);
    164     psMetadataAddTime(definebyqueryArgs, PS_LIST_TAIL, "-use_begin",  0,
     164    psMetadataAddTime(definebydefinebyqueryArgs, PS_LIST_TAIL, "-use_begin",  0,
    165165            "start of detrend run applicable period", NULL);
    166     psMetadataAddTime(definebyqueryArgs, PS_LIST_TAIL, "-use_end",  0,
     166    psMetadataAddTime(definebydefinebyqueryArgs, PS_LIST_TAIL, "-use_end",  0,
    167167            "end of detrend run applicable period", NULL);
    168     psMetadataAddStr(definebyqueryArgs, PS_LIST_TAIL, "-select_exp_type",  0,
     168    psMetadataAddStr(definebydefinebyqueryArgs, PS_LIST_TAIL, "-select_exp_type",  0,
    169169            "search for exp_type", NULL);
    170     psMetadataAddStr(definebyqueryArgs, PS_LIST_TAIL, "-select_inst",  0,
     170    psMetadataAddStr(definebydefinebyqueryArgs, PS_LIST_TAIL, "-select_inst",  0,
    171171            "search for camera", NULL);
    172     psMetadataAddStr(definebyqueryArgs, PS_LIST_TAIL, "-select_telescope",  0,
     172    psMetadataAddStr(definebydefinebyqueryArgs, PS_LIST_TAIL, "-select_telescope",  0,
    173173            "search for telescope", NULL);
    174     psMetadataAddStr(definebyqueryArgs, PS_LIST_TAIL, "-select_filter",  0,
     174    psMetadataAddStr(definebydefinebyqueryArgs, PS_LIST_TAIL, "-select_filter",  0,
    175175            "search for filter", NULL);
    176     psMetadataAddStr(definebyqueryArgs, PS_LIST_TAIL, "-select_uri",  0,
     176    psMetadataAddStr(definebydefinebyqueryArgs, PS_LIST_TAIL, "-select_uri",  0,
    177177            "search for uri", NULL);
    178     psMetadataAddTime(definebyqueryArgs, PS_LIST_TAIL, "-select_dateobs_begin", 0,
     178    psMetadataAddTime(definebydefinebyqueryArgs, PS_LIST_TAIL, "-select_dateobs_begin", 0,
    179179            "search for exposures by time (>=)", NULL);
    180     psMetadataAddTime(definebyqueryArgs, PS_LIST_TAIL, "-select_dateobs_end", 0,
     180    psMetadataAddTime(definebydefinebyqueryArgs, PS_LIST_TAIL, "-select_dateobs_end", 0,
    181181            "search for exposures by time (<)", NULL);
    182     psMetadataAddF32(definebyqueryArgs, PS_LIST_TAIL, "-select_airmass_min",  0,
     182    psMetadataAddF32(definebydefinebyqueryArgs, PS_LIST_TAIL, "-select_airmass_min",  0,
    183183            "define min airmass", NAN);
    184     psMetadataAddF32(definebyqueryArgs, PS_LIST_TAIL, "-select_airmass_max",  0,
     184    psMetadataAddF32(definebydefinebyqueryArgs, PS_LIST_TAIL, "-select_airmass_max",  0,
    185185            "define max airmass", NAN);
    186     psMetadataAddF32(definebyqueryArgs, PS_LIST_TAIL, "-select_sat_pixel_frac_max",  0,
     186    psMetadataAddF32(definebydefinebyqueryArgs, PS_LIST_TAIL, "-select_sat_pixel_frac_max",  0,
    187187            "define max fraction of saturated pixels", NAN);
    188     psMetadataAddF32(definebyqueryArgs, PS_LIST_TAIL, "-select_exp_time_min",  0,
     188    psMetadataAddF32(definebydefinebyqueryArgs, PS_LIST_TAIL, "-select_exp_time_min",  0,
    189189            "define min exposure time", NAN);
    190     psMetadataAddF32(definebyqueryArgs, PS_LIST_TAIL, "-select_exp_time_max",  0,
     190    psMetadataAddF32(definebydefinebyqueryArgs, PS_LIST_TAIL, "-select_exp_time_max",  0,
    191191            "define max exposure time", NAN);
    192     psMetadataAddF64(definebyqueryArgs, PS_LIST_TAIL, "-select_ccd_temp_min",  0,
     192    psMetadataAddF64(definebydefinebyqueryArgs, PS_LIST_TAIL, "-select_ccd_temp_min",  0,
    193193            "define min ccd tempature", NAN);
    194     psMetadataAddF64(definebyqueryArgs, PS_LIST_TAIL, "-select_ccd_temp_max",  0,
     194    psMetadataAddF64(definebydefinebyqueryArgs, PS_LIST_TAIL, "-select_ccd_temp_max",  0,
    195195            "define max ccd tempature", NAN);
    196     psMetadataAddF64(definebyqueryArgs, PS_LIST_TAIL, "-select_pon_time_min",  0,
     196    psMetadataAddF64(definebydefinebyqueryArgs, PS_LIST_TAIL, "-select_pon_time_min",  0,
    197197            "define min power-on time", NAN);
    198     psMetadataAddF64(definebyqueryArgs, PS_LIST_TAIL, "-select_pon_time_max",  0,
     198    psMetadataAddF64(definebydefinebyqueryArgs, PS_LIST_TAIL, "-select_pon_time_max",  0,
    199199            "define max power-on time", NAN);
    200     psMetadataAddF64(definebyqueryArgs, PS_LIST_TAIL, "-select_posang_min",  0,
     200    psMetadataAddF64(definebydefinebyqueryArgs, PS_LIST_TAIL, "-select_posang_min",  0,
    201201            "define min rotator position angle", NAN);
    202     psMetadataAddF64(definebyqueryArgs, PS_LIST_TAIL, "-select_posang_max",  0,
     202    psMetadataAddF64(definebydefinebyqueryArgs, PS_LIST_TAIL, "-select_posang_max",  0,
    203203            "define max rotator position angle", NAN);
    204     psMetadataAddF64(definebyqueryArgs, PS_LIST_TAIL, "-select_solang_min",  0,
     204    psMetadataAddF64(definebydefinebyqueryArgs, PS_LIST_TAIL, "-select_solang_min",  0,
    205205            "define min solar angle", NAN);
    206     psMetadataAddF64(definebyqueryArgs, PS_LIST_TAIL, "-select_solang_max",  0,
     206    psMetadataAddF64(definebydefinebyqueryArgs, PS_LIST_TAIL, "-select_solang_max",  0,
    207207            "define max solar angle", NAN);
    208     psMetadataAddBool(definebyqueryArgs, PS_LIST_TAIL, "-pretend",  0,
     208    psMetadataAddBool(definebydefinebyqueryArgs, PS_LIST_TAIL, "-pretend",  0,
    209209            "print the exposures that would be included in the detrend run and exit", false);
    210     psMetadataAddStr(definebyqueryArgs, PS_LIST_TAIL, "-reduction",  0,
     210    psMetadataAddStr(definebydefinebyqueryArgs, PS_LIST_TAIL, "-reduction",  0,
    211211            "define reduction class for processing", NULL);
    212     psMetadataAddStr(definebyqueryArgs, PS_LIST_TAIL, "-label",  0,
     212    psMetadataAddStr(definebydefinebyqueryArgs, PS_LIST_TAIL, "-label",  0,
    213213            "define detrun label", NULL);
    214     psMetadataAddBool(definebyqueryArgs, PS_LIST_TAIL, "-simple",  0,
    215             "use the simple output format", false);
    216 
    217     psMetadataAddBool(definebyqueryArgs, PS_LIST_TAIL, "-random_subset",  0,
     214    psMetadataAddBool(definebydefinebyqueryArgs, PS_LIST_TAIL, "-simple",  0,
     215            "use the simple output format", false);
     216
     217    psMetadataAddBool(definebydefinebyqueryArgs, PS_LIST_TAIL, "-random_subset",  0,
    218218            "use a random subset of elements", false);
    219     psMetadataAddS32(definebyqueryArgs, PS_LIST_TAIL, "-random_limit",  0,
     219    psMetadataAddS32(definebydefinebyqueryArgs, PS_LIST_TAIL, "-random_limit",  0,
    220220            "use this number of random elements", 20);
    221221
    … …  
    11391139    PXOPT_ADD_MODE("-pending",         "list active detruns", DETTOOL_MODE_PENDING,       pendingArgs);
    11401140    PXOPT_ADD_MODE("-definebytag",     "", DETTOOL_MODE_DEFINEBYTAG,   definebytagArgs);
    1141     PXOPT_ADD_MODE("-definebyquery",   "", DETTOOL_MODE_DEFINEBYQUERY, definebyqueryArgs);
     1141    PXOPT_ADD_MODE("-definebyquery",   "", DETTOOL_MODE_DEFINEBYQUERY, definebydefinebyqueryArgs);
    11421142    PXOPT_ADD_MODE("-definebydetrun",  "", DETTOOL_MODE_DEFINEBYDETRUN, definebydetrunArgs);
    11431143    PXOPT_ADD_MODE("-makecorrection",  "", DETTOOL_MODE_MAKECORRECTION, makecorrectionArgs);

  • trunk/ippTools/src/difftool.c

    r17785 r18093  
    4040static bool revertdiffskyfileMode(pxConfig *config);
    4141static bool definepoprunMode(pxConfig *config);
    42 static bool queueMode(pxConfig *config);
     42static bool definebyqueryMode(pxConfig *config);
    4343
    4444static bool setdiffRunState(pxConfig *config, const char *diff_id, const char *state);
    … …  
    7171        MODECASE(DIFFTOOL_MODE_REVERTDIFFSKYFILE, revertdiffskyfileMode);
    7272        MODECASE(DIFFTOOL_MODE_DEFINEPOPRUN,      definepoprunMode);
    73         MODECASE(DIFFTOOL_MODE_QUEUE,             queueMode);
     73        MODECASE(DIFFTOOL_MODE_DEFINEBYQUERY,             definebyqueryMode);
    7474        default:
    7575            psAbort("invalid option (this should not happen)");
    … …  
    802802
    803803
    804 static bool queueMode(pxConfig *config)
     804static bool definebyqueryMode(pxConfig *config)
    805805{
    806806    PS_ASSERT_PTR_NON_NULL(config, false);

  • trunk/ippTools/src/difftool.h

    r17712 r18093  
    3434    DIFFTOOL_MODE_REVERTDIFFSKYFILE,
    3535    DIFFTOOL_MODE_DEFINEPOPRUN,
    36     DIFFTOOL_MODE_QUEUE,
     36    DIFFTOOL_MODE_DEFINEBYQUERY,
    3737} difftoolMode;
    3838

  • trunk/ippTools/src/difftoolConfig.c

    r17785 r18093  
    180180            "define stack ID for input", NULL);
    181181
    182     // -queue
     182    // -definebyquery
    183183    psMetadata *queueArgs = psMetadataAlloc();
    184184    psMetadataAddStr(queueArgs, PS_LIST_TAIL, "-workdir", 0,
    … …  
    203203    PXOPT_ADD_MODE("-revertdiffskyfile","", DIFFTOOL_MODE_REVERTDIFFSKYFILE, revertdiffskyfileArgs);
    204204    PXOPT_ADD_MODE("-definepoprun",     "", DIFFTOOL_MODE_DEFINEPOPRUN,      definepoprunArgs);
    205     PXOPT_ADD_MODE("-queue",            "", DIFFTOOL_MODE_QUEUE,             queueArgs);
     205    PXOPT_ADD_MODE("-definebyquery",            "", DIFFTOOL_MODE_DEFINEBYQUERY,             queueArgs);
    206206
    207207    if (!pxGetOptions(stderr, argc, argv, config, modes, argSets)) {

  • trunk/ippTools/src/faketool.c

    r18029 r18093  
    3333#include "faketool.h"
    3434
    35 static bool queueMode(pxConfig *config);
     35static bool definebyqueryMode(pxConfig *config);
    3636static bool updaterunMode(pxConfig *config);
    3737static bool pendingexpMode(pxConfig *config);
    … …  
    6565
    6666    switch (config->mode) {
    67         MODECASE(FAKETOOL_MODE_QUEUE,                   queueMode);
     67        MODECASE(FAKETOOL_MODE_DEFINEBYQUERY,                   definebyqueryMode);
    6868        MODECASE(FAKETOOL_MODE_UPDATERUN,               updaterunMode);
    6969        MODECASE(FAKETOOL_MODE_PENDINGEXP,              pendingexpMode);
    … …  
    9999
    100100
    101 static bool queueMode(pxConfig *config)
     101static bool definebyqueryMode(pxConfig *config)
    102102{
    103103    PS_ASSERT_PTR_NON_NULL(config, NULL);

  • trunk/ippTools/src/faketool.h

    r18029 r18093  
    2525typedef enum {
    2626    FAKETOOL_MODE_NONE      = 0x0,
    27     FAKETOOL_MODE_QUEUE,
     27    FAKETOOL_MODE_DEFINEBYQUERY,
    2828    FAKETOOL_MODE_UPDATERUN,
    2929    FAKETOOL_MODE_PENDINGIMFILE,

  • trunk/ippTools/src/faketoolConfig.c

    r18029 r18093  
    4444    }
    4545
    46     // -queue
     46    // -definebyquery
    4747    psMetadata *queueArgs = psMetadataAlloc();
    4848    // XXX need to allow multiple exp_ids
    … …  
    426426    psMetadata *modes = psMetadataAlloc();
    427427
    428     PXOPT_ADD_MODE("-queue",                 "create runs from raw exposures",
    429         FAKETOOL_MODE_QUEUE,                    queueArgs);
     428    PXOPT_ADD_MODE("-definebyquery",                 "create runs from raw exposures",
     429        FAKETOOL_MODE_DEFINEBYQUERY,                    queueArgs);
    430430    PXOPT_ADD_MODE("-updaterun",             "change fake run properties",
    431431        FAKETOOL_MODE_UPDATERUN,                updaterunArgs);

  • trunk/ippTools/src/magictool.c

    r16170 r18093  
    3131#include "magictool.h"
    3232
    33 static bool queueMode(pxConfig *config);
     33static bool definebyqueryMode(pxConfig *config);
    3434static psS64 definerunMode(pxConfig *config);
    3535static bool updaterunMode(pxConfig *config);
    … …  
    6565
    6666    switch (config->mode) {
    67         MODECASE(MAGICTOOL_MODE_QUEUE,          queueMode);
     67        MODECASE(MAGICTOOL_MODE_DEFINEBYQUERY,          definebyqueryMode);
    6868        MODECASE(MAGICTOOL_MODE_DEFINERUN,      definerunMode);
    6969        MODECASE(MAGICTOOL_MODE_UPDATERUN,      updaterunMode);
    … …  
    9898}
    9999
    100 static bool queueMode(pxConfig *config)
     100static bool definebyqueryMode(pxConfig *config)
    101101{
    102102    PS_ASSERT_PTR_NON_NULL(config, false);

  • trunk/ippTools/src/magictool.h

    r15501 r18093  
    2525typedef enum {
    2626    MAGICTOOL_MODE_NONE           = 0x0,
    27     MAGICTOOL_MODE_QUEUE,
     27    MAGICTOOL_MODE_DEFINEBYQUERY,
    2828    MAGICTOOL_MODE_DEFINERUN,
    2929    MAGICTOOL_MODE_UPDATERUN,

  • trunk/ippTools/src/magictoolConfig.c

    r16170 r18093  
    4747    psTime *now = psTimeGetNow(PS_TIME_TAI);
    4848
    49     // -queue
     49    // -definebyquery
    5050    psMetadata *queueArgs = psMetadataAlloc();
    5151
    … …  
    160160    psMetadata *modes   = psMetadataAlloc();
    161161
    162     PXOPT_ADD_MODE("-queue",           "", MAGICTOOL_MODE_QUEUE,           queueArgs);
     162    PXOPT_ADD_MODE("-definebyquery",           "", MAGICTOOL_MODE_DEFINEBYQUERY,           queueArgs);
    163163    PXOPT_ADD_MODE("-definerun",       "", MAGICTOOL_MODE_DEFINERUN,       definerunArgs);
    164164    PXOPT_ADD_MODE("-updaterun",       "", MAGICTOOL_MODE_UPDATERUN,       updaterunArgs);

  • trunk/ippTools/src/stacktool.c

    r16940 r18093  
    3131#include "stacktool.h"
    3232
    33 static bool queueMode(pxConfig *config);
     33static bool definebyqueryMode(pxConfig *config);
    3434static bool definerunMode(pxConfig *config);
    3535static bool updaterunMode(pxConfig *config);
    … …  
    6161
    6262    switch (config->mode) {
    63         MODECASE(STACKTOOL_MODE_QUEUE,              queueMode);
     63        MODECASE(STACKTOOL_MODE_DEFINEBYQUERY,              definebyqueryMode);
    6464        MODECASE(STACKTOOL_MODE_DEFINERUN,          definerunMode);
    6565        MODECASE(STACKTOOL_MODE_UPDATERUN,          updaterunMode);
    … …  
    9292
    9393
    94 static bool queueMode(pxConfig *config)
     94static bool definebyqueryMode(pxConfig *config)
    9595{
    9696    PS_ASSERT_PTR_NON_NULL(config, false);

  • trunk/ippTools/src/stacktool.h

    r16724 r18093  
    2525typedef enum {
    2626    STACKTOOL_MODE_NONE           = 0x0,
    27     STACKTOOL_MODE_QUEUE,
     27    STACKTOOL_MODE_DEFINEBYQUERY,
    2828    STACKTOOL_MODE_DEFINERUN,
    2929    STACKTOOL_MODE_UPDATERUN,

  • trunk/ippTools/src/stacktoolConfig.c

    r16940 r18093  
    4545    psTime *now = psTimeGetNow(PS_TIME_TAI);
    4646
    47     // -queue
     47    // -definebyquery
    4848    psMetadata *queueArgs = psMetadataAlloc();
    4949    psMetadataAddStr(queueArgs, PS_LIST_TAIL, "-workdir", 0,
    … …  
    200200    psMetadata *modes   = psMetadataAlloc();
    201201
    202     PXOPT_ADD_MODE("-queue", "Define a new stackRun by searching for warp IDs",
    203         STACKTOOL_MODE_QUEUE,  queueArgs);
     202    PXOPT_ADD_MODE("-definebyquery", "Define a new stackRun by searching for warp IDs",
     203        STACKTOOL_MODE_DEFINEBYQUERY,  queueArgs);
    204204    PXOPT_ADD_MODE("-definerun",       "", STACKTOOL_MODE_DEFINERUN,      definerunArgs);
    205205    PXOPT_ADD_MODE("-updaterun",       "", STACKTOOL_MODE_UPDATERUN,      updaterunArgs);
Note: See TracChangeset for help on using the changeset viewer.