IPP Software Navigation Tools IPP Links Communication Pan-STARRS Links

Changeset 16685


Ignore:
Timestamp:
Feb 27, 2008, 11:16:57 AM (18 years ago)
Author:
Paul Price
Message:

Overlapping consecutive scans were interfering with each other. Restricted the region of combination. However, there's still a problem: rejection regions that transcend scans aren't being respected.

Location:
trunk/psModules/src/imcombine
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • trunk/psModules/src/imcombine/pmStack.c

    r16681 r16685  
    88 *  @author GLG, MHPCC
    99 *
    10  *  @version $Revision: 1.25 $ $Name: not supported by cvs2svn $
    11  *  @date $Date: 2008-02-27 02:25:10 $
     10 *  @version $Revision: 1.26 $ $Name: not supported by cvs2svn $
     11 *  @date $Date: 2008-02-27 21:16:57 $
    1212 *  Copyright 2004-2007 Institute for Astronomy, University of Hawaii
    1313 *
    … …  
    480480            int x = pixels->data[j].x, y = pixels->data[j].y; // Coordinates of interest
    481481            if (x < 0 || x >= numCols || y < 0 || y >= numRows) {
    482                 psWarning("Bad pixel coordinate: %d,%d --- ignored.", x, y);
     482                //                psWarning("Bad pixel coordinate: %d,%d --- ignored.", x, y);
    483483                continue;
    484484            }
    … …  
    528528/// Stack input images
    529529bool pmStackCombine(pmReadout *combined, psArray *input, psMaskType maskVal, psMaskType bad,
    530                     int numIter, float rej, bool useVariance, bool safe)
     530                    int kernelSize, int numIter, float rej, bool useVariance, bool safe)
    531531{
    532532    PS_ASSERT_PTR_NON_NULL(combined, false);
    … …  
    538538        return false;
    539539    }
     540    PS_ASSERT_INT_NONNEGATIVE(kernelSize, false);
    540541    PS_ASSERT_INT_POSITIVE(bad, false);
    541542    PS_ASSERT_INT_NONNEGATIVE(numIter, false);
    … …  
    580581    psFree(stack);
    581582    pmReadoutUpdateSize(combined, minInputCols, minInputRows, xSize, ySize, true, true, bad);
    582     psTrace("psModules.imcombine", 1, "Combining [%d:%d,%d:%d] (%dx%d)\n",
     583    psTrace("psModules.imcombine", 1, "Have for combination [%d:%d,%d:%d] (%dx%d)\n",
    583584            minInputCols, maxInputCols, minInputRows, maxInputRows, xSize, ySize);
     585
     586    // Reduce combination area by the size of the kernel
     587    minInputCols += kernelSize;
     588    maxInputCols -= kernelSize;
     589    minInputRows += kernelSize;
     590    maxInputRows -= kernelSize;
     591    psTrace("psModules.imcombine", 1, "Combining on [%d:%d,%d:%d]\n",
     592            minInputCols, maxInputCols, minInputRows, maxInputRows);
    584593
    585594

  • trunk/psModules/src/imcombine/pmStack.h

    r16620 r16685  
    88 * @author GLG, MHPCC
    99 *
    10  * @version $Revision: 1.5 $ $Name: not supported by cvs2svn $
    11  * @date $Date: 2008-02-23 02:02:59 $
     10 * @version $Revision: 1.6 $ $Name: not supported by cvs2svn $
     11 * @date $Date: 2008-02-27 21:16:57 $
    1212 *
    1313 * Copyright 2004-2007 Institute for Astronomy, University of Hawaii
    … …  
    4242                    psMaskType maskVal, ///< Mask value of bad pixels
    4343                    psMaskType bad,     ///< Mask value to give rejected pixels
     44                    int kernelSize,     ///< Half-size of the convolution kernel
    4445                    int numIter,        ///< Number of iterations
    4546                    float rej,          ///< Rejection limit (standard deviations)
Note: See TracChangeset for help on using the changeset viewer.