IPP Software Navigation Tools IPP Links Communication Pan-STARRS Links

Ignore:
Timestamp:
Jun 19, 2012, 5:24:19 PM (14 years ago)
Author:
mhuber
Message:

merging latest r34040 trunk changes to branch

Location:
branches/meh_branches/ppstack_test
Files:
17 edited
3 copied

Legend:

Unmodified
Added
Removed

  • branches/meh_branches/ppstack_test

  • branches/meh_branches/ppstack_test/ippTools/src

  • branches/meh_branches/ppstack_test/ippTools/src/Makefile.am

    r33415 r34041  
    3131        mergetool \
    3232        laptool \
    33         vptool
     33        vptool \
     34        sctool
    3435
    3536pkginclude_HEADERS = \
    … …  
    8384        mergetool.h \
    8485        laptool.h \
    85         vptool.h
     86        vptool.h \
     87        sctool.h
    8688
    8789lib_LTLIBRARIES = libpxtools.la
    … …  
    316318    vptoolConfig.c
    317319
     320sctool_CFLAGS = $(PSLIB_CFLAGS) $(PSMODULES_CFLAGS) $(IPPDB_CFLAGS)
     321sctool_LDADD = $(PSLIB_LIBS) $(PSMODULES_LIBS) $(IPPDB_LIBS) libpxtools.la
     322sctool_SOURCES = \
     323    sctool.c \
     324    sctoolConfig.c
     325
    318326clean-local:
    319327        -rm -f TAGS

  • branches/meh_branches/ppstack_test/ippTools/src/addtool.c

    r33415 r34041  
    141141    pxAddLabelSearchArgs (config, where, "-data_group","staticskyRun.data_group", "=="); // define using camRun label
    142142    PXOPT_COPY_STR(config->args, where,  "-reduction", "staticskyyRun.reduction", "==");
    143     pxAddLabelSearchArgs (config, where, "-filter",     "stackRun.filter", "=="); // define using camRun label
    144     }
    145         if (strcmp(stage, "staticsky_multi")== 0) {
    146 
    147     pxAddLabelSearchArgs (config, where, "-label",     "staticskyRun.label", "=="); // define using camRun label
    148     pxAddLabelSearchArgs (config, where, "-data_group","staticskyRun.data_group", "=="); // define using camRun label
    149     PXOPT_COPY_STR(config->args, where,  "-reduction", "staticskyyRun.reduction", "==");
    150143    //no filter here
    151144    }
    … …  
    227220    }
    228221    }
     222 
    229223    if (strcmp(stage,"staticsky") == 0) {
    230     if (dvodb ) {
    231       psTrace("addtool.c", PS_LOG_INFO, "dvodb argument found (%s) using addtool_find_sky_id_dvo.sql\n%s\n", dvodb,stage);
    232         // find the cam_id of all the exposures that we want to queue up.
    233         bare_query = pxDataGet("addtool_find_sky_id_dvo.sql");
    234         // user supplied dvodb
    235         psStringAppend(&dvodb_string, "addRun.dvodb = '%s'", dvodb);
    236     } else {
    237       psTrace("addtool.c", PS_LOG_INFO, "dvodb argument not found using addtool_find_sky_id.sql\n%s\n",stage);
    238         // find the cam_id of all the exposures that we want to queue up.
    239         bare_query = pxDataGet("addtool_find_sky_id.sql");
    240         // inherit dvodb from camRun, avoid matching NULL
    241         psStringAppend(&dvodb_string, "(staticskyRun.dvodb IS NOT NULL AND previous_dvodb = staticskyRun.dvodb)");
    242     }
    243     }
    244 
    245     if (strcmp(stage,"staticsky_multi") == 0) {
    246224      if (dvodb ) {
    247225        psTrace("addtool.c", PS_LOG_INFO, "dvodb argument found (%s) using addtool_find_sky_id_multi_dvo.sql\n%s\n", dvodb,stage);
    … …  
    310288        psStringAppend(&query, " GROUP BY stack_id");
    311289      }
     290      //   if (strcmp(stage,"staticsky") == 0) {
     291      //   psStringAppend(&query, " GROUP BY stack_id");
     292      // }
    312293    if (strcmp(stage,"staticsky") == 0) {
    313         psStringAppend(&query, " GROUP BY stack_id");
    314       }
    315     if (strcmp(stage,"staticsky_multi") == 0) {
    316       psStringAppend(&query, " GROUP BY sky_id");  //some reason it needs this
     294      psStringAppend(&query, " GROUP BY sky_id, stack_id");  //some reason it needs this
    317295      }
    318296
    … …  
    402380    }
    403381    }
     382   
    404383    if (strcmp(stage,"staticsky") == 0) {
    405     for (long i = 0; i < psArrayLength(output); i++) {
    406         psMetadata *md = output->data[i];
    407 
    408         staticskyRunRow *row = staticskyRunObjectFromMetadata(md);
    409        
    410         if (!row) {
    411             psError(PS_ERR_UNKNOWN, false, "failed to convert metadata into camRun");
    412             psFree(output);
    413             return false;
    414         }
    415 
    416         if (!dvodb) {  //there's no staticsky.dvodb
    417             psError(PS_ERR_UNKNOWN, false, "cannot queue addstar run without a defined dvodb: label: %s, sky_id %" PRId64, row->label, row->sky_id);
    418             psFree(output);
    419             return false;
    420         }
    421         if (!workdir && !row->workdir) {
    422             psError(PS_ERR_UNKNOWN, false, "cannot queue addstar run without a defined workdir: label: %s, sky_id %" PRId64, row->label, row->sky_id);
    423             psFree(output);
    424             return false;
    425         }
    426 
    427         psFree(row);
    428     }
    429     }
    430     if (strcmp(stage,"staticsky_multi") == 0) {
    431384    for (long i = 0; i < psArrayLength(output); i++) {
    432385        psMetadata *md = output->data[i];
    … …  
    566519    }
    567520      }
     521   
    568522    if (strcmp(stage,"staticsky") == 0) {
    569523    for (long i = 0; i < psArrayLength(output); i++) {
    570524        psMetadata *md = output->data[i];
    571525        psS64 stage_id =0;
    572        
     526        bool status = false;
     527        //psS32 num_inputs = psMetadataLookupS32(&status, md, "num_inputs");
     528        psS32 stack_id = psMetadataLookupS32(&status, md, "stack_id");
     529
     530        if (!status) {
     531          psError(PS_ERR_UNKNOWN, true, "failed to lookup value for item stack_id");
     532          return false;
     533        }
    573534        staticskyRunRow *row = staticskyRunObjectFromMetadata(md);
    574535        stage_id = row->sky_id;
    … …  
    581542
    582543        // queue the exp
    583         if (!pxaddQueueByCamID(config,
     544        //for (int filter_id = 0; filter_id < num_inputs; filter_id++) { 
     545          if (!pxaddQueueByCamID(config,
    584546                               stage,
    585                                stage_id,
    586                                0,
     547                               stage_id,
     548                               stack_id,
    587549                               workdir     ? workdir   : row->workdir,
    588550                               reduction   ? reduction : row->reduction,
    … …  
    595557                               minidvodb_group,
    596558                               minidvodb_name
    597         )) {
     559                                )) {
    598560            if (!psDBRollback(config->dbh)) {
    599                 psError(PS_ERR_UNKNOWN, false, "database error sfg");
     561              psError(PS_ERR_UNKNOWN, false, "database error sfg");
    600562            }
    601563            psError(PS_ERR_UNKNOWN, false,
    … …  
    604566            psFree(output);
    605567            return false;
    606         }
    607         psFree(row);
    608     }
    609       }
    610 
    611     if (strcmp(stage,"staticsky_multi") == 0) {
    612     for (long i = 0; i < psArrayLength(output); i++) {
    613         psMetadata *md = output->data[i];
    614         psS64 stage_id =0;
    615         bool status = false;
    616         psS32 num_inputs = psMetadataLookupS32(&status, md, "num_inputs");
    617         if (!status) {
    618           psError(PS_ERR_UNKNOWN, true, "failed to lookup value for item num_inputs");
    619           return false;
    620         }
    621         staticskyRunRow *row = staticskyRunObjectFromMetadata(md);
    622         stage_id = row->sky_id;
    623        
    624         if (!row) {
    625             psError(PS_ERR_UNKNOWN, false, "failed to convert metadata into camRun");
    626             psFree(output);
    627             return false;
    628         }
    629 
    630         // queue the exp
    631         for (int filter_id = 0; filter_id < num_inputs; filter_id++) { 
    632         if (!pxaddQueueByCamID(config,
    633                                stage,
    634                                stage_id,
    635                                filter_id,
    636                                workdir     ? workdir   : row->workdir,
    637                                reduction   ? reduction : row->reduction,
    638                                label       ? label     : row->label,
    639                                data_group  ? data_group : (row->data_group ? row->data_group :  (label ? label : row->label)),
    640                                dvodb       ? dvodb     : NULL,
    641                                note        ? note      : NULL,
    642                                image_only,
    643                                minidvodb,
    644                                minidvodb_group,
    645                                minidvodb_name
    646         )) {
    647             if (!psDBRollback(config->dbh)) {
    648                 psError(PS_ERR_UNKNOWN, false, "database error sfg");
    649             }
    650             psError(PS_ERR_UNKNOWN, false,
    651                     "failed to trying to queue stage %s %" PRId64,stage, stage_id);
    652             psFree(row);
    653             psFree(output);
    654             return false;
    655         }
    656         }
     568          }
     569          //}
    657570        psFree(row);
    658571    }
    … …  
    705618    query = psStringCopy("UPDATE addRun JOIN staticskyRun on sky_id = stage_id");
    706619    }
    707     if (strcmp(stage, "staticsky_multi")==0) {
    708     query = psStringCopy("UPDATE addRun JOIN staticskyRun on sky_id = stage_id");
    709     }
     620   
    710621
    711622    // pxUpdateRun gets parameters from config->args and runs the update query
    … …  
    745656    }
    746657    if (strcmp(stage, "staticsky")==0) {
    747     query = pxDataGet("addtool_find_pendingexp_staticsky.sql");
    748     }
    749     if (strcmp(stage, "staticsky_multi")==0) {
    750658    query = pxDataGet("addtool_find_pendingexp_staticsky_multi.sql");
    751659    }
    … …  
    768676      psStringAppend(&query, " GROUP BY %s", "stack_id");
    769677    }
     678    //if (strcmp(stage, "staticsky") == 0) {
     679    //  //this group by is needed to join against all the warps (to get camera)
     680    //  psStringAppend(&query, " GROUP BY %s", "sky_id");
     681    //}
    770682    if (strcmp(stage, "staticsky") == 0) {
    771       //this group by is needed to join against all the warps (to get camera)
    772       psStringAppend(&query, " GROUP BY %s", "sky_id");
    773     }
    774     if (strcmp(stage, "staticsky_multi") == 0) {
    775683      //this group by is needed to join against all the warps (to get camera)
    776684      psStringAppend(&query, " GROUP BY %s", "sky_id, stage_extra1");
    … …  
    787695        return false;
    788696    }
     697    psTrace("addtool.c", PS_LOG_INFO, "used this query:\n %s\n",query);
    789698    psFree(query);
    790699
    … …  
    977886    }
    978887    if (strcmp (stage,"staticsky") == 0) {
    979     query = pxDataGet("addtool_find_processedexp_staticsky.sql");
    980     }
    981     if (strcmp (stage,"staticsky_multi") == 0) {
    982888    query = pxDataGet("addtool_find_processedexp_staticsky_multi.sql");
    983889    }
    … …  
    1090996         query = pxDataGet("addtool_revertprocessedexp_stack.sql");
    1091997      }
    1092      if (strcmp(stage, "staticsky") == 0) {
    1093          query = pxDataGet("addtool_revertprocessedexp_staticsky.sql");
    1094       }
    1095    if (strcmp(stage, "staticsky_multi") == 0) {
     998    if (strcmp(stage, "staticsky") == 0) {
    1096999         query = pxDataGet("addtool_revertprocessedexp_staticsky_multi.sql");
    10971000      }
    … …  
    14801383  PXOPT_COPY_STR(config->args, where, "-minidvodb_name", "minidvodbRun.minidvodb_name", "==");
    14811384  PXOPT_COPY_STR(config->args, where, "-state", "minidvodbRun.state", "==");
    1482 
    1483 
     1385  PXOPT_LOOKUP_STR(minidvodb_group,  config->args, "-minidvodb_group", false, false);
     1386 
    14841387  PXOPT_LOOKUP_U64(limit,      config->args, "-limit", false, false);
    14851388  PXOPT_LOOKUP_BOOL(all_addrun_states, config->args, "-all_addrun_states", false);
    … …  
    14931396  }
    14941397
    1495   psString query = pxDataGet("addtool_checkminidvodbaddrun.sql");
    1496 
    1497   if (!query) {
     1398  if (!minidvodb_group) {
     1399    psError(PXTOOLS_ERR_CONFIG, false, "minidvodb_group  required");
     1400    return false;
     1401  }
     1402
     1403
     1404  psString bare_query = pxDataGet("addtool_checkminidvodbaddrun.sql");
     1405 
     1406  if (!bare_query) {
    14981407        psError(PXTOOLS_ERR_SYS, false, "failed to retreive SQL statement");
    14991408        return false;
    15001409  }
    15011410
    1502 
     1411  psString where_string = NULL;
    15031412  if (psListLength(where->list)) {
    15041413    psString whereClause = psDBGenerateWhereConditionSQL(where, NULL);
    1505         psStringAppend(&query, " WHERE %s", whereClause);
     1414        psStringAppend(&where_string, " WHERE %s", whereClause);
    15061415        psFree(whereClause);
    1507   }
    1508 
     1416        //search params are defined above
     1417  }
     1418
     1419  psString query = NULL;
     1420  psStringAppend(&query, bare_query, minidvodb_group);
     1421  psStringAppend(&query," %s ", where_string);
     1422
     1423
     1424
     1425
     1426 
    15091427  if (!all_addrun_states) {
    15101428    psStringAppend(&query, " AND (cnt2 = cnt) ");
    … …  
    15191437
    15201438  if (!p_psDBRunQuery(config->dbh, query)) {
    1521     psError(PS_ERR_UNKNOWN, false, "database error");
     1439    psError(PS_ERR_UNKNOWN, false, "database error,\n\n%s", query);
    15221440    psFree(query);
    15231441    return false;

  • branches/meh_branches/ppstack_test/ippTools/src/chiptool.c

    r33415 r34041  
    10151015    PXOPT_COPY_S64(config->args, where, "-chip_id", "chipProcessedImfile.chip_id", "==");
    10161016    PXOPT_COPY_STR(config->args, where, "-class_id", "chipProcessedImfile.class_id", "==");
    1017     PXOPT_LOOKUP_S64(chip_id, config->args, "-chip_id", true, false);
     1017    PXOPT_COPY_S64(config->args, where, "-cam_id", "cam_id", "==");
     1018
     1019    PXOPT_LOOKUP_S64(cam_id, config->args, "-cam_id", false, false);
     1020    // if cam_id is not supplied chip_id is required
     1021    PXOPT_LOOKUP_S64(chip_id, config->args, "-chip_id", cam_id ? false : true, false);
    10181022    PXOPT_LOOKUP_S64(class_id, config->args, "-class_id", true, false);
    10191023    PXOPT_LOOKUP_S16(quality, config->args, "-set_quality", true, false);
    … …  
    10261030    if (psListLength(where->list) == 0) {
    10271031        // won't get here
    1028         psError(PXTOOLS_ERR_CONFIG, true, "-chip_id and -class_id are required");
     1032        psError(PXTOOLS_ERR_CONFIG, true, "-chip_id (or -cam_id) and -class_id are required");
    10291033        return false;
    10301034    }

  • branches/meh_branches/ppstack_test/ippTools/src/chiptoolConfig.c

    r33415 r34041  
    242242    // -dropprocessedimfile
    243243    psMetadata *dropprocessedimfileArgs = psMetadataAlloc();
    244     psMetadataAddS64(dropprocessedimfileArgs, PS_LIST_TAIL, "-chip_id",  0,            "search by chip ID (required)", 0);
     244    psMetadataAddS64(dropprocessedimfileArgs, PS_LIST_TAIL, "-chip_id",  0,            "search by chip ID", 0);
     245    psMetadataAddS64(dropprocessedimfileArgs, PS_LIST_TAIL, "-cam_id",  0,            "search by cam ID", 0);
    245246    psMetadataAddStr(dropprocessedimfileArgs,  PS_LIST_TAIL, "-class_id",           0, "search by class ID (required)", NULL);
    246247    psMetadataAddS16(dropprocessedimfileArgs, PS_LIST_TAIL, "-set_quality",  0,        "set quality (required)", 0);

  • branches/meh_branches/ppstack_test/ippTools/src/magicdstool.c

    r33415 r34041  
    779779    case IPP_STAGE_CAMERA:
    780780        query = NULL;
    781         clearRunQuery = "UPDATE chipBackgroundRun SET magicked = 0 where chip_bg_id = %" PRId64;
     781        clearRunQuery = "UPDATE camRun SET magicked = 0 where cam_id = %" PRId64;
    782782        break;
    783783    case IPP_STAGE_WARP:
    … …  
    12421242        } else if (!strcmp(state, "failed_cleanup")) {
    12431243            new_state = "goto_cleaned";
     1244        } else if (!strcmp(state, "failed_restore")) {
     1245            new_state = "goto_restored";
    12441246        } else {
    12451247            psError(PS_ERR_UNKNOWN, true, "unexpected value for state: %s", state);
    … …  
    14101412          (strcmp(state, "drop") == 0) ||
    14111413          (strcmp(state, "wait") == 0) ||
     1414          (strcmp(state, "failed_restore") == 0) ||
    14121415          (strcmp(state, "failed_revert") == 0) ||
    14131416          (strcmp(state, "failed_revert_ud") == 0) ||

  • branches/meh_branches/ppstack_test/ippTools/src/magictool.c

  • branches/meh_branches/ppstack_test/ippTools/src/pstamptoolConfig.c

    r33415 r34041  
    125125    psMetadataAddStr(revertreqArgs, PS_LIST_TAIL, "-state", 0,      "state to revert", NULL);
    126126    psMetadataAddStr(revertreqArgs, PS_LIST_TAIL, "-label", PS_META_DUPLICATE_OK, "search by pstampRequest label (LIKE comparision)", NULL);
     127    // this argument is supplied by pantasks so we accept it but don't use it
     128    psMetadataAddU64(revertreqArgs, PS_LIST_TAIL, "-limit", 0,      "not used", 0);
    127129
    128130    // -pendingcleanup

  • branches/meh_branches/ppstack_test/ippTools/src/pxadd.c

    r33415 r34041  
    157157      }
    158158      if (strcmp(stage,"staticsky") == 0) {
    159         query = pxDataGet("addtool_queue_sky_id.sql");
    160         psMemSetPersistent(query, true);
    161       }
    162       if (strcmp(stage,"staticsky_multi") == 0) {
    163159        query = pxDataGet("addtool_queue_sky_id_multi.sql");
    164160        psMemSetPersistent(query, true);

  • branches/meh_branches/ppstack_test/ippTools/src/pxspace.c

    r25770 r34041  
    5656    psMetadataAddF64(md, PS_LIST_TAIL, "-decl", 0,             "DEC value for radius search (degrees)", false);
    5757}
     58
     59void pxskycellAddArguments(psMetadata *md)
     60{
     61    psMetadataAddF32(md,  PS_LIST_TAIL, "-ra_min",            0, "search by right ascension (degrees)", NAN);
     62    psMetadataAddF32(md,  PS_LIST_TAIL, "-dec_min",           0, "search by declination (degrees)", NAN);
     63    psMetadataAddF32(md,  PS_LIST_TAIL, "-ra_max",            0, "search by right ascension (degrees)", NAN);
     64    psMetadataAddF32(md,  PS_LIST_TAIL, "-dec_max",           0, "search by declination (degrees)", NAN);
     65    psMetadataAddF32(md,  PS_LIST_TAIL, "-glong_min",         0, "search by galactic longitude (degrees)", NAN);
     66    psMetadataAddF32(md,  PS_LIST_TAIL, "-glat_min",          0, "search by galactic latitude (degrees)", NAN);
     67    psMetadataAddF32(md,  PS_LIST_TAIL, "-glong_max",         0, "search by galactic longitude (degrees)", NAN);
     68    psMetadataAddF32(md,  PS_LIST_TAIL, "-glat_max",          0, "search by galactic latitude (degrees)", NAN);
     69}
     70
     71bool pxskycellAddWhere(pxConfig *config, psMetadata *where)
     72{
     73    PXOPT_COPY_F32(config->args, where, "-ra_min", "skycell.radeg", ">=");
     74    PXOPT_COPY_F32(config->args, where, "-dec_min", "skycell.decdeg", ">=");
     75    PXOPT_COPY_F32(config->args, where, "-ra_max", "skycell.radeg", "<");
     76    PXOPT_COPY_F32(config->args, where, "-dec_max", "skycell.decdeg", "<");
     77    PXOPT_COPY_F32(config->args, where, "-glong_min", "skycell.glong", ">=");
     78    PXOPT_COPY_F32(config->args, where, "-glat_min", "skycell.glat", ">=");
     79    PXOPT_COPY_F32(config->args, where, "-glong_max", "skycell.glong", "<");
     80    PXOPT_COPY_F32(config->args, where, "-glat_max", "skycell.glat", "<");
     81    return true;
     82}

  • branches/meh_branches/ppstack_test/ippTools/src/pxspace.h

    r25770 r34041  
    11/*
    2  * pxmagic.h
     2 * pxspace.h
    33 *
    44 * Copyright (C) 2009  IfA
    … …  
    2424extern void pxspaceAddArguments(psMetadata *md);
    2525
     26extern bool pxskycellAddWhere(pxConfig *config, psMetadata *where);
     27extern void pxskycellAddArguments(psMetadata *md);
     28
    2629#endif // PXSPACE_H

  • branches/meh_branches/ppstack_test/ippTools/src/pztool.c

    r31445 r34041  
    338338        }
    339339
    340         psStringAppend(&query, " ORDER BY dateobs");
    341         if (desc) {
    342             psStringAppend(&query, " DESC");
    343         }
     340/*         psStringAppend(&query, " ORDER BY dateobs"); */
     341/*         if (desc) { */
     342/*             psStringAppend(&query, " DESC"); */
     343/*         } */
    344344
    345345        // request the full "limit" from each known camera and throw away any

  • branches/meh_branches/ppstack_test/ippTools/src/stacktool.c

    r31957 r34041  
    232232    PXOPT_COPY_F32(config->args,  where, "-select_fwhm_minor_min",     "camProcessedExp.fwhm_minor", ">=");
    233233    PXOPT_COPY_F32(config->args,  where, "-select_fwhm_minor_max",     "camProcessedExp.fwhm_minor", "<=");
     234    PXOPT_COPY_F32(config->args,  where, "-select_fwhm_iq_major_max",  "(camProcessedExp.fwhm_major - camProcessedExp.iq_fwhm_major)", "<=");
     235    PXOPT_COPY_F32(config->args,  where, "-select_fwhm_iq_major_min",  "(camProcessedExp.fwhm_major - camProcessedExp.iq_fwhm_major)", ">=");
     236    PXOPT_COPY_F32(config->args,  where, "-select_elong_max",          "(camProcessedExp.fwhm_major / camProcessedExp.fwhm_minor)", "<=");
     237    PXOPT_COPY_F32(config->args,  where, "-select_iq_elong_max",       "(camProcessedExp.iq_fwhm_major / camProcessedExp.iq_fwhm_minor)", "<=");
    234238    PXOPT_COPY_F32(config->args,  where, "-select_iq_m2_max",          "camProcessedExp.iq_m2", "<=");
    235239    PXOPT_COPY_F32(config->args,  where, "-select_iq_m2_min",          "camProcessedExp.iq_m2", ">=");
    … …  
    239243    PXOPT_COPY_F32(config->args,  where, "-select_zpt_obs_min",        "camProcessedExp.zpt_obs", ">=");
    240244    PXOPT_COPY_F32(config->args,  where, "-select_zpt_obs_max",        "camProcessedExp.zpt_obs", "<=");
     245    PXOPT_COPY_F32(config->args,  where, "-select_bg_max",             "camProcessedExp.bg", "<=");
     246    PXOPT_COPY_F32(config->args,  where, "-select_bg_stdev_max",       "camProcessedExp.bg_stdev", "<=");
    241247    PXOPT_COPY_F32(config->args,  where, "-select_astrom",             "sqrt(POWER(camProcessedExp.sigma_ra, 2) + POWER(camProcessedExp.sigma_dec, 2))", "<=");
    242 
    243248    PXOPT_COPY_STR(config->args,  where, "-select_exp_type",           "rawExp.exp_type", "==");
    244249    PXOPT_COPY_F32(config->args,  where, "-select_good_frac_min",      "warpSkyfile.good_frac", ">=");

  • branches/meh_branches/ppstack_test/ippTools/src/stacktoolConfig.c

    r31792 r34041  
    8282    psMetadataAddF64(definebyqueryArgs, PS_LIST_TAIL, "-select_fwhm_minor_min", 0, "define min fwhm (minor axis)", NAN);
    8383    psMetadataAddF64(definebyqueryArgs, PS_LIST_TAIL, "-select_fwhm_minor_max", 0, "define max fwhm (minor axis)", NAN);
     84    psMetadataAddF64(definebyqueryArgs, PS_LIST_TAIL, "-select_fwhm_iq_major_max", 0, "define max difference between fwhm and iq major ", NAN);
     85    psMetadataAddF64(definebyqueryArgs, PS_LIST_TAIL, "-select_fwhm_iq_major_min", 0, "define min difference between fwhm and iq major ", NAN);
     86    psMetadataAddF64(definebyqueryArgs, PS_LIST_TAIL, "-select_elong_max", 0, "define max elongation from fwhm ", NAN);
     87    psMetadataAddF64(definebyqueryArgs, PS_LIST_TAIL, "-select_iq_elong_max", 0, "define max elongation from iq_fwhm ", NAN);
    8488    psMetadataAddF64(definebyqueryArgs, PS_LIST_TAIL, "-select_iq_m2_min", 0, "define min iq_m2", NAN);
    8589    psMetadataAddF64(definebyqueryArgs, PS_LIST_TAIL, "-select_iq_m2_max", 0, "define max iq_m2", NAN);
    … …  
    9094    psMetadataAddF64(definebyqueryArgs, PS_LIST_TAIL, "-select_zpt_obs_min", 0, "define min zero point", NAN);
    9195    psMetadataAddF64(definebyqueryArgs, PS_LIST_TAIL, "-select_zpt_obs_max", 0, "define max zero point", NAN);
     96    psMetadataAddF64(definebyqueryArgs, PS_LIST_TAIL, "-select_bg_max", 0, "define max background", NAN);
     97    psMetadataAddF64(definebyqueryArgs, PS_LIST_TAIL, "-select_bg_stdev_max", 0, "define max background stdev", NAN);   
    9298    psMetadataAddF64(definebyqueryArgs, PS_LIST_TAIL, "-select_astrom", 0, "define max astrometry rms", NAN);
    9399    psMetadataAddS64(definebyqueryArgs, PS_LIST_TAIL, "-warp_id", PS_META_DUPLICATE_OK, "include this warp ID (multiple OK)", 0);

  • branches/meh_branches/ppstack_test/ippTools/src/staticskytool.c

    r33415 r34041  
    2929
    3030#include "pxtools.h"
     31#include "pxspace.h"
    3132#include "staticskytool.h"
    3233
    … …  
    131132    pxAddLabelSearchArgs(config, whereMD, "-select_data_group",    "stackRun.data_group",       "LIKE");
    132133    pxAddLabelSearchArgs(config, whereMD, "-select_filter",        "stackRun.filter",           "LIKE");
     134    PXOPT_COPY_F32(config->args, whereMD, "-select_glat_min",      "skycell.glat",              ">=");
     135    PXOPT_COPY_F32(config->args, whereMD, "-select_glat_max",      "skycell.glat",              "<=");
    133136
    134137    // find the number of requested filters:
    … …  
    390393
    391394    psMetadata *where = psMetadataAlloc();
    392     PXOPT_COPY_S64(config->args, where, "-sky_id",  "sky_id",   "==");
    393     PXOPT_COPY_STR(config->args, where, "-label",   "label",    "==");
    394     PXOPT_COPY_STR(config->args, where, "-state",   "state",    "==");
     395    PXOPT_COPY_S64(config->args, where, "-sky_id",      "sky_id",   "==");
     396    PXOPT_COPY_STR(config->args, where, "-label",       "staticskyRun.label",    "==");
     397    PXOPT_COPY_STR(config->args, where, "-state",       "staticskyRun.state",    "==");
     398    PXOPT_COPY_STR(config->args, where, "-tess_id",     "stackRun.tess_id",    "==");
     399    PXOPT_COPY_STR(config->args, where, "-skycell_id",  "stackRun.skycell_id",    "==");
     400    if (!pxskycellAddWhere(config, where)) {
     401        psError(PXTOOLS_ERR_CONFIG, false, "failed to add skycell search arguments");
     402        return false;
     403    }
    395404    if (!psListLength(where->list)) {
    396405        psFree(where);
    … …  
    399408    }
    400409
    401     psString query = psStringCopy("UPDATE staticskyRun");
     410    psString query = psStringCopy("UPDATE staticskyRun JOIN staticskyInput USING(sky_id) JOIN stackRun using(stack_id) JOIN skycell USING(tess_id, skycell_id)");
    402411
    403412    // pxUpdateRun gets parameters from config->args and updates
    … …  
    638647    PXOPT_COPY_STR(config->args, where, "-skycell_id", "stackRun.skycell_id", "LIKE");
    639648    PXOPT_COPY_S16(config->args, where, "-fault",      "staticskyResult.fault", "==");
     649    pxskycellAddWhere(config, where);
    640650    PXOPT_LOOKUP_S32(num_filters, config->args, "-num_filters", false, false);
    641651

  • branches/meh_branches/ppstack_test/ippTools/src/staticskytoolConfig.c

    r33415 r34041  
    5555    psMetadataAddStr(definebyqueryArgs,  PS_LIST_TAIL, "-select_data_group", PS_META_DUPLICATE_OK, "search by stackRun data_group (LIKE comparison, multiple OK)", NULL);
    5656    psMetadataAddStr(definebyqueryArgs,  PS_LIST_TAIL, "-select_filter", PS_META_DUPLICATE_OK, "search by filter (LIKE comparison, multiple OK)", NULL);
     57    psMetadataAddF32(definebyqueryArgs,  PS_LIST_TAIL, "-select_glat_min", 0, "define min galactic latitude", NAN);
     58    psMetadataAddF32(definebyqueryArgs,  PS_LIST_TAIL, "-select_glat_max", 0, "define max galactic latitude", NAN);
    5759    psMetadataAddStr(definebyqueryArgs,  PS_LIST_TAIL, "-set_workdir", 0, "define workdir (required)", NULL);
    5860    psMetadataAddStr(definebyqueryArgs,  PS_LIST_TAIL, "-set_label", 0, "define label (required)", NULL);
    … …  
    7375    psMetadataAddStr(updaterunArgs, PS_LIST_TAIL, "-state", 0, "search by state", NULL);
    7476    psMetadataAddStr(updaterunArgs, PS_LIST_TAIL, "-label", 0, "search by label", 0);
     77    psMetadataAddStr(updaterunArgs, PS_LIST_TAIL, "-tess_id", 0, "search by tess_id", NULL);
     78    psMetadataAddStr(updaterunArgs, PS_LIST_TAIL, "-skycell_id", 0, "search by skycell_id", NULL);
     79    pxskycellAddArguments(updaterunArgs);
    7580    psMetadataAddStr(updaterunArgs, PS_LIST_TAIL, "-set_label", 0, "define new value for label", NULL);
    7681    psMetadataAddStr(updaterunArgs, PS_LIST_TAIL, "-set_state", 0, "define new state", NULL);
    … …  
    113118    psMetadataAddStr(resultArgs, PS_LIST_TAIL, "-data_group", 0, "search by data_group (LIKE comparison)", NULL);
    114119    psMetadataAddS16(resultArgs, PS_LIST_TAIL, "-num_filters", 0, "search by number of filters in the inputs (>=)", 0);
     120    pxskycellAddArguments(resultArgs);
    115121    psMetadataAddS16(resultArgs, PS_LIST_TAIL, "-fault", 0, "search by fault code", 0);
    116122    psMetadataAddU64(resultArgs, PS_LIST_TAIL, "-limit", 0, "limit result set to N items", 0);
Note: See TracChangeset for help on using the changeset viewer.