Changeset 34902 for branches/eam_branches/ipp-20121219/ppStack/src/ppStackLoop.c

Timestamp:

Jan 10, 2013, 11:33:10 AM (14 years ago)

Author:

eugene

Message:

merge changes from trunk

Location:

branches/eam_branches/ipp-20121219

Files:

• . (modified) (1 prop)
• ppStack/src (modified) (1 prop)
• ppStack/src/ppStackLoop.c (modified) (3 diffs)

branches/eam_branches/ipp-20121219/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
+

branches/eam_branches/ipp-20121219/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
+