IPP Software Navigation Tools IPP Links Communication Pan-STARRS Links

Changeset 38049


Ignore:
Timestamp:
Mar 28, 2015, 8:24:37 PM (11 years ago)
Author:
eugene
Message:

merge changes from trunk

Location:
branches/eam_branches/ipp-20150112/ippTools
Files:
11 edited

Legend:

Unmodified
Added
Removed

  • branches/eam_branches/ipp-20150112/ippTools/share/difftool_definewarpstack.sql

    r35192 r38049  
    22-- and check results against existing diffs
    33SELECT
     4   exp_id,
     5   warp_id,
     6   filter,
     7   warpLabel,
     8   warpDataGroup,
     9   Inputs.tess_id,
     10   Inputs.skycell_id,
     11   stack_id,
     12   stackLabel,
     13   stackDataGroup,
     14   diff_id,
     15   diffLabel
     16FROM
     17(
     18SELECT
    419   exp_id,
    520   warp_id,
    … …  
    1126   MAX(stack_id) AS stack_id,
    1227   stackRun.label AS stackLabel,
    13    stackRun.data_group AS stackDataGroup,
    14    diff_id,
    15    diffRun.label AS diffLabel
     28   stackRun.data_group AS stackDataGroup
    1629FROM warpRun
    1730     JOIN fakeRun USING(fake_id)
    … …  
    2538        stackRun.tess_id    = warpRun.tess_id)
    2639     JOIN stackSumSkyfile USING(stack_id)
    27      LEFT JOIN diffInputSkyfile ON
    28        (warp_id = diffInputSkyfile.warp1 AND
    29         stack_id = diffInputSkyfile.stack2 AND
    30         diffInputSkyfile.skycell_id = stackRun.skycell_id AND
    31         diffInputSkyfile.tess_id = stackRun.tess_id)
    32      LEFT JOIN diffRun USING(diff_id)
    3340WHERE
    3441     warpRun.state = 'full'
    … …  
    4148-- %s
    4249GROUP BY exp_id,warp_id,skycell_id
     50) AS Inputs
     51LEFT JOIN
     52(
     53SELECT
     54diff_id,
     55diffRun.label AS diffLabel,
     56warp1,
     57stack2,
     58skycell_id,
     59diffInputSkyfile.tess_id
     60FROM
     61diffRun JOIN diffInputSkyfile USING(diff_id,tess_id)
     62WHERE
     63diff_mode = 2
     64-- %s
     65) AS Diffs ON
     66       (warp_id = warp1 AND
     67        stack_id = stack2 AND
     68        Diffs.skycell_id = Inputs.skycell_id AND
     69        Diffs.tess_id = Inputs.tess_id)
     70WHERE
     711
     72-- %s
     73

  • branches/eam_branches/ipp-20150112/ippTools/share/pxadmin_create_tables.sql

    r37833 r38049  
    23852385    remote_id BIGINT,
    23862386    stage_id  BIGINT,
    2387     jobs      INT
     2387    jobs      INT,
    23882388    state     VARCHAR(64) NOT NULL,
    23892389    path_base VARCHAR(255),

  • branches/eam_branches/ipp-20150112/ippTools/share/pxadmin_drop_tables.sql

    r36441 r38049  
    124124DROP TABLE IF EXISTS fullForceResult;
    125125DROP TABLE IF EXISTS fullForceSummary;
     126DROP TABLE IF EXISTS remoteComponent;
     127DROP TABLE IF EXISTS remoteRun;
    126128
    127129

  • branches/eam_branches/ipp-20150112/ippTools/src/difftool.c

    r36572 r38049  
    4242static bool definepoprunMode(pxConfig *config);
    4343static bool definewarpstackMode(pxConfig *config);
     44//static bool definewarpstackOldMethodMode(pxConfig *config);
    4445static bool definewarpwarpMode(pxConfig *config);
    4546static bool definestackstackMode(pxConfig *config);
    … …  
    9596        MODECASE(DIFFTOOL_MODE_DEFINEPOPRUN,          definepoprunMode);
    9697        MODECASE(DIFFTOOL_MODE_DEFINEWARPSTACK,       definewarpstackMode);
     98        //      MODECASE(DIFFTOOL_MODE_DEFINEWARPSTACKOLDMETHOD,       definewarpstackOldMethodMode);
    9799        MODECASE(DIFFTOOL_MODE_DEFINEWARPWARP,        definewarpwarpMode);
    98100        MODECASE(DIFFTOOL_MODE_DEFINESTACKSTACK,      definestackstackMode);
    … …  
    12331235
    12341236  PXOPT_COPY_S64(config->args, where, "-exp_id", "exp_id", "==");
    1235   PXOPT_COPY_STR(config->args, where, "-filter", "filter", "==");
     1237  PXOPT_COPY_STR(config->args, where, "-filter", "rawExp.filter", "==");
    12361238  PXOPT_COPY_STR(config->args, where, "-comment", "comment", "LIKE");
    12371239  PXOPT_COPY_S64(config->args, where, "-warp_id", "warpRun.warp_id", "==");
    … …  
    12441246  PXOPT_COPY_STR(config->args, where, "-stack_data_group", "stackRun.data_group", "==");
    12451247
     1248  // Add position dependence here.
     1249  if (!pxspaceBoxAddWhere(config,where)) {
     1250    psError(psErrorCodeLast(), false, "pxSpaceBoxAddWhere failed");
     1251    return false;
     1252  }
     1253 
     1254  // PXOPT_LOOKUP_BOOL(available, config->args, "-available", false);
    12461255  PXOPT_LOOKUP_BOOL(bothways, config->args, "-bothways", false);
    12471256 
    … …  
    12751284
    12761285  psString whereClause = psDBGenerateWhereConditionSQL(where,NULL);
     1286  psString diffWhereClause = psStringCopy("");
     1287  psString joinWhereClause = psStringCopy("");
    12771288 
    12781289  // Don't queue things that already have diffs.
    12791290  if (! (reRun || newTemplates) ) {
    1280     psStringAppend(&whereClause, "\nAND diff_id IS NULL\n");
     1291    psStringAppend(&joinWhereClause, "\nAND diff_id IS NULL\n");
    12811292  }
    12821293  // Append diff qualifiers, if we have them
    12831294  if (label) {
    1284     psStringAppend(&whereClause, "\nAND ((diffRun.label = '%s') OR (diffRun.label IS NULL))",label);
     1295    psStringAppend(&diffWhereClause, "\nAND ((diffRun.label = '%s') OR (diffRun.label IS NULL))",label);
    12851296  }
    12861297  if (data_group) {
    1287     psStringAppend(&whereClause, "\nAND ((diffRun.data_group = '%s') OR (diffRun.data_group IS NULL))",data_group);
     1298    psStringAppend(&diffWhereClause, "\nAND ((diffRun.data_group = '%s') OR (diffRun.data_group IS NULL))",data_group);
    12881299  }
    12891300  if (reduction) {
    1290     psStringAppend(&whereClause, "\nAND ((diffRun.reduction = '%s') OR (diffRun.reduction IS NULL))",reduction);
     1301    psStringAppend(&diffWhereClause, "\nAND ((diffRun.reduction = '%s') OR (diffRun.reduction IS NULL))",reduction);
    12911302  }
    12921303
    … …  
    12961307
    12971308  // This is just a simple query, so we don't need to do a transaction
    1298   if (!p_psDBRunQueryF(config->dbh, query, whereClauseString)) {
     1309  if (!p_psDBRunQueryF(config->dbh, query, whereClauseString, diffWhereClause,joinWhereClause)) {
    12991310    psError(PS_ERR_UNKNOWN, false, "database error");
    13001311    psFree(query);
    … …  
    13271338    return true;
    13281339  }
     1340 
    13291341  if (pretend) {
    13301342    // negative simple so the default is true
    … …  
    15181530
    15191531#if (0)
    1520 static bool definewarpstackMode(pxConfig *config)
     1532static bool definewarpstackOldMethodMode(pxConfig *config)
    15211533{
    15221534    PS_ASSERT_PTR_NON_NULL(config, false);
    … …  
    15301542    PXOPT_COPY_STR(config->args, expWhere, "-filter", "filter", "==");
    15311543    PXOPT_COPY_STR(config->args, expWhere, "-comment", "comment", "LIKE");
     1544   
    15321545    PXOPT_COPY_S64(config->args, warp1Where, "-warp_id", "warpRun.warp_id", "==");
    15331546    PXOPT_COPY_STR(config->args, warp1Where, "-warp_label", "warpRun.label", "==");
    … …  
    17981811        }
    17991812
     1813        // CZW force available off.  If we're using this very-expensive mode, we need to get the one thing it does correctly.
     1814        available = false;;
    18001815        if (!available && (num != skycell_count)) {
    18011816            psTrace("difftool", PS_LOG_INFO, "%" PRId64 " skyfiles with stack found for warp_id %" PRId64

  • branches/eam_branches/ipp-20150112/ippTools/src/difftool.h

    r29416 r38049  
    5454    DIFFTOOL_MODE_LISTSSRUN,
    5555    DIFFTOOL_MODE_SETSKYFILETOUPDATE,
     56    //    DIFFTOOL_MODE_DEFINEWARPSTACKOLDMETHOD,
    5657} difftoolMode;
    5758

  • branches/eam_branches/ipp-20150112/ippTools/src/difftoolConfig.c

    r34770 r38049  
    272272    psMetadataAddBool(definewarpstackArgs, PS_LIST_TAIL, "-pretend", 0, "list results but to not queue", false);
    273273
     274    pxspaceBoxAddArguments(definewarpstackArgs);
     275
     276#if (0)   
     277    // -definewarpstackOldMethod
     278    psMetadata *definewarpstackOldMethodArgs = psMetadataAlloc();
     279    psMetadataAddS64(definewarpstackOldMethodArgs, PS_LIST_TAIL, "-warp_id", 0, "search by warp ID", 0);
     280    psMetadataAddS64(definewarpstackOldMethodArgs, PS_LIST_TAIL, "-exp_id", 0, "search by exposure ID", 0);
     281    psMetadataAddStr(definewarpstackOldMethodArgs, PS_LIST_TAIL, "-skycell_id", 0, "search by skycell ID", NULL);
     282    psMetadataAddStr(definewarpstackOldMethodArgs, PS_LIST_TAIL, "-tess_id", 0, "search by tess ID", NULL);
     283    psMetadataAddBool(definewarpstackOldMethodArgs, PS_LIST_TAIL, "-bothways",  0,          "do the subtraction both ways?", false);
     284    psMetadataAddStr(definewarpstackOldMethodArgs, PS_LIST_TAIL, "-filter", 0, "search by filter", NULL);
     285    psMetadataAddStr(definewarpstackOldMethodArgs, PS_LIST_TAIL, "-comment", 0, "search by comment (LIKE)", NULL);
     286    psMetadataAddStr(definewarpstackOldMethodArgs, PS_LIST_TAIL, "-stack_label", 0, "search by stack label", NULL);
     287    psMetadataAddStr(definewarpstackOldMethodArgs, PS_LIST_TAIL, "-stack_data_group", 0, "search by stack data_group", NULL);
     288    psMetadataAddStr(definewarpstackOldMethodArgs, PS_LIST_TAIL, "-warp_label", 0, "search by warp label", NULL);
     289    psMetadataAddStr(definewarpstackOldMethodArgs, PS_LIST_TAIL, "-data_group", 0, "search by data_group", NULL);
     290    psMetadataAddF32(definewarpstackOldMethodArgs, PS_LIST_TAIL, "-good_frac", 0, "minimum good fraction of skycell", NAN);
     291    psMetadataAddStr(definewarpstackOldMethodArgs, PS_LIST_TAIL, "-set_workdir", 0, "define workdir (required)", NULL);
     292    psMetadataAddStr(definewarpstackOldMethodArgs, PS_LIST_TAIL, "-set_label",  0, "define label", NULL);
     293    psMetadataAddStr(definewarpstackOldMethodArgs, PS_LIST_TAIL, "-set_reduction",  0, "define reduction class", NULL);
     294    psMetadataAddTime(definewarpstackOldMethodArgs, PS_LIST_TAIL, "-set_registered", 0, "time detrend run was registered", now);
     295    psMetadataAddStr(definewarpstackOldMethodArgs, PS_LIST_TAIL, "-set_data_group",  0,     "define data group", NULL);
     296    psMetadataAddStr(definewarpstackOldMethodArgs, PS_LIST_TAIL, "-set_dist_group",  0,     "define dist group", NULL);
     297    psMetadataAddStr(definewarpstackOldMethodArgs, PS_LIST_TAIL, "-set_note",  0,           "define note", NULL);
     298    psMetadataAddBool(definewarpstackOldMethodArgs, PS_LIST_TAIL, "-new-templates", 0, "also search for diffs with new template", false);
     299    psMetadataAddBool(definewarpstackOldMethodArgs, PS_LIST_TAIL, "-rerun", 0, "define new run even if one exists", false);
     300    psMetadataAddBool(definewarpstackOldMethodArgs, PS_LIST_TAIL, "-available", 0, "define new run even if no stacks available for some skycells", false);
     301    psMetadataAddBool(definewarpstackOldMethodArgs, PS_LIST_TAIL, "-simple", 0, "use the simple output format", false);
     302    psMetadataAddBool(definewarpstackOldMethodArgs, PS_LIST_TAIL, "-pretend", 0, "list results but to not queue", false);
     303
     304    pxspaceBoxAddArguments(definewarpstackOldMethodArgs);
     305#endif
     306   
    274307    // -definewarpwarp
    275308    psMetadata *definewarpwarpArgs = psMetadataAlloc();
    … …  
    478511    PXOPT_ADD_MODE("-definepoprun",     "", DIFFTOOL_MODE_DEFINEPOPRUN,      definepoprunArgs);
    479512    PXOPT_ADD_MODE("-definewarpstack",  "", DIFFTOOL_MODE_DEFINEWARPSTACK,   definewarpstackArgs);
     513    //    PXOPT_ADD_MODE("-definewarpstackOldMethod",  "", DIFFTOOL_MODE_DEFINEWARPSTACKOLDMETHOD,   definewarpstackOldMethodArgs);
    480514    PXOPT_ADD_MODE("-definewarpwarp",   "", DIFFTOOL_MODE_DEFINEWARPWARP,    definewarpwarpArgs);
    481515    PXOPT_ADD_MODE("-definestackstack", "", DIFFTOOL_MODE_DEFINESTACKSTACK,  definestackstackArgs);

  • branches/eam_branches/ipp-20150112/ippTools/src/pstamptool.c

    r35955 r38049  
    11801180
    11811181    // negative simple so the default is true
    1182     if (!ippdbPrintMetadatas(stdout, output, "pstampDataStore", !simple)) {
     1182    if (!ippdbPrintMetadatas(stdout, output, "pstampProject", !simple)) {
    11831183        psError(PS_ERR_UNKNOWN, false, "failed to print array");
    11841184        psFree(output);

  • branches/eam_branches/ipp-20150112/ippTools/src/pxspace.c

    r35040 r38049  
    5757}
    5858
     59bool pxspaceBoxAddWhere(pxConfig *config, psMetadata *where)
     60{
     61  PXOPT_LOOKUP_F64(ra_min, config->args, "-ra_min", false, false);
     62  PXOPT_LOOKUP_F64(ra_max, config->args, "-ra_max", false, false);
     63  PXOPT_LOOKUP_F64(dec_min, config->args, "-dec_min", false, false);
     64  PXOPT_LOOKUP_F64(dec_max, config->args, "-dec_max", false, false);
     65
     66  if (ra_min) {
     67    ra_min *= PS_RAD_DEG;
     68    psMetadataAddF32(where,PS_LIST_TAIL,"rawExp.ra",PS_META_DUPLICATE_OK, ">=", ra_min);
     69  }
     70  if (ra_max) {
     71    ra_max *= PS_RAD_DEG;
     72    psMetadataAddF32(where,PS_LIST_TAIL,"rawExp.ra",PS_META_DUPLICATE_OK, "<=", ra_max);
     73  }
     74  if (dec_min) {
     75    dec_min *= PS_RAD_DEG;
     76    psMetadataAddF32(where,PS_LIST_TAIL,"rawExp.decl",PS_META_DUPLICATE_OK, ">=", dec_min);
     77  }
     78  if (dec_max) {
     79    dec_max *= PS_RAD_DEG;
     80    psMetadataAddF32(where,PS_LIST_TAIL,"rawExp.decl",PS_META_DUPLICATE_OK, "<=", dec_max);
     81  }
     82   
     83  return true;
     84}
     85
     86void pxspaceBoxAddArguments(psMetadata *md)
     87{
     88    psMetadataAddF64(md,  PS_LIST_TAIL, "-ra_min",            0, "search by right ascension (degrees)", NAN);
     89    psMetadataAddF64(md,  PS_LIST_TAIL, "-dec_min",           0, "search by declination (degrees)", NAN);
     90    psMetadataAddF64(md,  PS_LIST_TAIL, "-ra_max",            0, "search by right ascension (degrees)", NAN);
     91    psMetadataAddF64(md,  PS_LIST_TAIL, "-dec_max",           0, "search by declination (degrees)", NAN);
     92}
     93 
     94
    5995void pxskycellAddArguments(psMetadata *md)
    6096{

  • branches/eam_branches/ipp-20150112/ippTools/src/pxspace.h

    r33921 r38049  
    2424extern void pxspaceAddArguments(psMetadata *md);
    2525
     26extern bool pxspaceBoxAddWhere(pxConfig *config, psMetadata *where);
     27extern void pxspaceBoxAddArguments(psMetadata *md);
     28
    2629extern bool pxskycellAddWhere(pxConfig *config, psMetadata *where);
    2730extern void pxskycellAddArguments(psMetadata *md);

  • branches/eam_branches/ipp-20150112/ippTools/src/staticskytool.c

    r37164 r38049  
    650650    psMetadata *where = psMetadataAlloc();
    651651    PXOPT_COPY_S64(config->args, where, "-sky_id",     "staticskyRun.sky_id", "==");
     652    PXOPT_COPY_S64(config->args, where, "-stack_id",   "staticskyInput.stack_id", "==");
    652653    PXOPT_COPY_STR(config->args, where, "-label",      "staticskyRun.label", "==");
    653654    PXOPT_COPY_STR(config->args, where, "-data_group", "staticskyRun.data_group", "LIKE");

  • branches/eam_branches/ipp-20150112/ippTools/src/staticskytoolConfig.c

    r37164 r38049  
    129129    psMetadataAddStr(resultArgs, PS_LIST_TAIL, "-data_group", 0, "search by data_group (LIKE comparison)", NULL);
    130130    psMetadataAddS16(resultArgs, PS_LIST_TAIL, "-num_filters", 0, "search by number of filters in the inputs", 0);
     131    psMetadataAddS64(resultArgs, PS_LIST_TAIL, "-stack_id", 0, "search by input stack ID (if used num_filters will be wrong)", 0);
    131132    pxskycellAddArguments(resultArgs);
    132133    psMetadataAddS16(resultArgs, PS_LIST_TAIL, "-fault", 0, "search by fault code", 0);
Note: See TracChangeset for help on using the changeset viewer.