IPP Software Navigation Tools IPP Links Communication Pan-STARRS Links

Changeset 36633 for trunk/ippTools


Ignore:
Timestamp:
Apr 2, 2014, 10:50:14 AM (12 years ago)
Author:
bills
Message:

Merge with ipp-20140401 (The staticsky tag)

Location:
trunk
Files:
8 edited

Legend:

Unmodified
Added
Removed

  • trunk

  • trunk/ippTools/share/fftool_definebyquery_select_warps.sql

    r36441 r36633  
    55    JOIN chipRun USING(chip_id)
    66    JOIN rawExp USING(exp_id)
     7    JOIN skycell ON skycell.tess_id = warpSkyfile.tess_id AND skycell.skycell_id = warpSkyfile.skycell_id
    78WHERE warpRun.tess_id = '%s' AND warpSkyfile.skycell_id = '%s' AND rawExp.filter = '%s'
    89    AND warpRun.state = 'full' AND warpSkyfile.quality = 0 and warpSkyfile.fault = 0

  • trunk/ippTools/share/fftool_result.sql

    r36555 r36633  
    66    fullForceRun.skycal_id,
    77    fullForceRun.workdir,
     8    fullForceRun.sources_path_base,
    89    CONCAT_WS('.', warp_id, skycell_id) AS dist_component,
    910    stackRun.tess_id,

  • trunk/ippTools/share/fftool_summary.sql

    r36555 r36633  
    66    fullForceRun.skycal_id,
    77    fullForceRun.workdir,
     8    fullForceRun.sources_path_base,
    89    'summary' AS dist_component,
    910    stackRun.tess_id,

  • trunk/ippTools/share/fftool_toadvance.sql

    r36441 r36633  
    1515    JOIN rawExp USING(exp_id)
    1616    LEFT JOIN fullForceResult USING(ff_id, warp_id)
    17 WHERE fullForceRun.state = 'new'
     17    LEFT JOIN fullForceSummary USING(ff_id)
     18WHERE fullForceRun.state = 'new' AND fullForceSummary.ff_id IS NULL
    1819    -- WHERE hook %s
    1920    GROUP BY ff_id

  • trunk/ippTools/src/fftool.c

    r36623 r36633  
    139139
    140140    psMetadata *warpWhereMD = psMetadataAlloc();
    141     pxAddLabelSearchArgs(config, warpWhereMD, "-select_warp_label",     "fullForceRun.label",           "LIKE");
    142     pxAddLabelSearchArgs(config, warpWhereMD, "-select_warp_data_group","fullForceRun.data_group",      "LIKE");
    143     PXOPT_COPY_S64(config->args, warpWhereMD, "-select_warp_id",        "fullForceRun.warp_id",         "==");
     141    pxAddLabelSearchArgs(config, warpWhereMD, "-select_warp_label",     "warpRun.label",           "LIKE");
     142    pxAddLabelSearchArgs(config, warpWhereMD, "-select_warp_data_group","warpRun.data_group",      "LIKE");
     143    PXOPT_COPY_S64(config->args, warpWhereMD, "-select_warp_id",        "warpRun.warp_id",         "==");
    144144    if (!psListLength(warpWhereMD->list)) {
    145145        psError(PXTOOLS_ERR_CONFIG, false, "warp search parameters are required");
    … …  
    148148        return false;
    149149    }
    150     if (!psListLength(warpWhereMD->list)) {
    151         psError(PXTOOLS_ERR_CONFIG, false, "skycal search parameters are required");
    152         psFree(skycalWhereMD);
    153         psFree(warpWhereMD);
    154         return false;
    155     }
    156 
    157     PXOPT_COPY_STR(config->args, warpWhereMD, "-select_tess_id",       "fullForceRun.tess_id",         "==");
    158     pxAddLabelSearchArgs(config, warpWhereMD, "-select_filter",        "fullForceRun.filter",          "LIKE");
    159     if (!pxskycellAddWhere(config, warpWhereMD)) {
    160         psError(PXTOOLS_ERR_CONFIG, false, "failed to add skycell search arguments");
    161         psFree(skycalWhereMD);
    162         psFree(warpWhereMD);
    163         return false;
    164     }
    165 
     150    PXOPT_COPY_F32(config->args, warpWhereMD, "-select_good_frac_min",  "warpSkyfile.good_frac",   ">=");
     151    PXOPT_COPY_STR(config->args, warpWhereMD, "-select_tess_id",       "warpRun.tess_id",         "==");
     152    pxAddLabelSearchArgs(config, warpWhereMD, "-select_filter",        "rawExp.filter",          "LIKE");
    166153
    167154    PXOPT_LOOKUP_BOOL(rerun, config->args, "-rerun", false);
    … …  
    186173    psString joinHook = NULL;
    187174    if (!rerun) {
    188         psStringAppend(&joinHook, "\nLEFT JOIN fullForceRun ON fullForceRun.skycal_id = fullForceRun.skycal_id");
     175        psStringAppend(&joinHook, "\nLEFT JOIN fullForceRun ON fullForceRun.skycal_id = skycalRun.skycal_id");
    189176        psStringAppend(&joinHook, "\n %s\nAND fullForceRun.label = '%s'", where, label);
    190177        psStringAppend(&select, "\nAND ff_id IS NULL");
    … …  
    502489    psMetadata *where = psMetadataAlloc();
    503490    PXOPT_COPY_S64(config->args, where, "-ff_id",      "fullForceRun.ff_id", "==");
    504     PXOPT_COPY_S64(config->args, where, "-warp_id",    "fullForceRun.warp_id", "==");
     491    PXOPT_COPY_S64(config->args, where, "-warp_id",    "fullForceResult.warp_id", "==");
    505492    PXOPT_COPY_S64(config->args, where, "-skycal_id",  "fullForceRun.skycal_id", "==");
    506493    PXOPT_COPY_S64(config->args, where, "-stack_id",   "stackRun.stack_id", "==");
    … …  
    510497    PXOPT_COPY_STR(config->args, where, "-skycell_id", "stackRun.skycell_id", "LIKE");
    511498    PXOPT_COPY_STR(config->args, where, "-filter",      "stackRun.filter", "LIKE");
    512     PXOPT_COPY_S16(config->args, where, "-fault",      "staticskyResult.fault", "==");
     499    PXOPT_COPY_S16(config->args, where, "-fault",      "fullForceResult.fault", "==");
    513500    pxskycellAddWhere(config, where);
    514501

  • trunk/ippTools/src/fftoolConfig.c

    r36555 r36633  
    5858    psMetadataAddStr(definebyqueryArgs,  PS_LIST_TAIL, "-select_tess_id", 0, "search for tess_id", NULL);
    5959    psMetadataAddStr(definebyqueryArgs,  PS_LIST_TAIL, "-select_filter", PS_META_DUPLICATE_OK, "search by filter (LIKE comparison, multiple OK)", NULL);
     60    psMetadataAddF32(definebyqueryArgs,  PS_LIST_TAIL, "-select_good_frac_min", 0, "mimimum good_frac in warp", 0.0);
    6061
    6162    pxskycellAddArguments(definebyqueryArgs);

  • trunk/ippTools/src/staticskytool.c

    r35960 r36633  
    10451045    PXOPT_COPY_STR(config->args, whereMD, "-select_skycell_id",    "stackRun.skycell_id",       "==");
    10461046    PXOPT_COPY_STR(config->args, whereMD, "-select_tess_id",       "stackRun.tess_id",          "==");
     1047    pxAddLabelSearchArgs(config, whereMD, "-select_filter",        "stackRun.filter",           "LIKE");
    10471048    PXOPT_COPY_F32(config->args, whereMD, "-select_good_frac_min", "stackSumSkyfile.good_frac", ">=");
    10481049    pxAddLabelSearchArgs(config, whereMD, "-select_label",         "staticskyRun.label",            "LIKE");
    10491050    pxAddLabelSearchArgs(config, whereMD, "-select_data_group",    "staticskyRun.data_group",       "LIKE");
    1050     pxAddLabelSearchArgs(config, whereMD, "-select_filter",        "stackRun.filter",           "LIKE");
    10511051    if (!pxskycellAddWhere(config, whereMD)) {
    10521052        psError(PXTOOLS_ERR_CONFIG, false, "failed to add skycell search arguments");
Note: See TracChangeset for help on using the changeset viewer.