Index: trunk/ippTasks/camera.pro
===================================================================
--- trunk/ippTasks/camera.pro	(revision 16195)
+++ trunk/ippTasks/camera.pro	(revision 16298)
@@ -1,19 +1,8 @@
-## this file contains the tasks for running the phase 3 stage
+## camera.pro : globals and support macros : -*- sh -*-
+## this file contains the tasks for running the camera analysis stage
 ## these tasks use the book camPendingExp
 
-if ($?network == 0)
-  $network = 1
-end
-if ($?parallel == 0)
-  $parallel = 0
-end
-if ($?VERBOSE == 0)
-  echo "VERBOSE not defined: load pantasks.pro first"
-  break
-end
-if ($?LOGDIR == 0)
-  echo "LOGDIR not defined: load pantasks.pro first"
-  break
-end
+# test for required global variables
+check.globals
 
 $LOGSUBDIR = $LOGDIR/camera
@@ -57,6 +46,6 @@
   host         local
 
-  periods      -poll $loadpoll
-  periods      -exec $loadexec
+  periods      -poll $LOADPOLL
+  periods      -exec $LOADEXEC
   periods      -timeout 30
   npending     1
@@ -112,5 +101,5 @@
     book npages camPendingExp -var N
     if ($N == 0) break
-    if ($network == 0) break
+    if ($NETWORK == 0) break
     
     # look for new images in camPendingExp (pantaskState == INIT)