Changeset 28794 for branches/eam_branches/ipp-20100621/ippScripts/scripts/diffphot.pl

Timestamp:

Jul 30, 2010, 9:31:50 AM (16 years ago)

Author:

eugene

Message:

updates from trunk

File:

• branches/eam_branches/ipp-20100621/ippScripts/scripts/diffphot.pl (modified) (5 diffs)

branches/eam_branches/ipp-20100621/ippScripts/scripts/diffphot.pl

@@ -31 +31 @@
 my $diffphottool = can_run('diffphottool') or (warn "Can't find diffphottool" and $missing_tools = 1);
 my $psphot = can_run('psphot') or (warn "Can't find psphot" and $missing_tools = 1);
-my $ppArith = can_run('ppArith') or (warn "Can't find ppArith" and $missing_tools = 1);
 my $ppStatsFromMetadata = can_run('ppStatsFromMetadata') or (warn "Can't find ppStatsFromMetadata" and $missing_tools = 1);
 if ($missing_tools) {
@@ -177 +176 @@
 # Do reverse photometry
 if ($bothways) {
-    my ($tempFile, $tempName) = tempfile( "/tmp/diffphot.$diff_phot_id.$skycell_id.XXXX",
-                                          UNLINK => !$save_temps, SUFFIX => '.fits' );
-    {
-        my ($tempRoot) = $tempName =~ /^(.*).fits/;
-        my $command = "$ppArith $tempRoot -file1 $inputImage -op \\* -const2 -1";
-        unless ($no_op) {
-            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);
-                &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);
-        } else {
-            print "Skipping command: $command\n";
-        }
-    }
+    my $inputImage = $ipprc->filename("PPSUB.INVERSE", $inputPath);
+    my $inputMask = $ipprc->filename("PPSUB.INVERSE.MASK", $inputPath);
+    my $inputVariance = $ipprc->filename("PPSUB.INVERSE.VARIANCE", $inputPath);
+    &my_die("Couldn't find input: $inputImage", $diff_phot_id, $skycell_id, $PS_EXIT_SYS_ERROR) unless $ipprc->file_exists($inputImage);
+    &my_die("Couldn't find input: $inputMask", $diff_phot_id, $skycell_id, $PS_EXIT_SYS_ERROR) unless $ipprc->file_exists($inputMask);
+    &my_die("Couldn't find input: $inputVariance", $diff_phot_id, $skycell_id, $PS_EXIT_SYS_ERROR) unless $ipprc->file_exists($inputVariance);
 
     # Get the output filenames
@@ -201 +189 @@
 
     my $command = "$psphot $outroot.neg";
-    $command .= " -file $tempName";
+    $command .= " -file $inputImage";
     $command .= " -mask $inputMask";
     $command .= " -variance $inputVariance";
@@ -252 +240 @@
 }
 
-unless ($no_update) {
+{
     my $command = "$diffphottool -diff_phot_id $diff_phot_id -skycell_id $skycell_id";
     $command .= " -done -path_base $outroot";
-    $command .= " -magicked $magicked" if $magicked;
+    $command .= " -magicked $magicked" if defined $magicked;
     $command .= " -quality $quality" if defined $quality;
     $command .= (" -dtime_script " . ((DateTime->now->mjd - $mjd_start) * 86400));
@@ -261 +249 @@
     $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);
-        &my_die("Command failed: $error_code", $diff_phot_id, $skycell_id, $error_code);
+    unless ($no_update) {
+        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);
+            &my_die("Command failed: $error_code", $diff_phot_id, $skycell_id, $error_code);
+        }
+    } else {
+        print "Skipping update: $command\n";
     }
 }