Changeset 41848

Timestamp:

Oct 17, 2021, 1:31:19 PM (5 years ago)

Author:

eugene

Message:

basic combine-by-percent is working (needs variance and mask fixes)

Location:

branches/eam_branches/ppStack.20211015/src

Files:

• ppStackCombineFinal.c (modified) (1 diff)
• ppStackCombinePercent.c (modified) (2 diffs)
• ppStackLoopByPercent.c (modified) (2 diffs)

branches/eam_branches/ppStack.20211015/src/ppStackCombineFinal.c

@@ -2 +2 @@
 
 // This is the doomsday switch.
-// #define TESTING                         // Enable test output
+// # define TESTING                         // Enable test output
 
 //MEH -- adhoc addition to blank mask border of final stack since rejection different/none on order of KERNEL.SIZE with overlap in CombineInitial 

branches/eam_branches/ppStack.20211015/src/ppStackCombinePercent.c

@@ -1 +1 @@
 #include "ppStack.h"
+
+// #define TESTING
 
 bool ppStackCombinePercent(ppStackThreadData *stack, ppStackOptions *options, pmConfig *config)
@@ -32 +34 @@
     }
 
-    if (!psThreadPoolWait(false, true)) {
+    if (!psThreadPoolWait(true, true)) {
         psError(psErrorCodeLast(), false, "Unable to do initial combination.");
         return false;
-    }
-
-    psThreadJob *job;               // Completed job
-    while ((job = psThreadJobGetDone())) {
-        psAssert(strcmp(job->type, "PPSTACK_PERCENT_COMBINE") == 0,
-                 "Job has incorrect type: %s", job->type);
-        psFree(job);
     }
 

branches/eam_branches/ppStack.20211015/src/ppStackLoopByPercent.c

@@ -41 +41 @@
 
     // Done with stack inputs for now
-    // XXX is this where we are leaking??
     for (int i = 0; i < options->num; i++) {
         pmCellFreeData(options->cells->data[i]);
     }
-    // MEH -- must uncomment back out -- unclear is should be moved after pixel rejection
-    psFree(stack);
 
     psLogMsg("ppStack", PS_LOG_INFO, "Stage 5: Final Stack: %f sec", psTimerClear("PPSTACK_STEPS"));
@@ -96 +93 @@
         return false;
     }
-    // MEH -- also must uncomment back out..
     psFree(stack);
     psLogMsg("ppStack", PS_LOG_INFO, "Stage 7: Cleanup, WCS & JPEGS: %f sec", psTimerClear("PPSTACK_STEPS"));