Index: branches/eam_branches/ps2-tc3-20130727/ippTasks/Makefile.am
===================================================================
--- branches/eam_branches/ps2-tc3-20130727/ippTasks/Makefile.am	(revision 35859)
+++ branches/eam_branches/ps2-tc3-20130727/ippTasks/Makefile.am	(revision 36680)
@@ -27,4 +27,5 @@
 	survey.pro \
 	replicate.pro \
+	rawcheck.pro \
 	diskbalance.pro \
 	dist.pro \
@@ -45,6 +46,8 @@
 	diffphot.pro \
 	lap.pro \
+	lapgroup.pro \
 	vp.pro \
-	bg.regeneration.pro
+	bg.regeneration.pro \
+	fullforce.pro
 
 other_files = \
Index: branches/eam_branches/ps2-tc3-20130727/ippTasks/diff.pro
===================================================================
--- branches/eam_branches/ps2-tc3-20130727/ippTasks/diff.pro	(revision 35859)
+++ branches/eam_branches/ps2-tc3-20130727/ippTasks/diff.pro	(revision 36680)
@@ -47,10 +47,4 @@
     active true
   end
-  task diff.summary.load
-    active true
-  end
-  task diff.summary.run
-    active true
-  end
 end
 
@@ -67,10 +61,4 @@
   end
   task diff.revert
-    active false
-  end
-  task diff.summary.load
-    active false
-  end
-  task diff.summary.run
     active false
   end
@@ -499,4 +487,5 @@
 task	       diff.summary.load
   host         local
+  active       false
 
   periods      -poll $LOADPOLL
@@ -559,4 +548,5 @@
   periods      -exec $RUNEXEC
   periods      -timeout 60
+  active       false
 
   task.exec
Index: branches/eam_branches/ps2-tc3-20130727/ippTasks/dist.pro
===================================================================
--- branches/eam_branches/ps2-tc3-20130727/ippTasks/dist.pro	(revision 35859)
+++ branches/eam_branches/ps2-tc3-20130727/ippTasks/dist.pro	(revision 36680)
@@ -31,4 +31,6 @@
 list DIST_STAGE -add "warp_bg"
 list DIST_STAGE -add "sky"
+list DIST_STAGE -add "skycal"
+list DIST_STAGE -add "ff"
 
 $currentStage = 0
