Changeset 13591 for trunk/psModules/src/detrend

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/detrend

Files:

• pmFlatField.c (modified) (2 diffs)
• pmFlatField.h (modified) (2 diffs)
• pmMaskBadPixels.c (modified) (2 diffs)

trunk/psModules/src/detrend/pmFlatField.c

@@ -12 +12 @@
 #include "pmFlatField.h"
 
-bool pmFlatField(pmReadout *in, const pmReadout *flat)
+bool pmFlatField(pmReadout *in, const pmReadout *flat, psMaskType badFlat)
 {
     PS_ASSERT_PTR_NON_NULL(in, false);
@@ -79 +79 @@
             if (flatValue <= 0.0 || (flatMask && flatMask->data.U8[j + yOffset][i + xOffset])) { \
                 if (inMask) { \
-                    inMask->data.U8[j][i] |= PM_MASK_FLAT; \
+                    inMask->data.PS_TYPE_MASK_DATA[j][i] |= badFlat; \
                 } \
                 inImage->data.TYPE[j][i] = SPECIAL; \

trunk/psModules/src/detrend/pmFlatField.h

@@ -5 +5 @@
  * @author Paul Price, IfA
  *
- * @version $Revision: 1.9 $ $Name: not supported by cvs2svn $
- * @date $Date: 2007-03-30 21:12:56 $
+ * @version $Revision: 1.10 $ $Name: not supported by cvs2svn $
+ * @date $Date: 2007-06-02 03:51:03 $
  * Copyright 2004-2006 Institute for Astronomy, University of Hawaii
  */
@@ -24 +24 @@
 /// are masked, if there is a mask present in the input readout.
 bool pmFlatField(pmReadout *in,         ///< Readout with input image
-                 const pmReadout *flat  ///< Readout with flat image
+                 const pmReadout *flat,  ///< Readout with flat image
+                 psMaskType badFlat     ///< Mask value to give bad flat pixels
                 );
 /// @}

trunk/psModules/src/detrend/pmMaskBadPixels.c

@@ -66 +66 @@
             }
         }
-    } else {
-        // set raised pixels in exMask which are selected by maskVal
-        for (int j = 0; j < inMask->numRows; j++) {
-            int xJ = j - offRow;
-            for (int i = 0; i < inMask->numCols; i++) {
-                int xI = i - offCol;
-                if (exVal[xJ][xI] == 0) {
-                    inVal[j][i] |= PM_MASK_BAD;
-                }
-            }
-        }
     }
 
@@ -82 +71 @@
     psString timeString = psTimeToISO(time); // String with time
     psFree(time);
-    psStringPrepend(&timeString, "Static mask applied at ");
+    psStringPrepend(&timeString, "Static mask (selecting %x) applied at ", maskVal);
     psMetadataAddStr(hdu->header, PS_LIST_TAIL, "HISTORY", PS_META_DUPLICATE_OK,
                      timeString, "");