Changeset 32630 for branches/eam_branches/ipp-20110906/ippTasks/lap.pro

Timestamp:

Nov 8, 2011, 2:44:12 PM (15 years ago)

Author:

eugene

Message:

merge changes from trunk

Location:

branches/eam_branches/ipp-20110906

Files:

• . (modified) (1 prop)
• ippTasks/lap.pro (modified) (4 diffs)

branches/eam_branches/ipp-20110906/ippTasks/lap.pro

@@ -10 +10 @@
 $lap_RunPage = 0
 $lap_DonePage = 0
+
+$LAP_QUEUE = NULL
 
 book init lapNewRuns
@@ -135 +137 @@
  
 
+macro lap.define.queue
+  $LAP_QUEUE = $1
+end
+
 task           lap.initial.load
   host         local
@@ -388 +394 @@
     stderr $LOGDIR/lap.load.log
 
-    $run = laptool -pendingrun -state done
+    $run = laptool -pendingrun -state full
 
     if ($lapSeq:n != 0)
@@ -463 +469 @@
     option $LAP_ID
     $run = lap_science.pl --cleanup_mode --dbname $DBNAME --lap_id $LAP_ID
+    if ("$LAP_QUEUE" != "NULL") 
+      $run = $run --queue_list $LAP_QUEUE
+    end
+    
 
     command $run