Index: trunk/ippTasks/survey.pro
===================================================================
--- trunk/ippTasks/survey.pro	(revision 35627)
+++ trunk/ippTasks/survey.pro	(revision 35676)
@@ -382,10 +382,11 @@
 macro survey.add.chip.bg
   if ($0 != 4)
-    echo "USAGE: survey.add.chip.bg (label) (dist_group) (muggle)"
+    echo "USAGE: survey.add.chip.bg (label) (cam_label) (dist_group)"
     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 LABEL $1
+  book setword SURVEY_CHIP_BG $1 CAM_LABEL $2
+  book setword SURVEY_CHIP_BG $1 DIST_GROUP $3
   book setword SURVEY_CHIP_BG $1 STATE PENDING
 end
@@ -410,10 +411,11 @@
 macro survey.add.warp.bg
   if ($0 != 4)
-    echo "USAGE: survey.add.warp.bg (label) (dist_group) (muggle)"
+    echo "USAGE: survey.add.warp.bg (label) (warp_label) (dist_group)"
     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 LABEL $1
+  book setword SURVEY_WARP_BG $1 WARP_LABEL $2
+  book setword SURVEY_WARP_BG $1 DIST_GROUP $3
   book setword SURVEY_WARP_BG $1 STATE PENDING
 end
@@ -1312,11 +1314,12 @@
 
     book setword SURVEY_CHIP_BG $label STATE DONE
+    book getword SURVEY_CHIP_BG $label CAM_LABEL -var cam_label
     book getword SURVEY_CHIP_BG $label DIST_GROUP -var dist_group
-    book getword SURVEY_CHIP_BG $label MUGGLE -var muggle
+#    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
+    $run = bgtool -definechip -label $label -cam_label $cam_label -set_dist_group $dist_group
+#    if ($muggle == 0)
+#        $run = $run -destreaked
+#    end
 
     if ($DB:n == 0)
@@ -1388,11 +1391,11 @@
 
     book setword SURVEY_WARP_BG $label STATE DONE
+    book getword SURVEY_WARP_BG $label WARP_LABEL -var warp_label
     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
+    $run = bgtool -definewarp -set_label $label -chip_bg_label $label -warp_label $warp_label -set_dist_group $dist_group
+#    if ($muggle == 0)
+#        $run = $run -destreaked
+#    end