Changeset 27838 for branches/tap_branches/ippScripts/scripts/camera_exp.pl

Timestamp:

May 3, 2010, 8:41:49 AM (16 years ago)

Author:

eugene

Message:

updates from trunk

Location:

branches/tap_branches

Files:

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

branches/tap_branches/ippScripts/scripts/camera_exp.pl

@@ -8 +8 @@
 use Sys::Hostname;
 my $host = hostname();
+my $date = `date`;
 print "\n\n";
-print "Starting script $0 on $host\n\n";
+print "Starting script $0 on $host at $date\n\n";
 
 use DateTime;
@@ -144 +145 @@
 }
 
+
+my $produceMasks;               # Produce masks?
+{
+    # Get the PSASTRO recipe
+    my $command = "$ppConfigDump -camera $camera -recipe PSASTRO $recipe_psastro -dump-recipe PSASTRO -";
+    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 ppConfigDump: $error_code", $cam_id, $PS_EXIT_CONFIG_ERROR);
+    }
+    my $recipeData = $mdcParser->parse(join "", @$stdout_buf) or
+        &my_die("Unable to parse metadata config doc", $cam_id, $PS_EXIT_CONFIG_ERROR);
+
+    $produceMasks = metadataLookupBool($recipeData, 'REFSTAR_MASK');
+}
+
+
 ### not needed to have such an extensive temp file name.
 my ($list1File, $list1Name) = tempfile( "/tmp/$exp_tag.cm.$cam_id.b1.list.XXXX", UNLINK => !$save_temps ); # For binning 1
@@ -153 +172 @@
 
 # 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};
@@ -163 +183 @@
     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");
     print $list2File ($ipprc->filename("PPIMAGE.BIN2", $file->{path_base}, $class_id) . "\n");
     print $list3File ($chipObjects . "\n");
     print $list4File ($chipMask . "\n");
+
+    push @outMasks, $ipprc->filename("PSASTRO.OUTPUT.MASK", $outroot, $class_id) if $produceMasks;
 }
 close $list1File;
@@ -222 +236 @@
             &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_SYS_ERROR) unless $ipprc->file_exists($jpeg1);
     }
 
@@ -237 +251 @@
             &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_SYS_ERROR) unless $ipprc->file_exists($jpeg2);
+    }
+
+    {
         # run psastro on the chipObjects, producing fpaObjects
         my $command;
         $command  = "$psastro";
-        $command .= " -list $list3Name";
-        $command .= " -masklist $list4Name";
-        $command .= " $outroot";
+        $command .= " -list $list3Name";
+        $command .= " -masklist $list4Name";
+        $command .= " $outroot";
         $command .= " -recipe PSASTRO $recipe_psastro";
         $command .= " -tracedest $traceDest -log $logDest";
@@ -273 +286 @@
         if ($do_stats) {
             my $fpaStatsReal = $ipprc->file_resolve($fpaStats);
-            &my_die("Couldn't find expected output file: $fpaStats", $cam_id, $PS_EXIT_SYS_ERROR) unless -f $fpaStatsReal;
+            &my_die("Couldn't find expected output file: $fpaStats", $cam_id, $PS_EXIT_SYS_ERROR) unless $ipprc->file_exists( $fpaStatsReal );
 
             # parse stats from metadata
@@ -292 +305 @@
 
         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_SYS_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 $ipprc->file_exists($outMask);
+            }
+
+            if ($run_state eq 'new') {
+                &my_die("Couldn't find expected output file: $configuration", $cam_id, $PS_EXIT_SYS_ERROR) unless $ipprc->file_exists($configuration);
+            }
         }