Changeset 27517 for branches/eam_branches/20100225/ippTasks/camera.pro

Timestamp:

Mar 29, 2010, 3:55:49 PM (16 years ago)

Author:

eugene

Message:

update merges from trunk

Location:

branches/eam_branches/20100225

Files:

• . (modified) (1 prop)
• ippTasks/camera.pro (modified) (2 diffs)

branches/eam_branches/20100225/ippTasks/camera.pro

@@ -143 +143 @@
     if ($N == 0) break
     if ($NETWORK == 0) break
+    if ($BURNTOOLING == 1) break
     
     # look for new images in camPendingExp (pantaskState == INIT)
@@ -219 +220 @@
   host         local
 
-  periods      -poll 5.0
-  periods      -exec 60.0
+  periods      -poll 60.0
+  periods      -exec 1800.0
   periods      -timeout 120.0
   npending     1