Index: trunk/ippScripts/scripts/detrend_reject_exp.pl
===================================================================
--- trunk/ippScripts/scripts/detrend_reject_exp.pl	(revision 18460)
+++ trunk/ippScripts/scripts/detrend_reject_exp.pl	(revision 18562)
@@ -28,16 +28,17 @@
 use Pod::Usage qw( pod2usage );
 
-my ($det_id, $iter, $det_type, $camera, $outroot, $filter, $dbname, $verbose, $no_update, $no_op);
+my ($det_id, $iter, $det_type, $camera, $outroot, $filter, $dbname, $verbose, $no_update, $no_op, $redirect);
 GetOptions(
-           'det_id|d=s'        => \$det_id,
-           'iteration=s'       => \$iter,
-           'det_type|t=s'      => \$det_type,
-           'camera=s'          => \$camera,
-           'outroot|w=s'       => \$outroot,   # output file base name
-           'filter=s'          => \$filter,
-           'dbname|d=s'        => \$dbname, # Database name
-           'verbose'           => \$verbose,   # Print to stdout
-           'no-update'         => \$no_update,
-           'no-op'             => \$no_op,
+    'det_id|d=s'        => \$det_id,
+    'iteration=s'       => \$iter,
+    'det_type|t=s'      => \$det_type,
+    'camera=s'          => \$camera,
+    'outroot|w=s'       => \$outroot,   # output file base name
+    'filter=s'          => \$filter,
+    'dbname|d=s'        => \$dbname, # Database name
+    'verbose'           => \$verbose,   # Print to stdout
+    'no-update'         => \$no_update,
+    'no-op'             => \$no_op,
+    'redirect-output'   => \$redirect,
 ) or pod2usage( 2 );
 
@@ -50,4 +51,11 @@
     defined $camera   and
     defined $outroot;
+
+# check for existing directory, generate if needed
+$ipprc->outroot_prepare($outroot);
+
+my $logName = "$outroot.log"; # Name for log
+
+$ipprc->redirect_output($logName) if $redirect;
 
 # values to extract from output metadata and the stats to calculate
@@ -145,15 +153,8 @@
 # neb:///*/gpc1/20080130 (volume not specified)
 
-# check for existing directory, generate if needed
-$ipprc->outroot_prepare($outroot);
-
-my $logName = "$outroot.log"; # Name for log
-
-my $logFile;
 unless ($no_op) {
-    $logFile = $ipprc->file_create_append( $logName );
-    print $logFile "Ensemble mean $ensMeanMean +/- $ensMeanStdev\n";
-    print $logFile "Ensemble stdev $ensStdevMean +/- $ensStdevStdev\n";
-    print $logFile "Ensemble mean rms (over imfiles) $ensMeanStdevMean +/- $ensMeanStdevStdev\n\n";
+    print "Ensemble mean $ensMeanMean +/- $ensMeanStdev\n";
+    print "Ensemble stdev $ensStdevMean +/- $ensStdevStdev\n";
+    print "Ensemble mean rms (over imfiles) $ensMeanStdevMean +/- $ensMeanStdevStdev\n\n";
 }
 
@@ -186,5 +187,5 @@
         # Rejected this at an earlier stage
         unless ($no_op) {
-            print $logFile "Rejecting $expID based on earlier determination.\n";
+            print "Rejecting $expID based on earlier determination.\n";
         }
         $reject = 1;
@@ -205,13 +206,13 @@
         my $delta = abs($mean - $ensMeanMean);
         if ($delta > ($reject_mean * $ensMeanStdev)) {
-            print $logFile "Rejecting $expID based on ensemble mean value: ";
+            print "Rejecting $expID based on ensemble mean value: ";
             $reject = 1;
             #goto UPDATE;
         } else {
-            print $logFile "$expID OK against ensemble mean: ";
-        }
-        print $logFile "$mean --> $delta vs " . $reject_mean * $ensMeanStdev . "\n";
+            print "$expID OK against ensemble mean: ";
+        }
+        print "$mean --> $delta vs " . $reject_mean * $ensMeanStdev . "\n";
     } else {
-        print $logFile "No rejection of $expID for ensemble mean\n";
+        print "No rejection of $expID for ensemble mean\n";
     }
 
@@ -219,13 +220,13 @@
         my $delta = abs($stdev - $ensStdevMean);
         if ($delta > ($reject_stdev * $ensStdevStdev)) {
-            print $logFile "Rejecting $expID based on ensemble stdev: ";
+            print "Rejecting $expID based on ensemble stdev: ";
             $reject = 1;
             #goto UPDATE;
         } else {
-            print $logFile "$expID OK against ensemble stdev: ";
-        }
-        print $logFile "$stdev --> $delta sigma vs " . $reject_stdev * $ensStdevStdev . "\n";
+            print "$expID OK against ensemble stdev: ";
+        }
+        print "$stdev --> $delta sigma vs " . $reject_stdev * $ensStdevStdev . "\n";
     } else {
-        print $logFile "No rejection of $expID for ensemble stdev\n";
+        print "No rejection of $expID for ensemble stdev\n";
     }
 
@@ -233,13 +234,13 @@
         my $delta = abs($meanStdev - $ensMeanStdevMean);
         if ($delta > ($reject_meanstdev * $ensMeanStdevStdev)) {
-            print $logFile "Rejecting $expID based on ensemble mean stdev: ";
+            print "Rejecting $expID based on ensemble mean stdev: ";
             $reject = 1;
             #goto UPDATE;
         } else {
-            print $logFile "$expID OK against ensemble mean stdev: ";
-        }
-        print $logFile "$meanStdev --> $delta sigma vs " . $reject_meanstdev * $ensMeanStdevStdev. "\n";
+            print "$expID OK against ensemble mean stdev: ";
+        }
+        print "$meanStdev --> $delta sigma vs " . $reject_meanstdev * $ensMeanStdevStdev. "\n";
     } else {
-        print $logFile "No rejection of $expID for ensemble mean stdev\n";
+        print "No rejection of $expID for ensemble mean stdev\n";
     }
 
@@ -253,5 +254,5 @@
     if ((not $include and not $reject) or ($include and $reject)) {
         unless ($no_op) {
-            print $logFile "Status of $expID has changed.\n";
+            print "Status of $expID has changed.\n";
         }
         $numChanges++;
@@ -286,7 +287,6 @@
 
 unless ($no_op) {
-    print $logFile "Master: $master\n";
-    print $logFile "Stop: $stop\n";
-    close $logFile;
+    print "Master: $master\n";
+    print "Stop: $stop\n";
 }
 
@@ -309,5 +309,4 @@
 $command .= " -accept" if $master;
 $command .= " -dbname $dbname" if defined $dbname;
-### XXX WE NEED to make this a recipe-driven option
 $command .= " -again" unless $stop;
 $command .= $stats->cmdflags();
@@ -346,4 +345,5 @@
         $command .= " -det_id $det_id";
         $command .= " -iteration $iter";
+	# XXX EAM : we should add this to the db : $command .= " -path_base $outroot";
         $command .= " -code $exit_code";
         $command .= " -dbname $dbname" if defined $dbname;
