Changeset 26950

Timestamp:

Feb 14, 2010, 4:23:41 PM (16 years ago)

Author:

eugene

Message:

moved various utilities into pantasks.pro; moved revert.on/off functions to chip.pro, camera.pro, warp.pro; added surveys.on/off; moved project-specific labels to ~/stdscience/input

Location:

trunk/ippTasks

Files:

• camera.pro (modified) (1 diff)
• chip.pro (modified) (1 diff)
• nightly_stacks.pro (modified) (1 diff)
• pantasks.pro (modified) (1 diff)
• survey.pro (modified) (11 diffs)
• warp.pro (modified) (1 diff)

trunk/ippTasks/camera.pro

@@ -51 +51 @@
     active false
   end
+  task camera.revert
+    active false
+  end
+end
+
+macro camera.revert.on
+  task camera.revert
+    active true
+  end
+end
+
+macro camera.revert.off
   task camera.revert
     active false

trunk/ippTasks/chip.pro

@@ -41 +41 @@
     active false
   end
+  task chip.revert
+    active false
+  end
+end
+
+macro chip.revert.on
+  task chip.revert
+    active true
+  end
+end
+
+macro chip.revert.off
   task chip.revert
     active false

trunk/ippTasks/nightly_stacks.pro

@@ -17 +17 @@
     ns.chips.off
     ns.stacks.off
-end
-
-macro ns.load.labels
-    echo "This is a static list, and not generated from the config file!"
-    add.label M31.nightlyscience
-    add.label MD01.nightlyscience
-    add.label MD02.nightlyscience
-    add.label MD03.nightlyscience
-    add.label MD04.nightlyscience
-    add.label MD05.nightlyscience
-    add.label MD06.nightlyscience
-    add.label MD07.nightlyscience
-    add.label MD08.nightlyscience
-    add.label MD09.nightlyscience
-    add.label MD10.nightlyscience
-    add.label STS.nightlyscience
-    add.label SweetSpot.nightlyscience
-    add.label ThreePi.nightlyscience
 end
 

trunk/ippTasks/pantasks.pro

@@ -694 +694 @@
   end
 end
+
+macro show.book
+  if ($0 != 2)
+   echo "USAGE: show.book (book)"
+   break
+  end
+
+  book npages $1 -var npages
+  for i 0 $npages
+    book getpage $1 $i -var pagename
+    book listpage $1 $pagename
+  end
+
+  echo "npages: $npages"
+end
+
+macro del.page.from.book
+  if ($0 != 3)
+   echo "USAGE: del.page.from.book (book) (page)"
+   break
+  end
+
+  book delpage $1 $2
+end
+

trunk/ippTasks/survey.pro

@@ -29 +29 @@
  book create SURVEY_DESTREAK
  book create SURVEY_DIST
- book create SURVEY_ADD   
+ book create SURVEY_ADDSTAR   
  $haveSurveyBooks = TRUE
 end
@@ -39 +39 @@
 $SURVEY_DESTREAK_DB = 0
 $SURVEY_DIST_DB = 0
-$SURVEY_ADD_DB = 0
+$SURVEY_ADDSTAR_DB = 0
 
 $SURVEY_EXEC = 120
 $SURVEY_POLL = 10
 $SURVEY_TIMEOUT = 600
+
+macro survey.on
+  task survey.diff
+    active true
+  end
+  task survey.warpstack.diff
+    active true
+  end
+  task survey.stackstack.diff
+    active true
+  end
+  task survey.magic
+    active true
+  end
+  task survey.addstar
+    active true
+  end
+  task survey.destreak
+    active true
+  end
+  task survey.dist
+    active true
+  end
+end
+
+macro survey.off
+  task survey.diff
+    active false
+  end
+  task survey.warpstack.diff
+    active false
+  end
+  task survey.stackstack.diff
+    active false
+  end
+  task survey.magic
+    active false
+  end
+  task survey.addstar
+    active false
+  end
+  task survey.destreak
+    active false
+  end
+  task survey.dist
+    active false
+  end
+end
 
 # user functions to manipulate diff labels
@@ -99 +147 @@
     break
   end
-  book listbook SURVEY_DIFF_WARPSTACK $1
+  book listbook SURVEY_DIFF_WARPSTACK
 end
 
@@ -128 +176 @@
     break
   end
-  book listbook SURVEY_DIFF_STACKSTACK $1
+  book listbook SURVEY_DIFF_STACKSTACK
 end
 
