Changeset 14632

Timestamp:

Aug 23, 2007, 10:38:47 AM (19 years ago)

Author:

Paul Price

Message:

Moving pmSubtractionDeconvolveMask out of subtraction files, renaming pmStackReject, and putting it in its own file. It's used for stacking, not subtraction, even though it uses the subtraction functions. Added the forward convolution, so that all pixels that should be rejected are rejected (not just those that are bad in the original image, but all those that it contributes to in the convolved image.

Location:

trunk/psModules/src/imcombine

Files:

• Makefile.am (modified) (2 diffs)
• pmStackReject.c (added)
• pmStackReject.h (added)
• pmSubtraction.c (modified) (2 diffs)
• pmSubtraction.h (modified) (2 diffs)

trunk/psModules/src/imcombine/Makefile.am

@@ -7 +7 @@
         pmReadoutCombine.c      \
         pmStack.c               \
+        pmStackReject.c         \
         pmSubtraction.c         \
         pmSubtractionKernels.c  \
@@ -15 +16 @@
         pmReadoutCombine.h      \
         pmStack.h               \
+        pmStackReject.h         \
         pmSubtraction.h         \
         pmSubtractionKernels.h  \

trunk/psModules/src/imcombine/pmSubtraction.c

@@ -4 +4 @@
  *  @author GLG, MHPCC
  *
- *  @version $Revision: 1.46 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2007-08-23 02:00:29 $
+ *  @version $Revision: 1.47 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2007-08-23 20:38:47 $
  *
  *  Copyright 2004-2007 Institute for Astronomy, University of Hawaii
@@ -1023 +1023 @@
 
 
-psPixels *pmSubtractionDeconvolveMask(const psPixels *in, float threshold, const psArray *regions,
-                                      const psArray *solutions, const pmSubtractionKernels *kernels)
-{
-    PS_ASSERT_PIXELS_NON_NULL(in, NULL);
-    PS_ASSERT_FLOAT_LARGER_THAN_OR_EQUAL(threshold, 0.0, NULL);
-    PS_ASSERT_FLOAT_LESS_THAN_OR_EQUAL(threshold, 1.0, NULL);
-    PS_ASSERT_ARRAY_NON_NULL(regions, NULL);
-    PS_ASSERT_ARRAY_NON_NULL(solutions, NULL);
-    PS_ASSERT_ARRAYS_SIZE_EQUAL(regions, solutions, NULL);
-    PS_ASSERT_PTR_NON_NULL(kernels, NULL);
-
-    // Get the original image size
-    int numRegions = regions->n;        // Number of regions
-    int numCols = 0, numRows = 0;       // Size of original image
-    int minCols = INT_MAX, minRows = INT_MAX; // Minimum coordinate for image --- should be 0,0
-    for (int i = 0; i < numRegions; i++) {
-        psRegion *region = regions->data[i]; // Region of interest
-        if (region->x0 < minCols) {
-            minCols = region->x0;
-        }
-        if (region->y0 < minRows) {
-            minRows = region->y0;
-        }
-        if (region->x1 > numCols) {
-            numCols = region->x1;
-        }
-        if (region->y1 > numRows) {
-            numRows = region->y1;
-        }
-    }
-    if (minCols != 0 || minRows != 0) {
-        psError(PS_ERR_BAD_PARAMETER_VALUE, true,
-                "Some error with image regions --- minimum coordinate is not 0,0");
-        return NULL;
-    }
-
-    psImage *mask = psPixelsToMask(NULL, in, psRegionSet(0, numCols, 0, numRows), 0x01); // Mask image
-    psImage *image = psImageCopy(NULL, mask, PS_TYPE_F32); // Floating-point version, so we can convolve
-    psFree(mask);
-
-    // Convolve the image with the kernel --- we're basically applying a matched filter and then thresholding
-    psImage *convolved = NULL;          // Convolved image
-    psPixels *out = NULL;               // List of pixels that should be masked
-    for (int i = 0; i < numRegions; i++) {
-        psRegion *region = regions->data[i]; // Region of interest
-        psVector *solution = solutions->data[i]; // Solution of interest
-        if (!pmSubtractionConvolve(&convolved, NULL, NULL, image, NULL, NULL, 0, region, solution, kernels)) {
-            psError(PS_ERR_UNKNOWN, false, "Unable to convolve mask image in region %d.", i);
-            psFree(convolved);
-            psFree(image);
-            return NULL;
-        }
-
-        // Need to adjust the thresholding level for the normalisation of the kernel --- the application of
-        // the kernel may scale the unit level that we've inserted.
-
-        // Image of the kernel at the centre of the region
-        float xNorm = (region->x0 + 0.5 * (region->x1 - region->x0) - numCols/2.0) / (float)numCols;
-        float yNorm = (region->y0 + 0.5 * (region->y1 - region->y0) - numRows/2.0) / (float)numRows;
-        psImage *kernel = pmSubtractionKernelImage(solution, kernels, xNorm, yNorm);
-        if (!kernel) {
-            psError(PS_ERR_UNKNOWN, false, "Unable to generate kernel image.");
-            psFree(convolved);
-            psFree(image);
-            return NULL;
-        }
-        float sum = 0.0;
-        for (int y = 0; y < kernel->numRows; y++) {
-            for (int x = 0; x < kernel->numCols; x++) {
-                sum += kernel->data.F32[y][x];
-            }
-        }
-        psFree(kernel);
-
-        psImage *subConv = psImageSubset(convolved, *region); // Sub-image of convolved image
-        psBinaryOp(subConv, subConv, "*", psScalarAlloc(1.0 / sum, PS_TYPE_F32));
-    }
-    psFree(image);
-
-    // Threshold the convolved image
-    for (int y = 0; y < numRows; y++) {
-        for (int x = 0; x < numCols; x++) {
-            if (convolved->data.F32[y][x] > threshold) {
-                out = psPixelsAdd(out, PIXEL_LIST_BUFFER, x, y);
-            }
-        }
-    }
-    psFree(convolved);
-
-    return out;
-}

trunk/psModules/src/imcombine/pmSubtraction.h

@@ -6 +6 @@
  * @author GLG, MHPCC
  *
- * @version $Revision: 1.10 $ $Name: not supported by cvs2svn $
- * @date $Date: 2007-08-22 02:56:53 $
+ * @version $Revision: 1.11 $ $Name: not supported by cvs2svn $
+ * @date $Date: 2007-08-23 20:38:47 $
  * Copyright 2004-207 Institute for Astronomy, University of Hawaii
  */
@@ -91 +91 @@
     );
 
-/// Given a list of pixels from the convolved image, find the corresponding (smaller subset of) pixels in the
-/// original image
-///
-/// We apply a matched filter to the corresponding mask image, and threshold to find the original pixels
-psPixels *pmSubtractionDeconvolveMask(const psPixels *in, ///< List of pixels in the convolved image
-                                      float threshold, ///< Threshold on convolved image, 0..1
-                                      const psArray *regions, ///< Array of image regions for image
-                                      const psArray *solutions, ///< Array of solution vectors for image
-                                      const pmSubtractionKernels *kernels ///< Kernel parameters
-    );
-
 /// @}
 #endif