IPP Software Navigation Tools IPP Links Communication Pan-STARRS Links

Changeset 23777 for trunk/ippTools


Ignore:
Timestamp:
Apr 9, 2009, 1:56:50 PM (17 years ago)
Author:
bills
Message:

change disttool -pendingcomponent to output "$outroot.$dist_id" as outdir to help make it unique
allow 'clean' raw stage distributions. (Database information only.) This is required to
support mirrors with chip stage and beyond images but not raw data

Location:
trunk/ippTools
Files:
3 edited

Legend:

Unmodified
Added
Removed

  • trunk/ippTools/share/disttool_pendingcomponent.sql

    r23737 r23777  
    11SELECT * FROM (
     2    -- raw stage
    23SELECT
    34    distRun.dist_id,
    … …  
    89    clean,
    910    rawExp.camera,
    10     outroot,
     11    CONCAT_WS('.', outroot, CONVERT(distRun.dist_id, CHAR)) as outdir,
    1112    rawImfile.uri as path_base,         -- change this once rawImfile has path_base
    1213    chipProcessedImfile.path_base as chip_path_base,
    … …  
    4142WHERE
    4243    distRun.state = 'new'
     44    AND distRun.clean = 0
    4345    AND distRun.stage = 'raw'
    4446    AND distComponent.dist_id IS NULL
    4547    AND (rawExp.magicked OR distRun.no_magic)
    4648    -- where hook 1 %s
     49UNION
     50    -- raw stage clean (dbinfo only)
     51SELECT
     52    distRun.dist_id,
     53    distRun.label,
     54    stage,
     55    stage_id,
     56    'exposure' AS component,
     57    clean,
     58    rawExp.camera,
     59    CONCAT_WS('.', outroot, CONVERT(distRun.dist_id, CHAR)) as outdir,
     60    NULL,
     61    NULL,
     62    NULL as state,
     63    NULL as data_state,
     64    0 as quality,
     65    distRun.no_magic,
     66    rawExp.magicked
     67FROM distRun
     68JOIN rawExp ON exp_id = stage_id
     69LEFT JOIN distComponent
     70    ON distRun.dist_id = distComponent.dist_id
     71WHERE
     72    distRun.state = 'new'
     73    AND distRun.stage = 'raw'
     74    AND distRun.clean
     75    AND distComponent.dist_id IS NULL
     76    -- where hook 2 %s
    4777
    4878-- chip stage
    … …  
    5686    clean,
    5787    rawExp.camera,
    58     outroot,
     88    CONCAT_WS('.', outroot, CONVERT(distRun.dist_id, CHAR)) as outdir,
    5989    chipProcessedImfile.path_base,
    6090    chipProcessedImfile.path_base as chip_path_base,
    … …  
    77107    AND (distRun.clean OR chipRun.magicked OR distRun.no_magic)
    78108    AND (chipRun.state = 'full' OR (distRun.clean AND chipRun.state = 'cleaned'))
    79     -- where hook 2 %s
     109    -- where hook 3 %s
    80110UNION
    81111SELECT
    … …  
    88118    clean,
    89119    rawExp.camera,
    90     outroot,
     120    CONCAT_WS('.', outroot, CONVERT(distRun.dist_id, CHAR)) as outdir,
    91121    camProcessedExp.path_base,
    92122    NULL as chip_path_base,
    … …  
    111141    AND (distRun.clean OR chipRun.magicked OR distRun.no_magic)
    112142    AND (camRun.state = 'full' OR (distRun.clean AND camRun.state = 'cleaned'))
    113     -- where hook 3 %s
     143    -- where hook 4 %s
    114144UNION
    115145SELECT
    … …  
    121151    clean,
    122152    rawExp.camera,
    123     outroot,
     153    CONCAT_WS('.', outroot, CONVERT(distRun.dist_id, CHAR)) as outdir,
    124154    fakeProcessedImfile.path_base,
    125155    NULL,
    … …  
    142172    AND distRun.stage = 'fake'
    143173    AND distComponent.dist_id IS NULL
    144     -- where hook 4 %s
     174    -- where hook 5 %s
    145175UNION
    146176SELECT
    … …  
    152182    clean,
    153183    rawExp.camera,
    154     outroot,
     184    CONCAT_WS('.', outroot, CONVERT(distRun.dist_id, CHAR)) as outdir,
    155185    warpSkyfile.path_base,
    156186    NULL as chip_path_base,
    … …  
    176206    AND (distRun.clean OR warpRun.magicked OR distRun.no_magic)
    177207    AND (warpRun.state = 'full' OR (distRun.clean AND warpRun.state = 'cleaned'))
    178     -- where hook 5 %s
     208    -- where hook 6 %s
    179209UNION
    180210SELECT
    … …  
    186216    clean,
    187217    rawExp.camera,
    188     outroot,
     218    CONCAT_WS('.', outroot, CONVERT(distRun.dist_id, CHAR)) as outdir,
    189219    diffSkyfile.path_base,
    190220    NULL as chip_path_base,
    … …  
    209239    AND (distRun.clean OR diffRun.magicked OR distRun.no_magic)
    210240    AND (diffRun.state = 'full' OR (distRun.clean AND diffRun.state = 'cleaned'))
    211     -- where hook 6 %s
     241    -- where hook 7 %s
    212242UNION
    213243SELECT DISTINCT
    … …  
    219249    clean,
    220250    rawExp.camera,
    221     outroot,
     251    CONCAT_WS('.', outroot, CONVERT(distRun.dist_id, CHAR)) as outdir,
    222252    stackSumSkyfile.path_base,
    223253    NULL as chip_path_base,
    … …  
    258288    AND distComponent.dist_id IS NULL
    259289    AND (stackRun.state = 'full' OR (distRun.clean AND stackRun.state = 'cleaned'))
    260     -- where hook 7 %s
     290    -- where hook 8 %s
    261291) as Foo

  • trunk/ippTools/share/disttool_toadvance.sql

    r23742 r23777  
    33    stage,
    44    stage_id,
    5     outroot,
     5    CONCAT_WS('.', outroot, CONVERT(dist_id, CHAR)) as outdir,
    66    label,
    77    clean
    88FROM
    99    (
    10 -- raw stage
     10-- raw stage not clean
    1111SELECT
    1212    distRun.dist_id,
    … …  
    2323    WHERE
    2424        distRun.state = 'new'
     25        AND distRun.clean = 0
    2526        AND distRun.fault = 0
    2627        AND distRun.stage = 'raw'
    … …  
    3132        COUNT(rawImfile.class_id) = COUNT(distComponent.component)
    3233        AND SUM(distComponent.fault) = 0
     34UNION
     35-- clean distribution of raw files (dbinfo only) only 1 component
     36SELECT
     37    distRun.dist_id,
     38    stage,
     39    stage_id,
     40    outroot,
     41    label,
     42    clean
     43    FROM distRun
     44    LEFT JOIN distComponent
     45        ON distRun.dist_id = distComponent.dist_id
     46    WHERE
     47        distRun.state = 'new'
     48        AND distRun.clean
     49        AND distRun.fault = 0
     50        AND distRun.stage = 'raw'
     51        AND distComponent.component IS NOT NULL
     52        AND distComponent.fault = 0
    3353UNION
    3454-- chip stage

  • trunk/ippTools/src/disttool.c

    r23765 r23777  
    564564    // will get blocked by pending earlier stages
    565565    psString    raw_where = "";
     566    psString    raw_clean_where = "";
    566567    psString    chip_where = "";
    567568    psString    camera_where = "";
    … …  
    574575            query,
    575576            raw_where,
     577            raw_clean_where,
    576578            chip_where,
    577579            camera_where,
Note: See TracChangeset for help on using the changeset viewer.