Changeset 21363 for trunk/psModules/src/imcombine/pmReadoutCombine.h

Timestamp:

Feb 5, 2009, 4:31:25 PM (17 years ago)

Author:

Paul Price

Message:

Merging pap_branch_20090128. Resolved a small number of conflicts. Compiles, but not tested in detail.

File:

• trunk/psModules/src/imcombine/pmReadoutCombine.h (modified) (4 diffs)

trunk/psModules/src/imcombine/pmReadoutCombine.h

@@ -5 +5 @@
  * @author Paul Price, IfA
  *
- * @version $Revision: 1.15 $ $Name: not supported by cvs2svn $
- * @date $Date: 2009-01-27 06:39:38 $
+ * @version $Revision: 1.16 $ $Name: not supported by cvs2svn $
+ * @date $Date: 2009-02-06 02:31:25 $
  * Copyright 2004-2006 Institute for Astronomy, University of Hawaii
  */
@@ -22 +22 @@
 typedef struct {
     psStatsOptions combine;             ///< Statistic to use when performing the combination
-    psImageMaskType maskVal;            ///< Mask value
-    psImageMaskType blank;            ///< Mask value to give blank (i.e., no data) pixels
+    psImageMaskType maskVal;            ///< Mask value
+    psImageMaskType blank;            ///< Mask value to give blank (i.e., no data) pixels
     int nKeep;                          ///< Mimimum number of pixels to keep
     float fracHigh;                     ///< Fraction of high pixels to immediately throw
@@ -29 +29 @@
     int iter;                           ///< Number of iterations for clipping (for CLIPPED_MEAN only)
     float rej;                          ///< Rejection threshould for clipping (for CLIPPED_MEAN only)
-    bool weights;                       ///< Use the supplied weights (instead of calculated stdev)?
+    bool variances;                     ///< Use the supplied variances (instead of calculated stdev)?
 } pmCombineParams;
 
@@ -41 +41 @@
 /// Combine multiple readouts, applying zero and scale, with optional minmax clipping
 bool pmReadoutCombine(pmReadout *output,///< Output readout; altered and returned
-                      const psArray *inputs,  ///< Array of input readouts (F32 image and weight, U8 mask)
+                      const psArray *inputs,  ///< Array of input readouts
                       const psVector *zero, ///< Zero corrections to subtract from input, or NULL
                       const psVector *scale, ///< Scale corrections to divide into input, or NULL