Changeset 8370

Timestamp:

Aug 15, 2006, 4:44:45 PM (20 years ago)

Author:

jhoblitt

Message:

add -normstat

Location:

trunk/ippTools/src

Files:

• dettool.c (modified) (1 diff)
• dettoolConfig.c (modified) (5 diffs)

trunk/ippTools/src/dettool.c

@@ -1879 +1879 @@
 static bool normstatMode(pxConfig *config)
 {
-    PS_ASSERT_PTR_NON_NULL(config, NULL);
+    PS_ASSERT_PTR_NON_NULL(config, false);
+
+    // select detNormalizedStatImfile.*
+    // by:
+    // where det_id, iteration, class_id is not in detNormalizedImfile
+
+    psString query = psStringCopy(
+        "SELECT" 
+        "   detNormalizedStatImfile.*"
+        " FROM detNormalizedStatImfile"
+        " LEFT JOIN detNormalizedImfile"
+        "   USING(det_id, iteration, class_id)"
+        " WHERE"
+        "   detNormalizedImfile.det_id IS NULL"  
+        "   AND detNormalizedImfile.iteration IS NULL"  
+        "   AnD detNormalizedImfile.class_id IS NULL"  
+        ); 
+
+    // XXX does it make sens to accept any search params?
+#if 0
+    if (config->where) {
+        psString whereClaus = psDBGenerateWhereConditionSQL(config->where);
+        psStringAppend(&query, " AND %s", whereClaus);
+        psFree(whereClaus);
+    }
+#endif
+
+    if (!p_psDBRunQuery(config->dbh, query)) {
+        psError(PS_ERR_UNKNOWN, false, "database error");
+        psFree(query);
+        return false;
+    } 
+    psFree(query);
+
+    psArray *output = p_psDBFetchResult(config->dbh);
+    if (!output) {
+        // XXX check psError here
+        psError(PS_ERR_UNKNOWN, false, "no pending rawDetrendExp rows found");
+        return false;
+    }
+
+    bool simple = false;
+    {
+        bool status = false;
+        simple = psMetadataLookupBool(&status, config->args, "-simple");
+        if (!status) {
+            psError(PS_ERR_UNKNOWN, false, "failed to lookup value for -simple");
+            psFree(output);
+            return false;
+        }
+    }
+
+    // negative simple so the default is true
+    if (!ippdbPrintMetadatas(stdout, output, "rawDetrendImfile", !simple)) {
+        psError(PS_ERR_UNKNOWN, false, "failed to print array");
+        psFree(output);
+        return false;
+    }
+
+    psFree(output);
 
     return true;

trunk/ippTools/src/dettoolConfig.c

@@ -189 +189 @@
     psMetadataAddF32(addnormstatArgs, PS_LIST_TAIL, "-norm",  0,
         "define normal value (required)", NAN);
+ 
+    // -normstat
+    psMetadata *normstatArgs = psMetadataAlloc();
+    psMetadataAddBool(normstatArgs, PS_LIST_TAIL, "-simple",  0,
+        "use the simple output format", false);
     
     // -stacked
@@ -377 +382 @@
     PXTOOL_MODE("-tonormalize",     DETTOOL_MODE_TONORMALIZE,   tonormalizeArgs);
     PXTOOL_MODE("-addnormstat",     DETTOOL_MODE_ADDNORMSTAT,   addnormstatArgs);
+    PXTOOL_MODE("-normstat",        DETTOOL_MODE_NORMSTAT,      normstatArgs);
     PXTOOL_MODE("-stacked",         DETTOOL_MODE_STACKED,       stacArgs);
     PXTOOL_MODE("-stackedframe",    DETTOOL_MODE_STACKEDFRAME,  stacframeArgs);
@@ -403 +409 @@
         printf("\nPan-STARRS Detrend Tool\n");
         printf("Usage: %s <mode> [<options>]\n\n", argv[0]);
-        printf(" <mode> : [-pending|-definebyexp|-definebyquery|-runs|-selectrun|-select|-raw|-addprocessed|-tostack|-processed|-addstacked|-tonormalize|-addnormstat|-stacked|-stackedframe|-addnormalized|-normalized|-normalizedframe|-addresidimfile|-residimfile|-addresidexp|-residexp|-declaremasterframe|-masterframe|-master|-rerun]\n\n");
+        printf(" <mode> : [-pending|-definebyexp|-definebyquery|-runs|-selectrun|-select|-raw|-addprocessed|-tostack|-processed|-addstacked|-tonormalize|-addnormstat|-normstat|-stacked|-stackedframe|-addnormalized|-normalized|-normalizedframe|-addresidimfile|-residimfile|-addresidexp|-residexp|-declaremasterframe|-masterframe|-master|-rerun]\n\n");
         fprintf (stdout, "-pending ");
         psArgumentHelp(pendingArgs);
@@ -459 +465 @@
         psFree(addnormstatArgs);
 
+        fprintf (stdout, "-normstat ");
+        psArgumentHelp(normstatArgs);
+        psFree(normstatArgs);
+
         fprintf (stdout, "-stacked ");
         psArgumentHelp(stacArgs);
@@ -528 +538 @@
     psFree(tonormalizeArgs);
     psFree(addnormstatArgs);
+    psFree(normstatArgs);
     psFree(stacArgs);
     psFree(stacframeArgs);