Changeset 9145

Timestamp:

Oct 3, 2006, 10:04:48 AM (20 years ago)

Author:

Paul Price

Message:

Fixing so they compile.

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_stack.pl (modified) (1 diff)
• phase0_exp.pl (modified) (1 diff)

trunk/ippScripts/scripts/detrend_norm_apply.pl

@@ -56 +56 @@
 my $b1name = $outputRoot . '.' . $classId . '.b1.fits'; # Output file with binning 1
 my $b2name = $outputRoot . '.' . $classId . '.b2.fits'; # Output file with binning 2
-my $statName = $outputRoot . '.' . $classId . '.stats'; # Statistics file
+my $statsName = $outputRoot . '.' . $classId . '.stats'; # Statistics file
 
 # Run ppArith
 {
-    my $command = "$ppImage -file $input $outputRoot -norm $value -stat $statName -recipe PPIMAGE " . RECIPE(); # Command to run
+    my $command = "$ppImage -file $input $outputRoot -norm $value -stat $statsName -recipe PPIMAGE " . RECIPE(); # Command to run
     my ( $success, $error_code, $full_buf, $stdout_buf, $stderr_buf ) =
         run(command => $command, verbose => 1);
@@ -67 +67 @@
     die "Can't find expected output file: $b1name\n" if not -e $b1name;
     die "Can't find expected output file: $b2name\n" if not -e $b2name;
-    die "Can't find expected output file: $statName\n" if not -e $statName;
+    die "Can't find expected output file: $statsName\n" if not -e $statsName;
 }
 

trunk/ippScripts/scripts/detrend_norm_exp.pl

@@ -29 +29 @@
     -exitval => 3,
 ) unless defined $det_id
-     and defined $iteration
+     and defined $iter
      and defined $camera
      and defined $det_type;
@@ -89 +89 @@
 
 # Generate the file list, and get the statistics
-my $outputRoot = $camera . '.' . $detType . '.norm.' . $detId . '.' . $iter; # Root output name
+my $outputRoot = $camera . '.' . $det_type . '.norm.' . $det_id . '.' . $iter; # Root output name
 my $list1Name = $outputRoot . '.b1.list'; # Name for the input file list for binning 1
 my $list2Name = $outputRoot . '.b2.list'; # Name for the input file list for binning 2

trunk/ippScripts/scripts/detrend_process_exp.pl

@@ -27 +27 @@
     -exitval => 3,
 ) unless defined $det_id
-     and defined $exp_tag
-     and defined $det_type;
+    and defined $exp_tag;
 
 use constant RECIPE1 => 'PPIMAGE_J1'; # Recipe to use for ppImage to make JPEGs
@@ -86 +85 @@
 
 # Generate the file list, and get the statistics
-my $outputRoot = $exp_tag . '.detproc.' . $det_id . '.' . $iter; # Root output name
+my $outputRoot = $exp_tag . '.detproc.' . $det_id; # Root output name
 my $list1Name = $outputRoot . '.b1.list'; # Name for the input file list for binning 1
 my $list2Name = $outputRoot . '.b2.list'; # Name for the input file list for binning 2
@@ -124 +123 @@
 # Add the result into the database
 unless ($no_update) {
-    my $command = "$dettool -addprocessedexp -det_id $det_id -iteration $iter -exp_tag $exp_tag " .
+    my $command = "$dettool -addprocessedexp -det_id $det_id -exp_tag $exp_tag " .
         "-recip " . RECIPE1() . "," . RECIPE2() . " -b1_uri $jpeg1Name -b2_uri $jpeg2Name " .
         "-bg $bg -bg_stdev $bg_stdev -bg_mean_stdev $bg_mean_stdev"; # Command to run

trunk/ippScripts/scripts/detrend_stack.pl

@@ -15 +15 @@
 use Pod::Usage qw( pod2usage );
 
-my ($det_id, $iter, $class_id, $det_type, $camera);
+my ($det_id, $iter, $class_id, $det_type, $camera, $no_update);
 GetOptions(
     'det_id|d=s'        => \$det_id,

trunk/ippScripts/scripts/phase0_exp.pl

@@ -11 +11 @@
 
 use Getopt::Long qw( GetOptions :config auto_help auto_version gnu_getopt );
+use Pod::Usage qw( pod2usage );
 
 my ($exptag, $no_update);