Index: branches/czw_branch/20100519/ippTasks/diff.pro
===================================================================
--- branches/czw_branch/20100519/ippTasks/diff.pro	(revision 28304)
+++ branches/czw_branch/20100519/ippTasks/diff.pro	(revision 28334)
@@ -574,5 +574,5 @@
     book getword diffPendingSummary $pageName workdir -var WORKDIR_TEMPLATE
     book getword diffPendingSummary $pageName dbname -var DBNAME
-    book getword warpPendingSummary $pageName tess_id -var TESS_DIR
+    book getword diffPendingSummary $pageName tess_id -var TESS_DIR
     book getword diffPendingSummary $pageName diff_mode -var DIFF_MODE
     book getword diffPendingSummary $pageName state -var RUN_STATE
@@ -601,5 +601,5 @@
 
     ## generate outroot specific to this exposure
-    sprintf outroot "%s/%s/%s/%s.%s.%sdif.%s.summary" $WORKDIR $TESS_ID $SKYCELL_ID $TESS_ID $SKYCELL_ID $DIFF_TAG $DIFF_ID
+    sprintf outroot "%s/%s/%s.%sdif.%s.summary" $WORKDIR $TESS_ID $TESS_ID $DIFF_TAG $DIFF_ID
 
 
Index: branches/czw_branch/20100519/ippTasks/minidvodb.pro
===================================================================
--- branches/czw_branch/20100519/ippTasks/minidvodb.pro	(revision 28304)
+++ branches/czw_branch/20100519/ippTasks/minidvodb.pro	(revision 28334)
@@ -131,6 +131,6 @@
 ## you get no choice - you add all of them in at the same time. you can always turn off the tasks you don't want to run.
 macro add.minidvodb
-  if ($0 != 5)
-    echo "USAGE: add.minidvodb (minidvodb_group) (dvodb) (interval days) (camera)"
+  if ($0 != 6)
+    echo "USAGE: add.minidvodb (minidvodb_group) (minidvodb) (dvodb) (interval days) (camera)"
     break
   end
@@ -139,15 +139,15 @@
   book newpage MINIDVODB $1
   book setword MINIDVODB $1 MINIDVODB_GROUP $1
-  book setword MINIDVODB $1 DVODB $2
+  book setword MINIDVODB $1 DVODB $3
   book setword MINIDVODB $1 STATE PENDING
   #merge  
   book newpage MINIDVODB_MERGE $1
   book setword MINIDVODB_MERGE $1 MINIDVODB_GROUP $1
-  book setword MINIDVODB_MERGE $1 DVODB $2
+  book setword MINIDVODB_MERGE $1 DVODB $3
   book setword MINIDVODB_MERGE $1 STATE PENDING
   #active  
   book newpage MINIDVODB_ACTIVE $1
   book setword MINIDVODB_ACTIVE $1 MINIDVODB_GROUP $1
-  book setword MINIDVODB_ACTIVE $1 DVODB $2
+  book setword MINIDVODB_ACTIVE $1 DVODB $3
   book setword MINIDVODB_ACTIVE $1 STATE PENDING
 
@@ -155,7 +155,8 @@
   book newpage MINIDVODB_CREATE $1
   book setword MINIDVODB_CREATE $1 MINIDVODB_GROUP $1
-  book setword MINIDVODB_CREATE $1 DVODB $2
-  book setword MINIDVODB_CREATE $1 DVODB_DAYS $3
-  book setword MINIDVODB_CREATE $1 CAMERA $4  
+  book setword MINIDVODB_CREATE $1 MINIDVODB $2
+  book setword MINIDVODB_CREATE $1 DVODB $3
+  book setword MINIDVODB_CREATE $1 DVODB_DAYS $4
+  book setword MINIDVODB_CREATE $1 CAMERA $5  
   book setword MINIDVODB_CREATE $1 STATE PENDING  
 end
@@ -542,8 +543,9 @@
      
     book setword MINIDVODB_CREATE $minidvodb_group STATE DONE
+    book getword MINIDVODB_CREATE $minidvodb_group MINIDVODB -var minidvodb 
     book getword MINIDVODB_CREATE $minidvodb_group DVODB -var dvodb 
     book getword MINIDVODB_CREATE $minidvodb_group DVODB_DAYS -var dvodb_days
     book getword MINIDVODB_CREATE $minidvodb_group CAMERA -var camera
-    $run = minidvodb_createdb.pl --camera $camera --outroot $dvodb --dvodb $dvodb --minidvodb_group $minidvodb_group --interval $dvodb_days
+    $run = minidvodb_createdb.pl --camera $camera --outroot $dvodb --dvodb $dvodb --minidvodb $minidvodb --minidvodb_group $minidvodb_group --interval $dvodb_days
  
     if ($DB:n == 0)
