Changeset 27517 for branches/eam_branches/20100225/psModules/src/imcombine/pmStack.h

Timestamp:

Mar 29, 2010, 3:55:49 PM (16 years ago)

Author:

eugene

Message:

update merges from trunk

Location:

branches/eam_branches/20100225

Files:

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

branches/eam_branches/20100225/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