Index: /trunk/ippScripts/scripts/detrend_norm_apply.pl
===================================================================
--- /trunk/ippScripts/scripts/detrend_norm_apply.pl	(revision 11318)
+++ /trunk/ippScripts/scripts/detrend_norm_apply.pl	(revision 11319)
@@ -98,11 +98,11 @@
 	run(command => $command, verbose => 1);
     unless ($success) {
-	$error_code >> 8;
-	&my_die("Unable to perform ppImage: $error_code", $det_id, $iter, $class_id, $error_code);
+	$error_code = $error_code >> 8;
+	&my_die("Unable to perform ppImage: $error_code", $detId, $iter, $classId, $error_code);
     }
-    &my_die("Can't find expected output file: $output", $det_id, $iter, $class_id, $PS_EXIT_SYS_ERROR) unless -e $output;
-    &my_die("Can't find expected output file: $b1name", $det_id, $iter, $class_id, $PS_EXIT_SYS_ERROR) unless -e $b2name;
-    &my_die("Can't find expected output file: $b2name", $det_id, $iter, $class_id, $PS_EXIT_SYS_ERROR) unless -e $b1name;
-    &my_die("Can't find expected output file: $statsName", $det_id, $iter, $class_id, $PS_EXIT_SYS_ERROR) unless -e $statsName;
+    &my_die("Can't find expected output file: $output", $detId, $iter, $classId, $PS_EXIT_SYS_ERROR) unless -e $output;
+    &my_die("Can't find expected output file: $b1name", $detId, $iter, $classId, $PS_EXIT_SYS_ERROR) unless -e $b2name;
+    &my_die("Can't find expected output file: $b2name", $detId, $iter, $classId, $PS_EXIT_SYS_ERROR) unless -e $b1name;
+    &my_die("Can't find expected output file: $statsName", $detId, $iter, $classId, $PS_EXIT_SYS_ERROR) unless -e $statsName;
 }
 
@@ -111,12 +111,12 @@
 {
     my $statsFile;		# File handle
-    open $statsFile, $statsName or &my_die("Can't open statistics file $statsName: $!\n", $det_id, $iter, $class_id, $PS_EXIT_SYS_ERROR);
+    open $statsFile, $statsName or &my_die("Can't open statistics file $statsName: $!\n", $detId, $iter, $classId, $PS_EXIT_SYS_ERROR);
     my @contents = <$statsFile>; # Contents of file
     close $statsFile;
     my $mdcParser = PS::IPP::Metadata::Config->new;	# Parser for metadata config files
     my $metadata = $mdcParser->parse(join "", @contents)
-        or &my_die("Unable to parse metadata config", $det_id, $iter, $class_id, $PS_EXIT_PROG_ERROR);
+        or &my_die("Unable to parse metadata config", $detId, $iter, $classId, $PS_EXIT_PROG_ERROR);
     $stats = PS::IPP::Metadata::Stats->new(); # Stats parser
-    $stats->parse($metadata) or &my_die("Unable to find all values in statistics output.", $det_id, $iter, $class_id, $PS_EXIT_PROG_ERROR);
+    $stats->parse($metadata) or &my_die("Unable to find all values in statistics output.", $detId, $iter, $classId, $PS_EXIT_PROG_ERROR);
 }
 
