Index: trunk/ippScripts/scripts/phase2.pl
===================================================================
--- trunk/ippScripts/scripts/phase2.pl	(revision 9446)
+++ trunk/ippScripts/scripts/phase2.pl	(revision 9892)
@@ -21,4 +21,5 @@
     $classId,			# Class Id
     $input,			# Input FITS file
+    $camera,			# Camera
     $no_update			# Don't update the database?
     );
@@ -27,4 +28,5 @@
     'class_id|i=s'  => \$classId,
     'uri|u=s'       => \$input,
+    'camera|c=s'    => \$camera,
     'no-update'     => \$no_update
 ) or pod2usage( 2 );
@@ -32,9 +34,12 @@
 pod2usage( -msg => "Unknown option: @ARGV", -exitval => 2 ) if @ARGV;
 pod2usage(
-    -msg => "Required options: --exp_tag --class_id --uri",
+    -msg => "Required options: --exp_tag --class_id --uri --camera",
     -exitval => 3,
 ) unless defined $expTag 
     and defined $classId 
-    and defined $input;
+    and defined $input
+    and defined $camera;
+
+$ipprc->define_camera($camera);
 
 # Look for programs we need
@@ -49,8 +54,8 @@
 $outputRoot = File::Spec->rel2abs( File::Spec->catpath( $vol, $dir, $outputRoot ), $ipprc->workdir() );
 $input = File::Spec->rel2abs( $input, $ipprc->workdir() );
-my $outputImage = $outputRoot  . '.' . $classId . '.fits';
+my $outputImage = $ipprc->filename("PPIMAGE.OUTPUT", $outputRoot, $classId);
+my $outputBin1 = $ipprc->filename("PPIMAGE.BIN1", $outputRoot, $classId);
+my $outputBin2 = $ipprc->filename("PPIMAGE.BIN2", $outputRoot, $classId);
 my $outputStats = $outputRoot  . '.' . $classId . '.stats';
-my $outputBin1Name = $outputRoot . '.' . $classId . '.b1.fits';
-my $outputBin2Name = $outputRoot . '.' . $classId . '.b2.fits';
 
 # Run ppImage
@@ -62,6 +67,6 @@
     die "Unable to perform ppImage on $input: $error_code\n" if not $success;
     die "Couldn't find expected output file: $outputImage\n" if not -f $outputImage;
-    die "Couldn't find expected output file: $outputBin1Name\n" if not -f $outputBin1Name;
-    die "Couldn't find expected output file: $outputBin2Name\n" if not -f $outputBin2Name;
+    die "Couldn't find expected output file: $outputBin1\n" if not -f $outputBin1;
+    die "Couldn't find expected output file: $outputBin2\n" if not -f $outputBin2;
     die "Couldn't find expected output file: $outputStats\n" if not -f $outputStats;
 }
@@ -83,6 +88,6 @@
 # Add the processed file to the database
 $outputImage = File::Spec->abs2rel( $outputImage, $ipprc->workdir() );
-$outputBin1Name = File::Spec->abs2rel( $outputBin1Name, $ipprc->workdir() );
-$outputBin2Name = File::Spec->abs2rel( $outputBin2Name, $ipprc->workdir() );
+$outputBin1 = File::Spec->abs2rel( $outputBin1, $ipprc->workdir() );
+$outputBin2 = File::Spec->abs2rel( $outputBin2, $ipprc->workdir() );
 unless ($no_update) {
     # Command to run dettool
@@ -92,6 +97,6 @@
     $command .= " -recip " . RECIPE;
     $command .= " -uri $outputImage";
-    $command .= " -b1_uri $outputBin1Name";
-    $command .= " -b2_uri $outputBin2Name";
+    $command .= " -b1_uri $outputBin1";
+    $command .= " -b2_uri $outputBin2";
     $command .= " -bg " . $stats->bg_mean();
     $command .= " -bg_stdev " . $stats->bg_stdev();