Changeset 33415 for branches/meh_branches/ppstack_test/ippScripts/scripts/warp_skycell.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/warp_skycell.pl (modified) (7 diffs)

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

@@ -38 +38 @@
 
 my ($warp_id, $skycell_id, $warp_skyfile_id, $tess_dir, $reduction, $camera, $dbname, $outroot, $threads, $run_state, $magicked, $verbose, $no_update, $no_op, $redirect, $save_temps);
-my $zaplog = 0;
 
 GetOptions(
@@ -55 +54 @@
     'no-update'           => \$no_update, # Don't update the database?
     'no-op'               => \$no_op, # Don't do any operations?
-    'zaplog'              => \$zaplog, # delete previous logfile
     'redirect-output'     => \$redirect,
     'save-temps'          => \$save_temps, # Save temporary files?
@@ -77 +75 @@
 my $do_stats;
 if ($run_state eq 'new') {
-    $logDest = prepare_output("LOG.EXP", $outroot, $skycell_id, $zaplog);
+    $logDest = $ipprc->filename("LOG.EXP", $outroot, $skycell_id);
     $traceDest = prepare_output("TRACE.EXP", $outroot, $skycell_id, 1);
     $do_stats = 1;
 } elsif ($run_state eq 'update')  {
-    $logDest = prepare_output("LOG.EXP.UPDATE", $outroot, $skycell_id, 1);
+    $logDest = $ipprc->filename("LOG.EXP.UPDATE", $outroot, $skycell_id);
     $traceDest = prepare_output("TRACE.EXP.UPDATE", $outroot, $skycell_id, 1);
 } else {
@@ -93 +91 @@
 }
 
-$ipprc->redirect_output($logDest) or my_die( "Unable to redirect output", $warp_id, $skycell_id, $tess_dir, $PS_EXIT_SYS_ERROR ) if $redirect;
+$ipprc->redirect_to_logfile($logDest) or my_die( "Unable to redirect output", $warp_id, $skycell_id, $tess_dir, $PS_EXIT_SYS_ERROR ) if $redirect;
 
 # Recipes to use based on reduction class
@@ -333 +331 @@
             }
         }
-
+        print "Quality: $quality\n";
         unless ($no_update) {
             # XXX change -tess_id to -tess_dir when db is updated
@@ -358 +356 @@
         }
     } else {
+
+        my $quality = 0;
+
+        unless ($ipprc->file_exists($outputPSF)) {
+            $quality = 8006; # bad data.
+        }
+#         if (!$quality) {
+#             check_output($outputImage, 0);
+#             check_output($outputMask, 0);
+#             check_output($outputWeight, 0);
+#             check_output($outputSources, 1);
+#             check_output($outputPSF, 1) if metadataLookupBool($recipe, 'PSF')  ;
+#         }
+        print "Quality: $quality\n";
+
         # $run_state eq 'update'
         unless ($no_update) {
-            my $command = "$warptool -tofullskyfile";
-            $command .= " -warp_id $warp_id";
-            $command .= " -skycell_id $skycell_id";
-            $command .= " -set_magicked $magicked" if $magicked;
-            $command .= " -dbname $dbname"   if defined $dbname;
-
-            my ( $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);
-                warn("Unable to perform warptool -addwarped: $error_code\n");
-                exit($error_code);
+            my $try = 0;
+            while (1) {
+                $try++;
+                my $command = "$warptool -tofullskyfile";
+                $command .= " -warp_id $warp_id";
+                $command .= " -skycell_id $skycell_id";
+                $command .= " -set_magicked $magicked" if $magicked;
+                $command .= " -set_quality $quality" if $quality;
+                $command .= " -dbname $dbname"   if defined $dbname;
+
+                my ( $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);
+                    warn("Unable to perform warptool -addwarped: $error_code\n");
+                    exit($error_code) if $try >= 2;
+                    sleep 10;
+                    warn("Trying again\n");
+                } else {
+                    last;
+                }
             }
         }
@@ -407 +429 @@
 
     &my_die("Couldn't find expected output file: $file",  $warp_id, $skycell_id, $tess_dir, $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", $warp_id, $skycell_id, $tess_dir, $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", $warp_id, $skycell_id, $tess_dir, $PS_EXIT_SYS_ERROR);
+        }
+    }
+    #####
 
     if ($replicate and $neb) {