Changeset 9103

Timestamp:

Oct 2, 2006, 12:32:58 PM (20 years ago)

Author:

Paul Price

Message:

Fixing --no-update.

File:

• trunk/ippScripts/scripts/detrend_reject_exp.pl (modified) (2 diffs)

trunk/ippScripts/scripts/detrend_reject_exp.pl

@@ -67 +67 @@
     my ( $success, $error_code, $full_buf, $stdout_buf, $stderr_buf ) =
         run(command => $command, verbose => 1);
-    die "Unable to perform dettool -processed: $error_code\n" if not $success;
+    die "Unable to perform dettool -residexp: $error_code\n" if not $success;
     my $metadata = $mdcParser->parse(join "", @$stdout_buf)
         or die "unable to parse metadata config doc";
@@ -103 +103 @@
 
 # Go through again to do rejection, and update the database for each exposure
-my $numRejected = 0;            # Number of exposures rejected
-for (my $i = 0; $i < scalar @means; $i++) {
-    my $expTag = $expTags[$i];  # Exposure ID
-    my $command = "$dettool -updateresidexp -det_id $det_id -iteration $iter -exp_tag $expTag"; # Command to run
-    my $reject = 0;             # Reject this exposure?
-    if (defined REJECT_MEAN->{$det_type} and
-        defined $meanStats->standard_deviation() and
-        $meanStats->standard_deviation() > 0 and
-        ($means[$i] - $meanStats->mean()) / $meanStats->standard_deviation() > REJECT_MEAN->{$det_type}) {
-        print "Rejecting $expTag based on bad mean: " .
-            (($means[$i] - $meanStats->mean()) / $meanStats->standard_deviation()) .
-            " vs " . REJECT_MEAN->{$det_type} . "\n";
-        $reject = 1;
-    } elsif (defined REJECT_STDEV->{$det_type} and
-             defined $stdevStats->standard_deviation() and
-             $stdevStats->standard_deviation() > 0 and
-             ($stdevs[$i] - $stdevStats->mean()) / $stdevStats->standard_deviation() >
-             REJECT_STDEV->{$det_type}) {
-        print "Rejecting $expTag based on bad stdev: " .
-            (($stdevs[$i] - $stdevStats->mean()) / $stdevStats->standard_deviation()) .
-            " vs " . REJECT_STDEV->{$det_type} . "\n";
-        $reject = 1;
-    } elsif (defined REJECT_MEAN_STDEV->{$det_type} and
-             defined $meanStdevStats->standard_deviation() and 
-             $meanStdevStats->standard_deviation() > 0 and
-             ($meanStdevs[$i] - $meanStdevStats->mean()) / $meanStdevStats->standard_deviation() >
-             REJECT_MEAN_STDEV->{$det_type}) {
-        print "Rejecting $expTag based on bad stdev: " .
-            (($meanStdevs[$i] - $meanStdevStats->mean()) / $meanStdevStats->standard_deviation()) .
-            " vs " . REJECT_MEAN_STDEV->{$det_type} . "\n";
-        $reject = 1;
+unless ($no_update) {
+    my $numRejected = 0;                # Number of exposures rejected
+    for (my $i = 0; $i < scalar @means; $i++) {
+        my $expTag = $expTags[$i];      # Exposure ID
+        my $command = "$dettool -updateresidexp -det_id $det_id -iteration $iter -exp_tag $expTag"; # Command to run
+        my $reject = 0;         # Reject this exposure?
+        if (defined REJECT_MEAN->{$det_type} and
+            defined $meanStats->standard_deviation() and
+            $meanStats->standard_deviation() > 0 and
+            ($means[$i] - $meanStats->mean()) / $meanStats->standard_deviation() > REJECT_MEAN->{$det_type}) {
+            print "Rejecting $expTag based on bad mean: " .
+                (($means[$i] - $meanStats->mean()) / $meanStats->standard_deviation()) .
+                " vs " . REJECT_MEAN->{$det_type} . "\n";
+            $reject = 1;
+        } elsif (defined REJECT_STDEV->{$det_type} and
+                 defined $stdevStats->standard_deviation() and
+                 $stdevStats->standard_deviation() > 0 and
+                 ($stdevs[$i] - $stdevStats->mean()) / $stdevStats->standard_deviation() >
+                 REJECT_STDEV->{$det_type}) {
+            print "Rejecting $expTag based on bad stdev: " .
+                (($stdevs[$i] - $stdevStats->mean()) / $stdevStats->standard_deviation()) .
+                " vs " . REJECT_STDEV->{$det_type} . "\n";
+            $reject = 1;
+        } elsif (defined REJECT_MEAN_STDEV->{$det_type} and
+                 defined $meanStdevStats->standard_deviation() and 
+                 $meanStdevStats->standard_deviation() > 0 and
+                 ($meanStdevs[$i] - $meanStdevStats->mean()) / $meanStdevStats->standard_deviation() >
+                 REJECT_MEAN_STDEV->{$det_type}) {
+            print "Rejecting $expTag based on bad stdev: " .
+                (($meanStdevs[$i] - $meanStdevStats->mean()) / $meanStdevStats->standard_deviation()) .
+                " vs " . REJECT_MEAN_STDEV->{$det_type} . "\n";
+            $reject = 1;
+        }
+        
+        if ($reject) {
+            $command .= ' -reject';
+            ### XXX: Need some way to know whether the exposure has already been rejected.
+            ### rejection flag in $exposures?
+            $numRejected++;
+        }
+        
+        # Update 
+        my ( $success, $error_code, $full_buf, $stdout_buf, $stderr_buf ) =
+            run(command => $command, verbose => 1);
+        die "Unable to perform dettool -updateresidexp: $error_code\n" if not $success;
     }
 
-    if ($reject) {
-        $command .= ' -reject';
-        ### XXX: Need some way to know whether the exposure has already been rejected.
-        ### rejection flag in $exposures?
-        $numRejected++;
+    # Decide if the current is sufficient to use as a master, and if we can stop iterating
+    my $master = 1;                     # This is good enough for a master
+    my $stop = 1;                       # Stop iterating
+    # XXX: This probably isn't sufficient, but will do for now:
+    if ($numRejected > 0) {
+        $master = 0;
+        $stop = 0;
     }
 
-    # Update 
-    my ( $success, $error_code, $full_buf, $stdout_buf, $stderr_buf ) =
-        run(command => $command, verbose => 1);
-    die "Unable to perform dettool -updateresidexp: $error_code\n" if not $success;
-}
-
-# Decide if the current is sufficient to use as a master, and if we can stop iterating
-my $master = 1;                 # This is good enough for a master
-my $stop = 1;                   # Stop iterating
-# XXX: This probably isn't sufficient, but will do for now:
-if ($numRejected > 0) {
-    $master = 0;
-    $stop = 0;
-}
-
-# Put the result into the database
-unless ($no_update) {
+    # Put the result into the database
     {
         my $command = "$dettool -adddetrunsummary -det_id $det_id -iteration $iter " .