Index: branches/eam_branches/ps2-tc3-20130727/ippTasks/fullforce.pro
===================================================================
--- branches/eam_branches/ps2-tc3-20130727/ippTasks/fullforce.pro	(revision 36680)
+++ branches/eam_branches/ps2-tc3-20130727/ippTasks/fullforce.pro	(revision 36680)
@@ -0,0 +1,458 @@
+## fullforce.pro : tasks for static sky calibration analysis : -*- sh -*-
+
+## This file contains panTasks definitions for performing the fullforce analysis. 
+
+# test for required global variables
+check.globals
+
+### Initialise the books containing the tasks to do
+book init fullForceRun
+book init fullForceSummary
+
+### Database lists
+$fullForce_DB = 0
+$fullForce_revert_DB = 0
+$fullForceSummary_DB = 0
+$fullForceSummary_revert_DB = 0
+
+### Check status of fullForce tasks
+macro fullforce.status
+  book listbook fullForceRun
+end
+
+### Reset fullForce tasks
+macro fullforce.reset
+  book init fullForceRun
+end
+macro fullforce.summary.status
+  book listbook fullForceSummary
+end
+
+### Reset fullForce tasks
+macro fullforce.summary.reset
+  book init fullForceSummary
+end
+
+### Turn fullForce tasks on
+macro fullforce.on
+  task fullforce.load
+    active true
+  end
+  task fullforce.run
+    active true
+  end
+  task fullforce.summary.load
+    active true
+  end
+  task fullforce.summary.run
+    active true
+  end
+end
+
+### Turn fullForce tasks off
+macro fullforce.off
+  task fullforce.load
+    active false
+  end
+  task fullforce.run
+    active false
+  end
+  task fullforce.summary.load
+    active false
+  end
+  task fullforce.summary.run
+    active false
+  end
+end
+
+macro fullforce.revert.on
+  task fullforce.revert
+    active true
+  end
+  task fullforce.summary.revert
+    active true
+  end
+end
+
+macro fullforce.revert.off
+  task fullforce.revert
+    active false
+  end
+  task fullforce.summary.revert
+    active false
+  end
+end
+
+### Load tasks for fullforce
+### Tasks are loaded into fullForceRun.
+task	       fullforce.load
+  host         local
+
+  periods      -poll $LOADPOLL
+  periods      -exec $LOADEXEC
+  periods      -timeout 30
+  npending     1
+
+  stdout NULL
+  stderr $LOGDIR/fullforce.log
+
+  task.exec
+    if ($LABEL:n == 0) break
+    $run = fftool -todo
+    if ($DB:n == 0)
+      option DEFAULT
+    else
+      # save the DB name for the exit tasks
+      option $DB:$fullForce_DB
+      $run = $run -dbname $DB:$fullForce_DB
+      $fullForce_DB ++
+      if ($fullForce_DB >= $DB:n) set fullForce_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 fullForceRun -key ff_id:warp_id -uniq -setword dbname $options:0 -setword pantaskState INIT
+    if ($VERBOSE > 2)
+      book listbook fullForceRun
+    end
+
+    # delete existing entries in the appropriate pantaskStates
+    process_cleanup fullForceRun
+  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 the fullforce analysis
+### Tasks are taken from fullForceRun.
+task	       fullforce.run
+  periods      -poll $RUNPOLL
+  periods      -exec $RUNEXEC
+  periods      -timeout 10800
+
+  task.exec
+    # if we are unable to run use "long" exectime
+    periods -exec $RUNEXEC
+    book npages fullForceRun -var N
+    if ($N == 0) break
+    if ($NETWORK == 0) break
+    if ($BURNTOOLING == 1) break
+
+
+    # look for new entries in fullForceRun (pantaskState == INIT)
+    book getpage fullForceRun 0 -var pageName -key pantaskState INIT
+    if ("$pageName" == "NULL") break
+
+    book setword fullForceRun $pageName pantaskState RUN
+    book getword fullForceRun $pageName ff_id -var FF_ID
+    book getword fullForceRun $pageName warp_id -var WARP_ID
+    book getword fullForceRun $pageName sources_path_base -var SOURCES_PATH_BASE
+    book getword fullForceRun $pageName tess_id -var TESS_DIR
+    book getword fullForceRun $pageName skycell_id -var SKYCELL_ID
+    book getword fullForceRun $pageName camera -var CAMERA
+    book getword fullForceRun $pageName workdir -var WORKDIR_TEMPLATE
+    book getword fullForceRun $pageName warp_path_base -var WARP_PATH_BASE
+    book getword fullForceRun $pageName reduction -var REDUCTION
+    book getword fullForceRun $pageName dbname -var DBNAME
+
+    # set the host and workdir based on the skycell hash
+    # set.host.for.skycell $SKYCELL_ID
+    host anyhost
+    set.workdir.by.skycell $SKYCELL_ID $WORKDIR_TEMPLATE $default_host WORKDIR
+
+    basename $TESS_DIR -var TESS_ID
+    sprintf outroot "%s/%s/%s/%s.%s.wrp.%s.ff.%s" $WORKDIR $TESS_ID $SKYCELL_ID $TESS_ID $SKYCELL_ID $WARP_ID $FF_ID
+
+    stdout $LOGDIR/fullforce.log
+    stderr $LOGDIR/fullforce.log
+
+    $run = psphot_fullforce_warp.pl --ff_id $FF_ID --warp_id $WARP_ID --outroot $outroot --redirect-output --camera $CAMERA --warp_path_base $WARP_PATH_BASE --sources_path_base $SOURCES_PATH_BASE --skycell_id $SKYCELL_ID --threads @MAX_THREADS@
+    if ("$REDUCTION" != "NULL")
+      $run = $run --reduction $REDUCTION
+    end
+    add_standard_args run
+
+    # save the pageName for future reference below
+    options $pageName
+
+    # create the command line
+    if ($VERBOSE > 1)
+      echo command $run
+    end
+    # since we have work to do shorten exec time
+    periods -exec .05
+    command $run
+  end
+
+  # default exit status
+  task.exit    default
+    process_exit fullForceRun $options:0 $JOB_STATUS
+  end
+
+  # locked list
+  task.exit    crash
+    showcommand crash
+    echo "hostname: $JOB_HOSTNAME"
+    book setword fullForceRun $options:0 pantaskState CRASH
+  end
+
+  # operation timed out?
+  task.exit    timeout
+    showcommand timeout
+    book setword fullForceRun $options:0 pantaskState TIMEOUT
+  end
+end
+
+task fullforce.revert
+  host         local
+
+  periods      -poll 10.0
+  periods      -exec 1200.0
+  periods      -timeout 120.0
+  npending     1
+  active true
+  
+  stdout NULL
+  stderr $LOGDIR/fullforce.revert.log
+
+  task.exec
+    if ($LABEL:n == 0) break
+    # Only revert failures with fault=2 (SYS_ERROR), which tend to be
+    # temporary filesystem problems.  Every other fault type is
+    # interesting and should be kept for debugging (and so it does not
+    # continue to occur).
+    $run = fftool -revert -fault 2
+    if ($DB:n == 0)
+      option DEFAULT
+    else
+      # save the DB name for the exit tasks
+      option $DB:$fullForce_revert_DB
+      $run = $run -dbname $DB:$fullForce_revert_DB
+      $fullForce_revert_DB ++
+      if ($fullForce_revert_DB >= $DB:n) set fullForce_revert_DB = 0
+    end
+    add_poll_labels 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
+
+### Load tasks for fullForceSummary
+### Tasks are loaded into fullForceSummary.
+task	       fullforce.summary.load
+  host         local
+
+  periods      -poll $LOADPOLL
+  periods      -exec $LOADEXEC
+  periods      -timeout 30
+  npending     1
+
+  stdout NULL
+  stderr $LOGDIR/fullforce.summary.log
+
+  task.exec
+    if ($LABEL:n == 0) break
+    $run = fftool -toadvance
+    if ($DB:n == 0)
+      option DEFAULT
+    else
+      # save the DB name for the exit tasks
+      option $DB:$fullForceSummary_DB
+      $run = $run -dbname $DB:$fullForceSummary_DB
+      $fullForceSummary_DB ++
+      if ($fullForceSummary_DB >= $DB:n) set fullForceSummary_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 fullForceSummary -key ff_id -uniq -setword dbname $options:0 -setword pantaskState INIT
+    if ($VERBOSE > 2)
+      book listbook fullForceSummary
+    end
+
+    # delete existing entries in the appropriate pantaskStates
+    process_cleanup fullForceSummary
+  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 the fullForceSummary analyasis
+### Tasks are taken from fullForceSummary.
+task	       fullforce.summary.run
+  periods      -poll $RUNPOLL
+  periods      -exec $RUNEXEC
+  periods      -timeout 10800
+
+  task.exec
+    # if we are unable to run use "long" exectime
+    periods -exec $RUNEXEC
+    book npages fullForceSummary -var N
+    if ($N == 0) break
+    if ($NETWORK == 0) break
+    if ($BURNTOOLING == 1) break
+
+
+    # look for new entries in fullForceSummary (pantaskState == INIT)
+    book getpage fullForceSummary 0 -var pageName -key pantaskState INIT
+    if ("$pageName" == "NULL") break
+
+    book setword fullForceSummary $pageName pantaskState RUN
+    book getword fullForceSummary $pageName ff_id -var FF_ID
+    book getword fullForceSummary $pageName tess_id -var TESS_DIR
+    book getword fullForceSummary $pageName skycell_id -var SKYCELL_ID
+    book getword fullForceSummary $pageName camera -var CAMERA
+    book getword fullForceSummary $pageName workdir -var WORKDIR_TEMPLATE
+    book getword fullForceSummary $pageName reduction -var REDUCTION
+    book getword fullForceSummary $pageName dbname -var DBNAME
+
+    # set the host and workdir based on the skycell hash
+    # set.host.for.skycell $SKYCELL_ID
+    host anyhost
+    set.workdir.by.skycell $SKYCELL_ID $WORKDIR_TEMPLATE $default_host WORKDIR
+
+    basename $TESS_DIR -var TESS_ID
+    sprintf outroot "%s/%s/%s/%s.%s.ff.%s" $WORKDIR $TESS_ID $SKYCELL_ID $TESS_ID $SKYCELL_ID $FF_ID
+
+    stdout $LOGDIR/fullforce.summary.log
+    stderr $LOGDIR/fullforce.summary.log
+
+    $run = psphot_fullforce_summary.pl --ff_id $FF_ID --outroot $outroot --redirect-output --camera $CAMERA --threads @MAX_THREADS@
+    if ("$REDUCTION" != "NULL")
+      $run = $run --reduction $REDUCTION
+    end
+    add_standard_args run
+
+    # save the pageName for future reference below
+    options $pageName
+
+    # create the command line
+    if ($VERBOSE > 1)
+      echo command $run
+    end
+    # since we have work to do shorten exec time
+    periods -exec .05
+    command $run
+  end
+
+  # default exit status
+  task.exit    default
+    process_exit fullForceSummary $options:0 $JOB_STATUS
+  end
+
+  # locked list
+  task.exit    crash
+    showcommand crash
+    echo "hostname: $JOB_HOSTNAME"
+    book setword fullForceSummary $options:0 pantaskState CRASH
+  end
+
+  # operation timed out?
+  task.exit    timeout
+    showcommand timeout
+    book setword fullForceSummary $options:0 pantaskState TIMEOUT
+  end
+end
+
+task fullforce.summary.revert
+  host         local
+
+  periods      -poll 10.0
+  periods      -exec 1200.0
+  periods      -timeout 120.0
+  npending     1
+  active true
+  
+  stdout NULL
+  stderr $LOGDIR/fullforce.summary.revert.log
+
+  task.exec
+    if ($LABEL:n == 0) break
+    # Only revert failures with fault=2 (SYS_ERROR), which tend to be
+    # temporary filesystem problems.  Every other fault type is
+    # interesting and should be kept for debugging (and so it does not
+    # continue to occur).
+    $run = fftool -revertsummary -fault 2
+    if ($DB:n == 0)
+      option DEFAULT
+    else
+      # save the DB name for the exit tasks
+      option $DB:$fullForceSummary_revert_DB
+      $run = $run -dbname $DB:$fullForceSummary_revert_DB
+      $fullForceSummary_revert_DB ++
+      if ($fullForceSummary_revert_DB >= $DB:n) set fullForceSummary_revert_DB = 0
+    end
+    add_poll_labels 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: branches/eam_branches/ps2-tc3-20130727/ippTasks/nightly_science.pro
===================================================================
--- branches/eam_branches/ps2-tc3-20130727/ippTasks/nightly_science.pro	(revision 35859)
+++ branches/eam_branches/ps2-tc3-20130727/ippTasks/nightly_science.pro	(revision 36680)
@@ -370,5 +370,5 @@
   periods         -poll $LOADPOLL
   periods         -exec $LOADEXEC
