Changeset 37242 for branches/eam_branches/ipp-20140717/ippScripts/scripts/sc_prepare_stack.pl

Timestamp:

Aug 12, 2014, 3:55:38 PM (12 years ago)

Author:

eugene

Message:

merge changes from trunk

File:

• branches/eam_branches/ipp-20140717/ippScripts/scripts/sc_prepare_stack.pl (modified) (4 diffs)

branches/eam_branches/ipp-20140717/ippScripts/scripts/sc_prepare_stack.pl

@@ -18 +18 @@
 
 # Hard coded values
-my $remote_root   = '/scratch3/watersc1/';  # Far side destination base location
+#my $remote_root   = '/scratch3/watersc1/';  # Far side destination base location
+my $remote_root   = '/lustre/scratch1/turquoise/watersc1/ps1/'; # Far side destination base location
+$remote_root = '/scratch3/watersc1/';
 my $threads       = 2;                      # How many threads are we going to use?
 my $job_cost      = 1500 / 60 / 60;           # Estimate of how long a job runs, in hours.
@@ -29 +31 @@
 my @return_component_list = ("DBINFO.EXP", "PPSTACK.UNCONV","PPSTACK.UNCONV.MASK","PPSTACK.UNCONV.VARIANCE",
                              "PPSTACK.UNCONV.EXP","PPSTACK.UNCONV.EXPWT","PPSTACK.UNCONV.EXPNUM","PSPHOT.OUTPUT",
-                             "LOG.EXP","TRACE.EXP", "PSASTRO.STATS",
-                             "PPSTACK.CONFIG","PPSTACK.TARGET.PSF");
+                             "LOG.EXP", "PSASTRO.STATS",
+                             "PPSTACK.CONFIG","PPSTACK.TARGET.PSF","PSPHOT.STACK.PSF.SAVE");
 #,"PPSTACK.CONV.KERNEL");
 # Look for programs we need
@@ -147 +149 @@
     # This actually returns all the individual stack/skyfiles that comprise this run.  Because consistency.
     my $command = "$stacktool -inputskyfile -stack_id $stack_id ";
-
+    $command .= " -dbname $dbname " if defined($dbname);
     ( $success, $error_code, $full_buf, $stdout_buf, $stderr_buf ) =
         run(command => $command, verbose => 0);
@@ -208 +210 @@
         my ($ipp_disk, $remote_disk) = uri_to_outputs_for_return( $filename);
         my $remote_outroot_dir = dirname($ipp_disk);
-        print CONFIG " && mkdir -p ${remote_root}/tmp/${remote_outroot_dir} && ln -sf $remote_disk ${remote_root}/tmp/${ipp_disk} ";
+        print CONFIG " && mkdir -p ${remote_root}/tmp/${remote_outroot_dir} && ln -sf $remote_disk ${remote_root}/tmp/${ipp_disk} && touch $remote_disk ";
     }