IPP Software Navigation Tools IPP Links Communication Pan-STARRS Links

Changeset 23737


Ignore:
Timestamp:
Apr 7, 2009, 4:19:58 PM (17 years ago)
Author:
bills
Message:

changes to make building distribution bundles for camera and fake stages work

Location:
trunk/ippTools/share
Files:
4 added
3 edited

Legend:

Unmodified
Added
Removed

  • trunk/ippTools/share/Makefile.am

    r23701 r23737  
    11dist_pkgdata_DATA = \
    22     camtool_donecleanup.sql \
     3     camtool_export_processed_exp.sql \
     4     camtool_export_run.sql \
    35     camtool_find_chip_id.sql \
    46     camtool_find_pendingexp.sql \
    … …  
    2123     chiptool_revertprocessedimfile.sql \
    2224     chiptool_run.sql \
    23      chiptool_export_run.sql \
    2425     chiptool_export_imfile.sql \
    2526     chiptool_export_processed_imfile.sql \
     27     chiptool_export_run.sql \
    2628     chiptool_unmasked.sql \
    2729     detselect_search.sql \
    … …  
    9698     faketool_completely_processed_exp.sql \
    9799     faketool_donecleanup.sql \
     100     faketool_export_processed_imfile.sql \
     101     faketool_export_run.sql \
    98102     faketool_find_camrun.sql \
    99103     faketool_find_pendingexp.sql \
    … …  
    179183     warptool_donecleanup.sql \
    180184     warptool_exp.sql \
     185     warptool_export_imfile.sql \
    181186     warptool_export_run.sql \
    182      warptool_export_imfile.sql \
    183187     warptool_export_skyfile.sql \
    184188     warptool_export_skycell_map.sql \

  • trunk/ippTools/share/disttool_pendingcomponent.sql

    r23722 r23737  
    8484    stage,
    8585    stage_id,
    86     chipProcessedImfile.class_id AS component,
     86    'exposure' AS component,
     87--    chipProcessedImfile.class_id AS component,
    8788    clean,
    8889    rawExp.camera,
    8990    outroot,
    9091    camProcessedExp.path_base,
    91     chipProcessedImfile.path_base as chip_path_base,
     92    NULL as chip_path_base,
    9293    camRun.state,
    9394    NULL,
    9495    camProcessedExp.quality,
    9596    distRun.no_magic,
    96     chipProcessedImfile.magicked
     97    chipRun.magicked
    9798FROM distRun
    9899JOIN camRun ON camRun.cam_id = distRun.stage_id
    99100JOIN camProcessedExp USING(cam_id)
    100101JOIN chipRun USING(chip_id)
    101 JOIN chipProcessedImfile USING(exp_id, chip_id)
    102 JOIN rawExp using(exp_id)
    103 LEFT JOIN distComponent
    104     ON distRun.dist_id = distComponent.dist_id
    105     AND chipProcessedImfile.class_id = distComponent.component
     102-- JOIN chipProcessedImfile USING(exp_id, chip_id)
     103JOIN rawExp using(exp_id)
     104LEFT JOIN distComponent
     105    ON distRun.dist_id = distComponent.dist_id
     106--    AND chipProcessedImfile.class_id = distComponent.component
    106107WHERE
    107108    distRun.state = 'new'

  • trunk/ippTools/share/disttool_toadvance.sql

    r23717 r23737  
    44    stage_id,
    55    outroot,
    6     label
     6    label,
     7    clean
    78FROM
    89    (
    … …  
    1314    stage_id,
    1415    outroot,
    15     label
     16    label,
     17    clean
    1618    FROM distRun
    1719    JOIN rawImfile ON stage_id = rawImfile.exp_id
    … …  
    3638    stage_id,
    3739    outroot,
    38     label
     40    label,
     41    clean
    3942    FROM distRun
    4043    JOIN chipProcessedImfile ON stage_id = chipProcessedImfile.chip_id
    … …  
    5356        AND SUM(distComponent.fault) = 0
    5457UNION
     58-- camera stage
     59SELECT distRun.dist_id,
     60    stage,
     61    stage_id,
     62    outroot,
     63    distRun.label,
     64    clean
     65    FROM distRun
     66    JOIN camRun ON stage_id = cam_id
     67    JOIN chipRun USING(chip_id)
     68    LEFT JOIN distComponent  USING(dist_id)
     69    WHERE
     70        distRun.state = 'new'
     71        AND distRun.fault = 0
     72        AND distComponent.fault = 0
     73        AND distRun.stage = 'camera'
     74--        AND ((chipRun.magicked AND camRun.state = 'full') OR distRun.no_magic)
     75--        AND (camRun.state = 'full' OR (distRun.clean and camRun.state = 'cleaned'))
     76UNION
     77-- fake stage
     78SELECT
     79    distRun.dist_id,
     80    stage,
     81    stage_id,
     82    outroot,
     83    label,
     84    clean
     85    FROM distRun
     86    JOIN fakeProcessedImfile ON stage_id = fakeProcessedImfile.fake_id
     87    LEFT JOIN distComponent
     88        ON distComponent.dist_id = distRun.dist_id
     89        AND distComponent.component = fakeProcessedImfile.class_id
     90    WHERE
     91        distRun.state = 'new'
     92        AND distRun.fault = 0
     93        AND distRun.stage = 'fake'
     94    GROUP BY
     95        dist_id,
     96        fakeProcessedImfile.fake_id
     97    HAVING
     98        COUNT(fakeProcessedImfile.class_id) = COUNT(distComponent.component)
     99        AND SUM(distComponent.fault) = 0
     100UNION
    55101-- warp stage
    56102SELECT
    … …  
    59105    stage_id,
    60106    outroot,
    61     label
     107    label,
     108    clean
    62109    FROM distRun
    63110    JOIN warpSkyfile on stage_id = warp_id
    … …  
    84131    stage_id,
    85132    outroot,
    86     label
     133    label,
     134    clean
    87135    FROM distRun
    88136    JOIN diffSkyfile
    … …  
    109157    stage_id,
    110158    outroot,
    111     label
     159    label,
     160    clean
    112161    FROM distRun
    113162    JOIN stackSumSkyfile on stage_id = stack_id
Note: See TracChangeset for help on using the changeset viewer.