Changeset 39543 for trunk

Timestamp:

Apr 19, 2016, 2:52:09 PM (10 years ago)

Author:

mhuber

Message:

correcting SSdiff format to use more flexible tag and target_label like WSdiff

File:

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

trunk/ippTasks/survey.pro

@@ -209 +209 @@
 # user functions to manipulate stack/stack diff labels
 macro survey.add.SSdiff
-  if ($0 != 5)
-    echo "USAGE: survey.add.SSdiff (stack label) (template label) (dist_group) (workdir base)"
+  if ($0 != 7)
+    echo "USAGE: survey.add.SSdiff (key) (input label) (stack label) (dist_group) (workdir base) (target label)"
     break
   end
   book newpage SURVEY_DIFF_STACKSTACK $1
-  book setword SURVEY_DIFF_STACKSTACK $1 STACK_LABEL $2
-  book setword SURVEY_DIFF_STACKSTACK $1 DIST_GROUP $3
-  book setword SURVEY_DIFF_STACKSTACK $1 WORKDIR $4
+  book setword SURVEY_DIFF_STACKSTACK $1 INPUT_LABEL $2 
+  book setword SURVEY_DIFF_STACKSTACK $1 STACK_LABEL $3
+  book setword SURVEY_DIFF_STACKSTACK $1 DIST_GROUP $4
+  book setword SURVEY_DIFF_STACKSTACK $1 WORKDIR $5
+  book setword SURVEY_DIFF_STACKSTACK $1 TARGET_LABEL $6
   book setword SURVEY_DIFF_STACKSTACK $1 STATE PENDING
 end
@@ -802 +804 @@
     endif
 
-    book getpage SURVEY_DIFF_STACKSTACK 0 -var label -key STATE NEW
-    if ("$label" == "NULL")
+    book getpage SURVEY_DIFF_STACKSTACK 0 -var ssKey -key STATE NEW
+    if ("$ssKey" == "NULL")
       # All labels have been done --- reset
 #      echo "Resetting labels"
       for i 0 $N
-        book getpage SURVEY_DIFF_STACKSTACK $i -var label
-        book setword SURVEY_DIFF_STACKSTACK $label STATE NEW
+        book getpage SURVEY_DIFF_STACKSTACK $i -var ssKey 
+        book setword SURVEY_DIFF_STACKSTACK $ssKey STATE NEW
       end
-      book getpage SURVEY_DIFF_STACKSTACK 0 -var label -key STATE NEW
+      book getpage SURVEY_DIFF_STACKSTACK 0 -var ssKey -key STATE NEW
 
       # Select different database
@@ -817 +819 @@
     end
 
-    book setword SURVEY_DIFF_STACKSTACK $label STATE DONE
-    book getword SURVEY_DIFF_STACKSTACK $label STACK_LABEL -var stack_label
-    book getword SURVEY_DIFF_STACKSTACK $label WORKDIR -var workdir
-    book getword SURVEY_DIFF_STACKSTACK $label DIST_GROUP -var dist_group
+    book setword SURVEY_DIFF_STACKSTACK $ssKey STATE DONE
+    book getword SURVEY_DIFF_STACKSTACK $ssKey INPUT_LABEL -var input_label    
+    book getword SURVEY_DIFF_STACKSTACK $ssKey STACK_LABEL -var stack_label
+    book getword SURVEY_DIFF_STACKSTACK $ssKey WORKDIR -var workdir
+    book getword SURVEY_DIFF_STACKSTACK $ssKey DIST_GROUP -var dist_group
+    book getword SURVEY_DIFF_STACKSTACK $ssKey TARGET_LABEL -var target_label    
 
     $year = `date +%Y`
@@ -827 +831 @@
 # Do we need anything else here? 
     $run = difftool -definestackstack -good_frac 0.2 
-    $run = $run -input_label $label
+    $run = $run -input_label $input_label
     $run = $run -template_label $stack_label
     $run = $run -set_dist_group $dist_group
-    $run = $run -set_label $label
+    $run = $run -set_label $target_label
     $run = $run -set_workdir $workdir/$label/$year/$month/$day
     $run = $run -set_reduction STACKSTACK
@@ -1022 +1026 @@
     if ("$stage" == "diff")
         $run = $run -uncensored
-    end 
+    end
     # we need to handle isp/gpc1: gpc1 wants destreaked, isp wants uncensored.  Perhaps the best way is by default do destreaked (the most paranoid), and if db = isp (is this the best way?) then do uncensored
     
@@ -1480 +1484 @@
       $SURVEY_PUBLISH_DB ++
       if ($SURVEY_PUBLISH_DB >= $DB:n) set SURVEY_PUBLISH_DB = 0
-      periods -exec 900
+      periods -exec 300
       date -var mytime
       echo "done with publish list @ $mytime"