Changeset 28014

Timestamp:

May 18, 2010, 4:15:53 PM (16 years ago)

Author:

bills

Message:

Add recipe value BURNTOOL.STATE.GOOD.UPDATE which is the minimum value for burntool state
which will be processed if run-state is 'update'. Value set to 13. This allows data with older
burntool tables to be re-processed, but still requires new runs to have current burntool
tables.

Location:

trunk

Files:

• ippScripts/scripts/chip_imfile.pl (modified) (2 diffs)
• ippconfig/gpc1/camera.config (modified) (1 diff)

trunk/ippScripts/scripts/chip_imfile.pl

@@ -76 +76 @@
     defined $run_state;
 
+my_die ("$run_state is an invalid value for run-state", $exp_id, $chip_id, $class_id, $PS_EXIT_PROG_ERROR) unless ($run_state eq 'new' or $run_state eq 'update');
+
 my $ipprc = PS::IPP::Config->new( $camera ) or my_die( "Unable to set up", $exp_id, $chip_id, $class_id, $PS_EXIT_CONFIG_ERROR ); # IPP configuration
 
@@ -201 +203 @@
 
         my $burntoolStateGood;
+        my $burntoolStateGoodUpdate;
         foreach my $camEntry (@$camData) {
             if ($camEntry->{name} eq "BURNTOOL.STATE.GOOD") {
                 $burntoolStateGood = $camEntry->{value};
             }
-        }
-
-        print "burntool state vs burntoolStateGood : $burntoolState vs $burntoolStateGood\n";
+            if ($camEntry->{name} eq "BURNTOOL.STATE.GOOD.UPDATE") {
+                $burntoolStateGoodUpdate = $camEntry->{value};
+            }
+        }
+
+        if ($run_state eq 'new') {
+            print "burntool state vs burntoolStateGood : $burntoolState vs $burntoolStateGood\n";
+        } else {
+            # if doing update go ahead if burntoolState is at least at BURNTOOL.STATE.GOOD.UPDATE
+            print "burntool state vs burntoolStateGoodUpdate : $burntoolState vs $burntoolStateGoodUpdate\n";
+            $useBestBurntool = 0 if (abs($burntoolState) >= $burntoolStateGoodUpdate);
+        }
+
         if (abs($burntoolState) != $burntoolStateGood) {
             if ($useBestBurntool) {

trunk/ippconfig/gpc1/camera.config

@@ -151 +151 @@
 
 BURNTOOL.STATE.GOOD     S16     14  # Value for burntool_state with the most recent bt version.
+BURNTOOL.STATE.GOOD.UPDATE S16     13  # for upddate processing accept earlier version