Changeset 32982 for trunk

Timestamp:

Dec 20, 2011, 11:36:11 AM (15 years ago)

Author:

bills

Message:

pass PSPHOT recipe to psastro. don't pass -threads

File:

• trunk/ippScripts/scripts/skycalibration.pl (modified) (2 diffs)

trunk/ippScripts/scripts/skycalibration.pl

@@ -117 +117 @@
 }
 
+# XXX: We are making the bad assumption here that the staticksky run used the same reduction class
+# as this skycalRun
+my $recipe_psphot = $ipprc->reduction($reduction, "STACKPHOT_PSPHOT");
+unless ($recipe_psphot) {
+    &my_die("Couldn't find selected reduction for STATCKPHOT_PSPHOT: $reduction\n", $skycal_id, $PS_EXIT_CONFIG_ERROR);
+}
+
 print "reduction:      $reduction\n";
 print "recipe_psastro: $recipe_psastro\n";
+print "recipe_psphot:  $recipe_psphot\n";
 
 my $configuration = $ipprc->filename("PSASTRO.CONFIG", $outroot);
@@ -188 +196 @@
     my $command = "$psastro $outroot";
     $command .= " -file $file";
-    $command .= " -threads $threads" if defined $threads;
+#     $command .= " -threads $threads" if defined $threads;  # psastro doesn't currently accept -threads
     $command .= " -recipe PSASTRO  $recipe_psastro";
+    $command .= " -recipe PSPHOT   $recipe_psphot";
     $command .= " -F PSASTRO.OUTPUT $output_sources_filerule";
     $command .= " -stats $stats";