Index: branches/eam_branch_00/ippTasks/detrend.resid.pro =================================================================== --- branches/eam_branch_00/ippTasks/detrend.resid.pro (revision 11019) +++ branches/eam_branch_00/ippTasks/detrend.resid.pro (revision 11109) @@ -1,3 +1,4 @@ ## this file contains the tasks for running the detrend processing stage +## these tasks use the books detPendingResidImfile and detPendingResidExp if ($?network == 0) @@ -19,14 +20,14 @@ exec mkdir -p $LOGSUBDIR -book init DetrendResidImfiles -book init DetrendResidExposures +book init detPendingResidImfile +book init detPendingResidExp macro detresid.status - book listbook DetrendResidImfiles - book listbook DetrendResidExposures + book listbook detPendingResidImfile + book listbook detPendingResidExp end # select images ready for copy -# new entries are added to DetrendResidImfiles +# new entries are added to detPendingResidImfile # compare the new list with the ones already selected task dettool.resid.load @@ -37,5 +38,5 @@ periods -timeout 30 - stdout $LOGSUBDIR/detresid.log + stdout NULL stderr $LOGSUBDIR/detresid.log @@ -47,11 +48,11 @@ task.exit 0 # convert 'stdout' to book format - ipptool2book stdout DetrendResidImfiles -key det_id:iteration:exp_tag:class_id -uniq + ipptool2book stdout detPendingResidImfile -key det_id:iteration:exp_tag:class_id -uniq if ($VERBOSE > 2) - book listbook DetrendResidImfiles + book listbook detPendingResidImfile end # delete existing entries which are DONE - book delpage DetrendResidImfiles -key state DONE + book delpage detPendingResidImfile -key state DONE end @@ -74,22 +75,22 @@ task.exec - book npages DetrendResidImfiles -var N + book npages detPendingResidImfile -var N if ($N == 0) break if ($network == 0) break - # look for new images in DetrendResidImfiles - book getpage DetrendResidImfiles 0 -var pageName -key state NULL + # look for new images in detPendingResidImfile + book getpage detPendingResidImfile 0 -var pageName -key state NULL if ($pageName == NULL) break - book setword DetrendResidImfiles $pageName state RUN - book getword DetrendResidImfiles $pageName det_id -var DET_ID - book getword DetrendResidImfiles $pageName iteration -var ITERATION - book getword DetrendResidImfiles $pageName det_type -var DET_TYPE - book getword DetrendResidImfiles $pageName mode -var MODE - book getword DetrendResidImfiles $pageName exp_tag -var EXP_TAG - book getword DetrendResidImfiles $pageName class_id -var CLASS_ID - book getword DetrendResidImfiles $pageName uri -var URI - book getword DetrendResidImfiles $pageName det_uri -var DET_URI - book getword DetrendResidImfiles $pageName camera -var CAMERA + book setword detPendingResidImfile $pageName state RUN + book getword detPendingResidImfile $pageName det_id -var DET_ID + book getword detPendingResidImfile $pageName iteration -var ITERATION + book getword detPendingResidImfile $pageName det_type -var DET_TYPE + book getword detPendingResidImfile $pageName mode -var MODE + book getword detPendingResidImfile $pageName exp_tag -var EXP_TAG + book getword detPendingResidImfile $pageName class_id -var CLASS_ID + book getword detPendingResidImfile $pageName uri -var URI + book getword detPendingResidImfile $pageName det_uri -var DET_URI + book getword detPendingResidImfile $pageName camera -var CAMERA # specify choice of remote host: @@ -100,4 +101,5 @@ end + # XXX use ipp_filename.pl to lookup output file names $word = `basename $EXP_TAG | tr '.' ' '` list word -split $word @@ -117,24 +119,18 @@ end - # success - task.exit 0 - book setword DetrendResidImfiles $options:0 state DONE - end - - # default exit status - task.exit default - showcommand failure - book setword DetrendResidImfiles $options:0 state FAIL - end - - # operation times out? - task.exit timeout - showcommand timeout - book setword DetrendResidImfiles $options:0 state TIMEOUT + # default exit status + task.exit default + process_exit detPendingResidImfile $options:0 $JOB_STATUS + end + + # operation times out? + task.exit timeout + showcommand timeout + book setword detPendingResidImfile $options:0 state TIMEOUT end end # select images ready for copy -# new entries are added to DetrendResidExposures +# new entries are added to detPendingResidExp # compare the new list with the ones already selected task dettool.residexp.load @@ -145,5 +141,5 @@ periods -timeout 30 - stdout $LOGSUBDIR/detresid.exp.log + stdout NULL stderr $LOGSUBDIR/detresid.exp.log @@ -155,11 +151,11 @@ task.exit 0 # convert 'stdout' to book format - ipptool2book stdout DetrendResidExposures -key det_id:iteration:exp_tag -uniq + ipptool2book stdout detPendingResidExp -key det_id:iteration:exp_tag -uniq if ($VERBOSE > 2) - book listbook DetrendResidExposures + book listbook detPendingResidExp end # delete existing entries which are DONE - book delpage DetrendResidExposures -key state DONE + book delpage detPendingResidExp -key state DONE end @@ -182,20 +178,20 @@ task.exec - book npages DetrendResidExposures -var N + book npages detPendingResidExp -var N if ($N == 0) break if ($network == 0) break - # look for new images in DetrendResidExposures - book getpage DetrendResidExposures 0 -var pageName -key state NULL + # look for new images in detPendingResidExp + book getpage detPendingResidExp 0 -var pageName -key state NULL if ($pageName == NULL) break - book setword DetrendResidExposures $pageName state RUN - book getword DetrendResidExposures $pageName det_id -var DET_ID - book getword DetrendResidExposures $pageName iteration -var ITERATION - book getword DetrendResidExposures $pageName det_type -var DET_TYPE - book getword DetrendResidExposures $pageName mode -var MODE - book getword DetrendResidExposures $pageName exp_tag -var EXP_TAG - book getword DetrendResidExposures $pageName include -var INCLUDE - book getword DetrendResidExposures $pageName camera -var CAMERA + book setword detPendingResidExp $pageName state RUN + book getword detPendingResidExp $pageName det_id -var DET_ID + book getword detPendingResidExp $pageName iteration -var ITERATION + book getword detPendingResidExp $pageName det_type -var DET_TYPE + book getword detPendingResidExp $pageName mode -var MODE + book getword detPendingResidExp $pageName exp_tag -var EXP_TAG + book getword detPendingResidExp $pageName include -var INCLUDE + book getword detPendingResidExp $pageName camera -var CAMERA # specify choice of remote host: @@ -206,5 +202,5 @@ end - # XXX this is still a lame rule + # XXX use ipp_filename.pl to lookup output file names $word = `basename $EXP_TAG | tr '.' ' '` list word -split $word @@ -224,19 +220,13 @@ end - # success - task.exit 0 - book setword DetrendResidExposures $options:0 state DONE - end - - # default exit status - task.exit default - showcommand failure - book setword DetrendResidExposures $options:0 state FAIL - end - - # operation times out? - task.exit timeout - showcommand timeout - book setword DetrendResidExposures $options:0 state TIMEOUT - end -end + # default exit status + task.exit default + process_exit detPendingResidExp $options:0 $JOB_STATUS + end + + # operation times out? + task.exit timeout + showcommand timeout + book setword detPendingResidExp $options:0 state TIMEOUT + end +end