Index: branches/simtest_nebulous_branches/ippTasks/camera.pro
===================================================================
--- branches/simtest_nebulous_branches/ippTasks/camera.pro	(revision 25061)
+++ branches/simtest_nebulous_branches/ippTasks/camera.pro	(revision 27840)
@@ -6,4 +6,20 @@
 check.globals
 
+# camera.pro should have a more restricted polling limit (to avoid stress with getstar)
+if ($?POLL_LIMIT_CAMERA == 0) set POLL_LIMIT_CAMERA = 10
+
+macro set.camera.poll
+  if ($0 != 2)
+    echo "USAGE:set.camera.poll (value)"
+    break
+  end
+ 
+  $POLL_LIMIT_CAMERA = $1
+end
+
+macro get.camera.poll
+  echo "camera poll limit: $POLL_LIMIT_CAMERA"
+end
+
 book init camPendingExp
 
@@ -23,4 +39,7 @@
     active true
   end
+  task camera.revert
+    active true
+  end
 end
 
@@ -30,4 +49,19 @@
   end
   task camera.exp.run
+    active false
+  end
+  task camera.revert
+    active false
+  end
+end
+
+macro camera.revert.on
+  task camera.revert
+    active true
+  end
+end
+
+macro camera.revert.off
+  task camera.revert
     active false
   end
@@ -64,5 +98,8 @@
       if ($camera_DB >= $DB:n) set camera_DB = 0
     end
-    add_poll_args run
+    $run = $run -limit $POLL_LIMIT_CAMERA
+    # NOTE: we do not want to overload the dvo db machine with getstar queries, 
+    # so we will limit the camera stage to a smaller number than the other stages
+    # add_poll_args run
     add_poll_labels run
     command $run
@@ -106,4 +143,5 @@
     if ($N == 0) break
     if ($NETWORK == 0) break
+    if ($BURNTOOLING == 1) break
     
     # look for new images in camPendingExp (pantaskState == INIT)
@@ -182,6 +220,6 @@
   host         local
 
-  periods      -poll 5.0
-  periods      -exec 60.0
+  periods      -poll 60.0
+  periods      -exec 1800.0
   periods      -timeout 120.0
   npending     1