Changeset 36633 for trunk/ippTools/src/fftool.c

Timestamp:

Apr 2, 2014, 10:50:14 AM (12 years ago)

Author:

bills

Message:

Merge with ipp-20140401 (The staticsky tag)

Location:

trunk

Files:

• . (modified) (1 prop)
• ippTools/src/fftool.c (modified) (5 diffs)

trunk/ippTools/src/fftool.c

@@ -139 +139 @@
 
     psMetadata *warpWhereMD = psMetadataAlloc();
-    pxAddLabelSearchArgs(config, warpWhereMD, "-select_warp_label",     "fullForceRun.label",           "LIKE");
-    pxAddLabelSearchArgs(config, warpWhereMD, "-select_warp_data_group","fullForceRun.data_group",      "LIKE");
-    PXOPT_COPY_S64(config->args, warpWhereMD, "-select_warp_id",        "fullForceRun.warp_id",         "==");
+    pxAddLabelSearchArgs(config, warpWhereMD, "-select_warp_label",     "warpRun.label",           "LIKE");
+    pxAddLabelSearchArgs(config, warpWhereMD, "-select_warp_data_group","warpRun.data_group",      "LIKE");
+    PXOPT_COPY_S64(config->args, warpWhereMD, "-select_warp_id",        "warpRun.warp_id",         "==");
     if (!psListLength(warpWhereMD->list)) {
         psError(PXTOOLS_ERR_CONFIG, false, "warp search parameters are required");
@@ -148 +148 @@
         return false;
     }
-    if (!psListLength(warpWhereMD->list)) {
-        psError(PXTOOLS_ERR_CONFIG, false, "skycal search parameters are required");
-        psFree(skycalWhereMD);
-        psFree(warpWhereMD);
-        return false;
-    }
-
-    PXOPT_COPY_STR(config->args, warpWhereMD, "-select_tess_id",       "fullForceRun.tess_id",         "==");
-    pxAddLabelSearchArgs(config, warpWhereMD, "-select_filter",        "fullForceRun.filter",          "LIKE");
-    if (!pxskycellAddWhere(config, warpWhereMD)) {
-        psError(PXTOOLS_ERR_CONFIG, false, "failed to add skycell search arguments");
-        psFree(skycalWhereMD);
-        psFree(warpWhereMD);
-        return false;
-    }
-
+    PXOPT_COPY_F32(config->args, warpWhereMD, "-select_good_frac_min",  "warpSkyfile.good_frac",   ">=");
+    PXOPT_COPY_STR(config->args, warpWhereMD, "-select_tess_id",       "warpRun.tess_id",         "==");
+    pxAddLabelSearchArgs(config, warpWhereMD, "-select_filter",        "rawExp.filter",          "LIKE");
 
     PXOPT_LOOKUP_BOOL(rerun, config->args, "-rerun", false);
@@ -186 +173 @@
     psString joinHook = NULL;
     if (!rerun) {
-        psStringAppend(&joinHook, "\nLEFT JOIN fullForceRun ON fullForceRun.skycal_id = fullForceRun.skycal_id");
+        psStringAppend(&joinHook, "\nLEFT JOIN fullForceRun ON fullForceRun.skycal_id = skycalRun.skycal_id");
         psStringAppend(&joinHook, "\n %s\nAND fullForceRun.label = '%s'", where, label);
         psStringAppend(&select, "\nAND ff_id IS NULL");
@@ -502 +489 @@
     psMetadata *where = psMetadataAlloc();
     PXOPT_COPY_S64(config->args, where, "-ff_id",      "fullForceRun.ff_id", "==");
-    PXOPT_COPY_S64(config->args, where, "-warp_id",    "fullForceRun.warp_id", "==");
+    PXOPT_COPY_S64(config->args, where, "-warp_id",    "fullForceResult.warp_id", "==");
     PXOPT_COPY_S64(config->args, where, "-skycal_id",  "fullForceRun.skycal_id", "==");
     PXOPT_COPY_S64(config->args, where, "-stack_id",   "stackRun.stack_id", "==");
@@ -510 +497 @@
     PXOPT_COPY_STR(config->args, where, "-skycell_id", "stackRun.skycell_id", "LIKE");
     PXOPT_COPY_STR(config->args, where, "-filter",      "stackRun.filter", "LIKE");
-    PXOPT_COPY_S16(config->args, where, "-fault",      "staticskyResult.fault", "==");
+    PXOPT_COPY_S16(config->args, where, "-fault",      "fullForceResult.fault", "==");
     pxskycellAddWhere(config, where);