Changeset 31906

Timestamp:

Jul 19, 2011, 1:33:02 PM (15 years ago)

Author:

eugene

Message:

updating scripts to use ppConfigDump -get-key in place of full camera parsing in perl

Location:

trunk/ippScripts/scripts

Files:

• automate_stacks.pl (modified) (1 diff)
• camera_exp.pl (modified) (2 diffs)
• ipp_apply_burntool.pl (modified) (1 diff)
• ipp_apply_burntool_single.pl (modified) (1 diff)
• nightly_science.pl (modified) (1 diff)
• register_imfile.pl (modified) (1 diff)

trunk/ippScripts/scripts/automate_stacks.pl

@@ -545 +545 @@
     my $mdcParser = PS::IPP::Metadata::Config->new;
 
-    my $config_cmd = "$ppConfigDump -camera $camera -dump-camera - | grep BURNTOOL.STATE.GOOD | uniq";
+    my $config_cmd = "$ppConfigDump -camera $camera -get-key BURNTOOL.STATE.GOOD";
     my ( $success, $error_code, $full_buf, $stdout_buf, $stderr_buf ) =
         run ( command => $config_cmd, verbose => $verbose);

trunk/ippScripts/scripts/camera_exp.pl

@@ -155 +155 @@
 
     { # Determine if FWHM is too large to bother continuing.
-        my $command = "$ppConfigDump -camera $camera -dump-camera -";
+        my $maxFWHM = 0;
+        my $command = "$ppConfigDump -camera $camera -get-key MAX_ALLOWED_FWHM";
         my ($success, $error_code, $full_buf, $stdout_buf, $stderr_buf ) =
             run(command => $command, verbose => $verbose);
@@ -162 +163 @@
             &my_die("Unable to perform ppConfigDump: $error_code", $cam_id, $PS_EXIT_CONFIG_ERROR);
         }
-        my $cameraConfig = $mdcParser->parse(join "", @$stdout_buf) or
-            &my_die("Unable to parse metadata config doc", $cam_id, $PS_EXIT_CONFIG_ERROR);
-
-        my $maxFWHM = metadataLookupStr($cameraConfig, 'MAX_ALLOWED_FWHM');
+        if (@$stdout_buf) {
+            my $cameraConfig = $mdcParser->parse(join "", @$stdout_buf) or
+                &my_die("Unable to parse metadata config doc", $cam_id, $PS_EXIT_CONFIG_ERROR);
+            $maxFWHM = metadataLookupStr($cameraConfig, 'MAX_ALLOWED_FWHM');
+        }
         if ($maxFWHM) {
             my $expFWHM;

trunk/ippScripts/scripts/ipp_apply_burntool.pl

@@ -70 +70 @@
 
 # Determine the value of a "good" burntool run.
-my $config_cmd = "$ppConfigDump -camera $camera -dump-camera - | grep BURNTOOL | uniq";
+my $config_cmd = "$ppConfigDump -camera $camera -get-key BURNTOOL.STATE.GOOD";
 my ( $success, $error_code, $full_buf, $stdout_buf, $stderr_buf ) =
     run ( command => $config_cmd, verbose => $verbose);

trunk/ippScripts/scripts/ipp_apply_burntool_single.pl

@@ -74 +74 @@
 
 # Determine the value of a "good" burntool run.
-my $config_cmd = "$ppConfigDump -camera $camera -dump-camera - | grep BURNTOOL | uniq";
+my $config_cmd = "$ppConfigDump -camera $camera -get-key BURNTOOL.STATE.GOOD";
 my ( $success, $error_code, $full_buf, $stdout_buf, $stderr_buf ) =
     run ( command => $config_cmd, verbose => $verbose);

trunk/ippScripts/scripts/nightly_science.pl

@@ -521 +521 @@
     my $mdcParser = PS::IPP::Metadata::Config->new;
 
-    my $config_cmd = "$ppConfigDump -camera $camera -dump-camera - | grep BURNTOOL.STATE.GOOD | uniq";
+    my $config_cmd = "$ppConfigDump -camera $camera -get-key BURNTOOL.STATE.GOOD";
     my ( $success, $error_code, $full_buf, $stdout_buf, $stderr_buf ) =
         run ( command => $config_cmd, verbose => $verbose);

trunk/ippScripts/scripts/register_imfile.pl

@@ -147 +147 @@
     elsif (($isGPC1 == 1) && ($burntoolStateCurrent == 1)) {
 #       print STDERR "In the good region: >>$burntoolStateCurrent<<\n";
-        my $ppConfigDump_cmd = "$ppConfigDump -camera GPC1 -dump-camera -";
+        my $ppConfigDump_cmd = "$ppConfigDump -camera GPC1 -get-key BURNTOOL.STATE.GOOD";
         my ( $success, $error_code, $full_buf, $stdout_buf, $stderr_buf ) =
             IPC::Cmd::run(command => $ppConfigDump_cmd, verbose => $verbose);