Changeset 30926

Timestamp:

Mar 16, 2011, 12:13:32 PM (15 years ago)

Author:

bills

Message:

In distribution, handle case where a poor quality component has no config dump file.

Location:

tags/ipp-20110218/ippScripts/scripts

Files:

• dist_bundle.pl (modified) (8 diffs, 1 prop)
• dist_component.pl (modified) (4 diffs, 1 prop)

tags/ipp-20110218/ippScripts/scripts/dist_bundle.pl

@@ -70 +70 @@
 
 # Parse the command-line arguments
-my ($camera, $stage, $stage_id, $component, $path_base, $chip_path_base, $alt_path_base, $clean);
+my ($camera, $stage, $stage_id, $component, $path_base, $chip_path_base, $alt_path_base, $clean, $exp_type);
 my ($outroot, $run_state, $data_state, $magicked, $no_magic, $poor_quality, $results_file, $prefix);
 my ($dbname, $save_temps, $verbose, $no_update, $logfile);
@@ -89 +89 @@
            'alt_path_base=s'=> \$alt_path_base,  # path to alternate inputs
            'outroot=s'      => \$outroot,    # outroot
+           'exp_type=s'     => \$exp_type,   # exp_type (only used for raw stage
            'prefix=s'       => \$prefix,     # "prefix" to apply to filenames
            'clean'          => \$clean,      # create clean distribution
@@ -99 +100 @@
 
 pod2usage( -msg => "Unknown option: @ARGV", -exitval => 2 ) if @ARGV;
-pod2usage( -msg => "Required options: --camera --stage --stage_id --component --path_base --outroot",
+pod2usage( -msg => "Required options: --camera --stage --stage_id --component --exp_type --path_base --outroot",
            -exitval => 3) unless
     defined $camera and
@@ -105 +106 @@
     defined $stage_id and
     defined $component and
+    defined $exp_type and
     defined $path_base and
     defined $outroot;
@@ -110 +112 @@
 $ipprc->redirect_output($logfile) if $logfile;
 
-if (($stage eq 'raw') and !$clean and !defined $chip_path_base) {
-    pod2usage( -msg => "Required options: --chip_path_base for raw stage", -exitval => 3);
+if ($stage eq 'raw' and !$clean and !$no_magic) {
+    # need to be able to find chip mask file
+    if ($exp_type eq 'OBJECT' and !defined $chip_path_base) {
+        pod2usage( -msg => "Required options: --chip_path_base for raw stage", -exitval => 3);
+    }
 }
 
@@ -123 +128 @@
 my $file_list = get_file_list($stage, $component, $path_base, $clean);
 
-if (($stage ne 'raw') and ($stage ne 'fake')) {
+if (($stage ne 'raw') and ($stage ne 'fake') and !$poor_quality) {
     # If the file list is empty it is an error because we should at least get a config dump file
     # except for fake stage which doesn't do anything yet
@@ -493 +498 @@
             push @file_list, \%image;
 
-            my %burntool_table;
-            $burntool_table{file_rule} = "BURNTOOL.TABLE";
-            $burntool_table{name} = "$path_base.burn.tbl";
-            push @file_list, \%burntool_table;
+            if ($exp_type eq 'OBJECT' and $camera eq 'GPC1') {
+                my %burntool_table;
+                $burntool_table{file_rule} = "BURNTOOL.TABLE";
+                $burntool_table{name} = "$path_base.burn.tbl";
+                push @file_list, \%burntool_table;
+            }
         }
         return \@file_list;
@@ -541 +548 @@
     my $resolved = $ipprc->file_resolve($config_file);
 
+    if (!$resolved and $poor_quality) {
+        print STDERR "non config file found but continuing since component has poor quality\n";
+        return undef
+    }
     &my_die("failed to resolve name of config dump file: $config_file_rule", $component,
                     $PS_EXIT_CONFIG_ERROR) if (!$resolved);

tags/ipp-20110218/ippScripts/scripts/dist_component.pl

@@ -37 +37 @@
 # Parse the command-line arguments
 my ($dist_id, $camera, $stage, $stage_id, $component, $path_base, $chip_path_base, $clean, $alt_path_base);
-my ($outdir, $run_state, $data_state, $magicked, $no_magic, $poor_quality);
+my ($outdir, $run_state, $data_state, $magicked, $no_magic, $poor_quality, $exp_type);
 my ($dbname, $save_temps, $verbose, $no_update, $logfile);
 
@@ -53 +53 @@
            'no_magic'       => \$no_magic,   # magic is not required for this distribution run
            'magicked'       => \$magicked,   # magicked state for this component
+           'exp_type=s'     => \$exp_type,
            'alt_path_base=s'=> \$alt_path_base,  # path to alternate inputs
            'outdir=s'       => \$outdir,     # "directory" for outputs
@@ -81 +82 @@
 $temproot = "/tmp" if !defined $temproot;
 
-if (($stage eq 'raw') and !$clean and !defined $chip_path_base) {
-    pod2usage( -msg => "Required options: --chip_path_base for raw stage", -exitval => 3);
+if (($stage eq 'raw') and !$clean and !(defined $chip_path_base and defined $exp_type)) {
+    pod2usage( -msg => "Required options: --chip_path_base --exp_type for raw stage", -exitval => 3);
 }
 
@@ -105 +106 @@
     $command .= " --magicked" if defined $magicked;
     $command .= " --alt_path_base $alt_path_base" if defined $alt_path_base;
+    $command .= " --exp_type $exp_type" if defined $exp_type;
     $command .= " --clean" if defined $clean;
     $command .= " --save-temps" if defined $save_temps;