Changeset 37025 for branches/eam_branches/ipp-20140610/ippScripts/scripts/sc_prepare_warp.pl

Timestamp:

Jul 16, 2014, 3:29:14 PM (12 years ago)

Author:

eugene

Message:

merge changes from trunk

File:

• branches/eam_branches/ipp-20140610/ippScripts/scripts/sc_prepare_warp.pl (modified) (3 diffs)

branches/eam_branches/ipp-20140610/ippScripts/scripts/sc_prepare_warp.pl

@@ -27 +27 @@
 my $max_time      = 8;                      # longest allocation to ask for
 my $remote_hostname= "LANL/Mustang";         # Name of the remote node.
-my @return_component_list = ("DBINFO.EXP", "PSWARP.CONFIG", "PSWARP.OUTPUT", "PSWARP.OUTPUT.MASK", "PSWARP.OUTPUT.VARIANCE", "PSWARP.OUTPUT.SOURCES","LOG.EXP","TRACE.EXP");
+my @return_component_list = ("DBINFO.EXP", "PSWARP.CONFIG", "PSWARP.OUTPUT", "PSWARP.OUTPUT.MASK", "PSWARP.OUTPUT.VARIANCE", "PSWARP.OUTPUT.SOURCES","PSPHOT.PSF.SAVE","LOG.EXP","TRACE.EXP");
 # Look for programs we need
 my $missing_tools;
@@ -118 +118 @@
     # This actually returns all the individual warp/skyfiles that comprise this run.  Because consistency.
     my $command = "$warptool -towarped -warp_id $warp_id ";
+    $command   .= " -dbname $dbname " if defined($dbname);
     ( $success, $error_code, $full_buf, $stdout_buf, $stderr_buf ) =
         run(command => $command, verbose => 0);
@@ -366 +367 @@
     
     if (defined $id and not $no_update) {
-        my $command = "remotetool -updaterun -stage_id $id";
+        my $command = "remotetool -updaterun -remote_id $id";
         $command .= " -fault $exit_code " if defined $exit_code;
         $command .= " -set_state $exit_state " if defined $exit_state;