Changeset 9071

Timestamp:

Sep 29, 2006, 4:54:18 PM (20 years ago)

Author:

jhoblitt

Message:

toprocessedexpMode()
addprocessedexpMode()
processedexpMode()

Location:

trunk/ippTools/src

Files:

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

trunk/ippTools/src/dettool.c

@@ -20 +20 @@
 //static bool selectMode(pxConfig *config);
 static bool addprocessedimfileMode(pxConfig *config);
+static bool toprocessedexpMode(pxConfig *config);
+static bool addprocessedexpMode(pxConfig *config);
+static bool processedexpMode(pxConfig *config);
 static bool tostackMode(pxConfig *config);
 static bool processedimfileMode(pxConfig *config);
@@ -81 +84 @@
 //        MODECASE(DETTOOL_MODE_SELECT, selectMode);
         MODECASE(DETTOOL_MODE_ADDPROCESSEDIMFILE,addprocessedimfileMode);
+        MODECASE(DETTOOL_MODE_TOPROCESSEDEXP,   toprocessedexpMode);
+        MODECASE(DETTOOL_MODE_ADDPROCESSEDEXP,  addprocessedexpMode);
+        MODECASE(DETTOOL_MODE_PROCESSEDEXP,     processedexpMode);
         MODECASE(DETTOOL_MODE_TOSTACK,          tostackMode);
-        MODECASE(DETTOOL_MODE_PROCESSEDIMFILE,   processedimfileMode);
+        MODECASE(DETTOOL_MODE_PROCESSEDIMFILE,  processedimfileMode);
         MODECASE(DETTOOL_MODE_ADDSTACKED,       addstackedMode);
         MODECASE(DETTOOL_MODE_STACKED,          stackedMode);
@@ -1031 +1037 @@
 
     psFree(detRow);
+
+    return true;
+}
+
+static bool toprocessedexpMode(pxConfig *config)
+{
+    PS_ASSERT_PTR_NON_NULL(config, false);
+
+    return true;
+}
+
+static bool addprocessedexpMode(pxConfig *config)
+{
+    PS_ASSERT_PTR_NON_NULL(config, false);
+
+    return true;
+}
+
+static bool processedexpMode(pxConfig *config)
+{
+    PS_ASSERT_PTR_NON_NULL(config, false);
 
     return true;

trunk/ippTools/src/dettool.h

@@ -15 +15 @@
 //    DETTOOL_MODE_SELECT,
     DETTOOL_MODE_ADDPROCESSEDIMFILE,
+    DETTOOL_MODE_PROCESSEDIMFILE,
+    DETTOOL_MODE_TOPROCESSEDEXP,
+    DETTOOL_MODE_ADDPROCESSEDEXP,
+    DETTOOL_MODE_PROCESSEDEXP,
     DETTOOL_MODE_TOSTACK,
-    DETTOOL_MODE_PROCESSEDIMFILE,
     DETTOOL_MODE_ADDSTACKED,
     DETTOOL_MODE_STACKED,

trunk/ippTools/src/dettoolConfig.c

@@ -139 +139 @@
         "define banana 2", NULL);
     
-    // -tostack
-    psMetadata *tostackArgs = psMetadataAlloc();
-    psMetadataAddBool(tostackArgs, PS_LIST_TAIL, "-simple",  0,
-        "use the simple output format", false);
-
     // -processedimfile
     psMetadata *processedimfileArgs = psMetadataAlloc();
@@ -163 +158 @@
         "use the simple output format", false);
 
+    // -toprocessedexp
+    psMetadata *toprocessedexpArgs = psMetadataAlloc();
+    psMetadataAddBool(toprocessedexpArgs, PS_LIST_TAIL, "-simple",  0,
+        "use the simple output format", false);
+
+    // -addproccessedexp
+    psMetadata *addprocessedexpArgs = psMetadataAlloc();
+    psMetadataAddStr(addprocessedexpArgs, PS_LIST_TAIL, "-det_id",  0,
+        "define detrend ID (required)", NULL);
+    psMetadataAddS32(addprocessedexpArgs, PS_LIST_TAIL, "-iteration",  0,
+        "define iteration number", 0);
+    psMetadataAddStr(addprocessedexpArgs, PS_LIST_TAIL, "-exp_tag",  0,
+        "define detrend ID (required)", NULL);
+    psMetadataAddF64(addprocessedexpArgs, PS_LIST_TAIL, "-bg",  0,
+        "define exposue background", NAN);
+    psMetadataAddF64(addprocessedexpArgs, PS_LIST_TAIL, "-bg_stdev",  0,
+        "define exposue background stdev", NAN);
+    psMetadataAddF64(addprocessedexpArgs, PS_LIST_TAIL, "-bg_mean_stdev",  0,
+        "define exposue background mean stdev", NAN);
+    psMetadataAddStr(addprocessedexpArgs, PS_LIST_TAIL, "-b1_uri",  0,
+        "define banana 1", NULL);
+    psMetadataAddStr(addprocessedexpArgs, PS_LIST_TAIL, "-b2_uri",  0,
+        "define banana 2", NULL);
+
+    // -proccessedexp
+    psMetadata *processedexpArgs = psMetadataAlloc();
+    psMetadataAddStr(processedexpArgs, PS_LIST_TAIL, "-det_id",  0,
+        "define detrend ID (required)", NULL);
+    psMetadataAddS32(processedexpArgs, PS_LIST_TAIL, "-iteration",  0,
+        "define iteration number", 0);
+    psMetadataAddStr(processedexpArgs, PS_LIST_TAIL, "-exp_tag",  0,
+        "define detrend ID (required)", NULL);
+    psMetadataAddBool(processedexpArgs, PS_LIST_TAIL, "-simple",  0,
+        "use the simple output format", false);
+
+    // -tostack
+    psMetadata *tostackArgs = psMetadataAlloc();
+    psMetadataAddBool(tostackArgs, PS_LIST_TAIL, "-simple",  0,
+        "use the simple output format", false);
+
     // -addstacked
     psMetadata *addstacArgs = psMetadataAlloc();
@@ -481 +516 @@
     PXTOOL_MODE("-input",           DETTOOL_MODE_INPUT,         inputArgs);
     PXTOOL_MODE("-addprocessedimfile", DETTOOL_MODE_ADDPROCESSEDIMFILE,  addprocessedimfileArgs);
+    PXTOOL_MODE("-toprocessedexp",  DETTOOL_MODE_TOPROCESSEDEXP,  addprocessedexpArgs);
+    PXTOOL_MODE("-addprocessedexp", DETTOOL_MODE_ADDPROCESSEDIMFILE, addprocessedexpArgs);
+    PXTOOL_MODE("-processedexp",    DETTOOL_MODE_PROCESSEDIMFILE, processedimfileArgs);
     PXTOOL_MODE("-tostack",         DETTOOL_MODE_TOSTACK,       tostackArgs);
     PXTOOL_MODE("-processedimfile", DETTOOL_MODE_PROCESSEDIMFILE, processedimfileArgs);