Changeset 18607 for trunk/ippTasks/camera.pro

Timestamp:

Jul 17, 2008, 3:07:11 PM (18 years ago)

Author:

eugene

Message:

updates from eam_branch_20080706

File:

• trunk/ippTasks/camera.pro (modified) (4 diffs)

trunk/ippTasks/camera.pro

@@ -5 +5 @@
 # test for required global variables
 check.globals
-
-$LOGSUBDIR = $LOGDIR/camera
-exec mkdir -p $LOGSUBDIR
 
 book init camPendingExp
@@ -51 +48 @@
   npending     1
 
-  stdout $LOGSUBDIR/camera.exp.log
-  stderr $LOGSUBDIR/camera.exp.log
+  stdout NULL
+  stderr $LOGDIR/camera.exp.log
 
   task.exec
@@ -119 +116 @@
     set.host.for.camera $CAMERA FPA
 
-    # raw workdir examples:
+    # set the WORKDIR variable
+    set.workdir.by.camera $CAMERA FPA $WORKDIR_TEMPLATE $default_host WORKDIR
+
+    # notes on how this works:
+    # -- raw workdir examples:
     # file://data/@HOST@.0/gpc1/20080130
     # neb:///@HOST@-vol0/gpc1/20080130 (need to supply volname?, or are we re-defining this each time?)
-    set.workdir.by.camera $CAMERA FPA $WORKDIR_TEMPLATE $default_host WORKDIR
-    # out workdir examples:
+    # -- out workdir examples:
     # file://data/ipp004.0/gpc1/20080130
     # neb:///ipp004-vol0/gpc1/20080130
@@ -130 +130 @@
     sprintf outroot "%s/%s/%s.cm.%s" $WORKDIR $EXP_TAG $EXP_TAG $CAM_ID
 
-    ## generate output log based on filerule (convert the URI to a PATH)
-    $logfile = `ipp_filename.pl --filerule LOG.EXP --camera $CAMERA --class_id NONE --basename $outroot`
-    if ("$logfile" == "") 
-      echo "WARNING: logfile not defined in camera.pro:146"
-      break
-    end
+    stdout $LOGDIR/camera.exp.log
+    stderr $LOGDIR/camera.exp.log
 
-    stdout $logfile
-    stderr $logfile
-
-    $run = camera_exp.pl --exp_tag $EXP_TAG --cam_id $CAM_ID --camera $CAMERA --outroot $outroot
+    $run = camera_exp.pl --exp_tag $EXP_TAG --cam_id $CAM_ID --camera $CAMERA --outroot $outroot --redirect-output
     if ("$REDUCTION" != "NULL")
       $run = $run --reduction $REDUCTION