Changeset 23506 for trunk/ippTools

Timestamp:

Mar 24, 2009, 5:24:49 PM (17 years ago)

Author:

Paul Price

Message:

Adding restriction on good_frac for skycells of warp-warp diffs.

Location:

trunk/ippTools/src

Files:

• difftool.c (modified) (7 diffs)
• difftoolConfig.c (modified) (1 diff)

trunk/ippTools/src/difftool.c

@@ -1262 +1262 @@
     PS_ASSERT_PTR_NON_NULL(config, false);
 
-    psMetadata *where = psMetadataAlloc();
-
-    // Restrictions
-    PXOPT_COPY_S64(config->args, where, "-warp_id", "inputWarpRun.warp_id", "==");
-    PXOPT_COPY_S64(config->args, where, "-exp_id", "inputRawExp.exp_id", "==");
-    PXOPT_COPY_STR(config->args, where, "-filter", "inputRawExp.filter", "==");
-    PXOPT_COPY_STR(config->args, where, "-input_label", "inputWarpRun.label", "==");
-    PXOPT_COPY_STR(config->args, where, "-template_label", "templateWarpRun.label", "==");
-    PXOPT_COPY_F32(config->args, where, "-timediff",
+    psMetadata *selectWhere = psMetadataAlloc();
+    psMetadata *insertWhere = psMetadataAlloc();
+
+    // Restrictions for selecting warps
+    PXOPT_COPY_S64(config->args, selectWhere, "-warp_id", "inputWarpRun.warp_id", "==");
+    PXOPT_COPY_S64(config->args, selectWhere, "-exp_id", "inputRawExp.exp_id", "==");
+    PXOPT_COPY_STR(config->args, selectWhere, "-filter", "inputRawExp.filter", "==");
+    PXOPT_COPY_STR(config->args, selectWhere, "-input_label", "inputWarpRun.label", "==");
+    PXOPT_COPY_STR(config->args, selectWhere, "-template_label", "templateWarpRun.label", "==");
+    PXOPT_COPY_F32(config->args, selectWhere, "-timediff",
                    "ABS(TIME_TO_SEC(TIMEDIFF(inputRawExp.dateobs, templateRawExp.dateobs)))", "<=");
-    PXOPT_COPY_F32(config->args, where, "-rotdiff", "ABS(inputRawExp.posang - templateRawExp.posang)", "<=");
+    PXOPT_COPY_F32(config->args, selectWhere, "-rotdiff", "ABS(inputRawExp.posang - templateRawExp.posang)", "<=");
+
+    // Restrictions for inserting skycells
+    PXOPT_COPY_F32(config->args, insertWhere, "-good_frac", "inputWarpSkyfile.good_frac", ">=");
+    PXOPT_COPY_F32(config->args, insertWhere, "-good_frac", "templateWarpSkyfile.good_frac", ">=");
 
     // Additional controls
@@ -1294 +1299 @@
     psString whereClause = NULL; // The WHERE part of the query
 
-    if (psListLength(where->list)) {
-        psString new = psDBGenerateWhereConditionSQL(where, NULL);
+    if (psListLength(selectWhere->list)) {
+        psString new = psDBGenerateWhereConditionSQL(selectWhere, NULL);
         psStringAppend(&whereClause, "\n%s %s", whereClause ? "AND" : "WHERE", new);
         psFree(new);
     }
-    psFree(where);
+    psFree(selectWhere);
 
     if (!rerun) {
@@ -1313 +1318 @@
         psFree(select);
         psFree(whereClause);
+        psFree(insertWhere);
         return false;
     }
@@ -1322 +1328 @@
         psFree(select);
         psFree(whereClause);
+        psFree(insertWhere);
         if (!psDBRollback(config->dbh)) {
             psError(PS_ERR_UNKNOWN, false, "database error");
@@ -1347 +1354 @@
             psError(PS_ERR_UNKNOWN, false, "database error");
         }
+        psFree(insertWhere);
         return false;
     }
@@ -1352 +1360 @@
         psTrace("difftool", 1, "no rows found");
         psFree(results);
+        psFree(insertWhere);
         if (!psDBCommit(config->dbh)) {
             psError(PS_ERR_UNKNOWN, false, "database error");
@@ -1360 +1369 @@
 
     psString insert = pxDataGet("difftool_definewarpwarp_insert.sql"); // Insertion for each new run
+
+    if (psListLength(insertWhere->list)) {
+        psString whereClause = psDBGenerateWhereConditionSQL(insertWhere, NULL);
+        psStringAppend(&insert, "\n%s", whereClause);
+        psFree(whereClause);
+    }
+    psFree(insertWhere);
 
     psArray *list = psArrayAllocEmpty(16); // List of runs defined, to print

trunk/ippTools/src/difftoolConfig.c

@@ -174 +174 @@
     psMetadataAddStr(definewarpwarpArgs, PS_LIST_TAIL, "-input_label", 0, "search by warp label for input", NULL);
     psMetadataAddStr(definewarpwarpArgs, PS_LIST_TAIL, "-template_label", 0, "search by warp label for template", NULL);
+    psMetadataAddF32(definewarpwarpArgs, PS_LIST_TAIL, "-good_frac", 0, "minimum good fraction of skycell", NAN);
     psMetadataAddStr(definewarpwarpArgs, PS_LIST_TAIL, "-workdir", 0, "define workdir (required)", NULL);
     psMetadataAddStr(definewarpwarpArgs, PS_LIST_TAIL, "-label",  0, "define label", NULL);