Changeset 27062

Timestamp:

Feb 24, 2010, 2:41:51 PM (16 years ago)

Author:

Paul Price

Message:

Check for configuration dump file.

Location:

trunk/ippScripts/scripts

Files:

• camera_exp.pl (modified) (2 diffs)
• chip_imfile.pl (modified) (1 diff)
• diff_skycell.pl (modified) (6 diffs)
• stack_skycell.pl (modified) (1 diff)
• warp_skycell.pl (modified) (1 diff)

trunk/ippScripts/scripts/camera_exp.pl

@@ -294 +294 @@
         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
@@ -317 +317 @@
             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);
+            }
+
+            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);
             }
         }

trunk/ippScripts/scripts/chip_imfile.pl

@@ -399 +399 @@
         &my_die("Couldn't find expected output file: $outputBin1\n",   $exp_id, $chip_id, $class_id, $PS_EXIT_SYS_ERROR) unless $ipprc->file_exists($outputBin1);
         &my_die("Couldn't find expected output file: $outputBin2\n",   $exp_id, $chip_id, $class_id, $PS_EXIT_SYS_ERROR) unless $ipprc->file_exists($outputBin2);
+        if ($run_state eq 'new') {
+            &my_die("Couldn't find expected output file: $configuration", $exp_id, $chip_id, $class_id, $PS_EXIT_SYS_ERROR) unless $ipprc->file_exists($configuration);
+        }
     }
 

trunk/ippScripts/scripts/diff_skycell.pl

@@ -107 +107 @@
     # Both are zero, so stack stack diff;
     unless ($use_convolved) {
-        $use_convolved = 0;
+        $use_convolved = 0;
     }
 }
@@ -120 +120 @@
         $templatePath = $file->{path_base};
         if ($file->{warp_id} == 0) {
-            if ($use_convolved) {
-                $template = "PPSTACK.OUTPUT";
-                $templateMask = "PPSTACK.OUTPUT.MASK";
-                $templateVariance = "PPSTACK.OUTPUT.VARIANCE";
-            }
-            else {
-                $template     = "PPSTACK.UNCONV";
-                $templateMask = "PPSTACK.UNCONV.MASK";
-                $templateVariance = "PPSTACK.UNCONV.VARIANCE";
-            }
+            if ($use_convolved) {
+                $template = "PPSTACK.OUTPUT";
+                $templateMask = "PPSTACK.OUTPUT.MASK";
+                $templateVariance = "PPSTACK.OUTPUT.VARIANCE";
+            }
+            else {
+                $template     = "PPSTACK.UNCONV";
+                $templateMask = "PPSTACK.UNCONV.MASK";
+                $templateVariance = "PPSTACK.UNCONV.VARIANCE";
+            }
             $templateSources = "PSPHOT.OUT.CMF.MEF";  ## this must be consistent with the value in stack_skycell.pl:161
             # template is a stack so it doesn't need to be magicked
@@ -135 +135 @@
             ## use an explicit stack name for psphot output objects
         } else {
-            $template     = "PSWARP.OUTPUT";
+            $template     = "PSWARP.OUTPUT";
             $templateMask = "PSWARP.OUTPUT.MASK";
             $templateVariance = "PSWARP.OUTPUT.VARIANCE";
@@ -146 +146 @@
         $inputMagic = $file->{magicked};    # if input is a stack the output can't be "magicked"
         if ($file->{warp_id} == 0) {
-            if ($use_convolved) {
-                $input = "PPSTACK.OUTPUT";
-                $inputMask = "PPSTACK.OUTPUT.MASK";
-                $inputVariance = "PPSTACK.OUTPUT.VARIANCE";
-            }
-            else {
-                $input     = "PPSTACK.UNCONV";
-                $inputMask = "PPSTACK.UNCONV.MASK";
-                $inputVariance = "PPSTACK.UNCONV.VARIANCE";
-            }
+            if ($use_convolved) {
+                $input = "PPSTACK.OUTPUT";
+                $inputMask = "PPSTACK.OUTPUT.MASK";
+                $inputVariance = "PPSTACK.OUTPUT.VARIANCE";
+            }
+            else {
+                $input     = "PPSTACK.UNCONV";
+                $inputMask = "PPSTACK.UNCONV.MASK";
+                $inputVariance = "PPSTACK.UNCONV.VARIANCE";
+            }
             $inputSources = "PSPHOT.OUT.CMF.MEF";  ## this must be consistent with the value in stack_skycell.pl:161
         } else {
-            $input     = "PSWARP.OUTPUT";
+            $input     = "PSWARP.OUTPUT";
             $inputMask = "PSWARP.OUTPUT.MASK";
             $inputVariance = "PSWARP.OUTPUT.VARIANCE";
@@ -312 +312 @@
 
         my $outputStatsReal = $ipprc->file_resolve($outputStats);
-        &my_die("Couldn't find expected output file: $outputStats", $diff_id, $skycell_id, $PS_EXIT_SYS_ERROR) unless -f $outputStatsReal;
+        &my_die("Couldn't find expected output file: $outputStats", $diff_id, $skycell_id, $PS_EXIT_SYS_ERROR) unless $ipprc->file_exists($outputStatsReal);
 
         # measure chip stats
@@ -341 +341 @@
                 &my_die("Couldn't find expected output file: $inverseVariance", $diff_id, $skycell_id, $PS_EXIT_SYS_ERROR) unless $ipprc->file_exists($inverseVariance);
                 &my_die("Couldn't find expected output file: $inverseSources", $diff_id, $skycell_id, $PS_EXIT_SYS_ERROR) unless $ipprc->file_exists($inverseSources);
+                if ($run_state eq 'new') {
+                    &my_die("Couldn't find expected output file: $configuration", $diff_id, $PS_EXIT_SYS_ERROR) unless $ipprc->file_exists($configuration);
+                }
             }
         }

