Changeset 28981 for branches/eam_branches/ipp-20100621/ippScripts/scripts/dist_bundle.pl

Timestamp:

Aug 19, 2010, 6:52:05 PM (16 years ago)

Author:

eugene

Message:

updates from trunk

File:

• branches/eam_branches/ipp-20100621/ippScripts/scripts/dist_bundle.pl (modified) (6 diffs)

branches/eam_branches/ipp-20100621/ippScripts/scripts/dist_bundle.pl

@@ -53 +53 @@
                       'PPSTACK.OUTPUT.MASK' => 'mask',
                       'PPSTACK.OUTPUT.VARIANCE' => 'variance' );
+my %sky_cleaned   = ( 'PSPHOT.STACK.OUTPUT.IMAGE' => 'image',
+                      'PSPHOT.STACK.OUTPUT.MASK' => 'mask',
+                      'PSPHOT.STACK.OUTPUT.VARIANCE' => 'variance' );
 
 
@@ -58 +61 @@
 my $missing_tools;
 my $streaksrelease   = can_run('streaksrelease') or (warn "Can't find streaksrelease" and $missing_tools = 1);
+my $bgtool   = can_run('bgtool') or (warn "Can't find bgtool" and $missing_tools = 1);
 if ($missing_tools) {
     warn("Can't find required tools.");
@@ -224 +228 @@
 }
 
+if (!$clean) {
+    if ($stage eq 'chip_bg') {
+        # add the variance file from the original chipRun
+        my $command = "$bgtool -listchip -chip_bg_id $stage_id -class_id $component";
+        $command .= " -dbname $dbname" if $dbname;
+        my ( $success, $error_code, $full_buf, $stdout_buf, $stderr_buf ) =
+            run(command => $command, verbose => $verbose);
+        unless ($success) {
+            $error_code = (($error_code >> 8) or $PS_EXIT_PROG_ERROR);
+            &my_die("Unable to perform $command: $error_code", $component, $error_code);
+        }
+        my $mdcParser = PS::IPP::Metadata::Config->new; 
+        my $list = $mdcParser->parse( join "", @$stdout_buf) or 
+            &my_die("Unable to parse bgtool metadata", $component, $PS_EXIT_SYS_ERROR);
+        my $parsed = parse_md_list($list);
+
+        # result is an array with one element
+        my $chip_data = $parsed->[0];
+
+        my $chip_path_base = $chip_data->{path_base};
+        $variance = $ipprc->filename('PPIMAGE.CHIP.VARIANCE', $chip_path_base, $component) or
+            &my_die("Unable to resolve variance file name from $chip_path_base", $component, $PS_EXIT_SYS_ERROR);
+
+    } elsif ($stage eq 'warp_bg') {
+        # add the variance file from the original warpRun
+        my $command = "$bgtool -listwarp -warp_bg_id $stage_id -skycell_id $component";
+        $command .= " -dbname $dbname" if $dbname;
+        my ( $success, $error_code, $full_buf, $stdout_buf, $stderr_buf ) =
+            run(command => $command, verbose => $verbose);
+        unless ($success) {
+            $error_code = (($error_code >> 8) or $PS_EXIT_PROG_ERROR);
+            &my_die("Unable to perform $command: $error_code", $component, $error_code);
+        }
+        my $mdcParser = PS::IPP::Metadata::Config->new; 
+        my $list = $mdcParser->parse( join "", @$stdout_buf) or 
+            &my_die("Unable to parse bgtool metadata", $component, $PS_EXIT_SYS_ERROR);
+        my $parsed = parse_md_list($list);
+        my $warp_data = $parsed->[0];
+        my $warp_path_base = $warp_data->{path_base};
+        $variance = $ipprc->filename('PSWARP.OUTPUT.VARIANCE', $warp_path_base) or
+            &my_die("Unable to resolve variance file name from $warp_path_base", $component, $PS_EXIT_SYS_ERROR);
+    }
+}
+
 if ($nan_masked_pixels) {
     # One last check as to whether magic has been applied to the inputs
@@ -239 +287 @@
         if (($stage ne "chip_bg") and ($stage ne "warp_bg")) {
             &my_die("no variance image found in file list", $component, $PS_EXIT_CONFIG_ERROR) if !$variance;
+        } else {
+            &my_die("variance is not defined", $component, $PS_EXIT_CONFIG_ERROR) if !$variance;
         }
     }
@@ -373 +423 @@
     } elsif ($stage eq "stack") {
         $type = $stack_cleaned{$rule};
+    } elsif ($stage eq "sky") {
+        $type = $sky_cleaned{$rule};
     } else {
         &my_die("$stage is not a valid stage", $component, $PS_EXIT_CONFIG_ERROR);
@@ -453 +505 @@
     } elsif ($stage eq "stack") {
         $config_file_rule = "PPSTACK.CONFIG";
+    } elsif ($stage eq "sky") {
+        $config_file_rule = "PSPHOT.STACK.CONFIG";
     } else {
         &my_die("$stage is not a valid stage", $component, $PS_EXIT_CONFIG_ERROR);