Changeset 11830

Timestamp:

Feb 15, 2007, 10:34:36 AM (19 years ago)

Author:

Paul Price

Message:

Doing audit of statistics --- do I mean bg_stdev or bg_mean_stdev?

Location:

trunk/ippScripts/scripts

Files:

• detrend_norm_apply.pl (modified) (1 diff)
• detrend_process_imfile.pl (modified) (1 diff)
• detrend_stack.pl (modified) (1 diff)
• phase0_imfile.pl (modified) (1 diff)
• phase2.pl (modified) (1 diff)
• phase4_warp.pl (modified) (1 diff)
• phase5_subtract.pl (modified) (1 diff)

trunk/ippScripts/scripts/detrend_norm_apply.pl

@@ -138 +138 @@
     # Add the statistics triplet
     $command .= " -bg " . $stats->bg_mean();
-    if (defined($stats->bg_stdev())) {
-        $command .= " -bg_stdev " . $stats->bg_stdev();
+    if (defined($stats->bg_mean_stdev())) {
+        $command .= " -bg_mean_stdev " . $stats->bg_mean_stdev();
     } else {
         # May be undefined if there's only a single imfile
-        $command .= " -bg_stdev 0";
+        $command .= " -bg_mean_stdev 0";
     }
-    $command .= " -bg_mean_stdev " . $stats->bg_mean_stdev();
+    $command .= " -bg_stdev " . $stats->bg_stdev();
 
     $command .= " -dbname $dbname" if defined $dbname;

trunk/ippScripts/scripts/detrend_process_imfile.pl

@@ -144 +144 @@
         "-class_id $class_id -recip $recipe -uri $outputImage -b1_uri $outputRoot";  # Command to run dettool
     $command .= " -bg " . $stats->bg_mean();
-    if (defined($stats->bg_stdev())) {
-        $command .= " -bg_stdev " . $stats->bg_stdev();
+    if (defined($stats->bg_mean_stdev())) {
+        $command .= " -bg_mean_stdev " . $stats->bg_mean_stdev();
     } else {
         # May be undefined if there's only a single imfile
-        $command .= " -bg_stdev 0";
+        $command .= " -bg_mean_stdev 0";
     }
-    $command .= " -bg_mean_stdev " . $stats->bg_mean_stdev();
+    $command .= " -bg_stdev " . $stats->bg_stdev();
     $command .= " -dbname $dbname" if defined $dbname;
 

trunk/ippScripts/scripts/detrend_stack.pl

@@ -155 +155 @@
         " -uri $outputStack -recip $recipe"; # Command to run
     $command .= ' -bg ' . $stats->bg_mean();
-    if (defined($stats->bg_stdev())) {
-    $command .= ' -bg_stdev ' . $stats->bg_stdev();
+    if (defined($stats->bg_mean_stdev())) {
+    $command .= ' -bg_mean_stdev ' . $stats->bg_mean_stdev();
     } else {
         # May be undefined if there is only a single imfile
-        $command .= ' -bg_stdev 0';
-    }
-    $command .= ' -bg_mean_stdev ' . $stats->bg_mean_stdev();
+        $command .= ' -bg_mean_stdev 0';
+    }
+    $command .= ' -bg_stdev ' . $stats->bg_stdev();
     $command .= " -dbname $dbname" if defined $dbname;
     my ( $success, $error_code, $full_buf, $stdout_buf, $stderr_buf ) =

trunk/ippScripts/scripts/phase0_imfile.pl

@@ -187 +187 @@
         push @command, $stats->bg_mean_stdev();
     } else {
-        push @command, "NAN";
+        push @command, "0.0";
     }
 

trunk/ippScripts/scripts/phase2.pl

@@ -137 +137 @@
     $command .= " -bg " . $stats->bg_mean();
     $command .= " -bg_stdev " . $stats->bg_stdev();
-    $command .= " -bg_mean_stdev " . $stats->bg_mean_stdev();
+    if ( defined $stats->bg_mean_stdev() ) {
+        $command .= " -bg_mean_stdev " . $stats->bg_mean_stdev();
+    } else {
+        $command .= " -bg_mean_stdev 0.0";
+    }
     $command .= " -dbname $dbname" if defined $dbname;
 

trunk/ippScripts/scripts/phase4_warp.pl

@@ -142 +142 @@
         " -uri $outputImage -b1_uri $outputRoot";  # Command to run dettool
     $command .= " -bg " . $stats->bg_mean();
-    $command .= " -bg_mean_stdev " . $stats->bg_mean_stdev();
+    $command .= " -bg_stdev " . $stats->bg_stdev();
     $command .= " -dbname $dbname" if defined $dbname;
 

trunk/ippScripts/scripts/phase5_subtract.pl

@@ -163 +163 @@
         if (0) { ### Disabled because no statistics yet
             $command .= " -bg " . $stats->bg_mean();
-            $command .= " -bg_mean_stdev " . $stats->bg_mean_stdev();
+            $command .= " -bg_stdev " . $stats->bg_stdev();
         }