IPP Software Navigation Tools IPP Links Communication Pan-STARRS Links

Changeset 24725 for trunk/ippTools/share


Ignore:
Timestamp:
Jul 8, 2009, 6:16:07 PM (17 years ago)
Author:
bills
Message:

change distTarget.obs_mode to distTarget.label add filter require that
label, filter, stage, cleaned be unique

Location:
trunk/ippTools/share
Files:
8 edited

Legend:

Unmodified
Added
Removed

  • trunk/ippTools/share/disttool_definebyquery_camera.sql

    r24008 r24725  
    33    camRun.cam_id as stage_id,
    44    rawExp.exp_name as run_tag,
    5     rawExp.obs_mode,
     5    distTarget.label,
    66    distTarget.target_id,
    77    distTarget.clean
    … …  
    1010JOIN rawExp USING(exp_id)
    1111JOIN distTarget ON distTarget.stage = 'camera'
    12     AND rawExp.obs_mode = distTarget.obs_mode
     12    AND rawExp.filter = distTarget.filter
     13    AND camRun.label  = distTarget.label
    1314JOIN rcInterest USING(target_id)
    1415LEFT JOIN distRun ON distRun.stage = 'camera'

  • trunk/ippTools/share/disttool_definebyquery_chip.sql

    r24167 r24725  
    33    chipRun.chip_id as stage_id,
    44    rawExp.exp_name as run_tag,
    5     rawExp.obs_mode,
     5    chipRun.label,
    66    distTarget.target_id,
    77    distTarget.clean
    … …  
    99JOIN rawExp USING(exp_id)
    1010JOIN distTarget ON distTarget.stage = 'chip'
    11     AND rawExp.obs_mode = distTarget.obs_mode
     11    AND chipRun.label = distTarget.label
     12    AND rawExp.filter = distTarget.filter
    1213JOIN rcInterest USING(target_id)
    1314LEFT JOIN distRun ON distRun.stage = 'chip'

  • trunk/ippTools/share/disttool_definebyquery_diff.sql

    r24194 r24725  
    33    diffRun.diff_id AS stage_id,
    44    rawExp.exp_name as run_tag,
    5     rawExp.obs_mode,
     5    distTarget.label,
    66    distTarget.target_id,
    77    distTarget.clean
    … …  
    1313JOIN chipRun USING(chip_id)
    1414JOIN rawExp USING(exp_id)
    15 JOIN distTarget ON distTarget.stage = 'diff' AND rawExp.obs_mode = distTarget.obs_mode
     15JOIN distTarget ON distTarget.stage = 'diff'
     16    AND diffRun.label = distTarget.label
     17    AND distTarget.filter = rawExp.filter
    1618JOIN rcInterest USING(target_id)
    1719LEFT JOIN distRun ON distRun.stage = 'diff' AND (distRun.stage_id = diff_id)

  • trunk/ippTools/share/disttool_definebyquery_fake.sql

    r24008 r24725  
    33    fakeRun.fake_id AS stage_id,
    44    rawExp.exp_name as run_tag,
    5     rawExp.obs_mode,
     5    distTarget.label,
    66    distTarget.target_id,
    77    distTarget.clean
    88FROM fakeRun
    9 JOIN camRun USING(cam_id) -- ON fakeRun.cam_id = camRun.cam_id
     9JOIN camRun USING(cam_id)
    1010JOIN chipRun USING(chip_id)
    1111JOIN rawExp USING(exp_id)
    12 JOIN distTarget ON distTarget.stage = 'fake' AND rawExp.obs_mode = distTarget.obs_mode
     12JOIN distTarget ON distTarget.stage = 'fake' AND fakeRun.label = distTarget.label
     13    AND rawExp.filter = distTarget.filter
    1314JOIN rcInterest USING(target_id)
    1415LEFT JOIN distRun ON distRun.stage = 'fake' AND (distRun.stage_id = fake_id)

  • trunk/ippTools/share/disttool_definebyquery_raw.sql

    r24008 r24725  
    33    rawExp.exp_id AS stage_id,
    44    rawExp.exp_name AS run_tag,
    5     rawExp.obs_mode,
     5    distTarget.label,
    66    distTarget.target_id,
    77    distTarget.clean
    88FROM rawExp
    99JOIN chipRun USING(exp_id)
    10 JOIN distTarget ON distTarget.obs_mode = rawExp.obs_mode AND distTarget.stage = 'raw'
     10JOIN distTarget ON distTarget.label = chipRun.label AND distTarget.stage = 'raw'
     11    AND rawExp.filter = distTarget.filter
    1112JOIN rcInterest USING(target_id)
    1213LEFT JOIN distRun ON distRun.stage = 'raw' AND distRun.stage_id = exp_id

  • trunk/ippTools/share/disttool_definebyquery_stack.sql

    r24008 r24725  
    44    -- run tag in the form 'stack.$skycell_id.$stack_id'
    55    CONCAT_WS('.', 'stack', stackRun.skycell_id, convert(stackRun.stack_id, CHAR)) as run_tag,
    6     rawExp.obs_mode,
     6    distTarget.label,
    77    distTarget.target_id,
    88    distTarget.clean
    99FROM stackRun
    10 JOIN stackInputSkyfile using(stack_id)
    11 JOIN warpRun USING(warp_id)
    12 JOIN fakeRun USING(fake_id)
    13 JOIN camRun USING(cam_id)
    14 JOIN chipRun USING(chip_id)
    15 JOIN rawExp USING(exp_id)
    16 JOIN distTarget ON distTarget.stage = 'stack' AND rawExp.obs_mode = distTarget.obs_mode
     10JOIN distTarget ON distTarget.stage = 'stack'
     11    AND stackRun.label = distTarget.label
     12    AND stackRun.filter = distTarget.filter
    1713JOIN rcInterest USING(target_id)
    1814LEFT JOIN distRun ON distRun.stage = 'stack' AND (distRun.stage_id = stack_id)

  • trunk/ippTools/share/disttool_definebyquery_warp.sql

    r24008 r24725  
    33    warpRun.warp_id AS stage_id,
    44    rawExp.exp_name as run_tag,
    5     rawExp.obs_mode,
     5    distTarget.label,
    66    distTarget.target_id,
    77    distTarget.clean
    … …  
    1111JOIN chipRun USING(chip_id)
    1212JOIN rawExp USING(exp_id)
    13 JOIN distTarget ON distTarget.stage = 'warp' AND rawExp.obs_mode = distTarget.obs_mode
     13JOIN distTarget ON distTarget.stage = 'warp'
     14    AND warpRun.label = distTarget.label
     15    AND rawExp.filter = distTarget.filter
    1416JOIN rcInterest USING(target_id)
    1517LEFT JOIN distRun ON distRun.stage = 'warp' AND (distRun.stage_id = warp_id)

  • trunk/ippTools/share/pxadmin_create_tables.sql

    r24681 r24725  
    12141214CREATE TABLE distTarget (
    12151215    target_id   BIGINT AUTO_INCREMENT,
    1216     obs_mode    VARCHAR(64),
     1216    label       VARCHAR(64),
     1217    filter      VARCHAR(64),
    12171218    stage       VARCHAR(64),
    12181219    clean       TINYINT,
    … …  
    12201221    comment     VARCHAR(255),
    12211222    PRIMARY KEY(target_id)
     1223    CONSTRAINT UNIQUE (label, filter, stage, clean),
    12221224)  ENGINE=innodb DEFAULT CHARSET=latin1;
    12231225
Note: See TracChangeset for help on using the changeset viewer.