IPP Software Navigation Tools IPP Links Communication Pan-STARRS Links

Changeset 25324


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:
41 edited
9 copied

Legend:

Unmodified
Added
Removed

  • trunk

  • trunk/extsrc/gpcsw/gpcsrc/fits/burntool/burntool.c

    r25299 r25324  
    292292         CONCAT_FITS = argv[i][10] == 'n' || argv[i][10] == '0' ||
    293293            argv[i][10] == 'f';
     294
     295/* Set the e/ADU for the noise gate that cells must pass */
     296      } else if(strncmp(argv[i], "EADU=", 5) == 0) {    /* EADU=e */
     297         if(sscanf(argv[i]+5, "%lf", &MIN_EADU) != 1) {
     298            fprintf(stderr, "\rerror: cannot get e/ADU size from `%s'\n", argv[i]);
     299            exit(EXIT_FAILURE);
     300         }
     301
     302
     303        /* Set the read noise for the noise gate that cells must pass */
     304      } else if(strncmp(argv[i], "RN=", 3) == 0) {      /* EADU=e */
     305         if(sscanf(argv[i]+3, "%d", &MAX_READ_NOISE) != 1) {
     306            fprintf(stderr, "\rerror: cannot get read noise size from `%s'\n", argv[i]);
     307            exit(EXIT_FAILURE);
     308         }
    294309
    295310/* Quiet? */

  • trunk/extsrc/gpcsw/gpcsrc/fits/burntool/man/burntool.1

    r25299 r25324  
    303303                Retire a blasted burn after N seconds
    304304
     305        EADU=x
     306                Set the minimum e/ADU for acceptable cell sky noise
     307                (default 0.3).  Should not normally be changed!
     308        RN=x
     309                Set the maximum read noise for acceptable cell sky noise
     310                (default 20).  Should not normally be changed!
     311
     312                Any cell whose noise variance in the sky is greater than
     313                  sky/EADU+RN*RN  is rejected out of hand, and skipped for
     314                further processing.
     315
    305316        quiet={t|f}   
    306317                Quiet?

  • trunk/ippScripts/scripts/ipp_cleanup.pl

    r25299 r25324  
    154154                addFilename (\@files, "PPIMAGE.OUTPUT.FPA1", $path_base, $class_id);
    155155                addFilename (\@files, "PPIMAGE.OUTPUT.FPA2", $path_base, $class_id);
    156                 addFilename (\@files, "PPIMAGE.BIN1", $path_base, $class_id);
    157                 addFilename (\@files, "PPIMAGE.BIN2", $path_base, $class_id);
     156                addFilename (\@files, "PPIMAGE.BIN1", $path_base, $class_id);          # clean?
     157                addFilename (\@files, "PPIMAGE.BIN2", $path_base, $class_id);          # clean?
    158158                addFilename (\@files, "PPIMAGE.JPEG1", $path_base, $class_id);
    159159                addFilename (\@files, "PPIMAGE.JPEG2", $path_base, $class_id);
    160                 addFilename (\@files, "PPIMAGE.STATS", $path_base, $class_id);
     160                addFilename (\@files, "PPIMAGE.STATS", $path_base, $class_id);         #clean?
    161161                addFilename (\@files, "PPIMAGE.CONFIG", $path_base, $class_id);
    162162            }
    … …  
    253253        my @files = ();
    254254        # delete the temporary image datafiles
    255         addFilename (\@files, "PSASTRO.OUTPUT", $path_base);
     255#        addFilename (\@files, "PSASTRO.OUTPUT", $path_base);
    256256        if ($mode eq "goto_purged") {
    257257            # additional files to remove for 'purge' mode
    … …  
    349349            addFilename(\@files, "PSWARP.OUTPUT.MASK", $path_base, $skycell_id);
    350350            addFilename(\@files, "PSWARP.OUTPUT.VARIANCE", $path_base, $skycell_id);
    351             addFilename(\@files, "PSWARP.OUTPUT.SOURCES", $path_base, $skycell_id);
     351#            addFilename(\@files, "PSWARP.OUTPUT.SOURCES", $path_base, $skycell_id);
    352352
    353353            if ($mode eq "goto_purged") {
    … …  
    561561            addFilename(\@files, "PPSUB.INVERSE.MASK", $path_base, $skycell_id);
    562562            addFilename(\@files, "PPSUB.INVERSE.VARIANCE", $path_base, $skycell_id);
     563
    563564            addFilename(\@files, "PPSUB.INPUT.CONV", $path_base, $skycell_id);
    564565            addFilename(\@files, "PPSUB.INPUT.CONV.MASK", $path_base, $skycell_id);

  • trunk/ippScripts/scripts/magic_destreak_revert.pl

  • trunk/ippTasks/Makefile.am

    r25299 r25324  
    2626        pstamp.pro \
    2727        receive.pro \
    28         publish.pro
     28        publish.pro \
     29        science.cleanup.pro
    2930
    3031other_files = \

  • trunk/ippTasks/detrend.cleanup.pro

    r23480 r25324  
    234234    book getword detCleanupProcessedImfile $pageName class_id -var CLASS_ID
    235235    book getword detCleanupProcessedImfile $pageName camera   -var CAMERA
    236     book getword detCleanupProcessedImfile $pageName state    -var CLEANUP_MODE
     236    book getword detCleanupProcessedImfile $pageName data_state    -var CLEANUP_MODE
    237237    book getword detCleanupProcessedImfile $pageName dbname   -var DBNAME
    238238
    … …  
    244244
    245245    # XXX is everything listed here needed?
    246     $run = ipp_cleanup.pl --stage detrend.process.imfile --stage_id $DET_ID --exp_id $EXP_ID --class_id $CLASS_ID --camera $CAMERA --mode $CLEANUP_MODE
     246    $run = ipp_cleanup.pl --stage detrend.process.imfile --stage_id $DET_ID --camera $CAMERA --mode $CLEANUP_MODE
    247247    add_standard_args run
    248248
    … …  
    352352    book getword detCleanupProcessedExp $pageName exp_id   -var EXP_ID   
    353353    book getword detCleanupProcessedExp $pageName camera -var CAMERA
    354     book getword detCleanupProcessedExp $pageName state -var CLEANUP_MODE
     354    book getword detCleanupProcessedExp $pageName data_state -var CLEANUP_MODE
    355355    book getword detCleanupProcessedExp $pageName dbname -var DBNAME
    356356
    … …  
    362362
    363363    # XXX is everything listed here needed?
    364     $run = ipp_cleanup.pl --stage detrend.process.exp --stage_id $DET_ID --exp_id $EXP_ID --camera $CAMERA --mode $CLEANUP_MODE
     364    $run = ipp_cleanup.pl --stage detrend.process.exp --stage_id $DET_ID --camera $CAMERA --mode $CLEANUP_MODE
    365365    add_standard_args run
    366366
    … …  
    470470    book getword detCleanupStackedImfile $pageName class_id -var CLASS_ID
    471471    book getword detCleanupStackedImfile $pageName camera -var CAMERA
    472     book getword detCleanupStackedImfile $pageName state -var CLEANUP_MODE
     472    book getword detCleanupStackedImfile $pageName data_state -var CLEANUP_MODE
    473473    book getword detCleanupStackedImfile $pageName dbname -var DBNAME
    474474
    … …  
    480480
    481481    # XXX is everything listed here needed?
    482     $run = ipp_cleanup.pl --stage detrend.stack.imfile --stage_id $DET_ID --iteration $ITERATION --class_id $CLASS_ID --camera $CAMERA --mode $CLEANUP_MODE
     482    $run = ipp_cleanup.pl --stage detrend.stack.imfile --stage_id $DET_ID --camera $CAMERA --mode $CLEANUP_MODE
    483483    add_standard_args run
    484484
    … …  
    588588    book getword detCleanupNormStatImfile $pageName iteration -var ITERATION
    589589    book getword detCleanupNormStatImfile $pageName camera -var CAMERA
    590     book getword detCleanupNormStatImfile $pageName state -var CLEANUP_MODE
     590    book getword detCleanupNormStatImfile $pageName data_state -var CLEANUP_MODE
    591591    book getword detCleanupNormStatImfile $pageName dbname -var DBNAME
    592592
    … …  
    598598
    599599    # XXX is everything listed here needed?
    600     $run = ipp_cleanup.pl --stage detrend.normstat.imfile --stage_id $DET_ID --iteration $ITERATION --camera $CAMERA --mode $CLEANUP_MODE
     600    $run = ipp_cleanup.pl --stage detrend.normstat.imfile --stage_id $DET_ID --camera $CAMERA --mode $CLEANUP_MODE
    601601    add_standard_args run
    602602
    … …  
    704704    book getword detCleanupNormImfile $pageName class_id -var CLASS_ID
    705705    book getword detCleanupNormImfile $pageName camera -var CAMERA
    706     book getword detCleanupNormImfile $pageName state -var CLEANUP_MODE
     706    book getword detCleanupNormImfile $pageName data_state -var CLEANUP_MODE
    707707    book getword detCleanupNormImfile $pageName dbname -var DBNAME
    708708
    … …  
    714714
    715715    # XXX is everything listed here needed?
    716     $run = ipp_cleanup.pl --stage detrend.norm.imfile --stage_id $DET_ID --iteration $ITERATION --class_id $CLASS_ID --camera $CAMERA --mode $CLEANUP_MODE
     716    $run = ipp_cleanup.pl --stage detrend.norm.imfile --stage_id $DET_ID --camera $CAMERA --mode $CLEANUP_MODE
    717717    add_standard_args run
    718718
    … …  
    819819    book getword detCleanupNormExp $pageName iteration -var ITERATION
    820820    book getword detCleanupNormExp $pageName camera -var CAMERA
    821     book getword detCleanupNormExp $pageName state -var CLEANUP_MODE
     821    book getword detCleanupNormExp $pageName data_state -var CLEANUP_MODE
    822822    book getword detCleanupNormExp $pageName dbname -var DBNAME
    823823
    … …  
    829829
    830830    # XXX is everything listed here needed?
    831     $run = ipp_cleanup.pl --stage detrend.norm.exp --stage_id $DET_ID --iteration $ITERATION --camera $CAMERA --mode $CLEANUP_MODE
     831    $run = ipp_cleanup.pl --stage detrend.norm.exp --stage_id $DET_ID --camera $CAMERA --mode $CLEANUP_MODE
    832832    add_standard_args run
    833833
    … …  
    937937    book getword detCleanupResidImfile $pageName iteration -var ITERATION     
    938938    book getword detCleanupResidImfile $pageName camera -var CAMERA
    939     book getword detCleanupResidImfile $pageName state -var CLEANUP_MODE
     939    book getword detCleanupResidImfile $pageName data_state -var CLEANUP_MODE
    940940    book getword detCleanupResidImfile $pageName dbname -var DBNAME
    941941
    … …  
    947947
    948948    # XXX is everything listed here needed?
    949     $run = ipp_cleanup.pl --stage detrend.resid.imfile --stage_id $DET_ID --exp_id $EXP_ID --class_id $CLASS_ID --iteration $ITERATION --camera $CAMERA --mode $CLEANUP_MODE
     949    $run = ipp_cleanup.pl --stage detrend.resid.imfile --stage_id $DET_ID --camera $CAMERA --mode $CLEANUP_MODE
    950950    add_standard_args run
    951951
    … …  
    10561056    book getword detCleanupResidExp $pageName iteration -var ITERATION
    10571057    book getword detCleanupResidExp $pageName camera    -var CAMERA
    1058     book getword detCleanupResidExp $pageName state     -var CLEANUP_MODE
     1058    book getword detCleanupResidExp $pageName data_state        -var CLEANUP_MODE
    10591059    book getword detCleanupResidExp $pageName dbname    -var DBNAME
    10601060
    … …  
    10661066
    10671067    # XXX is everything listed here needed?
    1068     $run = ipp_cleanup.pl --stage detrend.resid.exp --stage_id $DET_ID --exp_id $EXP_ID --class_id $CLASS_ID --camera $CAMERA --mode $CLEANUP_MODE
     1068    $run = ipp_cleanup.pl --stage detrend.resid.exp --stage_id $DET_ID --camera $CAMERA --mode $CLEANUP_MODE
    10691069    add_standard_args run
    10701070

  • 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

  • trunk/ippTools/src

    • Property svn:ignore

      •  

        old new  
        3434disttool
        3535receivetool
        36 
         36addtool
        3737pubtool

  • trunk/ippTools/src/chiptool.c

    r24562 r25324  
    5454static bool tofullimfileMode(pxConfig *config);
    5555static bool topurgedimfileMode(pxConfig *config);
     56static bool toscrubbedimfileMode(pxConfig *config);
    5657static bool exportrunMode(pxConfig *config);
    5758static bool importrunMode(pxConfig *config);
    … …  
    9394        MODECASE(CHIPTOOL_MODE_TOFULLIMFILE,            tofullimfileMode);
    9495        MODECASE(CHIPTOOL_MODE_TOPURGEDIMFILE,          topurgedimfileMode);
     96        MODECASE(CHIPTOOL_MODE_TOSCRUBBEDIMFILE,        toscrubbedimfileMode);
    9597        MODECASE(CHIPTOOL_MODE_EXPORTRUN,               exportrunMode);
    9698        MODECASE(CHIPTOOL_MODE_IMPORTRUN,               importrunMode);
    … …  
    13331335    return change_imfile_data_state(config, "purged", "goto_purged");
    13341336}
    1335 
     1337static bool toscrubbedimfileMode(pxConfig *config)
     1338{
     1339  return change_imfile_data_state(config, "scrubbed", "goto_scrubbed");
     1340}
    13361341bool exportrunMode(pxConfig *config)
    13371342{

  • trunk/ippTools/src/chiptool.h

    r23339 r25324  
    4545    CHIPTOOL_MODE_TOFULLIMFILE,
    4646    CHIPTOOL_MODE_TOPURGEDIMFILE,
     47    CHIPTOOL_MODE_TOSCRUBBEDIMFILE,
    4748    CHIPTOOL_MODE_EXPORTRUN,
    4849    CHIPTOOL_MODE_IMPORTRUN

  • trunk/ippTools/src/chiptoolConfig.c

    r24562 r25324  
    248248    psMetadataAddStr(topurgedimfileArgs, PS_LIST_TAIL, "-class_id",  0,        "class ID to update", NULL);
    249249
     250    // -toscrubbedimfile
     251    psMetadata *toscrubbedimfileArgs = psMetadataAlloc();
     252    psMetadataAddS64(toscrubbedimfileArgs, PS_LIST_TAIL, "-chip_id", 0,        "chip ID to update", 0);
     253    psMetadataAddStr(toscrubbedimfileArgs, PS_LIST_TAIL, "-class_id", 0,       "class ID to update", NULL);
     254
    250255    // -exportrun
    251256    psMetadata *exportrunArgs = psMetadataAlloc();
    … …  
    282287    PXOPT_ADD_MODE("-tofullimfile",         "set imfile state to full",              CHIPTOOL_MODE_TOFULLIMFILE,         tofullimfileArgs);
    283288    PXOPT_ADD_MODE("-topurgedimfile",       "set imfile state to purged",            CHIPTOOL_MODE_TOPURGEDIMFILE,       topurgedimfileArgs);
     289    PXOPT_ADD_MODE("-toscrubbedimfile",     "set imfile state to scrubbed",          CHIPTOOL_MODE_TOSCRUBBEDIMFILE,     toscrubbedimfileArgs);
    284290
    285291    PXOPT_ADD_MODE("-exportrun",            "export run for import on other database", CHIPTOOL_MODE_EXPORTRUN, exportrunArgs);

  • trunk/ippTools/src/dettool.c

    r24866 r25324  
    150150        MODECASE(DETTOOL_MODE_UPDATEDETRUN,     updatedetrunMode);
    151151        MODECASE(DETTOOL_MODE_RERUN,            rerunMode);
     152        MODECASE(DETTOOL_MODE_PENDINGCLEANUP_DETRUNSUMMARY, pendingcleanup_detrunsummaryMode);
    152153        // register
    153154        MODECASE(DETTOOL_MODE_REGISTER_DETREND, register_detrendMode);
    … …  
    18271828    if (!strcmp(data_state, "drop")) return true;
    18281829    if (!strcmp(data_state, "register")) return true;
     1830    // These are valid data states, and are necessary for the cleanup to work correctly.
     1831    if (!strcmp(data_state, "full")) return true;
     1832    if (!strcmp(data_state, "goto_cleaned")) return true;
     1833    if (!strcmp(data_state, "goto_scrubbed")) return true;
     1834    if (!strcmp(data_state, "goto_purged")) return true;
     1835    if (!strcmp(data_state, "cleaned")) return true;
     1836    if (!strcmp(data_state, "scrubbed")) return true;
     1837    if (!strcmp(data_state, "purged")) return true;
     1838    if (!strcmp(data_state, "error_cleaned")) return true;
     1839    if (!strcmp(data_state, "error_scrubbed")) return true;
     1840    if (!strcmp(data_state, "error_purged")) return true;
    18291841
    18301842    psError(PS_ERR_UNKNOWN, true, "invalid data state: %s", data_state);
    … …  
    18531865
    18541866    if (!isValidDataState (data_state)) return false;
    1855 
     1867   
    18561868    char *query = "UPDATE detProcessedImfile SET data_state = '%s'"
    18571869        " WHERE det_id = %" PRId64
    … …  
    19001912        " WHERE det_id = %" PRId64
    19011913        " AND iteration = %" PRId32
    1902         " AND class_id = %s";
     1914        " AND class_id = '%s'";
    19031915    if (!p_psDBRunQueryF(config->dbh, query, data_state, det_id, iteration, class_id)) {
    19041916        psError(PS_ERR_UNKNOWN, false,
    … …  
    19221934        " WHERE det_id = %" PRId64
    19231935        " AND iteration = %" PRId32
    1924         " AND class_id = %s";
    1925     if (!p_psDBRunQueryF(config->dbh, query, data_state, det_id, iteration)) {
     1936        " AND class_id = '%s'";
     1937/*     fprintf(stderr,"DETTOOL SAYS: %s\n",query); */
     1938    if (!p_psDBRunQueryF(config->dbh, query, data_state, det_id, iteration,class_id)) {
    19261939        psError(PS_ERR_UNKNOWN, false,
    19271940                "failed to change state for det_id %" PRId64 ", iteration %" PRId32,
    … …  
    19441957        " WHERE det_id = %" PRId64
    19451958        " AND iteration = %" PRId32
    1946         " AND class_id = %s";
     1959        " AND class_id = '%s'";
    19471960    if (!p_psDBRunQueryF(config->dbh, query, data_state, det_id, iteration, class_id)) {
    19481961        psError(PS_ERR_UNKNOWN, false,

  • trunk/ippTools/src/dettool.h

    r23310 r25324  
    111111    DETTOOL_MODE_REVERTDETRUNSUMMARY,
    112112    DETTOOL_MODE_UPDATEDETRUNSUMMARY,
     113    DETTOOL_MODE_PENDINGCLEANUP_DETRUNSUMMARY,
    113114    DETTOOL_MODE_UPDATEDETRUN,
    114115    DETTOOL_MODE_RERUN,
    … …  
    209210bool revertdetrunsummaryMode(pxConfig *config);
    210211bool updatedetrunsummaryMode(pxConfig *config);
     212bool pendingcleanup_detrunsummaryMode(pxConfig *config);
    211213
    212214// other utilities

  • trunk/ippTools/src/dettoolConfig.c

    r25299 r25324  
    4141    // XXX EAM : is this used?  does it make sense?
    4242    psMetadata *pendingArgs = psMetadataAlloc();
    43     psMetadataAddS64(pendingArgs, PS_LIST_TAIL, "-exp_id",  0,            "search by exposure ID", 0);
    44     psMetadataAddStr(pendingArgs, PS_LIST_TAIL, "-exp_type",  0,            "search by exposure type", NULL);
    45     psMetadataAddStr(pendingArgs, PS_LIST_TAIL, "-inst",  0,            "search by camera", NULL);
    46     psMetadataAddStr(pendingArgs, PS_LIST_TAIL, "-telescope",  0,            "search by telescope", NULL);
    47     psMetadataAddStr(pendingArgs, PS_LIST_TAIL, "-filter",  0,            "search by filter", NULL);
     43    psMetadataAddS64(pendingArgs, PS_LIST_TAIL, "-exp_id",  0,         "search by exposure ID", 0);
     44    psMetadataAddStr(pendingArgs, PS_LIST_TAIL, "-exp_type",  0,       "search by exposure type", NULL);
     45    psMetadataAddStr(pendingArgs, PS_LIST_TAIL, "-inst",  0,           "search by camera", NULL);
     46    psMetadataAddStr(pendingArgs, PS_LIST_TAIL, "-telescope",  0,      "search by telescope", NULL);
     47    psMetadataAddStr(pendingArgs, PS_LIST_TAIL, "-filter",  0,         "search by filter", NULL);
    4848    psMetadataAddStr(pendingArgs, PS_LIST_TAIL, "-uri",  0,            "search by URL", NULL);
    49     psMetadataAddBool(pendingArgs, PS_LIST_TAIL, "-simple",  0,            "use the simple output format", false);
     49    psMetadataAddBool(pendingArgs, PS_LIST_TAIL, "-simple",  0,        "use the simple output format", false);
    5050
    5151    // -definebytag
    … …  
    7070    psMetadataAddF64(definebytagArgs, PS_LIST_TAIL, "-sun_angle_min",  0,            "define min solar angle", NAN);
    7171    psMetadataAddF64(definebytagArgs, PS_LIST_TAIL, "-sun_angle_max",  0,            "define max solar angle", NAN);
    72 
    7372
    7473    psMetadataAddTime(definebytagArgs, PS_LIST_TAIL, "-registered",  0,            "time detrend run was registered", now);
    … …  
    126125    psMetadataAddF64(definebyqueryArgs, PS_LIST_TAIL, "-select_posang_min",  0,            "define min rotator position angle", NAN);
    127126    psMetadataAddF64(definebyqueryArgs, PS_LIST_TAIL, "-select_posang_max",  0,            "define max rotator position angle", NAN);
     127
    128128    psMetadataAddF64(definebyqueryArgs, PS_LIST_TAIL, "-select_sun_angle_min",  0,            "define min solar angle", NAN);
    129129    psMetadataAddF64(definebyqueryArgs, PS_LIST_TAIL, "-select_sun_angle_max",  0,            "define max solar angle", NAN);
    … …  
    139139    psMetadataAddStr(definebyqueryArgs, PS_LIST_TAIL, "-comment",                0,          "search by comment field (LIKE comparison)", NULL);
    140140
    141 
    142     psMetadataAddF64(definebyqueryArgs, PS_LIST_TAIL, "-select_moon_angle_min",  0,          "define min moon angle", NAN);
    143     psMetadataAddF64(definebyqueryArgs, PS_LIST_TAIL, "-select_moon_angle_max",  0,          "define max moon angle", NAN);
    144     psMetadataAddF64(definebyqueryArgs, PS_LIST_TAIL, "-select_moon_alt_min",  0,            "define min moon alt", NAN);
    145     psMetadataAddF64(definebyqueryArgs, PS_LIST_TAIL, "-select_moon_alt_max",  0,            "define max moon alt", NAN);
    146     psMetadataAddF64(definebyqueryArgs, PS_LIST_TAIL, "-select_moon_phase_min",  0,          "define min moon phase", NAN);
    147     psMetadataAddF64(definebyqueryArgs, PS_LIST_TAIL, "-select_moon_phase_max",  0,          "define max moon phase", NAN);
    148     psMetadataAddStr(definebyqueryArgs, PS_LIST_TAIL, "-comment",                0,          "search by comment field (LIKE comparison)", NULL);
    149141
    150142    psMetadataAddBool(definebyqueryArgs, PS_LIST_TAIL, "-pretend",  0,            "print the exposures that would be included in the detrend run and exit", false);
    … …  
    217209    // -addcorrectimfile
    218210    psMetadata *addcorrectimfileArgs = psMetadataAlloc();
    219     psMetadataAddS64(addcorrectimfileArgs, PS_LIST_TAIL, "-det_id",  0,            "define detrend ID (required)", 0);
    220     psMetadataAddStr(addcorrectimfileArgs, PS_LIST_TAIL, "-class_id",  0,            "search for class ID (required)", NULL);
    221     psMetadataAddStr(addcorrectimfileArgs, PS_LIST_TAIL, "-uri",  0,            "define resid file URI", NULL);
     211    psMetadataAddS64(addcorrectimfileArgs, PS_LIST_TAIL, "-det_id",  0,        "define detrend ID (required)", 0);
     212    psMetadataAddStr(addcorrectimfileArgs, PS_LIST_TAIL, "-class_id",  0,      "search for class ID (required)", NULL);
     213    psMetadataAddStr(addcorrectimfileArgs, PS_LIST_TAIL, "-uri",  0,           "define resid file URI", NULL);
    222214    psMetadataAddF64(addcorrectimfileArgs, PS_LIST_TAIL, "-bg",  0,            "define exposure background", NAN);
    223215    psMetadataAddF64(addcorrectimfileArgs, PS_LIST_TAIL, "-bg_stdev",  0,            "define exposure background stdev", NAN);
    … …  
    316308    psMetadataAddS64(updateprocessedimfileArgs, PS_LIST_TAIL, "-exp_id",               0,            "search by exp_id", 0);
    317309    psMetadataAddStr(updateprocessedimfileArgs, PS_LIST_TAIL, "-class_id",             0,            "search by exp_name", NULL);
    318     psMetadataAddStr(updateprocessedimfileArgs, PS_LIST_TAIL, "-data_state",           0,            "search for telescope", NULL);
     310    psMetadataAddStr(updateprocessedimfileArgs, PS_LIST_TAIL, "-data_state",           0,            "set state", NULL);
    319311
    320312    // -pendingcleanup_processedimfile
    … …  
    376368    psMetadataAddS64(updateprocessedexpArgs, PS_LIST_TAIL, "-det_id",               0,            "search by chip ID", 0);
    377369    psMetadataAddS64(updateprocessedexpArgs, PS_LIST_TAIL, "-exp_id",               0,            "search by exp_id", 0);
    378     psMetadataAddStr(updateprocessedexpArgs, PS_LIST_TAIL, "-data_state",           0,            "search for telescope", NULL);
     370    psMetadataAddStr(updateprocessedexpArgs, PS_LIST_TAIL, "-data_state",           0,            "set state", NULL);
    379371
    380372    // -pendingcleanup_processedexp
    … …  
    436428    psMetadataAddS32(updatestackedArgs, PS_LIST_TAIL, "-iteration",  0,            "search by iteration number", 0);
    437429    psMetadataAddStr(updatestackedArgs, PS_LIST_TAIL, "-class_id",  0,            "search by class ID", NULL);
    438     psMetadataAddStr(updatestackedArgs, PS_LIST_TAIL, "-data_state",           0,            "search for telescope", NULL);
     430    psMetadataAddStr(updatestackedArgs, PS_LIST_TAIL, "-data_state",           0,            "set state", NULL);
    439431
    440432    // -pendingcleanup_stacked
    … …  
    488480    psMetadataAddS32(updatenormalizedstatArgs, PS_LIST_TAIL, "-iteration",  0,            "search by iteration number", 0);
    489481    psMetadataAddStr(updatenormalizedstatArgs, PS_LIST_TAIL, "-class_id",             0,            "search by exp_name", NULL);
    490     psMetadataAddStr(updatenormalizedstatArgs, PS_LIST_TAIL, "-data_state",           0,            "search for telescope", NULL);
     482    psMetadataAddStr(updatenormalizedstatArgs, PS_LIST_TAIL, "-data_state",           0,            "set state", NULL);
    491483
    492484    // -pendingcleanup_normalizedstat
    … …  
    550542    psMetadataAddS32(updatenormalizedimfileArgs, PS_LIST_TAIL, "-iteration", 0,            "search by iteration number", 0);
    551543    psMetadataAddStr(updatenormalizedimfileArgs, PS_LIST_TAIL, "-class_id",             0,            "search by exp_name", NULL);
    552     psMetadataAddStr(updatenormalizedimfileArgs, PS_LIST_TAIL, "-data_state",           0,            "search for telescope", NULL);
     544    psMetadataAddStr(updatenormalizedimfileArgs, PS_LIST_TAIL, "-data_state",           0,            "set state", NULL);
    553545
    554546    // -pendingcleanup_normalizedimfile
    … …  
    608600    psMetadataAddS64(updatenormalizedexpArgs, PS_LIST_TAIL, "-det_id",               0,            "search by chip ID", 0);
    609601    psMetadataAddS32(updatenormalizedexpArgs, PS_LIST_TAIL, "-iteration", 0,            "search by iteration number", 0);
    610     psMetadataAddStr(updatenormalizedexpArgs, PS_LIST_TAIL, "-data_state",           0,            "search for telescope", NULL);
     602    psMetadataAddStr(updatenormalizedexpArgs, PS_LIST_TAIL, "-data_state",           0,            "set state", NULL);
    611603
    612604    // -pendingcleanup_normalizedexp
    … …  
    688680    psMetadataAddS64(updateresidimfileArgs, PS_LIST_TAIL, "-exp_id",               0,            "search by exp_id", 0);
    689681    psMetadataAddStr(updateresidimfileArgs, PS_LIST_TAIL, "-class_id",             0,            "search by exp_name", NULL);
    690     psMetadataAddStr(updateresidimfileArgs, PS_LIST_TAIL, "-data_state",           0,            "search for telescope", NULL);
     682    psMetadataAddStr(updateresidimfileArgs, PS_LIST_TAIL, "-data_state",           0,            "set state", NULL);
    691683
    692684    // -pendingcleanup_residimfile
    … …  
    769761    psMetadataAddStr(updateresidexpArgs, PS_LIST_TAIL, "-path_base",  0,            "define base output location", NULL);
    770762    psMetadataAddBool(updateresidexpArgs, PS_LIST_TAIL, "-reject",  0,            "exposure is not to be stacked in the next iteration", false);
    771     psMetadataAddStr(updateresidexpArgs, PS_LIST_TAIL, "-data_state",           0,            "search for telescope", NULL);
     763    psMetadataAddStr(updateresidexpArgs, PS_LIST_TAIL, "-data_state",           0,            "set state", NULL);
    772764
    773765    // -pendingcleanup_residexp
    … …  
    823815    psMetadataAddBool(updatedetrunsummaryArgs, PS_LIST_TAIL, "-accept",  0,            "declare that this detrun iteration is accepted as a master", false);
    824816    psMetadataAddBool(updatedetrunsummaryArgs, PS_LIST_TAIL, "-reject",  0,            "reject this detrun iteration as a master", false);
     817    psMetadataAddStr(updatedetrunsummaryArgs, PS_LIST_TAIL, "-data_state", 0,          "set the data state", NULL);
     818    psMetadataAddS32(updatedetrunsummaryArgs, PS_LIST_TAIL, "-iteration", 0,           "search by iteration number", 0);
     819
     820    // -pendingcleanup_detrunsummary
     821    psMetadata *pendingcleanup_detrunsummaryArgs = psMetadataAlloc();
     822    psMetadataAddS64(pendingcleanup_detrunsummaryArgs, PS_LIST_TAIL, "-det_id", 0,     "search by detrend ID (required)", 0);
     823    psMetadataAddS32(pendingcleanup_detrunsummaryArgs, PS_LIST_TAIL, "-iteration", 0,  "search by iteration number", 0);
     824    psMetadataAddU64(pendingcleanup_detrunsummaryArgs, PS_LIST_TAIL, "-limit",  0,     "limit result set to N items", 0);
     825    psMetadataAddBool(pendingcleanup_detrunsummaryArgs, PS_LIST_TAIL, "-simple", 0,    "use the simple output format", false);
    825826
    826827    // -updatedetrun
    … …  
    978979    PXOPT_ADD_MODE("-updatedetrunsummary", "", DETTOOL_MODE_UPDATEDETRUNSUMMARY, updatedetrunsummaryArgs);
    979980
     981    PXOPT_ADD_MODE("-pendingcleanup_detrunsummary", "", DETTOOL_MODE_PENDINGCLEANUP_DETRUNSUMMARY, pendingcleanup_detrunsummaryArgs);
     982
    980983    PXOPT_ADD_MODE("-updatedetrun", "", DETTOOL_MODE_UPDATEDETRUN, updatedetrunArgs);
    981984    PXOPT_ADD_MODE("-rerun",           "", DETTOOL_MODE_RERUN,         rerunArgs);

  • trunk/ippTools/src/dettool_detrunsummary.c

    r23688 r25324  
    336336}
    337337
    338 // XXX need to add -data_state here
     338bool pendingcleanup_detrunsummaryMode(pxConfig *config) {
     339  PS_ASSERT_PTR_NON_NULL(config, false);
     340
     341  PXOPT_LOOKUP_U64(limit, config->args, "-limit", false, false);
     342  PXOPT_LOOKUP_BOOL(simple, config->args, "-simple", false);
     343
     344  psMetadata *where = psMetadataAlloc();
     345  PXOPT_COPY_S64(config->args, where, "-det_id", "det_id", "==");
     346  PXOPT_COPY_S32(config->args, where, "-iteration", "iteration", "==");
     347
     348  psString query = pxDataGet("dettool_pendingcleanup_detrunsummary.sql");
     349  if (!query) {
     350    psError(PXTOOLS_ERR_DATA, false, "failed to retreive SQL statement");
     351    return(false);
     352  }
     353 
     354  if (psListLength(where->list)) {
     355    psString whereClause = psDBGenerateWhereConditionSQL(where, "detRunSummary");
     356    psStringAppend(&query, " AND %s", whereClause);
     357    psFree(whereClause);
     358  }
     359  psFree(where);
     360
     361  // treat limit == 0 as "no limit"
     362  if (limit) {
     363    psString limitString = psDBGenerateLimitSQL(limit);
     364    psStringAppend(&query, " %s", limitString);
     365    psFree(limitString);
     366  }
     367  //  fprintf(stderr,">>>%s<<<\n",query);
     368  if (!p_psDBRunQuery(config->dbh, query)) {
     369    psError(PS_ERR_UNKNOWN, false, "database error");
     370    psFree(query);
     371    return(false);
     372  }
     373  psFree(query);
     374
     375  psArray *output = p_psDBFetchResult(config->dbh);
     376  if (!output) {
     377    psError(PS_ERR_UNKNOWN, false, "database error");
     378    return(false);
     379  }
     380  if (!psArrayLength(output)) {
     381    psTrace("dettool", PS_LOG_INFO, "no rows found");
     382    psFree(output);
     383    return(true);
     384  }
     385
     386  // negative simple so the default is true
     387  if (!ippdbPrintMetadatas(stdout, output, "pendingCleanupDetRun", !simple)) {
     388    psError(PS_ERR_UNKNOWN, false, "failed to print array");
     389    psFree(output);
     390    return(false);
     391  }
     392  psFree(output);
     393
     394  return(true);
     395}
     396
     397
     398// preliminary code now.
    339399bool updatedetrunsummaryMode(pxConfig *config)
    340400{
    … …  
    344404    PXOPT_LOOKUP_BOOL(accept, config->args, "-accept", false);
    345405    PXOPT_LOOKUP_BOOL(reject, config->args, "-reject", false);
     406    PXOPT_LOOKUP_STR(data_state, config->args, "-data_state", ((accept == 0)&&(reject == 0)), false);
     407    PXOPT_LOOKUP_S32(iteration, config->args, "-iteration", ((accept == 0)&&(reject == 0)), false);
     408
    346409
    347410    if (accept && reject) {
    … …  
    350413    }
    351414
    352     if (!(accept || reject)) {
    353         psError(PS_ERR_UNKNOWN, true, "either -accept or -reject is required");
    354         return false;
    355     }
    356 
    357     char *query = "UPDATE detRunSummary SET accept = %d WHERE det_id = %"PRId64;
    358     if (!p_psDBRunQueryF(config->dbh, query, accept, det_id)) {
    359         psError(PS_ERR_UNKNOWN, false, "database error");
    360         return false;
     415    if (!(accept || reject || (data_state != NULL))) {
     416        psError(PS_ERR_UNKNOWN, true, "either -accept or -reject is required if -data_state is not supplied");
     417        return false;
     418    }
     419
     420    if (accept || reject) {
     421      char *query = "UPDATE detRunSummary SET accept = %d WHERE det_id = %"PRId64;
     422      if (!p_psDBRunQueryF(config->dbh, query, accept, det_id)) {
     423        psError(PS_ERR_UNKNOWN, false, "database error");
     424        return false;
     425      }
     426    }
     427    else {
     428      PS_ASSERT_PTR_NON_NULL(data_state,false);
     429
     430/*       if (!isValidDataState(data_state)) return false; */
     431     
     432     
     433     
     434      char *query_detRunSummary = "UPDATE detRunSummary SET data_state = '%s'"
     435        " WHERE det_id = %" PRId64
     436        " AND iteration = %" PRId32;
     437      if (!p_psDBRunQueryF(config->dbh, query_detRunSummary, data_state, det_id,iteration)) {
     438        psError(PS_ERR_UNKNOWN, false,
     439                "failed to change state for det_id %" PRId64 ", iteration %" PRId32, det_id,iteration);
     440        return false;
     441      }
     442
     443      /* This check allows the one update to flag everything for cleanup.  The check for full is only temporary while I test for bugs. */
     444      if ((!strncmp(data_state,"goto_",5)
     445           //      || (!strcmp(data_state,"full"))
     446           //      || (!strcmp(data_state,"cleaned"))
     447           ))   {
     448        char *query_detProcessedImfile = "UPDATE detProcessedImfile SET data_state = '%s'"
     449          " WHERE det_id = %" PRId64;
     450        if (!p_psDBRunQueryF(config->dbh, query_detProcessedImfile,data_state,det_id)) {
     451          psError(PS_ERR_UNKNOWN, false,
     452                  "failed to change state for detProcessedImfile det_id %" PRId64 ", iteration %" PRId32, det_id,iteration);
     453          return(false);
     454        }
     455       
     456        char *query_detProcessedExp = "UPDATE detProcessedExp SET data_state = '%s'"
     457          " WHERE det_id = %" PRId64;
     458        if (!p_psDBRunQueryF(config->dbh, query_detProcessedExp,data_state,det_id)) {
     459          psError(PS_ERR_UNKNOWN, false,
     460                  "failed to change state for detProcessedExp det_id %" PRId64 ", iteration %" PRId32, det_id,iteration);
     461          return(false);
     462        }
     463       
     464        char *query_detNormalizedImfile = "UPDATE detNormalizedImfile SET data_state = '%s'"
     465          " WHERE det_id = %" PRId64
     466          " AND iteration = %" PRId32;
     467        if (!p_psDBRunQueryF(config->dbh, query_detNormalizedImfile,data_state,det_id,iteration)) {
     468          psError(PS_ERR_UNKNOWN, false,
     469                  "failed to change state for detNormalizedImfile det_id %" PRId64 ", iteration %" PRId32, det_id,iteration);
     470          return(false);
     471        }
     472       
     473        char *query_detNormalizedStatImfile = "UPDATE detNormalizedStatImfile SET data_state = '%s'"
     474          " WHERE det_id = %" PRId64
     475          " AND iteration = %" PRId32;
     476        if (!p_psDBRunQueryF(config->dbh, query_detNormalizedStatImfile,data_state,det_id,iteration)) {
     477          psError(PS_ERR_UNKNOWN, false,
     478                  "failed to change state for detNormalizedStatImfile det_id %" PRId64 ", iteration %" PRId32, det_id,iteration);
     479          return(false);
     480        }
     481
     482        char *query_detNormalizedExp = "UPDATE detNormalizedExp SET data_state = '%s'"
     483          " WHERE det_id = %" PRId64
     484          " AND iteration = %" PRId32;
     485        if (!p_psDBRunQueryF(config->dbh, query_detNormalizedExp,data_state,det_id,iteration)) {
     486          psError(PS_ERR_UNKNOWN, false,
     487                  "failed to change state for detNormalizedExp det_id %" PRId64 ", iteration %" PRId32, det_id,iteration);
     488          return(false);
     489        }
     490       
     491        char *query_detResidImfile = "UPDATE detResidImfile SET data_state = '%s'"
     492          " WHERE det_id = %" PRId64
     493          " AND iteration = %" PRId32;
     494        if (!p_psDBRunQueryF(config->dbh, query_detResidImfile,data_state,det_id,iteration)) {
     495          psError(PS_ERR_UNKNOWN, false,
     496                  "failed to change state for detResidImfile det_id %" PRId64 ", iteration %" PRId32, det_id,iteration);
     497          return(false);
     498        }
     499       
     500        char *query_detResidExp = "UPDATE detResidExp SET data_state = '%s'"
     501          " WHERE det_id = %" PRId64
     502          " AND iteration = %" PRId32;
     503        if (!p_psDBRunQueryF(config->dbh, query_detResidExp,data_state,det_id,iteration)) {
     504          psError(PS_ERR_UNKNOWN, false,
     505                  "failed to change state for detResidExp det_id %" PRId64 ", iteration %" PRId32, det_id,iteration);
     506          return(false);
     507        }
     508       
     509        char *query_detStackedImfile = "UPDATE detStackedImfile SET data_state = '%s'"
     510          " WHERE det_id = %" PRId64
     511          " AND iteration = %" PRId32;
     512        if (!p_psDBRunQueryF(config->dbh, query_detStackedImfile,data_state,det_id,iteration)) {
     513          psError(PS_ERR_UNKNOWN, false,
     514                  "failed to change state for detStackedImfile det_id %" PRId64 ", iteration %" PRId32, det_id,iteration);
     515          return(false);
     516        }
     517      }
     518      /* End if */
     519     
    361520    }
    362521

  • trunk/ippTools/src/dettool_processedimfile.c

    r23688 r25324  
    314314    PXOPT_LOOKUP_U64(limit, config->args, "-limit", false, false);
    315315    PXOPT_LOOKUP_BOOL(simple, config->args, "-simple", false);
    316 
     316/*     int i; */
    317317    psMetadata *where = psMetadataAlloc();
    318318    PXOPT_COPY_S64(config->args, where, "-det_id", "det_id", "==");
    … …  
    345345        return false;
    346346    }
     347/*     fprintf(stderr,"DETTOOL:procimfile: %s\n",query); */
    347348    psFree(query);
    348349
    … …  
    350351    if (!output) {
    351352        psError(PS_ERR_UNKNOWN, false, "database error");
     353/*      fprintf(stderr,"WTF !output?\n"); */
    352354        return false;
    353355    }
    354356    if (!psArrayLength(output)) {
    355357        psTrace("dettool", PS_LOG_INFO, "no rows found");
     358/*      fprintf(stderr,"WTF no rows??\n"); */
    356359        psFree(output);
    357360        return true;
    … …  
    359362
    360363    // negative simple so the default is true
     364/*     i = (int) ippdbPrintMetadatas(stdout, output, "detCleanupProcessedImfile", !simple); */
     365/*     fprintf(stderr,">>%d<<\n",i); */
    361366    if (!ippdbPrintMetadatas(stdout, output, "detCleanupProcessedImfile", !simple)) {
    362367        psError(PS_ERR_UNKNOWN, false, "failed to print array");
    … …  
    364369        return false;
    365370    }
     371/*     fprintf(stderr,"DETTOOL:procimfile: %s\n",output); */
     372/*     psFree(output); */
    366373
    367374    psFree(output);

  • trunk/ippTools/src/faketool.c

    r24866 r25324  
    5252static bool tofullimfileMode(pxConfig *config);
    5353static bool topurgedimfileMode(pxConfig *config);
     54static bool toscrubbedimfileMode(pxConfig *config);
    5455static bool exportrunMode(pxConfig *config);
    5556static bool importrunMode(pxConfig *config);
    … …  
    9192        MODECASE(FAKETOOL_MODE_TOFULLIMFILE,            tofullimfileMode);
    9293        MODECASE(FAKETOOL_MODE_TOPURGEDIMFILE,          topurgedimfileMode);
     94        MODECASE(FAKETOOL_MODE_TOSCRUBBEDIMFILE,        toscrubbedimfileMode);
    9395        MODECASE(FAKETOOL_MODE_EXPORTRUN,               exportrunMode);
    9496        MODECASE(FAKETOOL_MODE_IMPORTRUN,               importrunMode);
    … …  
    12511253    return change_imfile_data_state(config, "purged", "goto_purged");
    12521254}
     1255static bool toscrubbedimfileMode(pxConfig *config)
     1256{
     1257     return change_imfile_data_state(config, "scrubbed", "goto_scrubbed");
     1258}
    12531259
    12541260bool exportrunMode(pxConfig *config)

  • trunk/ippTools/src/faketool.h

    r23339 r25324  
    4545    FAKETOOL_MODE_TOFULLIMFILE,
    4646    FAKETOOL_MODE_TOPURGEDIMFILE,
     47    FAKETOOL_MODE_TOSCRUBBEDIMFILE,
    4748    FAKETOOL_MODE_EXPORTRUN,
    4849    FAKETOOL_MODE_IMPORTRUN

  • trunk/ippTools/src/faketoolConfig.c

    r24866 r25324  
    301301    psMetadataAddStr(topurgedimfileArgs, PS_LIST_TAIL, "-class_id",  0,        "class ID to update", NULL);
    302302
     303    // -toscrubbedimfile
     304    psMetadata *toscrubbedimfileArgs = psMetadataAlloc();
     305    psMetadataAddS64(toscrubbedimfileArgs, PS_LIST_TAIL, "-fake_id", 0,         "fake ID to update", 0);
     306    psMetadataAddStr(toscrubbedimfileArgs, PS_LIST_TAIL, "-class_id", 0,        "class ID to update", NULL);
     307
    303308    // -exportrun
    304309    psMetadata *exportrunArgs = psMetadataAlloc();
    … …  
    337342    PXOPT_ADD_MODE("-tofullimfile",        "set imfile state to full",               FAKETOOL_MODE_TOFULLIMFILE,         tofullimfileArgs);
    338343    PXOPT_ADD_MODE("-topurgedimfile",      "set imfile state to purged",             FAKETOOL_MODE_TOPURGEDIMFILE,       topurgedimfileArgs);
     344    PXOPT_ADD_MODE("-toscrubbedimfile",    "set imfile state to scrubbed",           FAKETOOL_MODE_TOSCRUBBEDIMFILE,     toscrubbedimfileArgs);
    339345    PXOPT_ADD_MODE("-exportrun",            "export run for import on other database", FAKETOOL_MODE_EXPORTRUN, exportrunArgs);
    340346    PXOPT_ADD_MODE("-importrun",            "import run from metadata file",           FAKETOOL_MODE_IMPORTRUN, importrunArgs);

  • trunk/ippTools/src/pxtools.c

    r23918 r25324  
    3737    if (!strcmp(state, "goto_cleaned")) return true;
    3838    if (!strcmp(state, "error_cleaned")) return true;
     39    if (!strcmp(state, "goto_purged")) return true;
     40    if (!strcmp(state, "error_purged")) return true;
    3941    if (!strcmp(state, "goto_scrubbed")) return true;
    4042    if (!strcmp(state, "error_scrubbed")) return true;
    … …  
    4244    if (!strcmp(state, "update")) return true;
    4345    if (!strcmp(state, "purged")) return true;
    44     if (!strcmp(state, "goto_purged")) return true;
    45     if (!strcmp(state, "error_purged")) return true;
    46 
     46    if (!strcmp(state, "scrubbed")) return true;
    4747    return false;
    4848}
    4949
    50 // 'scrubbed' is a virtual state equivalent to cleaned, but allows files to be removed
    51 // even if the config files is missing
     50// 'scrubbed' is no longer a virtual state equivalent to cleaned, but allows files to be removed
     51// even if the config files is missing.  This change was prompted as files that are cleaned can
     52// be regenerated, but that is not certain after being scrubbed.
    5253
    5354

  • trunk/ippTools/src/regtool.c

    r25299 r25324  
    929929    PXOPT_COPY_F64(config->args,   where,  "-posang_max", "posang", "<");
    930930    PXOPT_COPY_STR(config->args,   where,  "-object", "object", "==");
    931     PXOPT_COPY_F32(config->args,   where,  "-solang_min", "solang", ">=");
    932     PXOPT_COPY_F32(config->args,   where,  "-solang_max", "solang", "<");
     931    PXOPT_COPY_F32(config->args,   where,  "-sun_angle_min", "sun_angle", ">=");
     932    PXOPT_COPY_F32(config->args,   where,  "-sun_angle_max", "sun_angle", "<");
    933933
    934934    PXOPT_LOOKUP_U64(limit, config->args, "-limit", false, false);

  • trunk/ippTools/src/warptool.c

    r25299 r25324  
    5353static bool tocleanedskyfileMode(pxConfig *config);
    5454static bool topurgedskyfileMode(pxConfig *config);
     55static bool toscrubbedskyfileMode(pxConfig *config);
    5556static bool tofullskyfileMode(pxConfig *config);
    5657static bool updateskyfileMode(pxConfig *config);
    … …  
    102103        MODECASE(WARPTOOL_MODE_TOCLEANEDSKYFILE,   tocleanedskyfileMode);
    103104        MODECASE(WARPTOOL_MODE_TOPURGEDSKYFILE,    topurgedskyfileMode);
     105        MODECASE(WARPTOOL_MODE_TOSCRUBBEDSKYFILE,  toscrubbedskyfileMode);
    104106        MODECASE(WARPTOOL_MODE_TOFULLSKYFILE,      tofullskyfileMode);
    105107        MODECASE(WARPTOOL_MODE_UPDATESKYFILE,      updateskyfileMode);
    … …  
    234236    PXOPT_COPY_F64(config->args,   where, "-posang_max",         "rawExp.posang",         "<");
    235237    PXOPT_COPY_STR(config->args,   where, "-object",             "rawExp.object",         "==");
    236     PXOPT_COPY_F32(config->args,   where, "-solang_min",         "rawExp.solang",         ">=");
    237     PXOPT_COPY_F32(config->args,   where, "-solang_max",         "rawExp.solang",         "<");
     238    PXOPT_COPY_F32(config->args,   where, "-sun_angle_min",      "rawExp.sun_angle",      ">=");
     239    PXOPT_COPY_F32(config->args,   where, "-sun_angle_max",      "rawExp.sun_angle",      "<");
    238240    PXOPT_COPY_STR(config->args,   where, "-reduction",          "fakeRun.reduction",     "==");
    239241    pxAddLabelSearchArgs (config,  where, "-label",             "fakeRun.label",         "==");
    … …  
    16681670    return change_skyfile_data_state(config, "purged", "goto_purged");
    16691671}
     1672static bool toscrubbedskyfileMode(pxConfig *config)
     1673{
     1674     return change_skyfile_data_state(config, "scrubbed", "goto_scrubbed");
     1675}
    16701676
    16711677static bool updateskyfileMode(pxConfig *config)

  • trunk/ippTools/src/warptool.h

    r24426 r25324  
    4949    WARPTOOL_MODE_TOCLEANEDSKYFILE,
    5050    WARPTOOL_MODE_TOPURGEDSKYFILE,
     51    WARPTOOL_MODE_TOSCRUBBEDSKYFILE,
    5152    WARPTOOL_MODE_TOFULLSKYFILE,
    5253    WARPTOOL_MODE_UPDATESKYFILE,

  • trunk/ippTools/src/warptoolConfig.c

    r24956 r25324  
    279279    psMetadataAddStr(topurgedskyfileArgs, PS_LIST_TAIL, "-skycell_id", 0, "skycell ID to update", NULL);
    280280
     281    // -toscrubbedskyfile
     282    psMetadata *toscrubbedskyfileArgs = psMetadataAlloc();
     283    psMetadataAddS64(toscrubbedskyfileArgs, PS_LIST_TAIL, "-warp_id", 0, "warptool ID to update", 0);
     284    psMetadataAddStr(toscrubbedskyfileArgs, PS_LIST_TAIL, "-skycell_id", 0, "skycell ID to update", NULL);
     285
    281286    // -tofullskyfile
    282287    psMetadata *tofullskyfileArgs = psMetadataAlloc();
    … …  
    328333    PXOPT_ADD_MODE("-tocleanedskyfile", "set skyfile as cleaned", WARPTOOL_MODE_TOCLEANEDSKYFILE, tocleanedskyfileArgs);
    329334    PXOPT_ADD_MODE("-topurgedskyfile", "set skyfile as purged", WARPTOOL_MODE_TOPURGEDSKYFILE, topurgedskyfileArgs);
     335    PXOPT_ADD_MODE("-toscrubbedskyfile", "set skyfile as scrubbed", WARPTOOL_MODE_TOSCRUBBEDSKYFILE, toscrubbedskyfileArgs);
    330336    PXOPT_ADD_MODE("-tofullskyfile", "set skyfile as full (updated)", WARPTOOL_MODE_TOFULLSKYFILE, tofullskyfileArgs);
    331337    PXOPT_ADD_MODE("-updateskyfile", "update fault code for skyfile", WARPTOOL_MODE_UPDATESKYFILE, updateskyfileArgs);

  • trunk/ppImage/src/ppImageOptions.c

    r25299 r25324  
    6666    options->markValue       = 0x00;    // A safe bit for internal marking
    6767    options->burntoolMask    = 0x00;    // Suspect pixels that fall where a burntool trail is expected.
    68     options->burntoolTrails  = 0x00;    // Which types of burntool areas to mask.
     68    options->burntoolTrails  = 0x07;    // Which types of burntool areas to mask.
    6969    // crosstalk options
    7070    options->doCrosstalkMeasure = false;   // measure crosstalk
    … …  
    248248    options->applyParity = psMetadataLookupBool(NULL, recipe, "APPLY.CELL.PARITY");
    249249
    250     options->burntoolTrails = psMetadataLookupU16(&status, recipe, "BURNTOOL.TRAILS");
     250    options->burntoolTrails = psMetadataLookupS32(&status, recipe, "BURNTOOL.TRAILS");
     251    fprintf(stderr,"TRAILS: %d %d %d\n",options->burntoolTrails,psMetadataLookupS32(&status,recipe,"BURNTOOL.TRAILS"),status);
    251252    if (!status) {
    252253      psWarning("BURNTOOL.TRAILS not found in recipe: setting to default value.\n");

  • trunk/psModules/src/astrom/pmAstrometryWCS.c

    r25299 r25324  
    290290    if (pcKeys) {
    291291        wcs->wcsCDkeys = 0;
    292 
    293292        wcs->cdelt1 = psMetadataLookupF64 (&status, header, "CDELT1");
    294293        wcs->cdelt2 = psMetadataLookupF64 (&status, header, "CDELT2");
    … …  
    379378    // XXX make it optional to write out CDi_j terms, or other versions
    380379    // apply CDELT1,2 (degrees / pixel) to yield PCi,j terms of order unity
    381 
    382380    if (!(wcs->wcsCDkeys)) {
    383381
    … …  
    423421    }
    424422    if (wcs->wcsCDkeys) {
     423
    425424      psMetadataAddF64 (header, PS_LIST_TAIL, "CD1_1", PS_META_REPLACE, "", wcs->trans->x->coeff[1][0]);
    426425      psMetadataAddF64 (header, PS_LIST_TAIL, "CD1_2", PS_META_REPLACE, "", wcs->trans->x->coeff[0][1]);

  • trunk/psModules/src/camera/pmReadoutFake.c

    • Property svn:mergeinfo changed (with no actual effect on merging)

  • trunk/tools/ipp_apply_burntool.pl

    r25299 r25324  
    140140    my $tempfile = new File::Temp ( TEMPLATE => "$basename.XXXX",
    141141                                    DIR => '/tmp',
    142                                     UNLINK => !$save_temps);
     142                                    UNLINK => !$save_temps,
     143                                    SUFFIX => '.fits');
    143144    my $tmpImfileReal = $tempfile->filename;
    144145    # print "tmpImfile: $tmpImfile -> $tmpImfileReal\n";
Note: See TracChangeset for help on using the changeset viewer.