Changeset 35907

Timestamp:

Aug 7, 2013, 3:57:45 PM (13 years ago)

Author:

watersc1

Message:

Make register_imfile less verbose. Make ipp_cleanup delete diff stage b1jpegs for now.

Location:

tags/ipp-20130712/ippScripts/scripts

Files:

• ipp_cleanup.pl (modified) (1 diff)
• register_imfile.pl (modified) (2 diffs)

tags/ipp-20130712/ippScripts/scripts/ipp_cleanup.pl

@@ -933 +933 @@
             addFilename(\@files, "PPSUB.REF.CONV.VARIANCE", $path_base, $skycell_id);
 
+            addFilename(\@files, "PPSUB.OUTPUT.JPEG1", $path_base, $skycell_id);
+
             if ($mode eq "goto_purged") {
                 # additional files to remove for 'purge' mode
                 addFilename(\@files, "PPSUB.OUTPUT.KERNELS", $path_base, $skycell_id);
-                addFilename(\@files, "PPSUB.OUTPUT.JPEG1", $path_base, $skycell_id);
                 addFilename(\@files, "PPSUB.OUTPUT.JPEG2", $path_base, $skycell_id);
                 # Commented out to match warp files.

tags/ipp-20130712/ippScripts/scripts/register_imfile.pl

@@ -291 +291 @@
 
     my ( $success, $error_code, $full_buf, $stdout_buf, $stderr_buf ) =
-        run ( command => $bt_check_command, verbose => $verbose);
+        run ( command => $bt_check_command, verbose => 0); 
     unless ($success) {
         $error_code = (($error_code >> 8) or $PS_EXIT_PROG_ERROR);
@@ -341 +341 @@
         $apply_command .= " --class_id $class_id --exp_id $exp_id ";
         $apply_command .= " --this_uri $burntool_data->{uri} ";
+        $apply_command .= " --camera GPC1 "; # hack, but we're only going to get here if we're GPC1.
         $apply_command .= " --previous_uri $burntool_data->{previous_uri} " if defined $burntool_data->{previous_uri};
         $apply_command .= " --imfile_state $burntool_data->{imfile_state} ";