Changeset 27517 for branches/eam_branches/20100225/ippScripts/scripts/camera_exp.pl

Timestamp:

Mar 29, 2010, 3:55:49 PM (16 years ago)

Author:

eugene

Message:

update merges from trunk

Location:

branches/eam_branches/20100225

Files:

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

branches/eam_branches/20100225/ippScripts/scripts/camera_exp.pl

@@ -171 +171 @@
 
 # XXX we perform astrometry iff photometry output exists
-my $chipObjectsExist = 0;
 my @outMasks;                   # Names of output masks
 foreach my $file (@$files) {
+    next if $file->{quality} != 0;
     # use the path_base as OUTPUT root and convert the filenames with ipprc->filename:
     my $class_id = $file->{class_id};
@@ -181 +181 @@
     my $chipObjects = $ipprc->filename("PSPHOT.OUTPUT", $file->{path_base}, $class_id);
     my $chipMask   = $ipprc->filename("PPIMAGE.CHIP.MASK", $file->{path_base}, $class_id);
-
-    # if any of the output chip photometry files exist, we can run psastro / addstar below
-    if ($ipprc->file_exists($chipObjects)) {
-        $chipObjectsExist = 1;
-    } else {
-        if ($verbose) { print "skipping $chipObjects (not found)\n"; }
-        next;
-    }
 
     print $list1File ($ipprc->filename("PPIMAGE.BIN1", $file->{path_base}, $class_id) . "\n");
@@ -243 +235 @@
             &my_die("Unable to perform ppImage: $error_code", $cam_id, $error_code);
         }
-        &my_die("Unable to find expected output file: $jpeg1", $cam_id, $PS_EXIT_PROG_ERROR) unless -f $ipprc->file_resolve($jpeg1);
+        &my_die("Unable to find expected output file: $jpeg1", $cam_id, $PS_EXIT_PROG_ERROR) unless $ipprc->file_exists($jpeg1);
     }
 
@@ -258 +250 @@
             &my_die("Unable to perform ppImage: $error_code", $cam_id, $error_code);
         }
-        &my_die("Unable to find expected output file: $jpeg2", $cam_id, $PS_EXIT_PROG_ERROR) unless -f $ipprc->file_resolve($jpeg2);
-    }
-
-    # only run psastro / addstar if any of the output chip astrometry files exist (should we test for successful astrometry?)
-    if ($chipObjectsExist) {
+        &my_die("Unable to find expected output file: $jpeg2", $cam_id, $PS_EXIT_PROG_ERROR) unless $ipprc->file_exists($jpeg2);
+    }
+
+    {
         # run psastro on the chipObjects, producing fpaObjects
         my $command;
@@ -313 +304 @@
 
         if (!$quality) {
-            &my_die("Unable to find expected output file: $fpaObjects", $cam_id, $PS_EXIT_PROG_ERROR) unless -f $ipprc->file_resolve($fpaObjects);
+            &my_die("Unable to find expected output file: $fpaObjects", $cam_id, $PS_EXIT_PROG_ERROR) unless $ipprc->file_exists($fpaObjects);
 
             foreach my $outMask (@outMasks) {
-                &my_die("Unable to find expected output file: $outMask", $cam_id, $PS_EXIT_SYS_ERROR) unless -f $ipprc->file_resolve($outMask);
+                &my_die("Unable to find expected output file: $outMask", $cam_id, $PS_EXIT_SYS_ERROR) unless $ipprc->file_exists($outMask);
             }