Changeset 28362

Timestamp:

Jun 16, 2010, 2:28:40 PM (16 years ago)

Author:

Paul Price

Message:

psphot doesn't produce stats files.

File:

• trunk/ippScripts/scripts/diffphot.pl (modified) (8 diffs)

trunk/ippScripts/scripts/diffphot.pl

@@ -125 +125 @@
     $command .= " -variance $inputVariance";
     $command .= " -psf $inputPSF";
-    $command .= " -stats $outputStats";
+#    $command .= " -stats $outputStats";
     $command .= " -threads $threads" if defined $threads;
     $command .= " -recipe PSPHOT $recipe_psphot";
@@ -140 +140 @@
         unless ($success) {
             $error_code = (($error_code >> 8) or $PS_EXIT_PROG_ERROR);
-            &my_die("Unable to perform ppSub: $error_code", $diff_phot_id, $skycell_id, $error_code);
-        }
-
+            &my_die("Unable to perform psphot: $error_code", $diff_phot_id, $skycell_id, $error_code);
+        }
+
+        if (0) {                # psphot doesn't produce a stats file
         my $outputStatsReal = $ipprc->file_resolve($outputStats);
         &my_die("Couldn't find expected output file: $outputStats", $diff_phot_id, $skycell_id, $PS_EXIT_SYS_ERROR) unless $ipprc->file_exists($outputStatsReal);
@@ -161 +162 @@
             $quality = $1;
         }
+        }
 
         if (!$quality) {
@@ -171 +173 @@
 
 # Do reverse photometry
-{
+if ($bothways) {
     my ($tempFile, $tempName) = tempfile( "/tmp/diffphot.$diff_phot_id.$skycell_id.XXXX",
                                           UNLINK => !$save_temps, SUFFIX => '.fits' );
@@ -182 +184 @@
             unless ($success) {
                 $error_code = (($error_code >> 8) or $PS_EXIT_PROG_ERROR);
-                &my_die("Unable to perform ppSub: $error_code", $diff_phot_id, $skycell_id, $error_code);
+                &my_die("Unable to perform ppArith: $error_code", $diff_phot_id, $skycell_id, $error_code);
             }
             &my_die("Couldn't find expected output file: $tempName", $diff_phot_id, $skycell_id, $PS_EXIT_SYS_ERROR) unless $ipprc->file_exists($tempName);
@@ -200 +202 @@
     $command .= " -variance $inputVariance";
     $command .= " -psf $inputPSF";
-    $command .= " -stats $outputStats";
+#    $command .= " -stats $outputStats";
     $command .= " -threads $threads" if defined $threads;
     $command .= " -recipe PSPHOT $recipe_psphot";
@@ -215 +217 @@
         unless ($success) {
             $error_code = (($error_code >> 8) or $PS_EXIT_PROG_ERROR);
-            &my_die("Unable to perform ppSub: $error_code", $diff_phot_id, $skycell_id, $error_code);
-        }
-
+            &my_die("Unable to perform psphot: $error_code", $diff_phot_id, $skycell_id, $error_code);
+        }
+
+        if (0) {                # psphot doesn't produce a stats file
         my $outputStatsReal = $ipprc->file_resolve($outputStats);
         &my_die("Couldn't find expected output file: $outputStats", $diff_phot_id, $skycell_id, $PS_EXIT_SYS_ERROR) unless $ipprc->file_exists($outputStatsReal);
@@ -235 +238 @@
         if ($cmdflags =~ /-quality (\d+)/) {
             $quality = $1;
+        }
         }