Changeset 35686 for trunk/ippScripts/scripts/chip_imfile.pl

Timestamp:

Jun 20, 2013, 11:37:13 AM (13 years ago)

Author:

bills

Message:

remove obsolete titly streaks code
clarify some comments
minor reformatting

File:

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

trunk/ippScripts/scripts/chip_imfile.pl

@@ -224 +224 @@
     }
 
-    my $no_compress = metadataLookupBool($recipeData, 'NO.COMPRESS');
-
-    ## XXX make the feature more general?
+    my $no_compress_image = metadataLookupBool($recipeData, 'NO.COMPRESS');
+
     my $useDeburnedImage = metadataLookupBool($recipeData, 'USE.DEBURNED.IMAGE');
     my $ppImageApplyBurntool = metadataLookupBool($recipeData, 'APPLY.BURNTOOL');
@@ -330 +329 @@
         }
 
-        # if recipe option to have ppImage apply burntool is set and the burntool information is store in
-        # an external table, check the existence of that table file and set $burntoolArgument.
-        # If burntool state does not match fall through to the code that uses the burntool program
+        # 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.
+        # If burntool state does not match, say if the burntool data is stored in a fits extension in
+        # the rawImfile, use the burntool program.
         if ($ppImageApplyBurntool && ($burntoolState == -1 * $burntoolStateGood)) {
             my $burntoolTable_uri = $uri;
@@ -339 +339 @@
             if ((!$burntoolTable_uriReal)||(!($ipprc->file_exists($burntoolTable_uri)))) {
                 my $repair_cmd = "$nebrepair $burntoolTable_uri";
-                my ($repair_success, $repair_error_code, $repair_full_buf, $repair_stdout_buf, $repair_stderr_buf ) = run(command => $repair_cmd, verbose => $verbose);
+                my ($repair_success, $repair_error_code, $repair_full_buf, $repair_stdout_buf, $repair_stderr_buf ) 
+                    = run(command => $repair_cmd, verbose => $verbose);
                 unless ($repair_success) {
-                    &my_die("Unable to attempt repair: $uri $repair_error_code", $exp_id,$chip_id, $class_id, $PS_EXIT_SYS_ERROR);
+                    &my_die("Unable to attempt repair: $uri $repair_error_code", $exp_id,$chip_id, $class_id,
+                        $PS_EXIT_SYS_ERROR);
                 }
                 $burntoolTable_uriReal = $ipprc->file_resolve( $burntoolTable_uri );
             }
             unless ($ipprc->file_exists($burntoolTable_uri)) {
-                # Catch errors here
-                &my_die("Couldn't find burntool table: $burntoolTable_uri",$exp_id,$chip_id,$class_id, $PS_EXIT_SYS_ERROR);
+                &my_die("Couldn't find burntool table: $burntoolTable_uri",$exp_id,$chip_id,$class_id, 
+                    $PS_EXIT_SYS_ERROR);
             }
             $burntoolArgument = " -burntool $burntoolTable_uri";
         } else {
+            ## use external burntool program 
 
             ## We now know that we have an image that has been burntooled.
@@ -435 +438 @@
     }
 
-    # apply the 'tiltystreak' operation, if desired
     my $tiltystreakApply = metadataLookupBool($recipeData, 'TILTYSTREAK.APPLY');
     if ($tiltystreakApply) {
-
-        my $tiltystreakByClass = metadataLookupMD($recipeData, 'TILTYSTREAK.BY.CLASS');
-        my $tiltystreakClassApply = metadataLookupBool($tiltystreakByClass, "APPLY.$class_id");
-        if ($tiltystreakClassApply) {
-
-            my $tiltystreakClassOptions = metadataLookupStr($tiltystreakByClass, "OPTIONS.$class_id");
-            if ($tiltystreakClassOptions eq "none") {
-                $tiltystreakClassOptions = "";
-            }
-
-            my ($success, $error_code, $full_buf, $stdout_buf, $stderr_buf);
-
-            # XXX make these optional (must be built by psbuild as well...)
-            my $funpack = can_run('funpack') or &my_die ("Can't find funpack", $exp_id, $chip_id, $class_id, $PS_EXIT_SYS_ERROR);
-            my $tiltystreak = can_run('tiltystreak') or &my_die ("Can't find tiltystreak", $exp_id, $chip_id, $class_id, $PS_EXIT_SYS_ERROR);
-
-            # create an temporary output file:
-            my ($tempFile, $tempName) = tempfile( "/tmp/chip.$exp_id.$class_id.tmp.XXXX", UNLINK => !$save_temps );
-
-            print "uri: $uri\n";
-
-            # get the UNIX version of the (possible) neb: or path: filename
-            my $uriReal = $ipprc->file_resolve( $uri );
-
-            print "uriReal: $uriReal\n";
-
-            # unpack the data (is a NOP if not compressed)
-            $command = "$funpack -S $uriReal > $tempName";
-            ( $success, $error_code, $full_buf, $stdout_buf, $stderr_buf ) = run(command => $command, verbose => $verbose);
-            unless ($success) {
-                $error_code = (($error_code >> 8) or $PS_EXIT_PROG_ERROR);
-                &my_die("Unable to perform funpack: $error_code", $exp_id, $chip_id, $class_id, $PS_EXIT_SYS_ERROR);
-            }
-
-            # run tiltystreak
-            $command = "$tiltystreak $tempName $tiltystreakClassOptions";
-            ( $success, $error_code, $full_buf, $stdout_buf, $stderr_buf ) = run(command => $command, verbose => $verbose);
-            unless ($success) {
-                $error_code = (($error_code >> 8) or $PS_EXIT_PROG_ERROR);
-                &my_die("Unable to perform tiltystreak: $error_code", $exp_id, $chip_id, $class_id, $PS_EXIT_SYS_ERROR);
-            }
-
-            # supply the output file as the new input file
-            $uri = $tempName;
-        }
+        # NOTE: application of TILTYSTREAK.APPLY was here. Removed after r35685
+        &my_die("Unable to perform tiltystreak: code has been removed", $exp_id, $chip_id, $class_id,
+            $PS_EXIT_PROG_ERROR);
     }
 
@@ -505 +465 @@
         $command .= " -Db PPIMAGE:BIN1.FITS FALSE -Db PPIMAGE:BIN2.FITS FALSE";
     }
-    if ($no_compress) {
+    if ($no_compress_image) {
         $command .= " -R PPIMAGE.CHIP FITS.TYPE NONE";
     }