IPP Software Navigation Tools IPP Links Communication Pan-STARRS Links

Changeset 25784


Ignore:
Timestamp:
Oct 6, 2009, 9:22:42 AM (17 years ago)
Author:
eugene
Message:

change addcamera to advancecamera; add addcamera mode matching addchip mode

Location:
trunk/ippTools/src
Files:
3 edited

Legend:

Unmodified
Added
Removed

  • trunk/ippTools/src/flatcorr.c

    r24140 r25784  
    3939static bool addchipMode(pxConfig *config);
    4040static bool addcameraMode(pxConfig *config);
     41static bool advancecameraMode(pxConfig *config);
    4142static bool dropchipMode(pxConfig *config);
    4243static bool dropcameraMode(pxConfig *config);
    … …  
    7374        MODECASE(FLATCORR_MODE_ADDCHIP,        addchipMode);
    7475        MODECASE(FLATCORR_MODE_ADDCAMERA,      addcameraMode);
     76        MODECASE(FLATCORR_MODE_ADVANCECAMERA,  advancecameraMode);
    7577        MODECASE(FLATCORR_MODE_DROPCHIP,       dropchipMode);
    7678        MODECASE(FLATCORR_MODE_DROPCAMERA,     dropcameraMode);
    … …  
    297299    // start a transaction so we don't end up with an exp without any associted
    298300    // imfiles
    299     if (!psDBTransaction(config->dbh)) {
    300         psError(PS_ERR_UNKNOWN, false, "database error");
    301         return false;
    302     }
     301    // if (!psDBTransaction(config->dbh)) {
     302    //     psError(PS_ERR_UNKNOWN, false, "database error");
     303    //     return false;
     304    // }
    303305
    304306    // create a new flatcorrRun
    … …  
    333335    row->corr_id = corr_id;
    334336
     337    // if (!psDBCommit(config->dbh)) {
     338    //     psError(PS_ERR_UNKNOWN, false, "database error");
     339    //     return false;
     340    // }
     341
    335342    flatcorrRunPrintObject (stdout, row, !simple);
    336343    return true;
    … …  
    378385}
    379386
     387static bool addcameraMode(pxConfig *config)
     388{
     389    PS_ASSERT_PTR_NON_NULL(config, false);
     390
     391    // required
     392    PXOPT_LOOKUP_S64(corr_id, config->args, "-corr_id", true, false);
     393    PXOPT_LOOKUP_S64(chip_id, config->args, "-chip_id", true, false);
     394    PXOPT_LOOKUP_S64(cam_id, config->args, "-cam_id", true, false);
     395
     396    // add a flatcorrCamLink (initial state has include = TRUE)
     397    // XXX should add checks that the chip_id and corr_id are in ChipLink
     398    if (!flatcorrCamLinkInsert(config->dbh, corr_id, chip_id, cam_id, 1)) {
     399        psError(PS_ERR_UNKNOWN, false, "database error");
     400        return false;
     401    }
     402
     403    return true;
     404}
     405
    380406// select the flatcorr chip runs that have completed and for which there is no camera entry
    381407// queue a new camera run for them
    382 static bool addcameraMode(pxConfig *config)
     408static bool advancecameraMode(pxConfig *config)
    383409{
    384410    PS_ASSERT_PTR_NON_NULL(config, false);

  • trunk/ippTools/src/flatcorr.h

    r23310 r25784  
    2929    FLATCORR_MODE_ADDCHIP,
    3030    FLATCORR_MODE_ADDCAMERA,
     31    FLATCORR_MODE_ADVANCECAMERA,
    3132    FLATCORR_MODE_DROPCHIP,
    3233    FLATCORR_MODE_DROPCAMERA,

  • trunk/ippTools/src/flatcorrConfig.c

    r25782 r25784  
    8383    psMetadataAddS64(addchipArgs, PS_LIST_TAIL, "-chip_id", 0,            "define Chip ID (required)", 0);
    8484
     85    // -addcamera
     86    psMetadata *addcameraArgs = psMetadataAlloc();
     87    psMetadataAddS64(addcameraArgs, PS_LIST_TAIL, "-corr_id", 0,            "define Flat Correction ID (required)", 0);
     88    psMetadataAddS64(addcameraArgs, PS_LIST_TAIL, "-chip_id", 0,            "define Chip ID (required)", 0);
     89    psMetadataAddS64(addcameraArgs, PS_LIST_TAIL, "-cam_id", 0,             "define Camera ID (required)", 0);
     90
    8591    // -dropchip
    8692    psMetadata *dropchipArgs = psMetadataAlloc();
    … …  
    8894    psMetadataAddS64(dropchipArgs, PS_LIST_TAIL, "-chip_id", 0,            "define Chip ID (required)", 0);
    8995
    90     // -addcamera
    91     psMetadata *addcameraArgs = psMetadataAlloc();
    92     psMetadataAddU64 (addcameraArgs, PS_LIST_TAIL, "-limit",   0, "limit result set to N items", 0);
    93     psMetadataAddBool(addcameraArgs, PS_LIST_TAIL, "-simple",  0, "use the simple output format", false);
    94     psMetadataAddBool(addcameraArgs, PS_LIST_TAIL, "-pretend", 0, "use the simple output format", false);
     96    // -advancecamera
     97    psMetadata *advancecameraArgs = psMetadataAlloc();
     98    psMetadataAddU64 (advancecameraArgs, PS_LIST_TAIL, "-limit",   0, "limit result set to N items", 0);
     99    psMetadataAddBool(advancecameraArgs, PS_LIST_TAIL, "-simple",  0, "use the simple output format", false);
     100    psMetadataAddBool(advancecameraArgs, PS_LIST_TAIL, "-pretend", 0, "use the simple output format", false);
    95101
    96102    // -dropcamera
    … …  
    144150    psMetadata *modes = psMetadataAlloc();
    145151
    146     PXOPT_ADD_MODE("-definebyquery",  "create a new, populated flat correction run",       FLATCORR_MODE_DEFINEBYQUERY,  definebyqueryArgs);
    147     PXOPT_ADD_MODE("-definerun",      "create a new, empty flat correction run",           FLATCORR_MODE_DEFINERUN,      definerunArgs);
    148     PXOPT_ADD_MODE("-addchip",        "add a chip to a flat correction run",               FLATCORR_MODE_ADDCHIP,        addchipArgs);
    149     PXOPT_ADD_MODE("-addcamera",      "migrate completed chips to camera stage analysis",  FLATCORR_MODE_ADDCAMERA,      addcameraArgs);
    150     PXOPT_ADD_MODE("-dropchip",       "drop a chip from a flat correction run",            FLATCORR_MODE_DROPCHIP,       dropchipArgs);
    151     PXOPT_ADD_MODE("-dropcamera",     "drop an exposure (camera stage analysis)",          FLATCORR_MODE_DROPCAMERA,     dropcameraArgs);
    152     PXOPT_ADD_MODE("-pendingprocess", "show flat correction runs needing to be processed", FLATCORR_MODE_PENDINGPROCESS, pendingprocessArgs);
    153     PXOPT_ADD_MODE("-addprocess",     "report completed flat correction analysis",         FLATCORR_MODE_ADDPROCESS,     addprocessArgs);
    154     PXOPT_ADD_MODE("-updaterun",      "change a flat calibration run's state",             FLATCORR_MODE_UPDATERUN,      updaterunArgs);
    155     PXOPT_ADD_MODE("-inputexp",       "list exposures for a correction run",               FLATCORR_MODE_INPUTEXP,       inputexpArgs);
    156     PXOPT_ADD_MODE("-inputimfile",    "list imfiles for a chip run",                       FLATCORR_MODE_INPUTIMFILE,    inputimfileArgs);
    157     PXOPT_ADD_MODE("-exportrun",            "export run for import on other database", FLATCORR_MODE_EXPORTRUN, exportrunArgs);
    158     PXOPT_ADD_MODE("-importrun",            "import run from metadata file",           FLATCORR_MODE_IMPORTRUN, importrunArgs);
     152    PXOPT_ADD_MODE("-definebyquery",  "create a new, populated flat correction run",         FLATCORR_MODE_DEFINEBYQUERY,  definebyqueryArgs);
     153    PXOPT_ADD_MODE("-definerun",      "create a new, empty flat correction run",             FLATCORR_MODE_DEFINERUN,      definerunArgs);
     154    PXOPT_ADD_MODE("-addchip",        "add an existing chip run to a flat correction run",   FLATCORR_MODE_ADDCHIP,        addchipArgs);
     155    PXOPT_ADD_MODE("-addcamera",      "add an existing camera run to a flat correction run", FLATCORR_MODE_ADDCAMERA,      addcameraArgs);
     156    PXOPT_ADD_MODE("-advancecamera",  "migrate completed chips to camera stage analysis",    FLATCORR_MODE_ADVANCECAMERA,  advancecameraArgs);
     157    PXOPT_ADD_MODE("-dropchip",       "drop a chip from a flat correction run",              FLATCORR_MODE_DROPCHIP,       dropchipArgs);
     158    PXOPT_ADD_MODE("-dropcamera",     "drop an exposure (camera stage analysis)",            FLATCORR_MODE_DROPCAMERA,     dropcameraArgs);
     159    PXOPT_ADD_MODE("-pendingprocess", "show flat correction runs needing to be processed",   FLATCORR_MODE_PENDINGPROCESS, pendingprocessArgs);
     160    PXOPT_ADD_MODE("-addprocess",     "report completed flat correction analysis",           FLATCORR_MODE_ADDPROCESS,     addprocessArgs);
     161    PXOPT_ADD_MODE("-updaterun",      "change a flat calibration run's state",               FLATCORR_MODE_UPDATERUN,      updaterunArgs);
     162    PXOPT_ADD_MODE("-inputexp",       "list exposures for a correction run",                 FLATCORR_MODE_INPUTEXP,       inputexpArgs);
     163    PXOPT_ADD_MODE("-inputimfile",    "list imfiles for a chip run",                         FLATCORR_MODE_INPUTIMFILE,    inputimfileArgs);
     164    PXOPT_ADD_MODE("-exportrun",            "export run for import on other database",       FLATCORR_MODE_EXPORTRUN,      exportrunArgs);
     165    PXOPT_ADD_MODE("-importrun",            "import run from metadata file",                 FLATCORR_MODE_IMPORTRUN,      importrunArgs);
    159166
    160167    if (!pxGetOptions(stderr, argc, argv, config, modes, argSets)) {
Note: See TracChangeset for help on using the changeset viewer.