Changeset 32680 for trunk/ippTasks/survey.pro

Timestamp:

Nov 16, 2011, 3:04:31 PM (15 years ago)

Author:

bills

Message:

In the survey tasks for the background restore stages and distribution make
magic optional controlled with a parameter to the survey.add macros

File:

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

trunk/ippTasks/survey.pro

@@ -302 +302 @@
 # user functions to manipulate dist labels
 macro survey.add.dist
-  if ($0 != 3)
-    echo "USAGE: survey.add.dist (label) (workdir)"
+  if ($0 != 4)
+    echo "USAGE: survey.add.dist (label) (workdir) (muggle)"
     break
   end
   book newpage SURVEY_DIST $1
   book setword SURVEY_DIST $1 WORKDIR $2
+  book setword SURVEY_DIST $1 MUGGLE $3
   book setword SURVEY_DIST $1 STATE PENDING
 end
@@ -329 +330 @@
 # user functions to manipulate chip_bg labels
 macro survey.add.chip.bg
-  if ($0 != 3)
-    echo "USAGE: survey.add.chip.bg (label) (dist_group)"
+  if ($0 != 4)
+    echo "USAGE: survey.add.chip.bg (label) (dist_group) (muggle)"
     break
   end
   book newpage SURVEY_CHIP_BG $1
   book setword SURVEY_CHIP_BG $1 DIST_GROUP $2
+  book setword SURVEY_CHIP_BG $1 MUGGLE $3
   book setword SURVEY_CHIP_BG $1 STATE PENDING
 end
@@ -356 +358 @@
 # user functions to manipulate warp_bg labels
 macro survey.add.warp.bg
-  if ($0 != 3)
-    echo "USAGE: survey.add.warp.bg (label) (dist_group)"
+  if ($0 != 4)
+    echo "USAGE: survey.add.warp.bg (label) (dist_group) (muggle)"
     break
   end
   book newpage SURVEY_WARP_BG $1
   book setword SURVEY_WARP_BG $1 DIST_GROUP $2
+  book setword SURVEY_WARP_BG $1 MUGGLE $3
   book setword SURVEY_WARP_BG $1 STATE PENDING
 end
@@ -984 +987 @@
     $workdir = $workdir_base/$label/$year/$month/$day
 
+    book getword SURVEY_DIST $label MUGGLE -var muggle
+
     book setword SURVEY_DIST $label STATE DONE
   
     # note workdir is set by the script based on site.config
     $run = dist_defineruns.pl --label $label --workdir $workdir
+    if ($muggle != 0)
+        $run = $run --no_magic 
+    end
 
     if ($DB:n == 0)
@@ -1058 +1066 @@
     book setword SURVEY_CHIP_BG $label STATE DONE
     book getword SURVEY_CHIP_BG $label DIST_GROUP -var dist_group
+    book getword SURVEY_CHIP_BG $label MUGGLE -var muggle
   
     $run = bgtool -definechip -label $label -set_dist_group $dist_group
+    if ($muggle == 0)
+        $run = $run -destreaked
+    end
 
     if ($DB:n == 0)
@@ -1068 +1080 @@
     end
     
-    # echo $run
+    if ($VERBOSE > 1) 
+        echo $run
+    end
     command $run
   end
@@ -1128 +1142 @@
     book setword SURVEY_WARP_BG $label STATE DONE
     book getword SURVEY_WARP_BG $label DIST_GROUP -var dist_group
+    book getword SURVEY_WARP_BG $label MUGGLE -var muggle
   
     $run = bgtool -definewarp -warp_label $label -set_dist_group $dist_group
+    if ($muggle == 0)
+        $run = $run -destreaked
+    end
+
 
     if ($DB:n == 0)
@@ -1138 +1157 @@
     end
     
-    # echo $run
+    if ($VERBOSE > 1) 
+        echo $run
+    end
     command $run
   end
@@ -1258 +1279 @@
     book npages SURVEY_STATICSKYSINGLE -var N
     if ($N == 0)
-      echo "No STATICSKYSINGLE labels for processing"
+       # echo "No STATICSKYSINGLE labels for processing"
        break
     endif