Changeset 7283 for trunk/psModules/src/detrend

Timestamp:

Jun 1, 2006, 4:16:05 PM (20 years ago)

Author:

Paul Price

Message:

Restoring pmMaskBadPixels to the build (it has different functionality than pmReadoutSetMask, which only sets the mask on the basis of the image pixels, not on the basis of an independent bad pixel mask). Moved pmMaskValue to pmFPAMaskWeight.h, since it's related to the camera more than the detrend step. Changed a whole heap of #include statements to point to the new location.

Location:

trunk/psModules/src/detrend

Files:

• Makefile.am (modified) (2 diffs)
• pmFlatField.c (modified) (2 diffs)
• pmMaskBadPixels.c (modified) (4 diffs)
• pmMaskBadPixels.h (modified) (3 diffs)

trunk/psModules/src/detrend/Makefile.am

@@ -7 +7 @@
         pmFlatNormalize.c \
         pmFringeStats.c \
+        pmMaskBadPixels.c \
         pmNonLinear.c \
         pmSubtractBias.c
 #       pmSubtractSky.c
-#       pmMaskBadPixels.c
 
 psmoduleincludedir = $(includedir)
@@ -18 +18 @@
         pmFlatNormalize.h \
         pmFringeStats.h \
+        pmMaskBadPixelsErrors.h \
+        pmMaskBadPixels.h \
         pmNonLinear.h \
         pmSubtractBias.h
 #       pmSubtractSky.c
-#       pmMaskBadPixelsErrors.h
-#       pmMaskBadPixels.h
 
 EXTRA_DIST = \

trunk/psModules/src/detrend/pmFlatField.c

@@ -18 +18 @@
  *  @author Ross Harman, MHPCC
  *
- *  @version $Revision: 1.7 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2006-06-02 00:55:23 $
+ *  @version $Revision: 1.8 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2006-06-02 02:16:05 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -34 +34 @@
 #include "pslib.h"
 #include "pmFlatField.h"
-#include "pmMaskBadPixels.h"
+#include "pmFPAMaskWeight.h"
 #include "pmFlatFieldErrors.h"
 

trunk/psModules/src/detrend/pmMaskBadPixels.c

@@ -1 @@
-//////////////////////////////////////////////////////////////////////////////////////////////////////////////
-// XXX WARNING: I have completely replaced this file with an OLD VERSION (that works) instead of the
-// one that was being worked on.
-//////////////////////////////////////////////////////////////////////////////////////////////////////////////
-
 /** @file  pmMaskBadPixels.c
  *
@@ -24 +19 @@
  *  @author Ross Harman, MHPCC
  *
- *  @version $Revision: 1.6 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2006-04-19 20:37:35 $
+ *  @version $Revision: 1.7 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2006-06-02 02:16:05 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -34 +29 @@
 #endif
 
-#include<stdio.h>
-#include<math.h>
-#include<strings.h>
+#include <stdio.h>
+#include <math.h>
+#include <strings.h>
 
+#include "pmFPAMaskWeight.h"
 #include "pmMaskBadPixels.h"
 #include "pmMaskBadPixelsErrors.h"
@@ -148 +144 @@
             /* Pixels which satisfy growVal and within the grow radius shall be masked */                    \
             if(mask->data.PS_TYPE_MASK_DATA[j][i] & growVal) {                                               \
-                rowMin = PS_MAX(j-grow, 0);                                                                     \
-                rowMax = PS_MIN(j+grow+1, inImage->numRows);                                                    \
-                colMin = PS_MAX(i-grow, 0);                                                                     \
-                colMax = PS_MIN(i+grow+1, inImage->numCols);                                                    \
+                rowMin = PS_MAX(j-grow, 0);                                                                  \
+                rowMax = PS_MIN(j+grow+1, inImage->numRows);                                                 \
+                colMin = PS_MAX(i-grow, 0);                                                                  \
+                colMax = PS_MIN(i+grow+1, inImage->numCols);                                                 \
                 for(jj=rowMin; jj<rowMax; jj++) {                                                            \
                     for(ii=colMin; ii<colMax; ii++) {                                                        \

trunk/psModules/src/detrend/pmMaskBadPixels.h

@@ -1 @@
-//////////////////////////////////////////////////////////////////////////////////////////////////////////////
-// XXX WARNING: I have completely replaced this file with an OLD VERSION (that works) instead of the
-// one that was being worked on.
-//////////////////////////////////////////////////////////////////////////////////////////////////////////////
-
 /** @file  pmMaskBadPixels.h
  *
@@ -24 +19 @@
  *  @author Ross Harman, MHPCC
  *
- *  @version $Revision: 1.5 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2006-05-04 03:57:32 $
+ *  @version $Revision: 1.6 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2006-06-02 02:16:05 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
  */
+#ifndef PM_MASK_BAD_PIXELS_H
+#define PM_MASK_BAD_PIXELS_H
 
 #include "pslib.h"
 #include "pmFPA.h"
-
-// these defines are necessary to yield 8-bit results (use instead of ~)
-# define NOT_U8(A)(UCHAR_MAX-(A))
-# define NOT_U16(A)(USHORT_MAX-(A))
-
-/** Mask values */
-typedef enum {
-    PM_MASK_CLEAR   = 0x00,   ///< The pixel is not masked
-    PM_MASK_TRAP    = 0x01,   ///< The pixel is a charge trap.
-    PM_MASK_BADCOL  = 0x02,   ///< The pixel is a bad column.
-    PM_MASK_SAT     = 0x04,   ///< The pixel is saturated.
-    PM_MASK_BAD     = 0x08,   ///< The pixel is low
-    PM_MASK_FLAT    = 0x10,   ///< The pixel is non-positive in the flat-field.
-    PM_MASK_MARK    = 0x20,   ///< The pixel is marked as temporarily ignored
-    PM_MASK_EXT1    = 0x40,   ///< This mask value is not used
-    PM_MASK_EXT2    = 0x80,   ///< This mask value is not used
-} pmMaskValue;
-
-bool pmReadoutSetMask(pmReadout *readout // Readout for which to set mask
-                     );
-bool pmReadoutSetWeight(pmReadout *readout // Readout for which to set weight
-                       );
-bool pmCellSetMaskWeight(pmCell *cell // Cell for which to set weights
-                        );
 
 /** Execute bad pixels module.
@@ -74 +47 @@
 );
 
+
+#endif