Changeset 28732

Timestamp:

Jul 28, 2010, 1:05:21 PM (16 years ago)

Author:

bills

Message:

support for bundling chip_bg and warp_bg stages

File:

• trunk/ippScripts/scripts/dist_bundle.pl (modified) (7 diffs)

trunk/ippScripts/scripts/dist_bundle.pl

@@ -237 +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;
+        }
     }
 
@@ -254 +256 @@
     }
 
-    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;
@@ -266 +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;
@@ -345 +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};
@@ -351 +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};
@@ -420 +436 @@
     if ($stage eq "chip") {
         $config_file_rule = "PPIMAGE.CONFIG";
-    } elsif ($stage eq "chip") {
+    } elsif ($stage eq "chip_bg") {
         $config_file_rule = "PPBACKGROUND.CONFIG";
     } elsif ($stage eq "camera") {
@@ -430 +446 @@
         $config_file_rule = "PSWARP.CONFIG";
     } elsif ($stage eq "warp_bg") {
-        $config_file_rule = "PSWARP.CONFIG";
+        $config_file_rule = "PPBACKGROUND.CONFIG";
     } elsif ($stage eq "diff") {
         $config_file_rule = "PPSUB.CONFIG";