Index: /tags/ipp-pv3-20140717/ippTasks/remote.pro
===================================================================
--- /tags/ipp-pv3-20140717/ippTasks/remote.pro	(revision 37295)
+++ /tags/ipp-pv3-20140717/ippTasks/remote.pro	(revision 37296)
@@ -99,6 +99,6 @@
   periods     -exec 300
   periods     -timeout 30
+  active      true
   npending    1
-  active      true
 
   task.exec
@@ -155,6 +155,6 @@
   periods     -exec 1800
   periods     -timeout 30
+  active      false
   npending    1
-  active      false
 
   task.exec
@@ -201,7 +201,8 @@
   host       local
   periods    -poll $LOADPOLL
-  periods    -exec 30
+  periods    -exec $LOADEXEC
+  periods    -timeout 30
+  active     true
   npending   1
-  active     true
 
   task.exec
@@ -250,11 +251,13 @@
 task           remote.prepcomp.run
   host         anyhost
-  periods      -poll $LOADPOLL
-  periods      -exec $LOADEXEC
+  periods      -poll $RUNPOLL
+  periods      -exec $RUNEXEC
   periods      -timeout 600
   active       true
-  npending     10
-
-  task.exec
+
+  task.exec
+    # if we are unable to run the 'exec', use a long retry time
+    periods -exec $RUNEXEC
+
     stdout $LOGDIR/remote.prepcomp.run
     stderr $LOGDIR/remote.prepcomp.run
@@ -280,15 +283,13 @@
     end
     if ("$STAGE" == "camera")
-      $command = sc_prepare_camera.pl --camera GPC1 --stage_id $STAGE_ID --remote_id $REMOTE_ID --path_base $outroot --dbname $DBNAME
-      echo "skipping camera until scripts are ready"
-      break
+      $command = sc_prepare_camera.pl --camera GPC1 --cam_id $STAGE_ID --remote_id $REMOTE_ID --path_base $outroot --dbname $DBNAME
     end
     if ("$STAGE" == "warp")
-      $command = sc_prepare_warp.pl --camera GPC1 --stage_id $STAGE_ID --remote_id $REMOTE_ID --path_base $outroot --dbname $DBNAME
+      $command = sc_prepare_warp.pl --camera GPC1 --warp_id $STAGE_ID --remote_id $REMOTE_ID --path_base $outroot --dbname $DBNAME
       echo "skipping warp until scripts are ready"
       break
     end
     if ("$STAGE" == "stack")
-      $command = sc_prepare_stack.pl --camera GPC1 --stage_id $STAGE_ID --remote_id $REMOTE_ID --path_base $outroot --dbname $DBNAME
+      $command = sc_prepare_stack.pl --camera GPC1 --stack_id $STAGE_ID --remote_id $REMOTE_ID --path_base $outroot --dbname $DBNAME
       echo "skipping stack until scripts are ready"
       break
@@ -296,4 +297,6 @@
 
     options $pageName
+
+    periods -exec 0.05
     command $command
   end
@@ -370,5 +373,5 @@
   periods      -timeout 600000
   active       true
-  npending     10
+  npending     1
 
   task.exec
@@ -596,5 +599,5 @@
     # This can't have an invalid job_id
     if ($JOB_ID == -1) break
-    $command = sc_remote_poll.pl --remote_id $REMOTE_ID --path_base $outroot --verbose --dbname $DBNAME --camera GPC1 --poll --job_id $JOB_ID
+    $command = sc_remote_poll.pl --remote_id $REMOTE_ID --path_base $outroot --verbose --dbname $DBNAME --camera GPC1 --job_id $JOB_ID
 
     options $pageName