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

Timestamp:

Jul 24, 2013, 5:29:24 PM (13 years ago)

Author:

watersc1

Message:

Updated skycell_jpeg.pl to correctly skip undoable things, and to pass wcsref to the new ppSkycell code. Split masks and images, as doing them simultaneously makes ppSkycell unusably slow (it's no longer a reasonably simple copy operation)

File:

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

trunk/ippScripts/scripts/lap_science.pl

@@ -309 +309 @@
     my $magicDS_update_cmd  = "magicdstool -setfiletoupdate -magic_ds_id $chip_magicDS_id -set_label $label";
     $magicDS_update_cmd    .= " -dbname $dbname " if defined $dbname;
+    my $warptool_preupdate_cmd = "warptool -revertwarped -warp_id $warp_id -fault 26";
+    $warptool_preupdate_cmd .= " -dbname $dbname " if defined $dbname;
     my $warptool_update_cmd = "warptool -setskyfiletoupdate -warp_id $warp_id -set_label $label";
     $warptool_update_cmd   .= " -dbname $dbname " if defined $dbname;
@@ -339 +341 @@
 #               }
 #             }
+        }
+
+
+        ($success, $error_code, $full_buf, $stdout_buf, $stderr_buf ) =
+            run(command => $warptool_preupdate_cmd, verbose => $verbose);
+        unless ($success) {
+            $error_code = (($error_code >> 8) or $PS_EXIT_PROG_ERROR);
+            &my_die("Unable to perform warptool --revertwarped: $error_code", $exposure->{exp_id}, $data_group);
         }