Changeset 42566

Timestamp:

Dec 3, 2023, 3:02:49 PM (3 years ago)

Author:

eugene

Message:

merge changes from trunk: add parameter for nminpix to pmStackCombineByPercentile

Location:

branches/eam_branches/ipp-20230313/ppStack

Files:

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

branches/eam_branches/ipp-20230313/ppStack/src/ppStackReadout.c

@@ -83 +83 @@
     thread->status = status ? PPSTACK_THREAD_SUCCESS : PPSTACK_THREAD_FAILURE;
 
-    // fprintf (stderr, "finished thread %d, status %d : scan range %d - %d\n", thread->entry, thread->status, thread->firstScan, thread->lastScan);
+    fprintf (stderr, "finished thread %d, status %d : scan range %d - %d\n", thread->entry, thread->status, thread->firstScan, thread->lastScan);
 
     psAssert(status, "Stacking failed.");
@@ -383 +383 @@
     bool mdok;                          // Status of MD lookup
     psF64 rejectFraction = psMetadataLookupF32(&mdok, recipe, "COMBINE.REJECT.FRACTION"); // fraction of outliers to reject
+    int nminpix = psMetadataLookupS32(&mdok, recipe, "NMINPIX"); // Minimum input per pixel to combine with
 
     char defaultBlankStr[16] = "BLANK";
@@ -422 +423 @@
     }
 
-    if (!pmStackCombineByPercentile(outRO, expRO, stackData, rejectFraction, maskBad, maskSuspect, maskBlank)) {
+      if (!pmStackCombineByPercentile(outRO, expRO, stackData, rejectFraction, nminpix, maskBad, maskSuspect, maskBlank)) {
         psError(PS_ERR_UNKNOWN, false, "Unable to combine input readouts with rejection.");
         psFree(stackData);