Changeset 11394 for trunk/ippScripts/scripts/detrend_reject_imfile.pl

Timestamp:

Jan 29, 2007, 1:11:35 PM (19 years ago)

Author:

Paul Price

Message:

b1_uri now contains the output root name; b2 is unused. The idea here is that we have the file names defined in the camera configuration, and this means we can now add other files without the overhead of hacking the database schema.

File:

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

trunk/ippScripts/scripts/detrend_reject_imfile.pl

@@ -89 +89 @@
     $workdir = $ipprc->convert_filename_absolute( $workdir );
 } else {
-    my $example = ${$files}[0]->{b1_uri}; # Example file
+    my $example = ${$files}[0]->{b1_uri}; # Example original root name
     my ($vol, $dir, $file) = File::Spec->splitpath( $example );
     $workdir = $dir;
@@ -107 +107 @@
 open my $list2File, '>' . $list2Name;
 foreach my $file (@$files) {
-    print $list1File ($ipprc->convert_filename_absolute( $file->{b1_uri} ) . "\n");
-    print $list2File ($ipprc->convert_filename_absolute( $file->{b2_uri} ) . "\n");
+    my $origRoot = $ipprc->convert_filename_absolute( $file->{b1_uri} ); # Original root name
+    print $list1File ($ipprc->filename( "PPIMAGE.BIN1", $origRoot, $file->{class_id} ) . "\n");
+    print $list2File ($ipprc->filename( "PPIMAGE.BIN2", $origRoot, $file->{class_id} ) . "\n");
     push @means, $file->{bg};
     push @meanStdevs, $file->{bg_mean_stdev};
@@ -270 +271 @@
 unless ($no_update) {
     my $command = "$dettool -addresidexp -det_id $det_id -iteration $iter -exp_tag $exp_tag " .
-        "-recip " . RECIPE1() . "," . RECIPE2() . " -b1_uri $jpeg1Name -b2_uri $jpeg2Name " .
+        "-recip " . RECIPE1() . "," . RECIPE2() . " -b1_uri $outputRoot " .
         "-bg $mean -bg_stdev $stdev -bg_mean_stdev $meanStdev"; # Command to run
     $command .= ' -reject' if $reject;