IPP Software Navigation Tools IPP Links Communication Pan-STARRS Links

Changeset 25324 for trunk/ippTasks


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:
3 edited

Legend:

Unmodified
Added
Removed
  • trunk

  • 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
Note: See TracChangeset for help on using the changeset viewer.