trunk/ippScripts/scripts/stack_skycell.pl

@@ -283 +283 @@
         &my_die("Couldn't find expected output file: $outputMask", $stack_id, $PS_EXIT_SYS_ERROR) unless $ipprc->file_exists($outputMask);
         &my_die("Couldn't find expected output file: $outputWeight", $stack_id, $PS_EXIT_SYS_ERROR) unless $ipprc->file_exists($outputWeight);
-        if ($photometry) {
-            &my_die("Couldn't find expected output file: $outputSources", $stack_id, $PS_EXIT_SYS_ERROR) unless $ipprc->file_exists($outputSources);
-        }
+        if ($photometry) {
+            &my_die("Couldn't find expected output file: $outputSources", $stack_id, $PS_EXIT_SYS_ERROR) unless $ipprc->file_exists($outputSources);
+        }
+        if ($run_state eq 'new') {
+            &my_die("Couldn't find expected output file: $configuration", $stack_id, $PS_EXIT_SYS_ERROR) unless $ipprc->file_exists($configuration);
+        }
 #       &my_die("Couldn't find expected output file: $bin1Name",    $stack_id, $PS_EXIT_SYS_ERROR) unless $ipprc->file_exists($bin1Name);
 #       &my_die("Couldn't find expected output file: $bin2Name",    $stack_id, $PS_EXIT_SYS_ERROR) unless $ipprc->file_exists($bin2Name);

trunk/ippScripts/scripts/warp_skycell.pl

@@ -287 +287 @@
             &my_die("Couldn't find expected output file: $outputSources", $warp_id, $skycell_id, $tess_dir, $PS_EXIT_SYS_ERROR) unless $ipprc->file_exists($outputSources);
             &my_die("Couldn't find expected output file: $outputPSF", $warp_id, $skycell_id, $tess_dir, $PS_EXIT_SYS_ERROR) if metadataLookupBool($recipe, 'PSF') and not $ipprc->file_exists($outputPSF);
+            if ($run_state eq 'new') {
+                &my_die("Couldn't find expected output file: $configuration", $warp_id, $skycell_id, $tess_dir, $PS_EXIT_SYS_ERROR) unless $ipprc->file_exists($configuration);
+            }
         }