Changeset 34733 for trunk/ippTools/src/staticskytool.c

Timestamp:

Nov 29, 2012, 2:08:42 PM (13 years ago)

Author:

bills

Message:

add two columns to staticskyResult n_detections and n_extended

File:

• trunk/ippTools/src/staticskytool.c (modified) (3 diffs)

trunk/ippTools/src/staticskytool.c

@@ -132 +132 @@
     pxAddLabelSearchArgs(config, whereMD, "-select_data_group",    "stackRun.data_group",       "LIKE");
     pxAddLabelSearchArgs(config, whereMD, "-select_filter",        "stackRun.filter",           "LIKE");
+#ifdef notdef
     PXOPT_COPY_F32(config->args, whereMD, "-select_glat_min",      "skycell.glat",              ">=");
     PXOPT_COPY_F32(config->args, whereMD, "-select_glat_max",      "skycell.glat",              "<=");
+    PXOPT_COPY_F32(config->args, whereMD, "-select_rahours_min",   "skycell.radeg/15",          ">=");
+    PXOPT_COPY_F32(config->args, whereMD, "-select_rahours_max",   "skycell.radeg/15",          "<=");
+    PXOPT_COPY_F32(config->args, whereMD, "-select_radeg_min",     "skycell.radeg",             ">=");
+    PXOPT_COPY_F32(config->args, whereMD, "-select_radeg_max",     "skycell.radeg",             "<=");
+    PXOPT_COPY_F32(config->args, whereMD, "-select_decdeg_min",    "skycell.decdeg",             ">=");
+    PXOPT_COPY_F32(config->args, whereMD, "-select_decdeg_max",    "skycell.decdeg",             "<=");
+#endif
+    if (!pxskycellAddWhere(config, whereMD)) {
+        psError(PXTOOLS_ERR_CONFIG, false, "failed to add skycell search arguments");
+        return false;
+    }
 
     // find the number of requested filters:
@@ -1263 +1275 @@
 
     PXOPT_LOOKUP_STR(hostname, config->args,    "-hostname", false, false);
-//    PXOPT_LOOKUP_S32(n_stars, config->args,     "-n_stars", false, false);
     PXOPT_LOOKUP_S32(n_astrom, config->args,    "-n_astrom", false, false);
+    PXOPT_LOOKUP_S32(n_detections, config->args,    "-n_detections", false, false);
+    PXOPT_LOOKUP_S32(n_extended, config->args,    "-n_extended", false, false);
 
     PXOPT_LOOKUP_STR(path_base, config->args,   "-path_base", false, false);
@@ -1303 +1316 @@
         sigma_dec,
         n_astrom,
+        n_detections,
+        n_extended,
         zpt_obs,
         zpt_stdev,