-  periods         -timeout 480
+  periods         -timeout 1000
   npending        1
 
Index: branches/eam_branches/ps2-tc3-20130727/ippTasks/pantasks.pro
===================================================================
--- branches/eam_branches/ps2-tc3-20130727/ippTasks/pantasks.pro	(revision 35859)
+++ branches/eam_branches/ps2-tc3-20130727/ippTasks/pantasks.pro	(revision 36680)
@@ -490,4 +490,6 @@
     book delpage $1 -key pantaskState UNKNOWN_ERR
     book delpage $1 -key pantaskState CRASH_ERR
+    book delpage $1 -key pantaskState CRASH
+    book delpage $1 -key pantaskState TIMEOUT
   end
 end
Index: branches/eam_branches/ps2-tc3-20130727/ippTasks/pstamp.pro
===================================================================
--- branches/eam_branches/ps2-tc3-20130727/ippTasks/pstamp.pro	(revision 35859)
+++ branches/eam_branches/ps2-tc3-20130727/ippTasks/pstamp.pro	(revision 36680)
@@ -152,4 +152,7 @@
         active true
     end
+    task pstamp.queue.cleanup
+        active true
+    end
 end
 macro pstamp.cleanup.off
@@ -158,4 +161,7 @@
     end
     task pstamp.cleanup.run
