IPP Software Navigation Tools IPP Links Communication Pan-STARRS Links

Changeset 35886


Ignore:
Timestamp:
Aug 5, 2013, 1:15:14 PM (13 years ago)
Author:
bills
Message:

Add columns relExp.ubercal_dist ippRelease.dvodb and ippRelease.ubercal_file
include definition of dqstats tables from trunk

Location:
tags/ipp-20130712
Files:
8 edited

Legend:

Unmodified
Added
Removed

  • tags/ipp-20130712/dbconfig/changes.txt

    r35803 r35886  
    24222422
    24232423UPDATE dbversion set schema_version = '1.1.76', updated= CURRENT_TIMESTAMP();
     2424
     2425--
     2426
     2427ALTER TABLE ippRelease ADD COLUMN dvodb VARCHAR(255) DEFAULT NULL AFTER priority;
     2428ALTER TABLE ippRelease ADD COLUMN ubercal_file VARCHAR(255) DEFAULT NULL AFTER dvodb;
     2429ALTER TABLE relExp ADD COLUMN ubercal_dist INT DEFAULT 0 AFTER zpt_stdev;
     2430
     2431UPDATE dbversion set schema_version = '1.1.77', updated= CURRENT_TIMESTAMP();
     2432

  • tags/ipp-20130712/dbconfig/config.md

    r35803 r35886  
    22    pkg_name        STR     ippdb
    33    pkg_namespace   STR     ippdb
    4     pkg_version     STR     1.1.76
     4    pkg_version     STR     1.1.77
    55END

  • tags/ipp-20130712/dbconfig/release.md

    r35213 r35886  
    88    rel_id      S32     0   # Primary Key AUTO_INCREMENT
    99    surveyID    S32     0   # fkey(surveyID) ref survey(surveyID)
    10     release_name STR     64
     10    release_name STR    64
    1111    release_state STR   16
    1212    dataRelease S32     0
    1313    priority    S32     0
     14    dvodb       STR     255
     15    ubercal_file STR    255
    1416END
    1517
    … …  
    2527    zpt_obs     F32     0
    2628    zpt_stdev   F32     0
     29    ubercal_dist S32    0
    2730    path_base   STR     255
    2831    fault       S16     0

  • tags/ipp-20130712/ippTools/configure.ac

    r35803 r35886  
    11AC_PREREQ(2.61)
    22
    3 AC_INIT([ipptools], [1.1.76], [ipp-support@ifa.hawaii.edu])
     3AC_INIT([ipptools], [1.1.77], [ipp-support@ifa.hawaii.edu])
    44AC_CONFIG_SRCDIR([autogen.sh])
    55
    … …  
    1818PKG_CHECK_MODULES([PSLIB], [pslib >= 1.1.0])
    1919PKG_CHECK_MODULES([PSMODULES], [psmodules >= 1.1.0])
    20 PKG_CHECK_MODULES([IPPDB], [ippdb >= 1.1.76])
     20PKG_CHECK_MODULES([IPPDB], [ippdb >= 1.1.77])
    2121PKG_CHECK_MODULES([PPSTAMP], [ppstamp >= 0.1.1])
    2222

  • tags/ipp-20130712/ippTools/share/pxadmin_create_tables.sql

    r35789 r35886  
    21722172    dataRelease INT,         -- PSPS dataRelease
    21732173    priority    INT,
     2174    dvodb       VARCHAR(255),
     2175    ubercal_file VARCHAR(255),
    21742176    PRIMARY KEY(rel_id),
    21752177    UNIQUE KEY(surveyID, release_name),
    … …  
    21862188    chip_id     BIGINT,         -- links to the runs that supplied the data
    21872189    cam_id      BIGINT,         -- for this release
    2188     group_id    INT,         -- id of relGroup that this exposure is contained in
     2190    group_id    INT,            -- id of relGroup that this exposure is contained in
    21892191    state       VARCHAR(16),    -- released, pending, archive, drop 
    2190     flags       INT UNSIGNED,  -- flags for relphot, relastro, ??
     2192    flags       INT UNSIGNED,   -- flags for relphot, relastro, ??
    21912193    zpt_obs     FLOAT,          -- calibrated zero point for this release of
    21922194    zpt_stdev   FLOAT,          -- this exposure
     2195    ubercal_dist INT,           -- ubercal distance (from dvo calibration)
    21932196    path_base   VARCHAR(255),   -- path_base of any supporting files for this
    21942197                                -- release of this exposure.
    … …  
    22732276) ENGINE=innodb DEFAULT CHARSET=latin1;
    22742277
     2278CREATE TABLE dqstatsRun (
     2279  dqstats_id BIGINT NOT NULL AUTO_INCREMENT,
     2280  state VARCHAR(64) DEFAULT NULL,
     2281  registered TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP,
     2282  label VARCHAR(64) DEFAULT NULL,
     2283  fault SMALLINT NOT NULL,
     2284  PRIMARY KEY  (dqstats_id),
     2285  KEY label (label),
     2286  KEY fault (fault)
     2287) ENGINE=InnoDB DEFAULT CHARSET=latin1;
     2288
     2289CREATE TABLE dqstatsContent (
     2290  dqstats_id BIGINT,
     2291  exp_id BIGINT,
     2292  chip_id BIGINT,
     2293  cam_id BIGINT,
     2294  warp_id BIGINT,
     2295  invalid TINYINT DEFAULT NULL,
     2296  KEY dqstats_id (dqstats_id),
     2297  KEY exp_id (exp_id),
     2298  KEY chip_id (chip_id),
     2299  KEY cam_id (cam_id),
     2300  KEY warp_id (warp_id),
     2301  FOREIGN KEY (dqstats_id) REFERENCES dqstatsRun (dqstats_id),
     2302  FOREIGN KEY (exp_id) REFERENCES rawExp (exp_id),
     2303  FOREIGN KEY (chip_id) REFERENCES chipRun (chip_id),
     2304  FOREIGN KEY (cam_id) REFERENCES camRun (cam_id),
     2305  FOREIGN KEY (warp_id) REFERENCES warpRun (warp_id)
     2306) ENGINE=InnoDB DEFAULT CHARSET=latin1;
    22752307
    22762308

  • tags/ipp-20130712/ippTools/share/pxadmin_drop_tables.sql

    r35789 r35886  
    118118DROP TABLE IF EXISTS mergedvodbProcessed;
    119119DROP TABLE IF EXISTS mergedvodbRun;
     120DROP TABLE IF EXISTS dqstatsContent;
     121DROP TABLE IF EXISTS dqstatsRun;
    120122
    121123SET FOREIGN_KEY_CHECKS=1

  • tags/ipp-20130712/ippTools/src/releasetool.c

    r35795 r35886  
    180180    PS_ASSERT_PTR_NON_NULL(config, false);
    181181
    182     PXOPT_LOOKUP_S32(surveyID,    config->args, "-set_surveyID", true, false);
    183     PXOPT_LOOKUP_STR(release_name, config->args, "-set_release_name", true, false);
     182    PXOPT_LOOKUP_S32(surveyID,    config->args,   "-set_surveyID", true, false);
     183    PXOPT_LOOKUP_STR(release_name, config->args,  "-set_release_name", true, false);
    184184    PXOPT_LOOKUP_STR(release_state, config->args, "-set_release_state",  true, false);
    185     PXOPT_LOOKUP_S32(dataRelease, config->args, "-set_dataRelease", false, false);
    186     PXOPT_LOOKUP_S32(priority,    config->args, "-set_priority", false, false);
     185    PXOPT_LOOKUP_S32(dataRelease, config->args,   "-set_dataRelease", false, false);
     186    PXOPT_LOOKUP_S32(priority,    config->args,   "-set_priority", false, false);
     187    PXOPT_LOOKUP_STR(dvodb, config->args,         "-set_dvodb",  false, false);
     188    PXOPT_LOOKUP_STR(ubercal_file, config->args,  "-set_ubercal_file",  false, false);
    187189
    188190    if (!ippReleaseInsert(config->dbh,
    … …  
    192194        release_state,
    193195        dataRelease,
    194         priority
     196        priority,
     197        dvodb,
     198        ubercal_file
    195199    )) {
    196200        psError(PS_ERR_UNKNOWN, false, "failed to insert ippRelease");
    … …  
    215219    PXOPT_LOOKUP_S32(priority,         config->args, "-set_priority",  false, false);
    216220    PXOPT_LOOKUP_S32(dataRelease,      config->args, "-set_dataRelease",  false, false);
    217     if (!release_state && priority == 0 && dataRelease == -1) {
    218         psError(PXTOOLS_ERR_CONFIG, true, "at least one of -set_release_state -set_priority and -set_dataRelease is required\n");
     221    PXOPT_LOOKUP_STR(dvodb, config->args, "-set_dvodb",  false, false);
     222    PXOPT_LOOKUP_STR(ubercal_file, config->args, "-set_ubercal_file",  false, false);
     223    if (!release_state && priority == 0 && dataRelease == -1 && !dvodb && !ubercal_file) {
     224        psError(PXTOOLS_ERR_CONFIG, true, "at least one of -set_release_state -set_priority -set_dvodb -set_ubercal_file and -set_dataRelease is required\n");
    219225        return false;
    220226    }
    … …  
    366372    PXOPT_LOOKUP_F32(user_zpt_obs, config->args,   "-set_zpt_obs", false, false);
    367373    PXOPT_LOOKUP_F32(user_zpt_stdev, config->args, "-set_zpt_stdev", false, false);
     374    PXOPT_LOOKUP_S32(ubercal_dist, config->args, "-set_ubercal_dist", false, false);
    368375    PXOPT_LOOKUP_STR(path_base, config->args, "-set_path_base", false, false);
    369376    PXOPT_LOOKUP_S16(fault, config->args,     "-set_fault", false, false);
    … …  
    456463            zpt_obs,
    457464            zpt_stdev,
     465            ubercal_dist,
    458466            path_base,
    459467            fault,
    … …  
    500508    PXOPT_LOOKUP_F32(zpt_stdev,config->args, "-set_zpt_stdev",  false, false);
    501509    PXOPT_LOOKUP_S16(fault,    config->args, "-set_fault",  false, false);
     510    PXOPT_LOOKUP_S32(ubercal_dist, config->args, "-set_ubercal_dist", false, false);
    502511    PXOPT_LOOKUP_BOOL(clearfault, config->args, "-clearfault",  false);
    503     if (!state && !flags && !path_base && !isfinite(zpt_obs) && !isfinite(zpt_stdev) && !fault && !clearfault) {
     512    if (!state && !flags && !path_base && !isfinite(zpt_obs) && !isfinite(zpt_stdev) && !fault && !clearfault && !ubercal_dist) {
    504513        psError(PXTOOLS_ERR_CONFIG, true, "must set at least one column\n");
    505514        return false;
    … …  
    555564    if (clearfault) {
    556565        psStringAppend(&query, "%s relExp.fault = 0", sep);
     566        sep = comma;
     567    }
     568    if (ubercal_dist) {
     569        psStringAppend(&query, "%s relExp.ubercal_dist = %d", sep, ubercal_dist);
    557570        sep = comma;
    558571    }

  • tags/ipp-20130712/ippTools/src/releasetoolConfig.c

    r35795 r35886  
    6464    psMetadataAddStr(definereleaseArgs, PS_LIST_TAIL, "-set_release_state", 0, "define release state", NULL);
    6565    psMetadataAddS32(definereleaseArgs, PS_LIST_TAIL, "-set_priority", 0,      "define release priority", 0);
     66    psMetadataAddStr(definereleaseArgs, PS_LIST_TAIL, "-set_dvodb", 0,         "define dvo db name", NULL);
     67    psMetadataAddStr(definereleaseArgs, PS_LIST_TAIL, "-set_ubercal_file", 0,  "define ubercal file name", NULL);
    6668
    6769    // -uptdaterelease
    … …  
    7577    psMetadataAddS32(updatereleaseArgs, PS_LIST_TAIL, "-set_priority", 0,       "define new release priority", 0);
    7678    psMetadataAddS32(updatereleaseArgs, PS_LIST_TAIL, "-set_dataRelease", 0,    "define data release", -1);
     79    psMetadataAddStr(updatereleaseArgs, PS_LIST_TAIL, "-set_dvodb", 0,         "define new dvo db name", NULL);
     80    psMetadataAddStr(updatereleaseArgs, PS_LIST_TAIL, "-set_ubercal_file", 0,  "define new ubercal file name", NULL);
    7781
    7882
    … …  
    108112    psMetadataAddF32(definerelexpArgs,  PS_LIST_TAIL, "-set_zpt_obs", 0,    "define zero point", NAN);
    109113    psMetadataAddF32(definerelexpArgs,  PS_LIST_TAIL, "-set_zpt_stdev", 0,  "define zero point stdev", NAN);
     114    psMetadataAddS32(definerelexpArgs,  PS_LIST_TAIL, "-set_ubercal_dist", 0,  "define ubercal dist", 0);
    110115    psMetadataAddStr(definerelexpArgs,  PS_LIST_TAIL, "-set_path_base", 0,  "define state", NULL);
    111116    psMetadataAddS16(definerelexpArgs,  PS_LIST_TAIL, "-set_fault", 0,      "define fault", 0);
    … …  
    126131    psMetadataAddF32(updaterelexpArgs,  PS_LIST_TAIL, "-set_zpt_obs", 0,    "define new zero point", NAN);
    127132    psMetadataAddF32(updaterelexpArgs,  PS_LIST_TAIL, "-set_zpt_stdev", 0,  "define new zero point stdev", NAN);
     133    psMetadataAddS32(updaterelexpArgs,  PS_LIST_TAIL, "-set_ubercal_dist", 0, "define new ubercal dist", 0);
    128134    psMetadataAddStr(updaterelexpArgs,  PS_LIST_TAIL, "-set_path_base", 0,  "define path_base", NULL);
    129135    psMetadataAddS16(updaterelexpArgs,  PS_LIST_TAIL, "-set_fault", 0,      "define new fault", 0);
Note: See TracChangeset for help on using the changeset viewer.