Index: /tags/ipp-20130712/ippTasks/diff.pro =================================================================== --- /tags/ipp-20130712/ippTasks/diff.pro (revision 37057) +++ /tags/ipp-20130712/ippTasks/diff.pro (revision 37058) @@ -61,4 +61,22 @@ end task diff.revert + active false + end +end + +macro diff.summary.on + task diff.summary.load + active true + end + task diff.summary.run + active true + end +end + +macro diff.summary.off + task diff.summary.load + active false + end + task diff.summary.run active false end @@ -125,4 +143,9 @@ add_poll_args run add_poll_labels run + # increase the poll limit for warp over the default to + # help it keep up with chip processing + # NOTE : it is not a problem for difftool to have multiple + # -limit entries: the last one is used + $run = $run -limit {$POLL_LIMIT * 2} command $run end Index: /tags/ipp-20130712/ippTasks/ipphosts.mhpcc.config =================================================================== --- /tags/ipp-20130712/ippTasks/ipphosts.mhpcc.config (revision 37057) +++ /tags/ipp-20130712/ippTasks/ipphosts.mhpcc.config (revision 37058) @@ -18,5 +18,5 @@ ipphosts METADATA camera STR skycell - count S32 30 + count S32 60 sky00 STR stsci00.0 sky01 STR stsci00.1 @@ -49,4 +49,34 @@ sky28 STR stsci09.1 sky29 STR stsci09.2 + sky30 STR stsci10.0 + sky31 STR stsci10.1 + sky32 STR stsci10.2 + sky33 STR stsci11.0 + sky34 STR stsci11.1 + sky35 STR stsci11.2 + sky36 STR stsci12.0 + sky37 STR stsci12.1 + sky38 STR stsci12.2 + sky39 STR stsci13.0 + sky40 STR stsci13.1 + sky41 STR stsci13.2 + sky42 STR stsci14.0 + sky43 STR stsci14.1 + sky44 STR stsci14.2 + sky45 STR stsci15.0 + sky46 STR stsci15.1 + sky47 STR stsci15.2 + sky48 STR stsci16.0 + sky49 STR stsci16.1 + sky50 STR stsci16.2 + sky51 STR stsci17.0 + sky52 STR stsci17.1 + sky53 STR stsci17.2 + sky54 STR stsci18.0 + sky55 STR stsci18.1 + sky56 STR stsci18.2 + sky57 STR stsci19.0 + sky58 STR stsci19.1 + sky59 STR stsci19.2 END Index: /tags/ipp-20130712/ippTasks/pantasks.pro =================================================================== --- /tags/ipp-20130712/ippTasks/pantasks.pro (revision 37057) +++ /tags/ipp-20130712/ippTasks/pantasks.pro (revision 37058) @@ -645,4 +645,5 @@ host anyhost else + # echo host $host host $host end @@ -655,5 +656,5 @@ end - local skycellID varname count host skyname skyhash + local skycellID varname count host skyname skyhash fullhost $skycellID = $1 @@ -676,9 +677,12 @@ # missing ipphosts table results in host = NULL - book getword ipphosts skycell $skyname -var host + book getword ipphosts skycell $skyname -var fullhost + list word -splitbychar . $fullhost + $host = $word:0 if ("$host" == "NULL") host anyhost else + # echo host $host host $host end Index: /tags/ipp-20130712/ippTasks/stack.pro =================================================================== --- /tags/ipp-20130712/ippTasks/stack.pro (revision 37057) +++ /tags/ipp-20130712/ippTasks/stack.pro (revision 37058) @@ -72,4 +72,22 @@ active false end + task stack.summary.load + active false + end + task stack.summary.run + active false + end +end + +macro stack.summary.on + task stack.summary.load + active true + end + task stack.summary.run + active true + end +end + +macro stack.summary.off task stack.summary.load active false Index: /tags/ipp-20130712/ippTasks/summit.copy.pro =================================================================== --- /tags/ipp-20130712/ippTasks/summit.copy.pro (revision 37057) +++ /tags/ipp-20130712/ippTasks/summit.copy.pro (revision 37058) @@ -567,8 +567,13 @@ command pztool -clearcommonfaults -dbname $DB:$pztoolClearFault_DB + # loop over the multiple databases quickly, then pause for 5 min $pztoolClearFault_DB ++ - if ($pztoolClearFault_DB >= $DB:n) set pztoolClearFault_DB = 0 + if ($pztoolClearFault_DB >= $DB:n) + set pztoolClearFault_DB = 0 + periods -exec 300 + else + periods -exec 30 + end end - periods -exec 1800 end Index: /tags/ipp-20130712/ippTasks/survey.pro =================================================================== --- /tags/ipp-20130712/ippTasks/survey.pro (revision 37057) +++ /tags/ipp-20130712/ippTasks/survey.pro (revision 37058) @@ -1434,6 +1434,8 @@ host local - periods -poll $SURVEY_POLL - periods -exec $SURVEY_EXEC + # we are going to use a long timeout (900 sec) between passes of the list + # and a short timeout (10 sec) while we are doing the full list + periods -exec 10 + periods -poll 2 periods -timeout $SURVEY_TIMEOUT npending 1 @@ -1446,7 +1448,10 @@ book npages SURVEY_PUBLISH -var N if ($N == 0) - # echo "No labels for processing" + # echo "No labels for processing" break endif + + # short timeout while we have something to do + periods -exec 10 # survey.publish allows multiple entries per label. @@ -1462,7 +1467,10 @@ book getpage SURVEY_PUBLISH 0 -var tag -key STATE NEW - # Select different database - $SURVEY_PUBLISH ++ - if ($SURVEY_PUBLISH >= $DB:n) set SURVEY_PUBLISH = 0 + # Select different database, set a long timeout + $SURVEY_PUBLISH_DB ++ + if ($SURVEY_PUBLISH_DB >= $DB:n) set SURVEY_PUBLISH_DB = 0 + periods -exec 900 + date -var mytime + echo "done with publish list @ $mytime" end @@ -1481,10 +1489,9 @@ option DEFAULT else - $run = $run -dbname $DB:$SURVEY_PUBLISH - option $DB:$SURVEY_PUBLISH + $run = $run -dbname $DB:$SURVEY_PUBLISH_DB + option $DB:$SURVEY_PUBLISH_DB end # echo $run - command $run Index: /tags/ipp-20130712/ippTasks/warp.pro =================================================================== --- /tags/ipp-20130712/ippTasks/warp.pro (revision 37057) +++ /tags/ipp-20130712/ippTasks/warp.pro (revision 37058) @@ -279,4 +279,9 @@ add_poll_args run add_poll_labels run + # increase the poll limit for warp over the default to + # help it keep up with chip processing + # NOTE : it is not a problem for warptool to have multiple + # -limit entries: the last one is used + $run = $run -limit {$POLL_LIMIT * 2} command $run end