Index: trunk/ippTasks/detrend.norm.pro =================================================================== --- trunk/ippTasks/detrend.norm.pro (revision 28539) +++ trunk/ippTasks/detrend.norm.pro (revision 28557) @@ -64,8 +64,36 @@ end +macro detnorm.revert.off + task detrend.norm.revert + active false + end + task detrend.normexp.revert + active false + end + task detrend.normstat.revert + active false + end +end + +macro detnorm.revert.on + task detrend.norm.revert + active true + end + task detrend.normexp.revert + active true + end + task detrend.normstat.revert + active true + end +end + + # these variables will cycle through the known database names $detPendingNormStatImfile_DB = 0 $detPendingNormImfile_DB = 0 $detPendingNormExp_DB = 0 +$detPendingNormStatImfile_DB_revert = 0 +$detPendingNormImfile_DB_revert = 0 +$detPendingNormExp_DB_revert = 0 # select images ready for copy @@ -440,2 +468,140 @@ end end + +task detrend.norm.revert + host local + + periods -poll 60.0 + periods -exec 1800.0 + periods -timeout 120.0 + npending 1 + + stdout NULL + stderr $LOGDIR/revert.log + + task.exec + + $run = dettool -revertnormalizedimfile -all + if ($DB:n == 0) + option DEFAULT + else + # save the DB name for the exit tasks + option $DB:$detPendingNormImfile_DB_revert + $run = $run -dbname $DB:$detPendingNormImfile_DB_revert + $detPendingNormImfile_DB_revert ++ + if ($detPendingNormImfile_DB_revert >= $DB:n) set detPendingNormImfile_DB_revert = 0 + end + echo $run + command $run + end + + # success + task.exit 0 + end + + # locked list + task.exit default + showcommand failure + end + + task.exit crash + showcommand crash + end + + # operation times out? + task.exit timeout + showcommand timeout + end +end + +task detrend.normexp.revert + host local + + periods -poll 60.0 + periods -exec 1800.0 + periods -timeout 120.0 + npending 1 + + stdout NULL + stderr $LOGDIR/revert.log + + task.exec + + $run = dettool -revertnormalizedexp -all + if ($DB:n == 0) + option DEFAULT + else + # save the DB name for the exit tasks + option $DB:$detPendingNormExp_DB_revert + $run = $run -dbname $DB:$detPendingNormExp_DB_revert + $detPendingNormExp_DB_revert ++ + if ($detPendingNormExp_DB_revert >= $DB:n) set detPendingNormExp_DB_revert = 0 + end + echo $run + command $run + end + + # success + task.exit 0 + end + + # locked list + task.exit default + showcommand failure + end + + task.exit crash + showcommand crash + end + + # operation times out? + task.exit timeout + showcommand timeout + end +end + +task detrend.normstat.revert + host local + + periods -poll 60.0 + periods -exec 1800.0 + periods -timeout 120.0 + npending 1 + + stdout NULL + stderr $LOGDIR/revert.log + + task.exec + + $run = dettool -revertnormalizedstat -all + if ($DB:n == 0) + option DEFAULT + else + # save the DB name for the exit tasks + option $DB:$detPendingNormStatImfile_DB_revert + $run = $run -dbname $DB:$detPendingNormStatImfile_DB_revert + $detPendingNormStatImfile_DB_revert ++ + if ($detPendingNormStatImfile_DB_revert >= $DB:n) set detPendingNormStatImfile_DB_revert = 0 + end + echo $run + command $run + end + + # success + task.exit 0 + end + + # locked list + task.exit default + showcommand failure + end + + task.exit crash + showcommand crash + end + + # operation times out? + task.exit timeout + showcommand timeout + end +end Index: trunk/ippTasks/detrend.process.pro =================================================================== --- trunk/ippTasks/detrend.process.pro (revision 28539) +++ trunk/ippTasks/detrend.process.pro (revision 28557) @@ -51,8 +51,27 @@ end +macro detproc.revert.off + task detrend.process.revert + active false + end + task detrend.processexp.revert + active false + end +end + +macro detproc.revert.on + task detrend.process.revert + active true + end + task detrend.processexp.revert + active true + end +end # these variables will cycle through the known database names $detPendingProcessedImfile_DB = 0 $detPendingProcessedExp_DB = 0 +$detPendingProcessedImfile_revert_DB = 0 +$detPendingProcessedExp_revert_DB = 0 # select images ready for copy @@ -313,2 +332,94 @@ end end + +task detrend.process.revert + host local + + periods -poll 60.0 + periods -exec 1800.0 + periods -timeout 120.0 + npending 1 + + stdout NULL + stderr $LOGDIR/revert.log + + task.exec + + $run = dettool -revertprocessedimfile -all + if ($DB:n == 0) + option DEFAULT + else + # save the DB name for the exit tasks + option $DB:$detPendingProcessedImfile_revert_DB + $run = $run -dbname $DB:$detPendingProcessedImfile_revert_DB + $detPendingProcessedImfile_revert_DB ++ + if ($detPendingProcessedImfile_revert_DB >= $DB:n) set detPendingProcessedImfile_revert_DB = 0 + end + echo $run + command $run + end + + # success + task.exit 0 + end + + # locked list + task.exit default + showcommand failure + end + + task.exit crash + showcommand crash + end + + # operation times out? + task.exit timeout + showcommand timeout + end +end + +task detrend.processexp.revert + host local + + periods -poll 60.0 + periods -exec 1800.0 + periods -timeout 120.0 + npending 1 + + stdout NULL + stderr $LOGDIR/revert.log + + task.exec + + $run = dettool -revertprocessedexp -all + if ($DB:n == 0) + option DEFAULT + else + # save the DB name for the exit tasks + option $DB:$detPendingProcessedExp_revert_DB + $run = $run -dbname $DB:$detPendingProcessedExp_revert_DB + $detPendingProcessedExp_revert_DB ++ + if ($detPendingProcessedExp_revert_DB >= $DB:n) set detPendingProcessedExp_revert_DB = 0 + end + echo $run + command $run + end + + # success + task.exit 0 + end + + # locked list + task.exit default + showcommand failure + end + + task.exit crash + showcommand crash + end + + # operation times out? + task.exit timeout + showcommand timeout + end +end Index: trunk/ippTasks/detrend.resid.pro =================================================================== --- trunk/ippTasks/detrend.resid.pro (revision 28539) +++ trunk/ippTasks/detrend.resid.pro (revision 28557) @@ -49,7 +49,27 @@ end +macro detresid.revert.on + task detrend.resid.revert + active true + end + task detrend.residexp.revert + active true + end +end + +macro detresid.revert.off + task detrend.resid.revert + active false + end + task detrend.residexp.revert + active false + end +end + # these variables will cycle through the known database names $detPendingResidImfile_DB = 0 $detPendingResidExp_DB = 0 +$detPendingResidImfile_revert_DB = 0 +$detPendingResidExp_revert_DB = 0 # select images ready for copy @@ -316,2 +336,95 @@ end end + +task detrend.resid.revert + host local + + periods -poll 60.0 + periods -exec 1800.0 + periods -timeout 120.0 + npending 1 + + stdout NULL + stderr $LOGDIR/revert.log + + task.exec + + $run = dettool -revertresidimfile -all + if ($DB:n == 0) + option DEFAULT + else + # save the DB name for the exit tasks + option $DB:$detPendingResidImfile_revert_DB + $run = $run -dbname $DB:$detPendingResidImfile_revert_DB + $detPendingResidImfile_revert_DB ++ + if ($detPendingResidImfile_revert_DB >= $DB:n) set detPendingResidImfile_revert_DB = 0 + end + echo $run + command $run + end + + # success + task.exit 0 + end + + # locked list + task.exit default + showcommand failure + end + + task.exit crash + showcommand crash + end + + # operation times out? + task.exit timeout + showcommand timeout + end +end + +task detrend.residexp.revert + host local + + periods -poll 60.0 + periods -exec 1800.0 + periods -timeout 120.0 + npending 1 + + stdout NULL + stderr $LOGDIR/revert.log + + task.exec + + + $run = dettool -revertresidexp -all + if ($DB:n == 0) + option DEFAULT + else + # save the DB name for the exit tasks + option $DB:$detPendingResidExp_revert_DB + $run = $run -dbname $DB:$detPendingResidExp_revert_DB + $detPendingResidExp_revert_DB ++ + if ($detPendingResidExp_revert_DB >= $DB:n) set detPendingResidExp_revert_DB = 0 + end + echo $run + command $run + end + + # success + task.exit 0 + end + + # locked list + task.exit default + showcommand failure + end + + task.exit crash + showcommand crash + end + + # operation times out? + task.exit timeout + showcommand timeout + end +end Index: trunk/ippTasks/detrend.stack.pro =================================================================== --- trunk/ippTasks/detrend.stack.pro (revision 28539) +++ trunk/ippTasks/detrend.stack.pro (revision 28557) @@ -35,6 +35,19 @@ end +macro detstack.revert.off + task detrend.stack.revert + active false + end +end + +macro detstack.revert.on + task detrend.stack.revert + active true + end +end + # this variable will cycle through the known database names $detPendingStackedImfile_DB = 0 +$detPendingStackedImfile_revert_DB = 0 # select images ready for detrend_stack.pl @@ -165,2 +178,49 @@ end end + + +task detrend.stack.revert + host local + + periods -poll 60.0 + periods -exec 1800.0 + periods -timeout 120.0 + npending 1 + + stdout NULL + stderr $LOGDIR/revert.log + + task.exec + + $run = dettool -revertstacked -all + if ($DB:n == 0) + option DEFAULT + else + # save the DB name for the exit tasks + option $DB:$detPendingStackedImfile_revert_DB + $run = $run -dbname $DB:$detPendingStackedImfile_revert_DB + $detPendingStackedImfile_revert_DB ++ + if ($detPendingStackedImfile_revert_DB >= $DB:n) set detPendingStackedImfile_revert_DB = 0 + end + echo $run + command $run + end + + # success + task.exit 0 + end + + # locked list + task.exit default + showcommand failure + end + + task.exit crash + showcommand crash + end + + # operation times out? + task.exit timeout + showcommand timeout + end +end Index: trunk/ippTasks/pantasks.pro =================================================================== --- trunk/ippTasks/pantasks.pro (revision 28539) +++ trunk/ippTasks/pantasks.pro (revision 28557) @@ -240,4 +240,18 @@ detreject.off detcorr.off +end + +macro detrend.revert.off + detproc.revert.off + detstack.revert.off + detnorm.revert.off + detresid.revert.off +end + +macro detrend.revert.on + detproc.revert.on + detstack.revert.on + detnorm.revert.on + detresid.revert.on end