IPP Software Navigation Tools IPP Links Communication Pan-STARRS Links

Changeset 25835 for trunk/ippTools/share


Ignore:
Timestamp:
Oct 14, 2009, 11:06:18 AM (17 years ago)
Author:
bills
Message:

Add data_group, dist_group, and note to the pipeline. These new columns will be used
for some of the tasks that label was used previously.

Location:
trunk/ippTools/share
Files:
22 edited

Legend:

Unmodified
Added
Removed

  • trunk/ippTools/share/addtool_queue_cam_id.sql

    r25816 r25835  
    88        '%s',           -- reduction
    99        '%s',           -- label
     10        '%s',           -- data_group
    1011        '%s',           -- dvodb
     12        '%s',           -- note
    1113        %d              -- image_only
    1214    FROM camRun

  • trunk/ippTools/share/camtool_queue_chip_id.sql

    r24681 r25835  
    99        '%s',           -- workdir_state
    1010        '%s',           -- label
     11        '%s',           -- data_group
     12        '%s',           -- dist_group
    1113        '%s',           -- reduction
    1214        '%s',           -- expgroup
    … …  
    1416        '%s',           -- tess_id
    1517        '%s',           -- end_stage
    16         0               -- magicked
     18        0,              -- magicked
     19        '%s'           -- note
    1720    FROM chipRun
    1821    WHERE

  • trunk/ippTools/share/chiptool_completely_processed_exp.sql

    r23688 r25835  
    77    workdir_state,
    88    label,
     9    data_group,
     10    dist_group,
    911    reduction,
    1012    expgroup,
    … …  
    1214    tess_id,
    1315    end_stage,
    14     all_files_magicked as magicked
     16    all_files_magicked as magicked,
     17    note
    1518FROM
    1619    (SELECT

  • trunk/ippTools/share/disttool_definebyquery_camera.sql

    r25513 r25835  
    44    rawExp.exp_name as run_tag,
    55    camRun.magicked,
    6     distTarget.label,
     6    camRun.label,
     7    distTarget.dist_group,
    78    distTarget.target_id,
    89    distTarget.clean
    … …  
    1213JOIN distTarget ON distTarget.stage = 'camera'
    1314    AND rawExp.filter = distTarget.filter
    14     AND camRun.label  = distTarget.label
     15    AND camRun.dist_group  = distTarget.dist_group
    1516JOIN rcInterest USING(target_id)
    1617LEFT JOIN distRun ON distRun.stage = 'camera'

  • trunk/ippTools/share/disttool_definebyquery_chip.sql

    r25513 r25835  
    55    rawExp.exp_name as run_tag,
    66    chipRun.label,
     7    chipRun.dist_group,
    78    distTarget.target_id,
    89    distTarget.clean
    … …  
    1011JOIN rawExp USING(exp_id)
    1112JOIN distTarget ON distTarget.stage = 'chip'
    12     AND chipRun.label = distTarget.label
     13    AND chipRun.dist_group = distTarget.dist_group
    1314    AND rawExp.filter = distTarget.filter
    1415JOIN rcInterest USING(target_id)

  • trunk/ippTools/share/disttool_definebyquery_diff.sql

    r25513 r25835  
    44    diffRun.magicked,
    55    rawExp.exp_name as run_tag,
    6     distTarget.label,
     6    diffRun.label,
     7    distTarget.dist_group,
    78    distTarget.target_id,
    89    distTarget.clean
    … …  
    1516JOIN rawExp USING(exp_id)
    1617JOIN distTarget ON distTarget.stage = 'diff'
    17     AND diffRun.label = distTarget.label
     18    AND diffRun.dist_group = distTarget.dist_group
    1819    AND distTarget.filter = rawExp.filter
    1920JOIN rcInterest USING(target_id)

  • trunk/ippTools/share/disttool_definebyquery_fake.sql

    r25542 r25835  
    44    CAST(0 AS SIGNED) AS magicked,
    55    rawExp.exp_name as run_tag,
    6     distTarget.label,
     6    fakeRun.label,
     7    distTarget.dist_group,
    78    distTarget.target_id,
    89    distTarget.clean
    … …  
    1112JOIN chipRun USING(chip_id)
    1213JOIN rawExp USING(exp_id)
    13 JOIN distTarget ON distTarget.stage = 'fake' AND fakeRun.label = distTarget.label
     14JOIN distTarget ON distTarget.stage = 'fake' AND fakeRun.dist_group = distTarget.dist_group
    1415    AND rawExp.filter = distTarget.filter
    1516JOIN rcInterest USING(target_id)

  • trunk/ippTools/share/disttool_definebyquery_raw.sql

    r25513 r25835  
    44    rawExp.exp_name AS run_tag,
    55    rawExp.magicked,
    6     distTarget.label,
     6    chipRun.label,
     7    distTarget.dist_group,
    78    distTarget.target_id,
    89    distTarget.clean
    910FROM rawExp
    1011JOIN chipRun USING(exp_id)
    11 JOIN distTarget ON distTarget.label = chipRun.label AND distTarget.stage = 'raw'
     12JOIN distTarget ON distTarget.dist_group = chipRun.dist_group AND distTarget.stage = 'raw'
    1213    AND rawExp.filter = distTarget.filter
    1314JOIN rcInterest USING(target_id)

  • trunk/ippTools/share/disttool_definebyquery_stack.sql

    r25542 r25835  
    55    -- run tag in the form 'stack.$skycell_id.$stack_id'
    66    CONCAT_WS('.', 'stack', stackRun.skycell_id, convert(stackRun.stack_id, CHAR)) as run_tag,
    7     distTarget.label,
     7    stackRun.label,
     8    distTarget.dist_group,
    89    distTarget.target_id,
    910    distTarget.clean
    … …  
    1112JOIN stackSumSkyfile USING(stack_id)
    1213JOIN distTarget ON distTarget.stage = 'stack'
    13     AND stackRun.label = distTarget.label
     14    AND stackRun.dist_group = distTarget.dist_group
    1415    AND stackRun.filter = distTarget.filter
    1516JOIN rcInterest USING(target_id)

  • trunk/ippTools/share/disttool_definebyquery_warp.sql

    r25513 r25835  
    44    warpRun.magicked,
    55    rawExp.exp_name as run_tag,
    6     distTarget.label,
     6    warpRun.label,
     7    distTarget.dist_group,
    78    distTarget.target_id,
    89    distTarget.clean
    … …  
    1314JOIN rawExp USING(exp_id)
    1415JOIN distTarget ON distTarget.stage = 'warp'
    15     AND warpRun.label = distTarget.label
     16    AND warpRun.dist_group = distTarget.dist_group
    1617    AND rawExp.filter = distTarget.filter
    1718JOIN rcInterest USING(target_id)

  • trunk/ippTools/share/disttool_defineinterest.sql

    r25493 r25835  
    11INSERT INTO rcInterest
    2     SELECT 0, dest_id, target_id, '@STATE@'
     2    SELECT 0, rcDestination.dest_id, distTarget.target_id, '@STATE@'
    33    FROM distTarget
    44        JOIN rcDestination

  • trunk/ippTools/share/disttool_pending_camera.sql

    r25429 r25835  
    22    distRun.dist_id,
    33    distRun.label,
     4    distTarget.dist_group,
    45    stage,
    56    stage_id,
    … …  
    1617    chipRun.magicked
    1718FROM distRun
     19JOIN distTarget USING(target_id, stage)
    1820JOIN camRun ON camRun.cam_id = distRun.stage_id
    1921JOIN camProcessedExp USING(cam_id)

  • trunk/ippTools/share/disttool_pending_chip.sql

    r25429 r25835  
    22    distRun.dist_id,
    33    distRun.label,
     4    distTarget.dist_group,
    45    stage,
    56    stage_id,
    … …  
    1617    chipProcessedImfile.magicked
    1718FROM distRun
     19JOIN distTarget USING(target_id, stage)
    1820JOIN chipRun ON chipRun.chip_id = distRun.stage_id
    1921JOIN rawExp using(exp_id)

  • trunk/ippTools/share/disttool_pending_diff.sql

    r25429 r25835  
    22    distRun.dist_id,
    33    distRun.label,
     4    distTarget.dist_group,
    45    stage,
    56    stage_id,
    … …  
    1819    diffSkyfile.magicked
    1920FROM distRun
     21JOIN distTarget USING(target_id, stage)
    2022JOIN diffRun ON stage_id = diff_id
    2123JOIN diffSkyfile using(diff_id)

  • trunk/ippTools/share/disttool_pending_fake.sql

    r25429 r25835  
    22    distRun.dist_id,
    33    distRun.label,
     4    distTarget.dist_group,
    45    stage,
    56    stage_id,
    … …  
    1617    0
    1718FROM distRun
     19JOIN distTarget USING(target_id, stage)
    1820JOIN fakeRun ON fakeRun.fake_id = distRun.stage_id
    1921JOIN fakeProcessedImfile USING(fake_id)

  • trunk/ippTools/share/disttool_pending_raw.sql

    r25429 r25835  
    22    distRun.dist_id,
    33    distRun.label,
     4    distTarget.dist_group,
    45    stage,
    56    stage_id,
    … …  
    1617    rawImfile.magicked
    1718FROM distRun
     19JOIN distTarget USING(target_id, stage)
    1820JOIN rawExp ON rawExp.exp_id = stage_id
    1921JOIN rawImfile USING(exp_id)
    … …  
    3537    distRun.dist_id,
    3638    distRun.label,
     39    distTarget.dist_group,
    3740    stage,
    3841    stage_id,
    … …  
    4952    rawExp.magicked
    5053FROM distRun
     54JOIN distTarget USING(target_id, stage)
    5155JOIN rawExp ON exp_id = stage_id
    5256LEFT JOIN distComponent

  • trunk/ippTools/share/disttool_pending_stack.sql

    r25429 r25835  
    22    distRun.dist_id,
    33    distRun.label,
     4    distTarget.dist_group,
    45    stage,
    56    stage_id,
    … …  
    1819    0 AS magicked
    1920FROM distRun
     21JOIN distTarget USING(target_id, stage)
    2022JOIN stackRun
    2123    ON stage_id = stack_id

  • trunk/ippTools/share/disttool_pending_warp.sql

    r25429 r25835  
    22    distRun.dist_id,
    33    distRun.label,
     4    distTarget.dist_group,
    45    stage,
    56    stage_id,
    … …  
    1617    warpSkyfile.magicked
    1718FROM distRun
     19JOIN distTarget USING(target_id, stage)
    1820JOIN warpRun ON stage_id = warp_id
    1921JOIN warpSkyfile using(warp_id)

  • trunk/ippTools/share/disttool_pendingfileset.sql

    r25674 r25835  
    44    distRun.stage,
    55    stage_id,
    6     distTarget.label,
     6    distTarget.dist_group,
    77    distTarget.filter,
    88    CONCAT_WS('.', distRun.outroot, CONVERT(distRun.dist_id, CHAR)) as dist_dir,

  • trunk/ippTools/share/faketool_completely_processed_exp.sql

    r20608 r25835  
    66    workdir,
    77    label,
     8    data_group,
     9    dist_group,
    810    reduction,
    911    expgroup,
    … …  
    1113    tess_id,
    1214    end_stage,
    13     epoch
     15    epoch,
     16    note
    1417FROM
    1518    (SELECT

  • trunk/ippTools/share/faketool_queue_cam_id.sql

    r19092 r25835  
    66        '%s',           -- workdir
    77        '%s',           -- label
     8        '%s',           -- data_group
     9        '%s',           -- dist_group
    810        '%s',           -- reduction
    911        '%s',           -- expgroup
    … …  
    1113        '%s',           -- tess_id
    1214        '%s',           -- end_stage
    13         NULL            -- epoch
     15        NULL,           -- epoch
     16        '%s'            -- note
    1417    FROM camRun
    1518    WHERE

  • trunk/ippTools/share/pxadmin_create_tables.sql

    r25816 r25835  
    261261    workdir_state VARCHAR(64),
    262262    label VARCHAR(64),
     263    data_group VARCHAR(64),
     264    dist_group VARCHAR(64),
    263265    reduction VARCHAR(64),
    264      expgroup VARCHAR(64),
     266    expgroup VARCHAR(64),
    265267    dvodb VARCHAR(255),
    266268    tess_id VARCHAR(64),
    267269    end_stage VARCHAR(64),
    268270    magicked BIGINT,
     271    note VARCHAR(255),
    269272    PRIMARY KEY(chip_id),
    270273    KEY(chip_id), KEY(exp_id),
    … …  
    272275    KEY(workdir_state),
    273276    KEY(label),
     277    KEY(data_group),
     278    KEY(dist_group),
    274279    KEY(expgroup),
    275280    KEY(end_stage),
    … …  
    367372    workdir_state VARCHAR(64),
    368373    label VARCHAR(64),
     374    data_group VARCHAR(64),
     375    dist_group VARCHAR(64),
    369376    reduction VARCHAR(64),
    370377    expgroup VARCHAR(64),
    … …  
    373380    end_stage VARCHAR(64),
    374381    magicked BIGINT,
     382    note VARCHAR(255),
    375383    PRIMARY KEY(cam_id),
    376384    KEY(cam_id),
    … …  
    379387    KEY(workdir_state),
    380388    KEY(label),
     389    KEY(data_group),
     390    KEY(dist_group),
    381391    KEY(expgroup),
    382392    KEY(end_stage),
    … …  
    466476    reduction VARCHAR(64),
    467477    label VARCHAR(64),
     478    data_group VARCHAR(64),
    468479    dvodb VARCHAR(255),
     480    note  VARCHAR(255),
    469481    image_only TINYINT,
    470482    PRIMARY KEY(add_id),
    … …  
    474486    KEY(workdir_state),
    475487    KEY(label),
     488    KEY(data_group),
    476489    INDEX(add_id, cam_id),
    477490    FOREIGN KEY(cam_id) REFERENCES camRun(cam_id)
    … …  
    498511    workdir VARCHAR(255),
    499512    label VARCHAR(64),
     513    data_group VARCHAR(64),
     514    dist_group VARCHAR(64),
    500515    reduction VARCHAR(64),
    501516    expgroup VARCHAR(64),
    … …  
    504519    end_stage VARCHAR(64),
    505520    epoch TIMESTAMP DEFAULT CURRENT_TIMESTAMP,
     521    note VARCHAR(255),
    506522    PRIMARY KEY(fake_id),
    507523    KEY(cam_id),
    508524    KEY(state),
    509525    KEY(label),
     526    KEY(data_group),
     527    KEY(dist_group),
    510528    KEY(expgroup),
    511529    KEY(end_stage),
    … …  
    834852    workdir_state VARCHAR(64),
    835853    label VARCHAR(64),
     854    data_group VARCHAR(64),
     855    dist_group VARCHAR(64),
    836856    dvodb VARCHAR(255),
    837857    tess_id VARCHAR(64),
    … …  
    840860    registered DATETIME,
    841861    magicked BIGINT,
     862    note VARCHAR(255),
    842863    PRIMARY KEY(warp_id),
    843864    KEY(warp_id),
    … …  
    847868    KEY(workdir_state),
    848869    KEY(label),
     870    KEY(data_group),
     871    KEY(dist_group),
    849872    KEY(end_stage),
    850873    INDEX(warp_id, fake_id),
    … …  
    910933        workdir VARCHAR(255),
    911934        label VARCHAR(64),
     935        data_group VARCHAR(64),
     936        dist_group VARCHAR(64),
    912937        reduction VARCHAR(64),
    913938        dvodb VARCHAR(255),
    … …  
    916941        tess_id VARCHAR(64),
    917942        filter VARCHAR(64),
     943        note VARCHAR(255),
    918944        PRIMARY KEY(stack_id),
    919945        KEY(stack_id),
    … …  
    921947        KEY(skycell_id),
    922948        KEY(tess_id),
    923         KEY(label)
     949        KEY(label),
     950        KEY(data_group),
     951        KEY(dist_group)
    924952) ENGINE=innodb DEFAULT CHARSET=latin1;
    925953
    … …  
    9731001        workdir VARCHAR(255),
    9741002        label VARCHAR(64),
     1003        data_group VARCHAR(64),
     1004        dist_group VARCHAR(64),
    9751005        reduction VARCHAR(64),
    9761006        dvodb VARCHAR(255),
    … …  
    9801010        exposure TINYINT DEFAULT 0,
    9811011        magicked BIGINT,
     1012        note VARCHAR(255),
    9821013        PRIMARY KEY(diff_id),
    9831014        KEY(diff_id),
    9841015        KEY(state),
    9851016        KEY(tess_id),
    986         KEY(label)
     1017        KEY(label),
     1018        KEY(data_group),
     1019        KEY(dist_group)
    9871020) ENGINE=innodb DEFAULT CHARSET=latin1;
    9881021
    … …  
    10551088        workdir_state VARCHAR(255),
    10561089        label VARCHAR(64),
     1090        data_group VARCHAR(64),
    10571091        dvodb VARCHAR(255),
    10581092        registered DATETIME,
    10591093        fault SMALLINT,
     1094        note VARCHAR(255),
    10601095        PRIMARY KEY(magic_id),
    10611096        KEY(magic_id),
    … …  
    10631098        KEY(workdir_state),
    10641099        KEY(label),
     1100        KEY(data_group),
    10651101        KEY(fault),
    10661102        FOREIGN KEY(exp_id)  REFERENCES rawExp(exp_id),
    … …  
    11181154        cam_id BIGINT,
    11191155        label VARCHAR(64),
     1156        data_group VARCHAR(64),
    11201157        outroot VARCHAR(255),
    11211158        recoveryroot VARCHAR(255),
    11221159        re_place TINYINT,
    11231160        remove TINYINT,
     1161        fault SMALLINT,
     1162        note VARCHAR(255),
    11241163        PRIMARY KEY(magic_ds_id),
    11251164        KEY(magic_ds_id),
    … …  
    11271166        KEY(magic_id),
    11281167        KEY(label),
     1168        KEY(fault),
    11291169        FOREIGN KEY(magic_id) REFERENCES magicRun(magic_id),
    11301170        FOREIGN KEY(inv_magic_id) REFERENCES magicRun(magic_id)
    … …  
    13031343    time_stamp  TIMESTAMP DEFAULT CURRENT_TIMESTAMP,
    13041344    fault       SMALLINT,
     1345    note        VARCHAR(255),
    13051346    PRIMARY KEY(dist_id),
    13061347    KEY(state),
Note: See TracChangeset for help on using the changeset viewer.