Changeset 28458

Timestamp:

Jun 24, 2010, 11:56:57 AM (16 years ago)

Author:

Paul Price

Message:

Add 'rerun' option, default false.

Location:

branches/pap/ippTools

Files:

• share/bgtool_definechip.sql (modified) (1 diff)
• share/bgtool_definewarp.sql (modified) (1 diff)
• src/bgtool.c (modified) (4 diffs)
• src/bgtoolConfig.c (modified) (2 diffs)

branches/pap/ippTools/share/bgtool_definechip.sql

@@ -3 +3 @@
 FROM chipRun
 JOIN rawExp USING(exp_id)
+LEFT JOIN chipBackgroundRun USING(chip_id)
 WHERE chipRun.state = 'full'

branches/pap/ippTools/share/bgtool_definewarp.sql

@@ -8 +8 @@
 JOIN chipBackgroundRun USING(chip_id)
 JOIN rawExp USING(exp_id)
+LEFT JOIN warpBackgroundRun USING(chip_bg_id)
 WHERE warpRun.state = 'full'
     AND chipBackgroundRun.state = 'full'

branches/pap/ippTools/src/bgtool.c

@@ -317 +317 @@
     }
 
-    PXOPT_LOOKUP_STR(workdir, config->args, "-set_workdir", true, false);
+    PXOPT_LOOKUP_BOOL(rerun, config->args, "-rerun", false);
+    PXOPT_LOOKUP_STR(workdir, config->args, "-set_workdir", false, false);
     PXOPT_LOOKUP_STR(label, config->args, "-set_label", false, false);
     PXOPT_LOOKUP_STR(data_group, config->args, "-set_data_group", false, false);
@@ -338 +339 @@
     if (psListLength(where->list)) {
         psString whereClause = psDBGenerateWhereConditionSQL(where, NULL);
-        psStringAppend(&query, "AND %s", whereClause);
+        psStringAppend(&query, "\nAND %s", whereClause);
         psFree(whereClause);
     }
     psFree(where);
+
+    if (!rerun) {
+        psStringAppend(&query, "\nAND chipBackgroundRun.chip_bg_id IS NULL");
+        if (label) {
+            psStringAppend(&query,
+                           "\nAND (chipBackgroundRun.label = '%s'"
+                           " OR chipBackgroundRun.label IS NULL",
+                           label);
+        }
+        if (data_group) {
+            psStringAppend(&query,
+                           "\nAND (chipBackgroundRun.data_group = '%s'"
+                           " OR chipBackgroundRun.data_group IS NULL",
+                           data_group);
+        }
+        if (dist_group) {
+            psStringAppend(&query,
+                           "\nAND (chipBackgroundRun.dist_group = '%s'"
+                           " OR chipBackgroundRun.dist_group IS NULL",
+                           dist_group);
+        }
+    }
 
     if (!psDBTransaction(config->dbh)) {
@@ -1057 +1080 @@
     }
 
+    PXOPT_LOOKUP_BOOL(rerun, config->args, "-rerun", false);
     PXOPT_LOOKUP_STR(workdir, config->args, "-set_workdir", true, false);
     PXOPT_LOOKUP_STR(label, config->args, "-set_label", false, false);
@@ -1082 +1106 @@
     }
     psFree(where);
+
+    if (!rerun) {
+        psStringAppend(&query, "\nAND warpBackgroundRun.warp_bg_id IS NULL");
+        if (label) {
+            psStringAppend(&query,
+                           "\nAND (warpBackgroundRun.label = '%s'"
+                           " OR warpBackgroundRun.label IS NULL",
+                           label);
+        }
+        if (data_group) {
+            psStringAppend(&query,
+                           "\nAND (warpBackgroundRun.data_group = '%s'"
+                           " OR warpBackgroundRun.data_group IS NULL",
+                           data_group);
+        }
+        if (dist_group) {
+            psStringAppend(&query,
+                           "\nAND (warpBackgroundRun.dist_group = '%s'"
+                           " OR warpBackgroundRun.dist_group IS NULL",
+                           dist_group);
+        }
+    }
 
     if (!psDBTransaction(config->dbh)) {

branches/pap/ippTools/src/bgtoolConfig.c

@@ -90 +90 @@
     psMetadataAddF32(definechipArgs, PS_LIST_TAIL, "-sun_angle_max", 0, "search by max solar angle", NAN);
     psMetadataAddStr(definechipArgs, PS_LIST_TAIL, "-label", PS_META_DUPLICATE_OK, "search on chipRun label", NULL);
+    psMetadataAddBool(definechipArgs, PS_LIST_TAIL, "-rerun", 0, "re-run data?", false);
     psMetadataAddStr(definechipArgs, PS_LIST_TAIL, "-set_workdir", 0, "define workdir", NULL);
     psMetadataAddStr(definechipArgs, PS_LIST_TAIL, "-set_label", 0, "define label", NULL);
@@ -248 +249 @@
     psMetadataAddStr(definewarpArgs, PS_LIST_TAIL, "-warp_label", PS_META_DUPLICATE_OK, "search on warpRun label", NULL);
     psMetadataAddStr(definewarpArgs, PS_LIST_TAIL, "-bg_label", PS_META_DUPLICATE_OK, "search on warpBackgroundRun label", NULL);
+    psMetadataAddBool(definewarpArgs, PS_LIST_TAIL, "-rerun", 0, "rerun data?", false);
     psMetadataAddStr(definewarpArgs, PS_LIST_TAIL, "-set_workdir", 0, "define workdir", NULL);
     psMetadataAddStr(definewarpArgs, PS_LIST_TAIL, "-set_label", 0, "define label", NULL);