Changeset 8937

Timestamp:

Sep 25, 2006, 11:07:51 AM (20 years ago)

Author:

Paul Price

Message:

Split PPIMAGE_J into 2 recipes to handle both binnings

File:

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

trunk/ippScripts/scripts/detrend_reject_imfile.pl

@@ -32 +32 @@
     and defined $det_type;
 
-use constant RECIPE => 'PPIMAGE_J'; # Recipe to use for ppImage to make JPEGs
+use constant RECIPE1 => 'PPIMAGE_J1'; # Recipe to use for ppImage to make JPEGs
+use constant RECIPE2 => 'PPIMAGE_J2'; # Recipe to use for ppImage to make JPEGs
 
 # The expected mean, as a function of detrend type
@@ -112 +113 @@
 
 # Output products --- need to synch with the camera configuration!
-my $jpeg1Name = $outputName . ".b1.jpeg"; # Binned JPEG #1
-my $jpeg2Name = $outputName . ".b2.jpeg"; # Binned JPEG #2
+my $jpeg1Name = $outputName . ".b1.jpg"; # Binned JPEG #1
+my $jpeg2Name = $outputName . ".b2.jpg"; # Binned JPEG #2
 
 # Make the jpeg for binning 1
 {
-    my $command = "$ppImage -list $list1Name $outputName -recipe PPIMAGE " . RECIPE; # Command to run
-    my ( $success, $error_code, $full_buf, $stdout_buf, $stderr_buf ) =
-        run(command => $command, verbose => 1);
-#    die "Unable to find expected output file: $jpeg1Name\n" if not -f $jpeg1Name;
+    my $command = "$ppImage -list $list1Name $outputName -recipe PPIMAGE " . RECIPE1; # Command to run
+    my ( $success, $error_code, $full_buf, $stdout_buf, $stderr_buf ) =
+        run(command => $command, verbose => 1);
+    die "Unable to find expected output file: $jpeg1Name\n" if not -f $jpeg1Name;
 }
 
 # Make the jpeg for binning 2
 {
-    my $command = "$ppImage -list $list2Name $outputName -recipe PPIMAGE " . RECIPE; # Command to run
-    my ( $success, $error_code, $full_buf, $stdout_buf, $stderr_buf ) =
-        run(command => $command, verbose => 1);
-#    die "Unable to find expected output file: $jpeg2Name\n" if not -f $jpeg2Name;
+    my $command = "$ppImage -list $list2Name $outputName -recipe PPIMAGE " . RECIPE2; # Command to run
+    my ( $success, $error_code, $full_buf, $stdout_buf, $stderr_buf ) =
+        run(command => $command, verbose => 1);
+    die "Unable to find expected output file: $jpeg2Name\n" if not -f $jpeg2Name;
 }