Index: trunk/ippScripts/scripts/detrend_create_resid.pl
===================================================================
--- trunk/ippScripts/scripts/detrend_create_resid.pl	(revision 8983)
+++ trunk/ippScripts/scripts/detrend_create_resid.pl	(revision 9004)
@@ -16,5 +16,5 @@
 
 my ($det_id, $iter, $exp_id, $class_id, $det_type, $detrend,
-        $input_uri, $output_uri);
+        $input_uri);
 GetOptions(
     'det_id|d=s'        => \$det_id,
@@ -25,10 +25,9 @@
     'detrend=s'         => \$detrend,
     'input_uri|u=s'     => \$input_uri,
-    'output_uri|o=s'    => \$output_uri,
 ) or pod2usage( 2 );
 
 pod2usage( -msg => "Unknown option: @ARGV", -exitval => 2 ) if @ARGV;
 pod2usage(
-    -msg => "Required options: --det_id --iteration --exp_id --class_id --det_type --detrend --input_uri --output_uri",
+    -msg => "Required options: --det_id --iteration --exp_id --class_id --det_type --detrend --input_uri",
     -exitval => 3,
 ) unless defined $det_id
@@ -38,6 +37,5 @@
     and defined $det_type
     and defined $detrend
-    and defined $input_uri
-    and defined $output_uri;
+    and defined $input_uri;
 
 # Recipes to use, as a function of the detrend type
@@ -53,11 +51,4 @@
     'dark' => '-dark',		# Specify the dark frame
     'flat' => '-flat',		# Specify the flat frame
-};
-
-# Prefix to add to filenames
-use constant PREFIX => {
-    'bias' => 'ob',		# Overscan only
-    'dark' => 'obd',		# Overscan and bias only
-    'flat' => 'obdf',		# Overscan, bias and dark only
 };
 
@@ -77,14 +68,11 @@
 my $detFlag = DETRENDS->{$det_type};
 die "Unrecognised detrend type: $det_type\n" if not defined $detFlag;
-# Prefix to use for filename
-my $prefix = PREFIX->{$det_type};
-die  "Unrecognised detrend type: $det_type\n" if not defined $prefix;
 
 ### Output file names --- must match camera configuration!
-my $outputRoot = $prefix . '_' . $output_uri;
-my $outputName = $outputRoot . '.' . $class_id . '.fit';
+my $outputRoot = $exp_id . '.detresid.' . $det_id . '.' . $iter; # Root name
+my $outputName = $outputRoot . '.' . $class_id . '.fits'; # Name for 
 my $outputStats = $outputRoot . '.' . $class_id . '.stats';
-my $bin1Name = $outputRoot . '.' . $class_id . '.b1.fit';
-my $bin2Name =  $outputRoot . '.' . $class_id . '.b2.fit';
+my $bin1Name = $outputRoot . '.' . $class_id . '.b1.fits';
+my $bin2Name =  $outputRoot . '.' . $class_id . '.b2.fits';
 
 # Run ppImage
@@ -96,4 +84,5 @@
     die "Unable to perform ppImage on $input_uri: $error_code\n" if not $success;
     die "Couldn't find expected output file: $outputName\n" if not -f $outputName;
+    die "Couldn't find expected output file: $outputStats\n" if not -f $outputStats;
     die "Couldn't find expected output file: $bin1Name\n" if not -f $bin1Name;
     die "Couldn't find expected output file: $bin2Name\n" if not -f $bin2Name;
@@ -104,5 +93,5 @@
 {
     my $statsFile;		# File handle
-    open $statsFile, "$outputStats" or die "Can't open statistics file $outputStats: $!\n";
+    open $statsFile, $outputStats or die "Can't open statistics file $outputStats: $!\n";
     my @contents = <$statsFile>; # Contents of file
     close $statsFile;
@@ -134,5 +123,5 @@
 }
 
-unlink "$output_uri.stats" if DELETE_STATS;
+unlink $outputStats if DELETE_STATS;
 
 __END__