Changeset 27319 for trunk/psModules

Timestamp:

Mar 18, 2010, 12:01:15 PM (16 years ago)

Author:

Paul Price

Message:

Reworking ppStack to not grow the rejected pixels for the unconvolved stack. Also working with convolved and unconvolved stacks separately, so they don't have to be in memory at the same time. This should reduce the memory usage of ppStack.

Location:

trunk/psModules/src/imcombine

Files:

• pmStackReject.c (modified) (5 diffs)
• pmStackReject.h (modified) (1 diff)

trunk/psModules/src/imcombine/pmStackReject.c

@@ -10 +10 @@
 #include "pmSubtractionThreads.h"
 #include "pmSubtractionKernels.h"
+
+#include "pmStackReject.h"
 
 #define PIXEL_LIST_BUFFER 100           // Number of pixels to add to list at a time
@@ -115 +117 @@
 
 
-psPixels *pmStackReject(const psPixels *in, int numCols, int numRows, float threshold, float poorFrac,
-                        int stride, const psArray *subRegions, const psArray *subKernels)
+psPixels *pmStackReject(const psPixels *in, int numCols, int numRows, float threshold, int stride,
+                        const psArray *subRegions, const psArray *subKernels)
 {
     PS_ASSERT_PIXELS_NON_NULL(in, NULL);
@@ -223 +225 @@
     psTrace("psModules.imcombine", 7, "Found %ld bad pixels", bad->n);
 
-    // Now, grow the mask to include everything that touches a bad pixel in the convolution
-    psImage *source = psPixelsToMask(NULL, bad, psRegionSet(0, numCols - 1, 0, numRows - 1),
+    return bad;
+}
+
+
+psPixels *pmStackRejectGrow(const psPixels *in, int numCols, int numRows, float poorFrac,
+                            const psArray *subRegions, const psArray *subKernels)
+{
+    PS_ASSERT_PIXELS_NON_NULL(in, NULL);
+    PS_ASSERT_ARRAY_NON_NULL(subRegions, NULL);
+    PS_ASSERT_ARRAY_NON_NULL(subKernels, NULL);
+    PS_ASSERT_ARRAYS_SIZE_EQUAL(subRegions, subKernels, NULL);
+
+    psImage *source = psPixelsToMask(NULL, in, psRegionSet(0, numCols - 1, 0, numRows - 1),
                                      PM_STACK_MASK_BAD); // Mask image to grow
 
@@ -243 +256 @@
     bool oldThreads = psImageConvolveSetThreads(false); // Old value of threading for psImageColvolve
 
-    psImage *target = psImageRecycle(convolved, numCols, numRows, PS_TYPE_IMAGE_MASK); // Grown image
+    psImage *target = psImageAlloc(numCols, numRows, PS_TYPE_IMAGE_MASK); // Grown image
     psImageInit(target, 0);
     for (int i = 0; i < subRegions->n; i++) {
@@ -326 +339 @@
 
     psFree(source);
-    bad = psPixelsFromMask(bad, target, PM_STACK_MASK_ALL);
+    psPixels *bad = psPixelsFromMask(NULL, target, PM_STACK_MASK_ALL); // All bad pixels
     psFree(target);
     psTrace("psModules.imcombine", 7, "Total %ld bad pixels", bad->n);

trunk/psModules/src/imcombine/pmStackReject.h

@@ -12 +12 @@
                         int numCols, int numRows, ///< Size of image of interest
                         float threshold, ///< Threshold on convolved image, 0..1
-                        float poorFrac, ///< Fraction for "poor"
                         int stride,     ///< Size of convolution patches
                         const psArray *regions, ///< Array of image regions for image
                         const psArray *kernels ///< Array of kernel parameters for each region
+    );
+
+/// Given a list of pixels from the convolved image, we grow them by convolution to get the list of all pixels
+/// which should be rejected.
+psPixels *pmStackRejectGrow(const psPixels *in, ///< List of pixels in the convolved image
+                            int numCols, int numRows, ///< Size of image of interest
+                            float poorFrac, ///< Fraction for "poor"
+                            const psArray *regions, ///< Array of image regions for image
+                            const psArray *kernels ///< Array of kernel parameters for each region
     );