Changeset 32337 for branches/eam_branches/ipp-20110710/ippScripts/scripts/chip_imfile.pl

Timestamp:

Sep 6, 2011, 11:00:22 AM (15 years ago)

Author:

eugene

Message:

merge changes from trunk

File:

• branches/eam_branches/ipp-20110710/ippScripts/scripts/chip_imfile.pl (modified) (5 diffs)

branches/eam_branches/ipp-20110710/ippScripts/scripts/chip_imfile.pl

@@ -44 +44 @@
 my ( $exp_id, $chip_id, $class_id, $chip_imfile_id, $uri, $camera, $outroot, $dbname, $run_state, $reduction, $threads, $verbose,
      $no_update, $save_temps, $no_op, $redirect, $magicked, $deburned );
+
+my $zaplog = 0;
+
 GetOptions(
     'exp_id=s'          => \$exp_id,    # Exposure identifier
@@ -62 +65 @@
     'no-op'             => \$no_op,     # Don't do any operations?
     'redirect-output'   => \$redirect,
+    'zaplog'            => \$zaplog,
     'save-temps'        => \$save_temps, # Save temporary files?
     ) or pod2usage( 2 );
@@ -90 +94 @@
 my ($logDest, $traceDest);
 if ($run_state eq 'new') {
-    $logDest = prepare_output("LOG.IMFILE", $outroot, $class_id, 0);
+    $logDest = prepare_output("LOG.IMFILE", $outroot, $class_id, $zaplog);
     $traceDest = prepare_output("TRACE.IMFILE",  $outroot, $class_id, 1);
 } else {
@@ -115 +119 @@
 my $mdcParser = PS::IPP::Metadata::Config->new; # Parser for metadata config files
 
-&my_die("Couldn't find input file: $uri\n", $exp_id, $chip_id, $class_id, $PS_EXIT_SYS_ERROR) unless $ipprc->file_exists($uri);
+# &my_die("Couldn't find input file: $uri\n", $exp_id, $chip_id, $class_id, $PS_EXIT_SYS_ERROR) unless $ipprc->file_exists($uri);
 
 # outroot examples (HOST components must be set)
@@ -262 +266 @@
         }
 
-        ## Read camera config to get the current good burntool state :
-        ## XXX This is extremely slow. Any better way to do this?
-        my $camera_config_cmd = "$ppConfigDump -camera $camera -dump-camera -";
+        ## Read camera config to get the current good burntool state
+        ## this returns just the values of interest in a tiny mdc file
+        my $camera_config_cmd = "$ppConfigDump -camera $camera -get-key BURNTOOL.STATE.GOOD -get-key BURNTOOL.STATE.GOOD.UPDATE";
         ( $success, $error_code, $full_buf, $stdout_buf, $stderr_buf ) =
             run(command => $camera_config_cmd, verbose => 0);