+        active false
+    end
+    task pstamp.queue.cleanup
         active false
     end
@@ -825,4 +831,5 @@
         book getword pstampDependent $pageName imagedb    -var IMAGEDB
         book getword pstampDependent $pageName rlabel     -var RLABEL
+        book getword pstampDependent $pageName label      -var LABEL
         book getword pstampDependent $pageName outdir     -var OUTDIR
         book getword pstampDependent $pageName need_magic -var NEED_MAGIC
@@ -846,5 +853,5 @@
         stderr $MYLOGFILE
 
-        $run = pstamp_checkdependent.pl --dep_id $DEP_ID --stage_id $STAGE_ID --stage $STAGE --component $COMPONENT --imagedb $IMAGEDB --rlabel $RLABEL $NEED_MAGIC --fault_count $FAULT_COUNT --max_fault_count $PSTAMP_MAX_FAULT_COUNT --logfile $MYLOGFILE
+        $run = pstamp_checkdependent.pl --dep_id $DEP_ID --stage_id $STAGE_ID --stage $STAGE --component $COMPONENT --imagedb $IMAGEDB --rlabel $RLABEL --label $LABEL $NEED_MAGIC --fault_count $FAULT_COUNT --max_fault_count $PSTAMP_MAX_FAULT_COUNT --logfile $MYLOGFILE
 
         add_standard_args run
