Changeset 17085

Timestamp:

Mar 20, 2008, 5:24:32 PM (18 years ago)

Author:

Paul Price

Message:

Small changes to bad pixel masking --- adding readout analysis names to header.

Location:

branches/pap_branch_080320/psModules/src/detrend

Files:

• pmMaskBadPixels.c (modified) (1 diff)
• pmMaskBadPixels.h (modified) (3 diffs)

branches/pap_branch_080320/psModules/src/detrend/pmMaskBadPixels.c

@@ -110 +110 @@
 
     bool whole = false;                 // Mask whole image?
-    float median = psMetadataLookupF32 (&status, readout->analysis, "READOUT.MEDIAN");
+    float median = psMetadataLookupF32 (&status, readout->analysis, PM_MASK_ANALYSIS_MEAN);
     if (!status || !isfinite(median)) {
         whole = true;
     }
-    float stdev  = psMetadataLookupF32 (&status, readout->analysis, "READOUT.STDEV");
+    float stdev  = psMetadataLookupF32 (&status, readout->analysis, PM_MASK_ANALYSIS_STDEV);
     if (!status || !isfinite(stdev)) {
         whole = true;

branches/pap_branch_080320/psModules/src/detrend/pmMaskBadPixels.h

@@ -5 +5 @@
  * @author Eugene Magnier, IfA
  *
- * @version $Revision: 1.15 $ $Name: not supported by cvs2svn $
- * @date $Date: 2007-12-24 21:10:28 $
+ * @version $Revision: 1.15.6.1 $ $Name: not supported by cvs2svn $
+ * @date $Date: 2008-03-21 03:24:32 $
  * Copyright 2004 Institute for Astronomy, University of Hawaii
  */
@@ -15 +15 @@
 /// @addtogroup detrend Detrend Creation and Application
 /// @{
+
+#define PM_MASK_ANALYSIS_MEAN "MASK.MEAN" // Readout analysis metadata keyword with mean value
+#define PM_MASK_ANALYSIS_STDEV "MASK.STDEV" // Readout analysis metadata keyword with stdev value
+
 
 typedef enum {
@@ -60 +64 @@
 psImage *pmMaskIdentifyBadPixels(const psImage *suspects, ///< Accumulated suspect pixels image
                                  psMaskType maskVal, ///< Value to set for bad pixels
-                                 int nTotal,
+                                 int nTotal,
                                  float thresh, ///< Threshold for bad pixel (standard deviations)
-                                 pmMaskIdentifyMode mode
+                                 pmMaskIdentifyMode mode
                                 );
 /// @}