Changeset 13973

Timestamp:

Jun 25, 2007, 2:30:00 PM (19 years ago)

Author:

eugene

Message:

adding fringe residual stats (user_1-3), correctly handle NAN from stats parser

File:

• trunk/ippScripts/scripts/detrend_resid.pl (modified) (2 diffs)

trunk/ippScripts/scripts/detrend_resid.pl

@@ -164 +164 @@
 
 # Add the processed file to the database
-my $bg            = ($stats->bg_mean() or 'NAN');
-my $bg_stdev      = ($stats->bg_stdev() or 'NAN');
-my $bg_mean_stdev = ($stats->bg_mean_stdev() or 'NAN');
-my $bin_stdev     = ($binnedStats->bg_stdev() or 'NAN');
-my $fringe_0      = (${$stats->fringe_mean()}[0] or 'NAN');
-my $fringe_1      = (${$stats->fringe_err()}[0] or 'NAN');
-my $fringe_2      = (${$stats->fringe_mean_stdev()}[0] or 'NAN');
+# these value must be defined (NAN if not valid), or we raise a programming error
+my $bg            = $stats->bg_mean();
+my $bg_stdev      = $stats->bg_stdev();
+my $bg_mean_stdev = $stats->bg_mean_stdev();
+my $bin_stdev     = $binnedStats->bg_stdev();
+my $fringe_0      = ${$stats->fringe_mean()}[0];
+my $fringe_1      = ${$stats->fringe_err()}[0];
+my $fringe_2      = ${$stats->fringe_mean_stdev()}[0];
+my $dfringe_0     = ${$stats->dfringe_mean()}[0];
+my $dfringe_1     = ${$stats->dfringe_err()}[0];
+my $dfringe_2     = ${$stats->dfringe_mean_stdev()}[0];
+
+print "bg_mean_stdev: " . $bg_mean_stdev . "\n";
+print "stats : bg_mean_stdev: " . $stats->bg_mean_stdev() . "\n";
 
 unless ($no_update) {
@@ -179 +186 @@
     $command .= " -bin_stdev $bin_stdev";
     $command .= " -fringe_0 $fringe_0 -fringe_1 $fringe_1 -fringe_2 $fringe_2";
+    $command .= " -user_1 $dfringe_0 -user_2 $dfringe_1 -user_3 $dfringe_2";
     $command .= " -dbname $dbname" if defined $dbname;