Changeset 32430 for trunk/ippScripts/scripts/lap_science.pl

Timestamp:

Sep 21, 2011, 3:02:32 PM (15 years ago)

Author:

watersc1

Message:

Incorrect handling of exposures we need to wait to diff. They are
marked inactive and then cleaned, which isn't necessarily the correct
option.

File:

• trunk/ippScripts/scripts/lap_science.pl (modified) (3 diffs)

trunk/ippScripts/scripts/lap_science.pl

@@ -233 +233 @@
     }
     if ($chip_magicDS_id == 0) {
-        return(&remake_this_exposure($exposure));
+#       return(&remake_this_exposure($exposure));
     }
 
@@ -275 +275 @@
         &my_die("Unable to perform chiptool -setimfiletoupdate: $error_code", $exposure->{exp_id}, $data_group);
     }
-
-    ($success, $error_code, $full_buf, $stdout_buf, $stderr_buf ) =
-        run(command => $magicDS_update_cmd, verbose => $verbose);
-    unless ($success) {
-        $error_code = (($error_code >> 8) or $PS_EXIT_PROG_ERROR);
-        &my_die("Unable to perform magicdstool -setfiletoupdate: $error_code", $exposure->{exp_id}, $data_group);
+    if ($chip_magicDS_id != 0) {    
+        ($success, $error_code, $full_buf, $stdout_buf, $stderr_buf ) =
+            run(command => $magicDS_update_cmd, verbose => $verbose);
+        unless ($success) {
+            $error_code = (($error_code >> 8) or $PS_EXIT_PROG_ERROR);
+            &my_die("Unable to perform magicdstool -setfiletoupdate: $error_code", $exposure->{exp_id}, $data_group);
+        }
     }
 
@@ -1183 +1184 @@
     my $exposures = shift;
     foreach my $exposure (@$exposures) {
-        unless ($exposure->{private} == 1) {
+        if ($exposure->{private} == 1) {  # This can probably be relaxed since we can update an undestreaked warp.
+            $exposure->{active} = 1;
+        }
+        else {
             $exposure->{active} = 0;
-            update_this_exposure($exposure);
-        }
+        }
+        update_this_exposure($exposure);        
     }
 }