Changeset 32680

Timestamp:

Nov 16, 2011, 3:04:31 PM (14 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

Location:

trunk

Files:

• ippScripts/scripts/dist_defineruns.pl (modified) (1 diff)
• ippTasks/survey.pro (modified) (9 diffs)
• ippTools/share/bgtool_definechip.sql (modified) (1 diff)
• ippTools/src/disttool.c (modified) (2 diffs)
• ippTools/src/disttoolConfig.c (modified) (1 diff)

trunk/ippScripts/scripts/dist_defineruns.pl

@@ -88 +88 @@
     push @stages, $stage;
 } else {
-    @stages = qw( raw chip chip_bg camera fake warp warp_bg diff stack SSdiff sky);
+    @stages = qw(chip chip_bg camera fake warp warp_bg diff stack SSdiff sky);
 }
 

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

trunk/ippTools/share/bgtool_definechip.sql

@@ -5 +5 @@
 LEFT JOIN chipBackgroundRun USING(chip_id)
 WHERE chipRun.state = 'full'
-    AND chipRun.magicked > 0 -- require destreaked to stop race condition in destreaking

trunk/ippTools/src/disttool.c

@@ -141 +141 @@
     PXOPT_LOOKUP_BOOL(use_alternate, config->args, "-use_alternate", false);
     PXOPT_LOOKUP_BOOL(no_magic, config->args, "-no_magic", false);
-    PXOPT_LOOKUP_BOOL(i_am_sure, config->args, "-i_am_sure", false);
     PXOPT_LOOKUP_STR(set_label, config->args, "-set_label", false, false);
     PXOPT_LOOKUP_STR(set_data_group, config->args, "-set_data_group", false, false);
@@ -165 +164 @@
     PXOPT_LOOKUP_STR(dist_group, config->args, "-dist_group", false, false);
 
-    // queuing no_magic runs can be quite dangerous. Require confirmation
-    if (no_magic && !pretend && !i_am_sure) {
-        psError(PXTOOLS_ERR_SYS, true, "-i_am_sure required to queue no_magic distribution runs");
-        return false;
-    }
-   
     if (use_alternate) {
         if (strcmp(stage, "raw")) {

trunk/ippTools/src/disttoolConfig.c

@@ -49 +49 @@
 
     psMetadataAddBool(definebyqueryArgs, PS_LIST_TAIL, "-no_magic", 0, "magic is not needed", false);
-    psMetadataAddBool(definebyqueryArgs, PS_LIST_TAIL, "-i_am_sure", 0, "confirmation needed when -no_magic is supplied", false);
     psMetadataAddBool(definebyqueryArgs, PS_LIST_TAIL, "-use_alternate", 0, "use alternate inputs", false);
     psMetadataAddStr(definebyqueryArgs, PS_LIST_TAIL, "-set_label",    0, "define label for run", NULL);