Changeset 24538

Timestamp:

Jun 24, 2009, 10:57:17 AM (17 years ago)

Author:

bills

Message:

if --skip_burned don't skip until $artImfileReal has been calculated so that is
available for use for the next exposure

File:

• trunk/tools/ipp_apply_burntool.pl (modified) (2 diffs)

trunk/tools/ipp_apply_burntool.pl

@@ -111 +111 @@
 foreach my $file (@files) {
     my $exp_id = $file->{exp_id};
-    if ($skip_burned and ($file->{user_1} > 0.5)) { next; }
 
     my $rawImfile = $file->{uri};
@@ -147 +146 @@
     }
 
-    # uncompress the image (do we need to check if it is compressed?)
-    my $status = vsystem ("$funpack -S $rawImfileReal > $tmpImfileReal", $REALRUN);
-    if ($status) {
-        &my_die("failed on funpack");
-    }
-
-    if ($RAWTABLES) {
-        $status = vsystem ("$burntool $tmpImfileReal out=$artImfileReal $prevFileOpt", $REALRUN);
-    } else {
-        $status = vsystem ("$burntool $tmpImfileReal $prevFileOpt", $REALRUN);
-    }
-    if ($status) {
-        &my_die("failed on burntool");
-    }
-
-    # compress the image (do we need to check if it is compressed?)
-    $status = vsystem ("$fpack -S $tmpImfileReal > $outImfileReal", $REALRUN);
-    if ($status) {
-        &my_die("failed on fpack");
-    }
-
-    $status = vsystem ("$regtool -dbname $dbname -updateprocessedimfile -exp_id $exp_id -class_id $class_id -user_1 1.0", 1);
-    if ($status) {
-        &my_die("failed to update imfile");
-    }
-
+    if (! ($skip_burned and ($file->{user_1} > 0.5))) {
+        # uncompress the image (do we need to check if it is compressed?)
+        my $status = vsystem ("$funpack -S $rawImfileReal > $tmpImfileReal", $REALRUN);
+        if ($status) {
+            &my_die("failed on funpack");
+        }
+
+        if ($RAWTABLES) {
+            $status = vsystem ("$burntool $tmpImfileReal out=$artImfileReal $prevFileOpt", $REALRUN);
+        } else {
+            $status = vsystem ("$burntool $tmpImfileReal $prevFileOpt", $REALRUN);
+        }
+        if ($status) {
+            &my_die("failed on burntool");
+        }
+
+        # compress the image (do we need to check if it is compressed?)
+        $status = vsystem ("$fpack -S $tmpImfileReal > $outImfileReal", $REALRUN);
+        if ($status) {
+            &my_die("failed on fpack");
+        }
+
+        $status = vsystem ("$regtool -dbname $dbname -updateprocessedimfile -exp_id $exp_id -class_id $class_id -user_1 1.0", 1);
+        if ($status) {
+            &my_die("failed to update imfile");
+        }
+    }
     # save the artifact file for the next image
     if ($RAWTABLES) {