Changeset 10675

Timestamp:

Dec 12, 2006, 5:29:41 PM (19 years ago)

Author:

eugene

Message:

cleanup lognames

Location:

trunk/ippTasks

Files:

• pantasks.pro (modified) (1 diff)
• phase0.pro (modified) (7 diffs)

trunk/ippTasks/pantasks.pro

@@ -2 +2 @@
 $network = 1
 $parallel = 1
-$scripts = $HOME/src/pantasks/ipp/ippTasks
+# $scripts = $HOME/src/pantasks/ipp/ippTasks
+$scripts = .
 $LOGDIR = `ipp_datapath.pl path://ESSENCE/`
 $LOGDIR = "$LOGDIR/logs"

trunk/ippTasks/phase0.pro

@@ -16 +16 @@
 
 $Phase0ImfileFail = 0
+$Phase0ExpFail = 0
 
 if ($?LOGDIR == 0)
@@ -28 +29 @@
 # compare the new list with the ones already selected
 task           phase0.imfile.load
-#  command      p0tool -pendingimfile -simple
+  command      p0tool -pendingimfile -simple
   host         local
 
@@ -39 +40 @@
 
   task.exec
-    command      p0tool.sh {$Phase0ImfileFail + 20}
+    command p0tool -pendingimfile -simple -limit {$Phase0ImfileFail + 20}
   end
 
@@ -45 +46 @@
   task.exit    0
     local i Nqueue
-
-    # save stdout and stderr
 
     # compare output with Phase0Imfiles queue
     # only add entries which don't exist in queue
     queuesize stdout -var Nqueue
-    for i 0 {$Nqueue << 20}
+    for i 0 $Nqueue
       queuepop stdout -var line
       echo $line
@@ -154 +153 @@
 # compare the new list with the ones already selected
 task           phase0.exp.load
-  command      p0tool -pendingexp -simple
   host         local
 
@@ -163 +161 @@
   stdout $LOGSUBDIR/phase0.exp.log
   stderr $LOGSUBDIR/phase0.exp.log
+
+  task.exec
+    command p0tool -pendingexp -simple -limit {$Phase0ExpFail + 20}
+  end
 
   # success
@@ -253 +255 @@
   task.exit    default
     queuepush Phase0Exposures -replace -key 1 "FAIL $options:0"
+    $Phase0ExpFail
   end