Changeset 9091

Timestamp:

Oct 2, 2006, 11:54:11 AM (20 years ago)

Author:

Paul Price

Message:

Adding -no-update option (bug 825).

Location:

trunk/ippScripts/scripts

Files:

• detrend_apply_norm.pl (modified) (3 diffs)
• detrend_calc_norm.pl (modified) (2 diffs)
• detrend_create_resid.pl (modified) (3 diffs)
• detrend_process.pl (modified) (3 diffs)
• detrend_reject_exp.pl (modified) (2 diffs)
• detrend_reject_imfile.pl (modified) (3 diffs)
• detrend_stack.pl (modified) (2 diffs)
• phase0exp.pl (modified) (3 diffs)
• phase0imfile.pl (modified) ( previous)

trunk/ippScripts/scripts/detrend_apply_norm.pl

@@ -17 +17 @@
     $input,                     # Input file
     $camera,                    # Camera
-    $detType                    # Detrend type
+    $detType,                   # Detrend type
+    $no_update                  # Don't update the database
     );
 GetOptions(
@@ -26 +27 @@
     'input_uri|u=s'     => \$input,
     'camera|c=s'        => \$camera,
-    'det_type|t=s'      => \$detType
+    'det_type|t=s'      => \$detType,
+    'no-update'         => \$no_update
     ) or pod2usage( 2 );
     
@@ -62 +64 @@
 
 # Update the database
