IPP Software Navigation Tools IPP Links Communication Pan-STARRS Links

Changeset 25402


Ignore:
Timestamp:
Sep 15, 2009, 3:59:02 PM (17 years ago)
Author:
eugene
Message:

updates from trunk

Location:
branches/eam_branches/20090715/ippTasks
Files:
10 edited
1 copied

Legend:

Unmodified
Added
Removed

  • branches/eam_branches/20090715/ippTasks/Makefile.am

    r25022 r25402  
    1313        chip.pro \
    1414        camera.pro \
     15        addstar.pro \
    1516        fake.pro \
    1617        warp.pro \
    … …  
    2526        pstamp.pro \
    2627        receive.pro \
    27         publish.pro
     28        publish.pro \
     29        science.cleanup.pro
    2830
    2931other_files = \

  • branches/eam_branches/20090715/ippTasks/detrend.cleanup.pro

    r23480 r25402  
    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

  • branches/eam_branches/20090715/ippTasks/dist.pro

    r25022 r25402  
    44check.globals
    55
    6 #$LOGSUBDIR = $LOGDIR/dist
     6$LOGSUBDIR = $LOGDIR/dist
    77mkdir $LOGSUBDIR
    88
    … …  
    122122
    123123  task.exec
     124    if ($NETWORK == 0) break
    124125    book npages distToProcess -var N
    125126    if ($N == 0)
    … …  
    128129    end
    129130    periods -exec 0.05
    130 
    131     if ($NETWORK == 0) break
    132131   
    133132    # look for new components to process (pantaskState == INIT)

  • branches/eam_branches/20090715/ippTasks/ipphosts.mhpcc.config

    r24602 r25402  
    114114  XY73  STR  ipp015
    115115  XY74  STR  ipp015
    116   XY75  STR  ipp053
    117   XY76  STR  ipp053
     116  XY75  STR  ipp025
     117  XY76  STR  ipp025
    118118END
    119119
    … …  
    193193  ota73  STR  ipp015
    194194  ota74  STR  ipp015
    195   ota75  STR  ipp053
    196   ota76  STR  ipp053
     195  ota75  STR  ipp025
     196  ota76  STR  ipp025
    197197END

  • branches/eam_branches/20090715/ippTasks/magic.pro

    r25022 r25402  
    104104    end
    105105end
     106macro magic.ds.off
     107    task magic.destreak.load
     108        active false
     109    end
     110    task magic.destreak.run
     111        active false
     112    end
     113end
     114macro magic.ds.on
     115    task magic.destreak.load
     116        active true
     117    end
     118    task magic.destreak.run
     119        active true
     120    end
     121end
     122
     123macro magic.ds.status
     124    echo magicToDS
     125    book listbook magicToDS
     126    echo ""
     127    echo magicDSToRevert
     128    book listbook magicDSToRevert
     129end
     130
    106131
    107132

  • branches/eam_branches/20090715/ippTasks/pantasks.pro

    r25022 r25402  
    213213  chip.on
    214214  camera.on
     215  addstar.on
    215216  fake.on
    216217  warp.on
    … …  
    225226  chip.off
    226227  camera.off
     228  addstar.off
    227229  fake.off
    228230  warp.off
    … …  
    242244  module chip.pro
    243245  module camera.pro
     246  module addstar.pro
    244247  module fake.pro
    245248  module warp.pro

  • branches/eam_branches/20090715/ippTasks/pstamp.pro

    r25022 r25402  
    1010
    1111# set PS_DBSERVER if postage stamp database host is not the same as the value for DBSERVER in site.config
    12 # warning: no quotes around the two words. it cause it to get passed to pstamptool as one word
    13 # tricky to debug problem ensues
     12# warning: no quotes around the two words. That causes the variable to get passed to pstamptool as one word
     13# and a tricky to debug problem ensues
    1414# example:
    15 # $PSDBSERVER = -dbserver hostname
    16 if ($?PSDBSERVER == 0)
     15# $PS_DBSERVER = -dbserver hostname
     16
     17if ($?PS_DBSERVER == 0)
    1718    $PS_DBSERVER = ""
    1819end
    … …  
    134135        end
    135136        add_poll_args run
     137        # add_poll_labels run
    136138        command $run
    137139    end
    … …  
    178180        book getword pstampRequest $pageName ds_outProduct -var PRODUCT
    179181
     182        host anyhost
     183
    180184        $run = pstamp_parser_run.pl --req_id $REQ_ID --uri $URI --product $PRODUCT --redirect-output
    181185
    … …  
    219223
    220224    task.exec
     225        $run = pstamptool  -completedreq
    221226        if ($DB:n == 0)
    222227            option DEFAULT
    223             command pstamptool  -completedreq
    224228        else
    225229            option $DB:$pstampFin_DB
    226             command pstamptool  -completedreq -dbname $DB:$pstampFin_DB $PS_DBSERVER
     230            $run = $run -dbname $DB:$pstampFin_DB $PS_DBSERVER
    227231            $pstampFin_DB ++
    228232            if ($pstampFin_DB >= $DB:n) set pstampFin_DB = 0
    229233        end
     234        add_poll_args run
     235        # add_poll_labels run
     236        command $run
    230237    end
    231238
    … …  
    313320
    314321    task.exec
     322        $run = pstamptool -pendingjob
    315323        if ($DB:n == 0)
    316324            option DEFAULT
    317             command pstamptool -pendingjob -limit 10
    318325        else
    319326            option $DB:$pstampJob_DB
    320             command pstamptool -pendingjob -limit 10 -dbname $DB:$pstampJob_DB $PS_DBSERVER
     327            $run = $run -dbname $DB:$pstampJob_DB $PS_DBSERVER
    321328            $pstampJob_DB ++
    322329            if ($pstampJob_DB >= $DB:n) set pstampJob_DB = 0
    323330        end
     331        add_poll_args run
     332        # add_poll_labels run
     333        command $run
    324334    end
    325335
    … …  
    356366    task.exec
    357367        book npages pstampJob -var N
    358         if ($N == 0) break
     368        if ($N == 0)
     369            periods -exec $RUNEXEC
     370            break
     371        end
     372        periods -exec 0.05
    359373       
    360374        book getpage pstampJob 0 -var pageName -key pantaskState INIT
    … …  
    374388        end
    375389
     390        host anyhost
    376391
    377392        $run = pstamp_job_run.pl --job_id $JOB_ID --job_type $JOB_TYPE --rownum $ROWNUM --output_base $OUTPUT_BASE --redirect-output

  • branches/eam_branches/20090715/ippTasks/publish.pro

    r24707 r25402  
    161161    book getword publishRun $pageName stage -var STAGE
    162162    book getword publishRun $pageName stage_id -var STAGE_ID
    163     book getword publishRun $pageName exp_id -var EXP_ID
    164163    book getword publishRun $pageName dbname -var DBNAME
    165164
    … …  
    170169    strsub $WORKDIR_TEMPLATE @HOST@ $default_host -var WORKDIR
    171170
    172     $run = publish_file.pl --pub_id $PUB_ID --exp_id $EXP_ID --camera $CAMERA --workdir $WORKDIR --product $PRODUCT --stage $STAGE --stage_id $STAGE_ID --redirect-output
     171    $run = publish_file.pl --pub_id $PUB_ID --camera $CAMERA --workdir $WORKDIR --product $PRODUCT --stage $STAGE --stage_id $STAGE_ID --redirect-output
    173172    add_standard_args run
    174173

  • branches/eam_branches/20090715/ippTasks/site.mhpcc.pro

    r24454 r25402  
    1414  controller host add ipp023
    1515  controller host add ipp024
     16  controller host add ipp025
    1617  controller host add ipp026
    1718  controller host add ipp028
    … …  
    3940  controller host add ipp051
    4041  controller host add ipp052
    41   controller host add ipp053
     42#  controller host add ipp053
    4243end
    4344

  • branches/eam_branches/20090715/ippTasks/summit.copy.pro

    r24054 r25402  
    380380    periods      -poll     0.05
    381381    periods      -timeout  650
    382     # trage       16:00 23:59
    383     # trage       00:00 04:00
     382    trange        -reset
     383    # only active in the night (18:00 to 06:00 HST, times are UT):
     384    # trange      04:00 16:00
     385    # only active in the day (06:00 to 18:00 HST, times are UT):
     386    # trange        16:00 23:59
     387    # trange        00:00 04:00
    384388
    385389    task.exec
    … …  
    449453        end
    450454        if (("$MD5SUM" != "NULL") && ("$MD5SUM" != "0") && (not($COMPRESS)))
     455# && (($YEAR > 2008) || (("$YEAR" = "2007") && ($MONTH > 8))))
    451456            $run = $run --md5 $MD5SUM
    452457        end
Note: See TracChangeset for help on using the changeset viewer.