Changeset 7369

Timestamp:

Jun 6, 2006, 1:45:35 PM (20 years ago)

Author:

jhoblitt

Message:

stub out -residexp

Location:

trunk/ippTools/src

Files:

• dettool.c (modified) (3 diffs)
• dettool.h (modified) (1 diff)
• dettoolConfig.c (modified) (8 diffs)

trunk/ippTools/src/dettool.c

@@ -26 +26 @@
 static bool residMode(pxConfig *config);
 static bool addresidexpMode(pxConfig *config);
+static bool residexpMode(pxConfig *config);
 
 static detInputExpRow *rawDetrenTodetInputExpRow(rawDetrendExpRow *rawExp, psS32 det_id);
@@ -107 +108 @@
         case DETTOOL_MODE_ADDRESIDEXP:
             if (addresidexpMode(config)) {
+                goto FAIL;
+            }
+            break;
+        case DETTOOL_MODE_RESIDEXP:
+            if (residexpMode(config)) {
                 goto FAIL;
             }
@@ -1598 +1604 @@
     return true;
 }
+
+static bool residexpMode(pxConfig *config)
+{
+    PS_ASSERT_PTR_NON_NULL(config, false);
+    return true;
+}

trunk/ippTools/src/dettool.h

@@ -20 +20 @@
     DETTOOL_MODE_ADDRESID,
     DETTOOL_MODE_RESID,
-    DETTOOL_MODE_ADDRESIDEXP
+    DETTOOL_MODE_ADDRESIDEXP,
+    DETTOOL_MODE_RESIDEXP
 } dettoolMode;
 

trunk/ippTools/src/dettoolConfig.c

@@ -188 +188 @@
     psMetadataAddStr(residArgs, PS_LIST_TAIL, "-iter",  0,
         "search for iteration number", NULL);
+    psMetadataAddStr(addresidArgs, PS_LIST_TAIL, "-exp_id",  0,
+        "define detrend ID (required)", NULL);
     psMetadataAddStr(residArgs, PS_LIST_TAIL, "-class_id",  0,
         "search for class ID", NULL);
@@ -209 +211 @@
     psMetadataAddBool(addresidexpArgs, PS_LIST_TAIL, "-accept",  0,
         "define as having acceptable residuals", false);
+
+    // -residexp
+    psMetadata *residexpArgs = psMetadataAlloc();
+    psMetadataAddStr(residexpArgs, PS_LIST_TAIL, "-det_id",  0,
+        "search for detrend ID (required)", NULL);
+    psMetadataAddStr(residexpArgs, PS_LIST_TAIL, "-iter",  0,
+        "search for iteration number", NULL);
+    psMetadataAddStr(residexpArgs, PS_LIST_TAIL, "-class_id",  0,
+        "search for class ID", NULL);
+    psMetadataAddStr(residexpArgs, PS_LIST_TAIL, "-stats",  0,
+        "search for stats", NULL);
+    psMetadataAddStr(residexpArgs, PS_LIST_TAIL, "-recipe",  0,
+        "search for recipe", NULL);
+    psMetadataAddBool(residexpArgs, PS_LIST_TAIL, "-accept",  0,
+        "search for acceptable residuals", false);
 
 #define PXTOOL_MODE(option, modeval, argset) \
@@ -245 +262 @@
     PXTOOL_MODE("-resid",           DETTOOL_MODE_RESID,         residArgs);
     PXTOOL_MODE("-addresidexp",     DETTOOL_MODE_ADDRESIDEXP,  addresidexpArgs);
+    PXTOOL_MODE("-residexp",        DETTOOL_MODE_RESIDEXP,     residexpArgs);
 
     bool argErr = false;
@@ -258 +276 @@
         printf("\nPan-STARRS Detrend Tool\n");
         printf("Usage: %s <mode> [<options>]\n\n", argv[0]);
-        printf(" <mode> : [-define|-raw|-addprocessed|-processed|-addstacked|-stacked|-stackedframe|-addnormalized|-normalized|-normalizedframe|-addresid|-resid|-addresidexp]\n\n");
+        printf(" <mode> : [-define|-raw|-addprocessed|-processed|-addstacked|-stacked|-stackedframe|-addnormalized|-normalized|-normalizedframe|-addresid|-resid|-addresidexp|-residexp]\n\n");
         fprintf (stdout, "-define ");
         psArgumentHelp(defineArgs);
@@ -304 +322 @@
         psArgumentHelp(addresidexpArgs);
         psFree(addresidexpArgs);
+        fprintf (stdout, "-residexp ");
+        psArgumentHelp(residexpArgs);
+        psFree(residexpArgs);
 
         exit(EXIT_FAILURE);
@@ -321 +342 @@
     psFree(residArgs);
     psFree(addresidexpArgs);
+    psFree(residexpArgs);
 
     // setup search criterion
@@ -338 +360 @@
     int n = 0;
     bool status = false;
+    bool boolean = false;
 
     addWhereStr(det_id);
@@ -367 +390 @@
         }
     }
+    if ((boolean = psMetadataLookupBool(&status, config->args, "-accept"))) {
+        if (!psMetadataAddBool(config->where, PS_LIST_TAIL, "accept", 0, "==", boolean)) {
+            psError(PS_ERR_UNKNOWN, false, "failed to add item accept");
+            exit(EXIT_FAILURE);
+        }
+    }
 }