@@ -944,5 +951,5 @@
     # overloading nfs
 
-    npending    10
+    npending    5
 
     task.exec
@@ -1118,2 +1125,35 @@
     end
 end
+
+task pstamp.queue.cleanup
+    host        local
+
+    periods     -poll $RUNPOLL
+    periods     -exec 600
+    periods     -timeout 120
+    npending    1
+
+    task.exec
+        stdout NULL
+        stderr $LOGSUBDIR/pstamp.queue.cleanup.log
+
+        $run = pstamp_queue_cleanup.pl
+        command $run
+    end
+
+    task.exit $EXIT_SUCCESS
+        # echo nothing to do
+    end
+
+    task.exit   default
+        showcommand failure
+    end
+
+    task.exit   crash
+        showcommand crash
+    end
+
+    task.exit   timeout
+        showcommand timeout
+    end
+end
Index: branches/eam_branches/ps2-tc3-20130727/ippTasks/rawcheck.pro
===================================================================
--- branches/eam_branches/ps2-tc3-20130727/ippTasks/rawcheck.pro	(revision 36680)
+++ branches/eam_branches/ps2-tc3-20130727/ippTasks/rawcheck.pro	(revision 36680)
@@ -0,0 +1,190 @@
+## replicate.pro : tasks for data replication : -*- sh -*-
+
+# test for required global variables
+check.globals
+
+# load in the local configuration (NEB_USER, etc.)
+# module nebulous.site.pro
+
+$LOGSUBDIR = $LOGDIR/rawcheck
+mkdir $LOGSUBDIR
+
+book init rawcheckPending
+
+macro rawcheck.reset
+  book init checkPending
+end
+
+macro rawcheck.status
+  book listbook rawcheckPending
+end
+
+macro rawcheck.on
+  task rawcheck.load
+    active true
+ end
+  task rawcheck.run
+    active true
+ end
+end
+
+macro rawcheck.off
+  task rawcheck.load
+    active false
+ end
+  task rawcheck.run
+    active false
+ end
+end
+
+# this variable will cycle through the known database names
+$rawcheck_DB = 0
+
+
+$DATEOBS_MIN  = 1970-01-01T00:00:00
+
+macro rawcheck.set.date
+  if ($0 != 2) 
+    echo "USAGE: rawcheck.set.date (YYYY-MM-DD)"
+    break
+  end
+
+  $DATEOBS_MIN = "$1"
+end
+
+macro rawcheck.show.date
+
+  echo "DATE: "
+  echo $DATEOBS_MIN
+end
+
+
+task           rawcheck.load
+  host         local
+
+  # modify these after the tasks are tested
+  periods      -poll $LOADPOLL
+  periods      -exec $LOADEXEC
+  periods      -timeout 60
+  npending     1
+
+  # silently drop stdout
+  stdout NULL
+  stderr $LOGSUBDIR/rawcheck.log
+
+  task.exec
+      book npages rawcheckPending -var N
+      if ($N > 200)
+        process_cleanup rawcheckPending
+        break
+     end      
+     if ($N > 1) 
+        book getpage rawcheckPending N -var pageName
+        book getword rawcheckPending $pageName dateobs -var DATEOBS_MIN
+     end
+     
+
+     $run = regtool -processedexp -state full -dateobs_begin $DATEOBS_MIN 
+
+     if ($DB:n == 0)
+      option DEFAULT
+    else
+      # save the DB name for the exit tasks
+      option $DB:$rawcheck_DB
+      $run = $run -dbname $DB:$rawcheck_DB
+      $rawcheck_DB ++
+      if ($rawcheck_DB >= $DB:n) set rawcheck_DB = 0
+
+    end
+    add_poll_args run
+    command $run
+  end
+
+  # success
+  task.exit    0
+    # convert 'stdout' to book format
+    ipptool2book stdout rawcheckPending -key exp_id -uniq -setword dbname $options:0 -setword pantaskState INIT
+    if ($VERBOSE > 2)
+      book listbook rawcheckPending
+    end
+
+    # delete existing entries in the appropriate pantaskStates
+    process_cleanup rawcheckPending
+  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        rawcheck.run
+  periods      -poll 0.5
+  periods      -exec 5
+  periods      -timeout 1200
+  host         anyhost
+
+
+  task.exec
+    periods -exec 5
+
+    book npages rawcheckPending -var N
+    if ($N == 0) break
+    if ($NETWORK == 0) break
+    
+    # look for new objects in rawcheckPending
+    book getpage rawcheckPending 0 -var pageName -key pantaskState INIT
+    if ("$pageName" == "NULL") break
+
+    book setword rawcheckPending $pageName pantaskState RUN
+
+    # XXX what values do I need to get back?
+    book getword rawcheckPending $pageName exp_id         -var EXP_ID
+    book getword rawcheckPending $pageName dbname         -var DBNAME
+
+#    stdout NULL
+    stdout $LOGSUBDIR/rawcheck.log
+    stderr $LOGSUBDIR/rawcheck.log
+
+    # these operations do not require a database to be specified
+    $run = rawcheck.pl --dbname $DBNAME --exp_id $EXP_ID
+
+    # 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 rawcheckPending $options:0 $JOB_STATUS
+  end
+
+  task.exit    crash
+    showcommand crash
+    book setword rawcheckPending $options:0 pantaskState CRASH
+  end
+
+  # operation timed out?
+  task.exit    timeout
+    showcommand timeout
+    book setword rawcheckPending $options:0 pantaskState TIMEOUT
+  end
+end
+
+
Index: branches/eam_branches/ps2-tc3-20130727/ippTasks/register.pro
===================================================================
--- branches/eam_branches/ps2-tc3-20130727/ippTasks/register.pro	(revision 35859)
+++ branches/eam_branches/ps2-tc3-20130727/ippTasks/register.pro	(revision 36680)
@@ -267,5 +267,5 @@
 task	       register.imfile.run
   periods      -poll $RUNPOLL
