Changeset 14116

Timestamp:

Jul 10, 2007, 3:19:20 PM (19 years ago)

Author:

eugene

Message:

adding reduction, using exp_tag for output names

File:

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

trunk/ippTasks/camera.pro

@@ -118 +118 @@
     book setword camPendingExp $pageName pantaskState RUN
     book getword camPendingExp $pageName camera -var CAMERA
-    book getword camPendingExp $pageName exp_id -var EXP_ID
+    book getword camPendingExp $pageName exp_tag -var EXP_TAG
     book getword camPendingExp $pageName cam_id -var CAM_ID
     book getword camPendingExp $pageName workdir -var WORKDIR
     book getword camPendingExp $pageName dvodb  -var DVODB
     book getword camPendingExp $pageName dbname -var DBNAME
+    book getword camPendingExp $pageName reduction -var REDUCTION
 
     # specify choice of remote host:(need to choose based on chips)
@@ -133 +134 @@
     # output log from filerule
     if ("$WORKDIR" == "NULL")
-      $outroot = `pwd`
+      $outpath = `pwd`
     else
-      $outroot = `ipp_datapath.pl $WORKDIR`
+      $outpath = `ipp_datapath.pl $WORKDIR`
     end
-    $outroot = $outroot/$EXP_ID
-    $logfile = $outroot/cam.log
+    $outpath = $outpath/$EXP_TAG
+    $outroot = $outpath/$EXP_TAG.cm.$CAM_ID
+    $logfile = `ipp_filename.pl --filerule LOG.EXP --camera $CAMERA --class_id NONE --basename $outroot`
+    if ("$logfile" == "") 
+      $logfile = $outroot.log
+    end
+
     stdout $logfile
     stderr $logfile
-    exec mkdir -p $outroot
+    exec mkdir -p $outpath
 
-    $run = camera_exp.pl --exp_id $EXP_ID --cam_id $CAM_ID --camera $CAMERA
+    $run = camera_exp.pl --exp_tag $EXP_TAG --cam_id $CAM_ID --camera $CAMERA
     if ("$WORKDIR" != "NULL")
       $run = $run --workdir $WORKDIR
+    end
+    if ("$REDUCTION" != "NULL")
+      $run = $run --reduction $REDUCTION
     end
     if ("$DVODB" != "NULL")