Changeset 32283

Timestamp:

Sep 1, 2011, 2:12:15 PM (15 years ago)

Author:

watersc1

Message:

Fix magictool to understand that we sometimes want to allow multiple diffs in the same label to be independently processed.

Location:

trunk

Files:

• ippTasks/survey.pro (modified) (3 diffs)
• ippTools/share/Makefile.am (modified) (1 diff)
• ippTools/share/magictool_definebyquery_select.sql (modified) (1 diff)
• ippTools/share/magictool_definebyquery_select_multidiff.sql (added)
• ippTools/src/magictool.c (modified) (2 diffs)
• ippTools/src/magictoolConfig.c (modified) (1 diff)

trunk/ippTasks/survey.pro

@@ -213 +213 @@
 # user functions to manipulate magic labels
 macro survey.add.magic
-  if ($0 != 3)
-    echo "USAGE: survey.add.magic (label) (workdir base)"
+  if (($0 != 3)&&($0 != 4))
+    echo "USAGE: survey.add.magic (label) (workdir base) (multidiff)"
     break
   end
   book newpage SURVEY_MAGIC $1
   book setword SURVEY_MAGIC $1 WORKDIR $2
+  if ($0 == 3)
+     book setword SURVEY_MAGIC $1 MULTIDIFF FALSE
+  else 
+     book setword SURVEY_MAGIC $1 MULTIDIFF $3
+  end
   book setword SURVEY_MAGIC $1 STATE PENDING
 end
@@ -725 +730 @@
     book setword SURVEY_MAGIC $label STATE DONE
     book getword SURVEY_MAGIC $label WORKDIR -var workdir
-  
-    $run = magictool -rerun -definebyquery -label $label -diff_label $label -workdir $workdir/$label
+    book getword SURVEY_MAGIC $label MULTIDIFF -var multidiff
+
+    $run = magictool -pretend -rerun -definebyquery -label $label -diff_label $label -workdir $workdir/$label
+    
+    if (("$multidiff" == "TRUE")||("$multidiff" == "MULTIDIFF"))
+       $run = $run -multidiff
+    end
 
     if ($DB:n == 0)
@@ -735 +745 @@
     end
     
-    # echo $run
+    echo $run
     command $run
   end

trunk/ippTools/share/Makefile.am

@@ -244 +244 @@
         magictool_definebyquery_insert.sql \
         magictool_definebyquery_select.sql \
+        magictool_definebyquery_select_multidiff.sql \
         magictool_inputs.sql \
         magictool_inputskyfile.sql \

trunk/ippTools/share/magictool_definebyquery_select.sql

@@ -49 +49 @@
     ) AS oldMagicRun
     ON oldMagicRun.exp_id = chipRun.exp_id
---    AND oldMagicRun.diff_id = diffWarps.diff_id
 -- WHERE hook %s
 GROUP BY chipRun.exp_id

trunk/ippTools/src/magictool.c

@@ -131 +131 @@
     PXOPT_LOOKUP_BOOL(simple, config->args, "-simple", false);
     PXOPT_LOOKUP_BOOL(pretend, config->args, "-pretend", false);
-
+    PXOPT_LOOKUP_BOOL(multidiff, config->args, "-multidiff", false);
     psMetadata *diffWhere = psMetadataAlloc(); // WHERE conditions for diffRuns
     PXOPT_COPY_STR(config->args, diffWhere, "-diff_label", "diffRun.label", "==");
@@ -142 +142 @@
     // Get list of exposures ready to magic
     {
-        psString query = pxDataGet("magictool_definebyquery_select.sql");
+        psString query;
+        if (multidiff) {
+          query = pxDataGet("magictool_definebyquery_select_multidiff.sql");
+        }
+        else {
+          query = pxDataGet("magictool_definebyquery_select.sql");
+        }
         if (!query) {
             psError(PXTOOLS_ERR_SYS, false, "failed to retreive SQL statement");

trunk/ippTools/src/magictoolConfig.c

@@ -61 +61 @@
     psMetadataAddBool(definebyqueryArgs, PS_LIST_TAIL, "-available", 0, "process what's immediately available?", false);
     psMetadataAddBool(definebyqueryArgs, PS_LIST_TAIL, "-rerun", 0, "generate new run even if existing?", false);
+    psMetadataAddBool(definebyqueryArgs, PS_LIST_TAIL, "-multidiff", 0, "allow multiple diffs to be magicked with the same label", false);
     psMetadataAddBool(definebyqueryArgs, PS_LIST_TAIL, "-simple", 0, "use the simple output format", false);
     psMetadataAddBool(definebyqueryArgs, PS_LIST_TAIL, "-pretend", 0, "list results but do not queue", false);