Index: branches/czw_branch/20100519/ippTasks/stack.pro
===================================================================
--- branches/czw_branch/20100519/ippTasks/stack.pro	(revision 28304)
+++ branches/czw_branch/20100519/ippTasks/stack.pro	(revision 28334)
@@ -10,4 +10,5 @@
 ### Initialise the books containing the tasks to do
 book init stackSumSkyfile
+book init stackPendingSummary
 #book init stackCleanup
 
@@ -16,4 +17,5 @@
 $stack_revert_DB = 0
 #$stackCleanup_DB = 0
+$stackSummary_DB = 0
 
 ### Check status of stacking tasks
@@ -26,4 +28,5 @@
 macro stack.reset
   book init stackSumSkyfile
+  book init stackPendingSummary
 #  book init stackCleanup
 end
@@ -40,4 +43,10 @@
     active false
   end
+  task stack.summary.load
+    active true
+  end
+  task stack.summary.run
+    active true
+  end
 end
 
@@ -51,4 +60,10 @@
   end
   task stack.revert
+    active false
+  end
+  task stack.summary.load
+    active false
+  end
+  task stack.summary.run
     active false
   end
@@ -403,2 +418,131 @@
 end
 
+### Load tasks for doing the stack summary
+### Tasks are loaded into stackPendingSummary
+task           stack.summary.load
+  host         local
+
+  periods      -poll $LOADPOLL
+  periods      -exec $LOADEXEC
+  periods      -timeout 1200
+  npending     1
+
+  stdout       NULL
+  stderr       $LOGDIR/stack.summary.load
+
+  task.exec
+    if ($LABEL:n == 0) break
+    $run = stacktool -tosummary
+    if ($DB:n == 0) 
+      option DEFAULT
+    else
+      # save the DB name for the exit tasks
+      option $DB:$stackSummary_DB
+      $run = $run -dbname $DB:$stackSummary_DB
+      $stackSummary_DB ++
+      if ($stackSummary_DB >= $DB:n) set stackSummary_DB = 0
+    end
+    add_poll_args run
+    add_poll_labels run
+    command $run
+  end
+
+  # success
+  task.exit     0
+    # convert 'stdout' to book format
+    ipptool2book stdout stackPendingSummary -key sass_id -uniq -setword dbname $options:0 -setword pantaskState INIT
+    if ($VERBOSE > 2)
+      book listbook stackPendingSummary
+    end
+
+    # delete existing entries in the appropriate pantaskStates
+    process_cleanup stackPendingSummary
+  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
+
+### Run tasks for doing the stack summary
+task           stack.summary.run
+  periods      -poll $RUNPOLL
+  periods      -exec $RUNEXEC
+  periods      -timeout 60
+
+  task.exec
+    # if we are unable to run the 'exec', use a long retry time
+    periods -exec $RUNEXEC
+
+    book npages stackPendingSummary -var N
+    if ($N == 0) break
+    if ($NETWORK == 0) break
+
+    # look for new images in stackPendingSummary (pantaskState == INIT)
+    book getpage stackPendingSummary 0 -var pageName -key pantaskState INIT
+    if ("$pageName" == "NULL") break
+
+    book setword stackPendingSummary $pageName pantaskState RUN
+    book getword stackPendingSummary $pageName sass_id -var SASS_ID
+    book getword stackPendingSummary $pageName camera -var CAMERA
+    book getword stackPendingSummary $pageName workdir -var WORKDIR_TEMPLATE
+    book getword stackPendingSummary $pageName dbname -var DBNAME
+    book getword stackPendingSummary $pageName tess_id -var TESS_DIR
+    book getword stackPendingSummary $pageName state -var RUN_STATE
+    book getword stackPendingSummary $pageName projection_cell -var projection_cell
+
+    # set the host and workdir
+    host anyhost
+    strsub $WORKDIR_TEMPLATE @HOST@.0 $default_host -var WORKDIR
+
+    basename $TESS_DIR -var TESS_ID
+
+    ## generate outroot specific to this association
+    sprintf outroot "%s/%s/%s.stk.%s.summary" $WORKDIR $TESS_ID $TESS_ID $SASS_ID
+
+    stdout $LOGDIR/stack.summary.log
+    stderr $LOGDIR/stack.summary.log
+
+    $run = skycell_jpeg.pl --stage stack --stage_id $SASS_ID --camera $CAMERA --outroot $outroot
+    add_standard_args run
+
+    # save the pageName for future reference below
+    options $pageName
+
+    # create the command line
+    if ($VERBOSE > 1)
+	echo command $run
+    end
+    periods -exec 0.05
+    command $run
+  end
+
+  # default exit status
+  task.exit       default
+    process_exit stackPendingSummary $options:0 $JOB_STATUS
+  end
+
+  # locked list
+  task.exit       crash
+    showcommand crash
+    echo "hostname: $JOB_HOSTNAME"
+    book setword stackPendingSummary $options:0 pantaskState CRASH
+  end
+
+  # operation timed out?
+  task.exit       timeout
+    showcommand timeout
+    book setword stackPendingSummary $options:0 pantaskState TIMEOUT
+  end
+end
+