Changeset 31164

Timestamp:

Apr 4, 2011, 1:23:27 PM (15 years ago)

Author:

eugene

Message:

updates from eam branch (tweaks for Darwin)

Location:

trunk/ippScripts/scripts

Files:

• ipp_apply_burntool_single.pl (modified) (1 prop)
• staticsky.pl (modified) (4 diffs)

trunk/ippScripts/scripts/staticsky.pl

@@ -148 +148 @@
 # Recipes to use based on reduction class
 $reduction = 'DEFAULT' unless defined $reduction;
-my $recipe_psphot  = $ipprc->reduction($reduction, 'STACKPHOT'); # Recipe to use for psphot
+my $recipe_psphot  = $ipprc->reduction($reduction, 'STACKPHOT_PSPHOT'); # Recipe to use for psphot
+my $recipe_ppsub   = $ipprc->reduction($reduction, 'STACKPHOT_PPSUB'); # Recipe to use for ppsub
+my $recipe_ppstack = $ipprc->reduction($reduction, 'STACKPHOT_PPSTACK'); # Recipe to use for ppstack
 unless ($recipe_psphot) {
     &my_die("Couldn't find selected reduction for STACKPHOT: $reduction\n", $sky_id, $PS_EXIT_CONFIG_ERROR);
 }
 
-print "reduction:     $reduction\n";
-print "recipe_psphot: $recipe_psphot\n";
+print "reduction:      $reduction\n";
+print "recipe_psphot:  $recipe_psphot\n";
+print "recipe_ppsub:   $recipe_ppsub\n";
+print "recipe_ppstack: $recipe_ppstack\n";
 
 # my $cmdflags;
@@ -163 +167 @@
     $command .= " -input $listName";
     $command .= " -threads $threads" if defined $threads;
-    $command .= " -recipe PSPHOT $recipe_psphot";
+    $command .= " -recipe PSPHOT  $recipe_psphot";
+    $command .= " -recipe PPSUB   $recipe_ppsub";
+    $command .= " -recipe PPSTACK $recipe_ppstack";
     $command .= " -dumpconfig $configuration";
     $command .= " -tracedest $traceDest -log $logDest";
@@ -206 +212 @@
                 my $outputSources  = $ipprc->filename("PSPHOT.STACK.OUTPUT", $outroot, $i);
 
-                &my_die("Couldn't find expected output file: $outputName", $sky_id, $PS_EXIT_SYS_ERROR) unless $ipprc->file_exists($outputName);
-                &my_die("Couldn't find expected output file: $outputMask", $sky_id, $PS_EXIT_SYS_ERROR) unless $ipprc->file_exists($outputMask);
-                &my_die("Couldn't find expected output file: $outputVariance", $sky_id, $PS_EXIT_SYS_ERROR) unless $ipprc->file_exists($outputVariance);
+                # XXX these are optional and not generated by default
+                # &my_die("Couldn't find expected output file: $outputName", $sky_id, $PS_EXIT_SYS_ERROR) unless $ipprc->file_exists($outputName);
+                # &my_die("Couldn't find expected output file: $outputMask", $sky_id, $PS_EXIT_SYS_ERROR) unless $ipprc->file_exists($outputMask);
+                # &my_die("Couldn't find expected output file: $outputVariance", $sky_id, $PS_EXIT_SYS_ERROR) unless $ipprc->file_exists($outputVariance);
                 &my_die("Couldn't find expected output file: $outputSources", $sky_id, $PS_EXIT_SYS_ERROR) unless $ipprc->file_exists($outputSources);
             }
@@ -220 +227 @@
             my $chisqVariance = $ipprc->filename("PSPHOT.CHISQ.VARIANCE", $outroot);
 
-            &my_die("Couldn't find expected output file: $chisqName",     $sky_id, $PS_EXIT_SYS_ERROR) unless $ipprc->file_exists($chisqName);
-            &my_die("Couldn't find expected output file: $chisqMask",     $sky_id, $PS_EXIT_SYS_ERROR) unless $ipprc->file_exists($chisqMask);
-            &my_die("Couldn't find expected output file: $chisqVariance", $sky_id, $PS_EXIT_SYS_ERROR) unless $ipprc->file_exists($chisqVariance);
+            # XXX check the recipe -- should we expect these to exist?
+            # &my_die("Couldn't find expected output file: $chisqName",           $sky_id, $PS_EXIT_SYS_ERROR) unless $ipprc->file_exists($chisqName);
+            # &my_die("Couldn't find expected output file: $chisqMask",           $sky_id, $PS_EXIT_SYS_ERROR) unless $ipprc->file_exists($chisqMask);
+            # &my_die("Couldn't find expected output file: $chisqVariance", $sky_id, $PS_EXIT_SYS_ERROR) unless $ipprc->file_exists($chisqVariance);
         }
     } else {