Changeset 9046

Timestamp:

Sep 28, 2006, 4:33:55 PM (20 years ago)

Author:

jhoblitt

Message:

rename -> -addprocessedimfile -addprocessed
add -uri_b1, -uri_b2 to -addprocessedimfile

Location:

trunk/ippTools

Files:

• configure.ac (modified) (1 diff)
• src/dettool.c (modified) (5 diffs)
• src/dettool.h (modified) (1 diff)
• src/dettoolConfig.c (modified) (2 diffs)

trunk/ippTools/configure.ac

@@ -16 +16 @@
 PKG_CHECK_MODULES([PSLIB], [pslib >= 0.12.99]) 
 PKG_CHECK_MODULES([PSMODULES], [psmodules >= 0.12.0]) 
-PKG_CHECK_MODULES([IPPDB], [ippdb >= 0.0.34]) 
+PKG_CHECK_MODULES([IPPDB], [ippdb >= 0.0.37]) 
 
 AC_PROG_PERL_MODULES(

trunk/ippTools/src/dettool.c

@@ -19 +19 @@
 //static bool selectrunMode(pxConfig *config);
 //static bool selectMode(pxConfig *config);
-static bool addprocessedMode(pxConfig *config);
+static bool addprocessedimfileMode(pxConfig *config);
 static bool tostackMode(pxConfig *config);
 static bool processedMode(pxConfig *config);
@@ -80 +80 @@
 //        MODECASE(DETTOOL_MODE_SELECTRUN, selectrunMode);
 //        MODECASE(DETTOOL_MODE_SELECT, selectMode);
-        MODECASE(DETTOOL_MODE_ADDPROCESSED,     addprocessedMode);
+        MODECASE(DETTOOL_MODE_ADDPROCESSEDIMFILE,addprocessedimfileMode);
         MODECASE(DETTOOL_MODE_TOSTACK,          tostackMode);
         MODECASE(DETTOOL_MODE_PROCESSED,        processedMode);
@@ -897 +897 @@
 }
 
-static bool addprocessedMode(pxConfig *config)
+static bool addprocessedimfileMode(pxConfig *config)
 {
     PS_ASSERT_PTR_NON_NULL(config, false);
@@ -974 +974 @@
     if (isnan(bg_mean_stdev)) {
         psError(PS_ERR_UNKNOWN, true, "-bg_mean_stdev is required");
+        return false;
+    }
+    // optional
+    psString b1_uri = psMetadataLookupStr(&status, config->args, "-b1_uri");
+    if (!status) {
+        psError(PS_ERR_UNKNOWN, false, "failed to lookup value for -b1_uri");
+        return false;
+    }
+    psString b2_uri = psMetadataLookupStr(&status, config->args, "-b2_uri");
+    if (!status) {
+        psError(PS_ERR_UNKNOWN, false, "failed to lookup value for -b2_uri");
         return false;
     }
@@ -1006 +1017 @@
         bg,
         bg_stdev,
-        bg_mean_stdev
+        bg_mean_stdev,
+        b1_uri,
+        b2_uri
     );
     psFree(rawImfiles);

trunk/ippTools/src/dettool.h

@@ -14 +14 @@
 //    DETTOOL_MODE_SELECTRUN,
 //    DETTOOL_MODE_SELECT,
-    DETTOOL_MODE_ADDPROCESSED,
+    DETTOOL_MODE_ADDPROCESSEDIMFILE,
     DETTOOL_MODE_TOSTACK,
     DETTOOL_MODE_PROCESSED,

trunk/ippTools/src/dettoolConfig.c

@@ -116 +116 @@
             "use the simple output format", false);
     
-    // -addprocessed
-    psMetadata *addprocArgs = psMetadataAlloc();
-    psMetadataAddStr(addprocArgs, PS_LIST_TAIL, "-det_id",  0,
-        "define detrend ID (required)", NULL);
-    psMetadataAddStr(addprocArgs, PS_LIST_TAIL, "-exp_id",  0,
+    // -addprocessedimfile
+    psMetadata *addprocessedimfileArgs = psMetadataAlloc();
+    psMetadataAddStr(addprocessedimfileArgs, PS_LIST_TAIL, "-det_id",  0,
+        "define detrend ID (required)", NULL);
+    psMetadataAddStr(addprocessedimfileArgs, PS_LIST_TAIL, "-exp_id",  0,
         "define exp ID (required)", NULL);
-    psMetadataAddStr(addprocArgs, PS_LIST_TAIL, "-class_id",  0,
+    psMetadataAddStr(addprocessedimfileArgs, PS_LIST_TAIL, "-class_id",  0,
         "define class ID (required)", NULL);
-    psMetadataAddStr(addprocArgs, PS_LIST_TAIL, "-uri",  0,
+    psMetadataAddStr(addprocessedimfileArgs, PS_LIST_TAIL, "-uri",  0,
         "define URI (required)", NULL);
-    psMetadataAddStr(addprocArgs, PS_LIST_TAIL, "-recip",  0,
+    psMetadataAddStr(addprocessedimfileArgs, PS_LIST_TAIL, "-recip",  0,
         "define recipe (required)", NULL);
-    psMetadataAddF64(addprocArgs, PS_LIST_TAIL, "-bg",  0,
+    psMetadataAddF64(addprocessedimfileArgs, PS_LIST_TAIL, "-bg",  0,
         "define exposue background", NAN);
-    psMetadataAddF64(addprocArgs, PS_LIST_TAIL, "-bg_stdev",  0,
+    psMetadataAddF64(addprocessedimfileArgs, PS_LIST_TAIL, "-bg_stdev",  0,
         "define exposue background stdev", NAN);
-    psMetadataAddF64(addprocArgs, PS_LIST_TAIL, "-bg_mean_stdev",  0,
+    psMetadataAddF64(addprocessedimfileArgs, PS_LIST_TAIL, "-bg_mean_stdev",  0,
         "define exposue background mean stdev", NAN);
+    psMetadataAddStr(addprocessedimfileArgs, PS_LIST_TAIL, "-b1_uri",  0,
+        "define banana 1", NULL);
+    psMetadataAddStr(addprocessedimfileArgs, PS_LIST_TAIL, "-b2_uri",  0,
+        "define banana 2", NULL);
     
     // -tostack
@@ -476 +480 @@
 //    PXTOOL_MODE("-select",          DETTOOL_MODE_SELECT,        selectArgs);
     PXTOOL_MODE("-input",           DETTOOL_MODE_INPUT,         inputArgs);
-    PXTOOL_MODE("-addprocessed",    DETTOOL_MODE_ADDPROCESSED,  addprocArgs);
+    PXTOOL_MODE("-addprocessedimfile", DETTOOL_MODE_ADDPROCESSEDIMFILE,  addprocessedimfileArgs);
     PXTOOL_MODE("-tostack",         DETTOOL_MODE_TOSTACK,       tostackArgs);
     PXTOOL_MODE("-processed",       DETTOOL_MODE_PROCESSED,     procArgs);