Changeset 9231

Timestamp:

Oct 4, 2006, 12:30:02 PM (20 years ago)

Author:

jhoblitt

Message:

add detNormalizedImfile.bg*

Location:

trunk/ippTools

Files:

• configure.ac (modified) (1 diff)
• scripts/dettest.sh (modified) (1 diff)
• src/dettool.c (modified) (2 diffs)
• src/dettoolConfig.c (modified) (1 diff)

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.44]) 
+PKG_CHECK_MODULES([IPPDB], [ippdb >= 0.0.45]) 
 
 AC_PROG_PERL_MODULES(

trunk/ippTools/scripts/dettest.sh

@@ -29 +29 @@
 dettool -tonormalize || exit 1
 for ID in `seq 0 3` ; do
-    dettool -addnormalizedimfile -det_id 1 -class_id $ID -uri file://normalized-$ID -b1_uri banana1 -b2_uri banannnnnaaa2 || exit 1
+    dettool -addnormalizedimfile -det_id 1 -class_id $ID -uri file://normalized-$ID -bg 1 -bg_stdev 2 -bg_mean_stdev 3 -b1_uri banana1 -b2_uri banannnnnaaa2 || exit 1
 done;
 

trunk/ippTools/src/dettool.c

@@ -2967 +2967 @@
         return false;
     }
+    psF64 bg = psMetadataLookupF64(&status, config->args, "-bg");
+    if (!status) {
+        psError(PS_ERR_UNKNOWN, false, "failed to lookup value for -bg");
+        return false;
+    }
+    if (isnan(bg)) {
+        psError(PS_ERR_UNKNOWN, true, "-bg is required");
+        return false;
+    }
+    psF64 bg_stdev = psMetadataLookupF64(&status, config->args, "-bg_stdev");
+    if (!status) {
+        psError(PS_ERR_UNKNOWN, false, "failed to lookup value for -bg_stdev");
+        return false;
+    }
+    if (isnan(bg_stdev)) {
+        psError(PS_ERR_UNKNOWN, true, "-bg_stdev is required");
+        return false;
+    }
+    psF64 bg_mean_stdev = psMetadataLookupF64(&status, config->args, "-bg_mean_stdev");
+    if (!status) {
+        psError(PS_ERR_UNKNOWN, false, "failed to lookup value for -bg_mean_stdev");
+        return false;
+    }
+    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");
@@ -2984 +3011 @@
         statImfile->class_id,
         uri,
+        bg,
+        bg_stdev,
+        bg_mean_stdev,
         b1_uri,
         b2_uri

trunk/ippTools/src/dettoolConfig.c

@@ -268 +268 @@
     // -addnormalizedimfile
     psMetadata *addnormalizedimfileArgs = psMetadataAlloc();
-    psMetadataAddStr(addnormalizedimfileArgs, PS_LIST_TAIL, "-det_id",  0,
-        "define detrend ID (required)", NULL);
-    psMetadataAddS32(addnormalizedimfileArgs, PS_LIST_TAIL, "-iteration",  0,
-        "define iteration number", 0);
-    psMetadataAddStr(addnormalizedimfileArgs, PS_LIST_TAIL, "-class_id",  0,
+    psMetadataAddStr(addnormalizedimfileArgs, PS_LIST_TAIL, "-det_id", 0,
+        "define detrend ID (required)", NULL);
+    psMetadataAddS32(addnormalizedimfileArgs, PS_LIST_TAIL, "-iteration", 0,
+        "define iteration number", 0);
+    psMetadataAddStr(addnormalizedimfileArgs, PS_LIST_TAIL, "-class_id", 0,
         "define class ID (required)", NULL);
-    psMetadataAddStr(addnormalizedimfileArgs, PS_LIST_TAIL, "-uri",  0,
+    psMetadataAddStr(addnormalizedimfileArgs, PS_LIST_TAIL, "-uri", 0,
         "define URI (required)", NULL);
-    psMetadataAddStr(addnormalizedimfileArgs, PS_LIST_TAIL, "-b1_uri",  0,
+    psMetadataAddF64(addnormalizedimfileArgs, PS_LIST_TAIL, "-bg", 0,
+        "define exposue background", NAN);
+    psMetadataAddF64(addnormalizedimfileArgs, PS_LIST_TAIL, "-bg_stdev", 0,
+        "define exposue background stdev", NAN);
+    psMetadataAddF64(addnormalizedimfileArgs, PS_LIST_TAIL, "-bg_mean_stdev", 0,
+        "define exposue background mean stdev", NAN);
+    psMetadataAddStr(addnormalizedimfileArgs, PS_LIST_TAIL, "-b1_uri", 0,
         "define banana 1", NULL);
-    psMetadataAddStr(addnormalizedimfileArgs, PS_LIST_TAIL, "-b2_uri",  0,
+    psMetadataAddStr(addnormalizedimfileArgs, PS_LIST_TAIL, "-b2_uri", 0,
         "define banana 2", NULL);