Changeset 34789 for trunk

Timestamp:

Dec 11, 2012, 10:57:32 AM (14 years ago)

Author:

bills

Message:

Add column n_forced to skycalResult

Location:

trunk

Files:

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

trunk/dbconfig/changes.txt

@@ -2262 +2262 @@
 
 UPDATE dbversion set schema_version = '1.1.72', updated= CURRENT_TIMESTAMP();
+
+ALTER TABLE skycalResult ADD column n_forced INT after n_extended;
+UPDATE dbversion set schema_version = '1.1.73', updated= CURRENT_TIMESTAMP();

trunk/dbconfig/staticsky.md

@@ -56 +56 @@
     n_detections   S32    0
     n_extended     S32    0
+    n_forced       S32    0
     zpt_obs        F32    0.0
     zpt_stdev      F32    0.0

trunk/ippTools/share/pxadmin_create_tables.sql

@@ -2119 +2119 @@
       n_detections INT,
       n_extended INT,
+      n_forced INT,
       zpt_obs FLOAT,
       zpt_stdev FLOAT,

trunk/ippTools/src/staticskytool.c

@@ -1154 +1154 @@
 
     psMetadata *where = psMetadataAlloc();
-    PXOPT_COPY_S64(config->args, where, "-skycal_id",  "skycal_id",   "==");
+    PXOPT_COPY_S64(config->args, where, "-skycal_id", "skycal_id",   "==");
+    PXOPT_COPY_S64(config->args, where, "-sky_id",   "sky_id",   "==");
+    PXOPT_COPY_S64(config->args, where, "-stack_id", "stack_id",   "==");
     PXOPT_COPY_STR(config->args, where, "-label",   "label",    "==");
     PXOPT_COPY_STR(config->args, where, "-state",   "state",    "==");
@@ -1271 +1273 @@
     PXOPT_LOOKUP_STR(hostname, config->args,    "-hostname", 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_S32(n_detections, config->args,"-n_detections", false, false);
+    PXOPT_LOOKUP_S32(n_extended, config->args,  "-n_extended", false, false);
+    PXOPT_LOOKUP_S32(n_forced, config->args,    "-n_forced", false, false);
 
     PXOPT_LOOKUP_STR(path_base, config->args,   "-path_base", false, false);
@@ -1313 +1316 @@
         n_detections,
         n_extended,
+        n_forced,
         zpt_obs,
         zpt_stdev,

trunk/ippTools/src/staticskytoolConfig.c

@@ -182 +182 @@
     psMetadata *updateskycalrunArgs = psMetadataAlloc();
     psMetadataAddS64(updateskycalrunArgs, PS_LIST_TAIL, "-skycal_id", 0, "search by skycal ID", 0);
+    psMetadataAddS64(updateskycalrunArgs, PS_LIST_TAIL, "-sky_id", 0,    "search by sky ID", 0);
+    psMetadataAddS64(updateskycalrunArgs, PS_LIST_TAIL, "-stack_id", 0,  "search by stack ID", 0);
     psMetadataAddStr(updateskycalrunArgs, PS_LIST_TAIL, "-state", 0, "search by state", NULL);
     psMetadataAddStr(updateskycalrunArgs, PS_LIST_TAIL, "-label", 0, "search by label", 0);
@@ -217 +219 @@
     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);
+    psMetadataAddS32(addskycalresultArgs, PS_LIST_TAIL, "-n_forced", 0,            "define number of forced detections", 0);
 
     psMetadataAddStr(addskycalresultArgs, PS_LIST_TAIL, "-path_base", 0,            "define base output location", NULL);