-  periods      -exec $RUNEXEC
+  periods      -exec 1.0
   periods      -timeout 30
 
Index: branches/eam_branches/ps2-tc3-20130727/ippTasks/staticsky.pro
===================================================================
--- branches/eam_branches/ps2-tc3-20130727/ippTasks/staticsky.pro	(revision 35859)
+++ branches/eam_branches/ps2-tc3-20130727/ippTasks/staticsky.pro	(revision 36680)
@@ -64,4 +64,17 @@
 end
 
+$RA_POLL_MAX = 0
+
+macro set.ra.max
+    if ($0 != 2) 
+        echo "USAGE: set.ra.max (ra_max_deg)"
+        break
+    end
+    $RA_POLL_MAX = $1
+end
+macro get.ra.max
+    echo $RA_POLL_MAX
+end
+
 ### Load tasks for staticsky
 ### Tasks are loaded into staticskyResult.
@@ -80,4 +93,7 @@
     if ($LABEL:n == 0) break
     $run = staticskytool -todo
+    if ($RA_POLL_MAX > 0) 
+        $run = $run -ra_max $RA_POLL_MAX
+    end
     if ($DB:n == 0)
       option DEFAULT
Index: branches/eam_branches/ps2-tc3-20130727/ippTasks/summit.copy.pro
===================================================================
--- branches/eam_branches/ps2-tc3-20130727/ippTasks/summit.copy.pro	(revision 35859)
+++ branches/eam_branches/ps2-tc3-20130727/ippTasks/summit.copy.pro	(revision 36680)
@@ -34,4 +34,19 @@
 macro copy.status
     book listbook pzPendingImfile
