Changeset 14048 for trunk/ippScripts/scripts/detrend_norm_exp.pl

Timestamp:

Jul 6, 2007, 3:44:38 PM (19 years ago)

Author:

eugene

Message:

rework for consistency with the changes to the database and PS-IPP-Config

File:

• trunk/ippScripts/scripts/detrend_norm_exp.pl (modified) (7 diffs)

trunk/ippScripts/scripts/detrend_norm_exp.pl

@@ -16 +16 @@
 use IPC::Cmd 0.36 qw( can_run run );
 use PS::IPP::Metadata::Config;
+use PS::IPP::Metadata::Stats;
+
 use PS::IPP::Metadata::List qw( parse_md_list );
 use File::Temp qw( tempfile );
@@ -33 +35 @@
 use Pod::Usage qw( pod2usage );
 
-my ($det_id, $iter, $det_type, $camera, $dbname, $workdir, $no_update, $no_op);
+my ($det_id, $iter, $det_type, $camera, $dbname, $workdir, $reduction, $no_update, $no_op);
 GetOptions(
-    'det_id|d=s'        => \$det_id,
-    'iteration|i=s'     => \$iter,
-    'camera|c=s'        => \$camera,
-    'det_type|t=s'      => \$det_type,
-    'dbname|d=s'        => \$dbname, # Database name
-    'workdir|w=s'       => \$workdir,   # Working directory, for output files
-    'no-update'         => \$no_update,
-    'no-op'             => \$no_op,
-) or pod2usage( 2 );
+           'det_id|d=s'        => \$det_id,
+           'iteration|i=s'     => \$iter,
+           'camera|c=s'        => \$camera,
+           'det_type|t=s'      => \$det_type,
+           'dbname|d=s'        => \$dbname, # Database name
+           'workdir|w=s'       => \$workdir,    # Working directory, for output files
+           'reduction|=s'      => \$reduction,
+           'no-update'         => \$no_update,
+           'no-op'             => \$no_op,
+           ) or pod2usage( 2 );
 
 pod2usage( -msg => "Unknown option: @ARGV", -exitval => 2 ) if @ARGV;
@@ -58 +61 @@
 $reduction = 'DETREND' unless defined $reduction;
 
-my $recipe1 = $ipprc->reduction($reduction, 'JPEG_BIN1_IMAGE' . uc($det_type); # Recipe to use
+my $recipe1 = $ipprc->reduction($reduction, 'JPEG_BIN1_IMAGE_' . uc($det_type)); # Recipe to use
 &my_die("Unrecognised detrend type: $det_type", $det_id, $iter, $PS_EXIT_PROG_ERROR) unless defined $recipe1;
 
-my $recipe2 = $ipprc->reduction($reduction, 'JPEG_BIN2_IMAGE' . uc($det_type); # Recipe to use
+my $recipe2 = $ipprc->reduction($reduction, 'JPEG_BIN2_IMAGE_' . uc($det_type)); # Recipe to use
 &my_die("Unrecognised detrend type: $det_type", $det_id, $iter, $PS_EXIT_PROG_ERROR) unless defined $recipe2;
 
@@ -69 +72 @@
 # XXX  (A) if imfile.Ncomp > 1, (B) if imfile.Ncomp == 1
 my $STATS = 
-   [   
-       #          KEYWORD                 STATISTIC          CHIPTOOL FLAG
-       { name => "bg",             type => "mean",  flag => "-bg" },
-       { name => "bg",             type => "stdev", flag => "-bg_mean_stdev" },
-       { name => "bg_stdev",       type => "rms",   flag => "-bg_stdev" },
-       # { name => "bg_mean_stdev",  type => "rms",   flag => "-bg_mean_stdev" },
-   ];
+    [   
+        #          KEYWORD                 STATISTIC          CHIPTOOL FLAG
+        { name => "bg",             type => "mean",  flag => "-bg" },
+        { name => "bg",             type => "stdev", flag => "-bg_mean_stdev" },
+        { name => "bg_stdev",       type => "rms",   flag => "-bg_stdev" },
+        # { name => "bg_mean_stdev",  type => "rms",   flag => "-bg_mean_stdev" },
+        ];
 
 # Look for programs we need
@@ -87 +90 @@
 
 # Get list of component files
-my $files;                      # Array of component files
+my ($files, $command, $success, $error_code, $full_buf, $stdout_buf, $stderr_buf);
 {
-    my $command = "$dettool -normalizedimfile -det_id $det_id -iteration $iter"; # Command to run
+    $command  = "$dettool -normalizedimfile -det_id $det_id -iteration $iter"; # Command to run
     $command .= " -dbname $dbname" if defined $dbname;
-    my ( $success, $error_code, $full_buf, $stdout_buf, $stderr_buf ) =
+    ( $success, $error_code, $full_buf, $stdout_buf, $stderr_buf ) =
         run(command => $command, verbose => 1);
     unless ($success) {
@@ -131 +134 @@
 unless ($no_op) {
     # Make the jpeg for binning 1
-    {
-        my $command = "$ppImage -list $list1Name $outputRoot -recipe PPIMAGE $recipe1"; # Command to run
-        my ( $success, $error_code, $full_buf, $stdout_buf, $stderr_buf ) =
-            run(command => $command, verbose => 1);
-        &my_die("Unable to find expected output file: $jpeg1Name", $det_id, $iter, $PS_EXIT_SYS_ERROR) unless -f $ipprc->file_resolve($jpeg1Name);
-    }
+    $command = "$ppImage -list $list1Name $outputRoot -recipe PPIMAGE $recipe1"; # Command to run
+    ( $success, $error_code, $full_buf, $stdout_buf, $stderr_buf ) =
+        run(command => $command, verbose => 1);
+    &my_die("Unable to find expected output file: $jpeg1Name", $det_id, $iter, $PS_EXIT_SYS_ERROR) unless -f $ipprc->file_resolve($jpeg1Name);
     
     # Make the jpeg for binning 2
-    {
-        my $command = "$ppImage -list $list2Name $outputRoot -recipe PPIMAGE $recipe2"; # Command to run
-        my ( $success, $error_code, $full_buf, $stdout_buf, $stderr_buf ) =
-            run(command => $command, verbose => 1);
-        &my_die("Unable to find expected output file: $jpeg2Name", $det_id, $iter, $PS_EXIT_SYS_ERROR) unless -f $ipprc->file_resolve($jpeg2Name);
-    }
+    $command = "$ppImage -list $list2Name $outputRoot -recipe PPIMAGE $recipe2"; # Command to run
+    ( $success, $error_code, $full_buf, $stdout_buf, $stderr_buf ) =
+        run(command => $command, verbose => 1);
+    &my_die("Unable to find expected output file: $jpeg2Name", $det_id, $iter, $PS_EXIT_SYS_ERROR) unless -f $ipprc->file_resolve($jpeg2Name);
+
 }
 
 # command to update the database
-my $command = "$dettool -addnormalizedexp";
+$command  = "$dettool -addnormalizedexp";
 $command .= " -det_id $det_id";
 $command .= " -iteration $iter";
@@ -164 +164 @@
 # Add the processed file to the database
 unless ($no_update) {
-    my ( $success, $error_code, $full_buf, $stdout_buf, $stderr_buf ) =
+    ( $success, $error_code, $full_buf, $stdout_buf, $stderr_buf ) =
         run(command => $command, verbose => 1);
     unless ($success) {