@@ -143,5 +143,5 @@
 	run(command => $command, verbose => 1);
     unless ($success) {
-	$error_code >> 8;
+	$error_code = $error_code >> 8;
 	warn("Unable to perform dettool -addnormalizedimfile: $error_code\n");
 	exit($error_code);
Index: /trunk/ippScripts/scripts/detrend_norm_exp.pl
===================================================================
--- /trunk/ippScripts/scripts/detrend_norm_exp.pl	(revision 11318)
+++ /trunk/ippScripts/scripts/detrend_norm_exp.pl	(revision 11319)
@@ -8,5 +8,9 @@
 
 use IPC::Cmd qw( can_run run );
-use PS::IPP::Metadata::Config qw(
+use PS::IPP::Metadata::Config;
+use PS::IPP::Metadata::List qw( parse_md_list );
+use Statistics::Descriptive;
+
+use PS::IPP::Config qw(
     $PS_EXIT_SUCCESS
     $PS_EXIT_UNKNOWN_ERROR
@@ -17,8 +21,4 @@
     $PS_EXIT_TIMEOUT_ERROR
     );
-use PS::IPP::Metadata::List qw( parse_md_list );
-use Statistics::Descriptive;
-
-use PS::IPP::Config;
 my $ipprc = PS::IPP::Config->new(); # IPP configuration
 use File::Spec;
@@ -72,5 +72,5 @@
 	run(command => $command, verbose => 1);
     unless ($success) {
-	$error_code >> 8;
+	$error_code = $error_code >> 8;
 	&my_die("Unable to perform ppImage: $error_code", $det_id, $iter, $error_code);
     }
@@ -164,5 +164,5 @@
 	run(command => $command, verbose => 1);
     unless ($success) {
-	$error_code >> 8;
+	$error_code = $error_code >> 8;
 	&my_die("Unable to perform dettool -addnormalizedexp: $error_code", $det_id, $iter, $error_code);
     }
Index: /trunk/ippScripts/scripts/detrend_process_exp.pl
===================================================================
--- /trunk/ippScripts/scripts/detrend_process_exp.pl	(revision 11318)
+++ /trunk/ippScripts/scripts/detrend_process_exp.pl	(revision 11319)
@@ -70,5 +70,5 @@
 	run(command => $command, verbose => 1);
     unless ($success) {
-	$error_code >> 8;
+	$error_code = $error_code >> 8;
 	&my_die("Unable to perform dettool -processedimfile: $error_code", $det_id, $exp_tag, $error_code);
     }
@@ -85,5 +85,5 @@
     my @variances;    # Array of variances for each component
     foreach my $file (@$files) {
-	&my_die("Unable to find class id", $det_id, $exp_tag, $PS_EXIT_SYS_ERRROR) unless defined $file->{class_id};
+	&my_die("Unable to find class id", $det_id, $exp_tag, $PS_EXIT_SYS_ERROR) unless defined $file->{class_id};
 	my $class_id = $file->{class_id};
 	&my_die("Unable to find bg for class_id=$class_id", $det_id, $exp_tag, $PS_EXIT_SYS_ERROR) unless defined $file->{bg};
@@ -141,5 +141,5 @@
 	run(command => $command, verbose => 1);
     unless ($success) {
-	$error_code >> 8;
+	$error_code = $error_code >> 8;
 	&my_die("Unable to perform ppImage: $error_code", $det_id, $exp_tag, $error_code);
     }
@@ -153,5 +153,5 @@
 	run(command => $command, verbose => 1);
     unless ($success) {
-	$error_code >> 8;
+	$error_code = $error_code >> 8;
 	&my_die("Unable to perform ppImage: $error_code", $det_id, $exp_tag, $error_code);
     }
@@ -172,5 +172,5 @@
 	run(command => $command, verbose => 1);
     unless ($success) {
-	$error_code >> 8;
+	$error_code = $error_code >> 8;
 	warn("Unable to perform dettool -addprocessedexp: $error_code");
 	exit($error_code);
Index: /trunk/ippScripts/scripts/detrend_process_imfile.pl
===================================================================
--- /trunk/ippScripts/scripts/detrend_process_imfile.pl	(revision 11318)
+++ /trunk/ippScripts/scripts/detrend_process_imfile.pl	(revision 11319)
@@ -26,5 +26,5 @@
 use Pod::Usage qw( pod2usage );
 
-my ($det_id, $exp_tag, $class_id, $det_type, $input_uri, $camera, $bdname, $workdir, $no_update);
+my ($det_id, $exp_tag, $class_id, $det_type, $input_uri, $camera, $dbname, $workdir, $no_update);
 GetOptions(
     'det_id|d=s'        => \$det_id,
@@ -103,5 +103,5 @@
 	run(command => $command, verbose => 1);
     unless ($success) {
-	$error_code >> 8;
+	$error_code = $error_code >> 8;
 	&my_die("Unable to perform ppImage: $error_code", $det_id, $exp_tag, $class_id, $error_code);
     }
@@ -149,5 +149,5 @@
 	run(command => $command, verbose => 1);
     unless ($success) {
-	$error_code >> 8;
+	$error_code = $error_code >> 8;
 	warn("Unable to perform dettool -addprocessedimfile: $error_code\n");
 	exit($error_code);
Index: /trunk/ippScripts/scripts/detrend_reject_exp.pl
===================================================================
--- /trunk/ippScripts/scripts/detrend_reject_exp.pl	(revision 11318)
+++ /trunk/ippScripts/scripts/detrend_reject_exp.pl	(revision 11319)
@@ -65,5 +65,5 @@
 	run(command => $command, verbose => 1);
     unless ($success) {
-	$error_code >> 8;
+	$error_code = $error_code >> 8;
 	&my_die("Unable to perform dettool -residexp: $error_code", $det_id, $iter, $error_code);
     }
@@ -188,5 +188,5 @@
 	    run(command => $command, verbose => 1);
 	unless ($success) {
-	    $error_code >> 8;
+	    $error_code = $error_code >> 8;
 	    &my_die("Unable to perform dettool -updateresidexp: $error_code", $det_id, $iter, $error_code);
 	}
@@ -226,5 +226,5 @@
 	run(command => $command, verbose => 1);
     unless ($success) {
-	$error_code >> 8;
+	$error_code = $error_code >> 8;
 	warn("Unable to perform dettool -adddetrunsummary: $error_code");
 	exit($error_code);
@@ -246,5 +246,5 @@
 	run(command => $command, verbose => 1);
     unless ($success) {
-	$error_code >> 8;
+	$error_code = $error_code >> 8;
 	warn("Unable to perform dettool -updatedetrun: $error_code");
 	exit($error_code);
Index: /trunk/ippScripts/scripts/detrend_reject_imfile.pl
===================================================================
--- /trunk/ippScripts/scripts/detrend_reject_imfile.pl	(revision 11318)
+++ /trunk/ippScripts/scripts/detrend_reject_imfile.pl	(revision 11319)
@@ -35,5 +35,5 @@
 	   'camera=s'          => \$camera,
 	   'filter=s'          => \$filter,
-	   'reject'            => \$reject
+	   'reject'            => \$reject,
 	   'dbname|d=s'        => \$dbname, # Database name
 	   'workdir|w=s'       => \$workdir, # Working directory, for output files
@@ -75,5 +75,5 @@
 	run(command => $command, verbose => 1);
     unless ($success) {
-	$error_code >> 8;
+	$error_code = $error_code >> 8;
 	warn("Unable to perform dettool -residimfile: $error_code\n");
 	exit($error_code);
@@ -125,5 +125,5 @@
 	run(command => $command, verbose => 1);
     unless ($success) {
-	$error_code >> 8;
+	$error_code = $error_code >> 8;
 	&my_die("Unable to run ppImage: $error_code", $det_id, $iter, $exp_tag, $error_code);
     }
@@ -137,5 +137,5 @@
 	run(command => $command, verbose => 1);
     unless ($success) {
-	$error_code >> 8;
+	$error_code = $error_code >> 8;
 	&my_die("Unable to run ppImage: $error_code", $det_id, $iter, $exp_tag, $error_code);
     }
@@ -274,5 +274,5 @@
 	run(command => $command, verbose => 1);
     unless ($success) {
-	$error_code >> 8;
+	$error_code = $error_code >> 8;
 	warn("Unable to perform dettool -addresidexp: $error_code\n");
 	exit($error_code);
@@ -300,5 +300,5 @@
 
     warn($msg);
-    if ($det_id and $iteration and $exp_tag) {
+    if ($det_id and $iter and $exp_tag) {
 	my $command = "$dettool -addresidexp -det_id $det_id -iteration $iter -exp_tag $exp_tag -code $exit_code";
 	$command .= " -dbname $dbname" if defined $dbname;
Index: /trunk/ippScripts/scripts/detrend_resid.pl
===================================================================
--- /trunk/ippScripts/scripts/detrend_resid.pl	(revision 11318)
+++ /trunk/ippScripts/scripts/detrend_resid.pl	(revision 11319)
@@ -142,5 +142,5 @@
 	run(command => $command, verbose => 1);
     unless ($success) {
-	$error_code >> 8;
+	$error_code = $error_code >> 8;
 	&my_die("Unable to perform ppImage: $error_code", $det_id, $iter, $exp_tag, $class_id, $error_code);
     }
@@ -188,5 +188,5 @@
 	run(command => $command, verbose => 1);
     unless ($success) {
-	$error_code >> 8;
+	$error_code = $error_code >> 8;
 	warn("Unable to perform dettool -addresidimfile: $error_code\n");
 	exit($error_code);
Index: /trunk/ippScripts/scripts/detrend_stack.pl
===================================================================
--- /trunk/ippScripts/scripts/detrend_stack.pl	(revision 11318)
+++ /trunk/ippScripts/scripts/detrend_stack.pl	(revision 11319)
@@ -82,5 +82,5 @@
 	run(command => $command, verbose => 1);
     unless ($success) {
-	$error_code >> 8;
+	$error_code = $error_code >> 8;
 	&my_die("Unable to perform dettool -processedimfile: $error_code", $det_id, $iter, $class_id, $error_code);
     }
@@ -117,5 +117,5 @@
 	run(command => $command, verbose => 1);
     unless ($success) {
-	$error_code >> 8;
+	$error_code = $error_code >> 8;
 	&my_die("Unable to perform ppMerge: $error_code", $det_id, $iter, $class_id, $error_code);
     }
@@ -157,5 +157,5 @@
 	run(command => $command, verbose => 1);
     unless ($success) {
-	$error_code >> 8;
+	$error_code = $error_code >> 8;
 	warn("Unable to perform dettool -addstacked: $error_code\n");
 	exit($error_code);
Index: /trunk/ippScripts/scripts/phase0_exp.pl
===================================================================
--- /trunk/ippScripts/scripts/phase0_exp.pl	(revision 11318)
+++ /trunk/ippScripts/scripts/phase0_exp.pl	(revision 11319)
@@ -25,5 +25,5 @@
     );
 
-my ($cache, $exptag, $no_update);
+my ($cache, $exptag, $dbname, $no_update);
 
 GetOptions(
Index: /trunk/ippScripts/scripts/phase2.pl
===================================================================
--- /trunk/ippScripts/scripts/phase2.pl	(revision 11318)
+++ /trunk/ippScripts/scripts/phase2.pl	(revision 11319)
@@ -26,6 +26,6 @@
 
 # Parse the command-line arguments
-my ($expTag,			# Exposure tag
-    $classId,			# Class Id
+my ($exp_tag,			# Exposure tag
+    $class_id,			# Class Id
     $input,			# Input FITS file
     $camera,			# Camera
@@ -35,6 +35,6 @@
     );
 GetOptions(
-    'exp_tag|e=s'   => \$expTag,
-    'class_id|i=s'  => \$classId,
+    'exp_tag|e=s'   => \$exp_tag,
+    'class_id|i=s'  => \$class_id,
     'uri|u=s'       => \$input,
     'camera|c=s'    => \$camera,
@@ -46,8 +46,8 @@
 pod2usage( -msg => "Unknown option: @ARGV", -exitval => 2 ) if @ARGV;
 pod2usage(
-    -msg => "Required options: --exp_tag --class_id --uri --camera --outpath",
+    -msg => "Required options: --exp_tag --class_id --uri --camera --workdir",
     -exitval => 3,
-) unless defined $expTag 
-    and defined $classId 
+) unless defined $exp_tag 
+    and defined $class_id 
     and defined $input
     and defined $camera;
@@ -70,13 +70,13 @@
 
 ### Output file name --- must match camera configuration!
-my $outputRoot =  $expTag . '.p2';
+my $outputRoot =  $exp_tag . '.p2';
 $outputRoot = File::Spec->catfile( $workdir, $outputRoot );
 $outputRoot = $ipprc->convert_filename_absolute($outputRoot);
 $input = $ipprc->convert_filename_absolute ( $input );
 
-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 $outputImage = $ipprc->filename("PPIMAGE.OUTPUT", $outputRoot, $class_id);
+my $outputBin1 = $ipprc->filename("PPIMAGE.BIN1", $outputRoot, $class_id);
+my $outputBin2 = $ipprc->filename("PPIMAGE.BIN2", $outputRoot, $class_id);
+my $outputStats = $outputRoot  . '.' . $class_id . '.stats';
 
 # Run ppImage
@@ -91,5 +91,5 @@
 	run(command => $command, verbose => 1);
     unless ($success) {
-	$error_code >> 8;
+	$error_code = $error_code >> 8;
 	&my_die("Unable to perform ppImage: $error_code", $exp_tag, $class_id, $error_code);
     }
@@ -122,6 +122,6 @@
     # Command to run p2tool
     my $command = "$p2tool -addprocessedimfile";
-    $command .= " -exp_tag $expTag";
-    $command .= " -class_id $classId";
+    $command .= " -exp_tag $exp_tag";
+    $command .= " -class_id $class_id";
     $command .= " -recip " . RECIPE;
     $command .= " -uri $outputImage";
@@ -136,5 +136,5 @@
 	run(command => $command, verbose => 1);
     unless ($success) {
-	$error_code >> 8;
+	$error_code = $error_code >> 8;
 	warn("Unable to perform p2tool -addprocessedimfile: $error_code\n");
 	exit($error_code);
@@ -154,5 +154,5 @@
     warn($msg);
     if ($exp_tag and $class_id) {
-	my $command = "$dettool -addprocessedimfile -exp_tag $exp_tag -class_id $class_id -code $exit_code";
+	my $command = "$p2tool -addprocessedimfile -exp_tag $exp_tag -class_id $class_id -code $exit_code";
 	$command .= " -dbname $dbname" if defined $dbname;
         system ($command);
Index: /trunk/ippScripts/scripts/phase3.pl
===================================================================
--- /trunk/ippScripts/scripts/phase3.pl	(revision 11318)
+++ /trunk/ippScripts/scripts/phase3.pl	(revision 11319)
@@ -27,5 +27,5 @@
 use Pod::Usage qw( pod2usage );
 
-my ($exp_tag, $camera, $outpath, $dbname, $workdir, $no_update);
+my ($exp_tag, $camera, $dbname, $workdir, $no_update);
 GetOptions(
     'exp_tag|e=s'       => \$exp_tag,
@@ -38,5 +38,5 @@
 pod2usage( -msg => "Unknown option: @ARGV", -exitval => 2 ) if @ARGV;
 pod2usage(
-    -msg => "Required options: --exp_tag --camera --outpath",
+    -msg => "Required options: --exp_tag --camera --workdir",
     -exitval => 3,
 ) unless defined $exp_tag
@@ -68,5 +68,5 @@
 	run(command => $command, verbose => 1);
     unless ($success) {
-	$error_code >> 8;
+	$error_code = $error_code >> 8;
 	&my_die("Unable to perform p3tool: $error_code", $exp_tag, $error_code);
     }
@@ -148,5 +148,5 @@
 	run(command => $command, verbose => 1);
     unless ($success) {
-	$error_code >> 8;
+	$error_code = $error_code >> 8;
 	&my_die("Unable to perform ppImage: $error_code", $exp_tag, $error_code);
     }
@@ -160,5 +160,5 @@
 	run(command => $command, verbose => 1);
     unless ($success) {
-	$error_code >> 8;
+	$error_code = $error_code >> 8;
 	&my_die("Unable to perform ppImage: $error_code", $exp_tag, $error_code);
     }
@@ -180,5 +180,5 @@
 	run(command => $command, verbose => 1);
     unless ($success) {
-	$error_code >> 8;
+	$error_code = $error_code >> 8;
 	warn("Unable to perform dettool -addprocessedexp: $error_code\n");
 	exit($error_code);
@@ -198,5 +198,5 @@
     warn($msg);
     if ($exp_tag) {
-	my $command = "$dettool -addprocessedexp -exp_tag $exp_tag -code $exit_code";
+	my $command = "$p3tool -addprocessedexp -exp_tag $exp_tag -code $exit_code";
 	$command .= " -dbname $dbname" if defined $dbname;
         system ($command);