IPP Software Navigation Tools IPP Links Communication Pan-STARRS Links

Changeset 18975


Ignore:
Timestamp:
Aug 8, 2008, 12:37:49 PM (18 years ago)
Author:
bills
Message:

In the modes for difftool, stacktool, and warptool that print out results
of runs include the exp_id and camera and also allow (or fix bugs in)
selecting by exp_id

Location:
trunk/ippTools
Files:
8 edited

Legend:

Unmodified
Added
Removed

  • trunk/ippTools/share/difftool_skyfile.sql

    r18952 r18975  
    33    diffRun.tess_id,
    44    diffRun.state,
    5     diffSkyfile.*
     5    diffSkyfile.*,
     6    rawExp.exp_id,
     7    rawExp.camera
    68FROM diffRun
    79JOIN diffSkyfile
    810    USING(diff_id)
     11-- my new stuff begins here
     12JOIN diffInputSkyfile
     13    ON diffInputSkyfile.diff_id = diffRun.diff_id
     14    AND diffInputSkyfile.template = 0
     15JOIN warpRun
     16    ON diffInputSkyfile.warp_id = warpRun.warp_id
     17JOIN fakeRun
     18    ON warpRun.fake_id = fakeRun.fake_id
     19JOIN camRun
     20    ON camRun.cam_id = fakeRun.cam_id
     21JOIN chipRun
     22    ON camRun.chip_id = chipRun.chip_id
     23JOIN rawExp
     24    ON chipRun.exp_id = rawExp.exp_id
     25-- my new stuff ends here
    926    WHERE
    1027    -- bogus test to allow appending conditionals

  • trunk/ippTools/share/stacktool_sumskyfile.sql

    r18951 r18975  
    11SELECT
    22    stackSumSkyfile.*,
    3     stackRun.state
     3    stackRun.state,
     4    rawExp.camera
    45FROM stackRun
    56JOIN stackSumSkyfile
    67    USING(stack_id)
     8JOIN warpRun
     9    -- just need 1 warp to find the camera
     10    ON warpRun.warp_id = (SELECT warp_id FROM stackInputSkyfile
     11                            WHERE stackInputSkyfile.stack_id = stackRun.stack_id limit 1)
     12JOIN fakeRun
     13    ON warpRun.fake_id = fakeRun.fake_id
     14JOIN camRun
     15    ON camRun.cam_id   = fakeRun.cam_id
     16JOIN chipRun
     17    ON camRun.chip_id  = chipRun.chip_id
     18JOIN rawExp
     19    ON chipRun.exp_id  = rawExp.exp_id
    720WHERE
    821-- bogus test; just here so there there is a 'WHERE' stmt to append conditionals too

  • trunk/ippTools/share/warptool_warped.sql

    r18950 r18975  
    11SELECT
    22    warpSkyfile.*,
    3     warpRun.state
     3    warpRun.state,
     4    rawExp.exp_id,
     5    rawExp.camera
    46FROM warpRun
    57JOIN warpSkyfile
    68    USING(warp_id)
     9JOIN fakeRun
     10    ON warpRun.fake_id = fakeRun.fake_id
     11JOIN camRun
     12    ON camRun.cam_id   = fakeRun.cam_id
     13JOIN chipRun
     14    ON camRun.chip_id  = chipRun.chip_id
     15JOIN rawExp
     16    ON chipRun.exp_id  = rawExp.exp_id
    717WHERE
    818-- bogus test; just here so there there is a 'WHERE' stmt to append conditionals too

  • trunk/ippTools/src/difftool.c

    r18679 r18975  
    519519
    520520    psMetadata *where = psMetadataAlloc();
    521     PXOPT_COPY_S64(config->args, where,  "-diff_id", "diff_id", "==");
    522     PXOPT_COPY_STR(config->args, where, "-skycell_id", "skycell_id", "==");
    523     PXOPT_COPY_STR(config->args, where, "-tess_id", "tess_id", "==");
     521    PXOPT_COPY_S64(config->args, where,  "-diff_id", "diffSkyfile.diff_id", "==");
     522    PXOPT_COPY_STR(config->args, where, "-skycell_id", "diffSkyfile.skycell_id", "==");
     523    PXOPT_COPY_STR(config->args, where, "-tess_id", "diffSkyfile.tess_id", "==");
     524    PXOPT_COPY_STR(config->args, where, "-exp_id", "rawExp.exp_id", "==");
    524525
    525526    PXOPT_LOOKUP_U64(limit, config->args, "-limit", false, false);
    … …  
    533534
    534535    if (psListLength(where->list)) {
    535         psString whereClause = psDBGenerateWhereConditionSQL(where, "diffSkyfile");
     536        psString whereClause = psDBGenerateWhereConditionSQL(where, NULL);
    536537        psStringAppend(&query, " AND %s", whereClause);
    537538        psFree(whereClause);

  • trunk/ippTools/src/difftoolConfig.c

    r18678 r18975  
    104104    psMetadataAddStr(diffskyfileArgs , PS_LIST_TAIL, "-skycell_id",  0,            "define skycell ID", NULL);
    105105    psMetadataAddStr(diffskyfileArgs, PS_LIST_TAIL, "-tess_id",  0,            "define tessellation ID", NULL);
     106    psMetadataAddStr(diffskyfileArgs, PS_LIST_TAIL, "-exp_id",  0,            "define exposure ID", NULL);
    106107    psMetadataAddU64(diffskyfileArgs, PS_LIST_TAIL, "-limit",  0,            "limit result set to N items", 0);
    107108    psMetadataAddBool(diffskyfileArgs, PS_LIST_TAIL, "-simple",  0,            "use the simple output format", false);

  • trunk/ippTools/src/stacktool.c

    r18772 r18975  
    690690
    691691    psMetadata *where = psMetadataAlloc();
    692     PXOPT_COPY_S64(config->args, where, "-warp_id", "warp_id", "==");
    693     PXOPT_COPY_S64(config->args, where, "-stack_id", "stack_id", "==");
     692    PXOPT_COPY_S64(config->args, where, "-warp_id", "warpRun.warp_id", "==");
     693    PXOPT_COPY_S64(config->args, where, "-stack_id", "stackSumSkyfile.stack_id", "==");
     694    PXOPT_COPY_S64(config->args, where, "-exp_id", "rawExp.exp_id", "==");
    694695
    695696    PXOPT_LOOKUP_U64(limit, config->args, "-limit", false, false);
    … …  
    703704
    704705    if (psListLength(where->list)) {
    705         psString whereClause = psDBGenerateWhereConditionSQL(where, "stackSumSkyfile");
     706        psString whereClause = psDBGenerateWhereConditionSQL(where, NULL);
    706707        psStringAppend(&query, " AND %s", whereClause);
    707708        psFree(whereClause);

  • trunk/ippTools/src/stacktoolConfig.c

    r18578 r18975  
    126126    psMetadataAddS64(sumskyfileArgs, PS_LIST_TAIL, "-stack_id", 0,            "search by stack ID", 0);
    127127    psMetadataAddS64(sumskyfileArgs, PS_LIST_TAIL, "-warp_id", 0,            "search by warp ID", 0);
     128    psMetadataAddS64(sumskyfileArgs, PS_LIST_TAIL, "-exp_id", 0,            "search by exposure ID", 0);
    128129    psMetadataAddU64(sumskyfileArgs, PS_LIST_TAIL, "-limit",  0,            "limit result set to N items", 0);
    129130    psMetadataAddBool(sumskyfileArgs, PS_LIST_TAIL, "-simple",  0,            "use the simple output format", false);
    … …  
    146147    PXOPT_ADD_MODE("-tosum",           "", STACKTOOL_MODE_TOSUM,          tosumArgs);
    147148    PXOPT_ADD_MODE("-addsumskyfile",   "", STACKTOOL_MODE_ADDSUMSKYFILE,   addsumskyfileArgs);
    148     PXOPT_ADD_MODE("-sumskyfile",      "", STACKTOOL_MODE_SUMSKYFILE,      sumskyfileArgs);
     149    PXOPT_ADD_MODE("-sumskyfile",      "list results of stackRun", STACKTOOL_MODE_SUMSKYFILE,      sumskyfileArgs);
    149150    PXOPT_ADD_MODE("-revertsumskyfile","", STACKTOOL_MODE_REVERTSUMSKYFILE,      revertsumskyfileArgs);
    150151

  • trunk/ippTools/src/warptool.c

    r18889 r18975  
    910910
    911911    psMetadata *where = psMetadataAlloc();
    912     PXOPT_COPY_S64(config->args, where, "-warp_id",    "warp_id", "==");
    913     PXOPT_COPY_STR(config->args, where, "-skycell_id", "skycell_id", "==");
    914     PXOPT_COPY_STR(config->args, where, "-tess_id",    "tess_id", "==");
    915     PXOPT_COPY_S64(config->args, where, "-exp_id",     "exp_id", "==");
    916     PXOPT_COPY_S64(config->args, where, "-fake_id",    "fake_id", "==");
     912    PXOPT_COPY_S64(config->args, where, "-warp_id",    "warpSkyfile.warp_id", "==");
     913    PXOPT_COPY_STR(config->args, where, "-skycell_id", "warpSkyfile.skycell_id", "==");
     914    PXOPT_COPY_STR(config->args, where, "-tess_id",    "warpSkyfile.tess_id", "==");
     915    PXOPT_COPY_S64(config->args, where, "-exp_id",     "rawExp.exp_id", "==");
     916    PXOPT_COPY_S64(config->args, where, "-fake_id",    "fakeRun.fake_id", "==");
    917917
    918918    PXOPT_LOOKUP_U64(limit, config->args, "-limit", false, false);
    … …  
    927927
    928928    if (psListLength(where->list)) {
    929         psString whereClause = psDBGenerateWhereConditionSQL(where, "warpSkyfile");
     929        psString whereClause = psDBGenerateWhereConditionSQL(where, NULL);
    930930        psStringAppend(&query, " AND %s", whereClause);
    931931        psFree(whereClause);
Note: See TracChangeset for help on using the changeset viewer.