IPP Software Navigation Tools IPP Links Communication Pan-STARRS Links

Changeset 12190


Ignore:
Timestamp:
Mar 2, 2007, 2:33:47 PM (19 years ago)
Author:
jhoblitt
Message:

rename chipQueueRawExp() -> chipQueueExpTag()

Location:
trunk/ippTools/src
Files:
6 edited

Legend:

Unmodified
Added
Removed

  • trunk/ippTools/src/Makefile.am

    r12188 r12190  
    5151        pxio.c \
    5252        pxtag.c \
    53         chipqueuerawexp.c \
     53        chipqueue.c \
    5454        camqueue.c
    5555

  • trunk/ippTools/src/chipqueue.c

    r12177 r12190  
    11/*
    2  * chipqueuerawexp.c
     2 * chipqueue.c
    33 *
    44 * Copyright (C) 2007  Joshua Hoblitt
    … …  
    2626#include "chiptool.h"
    2727
    28 bool chipQueueRawExp(pxConfig *config,
     28bool chipQueueExpTag(pxConfig *config,
    2929                     psString exp_tag,
    3030                     psString label,

  • trunk/ippTools/src/chiptool.c

    r12188 r12190  
    3131#include "camtool.h"
    3232
    33 static bool queuerawexpMode(pxConfig *config);
     33static bool queueMode(pxConfig *config);
    3434static bool pendingimfileMode(pxConfig *config);
    3535static bool addprocessedimfileMode(pxConfig *config);
    … …  
    6161
    6262    switch (config->mode) {
    63         MODECASE(CHIPTOOL_MODE_QUEUERAWEXP,           queuerawexpMode);
    64         MODECASE(CHIPTOOL_MODE_PENDINGIMFILE,         pendingimfileMode);
    65         MODECASE(CHIPTOOL_MODE_ADDPROCESSEDIMFILE,    addprocessedimfileMode);
    66         MODECASE(CHIPTOOL_MODE_PROCESSEDIMFILE,       processedimfileMode);
    67         MODECASE(CHIPTOOL_MODE_UPDATEPROCESSEDIMFILE, updateprocessedimfileMode);
    68         MODECASE(CHIPTOOL_MODE_BLOCK,                 blockMode);
    69         MODECASE(CHIPTOOL_MODE_MASKED,                maskedMode);
    70         MODECASE(CHIPTOOL_MODE_UNBLOCK,               unblockMode);
     63        MODECASE(CHIPTOOL_MODE_QUEUE,                   queueMode);
     64        MODECASE(CHIPTOOL_MODE_PENDINGIMFILE,           pendingimfileMode);
     65        MODECASE(CHIPTOOL_MODE_ADDPROCESSEDIMFILE,      addprocessedimfileMode);
     66        MODECASE(CHIPTOOL_MODE_PROCESSEDIMFILE,         processedimfileMode);
     67        MODECASE(CHIPTOOL_MODE_UPDATEPROCESSEDIMFILE,updateprocessedimfileMode);
     68        MODECASE(CHIPTOOL_MODE_BLOCK,                   blockMode);
     69        MODECASE(CHIPTOOL_MODE_MASKED,                  maskedMode);
     70        MODECASE(CHIPTOOL_MODE_UNBLOCK,                 unblockMode);
    7171        default:
    7272            psAbort("invalid option (this should not happen)");
    … …  
    126126
    127127
    128 static bool queuerawexpMode(pxConfig *config)
     128static bool queueMode(pxConfig *config)
    129129{
    130130    PS_ASSERT_PTR_NON_NULL(config, NULL);
    … …  
    235235
    236236        // queue the exp
    237         if (!chipQueueRawExp(config, exp_tag, label, recipe, expgroup, dvodb)) {
     237        if (!chipQueueExpTag(config, exp_tag, label, recipe, expgroup, dvodb)) {
    238238            if (!psDBRollback(config->dbh)) {
    239239                psError(PS_ERR_UNKNOWN, false, "database error");

  • trunk/ippTools/src/chiptool.h

    r12177 r12190  
    2525typedef enum {
    2626    CHIPTOOL_MODE_NONE      = 0x0,
    27     CHIPTOOL_MODE_QUEUERAWEXP,
     27    CHIPTOOL_MODE_QUEUE,
    2828    CHIPTOOL_MODE_PENDINGIMFILE,
    2929    CHIPTOOL_MODE_ADDPROCESSEDIMFILE,
    … …  
    3737pxConfig *chiptoolConfig(pxConfig *config, int argc, char **argv);
    3838
    39 bool chipQueueRawExp(pxConfig *config, psString exp_tag, psString label, psString recipe, psString expgroup, psString dvodb);
     39bool chipQueueExpTag(pxConfig *config, psString exp_tag, psString label, psString recipe, psString expgroup, psString dvodb);
    4040
    4141#endif // CHIPTOOL_H

  • trunk/ippTools/src/chiptoolConfig.c

    r12174 r12190  
    4141    }
    4242
    43     // -queuerawexp
    44     psMetadata *queuerawexpArgs = psMetadataAlloc();
    45     psMetadataAddStr(queuerawexpArgs, PS_LIST_TAIL, "-exp_tag",  0,
     43    // -queue
     44    psMetadata *queueArgs = psMetadataAlloc();
     45    psMetadataAddStr(queueArgs, PS_LIST_TAIL, "-exp_tag",  0,
    4646            "search by exp_tag", NULL);
    47     psMetadataAddStr(queuerawexpArgs, PS_LIST_TAIL, "-exp_id",  0,
     47    psMetadataAddStr(queueArgs, PS_LIST_TAIL, "-exp_id",  0,
    4848            "search by exp_id", NULL);
    49     psMetadataAddStr(queuerawexpArgs, PS_LIST_TAIL, "-inst",  0,
     49    psMetadataAddStr(queueArgs, PS_LIST_TAIL, "-inst",  0,
    5050            "search by camera", NULL);
    51     psMetadataAddStr(queuerawexpArgs, PS_LIST_TAIL, "-telescope",  0,
     51    psMetadataAddStr(queueArgs, PS_LIST_TAIL, "-telescope",  0,
    5252            "search by telescope", NULL);
    53     psMetadataAddStr(queuerawexpArgs, PS_LIST_TAIL, "-dateobs",  0,
     53    psMetadataAddStr(queueArgs, PS_LIST_TAIL, "-dateobs",  0,
    5454            "search by observation time", NULL);
    55     psMetadataAddStr(queuerawexpArgs, PS_LIST_TAIL, "-exp_type",  0,
     55    psMetadataAddStr(queueArgs, PS_LIST_TAIL, "-exp_type",  0,
    5656            "search by exposure type", NULL);
    57     psMetadataAddStr(queuerawexpArgs, PS_LIST_TAIL, "-imfiles",  0,
     57    psMetadataAddStr(queueArgs, PS_LIST_TAIL, "-imfiles",  0,
    5858            "search by number of imfiles", NULL);
    59     psMetadataAddStr(queuerawexpArgs, PS_LIST_TAIL, "-workdir",  0,
     59    psMetadataAddStr(queueArgs, PS_LIST_TAIL, "-workdir",  0,
    6060            "search by workdir", NULL);
    61     psMetadataAddStr(queuerawexpArgs, PS_LIST_TAIL, "-filter",  0,
     61    psMetadataAddStr(queueArgs, PS_LIST_TAIL, "-filter",  0,
    6262            "search by filter ", NULL);
    63     psMetadataAddF32(queuerawexpArgs, PS_LIST_TAIL, "-airmass",  0,
     63    psMetadataAddF32(queueArgs, PS_LIST_TAIL, "-airmass",  0,
    6464            "search by airmass", NAN);
    65     psMetadataAddF64(queuerawexpArgs, PS_LIST_TAIL, "-ra",  0,
     65    psMetadataAddF64(queueArgs, PS_LIST_TAIL, "-ra",  0,
    6666            "search by RA", NAN);
    67     psMetadataAddF64(queuerawexpArgs, PS_LIST_TAIL, "-decl",  0,
     67    psMetadataAddF64(queueArgs, PS_LIST_TAIL, "-decl",  0,
    6868            "search by DEC", NAN);
    69     psMetadataAddF32(queuerawexpArgs, PS_LIST_TAIL, "-exp_time",  0,
     69    psMetadataAddF32(queueArgs, PS_LIST_TAIL, "-exp_time",  0,
    7070            "search by exposure time", NAN);
    71     psMetadataAddF64(queuerawexpArgs, PS_LIST_TAIL, "-bg",  0,
     71    psMetadataAddF64(queueArgs, PS_LIST_TAIL, "-bg",  0,
    7272            "search by exposue background", NAN);
    73     psMetadataAddF64(queuerawexpArgs, PS_LIST_TAIL, "-bg_stdev",  0,
     73    psMetadataAddF64(queueArgs, PS_LIST_TAIL, "-bg_stdev",  0,
    7474            "search by exposue background stdev", NAN);
    75     psMetadataAddF64(queuerawexpArgs, PS_LIST_TAIL, "-bg_mean_stdev",  0,
     75    psMetadataAddF64(queueArgs, PS_LIST_TAIL, "-bg_mean_stdev",  0,
    7676            "search by exposue background mean stdev", NAN);
    77     psMetadataAddF64(queuerawexpArgs, PS_LIST_TAIL, "-alt",  0,
     77    psMetadataAddF64(queueArgs, PS_LIST_TAIL, "-alt",  0,
    7878            "search by altitute", NAN);
    79     psMetadataAddF64(queuerawexpArgs, PS_LIST_TAIL, "-az",  0,
     79    psMetadataAddF64(queueArgs, PS_LIST_TAIL, "-az",  0,
    8080            "search by azimuth", NAN);
    81     psMetadataAddF32(queuerawexpArgs, PS_LIST_TAIL, "-ccd_temp",  0,
     81    psMetadataAddF32(queueArgs, PS_LIST_TAIL, "-ccd_temp",  0,
    8282            "search by ccd tempature", NAN);
    83     psMetadataAddF64(queuerawexpArgs, PS_LIST_TAIL, "-posang",  0,
     83    psMetadataAddF64(queueArgs, PS_LIST_TAIL, "-posang",  0,
    8484            "search by rotator position angle", NAN);
    85     psMetadataAddStr(queuerawexpArgs, PS_LIST_TAIL, "-object",  0,
     85    psMetadataAddStr(queueArgs, PS_LIST_TAIL, "-object",  0,
    8686            "search by exposure object", NULL);
    87     psMetadataAddStr(queuerawexpArgs, PS_LIST_TAIL, "-set_label",  0,
     87    psMetadataAddStr(queueArgs, PS_LIST_TAIL, "-set_label",  0,
    8888            "define label", NULL);
    89     psMetadataAddStr(queuerawexpArgs, PS_LIST_TAIL, "-set_recipe",  0,
     89    psMetadataAddStr(queueArgs, PS_LIST_TAIL, "-set_recipe",  0,
    9090            "define recipe", NULL);
    91     psMetadataAddStr(queuerawexpArgs, PS_LIST_TAIL, "-set_expgroup",  0,
     91    psMetadataAddStr(queueArgs, PS_LIST_TAIL, "-set_expgroup",  0,
    9292            "define exposure group", NULL);
    93     psMetadataAddStr(queuerawexpArgs, PS_LIST_TAIL, "-set_dvodb",  0,
     93    psMetadataAddStr(queueArgs, PS_LIST_TAIL, "-set_dvodb",  0,
    9494            "define DBO db", NULL);
    9595
    … …  
    207207
    208208    psMetadata *argSets = psMetadataAlloc();
    209     PXTOOL_MODE("-queuerawexp",     CHIPTOOL_MODE_QUEUERAWEXP,   queuerawexpArgs);
     209    PXTOOL_MODE("-queue",           CHIPTOOL_MODE_QUEUE,          queueArgs);
    210210    PXTOOL_MODE("-pendingimfile",   CHIPTOOL_MODE_PENDINGIMFILE,  pendingimfileArgs);
    211211    PXTOOL_MODE("-addprocessedimfile",CHIPTOOL_MODE_ADDPROCESSEDIMFILE,addprocessedimfileArgs);

  • trunk/ippTools/src/regtool.c

    r12177 r12190  
    646646
    647647        // insert an entry into the chipPendingExp table
    648         if (!chipQueueRawExp(config, exp_tag, NULL, NULL, NULL, NULL)) {
     648        if (!chipQueueExpTag(config, exp_tag, NULL, NULL, NULL, NULL)) {
    649649            // rollback
    650650            if (!psDBRollback(config->dbh)) {
Note: See TracChangeset for help on using the changeset viewer.