IPP Software Navigation Tools IPP Links Communication Pan-STARRS Links

Ignore:
Timestamp:
Feb 6, 2013, 2:34:49 PM (14 years ago)
Author:
eugene
Message:

merging changes from trunk

Location:
branches/eam_branches/ipp-20121219
Files:
21 edited
7 copied

Legend:

Unmodified
Added
Removed

  • branches/eam_branches/ipp-20121219

  • branches/eam_branches/ipp-20121219/ippTools/share/Makefile.am

    r34800 r35096  
    461461        vptool_processedcell.sql \
    462462        vptool_revertrun.sql \
    463         sctool_list.sql
     463        sctool_list.sql \
     464        releasetool_listsurvey.sql \
     465        releasetool_listrelease.sql \
     466        releasetool_listrelexp.sql \
     467        releasetool_definerelexp.sql
    464468

  • branches/eam_branches/ipp-20121219/ippTools/share/bgtool_definechip.sql

    r32680 r35096  
    33FROM chipRun
    44JOIN rawExp USING(exp_id)
     5JOIN camRun USING(chip_id)
     6JOIN camProcessedExp USING(cam_id)
    57LEFT JOIN chipBackgroundRun USING(chip_id)
    68WHERE chipRun.state = 'full'
     9AND camRun.state = 'full'
     10AND camProcessedExp.quality = 0

  • branches/eam_branches/ipp-20121219/ippTools/share/camtool_find_pendingimfile.sql

    • Property svn:mergeinfo changed (with no actual effect on merging)

  • branches/eam_branches/ipp-20121219/ippTools/share/chiptool_setimfiletoupdate.sql

    • Property svn:mergeinfo changed (with no actual effect on merging)

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

    r34903 r35096  
    21482148) ENGINE=InnoDB DEFAULT CHARSET=latin1;
    21492149
    2150 
    2151 -- This comment line is here to avoid empty query error.
     2150CREATE TABLE survey (
     2151    surveyID    INT(8),
     2152    surveyName  VARCHAR(16) NOT NULL,
     2153    description VARCHAR(255),
     2154    PRIMARY KEY(surveyID),
     2155    UNIQUE  KEY(name)
     2156) ENGINE=InnoDB CHARSET=latin1;
     2157
     2158
     2159CREATE TABLE ippRelease (
     2160    rel_id      INT(8) AUTO_INCREMENT,
     2161    surveyID    INT(8),
     2162    releaseName VARCHAR(64),
     2163    relase_state VARCHAR(16),   -- active, pending, archive, drop
     2164    dataRelease INT(8),         -- PSPS dataRelease
     2165    priority    INT(8),
     2166    PRIMARY KEY(rel_id),
     2167    KEY(releaseName),
     2168    KEY(state),
     2169    KEY(priority),
     2170    FOREIGN KEY(surveyID) REFERENCES survey(surveyID)
     2171) ENGINE=Innodb DEFAULT CHARSET=latin1;
     2172
     2173CREATE TABLE relExp (
     2174    relexp_id   BIGINT AUTO_INCREMENT,
     2175    rel_id      INT(8),
     2176    exp_id      BIGINT,
     2177    chip_id     BIGINT,         -- links to the runs that supplied the data
     2178    cam_id      BIGINT,         -- for this release
     2179    state       VARCHAR(16),    -- released, pending, archive, drop 
     2180    flags       INT UNSIGNED,   -- flags for relphot, relastro, ??
     2181    zpt_obs     FLOAT,          -- calibrated zero point for this release of
     2182    zpt_stdev   FLOAT,          -- this exposure
     2183    path_base   VARCHAR(255),   -- path_base of any supporting files for this
     2184                                -- release of this exposure.
     2185    registered  DATETIME,       -- insertion time for this row
     2186    time_stamp  DATETIME,       -- time of last update for this row
     2187    PRIMARY KEY (relexp_id),
     2188    FOREIGN KEY(rel_id) REFERENCES ippRelease(rel_id),
     2189    KEY (state),
     2190    FOREIGN KEY(exp_id) REFERENCES rawExp(exp_id),
     2191    FOREIGN KEY(chip_id) REFERENCES chipRun(chip_id),
     2192    FOREIGN KEY(cam_id) REFERENCES camRun(cam_id)
     2193) ENGINE=innodb DEFAULT CHARSET=latin1;
     2194
     2195CREATE TABLE relStack (
     2196    relstack_id BIGINT AUTO_INCREMENT,
     2197    rel_id      INT(8),
     2198    skycal_id   BIGINT,         -- id of the sky calibration run that supplied the calibration
     2199                                -- for this release. We get back to stack from here
     2200    skycell_id  varchar(64),
     2201    tess_id     varchar(64),
     2202    state       VARCHAR(16),    -- released, pending, archive, drop 
     2203    flags       INT UNSIGNED,
     2204    stack_type  VARCHAR(16),    -- nightly, deep, reference
     2205    zpt_obs     FLOAT,          -- calibrated zero point for this release of this skycell
     2206    zpt_stdev   FLOAT,
     2207    fwhm_major  FLOAT,          -- seeing as measured by staticsky
     2208    path_base   VARCHAR(255),   -- path_base of any supporting files,
     2209    registered  DATETIME,
     2210    time_stamp  DATETIME,
     2211    PRIMARY KEY (relstack_id),
     2212    KEY (tess_id, skycell_id),
     2213    KEY (rel_id, tess_id, skycell_id),
     2214    FOREIGN KEY(rel_id) REFERENCES ippRelease(rel_id),
     2215    FOREIGN KEY(skycal_id) REFERENCES skycalRun(skycal_id)
     2216) ENGINE=innodb DEFAULT CHARSET=latin1;
     2217
     2218
     2219
     2220-- These comment lines are here to avoid an empty query error.
    21522221-- Another way to avoid that problem is to omit the semicolon above but I think that is untidy.

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

    r33720 r35096  
    109109DROP TABLE IF EXISTS skycalResult;
    110110DROP TABLE IF EXISTS skycell;
     111DROP TABLE IF EXISTS relExp;
     112DROP TABLE IF EXISTS ippRelease;
     113DROP TABLE IF EXISTS survey;
    111114
    112115SET FOREIGN_KEY_CHECKS=1

  • branches/eam_branches/ipp-20121219/ippTools/share/stacktool_tobkg.sql

    r34800 r35096  
    2525    -- WHERE hook %s
    2626GROUP BY stack_id
    27 HAVING (SUM(IF(warpRun.state = 'full', 1, 0)) = COUNT(stackInputSkyfile.warp_id) AND
     27HAVING ((SUM(IF(warpRun.state = 'cleaned', 1, 0)) = COUNT(stackInputSkyfile.warp_id) OR
     28         SUM(IF(warpRun.state = 'full', 1, 0)) = COUNT(stackInputSkyfile.warp_id)) AND
    2829        SUM(IF(warpSkyfile.background_model = 1, 1, 0)) = COUNT(stackInputSkyfile.warp_id))
    2930

  • branches/eam_branches/ipp-20121219/ippTools/share/staticskytool_defineskycalrun.sql

    r34761 r35096  
    11SELECT
    2     sky_id,
    3     stack_id,
     2    staticskyRun.sky_id,
     3    stackRun.stack_id,
    44    skycell_id,
    55    filter,
    … …  
    1414    JOIN stackSumSkyfile USING(stack_id)
    1515    JOIN skycell USING(tess_id, skycell_id)
    16     LEFT JOIN skycalRun USING(sky_id, stack_id)
     16    LEFT JOIN skycalRun ON staticskyRun.sky_id = skycalRun.sky_id AND stackRun.stack_id = skycalRun.stack_id -- join hook %s
    1717WHERE staticskyRun.state = 'full'
    1818    AND staticskyResult.quality = 0

  • branches/eam_branches/ipp-20121219/ippTools/share/staticskytool_revert.sql

    r28154 r35096  
    11DELETE FROM staticskyResult
    2 USING staticskyResult, staticskyRun
     2USING staticskyResult, staticskyRun, staticskyInput, stackRun, skycell
    33WHERE staticskyRun.sky_id = staticskyResult.sky_id
     4    AND staticskyRun.sky_id = staticskyInput.sky_id
     5    AND staticskyInput.stack_id = stackRun.stack_id
     6    AND stackRun.tess_id = skycell.tess_id
     7    AND stackRun.skycell_id = skycell.skycell_id
    48    AND staticskyRun.state = 'new'
    59    AND staticskyResult.fault != 0

  • branches/eam_branches/ipp-20121219/ippTools/share/staticskytool_revertskycal.sql

    r32962 r35096  
    11DELETE FROM skycalResult
    2 USING skycalResult, skycalRun, stackRun
     2USING skycalResult, skycalRun, stackRun, skycell
    33WHERE skycalRun.skycal_id = skycalResult.skycal_id
    44    AND stackRun.stack_id = skycalRun.stack_id
    55    AND skycalRun.state = 'new'
    66    AND skycalResult.fault != 0
     7    AND stackRun.tess_id = skycell.tess_id
     8    AND stackRun.skycell_id = skycell.skycell_id

  • branches/eam_branches/ipp-20121219/ippTools/share/staticskytool_skycalresult.sql

    r32962 r35096  
    22    skycalResult.*,
    33    skycalRun.stack_id,
    4     stackRun.tess_id,
    5     stackRun.skycell_id,
    64    stackRun.filter,
    75    skycalRun.state,
    86    skycalRun.label,
    97    skycalRun.data_group,
    10     skycalRun.sky_id
     8    skycalRun.sky_id,
     9    skycell.*
    1110FROM skycalRun
    1211JOIN skycalResult USING(skycal_id)
    13 JOIN stackRun USING(stack_id)
    14 
     12JOIN stackRun USING(stack_id) 
     13JOIN skycell USING(tess_id, skycell_id)

  • branches/eam_branches/ipp-20121219/ippTools/share/warptool_towarped.sql

    • Property svn:mergeinfo changed (with no actual effect on merging)

  • branches/eam_branches/ipp-20121219/ippTools/src

  • branches/eam_branches/ipp-20121219/ippTools/src/Makefile.am

    r33720 r35096  
    3232        laptool \
    3333        vptool \
    34         sctool
     34        sctool \
     35        releasetool
    3536
    3637pkginclude_HEADERS = \
    … …  
    8586        laptool.h \
    8687        vptool.h \
    87         sctool.h
     88        sctool.h \
     89        releasetool.h
    8890
    8991lib_LTLIBRARIES = libpxtools.la
    … …  
    324326    sctoolConfig.c
    325327
     328releasetool_CFLAGS = $(PSLIB_CFLAGS) $(PSMODULES_CFLAGS) $(IPPDB_CFLAGS)
     329releasetool_LDADD = $(PSLIB_LIBS) $(PSMODULES_LIBS) $(IPPDB_LIBS) libpxtools.la
     330releasetool_SOURCES = \
     331    releasetool.c \
     332    releasetoolConfig.c
     333
    326334clean-local:
    327335        -rm -f TAGS

  • branches/eam_branches/ipp-20121219/ippTools/src/bgtool.c

    r34081 r35096  
    693693    psMetadata *where = psMetadataAlloc();
    694694    PXOPT_COPY_S64(config->args, where, "-chip_bg_id",    "chipBackgroundRun.chip_bg_id", "==");
     695    PXOPT_COPY_S64(config->args, where, "-chip_id",    "chipBackgroundRun.chip_id", "==");
    695696    PXOPT_COPY_STR(config->args, where, "-class_id", "chipBackgroundImfile.class_id", "==");
    696697    pxAddLabelSearchArgs(config, where, "-label",   "chipBackgroundRun.label", "LIKE");

  • branches/eam_branches/ipp-20121219/ippTools/src/bgtoolConfig.c

    r32199 r35096  
    162162    psMetadata *chipArgs = psMetadataAlloc();
    163163    psMetadataAddS64(chipArgs, PS_LIST_TAIL, "-chip_bg_id", 0, "search by chip_bg_id", 0);
     164    psMetadataAddS64(chipArgs, PS_LIST_TAIL, "-chip_id", 0, "search by chip_id", 0);
    164165    psMetadataAddStr(chipArgs, PS_LIST_TAIL, "-class_id", 0, "search by class_id", NULL);
    165166    psMetadataAddS16(chipArgs, PS_LIST_TAIL, "-fault",  0, "search by fault code", 0);

  • branches/eam_branches/ipp-20121219/ippTools/src/magictool.c

    • Property svn:mergeinfo changed (with no actual effect on merging)

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

    r33921 r35096  
    6767    psMetadataAddF32(md,  PS_LIST_TAIL, "-glong_max",         0, "search by galactic longitude (degrees)", NAN);
    6868    psMetadataAddF32(md,  PS_LIST_TAIL, "-glat_max",          0, "search by galactic latitude (degrees)", NAN);
     69    psMetadataAddF32(md,  PS_LIST_TAIL, "-abs_glat_min",       0, "search by absolute value(galactic latitude) (degrees)", NAN);
     70    psMetadataAddF32(md,  PS_LIST_TAIL, "-abs_glat_max",       0, "search by absolute value(galactic latitude) (degrees)", NAN);
    6971}
    7072
    … …  
    7981    PXOPT_COPY_F32(config->args, where, "-glong_max", "skycell.glong", "<");
    8082    PXOPT_COPY_F32(config->args, where, "-glat_max", "skycell.glat", "<");
     83    PXOPT_COPY_F32(config->args, where, "-abs_glat_min", "abs(skycell.glat)", ">=");
     84    PXOPT_COPY_F32(config->args, where, "-abs_glat_max", "abs(skycell.glat)", "<");
    8185    return true;
    8286}

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

    r34815 r35096  
    503503    PXOPT_COPY_S64(config->args, whereMD, "-sky_id", "sky_id", "==");
    504504    pxAddLabelSearchArgs (config, whereMD, "-label", "staticskyRun.label", "==");
     505    pxskycellAddWhere(config, whereMD);
    505506
    506507    PXOPT_LOOKUP_U64(limit, config->args, "-limit", false, false);
    … …  
    736737    PXOPT_COPY_S16(config->args, where, "-fault", "staticskyResult.fault", "==");
    737738
     739    if (!pxskycellAddWhere(config, where)) {
     740        psError(PXTOOLS_ERR_CONFIG, false, "failed to add skycell search arguments");
     741        return false;
     742    }
     743
    738744    if (!psListLength(where->list) && !psMetadataLookupBool(NULL, config->args, "-all")) {
    739745        psFree(where);
    … …  
    10661072    psFree(whereMD);
    10671073
     1074    psString labelHook = psStringCopy("");
    10681075    if (!rerun) {
    10691076        if (label)  {
    1070             psStringAppend(&query, "\nAND (skycalRun.label IS NULL OR skycalRun.label = '%s')", label);
     1077            psStringAppend(&labelHook, "\nAND skycalRun.label = '%s'", label);
    10711078        }
    10721079        psStringAppend(&query, "\nAND skycal_id IS NULL");
    10731080    }
    10741081
    1075     if (!p_psDBRunQuery(config->dbh, query)) {
     1082
     1083    if (!p_psDBRunQueryF(config->dbh, query, labelHook)) {
    10761084        psError(PS_ERR_UNKNOWN, false, "database error");
     1085        psFree(labelHook);
    10771086        psFree(query);
    10781087        return false;
    10791088    }
     1089    psFree(labelHook);
    10801090    psFree(query);
    10811091
    … …  
    13921402    PXOPT_COPY_STR(config->args, where, "-label",      "skycalRun.label", "==");
    13931403    PXOPT_COPY_STR(config->args, where, "-data_group", "skycalRun.data_group", "LIKE");
     1404    PXOPT_COPY_S16(config->args, where, "-quality",     "skycalResult.quality", "==");
    13941405    PXOPT_COPY_S16(config->args, where, "-fault",      "skycalResult.fault", "==");
     1406
     1407    if (!pxskycellAddWhere(config, where)) {
     1408        psError(PXTOOLS_ERR_CONFIG, false, "failed to add skycell search arguments");
     1409        return false;
     1410    }
    13951411
    13961412    PXOPT_LOOKUP_U64(limit, config->args, "-limit", false, false);
    … …  
    14681484    pxAddLabelSearchArgs(config, where, "-filter", "stackRun.filter", "==");
    14691485    PXOPT_COPY_S16(config->args, where, "-fault", "skycalResult.fault", "==");
     1486    if (!pxskycellAddWhere(config, where)) {
     1487        psError(PXTOOLS_ERR_CONFIG, false, "failed to add skycell search arguments");
     1488        return false;
     1489    }
    14701490
    14711491    if (!psListLength(where->list) && !psMetadataLookupBool(NULL, config->args, "-all")) {

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

    r34789 r35096  
    5151    psMetadataAddStr(definebyqueryArgs,  PS_LIST_TAIL, "-select_skycell_id", 0, "search for skycell_id", NULL);
    5252    psMetadataAddStr(definebyqueryArgs,  PS_LIST_TAIL, "-select_tess_id", 0, "search for tess_id", NULL);
    53     psMetadataAddF32(definebyqueryArgs,  PS_LIST_TAIL, "-select_good_frac_min", 0, "define min good_frac", 0.0);
     53    psMetadataAddF32(definebyqueryArgs,  PS_LIST_TAIL, "-select_good_frac_min", 0, "define min good_frac", NAN);
    5454    psMetadataAddStr(definebyqueryArgs,  PS_LIST_TAIL, "-select_label", PS_META_DUPLICATE_OK, "search by stackRun label (LIKE comparison, multiple OK)", NULL);
    5555    psMetadataAddStr(definebyqueryArgs,  PS_LIST_TAIL, "-select_data_group", PS_META_DUPLICATE_OK, "search by stackRun data_group (LIKE comparison, multiple OK)", NULL);
    … …  
    103103    psMetadataAddS64(todoArgs, PS_LIST_TAIL, "-sky_id", 0, "search by staticsky ID", 0);
    104104    psMetadataAddStr(todoArgs, PS_LIST_TAIL, "-label", PS_META_DUPLICATE_OK, "search by label", NULL);
     105    pxskycellAddArguments(todoArgs);
    105106    psMetadataAddU64(todoArgs, PS_LIST_TAIL, "-limit", 0, "limit result set to N items", 0);
    106107    psMetadataAddBool(todoArgs, PS_LIST_TAIL, "-simple", 0, "use the simple output format", false);
    … …  
    138139    psMetadataAddStr(revertArgs, PS_LIST_TAIL, "-label", PS_META_DUPLICATE_OK, "search by label", 0);
    139140    psMetadataAddS16(revertArgs, PS_LIST_TAIL, "-fault", 0, "search by fault code", 0);
     141    pxskycellAddArguments(revertArgs);
    140142    psMetadataAddBool(revertArgs, PS_LIST_TAIL, "-all", 0, "allow no search terms", false);
    141143
    … …  
    162164    psMetadataAddStr(defineskycalrunArgs,  PS_LIST_TAIL, "-select_skycell_id", 0, "search for skycell_id", NULL);
    163165    psMetadataAddStr(defineskycalrunArgs,  PS_LIST_TAIL, "-select_tess_id", 0, "search for tess_id", NULL);
    164     psMetadataAddF32(defineskycalrunArgs,  PS_LIST_TAIL, "-select_good_frac_min", 0, "define min good_frac", 0.0);
     166    psMetadataAddF32(defineskycalrunArgs,  PS_LIST_TAIL, "-select_good_frac_min", 0, "define min good_frac", NAN);
    165167    psMetadataAddStr(defineskycalrunArgs,  PS_LIST_TAIL, "-select_label", PS_META_DUPLICATE_OK, "search by stackRun label (LIKE comparison, multiple OK)", NULL);
    166168    psMetadataAddStr(defineskycalrunArgs,  PS_LIST_TAIL, "-select_data_group", PS_META_DUPLICATE_OK, "search by stackRun data_group (LIKE comparison, multiple OK)", NULL);
    … …  
    238240    psMetadataAddStr(revertskycalArgs, PS_LIST_TAIL, "-data_group", PS_META_DUPLICATE_OK, "search by data_group", 0);
    239241    psMetadataAddStr(revertskycalArgs, PS_LIST_TAIL, "-filter", PS_META_DUPLICATE_OK, "search by filter", 0);
     242    pxskycellAddArguments(revertskycalArgs);
    240243    psMetadataAddS16(revertskycalArgs, PS_LIST_TAIL, "-fault", 0, "search by fault code", 0);
    241244    psMetadataAddBool(revertskycalArgs, PS_LIST_TAIL, "-all", 0, "allow no search terms", false);
    … …  
    257260    psMetadataAddStr(skycalresultArgs, PS_LIST_TAIL, "-label", 0, "search by label (LIKE comparison)", NULL);
    258261    psMetadataAddStr(skycalresultArgs, PS_LIST_TAIL, "-data_group", 0, "search by data_group (LIKE comparison)", NULL);
     262    psMetadataAddS16(skycalresultArgs, PS_LIST_TAIL, "-quality",  0, "search by quality", 0);
    259263    psMetadataAddS16(skycalresultArgs, PS_LIST_TAIL, "-fault", 0, "search by fault code", 0);
     264    pxskycellAddArguments(skycalresultArgs);
    260265    psMetadataAddU64(skycalresultArgs, PS_LIST_TAIL, "-limit", 0, "limit skycalresult set to N items", 0);
    261266    psMetadataAddBool(skycalresultArgs, PS_LIST_TAIL, "-simple", 0, "use the simple output format", false);
Note: See TracChangeset for help on using the changeset viewer.