Changeset 13591 for trunk/psModules/src/imcombine

Timestamp:

Jun 1, 2007, 5:51:03 PM (19 years ago)

Author:

Paul Price

Message:

Adding pmConfigMask to use symbolic names for mask values. Need to adapt APIs that use mask values to accept the values for those masks (which can be obtained from pmConfigMask).

Location:

trunk/psModules/src/imcombine

Files:

• pmReadoutCombine.c (modified) (2 diffs)
• pmReadoutCombine.h (modified) (2 diffs)

trunk/psModules/src/imcombine/pmReadoutCombine.c

@@ -29 +29 @@
     params->combine = combine;
     params->maskVal = 0;
+    params->blank = 0;
     params->nKeep = 0;
     params->fracHigh = 0.0;
@@ -335 +336 @@
 
             if (numValid == 0) {
-                outputMask[yOut][xOut] = PM_MASK_FLAT;
+                outputMask[yOut][xOut] = params->blank;
                 outputImage[yOut][xOut] = NAN;
                 continue;

trunk/psModules/src/imcombine/pmReadoutCombine.h

@@ -1 +1 @@
 /* @file  pmReadoutCombine.h
  * @brief Combine multiple readouts
- * 
+ *
  * @author George Gusciora, MHPCC
  * @author Paul Price, IfA
- * 
- * @version $Revision: 1.11 $ $Name: not supported by cvs2svn $
- * @date $Date: 2007-03-30 21:12:56 $
+ *
+ * @version $Revision: 1.12 $ $Name: not supported by cvs2svn $
+ * @date $Date: 2007-06-02 03:51:03 $
  * Copyright 2004-2006 Institute for Astronomy, University of Hawaii
  */
@@ -24 +24 @@
     psStatsOptions combine;             ///< Statistic to use when performing the combination
     psMaskType maskVal;                 ///< Mask value
+    psMaskType 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