Changeset 33415 for branches/meh_branches/ppstack_test/ippScripts/scripts/camera_exp.pl

Timestamp:

Mar 5, 2012, 5:19:48 PM (14 years ago)

Author:

mhuber

Message:

merging latest r33407 trunk changes to meh_branches/ppstack_test

Location:

branches/meh_branches/ppstack_test

Files:

• . (modified) (1 prop)
• ippScripts/scripts/camera_exp.pl (modified) (4 diffs)

branches/meh_branches/ppstack_test/ippScripts/scripts/camera_exp.pl

@@ -88 +88 @@
 
 if ($redirect) {
-    $ipprc->redirect_output($logDest) or my_die( "Unable to redirect output", $cam_id, $PS_EXIT_SYS_ERROR );
+    $ipprc->redirect_to_logfile($logDest) or my_die( "Unable to redirect output", $cam_id, $PS_EXIT_SYS_ERROR );
     print "\n\n";
     print "Starting script $0 on $host\n\n";
@@ -156 +156 @@
     { # Determine if FWHM is too large to bother continuing.
         my $maxFWHM = 0;
+      # XXX: temporary hack if this is a CNP exposure set maxFWHM to a large
+      # value.
+      # Before the next tag we will put this into a recipe
+      if ($outroot =~ /CNP/) {
+            $maxFWHM = 25;
+      } else {
         my $command = "$ppConfigDump -camera $camera -get-key MAX_ALLOWED_FWHM";
         my ($success, $error_code, $full_buf, $stdout_buf, $stderr_buf ) =
@@ -168 +174 @@
             $maxFWHM = metadataLookupStr($cameraConfig, 'MAX_ALLOWED_FWHM');
         }
+      }
         if ($maxFWHM) {
             my $expFWHM;
@@ -403 +410 @@
     &my_die("Couldn't find expected output file: $file",  $cam_id, $PS_EXIT_SYS_ERROR) unless
         $ipprc->file_exists($file);
+
+    # Funpack to confirm we've really made things correctly
+    my $diskfile = $ipprc->file_resolve($file);
+    if ($diskfile =~ /fits/) {
+        my $funpack  = can_run('funpack') or &my_die ("Can't find funpack",  $cam_id, $PS_EXIT_SYS_ERROR);
+        my $check_command = "$funpack -S $diskfile > /dev/null";
+        my ( $success, $error_code, $full_buf, $stdout_buf, $stderr_buf ) =
+            run(command => $check_command, verbose => $verbose);
+        if (!$success) {
+            &my_die("Output file not a valid fits file: $file",  $cam_id, $PS_EXIT_SYS_ERROR);
+        }
+    }
+    #####
+
 
     my $scheme = file_scheme($file);