@@ -158 +206 @@
 end
 
-macro survey.add.addstage
+macro survey.add.addstar
   if ($0 != 3)
-    echo "USAGE: survey.add.addstage (label) (dvodb)"
-    break
-  end
-  book newpage SURVEY_ADD $1
-  book setword SURVEY_ADD $1 DVODB $2
-  book setword SURVEY_ADD $1 STATE PENDING
-end
-
-macro survey.del.addstage
+    echo "USAGE: survey.add.addstar (label) (dvodb)"
+    break
+  end
+  book newpage SURVEY_ADDSTAR $1
+  book setword SURVEY_ADDSTAR $1 DVODB $2
+  book setword SURVEY_ADDSTAR $1 STATE PENDING
+end
+
+macro survey.del.addstar
   if ($0 != 2)
-    echo "USAGE: survey.del.addstage (label)"
-    break
-  end
-  book delpage SURVEY_ADD $1
-end
-
-macro survey.show.addstage
+    echo "USAGE: survey.del.addstar (label)"
+    break
+  end
+  book delpage SURVEY_ADDSTAR $1
+end
+
+macro survey.show.addstar
   if ($0 != 1)
-    echo "USAGE: survey.show.addstage"
-    break
-  end
-  book listbook SURVEY_ADD
+    echo "USAGE: survey.show.addstar"
+    break
+  end
+  book listbook SURVEY_ADDSTAR
 end
 
@@ -457 +505 @@
     end
     
-#    echo $run
+    echo $run
     command $run
   end
@@ -553 +601 @@
 end
 
-task survey.add
+task survey.addstar
   host local
  
@@ -561 +609 @@
   npending     1
 
-  stdout $LOGDIR/survey.addstage.log
-  stderr $LOGDIR/survey.addstage.log
+  stdout $LOGDIR/survey.addstar.log
+  stderr $LOGDIR/survey.addstar.log
 
   # generate magic warp-warp runs
   task.exec
-    book npages SURVEY_ADD -var N
+    book npages SURVEY_ADDSTAR -var N
     if ($N == 0)
 #      echo "No labels for processing"
@@ -572 +620 @@
     endif
 
-    book getpage SURVEY_ADD 0 -var label -key STATE NEW
+    book getpage SURVEY_ADDSTAR 0 -var label -key STATE NEW
     if ("$label" == "NULL")
       # All labels have been done --- reset
 #      echo "Resetting labels"
       for i 0 $N
-        book getpage SURVEY_ADD $i -var label
-        book setword SURVEY_ADD $label STATE NEW
+        book getpage SURVEY_ADDSTAR $i -var label
+        book setword SURVEY_ADDSTAR $label STATE NEW
       end
-      book getpage SURVEY_ADD 0 -var label -key STATE NEW
+      book getpage SURVEY_ADDSTAR 0 -var label -key STATE NEW
 
       # Select different database
-      $SURVEY_ADD_DB ++
-      if ($SURVEY_ADD_DB >= $DB:n) set SURVEY_ADD_DB = 0
-    end
-
-    book setword SURVEY_ADD $label STATE DONE
-    book getword SURVEY_ADD $label DVODB -var dvodb
+      $SURVEY_ADDSTAR_DB ++
+      if ($SURVEY_ADDSTAR_DB >= $DB:n) set SURVEY_ADDSTAR_DB = 0
+    end
+
+    book setword SURVEY_ADDSTAR $label STATE DONE
+    book getword SURVEY_ADDSTAR $label DVODB -var dvodb
   
     $run = addtool -definebyquery -destreaked -label $label -set_dvodb $dbodb
@@ -595 +643 @@
       option DEFAULT
     else
-      $run = $run -dbname $DB:$SURVEY_ADD_DB
-      option $DB:$SURVEY_ADD_DB
+      $run = $run -dbname $DB:$SURVEY_ADDSTAR_DB
+      option $DB:$SURVEY_ADDSTAR_DB
     end
     
@@ -622 +670 @@
   end
 end
-
-
 
 

trunk/ippTasks/warp.pro

@@ -78 +78 @@
   end
   task warp.revert.warped
+    active false
+  end
+end
+
+macro warp.revert.on
+  task warp.revert.warped
+    active true
+  end
+  task warp.revert.overlap
+    active true
+  end
+end
+
+macro warp.revert.off
+  task warp.revert.warped
+    active false
+  end
+  task warp.revert.overlap
     active false
   end