-{
+unless ($no_update) {
     my $command = "$dettool -addnormalizedimfile -det_id $detId -iteration $iter -class_id $classId ".
         "-uri $output"; # Command to run

trunk/ippScripts/scripts/detrend_calc_norm.pl

@@ -16 +16 @@
 # Parse command-line arguments
 my ($detId,                     # Detrend id
-    $iter                       # Iteration
+    $iter,                      # Iteration
+    $no_update                  # Don't update the database?
     );
 GetOptions(
         'det_id|d=s'    => \$detId,
         'iteration|i=s' => \$iter,
+        'no-update'     => \$no_update
         ) or pod2usage( 2 );
 
@@ -94 +96 @@
 
 # Process output normalisations
-{
+unless ($no_update) {
     foreach my $normItem (@$norms) {
         my $className = $normItem->{name}; # Name of component

trunk/ippScripts/scripts/detrend_create_resid.pl

@@ -16 +16 @@
 
 my ($det_id, $iter, $exp_id, $class_id, $det_type, $detrend,
-        $input_uri);
+        $input_uri, $no_update);
 GetOptions(
     'det_id|d=s'        => \$det_id,
@@ -25 +25 @@
     'detrend=s'         => \$detrend,
     'input_uri|u=s'     => \$input_uri,
+    'no-update'         => \$no_update
 ) or pod2usage( 2 );
 
@@ -104 +105 @@
 
 # Add the processed file to the database
-{
+unless ($no_update) {
     my $command = "$dettool -addresidimfile -det_id $det_id -iteration $iter -exp_id $exp_id " .
         "-class_id $class_id -recip $recipe -uri $outputName -b1_uri $bin1Name " .

trunk/ippScripts/scripts/detrend_process.pl

@@ -14 +14 @@
 use Pod::Usage qw( pod2usage );
 
-my ($det_id, $exp_id, $class, $class_id, $det_type, $input_uri, $output_uri);
+my ($det_id, $exp_id, $class, $class_id, $det_type, $input_uri, $output_uri, $no_update);
 GetOptions(
     'det_id|d=s'        => \$det_id,
@@ -22 +22 @@
     'det_type|t=s'      => \$det_type,
     'input_uri|u=s'     => \$input_uri,
+    'no-update'         => \$no_update
 ) or pod2usage( 2 );
 
@@ -85 +86 @@
 
 # Add the processed file to the database
-{
+unless ($no_update) {
     my $command = "$dettool -addprocessed -det_id $det_id -exp_id $exp_id " .
         "-class_id $class_id -recip $recipe -uri $outputImage"; # Command to run dettool

trunk/ippScripts/scripts/detrend_reject_exp.pl

@@ -15 +15 @@
 use Pod::Usage qw( pod2usage );
 
-my ($det_id, $iter, $det_type);
+my ($det_id, $iter, $det_type, $no_update);
 GetOptions(
     'det_id|d=s'        => \$det_id,
     'iteration=s'       => \$iter,
     'det_type|t=s'      => \$det_type,
+    'no-update'         => \$no_update
 ) or pod2usage( 2 );
 
@@ -158 +159 @@
 
 # Put the result into the database
-{
-    my $command = "$dettool -adddetrunsummary -det_id $det_id -iteration $iter " .
-        "-bg " . $meanStats->mean() . " -bg_stdev " . $stdevStats->mean() .
-        " -bg_mean_stdev " . $meanStdevStats->mean();
-    $command .= " -reject" if not $master;
-
-    my ( $success, $error_code, $full_buf, $stdout_buf, $stderr_buf ) =
-        run(command => $command, verbose => 1);
-    die "Unable to perform dettool -adddetrunsummary: $error_code\n" if not $success;
-}
-
-# Re-run processing if required
-{
-    my $command = "$dettool -updatedetrun -det_id $det_id";
-    if ($stop) {
-        $command .= ' -stop';
-    } else {
-        $command .= ' -again';
+unless ($no_update) {
+    {
+        my $command = "$dettool -adddetrunsummary -det_id $det_id -iteration $iter " .
+            "-bg " . $meanStats->mean() . " -bg_stdev " . $stdevStats->mean() .
+            " -bg_mean_stdev " . $meanStdevStats->mean();
+        $command .= " -reject" if not $master;
+        
+        my ( $success, $error_code, $full_buf, $stdout_buf, $stderr_buf ) =
+            run(command => $command, verbose => 1);
+        die "Unable to perform dettool -adddetrunsummary: $error_code\n" if not $success;
     }
     
-    my ( $success, $error_code, $full_buf, $stdout_buf, $stderr_buf ) =
-        run(command => $command, verbose => 1);
-    die "Unable to perform dettool -updatedetrun: $error_code\n" if not $success;
+    # Re-run processing if required
+    {
+        my $command = "$dettool -updatedetrun -det_id $det_id";
+        if ($stop) {
+            $command .= ' -stop';
+        } else {
+            $command .= ' -again';
+        }
+        
+        my ( $success, $error_code, $full_buf, $stdout_buf, $stderr_buf ) =
+            run(command => $command, verbose => 1);
+        die "Unable to perform dettool -updatedetrun: $error_code\n" if not $success;
+    }
 }
 __END__

trunk/ippScripts/scripts/detrend_reject_imfile.pl

@@ -15 +15 @@
 use Pod::Usage qw( pod2usage );
 
-my ($det_id, $iter, $exp_id, $det_type);
+my ($det_id, $iter, $exp_id, $det_type, $no_update);
 GetOptions(
     'det_id|d=s'        => \$det_id,
@@ -21 +21 @@
     'exp_id|e=s'        => \$exp_id,
     'det_type|t=s'      => \$det_type,
+    'no-update'         => \$no_update
 ) or pod2usage( 2 );
 
@@ -193 +194 @@
 
 # Add the result into the database
-{
+unless ($no_update) {
     my $command = "$dettool -addresidexp -det_id $det_id -iteration $iter -exp_id $exp_id " .
         "-recip " . RECIPE1() . "," . RECIPE2() . " -b1_uri $jpeg1Name -b2_uri $jpeg2Name " .

trunk/ippScripts/scripts/detrend_stack.pl

@@ -22 +22 @@
     'det_type|t=s'      => \$det_type,
     'camera|c=s'        => \$camera,
+    'no-update'         => \$no_update
 ) or pod2usage( 2 );
 
@@ -111 +112 @@
 
 # Add the resultant into the database
-{
+unless ($no_update) {
     my $command = "$dettool -addstacked -det_id $det_id -iteration $iter -class_id $class_id" .
         " -uri $outputStack -recip $recipe"; # Command to run

trunk/ippScripts/scripts/phase0exp.pl

@@ -10 +10 @@
 use Data::Dumper;
 
+use Getopt::Long qw( GetOptions :config auto_help auto_version gnu_getopt );
+
+my ($expid, $no_update);
+
+GetOptions(
+    'exp_id|e=s'    => \$expid,
+    'no-update'     => \$no_update
+) or pod2usage( 2 );
+
+pod2usage( -msg => "Unknown option: @ARGV", -exitval => 2 ) if @ARGV;
+pod2usage(
+    -msg => "Required options: --exp_id",
+    -exitval => 3,
+) unless defined $expid;
+
+# Define setup
 use constant TYPE => "exp_type"; # Observation type keyword
 use constant DETRENDS => [ "bias", "dark", "flat", "fringe" ]; # Observation types to mark as detrend
@@ -42 +58 @@
 ###                           "time" # Time of exposure --- not yet implemented
                            ];
-
-if (scalar @ARGV == 0 || scalar @ARGV >= 2) {
-    die "Perform phase 0 processing at the exposure level.\n\n" .
-        "Usage: $0 EXP_ID\n\n";
-}
-my $expid = shift @ARGV;        # Exposure id
 
 
@@ -106 +116 @@
 
 # Output results to the database
-{
+unless ($no_update) {
     my $command = "$p0tool -updateexp -exp_id $expid"; # Command to execute to update exposure parameters