Changeset 27838 for branches/tap_branches/ippScripts/scripts/chip_imfile.pl

Timestamp:

May 3, 2010, 8:41:49 AM (16 years ago)

Author:

eugene

Message:

updates from trunk

Location:

branches/tap_branches

Files:

• . (modified) (1 prop)
• ippScripts/scripts/chip_imfile.pl (modified) (12 diffs)

branches/tap_branches/ippScripts/scripts/chip_imfile.pl

@@ -8 +8 @@
 use Sys::Hostname;
 my $host = hostname();
+my $date = `date`;
 print "\n\n";
-print "Starting script $0 on $host\n\n";
+print "Starting script $0 on $host at $date\n\n";
 
 use DateTime;
@@ -53 +54 @@
     'reduction=s'       => \$reduction, # Reduction class
     'run-state=s'       => \$run_state, # current state of the run (new, update)
-    'magicked'          => \$magicked,  # magicked state of input file
+    'magicked=s'        => \$magicked,  # magicked state of input file
     'deburned=s'        => \$deburned,  # does deburned image exist?
     'threads=s'         => \$threads,   # Number of threads to use for ppImage
@@ -134 +135 @@
     $command = "$ppConfigDump -camera $camera -dump-recipe PPIMAGE -recipe PPIMAGE $recipe_ppImage -";
     my ( $success, $error_code, $full_buf, $stdout_buf, $stderr_buf ) =
