IPP Software Navigation Tools IPP Links Communication Pan-STARRS Links

Changeset 25324 for trunk/ippTools/share


Ignore:
Timestamp:
Sep 10, 2009, 12:52:50 PM (17 years ago)
Author:
watersc1
Message:

Fixes things that I thought were merged, but then discovered hadn't been. This includes the changes for cleanup, astrometry, and burntool.

Location:
trunk
Files:
14 edited
9 copied

Legend:

Unmodified
Added
Removed

  • trunk

  • trunk/ippTools/share/Makefile.am

    r25299 r25324  
    4747     dettool_normalizedstat.sql \
    4848     dettool_pending.sql \
     49     dettool_pendingcleanup_detrunsummary.sql \
    4950     dettool_pendingcleanup_normalizedexp.sql \
    5051     dettool_pendingcleanup_normalizedimfile.sql \

  • trunk/ippTools/share/camtool_pendingcleanupexp.sql

    r19528 r25324  
    1313    USING(cam_id)
    1414WHERE
    15     (camRun.state = 'goto_cleaned' OR camRun.state = 'goto_purged')
     15    (camRun.state = 'goto_cleaned' OR camRun.state = 'goto_purged' OR camRun.state = 'goto_scrubbed')
    1616

  • trunk/ippTools/share/camtool_pendingcleanuprun.sql

    r19528 r25324  
    99USING (exp_id)
    1010WHERE
    11     (camRun.state = 'goto_cleaned' OR camRun.state = 'goto_purged')
     11    (camRun.state = 'goto_cleaned' OR camRun.state = 'goto_purged' OR camRun.state = 'goto_scrubbed')

  • trunk/ippTools/share/dettool_pendingcleanup_normalizedexp.sql

    r19092 r25324  
    11SELECT
    22    detNormalizedExp.*,
    3     detRunSummary.data_state
     3    rawExp.camera   
    44FROM detRunSummary
    55JOIN detNormalizedExp
    66    USING(det_id,iteration)
     7JOIN detInputExp
     8     USING(det_id,iteration)
     9JOIN rawExp
     10     USING(exp_id)
    711WHERE
    8     detRunSummary.data_state = 'goto_cleaned'
    9 AND detNormalizedExp.data_state = 'full'
     12    ((detRunSummary.data_state = 'goto_cleaned'
     13      AND detNormalizedExp.data_state = 'full')
     14     OR (detRunSummary.data_state = 'goto_scrubbed'
     15      AND detNormalizedExp.data_state = 'full')
     16     OR (detRunSummary.data_state = 'goto_purged'
     17      AND detNormalizedExp.data_state = 'full')
     18     OR detNormalizedExp.data_state = 'goto_cleaned'
     19     OR detNormalizedExp.data_state = 'goto_scrubbed'
     20     OR detNormalizedExp.data_state = 'goto_purged')
     21

  • trunk/ippTools/share/dettool_pendingcleanup_normalizedimfile.sql

    r25299 r25324  
    11SELECT DISTINCT
    22    detNormalizedImfile.*,
    3     detRunSummary.data_state
     3    rawExp.camera
    44FROM detRunSummary
    55JOIN detNormalizedImfile
    66    USING(det_id,iteration)
     7JOIN detInputExp
     8     USING(det_id,iteration)
     9JOIN rawExp
     10     USING(exp_id)
    711WHERE
    8     detRunSummary.data_state = 'goto_cleaned'
    9 AND detNormalizedImfile.data_state = 'full'
     12    ((detRunSummary.data_state = 'goto_cleaned'
     13      AND detNormalizedImfile.data_state = 'full')
     14     OR (detRunSummary.data_state = 'goto_scrubbed'
     15      AND detNormalizedImfile.data_state = 'full')
     16     OR (detRunSummary.data_state = 'goto_purged'
     17      AND detNormalizedImfile.data_state = 'full')
     18     OR detNormalizedImfile.data_state = 'goto_cleaned'
     19     OR detNormalizedImfile.data_state = 'goto_scrubbed'
     20     OR detNormalizedImfile.data_state = 'goto_purged')
     21

  • trunk/ippTools/share/dettool_pendingcleanup_normalizedstat.sql

    r19092 r25324  
    1 SELECT
     1SELECT DISTINCT
    22    detNormalizedStatImfile.*,
    3     detRunSummary.data_state
     3    rawExp.camera
    44FROM detRunSummary
    55JOIN detNormalizedStatImfile
    66    USING(det_id,iteration)
     7JOIN detInputExp
     8     USING(det_id,iteration)
     9JOIN rawExp
     10     USING(exp_id)
    711WHERE
    8     detRunSummary.data_state = 'goto_cleaned'
    9 AND detNormalizedStatImfile.data_state = 'full'
     12    ((detRunSummary.data_state = 'goto_cleaned'
     13      AND detNormalizedStatImfile.data_state = 'full')
     14     OR (detRunSummary.data_state = 'goto_scrubbed'
     15      AND detNormalizedStatImfile.data_state = 'full')
     16     OR (detRunSummary.data_state = 'goto_purged'
     17      AND detNormalizedStatImfile.data_state = 'full')
     18     OR detNormalizedStatImfile.data_state = 'goto_cleaned'
     19     OR detNormalizedStatImfile.data_state = 'goto_scrubbed'
     20     OR detNormalizedStatImfile.data_state = 'goto_purged')
     21

  • trunk/ippTools/share/dettool_pendingcleanup_processedexp.sql

    r19092 r25324  
    22SELECT
    33    detProcessedExp.*,
    4     detRunSummary.data_state
     4    rawExp.camera
    55FROM detRunSummary
    66JOIN detProcessedExp
    77    USING(det_id)
     8JOIN rawExp
     9     USING(exp_id)
    810WHERE
    9     detRunSummary.data_state = 'goto_cleaned'
    10 AND detProcessedExp.data_state = 'full'
     11    ((detRunSummary.data_state = 'goto_cleaned'
     12      AND detProcessedExp.data_state = 'full')
     13     OR (detRunSummary.data_state = 'goto_scrubbed'
     14         AND detProcessedExp.data_state = 'full')
     15     OR (detRunSummary.data_state = 'goto_purged'
     16         AND detProcessedExp.data_state = 'full')
     17     OR detProcessedExp.data_state = 'goto_cleaned'
     18     OR detProcessedExp.data_state = 'goto_scrubbed'
     19     OR detProcessedExp.data_state = 'goto_purged')

  • trunk/ippTools/share/dettool_pendingcleanup_processedimfile.sql

    r19092 r25324  
    1 -- need to restrict to a single detRunSummary (require all to say 'cleaned'?)
    21SELECT
    32    detProcessedImfile.*,
    4     detRunSummary.data_state
     3    rawExp.camera
    54FROM detRunSummary
    65JOIN detProcessedImfile
    76    USING(det_id)
     7JOIN detInputExp
     8     USING(det_id,iteration,exp_id)
     9JOIN rawExp
     10     USING(exp_id)
    811WHERE
    9     detRunSummary.data_state = 'goto_cleaned'
    10 AND detProcessedImfile.data_state = 'full'
     12     (detProcessedImfile.data_state = 'goto_cleaned'
     13     OR detProcessedImfile.data_state = 'goto_scrubbed'
     14     OR detProcessedImfile.data_state = 'goto_purged')
     15

  • trunk/ippTools/share/dettool_pendingcleanup_residexp.sql

    r19092 r25324  
    11SELECT
    22    detResidExp.*,
    3     detRunSummary.data_state
     3    rawExp.camera
    44FROM detRunSummary
    55JOIN detResidExp
    66    USING(det_id,iteration)
     7JOIN detInputExp
     8     USING(det_id,iteration,exp_id)
     9JOIN rawExp
     10    USING(exp_id)
    711WHERE
    8     detRunSummary.data_state = 'goto_cleaned'
    9 AND detResidExp.data_state = 'full'
     12    ((detRunSummary.data_state = 'goto_cleaned'
     13      AND detResidExp.data_state = 'full')
     14     OR (detRunSummary.data_state = 'goto_scrubbed'
     15         AND detResidExp.data_state = 'full')
     16     OR (detRunSummary.data_state = 'goto_purged'
     17         AND detResidExp.data_state = 'full')
     18     OR detResidExp.data_state = 'goto_cleaned'
     19     OR detResidExp.data_state = 'goto_scrubbed'
     20     OR detResidExp.data_state = 'goto_purged')

  • trunk/ippTools/share/dettool_pendingcleanup_residimfile.sql

    r19092 r25324  
    11SELECT
    22    detResidImfile.*,
    3     detRunSummary.data_state
     3    rawExp.camera
    44FROM detRunSummary
    55JOIN detResidImfile
    66    USING(det_id,iteration)
     7JOIN detInputExp
     8    USING(det_id,iteration,exp_id)
     9JOIN rawExp
     10    USING(exp_id)
    711WHERE
    8     detRunSummary.data_state = 'goto_cleaned'
    9 AND detResidImfile.data_state = 'full'
     12    ((detRunSummary.data_state = 'goto_cleaned'
     13      AND detResidImfile.data_state = 'full')
     14     OR (detRunSummary.data_state = 'goto_scrubbed'
     15      AND detResidImfile.data_state = 'full')
     16     OR (detRunSummary.data_state = 'goto_purged'
     17      AND detResidImfile.data_state = 'full')
     18     OR detResidImfile.data_state = 'goto_cleaned'
     19     OR detResidImfile.data_state = 'goto_scrubbed'
     20     OR detResidImfile.data_state = 'goto_purged')
     21
     22

  • trunk/ippTools/share/dettool_pendingcleanup_stacked.sql

    r25299 r25324  
    11SELECT DISTINCT
    22    detStackedImfile.*,
    3     detRunSummary.data_state
     3    rawExp.camera
    44FROM detRunSummary
    55JOIN detStackedImfile
    6     USING(det_id,iteration)
     6     USING(det_id,iteration)
     7JOIN detInputExp
     8     USING(det_id,iteration)
     9JOIN rawExp
     10     USING(exp_id)
    711WHERE
    8     detRunSummary.data_state = 'goto_cleaned'
    9 AND detStackedImfile.data_state = 'full'
     12    ((detRunSummary.data_state = 'goto_cleaned'
     13      AND detStackedImfile.data_state = 'full')
     14     OR (detRunSummary.data_state = 'goto_scrubbed'
     15      AND detStackedImfile.data_state = 'full')
     16     OR (detRunSummary.data_state = 'goto_purged'
     17      AND detStackedImfile.data_state = 'full')
     18     OR detStackedImfile.data_state = 'goto_cleaned'
     19     OR detStackedImfile.data_state = 'goto_scrubbed'
     20     OR detStackedImfile.data_state = 'goto_purged')

  • trunk/ippTools/share/faketool_pendingcleanupimfile.sql

    r19092 r25324  
    1313    USING(fake_id)
    1414WHERE
    15     fakeRun.state = 'goto_cleaned'
     15    ((fakeRun.state = 'goto_cleaned' AND fakeProcessedImfile.data_state = 'full')
     16OR
     17    (fakeRun.state = 'goto_scrubbed' AND fakeProcessedImfile.data_state = 'full')
     18OR
     19    (fakeRun.state = 'goto_purged' AND fakeProcessedImfile.data_state != 'purged'))

  • trunk/ippTools/share/faketool_pendingcleanuprun.sql

    r19092 r25324  
    1111USING (exp_id)
    1212WHERE
    13     fakeRun.state = 'goto_cleaned'
     13    (fakeRun.state = 'goto_cleaned' OR fakeRun.state = 'goto_scrubbed' OR fakeRun.state = 'goto_purged')
     14
Note: See TracChangeset for help on using the changeset viewer.