Changeset 26950 for trunk/ippTasks/survey.pro

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

File:

• trunk/ippTasks/survey.pro (modified) (11 diffs)

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
-
-