Changeset 34733

Timestamp:

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

Author:

bills

Message:

add two columns to staticskyResult n_detections and n_extended

Location:

trunk

Files:

• dbconfig/changes.txt (modified) (1 diff)
• dbconfig/staticsky.md (modified) (1 diff)
• ippTools/src/staticskytool.c (modified) (3 diffs)
• ippTools/src/staticskytoolConfig.c (modified) (2 diffs)

trunk/dbconfig/changes.txt

@@ -2257 +2257 @@
 ALTER TABLE warpSkyfile add column background_model SMALLINT after maskfrac_advisory;
 ALTER TABLE stackSumSkyfile add column background_model SMALLINT after software_ver;
+
+ALTER TABLE skycalResult ADD column n_detections INT after n_astrom;
+ALTER TABLE skycalResult ADD column n_extended INT after n_detections;
+
 UPDATE dbversion set schema_version = '1.1.72', updated= CURRENT_TIMESTAMP();

trunk/dbconfig/staticsky.md

@@ -54 +54 @@
     sigma_dec      F32    0.0
     n_astrom       S32    0
+    n_detections   S32    0
+    n_extended     S32    0
     zpt_obs        F32    0.0
     zpt_stdev      F32    0.0

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,

trunk/ippTools/src/staticskytoolConfig.c

@@ -55 +55 @@
     psMetadataAddStr(definebyqueryArgs,  PS_LIST_TAIL, "-select_data_group", PS_META_DUPLICATE_OK, "search by stackRun data_group (LIKE comparison, multiple OK)", NULL);
     psMetadataAddStr(definebyqueryArgs,  PS_LIST_TAIL, "-select_filter", PS_META_DUPLICATE_OK, "search by filter (LIKE comparison, multiple OK)", NULL);
+    pxskycellAddArguments(definebyqueryArgs);
+#ifdef notdef
     psMetadataAddF32(definebyqueryArgs,  PS_LIST_TAIL, "-select_glat_min", 0, "define min galactic latitude", NAN);
     psMetadataAddF32(definebyqueryArgs,  PS_LIST_TAIL, "-select_glat_max", 0, "define max galactic latitude", NAN);
+    psMetadataAddF32(definebyqueryArgs,  PS_LIST_TAIL, "-select_rahours_min", 0, "define min RA in hours", NAN);
+    psMetadataAddF32(definebyqueryArgs,  PS_LIST_TAIL, "-select_rahours_max", 0, "define max RA in hours", NAN);
+    psMetadataAddF32(definebyqueryArgs,  PS_LIST_TAIL, "-select_radeg_min", 0, "define min RA in degrees", NAN);
+    psMetadataAddF32(definebyqueryArgs,  PS_LIST_TAIL, "-select_radeg_max", 0, "define max RA in degrees", NAN);
+    psMetadataAddF32(definebyqueryArgs,  PS_LIST_TAIL, "-select_decdeg_min", 0, "define min DEC in degrees", NAN);
+    psMetadataAddF32(definebyqueryArgs,  PS_LIST_TAIL, "-select_decdeg_max", 0, "define max DEC in degrees", NAN);
+#endif
     psMetadataAddStr(definebyqueryArgs,  PS_LIST_TAIL, "-set_workdir", 0, "define workdir (required)", NULL);
     psMetadataAddStr(definebyqueryArgs,  PS_LIST_TAIL, "-set_label", 0, "define label (required)", NULL);
@@ -204 +213 @@
     // psMetadataAddS32(addskycalresultArgs, PS_LIST_TAIL, "-n_stars", 0,            "define number of stars", 0);
     psMetadataAddS32(addskycalresultArgs, PS_LIST_TAIL, "-n_astrom", 0,            "define number of astrometry reference objects", 0);
+    psMetadataAddS32(addskycalresultArgs, PS_LIST_TAIL, "-n_detections", 0,        "define number of detections", 0);
+    psMetadataAddS32(addskycalresultArgs, PS_LIST_TAIL, "-n_extended", 0,          "define number of extended detections", 0);
 
     psMetadataAddStr(addskycalresultArgs, PS_LIST_TAIL, "-path_base", 0,            "define base output location", NULL);