Changeset 11394 for trunk/ippScripts

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.

Location:

trunk/ippScripts/scripts

Files:

• detrend_norm_apply.pl (modified) (2 diffs)
• detrend_norm_exp.pl (modified) (2 diffs)
• detrend_process_exp.pl (modified) (3 diffs)
• detrend_process_imfile.pl (modified) (1 diff)
• detrend_reject_imfile.pl (modified) (3 diffs)
• detrend_resid.pl (modified) (1 diff)
• phase2.pl (modified) (1 diff)
• phase3.pl (modified) (3 diffs)

trunk/ippScripts/scripts/detrend_norm_apply.pl

@@ -104 +104 @@
     }
     &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: $b1name", $det_id, $iter, $class_id, $PS_EXIT_SYS_ERROR) unless -e $b1name;
+    &my_die("Can't find expected output file: $b2name", $det_id, $iter, $class_id, $PS_EXIT_SYS_ERROR) unless -e $b2name;
     &my_die("Can't find expected output file: $statsName", $det_id, $iter, $class_id, $PS_EXIT_SYS_ERROR) unless -e $statsName;
 }
@@ -129 +129 @@
 unless ($no_update) {
     my $command = "$dettool -addnormalizedimfile -det_id $det_id -iteration $iter -class_id $class_id ".
-        "-uri $output -b1_uri $b1name -b2_uri $b2name"; # Command to run
+        "-uri $output -b1_uri $outputRoot"; # Command to run
     # Add the statistics triplet
     $command .= " -bg " . $stats->bg_mean();

trunk/ippScripts/scripts/detrend_norm_exp.pl

@@ -128 +128 @@
 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 @stdevs, $file->{bg_stdev};
@@ -161 +162 @@
 unless ($no_update) {
     my $command = "$dettool -addnormalizedexp -det_id $det_id -iteration $iter " .
-        "-recip " . RECIPE1() . "," . RECIPE2() . " -b1_uri $jpeg1Name -b2_uri $jpeg2Name " .
+        "-recip " . RECIPE1() . "," . RECIPE2() . " -b1_uri $outputRoot " .
         "-bg $bg -bg_stdev $bg_stdev -bg_mean_stdev $bg_mean_stdev"; # Command to run
     $command .= " -dbname $dbname" if defined $dbname;

trunk/ippScripts/scripts/detrend_process_exp.pl

@@ -109 +109 @@
     $workdir = $ipprc->convert_filename_absolute( $workdir );
 } else {
-    my $example = ${$files}[0]->{b1_uri}; # Example filename
+    my $example = ${$files}[0]->{b1_uri}; # Example original root name
     my ($vol, $dir, $file) = File::Spec->splitpath( $example );
     $workdir = $dir;
@@ -124 +124 @@
 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 @stdevs, $file->{bg_stdev};
@@ -167 +168 @@
 unless ($no_update) {
     my $command = "$dettool -addprocessedexp -det_id $det_id -exp_tag $exp_tag " .
-        "-recip " . RECIPE1() . "," . RECIPE2() . " -b1_uri $jpeg1 -b2_uri $jpeg2 " .
+        "-recip " . RECIPE1() . "," . RECIPE2() . " -b1_uri $outputRoot " .
         "-bg $bg -bg_stdev $bg_stdev -bg_mean_stdev $bg_mean_stdev"; # Command to run
     $command .= " -dbname $dbname" if defined $dbname;

trunk/ippScripts/scripts/detrend_process_imfile.pl

@@ -135 +135 @@
 unless ($no_update) {
     my $command = "$dettool -addprocessedimfile -det_id $det_id -exp_tag $exp_tag " .
-        "-class_id $class_id -recip $recipe -uri $outputImage -b1_uri $outputBin1 " .
-        "-b2_uri $outputBin2"; # Command to run dettool
+        "-class_id $class_id -recip $recipe -uri $outputImage -b1_uri $outputRoot";  # Command to run dettool
     $command .= " -bg " . $stats->bg_mean();
     if (defined($stats->bg_stdev())) {

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;

trunk/ippScripts/scripts/detrend_resid.pl

@@ -174 +174 @@
 unless ($no_update) {
     my $command = "$dettool -addresidimfile -det_id $det_id -iteration $iter -exp_tag $exp_tag " .
-        "-class_id $class_id -recip $recipe -uri $outputName -b1_uri $bin1Name " .
-        "-b2_uri $bin2Name"; # Command to run dettool
+        "-class_id $class_id -recip $recipe -uri $outputName -b1_uri $outputRoot"; # Command to run dettool
     $command .= " -bg " . $stats->bg_mean();
     $command .= " -dbname $dbname" if defined $dbname;

trunk/ippScripts/scripts/phase2.pl

@@ -127 +127 @@
     $command .= " -recip " . RECIPE;
     $command .= " -uri $outputImage";
-    $command .= " -b1_uri $outputBin1";
-    $command .= " -b2_uri $outputBin2";
+    $command .= " -b1_uri $outputRoot";
     $command .= " -bg " . $stats->bg_mean();
     $command .= " -bg_stdev " . $stats->bg_stdev();

trunk/ippScripts/scripts/phase3.pl

@@ -118 +118 @@
     $workdir = $ipprc->convert_filename_absolute( $workdir );
 } else {
-    my $example = ${$files}[0]->{b1_uri}; # Example filename
+    my $example = ${$files}[0]->{b1_uri}; # Example original root name
     my ($vol, $dir, $file) = File::Spec->splitpath( $example );
     $workdir = $dir;
@@ -137 +137 @@
     # use the b1_uri as OUTPUT root and convert the filenames
     # with ipprc->filename:
-    my $classID = $file->{class_id};
-    my $fileRoot = $file->{b1_uri};
-    print $list1File $ipprc->filename("PPIMAGE.BIN1", $file->{b1_uri}, $classID);
-    print $list2File $ipprc->filename("PPIMAGE.BIN2", $file->{b1_uri}, $classID);
-    print $list1File $ipprc->filename("PSPHOT.OUTPUT", $file->{b1_uri}, $classID);
-    print $list1File $ipprc->filename("PSASTRO.OUTPUT", $file->{b1_uri}, $classID);
+    my $class_id = $file->{class_id};
+    my $origRoot = $ipprc->convert_filename_absolute( $file->{b1_uri} ); # Original root name
+    print $list1File $ipprc->filename("PPIMAGE.BIN1", $origRoot, $class_id);
+    print $list2File $ipprc->filename("PPIMAGE.BIN2", $origRoot, $class_id);
+    print $list1File $ipprc->filename("PSPHOT.OUTPUT", $origRoot, $class_id);
+    print $list1File $ipprc->filename("PSASTRO.OUTPUT", $origRoot, $class_id);
     # XXX PSASTRO.OUTPUT is explicitly a CHIP output file 
     # XXX below the PSASTRO.OUTPUT must be an FPA output file
@@ -196 +196 @@
 unless ($no_update) {
     my $command = "$p3tool -addprocessedexp -exp_tag $exp_tag -uri UNKNOWN " .
-        "-recip " . RECIPE1() . "," . RECIPE2() . " -b1_uri $jpeg1 -b2_uri $jpeg2 " .
+        "-recip " . RECIPE1() . "," . RECIPE2() . " -b1_uri $outputRoot " .
         "-bg $bg -bg_stdev $bg_stdev -bg_mean_stdev $bg_mean_stdev " .
         "-sigma_ra 0.0 -sigma_dec 0.0 -nastro 0 -zp_mean 0.0 -zp_stdev 0.0"; # Command to run