Changeset 34394 for branches/eam_branches/ipp-20120805/ippTasks/survey.pro

Timestamp:

Sep 5, 2012, 3:48:04 PM (14 years ago)

Author:

eugene

Message:

merge changes from trunk

File:

• branches/eam_branches/ipp-20120805/ippTasks/survey.pro (modified) (4 diffs)

branches/eam_branches/ipp-20120805/ippTasks/survey.pro

@@ -144 +144 @@
 # user functions to manipulate warp/stack diff labels
 macro survey.add.WSdiff
-  if ($0 != 5)
-    echo "USAGE: survey.add.WSdiff (warp label) (stack label) (dist_group) (workdir base)"
+  if ($0 != 6)
+    echo "USAGE: survey.add.WSdiff (warp label) (stack label) (dist_group) (workdir base) (target label)"
     break
   end
@@ -152 +152 @@
   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 setword SURVEY_DIFF_WARPSTACK $1 STATE PENDING
 end
@@ -583 +584 @@
     book getword SURVEY_DIFF_WARPSTACK $label 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
 
     $year = `date +%Y`
@@ -593 +595 @@
     $run = $run -stack_label $stack_label
     $run = $run -set_dist_group $dist_group
-    $run = $run -set_label $label
-    $run = $run -set_workdir $workdir/$label/$year/$month/$day
+    $run = $run -set_label $target_label
+    $run = $run -set_workdir $workdir/$target_label/$year/$month/$day
     $run = $run -set_reduction WARPSTACK
     $run = $run -available