Changeset 31423

Timestamp:

May 2, 2011, 3:06:10 PM (15 years ago)

Author:

bills

Message:

Set stack type based on recipe value

Location:

tags/ipp-20110406

Files:

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

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

@@ -73 +73 @@
 PPSTACK.OUTPUT.EXPNUM       
 PPSTACK.OUTPUT.EXPWT
-PPSTACK.TARGET.PSF          
 PPSTACK.OUTPUT.JPEG1        
 PPSTACK.OUTPUT.JPEG2        
@@ -84 +83 @@
 # extra outputs when convolving
 my @outputListUnconv = qw(
+PPSTACK.TARGET.PSF          
 PPSTACK.UNCONV
 PPSTACK.UNCONV.MASK
@@ -208 +208 @@
     &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 +283 @@
     $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";

tags/ipp-20110406/ippconfig/recipes/ppStack.config

@@ -97 +97 @@
 OUTPUT.REPLICATE BOOL   TRUE
 
+STACK.TYPE      STR     DEEP_STACK
+
 # Recipe overrides for STACK
 STACK   METADATA
@@ -123 +125 @@
 END
 
+QUICKSTACK    METADATA
+        CONVOLVE        BOOL   FALSE
+        COMBINE.REJ     F32    3.0
+        COMBINE.DISCARD F32    0.3
+        MASK.VAL        STR    MASK.VALUE,CONV.BAD,GHOST,BURNTOOL # Mask value of input bad pixels
+END
 
 # 
@@ -130 +138 @@
 
 STACK_NIGHTLY  METADATA
+    STACK.TYPE      STR     NIGHTLY_STACK
 END
 

tags/ipp-20110406/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);