Changeset 31422

Timestamp:

May 2, 2011, 2:58:39 PM (15 years ago)

Author:

bills

Message:

Get the value for STACK.TYPE from recipe an dpass it it ppStack using -stack-type parameter

Location:

trunk

Files:

• ippScripts/scripts/stack_skycell.pl (modified) (3 diffs)
• ippconfig/recipes/ppStack.config (modified) (2 diffs)
• ppStack/src/ppStackArguments.c (modified) (1 diff)

trunk/ippScripts/scripts/stack_skycell.pl

@@ -181 +181 @@
 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';
+if ($
+run_state eq 'update') {
+     $recipe_ppstats = 'WARPSTATS';
 }
 unless ($recipe_ppStack and $recipe_ppSub and $recipe_psphot) {
@@ -208 +209 @@
     &my_die("Unable to not compress and logflux compress simultaneously. Check config.",$stack_id, $PS_EXIT_CONFIG_ERROR);
 }
+my $stack_type = metadataLookupStr($recipe, 'STACK.TYPE');
+&my_die("STACK.TYPE not found in recipe. Check config.",$stack_id, $PS_EXIT_CONFIG_ERROR) unless $stack_type;
 
 # Generate MDC file with the inputs
@@ -281 +284 @@
     $command .= " -recipe PSPHOT $recipe_psphot";
     $command .= " -recipe PPSTATS $recipe_ppstats" if $do_stats;;
+    $command .= " -stack-type $stack_type";
     $command .= " -F PSPHOT.PSF.SAVE PSPHOT.PSF.SKY.SAVE";
     $command .= " -F PSPHOT.OUTPUT PSPHOT.OUT.CMF.MEF";

trunk/ippconfig/recipes/ppStack.config

@@ -97 +97 @@
 OUTPUT.REPLICATE BOOL   TRUE
 
+STACK.TYPE      STR     DEEP_STACK
+
 # Recipe overrides for STACK
 STACK   METADATA
@@ -136 +138 @@
 
 STACK_NIGHTLY  METADATA
+    STACK.TYPE      STR     NIGHTLY_STACK
 END
 

trunk/ppStack/src/ppStackArguments.c

@@ -204 +204 @@
         }
         psArgumentRemove (argNum, &argc, argv);
-        if (strcasecmp(argv[argNum], "NIGHTLY") && strcasecmp(argv[argNum], "DEEP") && strcasecmp(argv[argNum], "BEST_IQ")) {
+        if (strcasecmp(argv[argNum], "NIGHTLY_STACK") && strcasecmp(argv[argNum], "DEEP_STACK") && strcasecmp(argv[argNum], "IQ_STACK")) {
             psErrorStackPrint(stderr, "Invalid option for -stack-type %s (must be one of NIGHTLY_STACK, DEEP_STACK, IQ_STACK)", argv[argNum]);
             exit(PS_EXIT_CONFIG_ERROR);