Changeset 28133

Timestamp:

May 27, 2010, 9:17:45 AM (16 years ago)

Author:

bills

Message:

Merged STATS fixes from trunk into ipp-20100525

Location:

tags/ipp-20100525/ippScripts/scripts

Files:

• diff_skycell.pl (modified) (3 diffs, 1 prop)
• stack_skycell.pl (modified) (2 diffs, 1 prop)

tags/ipp-20100525/ippScripts/scripts/diff_skycell.pl

@@ -197 +197 @@
 my $recipe_ppSub = $ipprc->reduction($reduction, 'DIFF_PPSUB'); # Recipe to use for ppSub
 my $recipe_psphot  = $ipprc->reduction($reduction, 'DIFF_PSPHOT'); # Recipe to use for psphot
+my $recipe_ppstats = 'DIFFSTATS';
 unless ($recipe_ppSub and $recipe_psphot) {
     &my_die("Couldn't find selected reduction for DIFF_PPSUB and DIFF_PSPHOT: $reduction\n", $diff_id, $skycell_id, $PS_EXIT_CONFIG_ERROR);
@@ -257 +258 @@
     $traceDest .= '.update';
     $outputStats .= '.update';
+
+    $recipe_ppstats = 'WARPSTATS';
 }
 
@@ -292 +295 @@
     $command .= " -recipe PPSUB $recipe_ppSub";
     $command .= " -recipe PSPHOT $recipe_psphot";
-    $command .= " -recipe PPSTATS DIFFSTATS";
+    $command .= " -recipe PPSTATS $recipe_ppstats";
     $command .= " -F PSPHOT.PSF.SAVE PSPHOT.PSF.SKY.SAVE";
     $command .= " -F PSPHOT.OUTPUT PSPHOT.OUT.CMF.MEF";

tags/ipp-20100525/ippScripts/scripts/stack_skycell.pl

@@ -149 +149 @@
 my $recipe_ppSub = $ipprc->reduction($reduction, 'STACK_PPSUB'); # Recipe to use for ppSub
 my $recipe_psphot  = $ipprc->reduction($reduction, 'STACK_PSPHOT'); # Recipe to use for psphot
+my $recipe_ppstats = 'STACKSTATS';
+if ($run_state eq 'update') {
+    $recipe_ppstats = 'WARPSTATS';
+}
 unless ($recipe_ppStack and $recipe_ppSub and $recipe_psphot) {
     &my_die("Couldn't find selected reduction for STACK_PPSTACK, STACK_PPSUB and STACK_PSPHOT: $reduction\n", $stack_id, $PS_EXIT_CONFIG_ERROR);
@@ -232 +236 @@
     $command .= " -recipe PPSUB $recipe_ppSub";
     $command .= " -recipe PSPHOT $recipe_psphot";
-    $command .= " -recipe PPSTATS STACKSTATS" if $do_stats;;
+    $command .= " -recipe PPSTATS $recipe_ppstats" if $do_stats;;
     $command .= " -F PSPHOT.PSF.SAVE PSPHOT.PSF.SKY.SAVE";
     $command .= " -F PSPHOT.OUTPUT PSPHOT.OUT.CMF.MEF";