Index: /branches/czw_branch/20120906/ippTasks/bg.regeneration.pro
===================================================================
--- /branches/czw_branch/20120906/ippTasks/bg.regeneration.pro	(revision 34780)
+++ /branches/czw_branch/20120906/ippTasks/bg.regeneration.pro	(revision 34781)
@@ -91,5 +91,5 @@
       $run = $run -dbname $DB:$bgRegWarp_DB
       $bgRegWarp_DB ++
-      if ($bgRegWarp_DB >= $DB:nn) set bgRegWarp_DB = 0
+      if ($bgRegWarp_DB >= $DB:n) set bgRegWarp_DB = 0
     end
     add_poll_args run
@@ -103,5 +103,5 @@
   task.exit    0
     # convert 'stdout' to book format
-    ipptool2book stdout bgRegWarp -key warp_id:skycell_id -uniq -setword -dbname $options:0 -setword pantaskState INIT
+    ipptool2book stdout bgRegWarp -key warp_id:skycell_id -uniq -setword dbname $options:0 -setword pantaskState INIT
     if ($VERBOSE > 2)
       book listbook bgRegWarp
@@ -148,4 +148,5 @@
     book getword bgRegWarp $pageName skycell_id -var SKYCELL_ID
     book getword bgRegWarp $pageName camera -var CAMERA
+    book getword bgRegWarp $pageName dbname -var DBNAME
 
     set.host.for.skycell $SKYCELL_ID
@@ -154,5 +155,5 @@
     stderr $LOGDIR/bgreg.warp.log
 
-    $run = regenerate_background.pl --stage_id $STAGE_ID --skycell_id $SKYCELL_ID --camera $CAMERA
+    $run = regenerate_background.pl --stage warp --stage_id $STAGE_ID --skycell_id $SKYCELL_ID --camera $CAMERA
 
     add_standard_args run
@@ -185,7 +186,6 @@
 end
 
-
-# Load task for warp
-task            bgreg.warp.load
+# Load task for stack
+task            bgreg.stack.load
   host          local
 
@@ -196,125 +196,9 @@
 
   stdout        NULL
-  stderr        $LOGDIR/bgreg.warp.load
+  stderr        $LOGDIR/bgreg.stack.load
 
   task.exec
     if ($LABEL:n == 0) break
-    $run = warptool -warped -background_model 0
-    if ($DB:n == 0) 
-      option DEFAULT
-    else
-      #save the DB naem for the exit tasks
-      option $DB:$bgRegWarp_DB
-      $run = $run -dbname $DB:$bgRegWarp_DB
-      $bgRegWarp_DB ++
-      if ($bgRegWarp_DB >= $DB:nn) set bgRegWarp_DB = 0
-    end
-    add_poll_args run
-    add_poll_labels run
-    # change the limit?
-    $run = $run -limit $POLL_LIMIT_BGREG
-    command $run
-  end
-
-  # success
-  task.exit    0
-    # convert 'stdout' to book format
-    ipptool2book stdout bgRegWarp -key warp_id:skycell_id -uniq -setword -dbname $options:0 -setword pantaskState INIT
-    if ($VERBOSE > 2)
-      book listbook bgRegWarp
-    end
-
-    # delete existing entries in the appropriate pantaskStates
-    process_cleanup bgRegWarp
-  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           bgreg.warp.run
-  periods      -poll $RUNPOLL
-  periods      -exec $RUNEXEC
-  periods      -timeout 60
-
-  task.exec
-    # if we can't exec, set the retry time long
-    periods -exec $RUNEXEC
-
-    book npages bgRegWarp -var N
-    if ($N == 0) break
-    if ($NETWORK == 0) break
-
-    # look for new pages
-    book getpage bgRegWarp 0 -var pageName -key pantaskState INIT
-    if ("$pageName" == "NULL") break
-
-    book setword bgRegWarp $pageName pantaskState RUN
-    book getword bgRegWarp $pageName warp_id -var STAGE_ID
-    book getword bgRegWarp $pageName skycell_id -var SKYCELL_ID
-    book getword bgRegWarp $pageName camera -var CAMERA
-
-    set.host.for.skycell $SKYCELL_ID
-
-    stdout $LOGDIR/bgreg.warp.log
-    stderr $LOGDIR/bgreg.warp.log
-
-    $run = regenerate_background.pl --stage warp --stage_id $STAGE_ID --skycell_id $SKYCELL_ID --camera $CAMERA
-
-    add_standard_args run
-    options $pageName
-
-    if ($VERBOSE > 1)
-      echo command $run
-    end
-    periods -exec 0.05
-    command $run
-  end
-
-  # default exit status
-  task.exit        default
-    process_exit bgRegWarp $options:0 $JOB_STATUS
-  end
-
-  # locked list
-  task.exit        crash
-    showcommand crash
-    echo "hostname: $JOB_HOSTNAME"
-    book setword bgRegWarp $options:0 pantasksState CRASH
-  end
-
-  # operation timed out
-  task.exit        timeout
-    showcommand timeout
-    book setword bgRegWarp $options:0 pantaskState TIMEOUT
-  end
-end
-
-# Load task for stack
-task            bgreg.stack.load
-  host          local
-
-  periods       -poll $LOADPOLL
-  periods       -poll $LOADEXEC
-  periods       -timeout 30
-  npending      1
-
-  stdout        NULL
-  stderr        $LOGDIR/bgreg.stack.load
-
-  task.exec
-    if ($LABEL:n == 0) break
-    $run = stacktool -sumskyfile -background_model 0
+    $run = stacktool -tobkg
     if ($DB:n == 0) 
       option DEFAULT
@@ -324,5 +208,5 @@
       $run = $run -dbname $DB:$bgRegStack_DB
       $bgRegStack_DB ++
-      if ($bgRegStack_DB >= $DB:nn) set bgRegStack_DB = 0
+      if ($bgRegStack_DB >= $DB:n) set bgRegStack_DB = 0
     end
     add_poll_args run
@@ -336,5 +220,5 @@
   task.exit    0
     # convert 'stdout' to book format
-    ipptool2book stdout bgRegStack -key stack_id:skycell_id -uniq -setword -dbname $options:0 -setword pantaskState INIT
+    ipptool2book stdout bgRegStack -key stack_id:skycell_id -uniq -setword dbname $options:0 -setword pantaskState INIT
     if ($VERBOSE > 2)
       book listbook bgRegStack
@@ -381,5 +265,5 @@
     book getword bgRegStack $pageName skycell_id -var SKYCELL_ID
     book getword bgRegStack $pageName camera -var CAMERA
-
+    book getword bgRegStack $pageName dbname -var DBNAME
     set.host.for.skycell $SKYCELL_ID