Changeset 14095 for trunk/ippTasks/chip.pro

Timestamp:

Jul 9, 2007, 4:39:45 PM (19 years ago)

Author:

eugene

Message:

adjust output names, add exp_tag to chip_imfile.pl

File:

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

trunk/ippTasks/chip.pro

@@ -119 +119 @@
     book getword chipPendingImfile $pageName camera -var CAMERA
     book getword chipPendingImfile $pageName exp_id -var EXP_ID
+    book getword chipPendingImfile $pageName exp_tag -var EXP_TAG
     book getword chipPendingImfile $pageName chip_id -var CHIP_ID
     book getword chipPendingImfile $pageName workdir -var WORKDIR
@@ -136 +137 @@
     ## generate output log based on 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/chip.$CLASS_ID.log
+    $outpath = $outpath/$EXP_TAG
+    $outroot = $outpath/$EXP_TAG.ch.$CHIP_ID
+    $logfile = `ipp_filename.pl --filerule LOG.IMFILE --camera $CAMERA --class_id $CLASS_ID --basename $outroot`
+    if ("$logfile" == "") 
+      $logfile = $outroot.$CLASS_ID.log
+    end
+
     stdout $logfile
     stderr $logfile
-    exec mkdir -p $outroot
+    exec mkdir -p $outpath
 
-    $run = chip_imfile.pl --exp_id $EXP_ID --chip_id $CHIP_ID --class_id $CLASS_ID --input_uri $URI --camera $CAMERA
+    $run = chip_imfile.pl --exp_id $EXP_ID --chip_id $CHIP_ID --class_id $CLASS_ID --exp_tag $EXP_TAG --input_uri $URI --camera $CAMERA
     if ("$WORKDIR" != "NULL")
       $run = $run --workdir $WORKDIR