Changeset 28376 for trunk

Timestamp:

Jun 16, 2010, 5:57:21 PM (16 years ago)

Author:

eugene

Message:

add options to stacktool to limit by zero point

Location:

trunk/ippTools/src

Files:

• stacktool.c (modified) (7 diffs)
• stacktoolConfig.c (modified) (1 diff)

trunk/ippTools/src/stacktool.c

@@ -237 +237 @@
     PXOPT_COPY_F32(config->args,  where, "-select_iq_m4_min",          "camProcessedExp.iq_m4", ">=");
     PXOPT_COPY_F32(config->args,  where, "-select_iq_m4_max",          "camProcessedExp.iq_m4", "<=");
+    PXOPT_COPY_F32(config->args,  where, "-select_zpt_obs_min",        "camProcessedExp.zpt_obs", ">=");
+    PXOPT_COPY_F32(config->args,  where, "-select_zpt_obs_max",        "camProcessedExp.zpt_obs", "<=");
 
     PXOPT_COPY_STR(config->args,  where, "-select_exp_type",           "rawExp.exp_type", "==");
@@ -456 +458 @@
             tess_id,
             filter,
-            NULL, // software_ver
+            NULL, // software_ver
             note);
 
@@ -657 +659 @@
         tess_id,
         filter,
-        NULL, // software_ver
+        NULL, // software_ver
         note);
 
@@ -988 +990 @@
 
     psTrace("czw.test",1,"Received versions: pslib %s psmodules %s psphot %s ppstats %s ppstack %s streaks %s\n",
-            ver_pslib,ver_psmodules,ver_psphot,ver_ppstats,ver_ppstack,ver_streaks);
+            ver_pslib,ver_psmodules,ver_psphot,ver_ppstats,ver_ppstack,ver_streaks);
     psString software_ver = NULL;
     if ((ver_pslib)&&(ver_psmodules)) {
@@ -1005 +1007 @@
       software_ver = pxMergeCodeVersions(software_ver,ver_streaks);
     }
-    
+
     // default values
     PXOPT_LOOKUP_S16(fault, config->args, "-fault", false, false);
@@ -1045 +1047 @@
                                good_frac,
                                fault,
-                               software_ver,
+                               software_ver,
                                quality
           )) {
@@ -1056 +1058 @@
 
     if (fault == 0) {
-        // Set stackRun software if we are finished.
-        if (!pxSetRunSoftware(config, "stackRun", "stack_id", stack_id, software_ver)) {
-          if (!psDBRollback(config->dbh)) {
-            psError(PS_ERR_UNKNOWN, false, "database error");
-          }
-          psError(PS_ERR_UNKNOWN, false, "failed to set stackRun.software_ver for stack_id: %" PRId64,
-                  stack_id);
-          return(false);
-        }
+        // Set stackRun software if we are finished.
+        if (!pxSetRunSoftware(config, "stackRun", "stack_id", stack_id, software_ver)) {
+          if (!psDBRollback(config->dbh)) {
+            psError(PS_ERR_UNKNOWN, false, "database error");
+          }
+          psError(PS_ERR_UNKNOWN, false, "failed to set stackRun.software_ver for stack_id: %" PRId64,
+                  stack_id);
+          return(false);
+        }
 
         if (!setstackRunState(config, stack_id, "full")) {

trunk/ippTools/src/stacktoolConfig.c

@@ -88 +88 @@
     psMetadataAddF64(definebyqueryArgs, PS_LIST_TAIL, "-select_iq_m4_min", 0, "define min iq_m4", NAN);
     psMetadataAddF64(definebyqueryArgs, PS_LIST_TAIL, "-select_iq_m4_max", 0, "define max iq_m4", NAN);
+    psMetadataAddF64(definebyqueryArgs, PS_LIST_TAIL, "-select_zpt_obs_min", 0, "define min zero point", NAN);
+    psMetadataAddF64(definebyqueryArgs, PS_LIST_TAIL, "-select_zpt_obs_max", 0, "define max zero point", NAN);
     psMetadataAddS32(definebyqueryArgs, PS_LIST_TAIL, "-random", 0, "use this number of random elements", 0);
     psMetadataAddS32(definebyqueryArgs, PS_LIST_TAIL, "-min_num", 0, "minimum number of inputs", 0);