Changeset 31948

Timestamp:

Jul 28, 2011, 2:51:52 PM (15 years ago)

Author:

watersc1

Message:

Move handling of dropped exposures to fix bad counting.

File:

• tags/ipp-20110622/ippScripts/scripts/lap_science.pl (modified) (6 diffs)

tags/ipp-20110622/ippScripts/scripts/lap_science.pl

@@ -464 +464 @@
         my $companion;
 
+        if  ($exposure->{data_state} eq 'drop') { # This exposure is impossible, so fudge the counts so we get through.
+            $can_qstack ++;
+            $can_diff ++;
+            $have_diff ++;
+            $can_fstack ++;         
+            next;
+        }
+
         if ($exposure->{pairwise}) {
             # Load companion exposure information
@@ -486 +494 @@
             $exposure = remake_this_exposure($exposure);
         }
+
+
         # Do quality checks here
         my $is_bad_quality = 0;
@@ -530 +540 @@
             $exposure->{data_state} = 'drop';
             &update_this_exposure($exposure);
-
         }
         
-        if  ($exposure->{data_state} eq 'drop') { # This exposure is impossible, so fudge the counts so we get through.
-            $can_qstack ++;
-            $can_diff ++;
-            $have_diff ++;
-            $can_fstack ++;         
-            next;
-        }
-
         if (($exposure->{warpRun_state})&&  # This exposure has a warp
             ($exposure->{warpRun_state} eq 'full')) { # This exposure's warp is done.
@@ -572 +573 @@
     print "\n";
     if ($do_nothing) {
+        print "STATUS: Doing nothing.\n";
         exit(0);
     }
@@ -585 +587 @@
                 &update_this_exposure($exposure);
             }
+            $needs_qstack = 0;
         }
         else {
@@ -621 +624 @@
         }
     }
+    print "STATUS: Exiting\n";
     print "\n";
     return(0);