Changeset 14158

Timestamp:

Jul 12, 2007, 9:36:26 AM (19 years ago)

Author:

eugene

Message:

make jpegs even if psastro fails

File:

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

trunk/ippScripts/scripts/camera_exp.pl

@@ -63 +63 @@
 
 my $recipe1 = $ipprc->reduction($reduction, 'JPEG_BIN1'); # Recipe to use
-&my_die("Unrecognised JPEG recipe", $cam_id, $PS_EXIT_PROG_ERROR) unless defined $recipe1;
+&my_die("Unrecognised JPEG recipe", $cam_id, $PS_EXIT_CONFIG_ERROR) unless defined $recipe1;
 
 my $recipe2 = $ipprc->reduction($reduction, 'JPEG_BIN2'); # Recipe to use
-&my_die("Unrecognised JPEG recipe", $cam_id, $PS_EXIT_PROG_ERROR) unless defined $recipe2;
+&my_die("Unrecognised JPEG recipe", $cam_id, $PS_EXIT_CONFIG_ERROR) unless defined $recipe2;
 
 # values to extract from output metadata and the stats to calculate
@@ -173 +173 @@
 
 unless ($no_op) {
+
+    ## build the output JPEG images first so we get them even if the astrometry fails
+
+    # Make the jpeg for binning 1
+    {
+        my $command = "$ppImage -list $list1Name $outputRoot -recipe PPIMAGE $recipe1"; # Command to run
+        my ( $success, $error_code, $full_buf, $stdout_buf, $stderr_buf ) =
+            run(command => $command, verbose => 1);
+        unless ($success) {
+            $error_code = (($error_code >> 8) or $PS_EXIT_PROG_ERROR);
+            &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);
+    }
+
+    # Make the jpeg for binning 2
+    {
+        my $command = "$ppImage -list $list2Name $outputRoot -recipe PPIMAGE $recipe2"; # Command to run
+        my ( $success, $error_code, $full_buf, $stdout_buf, $stderr_buf ) =
+            run(command => $command, verbose => 1);
+        unless ($success) {
+            $error_code = (($error_code >> 8) or $PS_EXIT_PROG_ERROR);
+            &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
@@ -196 +222 @@
         # XXX this construct requires the user to have a valid .ptolemyrc 
         # XXX which in turn points at ippconfig/dvo.site
-        {
+        
+        # require a defined output dvo database to run addstar (ie, refuse to use the .ptolemyrc default)
+        # XXX this needs to be converted to addstar_client...
+        if (defined $dvodbReal) {
             my $camdir = $ipprc->dvo_cameradir(); # Camera directory for addstar
             my $command = "addstar -D CAMERA $camdir " . $ipprc->file_resolve($fpaObjects);
-            
-            if (defined $dvodbReal) {
-                $command .= " -D CATDIR $dvodbReal";
-            }
+            $command .= " -D CATDIR $dvodbReal";
 
             my ( $success, $error_code, $full_buf, $stdout_buf, $stderr_buf ) =
@@ -213 +239 @@
     }
     
-    # Make the jpeg for binning 1
-    {
-        my $command = "$ppImage -list $list1Name $outputRoot -recipe PPIMAGE $recipe1"; # Command to run
-        my ( $success, $error_code, $full_buf, $stdout_buf, $stderr_buf ) =
-            run(command => $command, verbose => 1);
-        unless ($success) {
-            $error_code = (($error_code >> 8) or $PS_EXIT_PROG_ERROR);
-            &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);
-    }
-
-    # Make the jpeg for binning 2
-    {
-        my $command = "$ppImage -list $list2Name $outputRoot -recipe PPIMAGE $recipe2"; # Command to run
-        my ( $success, $error_code, $full_buf, $stdout_buf, $stderr_buf ) =
-            run(command => $command, verbose => 1);
-        unless ($success) {
-            $error_code = (($error_code >> 8) or $PS_EXIT_PROG_ERROR);
-            &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);
-    }
 }
 
@@ -269 +272 @@
         my $command = "$camtool -addprocessedexp -cam_id $cam_id -code $exit_code";
         $command .= " -dbname $dbname" if defined $dbname;
-###        system ($command);
+        system ($command);
     }
     exit $exit_code;