+end
+
+macro copy.reset
+    book init pzPendingExp
+    book init pzPendingImfile
+    book init pzPendingAdvance
+end
+
+# aliases because copy.* isn't intuitive
+macro pztool.reset
+    copy.reset
+end
+
+macro summitcopy.reset
+    summitcopy.reset
 end
 
Index: branches/eam_branches/ps2-tc3-20130727/ippTasks/survey.pro
===================================================================
--- branches/eam_branches/ps2-tc3-20130727/ippTasks/survey.pro	(revision 35859)
+++ branches/eam_branches/ps2-tc3-20130727/ippTasks/survey.pro	(revision 36680)
@@ -583,6 +583,6 @@
 
 macro survey.add.relstack
-  if ($0 != 3)
-    echo "USAGE: survey.add.relstack (label) (releasename)"
+  if ($0 != 4)
+    echo "USAGE: survey.add.relstack (label) (releasename) (stacktype)"
     break
   end
@@ -590,4 +590,5 @@
   book setword SURVEY_RELSTACK $1 LABEL $1
   book setword SURVEY_RELSTACK $1 RELEASE_NAME $2
+  book setword SURVEY_RELSTACK $1 STACK_TYPE $3
   book setword SURVEY_RELSTACK $1 STATE PENDING
 end
@@ -1846,7 +1847,8 @@
     book setword SURVEY_RELSTACK $label STATE DONE
     book getword SURVEY_RELSTACK $label RELEASE_NAME -var RELEASE_NAME
+    book getword SURVEY_RELSTACK $label STACK_TYPE -var STACK_TYPE
 
     # XXX: Can we use the survey task for stack types other than nightly?
-    $run = releasetool -definerelstack -label $label -release_name $RELEASE_NAME -set_state processed -set_stack_type nightly
+    $run = releasetool -definerelstack -label $label -release_name $RELEASE_NAME -set_state processed -set_stack_type $STACK_TYPE
 
     if ($DB:n == 0)
Index: branches/eam_branches/ps2-tc3-20130727/ippTasks/warp.pro
===================================================================
--- branches/eam_branches/ps2-tc3-20130727/ippTasks/warp.pro	(revision 35859)
+++ branches/eam_branches/ps2-tc3-20130727/ippTasks/warp.pro	(revision 36680)
@@ -58,10 +58,4 @@
     active true
   end
-  task warp.summary.load
-    active true
-  end
-  task warp.summary.run
-    active true
-  end
 end
 
@@ -87,10 +81,4 @@
   end
   task warp.revert.warped
-    active false
-  end
-  task warp.summary.load
-    active false
-  end
-  task warp.summary.run
     active false
   end
@@ -545,5 +533,5 @@
 task	       warp.summary.load
   host         local
-
+  active       false
   periods      -poll $LOADPOLL
   periods      -exec $LOADEXEC
@@ -605,4 +593,5 @@
   periods      -exec $RUNEXEC
   periods      -timeout 60
+  active       false
 
   task.exec