Changeset 37627

Timestamp:

Nov 18, 2014, 2:11:02 PM (12 years ago)

Author:

watersc1

Message:

Change warpstack survey task to use a key that is not the warp label.

File:

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

trunk/ippTasks/survey.pro

@@ -179 +179 @@
 macro survey.add.WSdiff
   if ($0 != 6)
-    echo "USAGE: survey.add.WSdiff (warp label) (stack label) (dist_group) (workdir base) (target label)"
+    echo "USAGE: survey.add.WSdiff (key) (warp label) (stack label) (dist_group) (workdir base) (target label)"
     break
   end
   book newpage SURVEY_DIFF_WARPSTACK $1
-  book setword SURVEY_DIFF_WARPSTACK $1 STACK_LABEL $2
-  book setword SURVEY_DIFF_WARPSTACK $1 DIST_GROUP $3
-  book setword SURVEY_DIFF_WARPSTACK $1 WORKDIR $4
-  book setword SURVEY_DIFF_WARPSTACK $1 TARGET_LABEL $5
+  book newpage SURVEY_DIFF_WARPSTACK $1 WARP_LABEL $2
+  book setword SURVEY_DIFF_WARPSTACK $1 STACK_LABEL $3
+  book setword SURVEY_DIFF_WARPSTACK $1 DIST_GROUP $4
+  book setword SURVEY_DIFF_WARPSTACK $1 WORKDIR $5
+  book setword SURVEY_DIFF_WARPSTACK $1 TARGET_LABEL $6
   book setword SURVEY_DIFF_WARPSTACK $1 STATE PENDING
 end
@@ -713 +714 @@
     endif
 
-    book getpage SURVEY_DIFF_WARPSTACK 0 -var label -key STATE NEW
+    book getpage SURVEY_DIFF_WARPSTACK 0 -var wsKey -key STATE NEW
     if ("$label" == "NULL")
       # All labels have been done --- reset
 #      echo "Resetting labels"
       for i 0 $N
-        book getpage SURVEY_DIFF_WARPSTACK $i -var label
-        book setword SURVEY_DIFF_WARPSTACK $label STATE NEW
+        book getpage SURVEY_DIFF_WARPSTACK $i -var wsKey
+        book setword SURVEY_DIFF_WARPSTACK $wsKey STATE NEW
       end
-      book getpage SURVEY_DIFF_WARPSTACK 0 -var label -key STATE NEW
+      book getpage SURVEY_DIFF_WARPSTACK 0 -var wsKey -key STATE NEW
 
       # Select different database
@@ -728 +729 @@
     end
 
-    book setword SURVEY_DIFF_WARPSTACK $label STATE DONE
-    book getword SURVEY_DIFF_WARPSTACK $label STACK_LABEL -var stack_label
-    book getword SURVEY_DIFF_WARPSTACK $label WORKDIR -var workdir
+    book setword SURVEY_DIFF_WARPSTACK $wsKey STATE DONE
+    book getword SURVEY_DIFF_WARPSTACK $wsKey WARP_LABEL -var warp_label
+    book getword SURVEY_DIFF_WARPSTACK $wsKey STACK_LABEL -var stack_label
+    book getword SURVEY_DIFF_WARPSTACK $wsKey WORKDIR -var workdir
     book getword SURVEY_DIFF_WARPSTACK $label DIST_GROUP -var dist_group
-    book getword SURVEY_DIFF_WARPSTACK $label TARGET_LABEL -var target_label
+    book getword SURVEY_DIFF_WARPSTACK $wsKey TARGET_LABEL -var target_label
 
     $year = `date +%Y`
@@ -740 +742 @@
 # Do we need anything else here? 
     $run = difftool -definewarpstack -good_frac 0.2
-    $run = $run -warp_label $label
+    $run = $run -warp_label $warp_label
     $run = $run -stack_label $stack_label
     $run = $run -set_dist_group $dist_group