Changeset 35724

Timestamp:

Jun 28, 2013, 3:35:24 PM (13 years ago)

Author:

bills

Message:

When processing updates pass the config dump file to ppConfigDump so
that the correct recipe set is checked.
If we apply burntool using the burntool program set the recipe value
PPIMAGE:APPLY.BURNTOOL to false.

File:

• trunk/ippScripts/scripts/chip_imfile.pl (modified) (6 diffs)

trunk/ippScripts/scripts/chip_imfile.pl

@@ -200 +200 @@
 
     ## get the ppImage recipe for this camera and CHIP reduction
-    $command = "$ppConfigDump -camera $camera -dump-recipe PPIMAGE -recipe PPIMAGE $recipe_ppImage -";
+    $command = "$ppConfigDump -dump-recipe PPIMAGE -recipe PPIMAGE $recipe_ppImage -";
+    if ($dump_config) {
+        # use this camera's recipes
+        $command .= " -camera $camera";
+    } else {
+        # get recipes as set in config dump file
+        $command .= " -ipprc $configuration";
+    }
     my ( $success, $error_code, $full_buf, $stdout_buf, $stderr_buf ) =
         run(command => $command, verbose => 0);
@@ -228 +235 @@
     my $useDeburnedImage = metadataLookupBool($recipeData, 'USE.DEBURNED.IMAGE');
     my $ppImageApplyBurntool = metadataLookupBool($recipeData, 'APPLY.BURNTOOL');
-    my $burntoolArgument;
+    my $burntoolArguments;
 
     if ($useDeburnedImage) {
@@ -330 +337 @@
 
         # if recipe option PPIMAGE:APPLY.BURNTOOL is set and the burntool information is stored in
-        # an external table (usual case), check the existence of that table file and set $burntoolArgument.
+        # an external table (usual case), check the existence of that table file and set $burntoolArguments.
         # If burntool state does not match, say if the burntool data is stored in a fits extension in
         # the rawImfile, use the burntool program.
@@ -351 +358 @@
                     $PS_EXIT_SYS_ERROR);
             }
-            $burntoolArgument = " -burntool $burntoolTable_uri";
+            $burntoolArguments = " -burntool $burntoolTable_uri";
         } else {
             ## use external burntool program 
@@ -433 +440 @@
             }
 
+            if ($dump_config) {
+                # tell ppImage to not apply burntool since we have done it here
+                $burntoolArguments = ' -Db PPIMAGE:APPLY.BURNTOOL F';
+            }
     #       print STDERR "$uri $uriReal $tempName $burntoolTable_uri $burntoolTable_uriReal $burntool_cmd $save_temps\n";
     #       exit(100);
+
         }
     }
@@ -468 +480 @@
         $command .= " -R PPIMAGE.CHIP FITS.TYPE NONE";
     }
-    $command .= $burntoolArgument if $burntoolArgument;
+    $command .= $burntoolArguments if $burntoolArguments;
     $command .= " -threads $threads" if defined $threads;
     $command .= " -image_id $chip_imfile_id" if defined $chip_imfile_id;