Changeset 36680 for branches/eam_branches/ps2-tc3-20130727/ippScripts/scripts/stack_skycell.pl

Timestamp:

Apr 21, 2014, 5:42:34 AM (12 years ago)

Author:

eugene

Message:

merge changes from trunk

Location:

branches/eam_branches/ps2-tc3-20130727

Files:

• . (modified) (1 prop)
• ippScripts/scripts/stack_skycell.pl (modified) (5 diffs)

branches/eam_branches/ps2-tc3-20130727/ippScripts/scripts/stack_skycell.pl

@@ -40 +40 @@
 }
 
-my ($stack_id, $dbname, $outroot, $debug, $run_state, $threads, $reduction, $verbose, $no_update, $no_op, $redirect, $save_temps);
+my ($stack_id, $dbname, $outroot, $debug, $run_state, $threads, $reduction, $verbose, $no_update, $no_op, $redirect, $save_temps, $delete_convolved_images);
 GetOptions(
     'stack_id|d=s'      => \$stack_id, # Stack identifier
@@ -55 +55 @@
     'redirect-output'   => \$redirect,
     'save-temps'        => \$save_temps, # Save temporary files?
+    'delete-convolved'  => \$delete_convolved_images,
 ) or pod2usage( 2 );
 
@@ -92 +93 @@
 );
 
+
 my $ipprc = PS::IPP::Config->new() or my_die( "Unable to set up", $stack_id, $PS_EXIT_CONFIG_ERROR ); # IPP configuration
 $| = 1;
@@ -299 +301 @@
         $command .= " -F PPSTACK.OUTPUT.VARIANCE PPSTACK.OUTPUT.VARIANCE.NOCOMP";
         $command .= " -F PPSTACK.OUTPUT.EXPWT PPSTACK.OUTPUT.EXPWT.NOCOMP";
+        $command .= " -F PPSTACK.OUTPUT.EXP PPSTACK.OUTPUT.EXP.NOCOMP";
         $command .= " -F PPSTACK.UNCONV PPSTACK.UNCONV.NOCOMP";
         $command .= " -F PPSTACK.UNCONV.VARIANCE PPSTACK.UNCONV.VARIANCE.NOCOMP";
         $command .= " -F PPSTACK.UNCONV.EXPWT PPSTACK.UNCONV.EXPWT.NOCOMP";
+        $command .= " -F PPSTACK.UNCONV.EXP PPSTACK.UNCONV.EXP.NOCOMP";
     }
     if ($output_logflux) {
@@ -358 +362 @@
 
     if (!$quality) {
+        
+
         check_outputs(\@outputFiles, $replicate_outputs);
+
+        if (($convolve)&&($delete_convolved_images)) { # We made convolved products, but do not wish to keep them anymore
+            my @products_to_clear = ('PPSTACK.OUTPUT',
+                                     'PPSTACK.OUTPUT.MASK',
+                                     'PPSTACK.OUTPUT.VARIANCE',
+                                     'PPSTACK.OUTPUT.EXP',
+                                     'PPSTACK.OUTPUT.EXPNUM',
+                                     'PPSTACK.OUTPUT.EXPWT');
+            foreach my $product (@products_to_clear) {
+                my $file = $ipprc->filename($product,$outroot,$skycell_id);
+                print "Deleting unwanted convolved product: $file\n";
+                my $error= $ipprc->kill_file($file);
+                if ($error_code) {
+                    print "Failed to delete unwanted convolved product: $error_code\n";
+                }
+            }
+        }
+
     }