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

Timestamp:

Jul 30, 2010, 9:31:50 AM (16 years ago)

Author:

eugene

Message:

updates from trunk

File:

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

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

@@ -35 +35 @@
                      'PPIMAGE.CHIP.MASK' => 'mask',
                      'PPIMAGE.CHIP.VARIANCE' => 'variance' );
+my %chip_bg_cleaned = ( 'PPBACKGROUND.OUTPUT' => 'image',
+                        'PPBACKGROUND.OUTPUT.MASK' => 'mask' );
 my %camera_cleaned = ( 'PSASTRO.OUTPUT.MASK' => 'mask' );
 my %fake_cleaned;
@@ -40 +42 @@
                      'PSWARP.OUTPUT.MASK' => 'mask',
                      'PSWARP.OUTPUT.VARIANCE' => 'variance' );
+my %warp_bg_cleaned = ( 'PSWARP.OUTPUT' => 'image',
+                        'PSWARP.OUTPUT.MASK' => 'mask' );
 my %diff_cleaned = ( 'PPSUB.OUTPUT' => 'image',
                      'PPSUB.OUTPUT.MASK' => 'mask',
@@ -233 +237 @@
     if ($stage ne "raw") {
         &my_die("no mask image found in file list", $component, $PS_EXIT_CONFIG_ERROR) if !$mask;
-        &my_die("no variance image found in file list", $component, $PS_EXIT_CONFIG_ERROR) if !$variance;
+        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;
+        }
     }
 
@@ -246 +252 @@
         my $fh = open_with_retries($mask_resolved);
         close $fh;
-    } elsif ($stage eq "chip") {
+    } elsif ($stage eq "chip" or $stage eq "chip_bg") {
         $class_id = $component;
     }
 
-    my $command = "$streaksrelease -stage $stage -image $image -outroot $tmpdir";
+    my $release_stage;
+    if ($stage eq "chip_bg") {
+        $release_stage = 'chip';
+    } elsif ($stage eq 'warp_bg') {
+        $release_stage = 'warp';
+    } else {
+        $release_stage = $stage;
+    }
+
+
+    my $command = "$streaksrelease -stage $release_stage -image $image -outroot $tmpdir";
     $command .= " -class_id $class_id" if $class_id;
     $command .= " -mask $mask" if $mask;
@@ -262 +278 @@
     }
     if ($inv_image) {
-        $command = "$streaksrelease -stage $stage -image $inv_image -outroot $tmpdir";
+        $command = "$streaksrelease -stage $release_stage -image $inv_image -outroot $tmpdir";
         $command .= " -mask $inv_mask" if $inv_mask;
         $command .= " -weight $inv_variance" if $inv_variance;
@@ -341 +357 @@
     } elsif ($stage eq "chip") {
         $type = $chip_cleaned{$rule};
+    } elsif ($stage eq "chip_bg") {
+        $type = $chip_bg_cleaned{$rule};
     } elsif ($stage eq "camera") {
         $type = $camera_cleaned{$rule};
@@ -347 +365 @@
     } elsif ($stage eq "warp") {
         $type = $warp_cleaned{$rule};
+    } elsif ($stage eq "warp_bg") {
+        $type = $warp_bg_cleaned{$rule};
     } elsif ($stage eq "diff") {
         $type = $diff_cleaned{$rule};
@@ -416 +436 @@
     if ($stage eq "chip") {
         $config_file_rule = "PPIMAGE.CONFIG";
+    } elsif ($stage eq "chip_bg") {
+        $config_file_rule = "PPBACKGROUND.CONFIG";
     } elsif ($stage eq "camera") {
         $config_file_rule = "PSASTRO.CONFIG";
@@ -422 +444 @@
         return \@file_list;
     } elsif ($stage eq "warp") {
+        $config_file_rule = "PSWARP.CONFIG";
+    } elsif ($stage eq "warp_bg") {
         $config_file_rule = "PSWARP.CONFIG";
     } elsif ($stage eq "diff") {