Changeset 10674

Timestamp:

Dec 12, 2006, 5:25:02 PM (19 years ago)

Author:

eugene

Message:

cleanup lognames

Location:

trunk/ippTasks

Files:

• pantasks.pro (modified) (2 diffs)
• phase0.pro (modified) (5 diffs)

trunk/ippTasks/pantasks.pro

@@ -2 +2 @@
 $network = 1
 $parallel = 1
-$scripts = .
-$WORKDIR = `ipp_datapath.pl path://ESSENCE/`
+$scripts = $HOME/src/pantasks/ipp/ippTasks
+$LOGDIR = `ipp_datapath.pl path://ESSENCE/`
+$LOGDIR = "$LOGDIR/logs"
+exec mkdir -p $LOGDIR
+
 $loadpoll = 1
 $loadexec = 5
@@ -16 +19 @@
     controller host add sn4
     controller host add sn5
-#    controller host add sn6
-    # sn7 serves the disk
+#   controller host add sn6
+# sn7 serves the disk
   end
 end

trunk/ippTasks/phase0.pro

@@ -16 +16 @@
 
 $Phase0ImfileFail = 0
+
+if ($?LOGDIR == 0)
+  echo "LOGDIR not defined: load pantasks.pro first"
+  break
+end
+$LOGSUBDIR = $LOGDIR/phase0
+exec mkdir -p $LOGSUBDIR
 
 # select images ready for phase0 analysis
@@ -28 +35 @@
   periods      -timeout 30
 
-  stdout phase0.imfile.log
-  stderr phase0.imfile.log
+  stdout $LOGSUBDIR/phase0.imfile.log
+  stderr $LOGSUBDIR/phase0.imfile.log
 
   task.exec
@@ -106 +113 @@
     end
 
-    stdout $WORKDIR/$EXP_TAG.$CLASS_ID.log
-    stderr $WORKDIR/$EXP_TAG.$CLASS_ID.log
+    # XXX this is still a lame rule
+    $word = `basename $EXP_TAG | tr '.' ' '`
+    list word -split $word
+    $base = $word:0
+    stdout $LOGSUBDIR/$base.p0.log
+    stderr $LOGSUBDIR/$base.p0.log
 
     # create the command line
@@ -150 +161 @@
   periods      -timeout 30
 
-  stdout phase0.exp.log
-  stderr phase0.exp.log
+  stdout $LOGSUBDIR/phase0.exp.log
+  stderr $LOGSUBDIR/phase0.exp.log
 
   # success
@@ -213 +224 @@
     $EXP_TAG   = $word:0
 
-    stdout $WORKDIR/$EXP_TAG.log
-    stderr $WORKDIR/$EXP_TAG.log
+    # XXX this is still a lame rule
+    $word = `basename $EXP_TAG | tr '.' ' '`
+    list word -split $word
+    $base = $word:0
+    stdout $LOGSUBDIR/$base.p0.log
+    stderr $LOGSUBDIR/$base.p0.log
 
     # specify choice of remote host:(need to choose based on chips)