IPP Software Navigation Tools IPP Links Communication Pan-STARRS Links

Ignore:
Timestamp:
Nov 8, 2011, 2:44:12 PM (15 years ago)
Author:
eugene
Message:

merge changes from trunk

Location:
branches/eam_branches/ipp-20110906
Files:
15 edited
9 copied

Legend:

Unmodified
Added
Removed

  • branches/eam_branches/ipp-20110906

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

    r32283 r32630  
    7676        chiptool_definecopy.sql \
    7777        chiptool_donecleanup.sql \
     78        chiptool_dropprocessedimfile_update.sql \
     79        chiptool_dropprocessedimfile_delete.sql \
    7880        chiptool_find_rawexp.sql \
    7981        chiptool_listrun.sql \
    … …  
    275277        magicdstool_definebyquery_warp_bg.sql \
    276278        magicdstool_definebyquery_diff.sql \
     279        magicdstool_definecopy_camera.sql \
    277280        magicdstool_definecopy_chip.sql \
    278281        magicdstool_definecopy_warp.sql \
    … …  
    424427        laptool_pendingexp.sql \
    425428        laptool_pendingrun.sql \
    426         laptool_stacks.sql
     429        laptool_WSdiff_check.sql \
     430        laptool_stacks.sql \
     431        vptool_find_rawexp.sql \
     432        vptool_pendingimfile.sql \
     433        vptool_pendingrun.sql \
     434        vptool_processedcell.sql \
     435        vptool_revertrun.sql
    427436

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

    r32352 r32630  
    1313    USING (chip_id)
    1414JOIN chipProcessedImfile
    15     USING (chip_id)
     15    USING (chip_id, exp_id)
    1616JOIN rawExp
    17   ON chipProcessedImfile.exp_id = rawExp.exp_id
     17    USING(exp_id)
     18JOIN rawImfile
     19    USING(exp_id, class_id, exp_time)
    1820LEFT JOIN camProcessedExp
    1921    USING(cam_id)
    … …  
    2224WHERE
    2325    camMask.label IS NULL
     26    AND rawImfile.ignored = 0

  • branches/eam_branches/ipp-20110906/ippTools/share/laptool_definerun.sql

    r31604 r32630  
    1 SELECT DISTINCT want.exp_id, have.chip_id, false as private, true as active, false as pairwise
     1SELECT DISTINCT
     2  want.exp_id,
     3  have.chip_id,
     4  COALESCE(have.private,false) as private,
     5  true as active,
     6  false as pairwise
    27  FROM
    38  (SELECT exp_id FROM rawExp
    … …  
    813  ) AS want
    914  LEFT JOIN
    10   (SELECT exp_id,MAX(chip_id) AS chip_id, chipRun.state
     15  (SELECT
     16     exp_id,
     17     MAX(chip_id) AS chip_id,
     18     chipRun.state,
     19     lapExp.private
    1120     FROM lapExp JOIN chipRun USING(exp_id,chip_id)
    12      where private IS FALSE
    13      AND chip_id IS NOT NULL
     21     JOIN lapRun USING(lap_id)
     22     where chip_id IS NOT NULL
    1423     AND
    15          (
     24-- This is the restriction to only draw from the current lapSequence
     25     @CHIPWHERE@
     26--       (
    1627          -- (active = TRUE) OR
    17           (chipRun.state = 'full') OR
    18           (chipRun.state = 'new')
     28          -- (chipRun.state = 'full') OR
     29          -- (chipRun.state = 'new')
    1930          -- when we can do updates, put that here.
    20           )
     31--        )
    2132     GROUP BY exp_id
    2233) AS have USING(exp_id)

  • branches/eam_branches/ipp-20110906/ippTools/share/laptool_pendingexp.sql

    r31435 r32630  
    33       lapRun.dist_group, lapRun.registered, lapRun.fault, lapRun.quick_sass_id, lapRun.final_sass_id,
    44       exp_id, chip_id, pair_id, private, pairwise, active, lapExp.data_state,
    5        dateobs, object, comment
     5       dateobs, object, comment,
     6       chipRun.state AS chip_state
    67  FROM lapRun JOIN lapExp USING(lap_id)
    78  JOIN rawExp USING(exp_id,filter)
     9  LEFT JOIN chipRun USING(exp_id,chip_id)
    810WHERE active IS TRUE AND lapRun.fault = 0
    911-- lap_id restriction here.

  • branches/eam_branches/ipp-20110906/ippTools/share/magicdstool_todestreak_camera.sql

    r30238 r32630  
    1414    stage_id,
    1515    'exposure' AS component,
     16    0 AS mismatched_tess,
    1617    CAST(NULL AS CHAR(255)) AS uri,
    1718    camProcessedExp.path_base,

  • branches/eam_branches/ipp-20110906/ippTools/share/magicdstool_todestreak_chip.sql

    r29561 r32630  
    1414    stage_id,
    1515    class_id AS component,
     16    0 AS mismatched_tess,
    1617    chipProcessedImfile.uri,
    1718    chipProcessedImfile.path_base,

  • branches/eam_branches/ipp-20110906/ippTools/share/magicdstool_todestreak_diff.sql

    r29561 r32630  
    1515    diffRun.magicked,
    1616    diffSkyfile.skycell_id AS component,
     17    0 AS mismatched_tess,
    1718    CAST(NULL AS CHAR(255)) AS uri,
    1819    diffSkyfile.path_base,
    … …  
    6364    diffRun.magicked,
    6465    diffSkyfile.skycell_id AS component,
     66    0 AS mismatched_tess,
    6567    CAST(NULL AS CHAR(255)) AS uri,
    6668    diffSkyfile.path_base,

  • branches/eam_branches/ipp-20110906/ippTools/share/magicdstool_todestreak_raw.sql

    r30809 r32630  
    1414    rawExp.magicked,
    1515    class_id as component,
     16    0 AS mismatched_tess,
    1617    rawImfile.uri AS uri,
    1718    -- XXX: replace this with rawImfile.path_base once it exists

  • branches/eam_branches/ipp-20110906/ippTools/share/magicdstool_todestreak_warp.sql

    r29561 r32630  
    1414    warpRun.magicked,
    1515    warpSkyfile.skycell_id as component,
     16    diffRun.tess_id != warpRun.tess_id AS mismatched_tess,
     17    diffRun.tess_id as diff_tess_id,
    1618    warpSkyfile.uri,
    1719    warpSkyfile.path_base,
    … …  
    2729JOIN magicMask USING (magic_id)
    2830JOIN magicRun USING (magic_id)
     31JOIN diffRun USING(diff_id)
    2932JOIN warpRun ON warp_id = stage_id
    3033JOIN warpSkyfile USING(warp_id)

  • branches/eam_branches/ipp-20110906/ippTools/share/pubtool_definerun.sql

    r32117 r32630  
    1515    JOIN diffRun
    1616    JOIN diffInputSkyfile USING(diff_id)
     17    JOIN diffSkyfile using(diff_id)
    1718    JOIN warpRun ON warpRun.warp_id = diffInputSkyfile.warp1 -- Only JOINing input, not reference!
    1819    JOIN fakeRun USING(fake_id)
    … …  
    3031              )
    3132           )
     33        AND diffSkyfile.quality = 0
    3234    -- WHERE hook %s
    3335    UNION

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

    r32352 r32630  
    554554    KEY(workdir_state),
    555555    KEY(label),
    556     KEY(data_group),
    557     INDEX(add_id, cam_id)
     556    KEY(data_group)
    558557) ENGINE=innodb DEFAULT CHARSET=latin1;
    559558
    … …  
    11571156        tess_id VARCHAR(64),
    11581157        diff_skyfile_id BIGINT AUTO_INCREMENT,
     1158        PRIMARY KEY(diff_skyfile_id),
    11591159        KEY(diff_id, skycell_id),
    1160         KEY(diff_skyfile_id),
    11611160        KEY(warp1),
    11621161        KEY(warp2),
    … …  
    19691968      dtime_verify FLOAT,
    19701969      dtime_merge FLOAT,
    1971       dtime_script,
    1972       epoch TIMESTAMP,
     1970      dtime_script FLOAT,
     1971      epoch timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
    19731972      mergedvodb_path VARCHAR(255) NOT NULL,
    19741973      fault SMALLINT NOT NULL,
    1975        KEY(minidvodb_id), CONSTRAINT UNIQUE(minidvodb_id), FOREIGN KEY(minidvodb_id) REFERENCES minidvodbRun (minidvodb_id)
     1974      UNIQUE KEY (minidvodb_id),
     1975      KEY(minidvodb_id),
     1976      FOREIGN KEY(minidvodb_id) REFERENCES minidvodbRun(minidvodb_id)
    19761977) ENGINE=innodb DEFAULT CHARSET=latin1;
    19771978
    … …  
    19901991    FOREIGN KEY(minidvodb_id) REFERENCES minidvodbRun(minidvodb_id)
    19911992) ENGINE=innodb DEFAULT CHARSET=latin1;
    1992 
    1993 
    1994 
     1993CREATE TABLE vpRun (
     1994    vp_id BIGINT AUTO_INCREMENT,
     1995    exp_id BIGINT,
     1996    state VARCHAR(64),
     1997    label VARCHAR(64),
     1998    data_group VARCHAR(64),
     1999    workdir VARCHAR(255),
     2000    note VARCHAR(255),
     2001    dest_id BIGINT,
     2002    outroot VARCHAR(255),
     2003    dtime_script FLOAT,
     2004    hostname VARCHAR(64),
     2005    fault SMALLINT NOT NULL DEFAULT 0,
     2006    PRIMARY KEY(vp_id),
     2007    KEY(exp_id),
     2008    KEY(state),
     2009    KEY(label),
     2010    KEY(data_group),
     2011    KEY(fault),
     2012    INDEX(vp_id, exp_id),
     2013    FOREIGN KEY(exp_id) REFERENCES rawExp(exp_id)
     2014) ENGINE=innodb DEFAULT CHARSET=latin1;
     2015
     2016CREATE TABLE vpProcessedCell (
     2017    vp_id BIGINT,
     2018    class_id VARCHAR(64),
     2019    cell_id VARCHAR(64),
     2020    dtime_photom FLOAT,
     2021    quality SMALLINT NOT NULL DEFAULT 0,
     2022    path_base VARCHAR(255),
     2023    fault SMALLINT NOT NULL DEFAULT 0,
     2024    KEY(quality),
     2025    KEY(fault),
     2026    FOREIGN KEY(vp_id) REFERENCES vpRun(vp_id)
     2027) ENGINE=innodb DEFAULT CHARSET=latin1;
    19952028
    19962029-- This comment line is here to avoid empty query error.

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

    r28486 r32630  
    9797DROP TABLE IF EXISTS diffPhotRun;
    9898DROP TABLE IF EXISTS diffPhotSkyfile;
     99DROP TABLE IF EXISTS lapExp;
     100DROP TABLE IF EXISTS lapRun;
     101DROP TABLE IF EXISTS lapSequence;
     102DROP TABLE IF EXISTS minidvodbRun;
     103DROP TABLE IF EXISTS minidvodbCopy;
     104DROP TABLE IF EXISTS minidvodbProcessed;
     105DROP TABLE IF EXISTS vpProcessedCell;
     106DROP TABLE IF EXISTS vpRun;
    99107
    100108SET FOREIGN_KEY_CHECKS=1

  • branches/eam_branches/ipp-20110906/ippTools/share/warptool_scmap.sql

    r30852 r32630  
    2929    ON chipRun.chip_id = chipProcessedImfile.chip_id
    3030    AND warpSkyCellMap.class_id = chipProcessedImfile.class_id
     31    AND chipProcessedImfile.quality = 0
    3132JOIN rawImfile
    3233    ON chipRun.exp_id = rawImfile.exp_id

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

    r30538 r32630  
    100100        AND warpSkyfile.fault = 0
    101101        AND camRun.state = 'full'
     102        AND chipProcessedImfile.quality = 0
     103        -- Maybe add this to solve the if any chip is bad a whole warp can't be updated problem?
     104        -- AND (chipProcessedImfile.fault = 0 OR chipProcessedImfile.fault = 26)
    102105        AND (Label.active OR Label.active IS NULL)
    103106        -- where hook 2 %s
Note: See TracChangeset for help on using the changeset viewer.