Changeset 27840 for branches/simtest_nebulous_branches/psModules/src/imcombine/pmStack.h

Timestamp:

May 3, 2010, 8:50:52 AM (16 years ago)

Author:

eugene

Message:

updates from trunk

Location:

branches/simtest_nebulous_branches

Files:

• . (modified) (1 prop)
• psModules (modified) (1 prop)
• psModules/src/imcombine/pmStack.h (modified) (3 diffs)

branches/simtest_nebulous_branches/psModules/src/imcombine/pmStack.h

@@ -31 +31 @@
     psPixels *inspect;                  ///< Pixels to inspect
     float weight;                       ///< Relative weighting for image
+    float exp;                          ///< Exposure time
     float addVariance;                  ///< Additional variance when rejecting
 } pmStackData;
@@ -37 +38 @@
 pmStackData *pmStackDataAlloc(pmReadout *readout, ///< Warped readout (sky cell)
                               float weight, ///< Weight to apply
+                              float exp,    ///< Exposure time
                               float addVariance ///< Additional variance when rejecting
     );
@@ -42 +44 @@
 /// Stack input images
 bool pmStackCombine(pmReadout *combined,///< Combined readout (output)
+                    pmReadout *expmaps, ///< Exposure maps (output)
                     psArray *input,     ///< Input array of pmStackData
                     psImageMaskType maskVal, ///< Mask value of bad pixels
+                    psImageMaskType suspect, ///< Mask value of suspect pixels
                     psImageMaskType bad,     ///< Mask value to give rejected pixels
                     int kernelSize,     ///< Half-size of the convolution kernel
-                    int numIter,        ///< Number of iterations
+                    float iter,         ///< Number of iterations per input
                     float rej,          ///< Rejection limit (standard deviations)
                     float sys,          ///< Relative systematic error
                     float discard,      ///< Fraction of values to discard for Olympic weighted mean
-                    bool entire,        ///< Combine entire image even if rejection lists provided?
                     bool useVariance,   ///< Use variance values for rejection?
                     bool safe,          ///< Play safe with small numbers of input pixels (mask if N <= 2)?