Changeset 34860

Timestamp:

Dec 19, 2012, 2:07:18 PM (14 years ago)

Author:

bills

Message:

added recipe value to turn off background stacking. set it to false because
the current implementation is not ready for input warps that don't have a background
model.

Location:

trunk

Files:

• ippconfig/recipes/ppStack.config (modified) (1 diff)
• ppStack/src (modified) (1 prop)
• ppStack/src/ppStackLoop.c (modified) (3 diffs)

trunk/ippconfig/recipes/ppStack.config

@@ -32 +32 @@
 TARGET.FRAC     F32     0.1             # Minimum flux fraction for target PSF
 TARGET.MINMAG   F32     3.0             # Minimum magnitude difference to tolerate in stamp
+
+BACKGROUND.MODEL    BOOL   FALSE        # Construct a stacked version of the warp stage background
 
 RENORM          BOOL    TRUE            # Renormalise weight maps?

trunk/ppStack/src

@@ -6 +6 @@
 *.la
 ppStack
+ppStackMedian
 config.h
 config.h.in
@@ -12 +13 @@
 ppStackErrorCodes.c
 ppStackErrorCodes.h
+

@@ -6 +6 @@
 *.la
 ppStack
+ppStackMedian
 config.h
 config.h.in
@@ -12 +13 @@
 ppStackErrorCodes.c
 ppStackErrorCodes.h
+

trunk/ppStack/src/ppStackLoop.c

@@ -41 +41 @@
     if (options->quality) return true; // Can't do anything else
 
+    psMetadata *recipe = psMetadataLookupMetadata(NULL, config->recipes, PPSTACK_RECIPE); // ppStack recipe
+
     // Ensure sufficient inputs
     {
         int numGood = stackSummary(options, "initial combination");
-        psMetadata *recipe = psMetadataLookupMetadata(NULL, config->recipes, PPSTACK_RECIPE); // ppStack recipe
         bool safe = psMetadataLookupBool(NULL, recipe, "SAFE"); // Be safe when combining
         if (safe && numGood <= 1) {
@@ -62 +63 @@
     }
 
+    bool doBackground = psMetadataLookupBool(NULL, recipe, "BACKGROUND.MODEL");
+
     // Prepare for combination
-    if (!ppStackCombinePrepare("PPSTACK.OUTPUT", "PPSTACK.OUTPUT.EXP", "PPSTACK.OUTPUT.BKGMODEL", PPSTACK_FILES_STACK, stack, options, config)) {
+    if (!ppStackCombinePrepare("PPSTACK.OUTPUT", "PPSTACK.OUTPUT.EXP", doBackground ? "PPSTACK.OUTPUT.BKGMODEL" : NULL, PPSTACK_FILES_STACK, stack, options, config)) {
         psError(psErrorCodeLast(), false, "Unable to prepare for combination.");
         psFree(stack);
@@ -143 +146 @@
 
     // Generate median background stack here.
-    if (!ppStackCombineBackground(stack, options, config)) {
+    if (doBackground && !ppStackCombineBackground(stack, options, config)) {
       psError(psErrorCodeLast(), false, "Unable to generate median of background images.");
       psFree(stack);

@@ -6 +6 @@
 *.la
 ppStack
+ppStackMedian
 config.h
 config.h.in
@@ -12 +13 @@
 ppStackErrorCodes.c
 ppStackErrorCodes.h
+