-        run(command => $command, verbose => $verbose);
+        run(command => $command, verbose => 0);
     unless ($success) {
         $error_code = (($error_code >> 8) or $PS_EXIT_PROG_ERROR);
@@ -146 +147 @@
 
     if ($useDeburnedImage) {
-        my $useBestBurntool  = metadataLookupBool($recipeData, 'USE.BEST.BURNTOOL');
-
-        ## Check that we have required programs:
-#       print STDERR "Inside burntool loop!\n";
-        my $regtool  = can_run('regtool') or &my_die ("Can't find regtool", $exp_id, $chip_id, $class_id, $PS_EXIT_SYS_ERROR);
-        my $funpack  = can_run('funpack') or &my_die ("Can't find funpack", $exp_id, $chip_id, $class_id, $PS_EXIT_SYS_ERROR);
-        my $burntool = can_run('burntool') or &my_die ("Can't find burntool", $exp_id, $chip_id, $class_id, $PS_EXIT_SYS_ERROR);
-        
+        my $useBestBurntool  = metadataLookupBool($recipeData, 'USE.BEST.BURNTOOL');
+
+        ## Check that we have required programs:
+#       print STDERR "Inside burntool loop!\n";
+        my $regtool  = can_run('regtool') or &my_die ("Can't find regtool", $exp_id, $chip_id, $class_id, $PS_EXIT_SYS_ERROR);
+        my $funpack  = can_run('funpack') or &my_die ("Can't find funpack", $exp_id, $chip_id, $class_id, $PS_EXIT_SYS_ERROR);
+        my $burntool = can_run('burntool') or &my_die ("Can't find burntool", $exp_id, $chip_id, $class_id, $PS_EXIT_SYS_ERROR);
+
         ## Check the current burntool processing version:
         my $regtool_state_cmd = "$regtool -processedimfile -exp_id $exp_id -class_id $class_id -limit 1";
@@ -173 +174 @@
         my $burntoolState = 999;
         foreach my $regEntry (@$regData2) {
-#           print "$regEntry->{exp_id} $regEntry->{burntool_state}\n";
+           print "$regEntry->{exp_id} $regEntry->{burntool_state}\n";
 
             if ($regEntry->{exp_id} == $exp_id) {
@@ -182 +183 @@
             &my_die("Unable to find burntool_state in metadata", $exp_id, $chip_id, $class_id, $PS_EXIT_SYS_ERROR);
         }
-        if ($burntoolState == 32767) {
-            $burntoolState = 0;
-        }
+        if ($burntoolState == 32767) {
+            $burntoolState = 0;
+        }
 
         ## Read camera config to get the current good burntool state :
@@ -190 +191 @@
         my $camera_config_cmd = "$ppConfigDump -camera $camera -dump-camera -";
         ( $success, $error_code, $full_buf, $stdout_buf, $stderr_buf ) =
-            run(command => $camera_config_cmd, verbose => $verbose);
+            run(command => $camera_config_cmd, verbose => 0);
         unless ($success) {
             $error_code = (($error_code >> 8) or $PS_EXIT_PROG_ERROR);
@@ -206 +207 @@
         }
 
-        if (abs($burntoolState) != $burntoolStateGood) {
-            if ($useBestBurntool) {
-                &my_die("Image burntool version does not match current accepted version.", $exp_id, $chip_id, $class_id, $PS_EXIT_SYS_ERROR);
-            }
-            else {
-                warn ("Image burntool version does not match current accepted version. Continuing as requested.");
-                # Internally pretend that we're at a good version.
-                if ($burntoolState < -10) {
-                    $burntoolState = -1 * $burntoolStateGood;
-                }
-                elsif ($burntoolState > 10) {
-                    $burntoolState = $burntoolStateGood;
-                }
-                elsif ($burntoolState == 0) {
-                    # You've told me to use a deburned image, and that you don't care if it's the most recent. The database has told me
-                    # that burntool has never been run on this image. We'll hope the database is wrong, but I don't really trust that.
-                    warn ("burntool_state suggests no table will be found. This will likely crash.");
-                    $burntoolState = -1 * $burntoolStateGood;
-                }
-                else {
-                    &my_die("No valid burntool table will be found.", $exp_id, $chip_id, $class_id, $PS_EXIT_SYS_ERROR);
-                }
-            }
-        }
+        print "burntool state vs burntoolStateGood : $burntoolState vs $burntoolStateGood\n";
+        if (abs($burntoolState) != $burntoolStateGood) {
+            if ($useBestBurntool) {
+                &my_die("Image burntool version does not match current accepted version.", $exp_id, $chip_id, $class_id, $PS_EXIT_SYS_ERROR);
+            }
+            else {
+                warn ("Image burntool version does not match current accepted version. Continuing as requested.");
+                # Internally pretend that we're at a good version.
+                if ($burntoolState < -10) {
+                    $burntoolState = -1 * $burntoolStateGood;
+                }
+                elsif ($burntoolState > 10) {
+                    $burntoolState = $burntoolStateGood;
+                }
+                elsif ($burntoolState == 0) {
+                    # You've told me to use a deburned image, and that you don't care if it's the most recent. The database has told me
+                    # that burntool has never been run on this image. We'll hope the database is wrong, but I don't really trust that.
+                    warn ("burntool_state suggests no table will be found. This will likely crash.");
+                    $burntoolState = -1 * $burntoolStateGood;
+                }
+                else {
+                    &my_die("No valid burntool table will be found.", $exp_id, $chip_id, $class_id, $PS_EXIT_SYS_ERROR);
+                }
+            }
+        }
 
         ## We now know that we have an image that has been burntooled.
@@ -258 +260 @@
             }
 
-            $burntool_cmd .= "$tempName in=${burntoolTable_uriReal} apply=t";
+            $burntool_cmd .= "$tempName in=${burntoolTable_uriReal} persist=t apply=t";
         }
         elsif ($burntoolState == $burntoolStateGood) { # Burntool information stored in a header table.
-            $burntool_cmd .= "$tempName apply=t";
+            $burntool_cmd .= "$tempName persist=t apply=t";
         }
         else {
@@ -375 +377 @@
     if ($do_stats) {
         my $outputStatsReal = $ipprc->file_resolve($outputStats);
-        &my_die("Couldn't find expected output file: $outputStats", $exp_id, $chip_id, $class_id, $PS_EXIT_SYS_ERROR) unless -f $outputStatsReal;
+        &my_die("Couldn't find expected output file: $outputStats", $exp_id, $chip_id, $class_id, $PS_EXIT_SYS_ERROR) unless $ipprc->file_exists($outputStatsReal);
 
         # measure chip stats
@@ -398 +400 @@
         &my_die("Couldn't find expected output file: $outputBin1\n",   $exp_id, $chip_id, $class_id, $PS_EXIT_SYS_ERROR) unless $ipprc->file_exists($outputBin1);
         &my_die("Couldn't find expected output file: $outputBin2\n",   $exp_id, $chip_id, $class_id, $PS_EXIT_SYS_ERROR) unless $ipprc->file_exists($outputBin2);
+        if ($run_state eq 'new') {
+            &my_die("Couldn't find expected output file: $configuration", $exp_id, $chip_id, $class_id, $PS_EXIT_SYS_ERROR) unless $ipprc->file_exists($configuration);
+        }
     }
 
@@ -411 +416 @@
     $command .= " -uri $outputImage";
     $command .= " -path_base $outroot";
-    $command .= " -magicked" if $magicked;
+    $command .= " -magicked $magicked" if $magicked;
     $command .= " -hostname $host" if defined $host;
     $command .= " -dbname $dbname" if defined $dbname;