IPP Software Navigation Tools IPP Links Communication Pan-STARRS Links

Changeset 24902


Ignore:
Timestamp:
Jul 22, 2009, 4:48:49 PM (17 years ago)
Author:
watersc1
Message:

New sql files to correctly select out files that are pending or done
with cleanup. This returns files marked as purged and scrubbed as
well as simpled cleaned.

Typo fixes in ipp_cleanup.pl .

Location:
branches/czw_branch/cleanup
Files:
8 added
10 edited

Legend:

Unmodified
Added
Removed

  • branches/czw_branch/cleanup/ippScripts/scripts/ipp_cleanup.pl

    r24785 r24902  
    759759    # XXX may need a different my_die for each stage
    760760    my $imfiles;                      # Array of component files
    761     my $command = "$dettool -pendingcleanup_processedimfile -chip_id $stage_id"; # Command to run
     761    my $command = "$dettool -pendingcleanup_processedimfile -det_id $stage_id"; # Command to run
    762762    $command .= " -dbname $dbname" if defined $dbname;
    763763    my ( $success, $error_code, $full_buf, $stdout_buf, $stderr_buf ) = run(command => $command, verbose => $verbose);
    … …  
    12391239    # XXX may need a different my_die for each stage
    12401240    my $imfiles;                      # Array of component files
    1241     my $command = "$dettool -pendingcleanup_residimfile -chip_id $stage_id"; # Command to run
     1241    my $command = "$dettool -pendingcleanup_residimfile -det_id $stage_id"; # Command to run
    12421242    $command .= " -dbname $dbname" if defined $dbname;
    12431243    my ( $success, $error_code, $full_buf, $stdout_buf, $stderr_buf ) = run(command => $command, verbose => $verbose);
    … …  
    13261326
    13271327        if ($status)  {
    1328             my $command = "$dettool -updateresidimfile -chip_id $stage_id -exp_id $exp_id -iteration $iteration -class_id $class_id";
     1328            my $command = "$dettool -updateresidimfile -det_id $stage_id -exp_id $exp_id -iteration $iteration -class_id $class_id";
    13291329            if ($mode eq "goto_purged") {
    13301330                $command .= " -data_state purged";
    … …  
    13461346            }
    13471347        } else {
    1348             my $command = "$dettool -updateresidimfile -chip_id $stage_id -exp_id $exp_id -iteration $iteration -class_id $class_id -data_state $error_state";
     1348            my $command = "$dettool -updateresidimfile -det_id $stage_id -exp_id $exp_id -iteration $iteration -class_id $class_id -data_state $error_state";
    13491349            $command .= " -dbname $dbname" if defined $dbname;
    13501350

  • branches/czw_branch/cleanup/ippTools/share/dettool_pendingcleanup_normalizedexp.sql

    r19092 r24902  
    66    USING(det_id,iteration)
    77WHERE
    8     detRunSummary.data_state = 'goto_cleaned'
    9 AND detNormalizedExp.data_state = 'full'
     8    ((detRunSummary.data_state = 'goto_cleaned'
     9      AND detNormalizedExp.data_state = 'full')
     10     OR (detRunSummary.data_state = 'goto_scrubbed'
     11      AND detNormalizedExp.data_state = 'full')
     12     OR (detRunSummary.data_state = 'goto_purged'
     13      AND detNormalizedExp.data_state = 'full')
     14     OR detNormalizedExp.data_state = 'goto_cleaned'
     15     OR detNormalizedExp.data_state = 'goto_scrubbed'
     16     OR detNormalizedExp.data_state = 'goto_purged')
     17

  • branches/czw_branch/cleanup/ippTools/share/dettool_pendingcleanup_normalizedimfile.sql

    r19092 r24902  
    66    USING(det_id,iteration)
    77WHERE
    8     detRunSummary.data_state = 'goto_cleaned'
    9 AND detNormalizedImfile.data_state = 'full'
     8    ((detRunSummary.data_state = 'goto_cleaned'
     9      AND detNormalizedImfile.data_state = 'full')
     10     OR (detRunSummary.data_state = 'goto_scrubbed'
     11      AND detNormalizedImfile.data_state = 'full')
     12     OR (detRunSummary.data_state = 'goto_purged'
     13      AND detNormalizedImfile.data_state = 'full')
     14     OR detNormalizedImfile.data_state = 'goto_cleaned'
     15     OR detNormalizedImfile.data_state = 'goto_scrubbed'
     16     OR detNormalizedImfile.data_state = 'goto_purged')
     17

  • branches/czw_branch/cleanup/ippTools/share/dettool_pendingcleanup_normalizedstat.sql

    r19092 r24902  
    66    USING(det_id,iteration)
    77WHERE
    8     detRunSummary.data_state = 'goto_cleaned'
    9 AND detNormalizedStatImfile.data_state = 'full'
     8    ((detRunSummary.data_state = 'goto_cleaned'
     9      AND detNormalizedStatImfile.data_state = 'full')
     10     OR (detRunSummary.data_state = 'goto_scrubbed'
     11      AND detNormalizedStatImfile.data_state = 'full')
     12     OR (detRunSummary.data_state = 'goto_purged'
     13      AND detNormalizedStatImfile.data_state = 'full')
     14     OR detNormalizedStatImfile.data_state = 'goto_cleaned'
     15     OR detNormalizedStatImfile.data_state = 'goto_scrubbed'
     16     OR detNormalizedStatImfile.data_state = 'goto_purged')
     17

  • branches/czw_branch/cleanup/ippTools/share/dettool_pendingcleanup_processedexp.sql

    r19092 r24902  
    77    USING(det_id)
    88WHERE
    9     detRunSummary.data_state = 'goto_cleaned'
    10 AND detProcessedExp.data_state = 'full'
     9    ((detRunSummary.data_state = 'goto_cleaned'
     10      AND detProcessedExp.data_state = 'full')
     11     OR (detRunSummary.data_state = 'goto_scrubbed'
     12         AND detProcessedExp.data_state = 'full')
     13     OR (detRunSummary.data_state = 'goto_purged'
     14         AND detProcessedExp.data_state = 'full')
     15     OR detProcessedExp.data_state = 'goto_cleaned'
     16     OR detProcessedExp.data_state = 'goto_scrubbed'
     17     OR detProcessedExp.data_state = 'goto_purged')

  • branches/czw_branch/cleanup/ippTools/share/dettool_pendingcleanup_processedimfile.sql

    r19092 r24902  
    77    USING(det_id)
    88WHERE
    9     detRunSummary.data_state = 'goto_cleaned'
    10 AND detProcessedImfile.data_state = 'full'
     9    ((detRunSummary.data_state = 'goto_cleaned'
     10      AND detProcessedImfile.data_state = 'full')
     11     OR (detRunSummary.data_state = 'goto_scrubbed'
     12         AND detProcessedImfile.data_state = 'full')
     13     OR (detRunSummary.data_state = 'goto_purged'
     14         AND detProcessedImfile.data_state = 'full')
     15     OR detProcessedImfile.data_state = 'goto_cleaned'
     16     OR detProcessedImfile.data_state = 'goto_scrubbed'
     17     OR detProcessedImfile.data_state = 'goto_purged')

  • branches/czw_branch/cleanup/ippTools/share/dettool_pendingcleanup_residexp.sql

    r19092 r24902  
    66    USING(det_id,iteration)
    77WHERE
    8     detRunSummary.data_state = 'goto_cleaned'
    9 AND detResidExp.data_state = 'full'
     8    ((detRunSummary.data_state = 'goto_cleaned'
     9      AND detResidExp.data_state = 'full')
     10     OR (detRunSummary.data_state = 'goto_scrubbed'
     11         AND detResidExp.data_state = 'full')
     12     OR (detRunSummary.data_state = 'goto_purged'
     13         AND detResidExp.data_state = 'full')
     14     OR detResidExp.data_state = 'goto_cleaned'
     15     OR detResidExp.data_state = 'goto_scrubbed'
     16     OR detResidExp.data_state = 'goto_purged')

  • branches/czw_branch/cleanup/ippTools/share/dettool_pendingcleanup_residimfile.sql

    r19092 r24902  
    66    USING(det_id,iteration)
    77WHERE
    8     detRunSummary.data_state = 'goto_cleaned'
    9 AND detResidImfile.data_state = 'full'
     8    ((detRunSummary.data_state = 'goto_cleaned'
     9      AND detResidImfile.data_state = 'full')
     10     OR (detRunSummary.data_state = 'goto_scrubbed'
     11      AND detResidImfile.data_state = 'full')
     12     OR (detRunSummary.data_state = 'goto_purged'
     13      AND detResidImfile.data_state = 'full')
     14     OR detResidImfile.data_state = 'goto_cleaned'
     15     OR detResidImfile.data_state = 'goto_scrubbed'
     16     OR detResidImfile.data_state = 'goto_purged')
     17
     18

  • branches/czw_branch/cleanup/ippTools/share/dettool_pendingcleanup_stacked.sql

    r19092 r24902  
    66    USING(det_id,iteration)
    77WHERE
    8     detRunSummary.data_state = 'goto_cleaned'
    9 AND detStackedImfile.data_state = 'full'
     8    ((detRunSummary.data_state = 'goto_cleaned'
     9      AND detStackedImfile.data_state = 'full')
     10     OR (detRunSummary.data_state = 'goto_scrubbed'
     11      AND detStackedImfile.data_state = 'full')
     12     OR (detRunSummary.data_state = 'goto_purged'
     13      AND detStackedImfile.data_state = 'full')
     14     OR detStackedImfile.data_state = 'goto_cleaned'
     15     OR detStackedImfile.data_state = 'goto_scrubbed'
     16     OR detStackedImfile.data_state = 'goto_purged')

  • branches/czw_branch/cleanup/ippTools/src/dettool.c

    r24785 r24902  
    18541854
    18551855    if (!isValidDataState (data_state)) return false;
    1856 
     1856   
    18571857    char *query = "UPDATE detProcessedImfile SET data_state = '%s'"
    18581858        " WHERE det_id = %" PRId64
Note: See TracChangeset for help on using the changeset viewer.