Changeset 31439 for branches/eam_branches/ipp-20110404/ippTasks/survey.pro

Timestamp:

May 5, 2011, 10:05:10 AM (15 years ago)

Author:

eugene

Message:

merging updates from trunk

File:

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

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

@@ -231 +231 @@
 
 macro survey.add.addstar
-  if ($0 != 4)
-    echo "USAGE: survey.add.addstar (label) (dvodb) (minidvodb_group)"
+  if ($0 != 5)
+    echo "USAGE: survey.add.addstar (label) (dvodb) (minidvodb_group) (stage)"
     break
   end
@@ -238 +238 @@
   book setword SURVEY_ADDSTAR $1 DVODB $2
   book setword SURVEY_ADDSTAR $1 MINIDVODB_GROUP $3
+  book setword SURVEY_ADDSTAR $1 STAGE $4  
   book setword SURVEY_ADDSTAR $1 STATE PENDING
 end
@@ -753 +754 @@
     book getword SURVEY_ADDSTAR $label DVODB -var dvodb
     book getword SURVEY_ADDSTAR $label MINIDVODB_GROUP -var minidvodb_group
+    book getword SURVEY_ADDSTAR $label STAGE -var stage
+    
   
  #   $run = addtool -definebyquery -destreaked -label $label -set_dvodb $dbodb
@@ -763 +766 @@
     end
     
-    $run = $run -definebyquery -destreaked -label $label -set_dvodb $dvodb -set_minidvodb_group $minidvodb_group -set_minidvodb -set_label $minidvodb_group
+    $run = $run -definebyquery -label $label -set_dvodb $dvodb -set_minidvodb_group $minidvodb_group -set_minidvodb -set_label $minidvodb_group -stage $stage
     # echo $run
+    if ($stage == 'cam') 
+        #only queue destreaked cams. stacks and staticsky don't need this
+        $run = $run -destreaked
+    end
+   
+
     command $run
   end