Changeset 7283
- Timestamp:
- Jun 1, 2006, 4:16:05 PM (20 years ago)
- Location:
- trunk/psModules/src
- Files:
-
- 11 edited
-
camera/pmFPAMaskWeight.h (modified) (1 diff)
-
camera/pmFPAfile.c (modified) (1 diff)
-
detrend/Makefile.am (modified) (2 diffs)
-
detrend/pmFlatField.c (modified) (2 diffs)
-
detrend/pmMaskBadPixels.c (modified) (4 diffs)
-
detrend/pmMaskBadPixels.h (modified) (3 diffs)
-
imcombine/pmReadoutCombine.c (modified) (2 diffs)
-
objects/pmPSFtry.c (modified) (2 diffs)
-
objects/pmSource.c (modified) (4 diffs)
-
objects/pmSourcePhotometry.c (modified) (3 diffs)
-
objects/pmSourceSky.c (modified) (2 diffs)
Legend:
- Unmodified
- Added
- Removed
-
trunk/psModules/src/camera/pmFPAMaskWeight.h
r7017 r7283 4 4 #include "pmFPA.h" 5 5 6 // these defines are necessary to yield 8-bit results (use instead of ~) 7 #define NOT_U8(A)(UCHAR_MAX-(A)) 8 #define NOT_U16(A)(USHORT_MAX-(A)) 9 6 10 /** Mask values */ 7 11 typedef enum { 8 PM_MASK_TRAP = 0x0001, ///< The pixel is a charge trap. 9 PM_MASK_BADCOL = 0x0002, ///< The pixel is a bad column. 10 PM_MASK_SAT = 0x0004, ///< The pixel is saturated. 11 PM_MASK_BAD = 0x0008, ///< The pixel is low 12 PM_MASK_FLAT = 0x0010 ///< The pixel is non-positive in the flat-field. 12 PM_MASK_CLEAR = 0x00, ///< The pixel is not masked 13 PM_MASK_TRAP = 0x01, ///< The pixel is a charge trap. 14 PM_MASK_BADCOL = 0x02, ///< The pixel is a bad column. 15 PM_MASK_SAT = 0x04, ///< The pixel is saturated. 16 PM_MASK_BAD = 0x08, ///< The pixel is low 17 PM_MASK_FLAT = 0x10, ///< The pixel is non-positive in the flat-field. 18 PM_MASK_MARK = 0x20, ///< The pixel is marked as temporarily ignored 19 PM_MASK_EXT1 = 0x40, ///< This mask value is not used 20 PM_MASK_EXT2 = 0x80, ///< This mask value is not used 13 21 } pmMaskValue; 14 22 -
trunk/psModules/src/camera/pmFPAfile.c
r7279 r7283 5 5 #include "pmHDU.h" 6 6 #include "pmFPA.h" 7 #include "pm MaskBadPixels.h"7 #include "pmFPAMaskWeight.h" 8 8 #include "pmFPAConstruct.h" 9 9 #include "pmFPAview.h" -
trunk/psModules/src/detrend/Makefile.am
r7275 r7283 7 7 pmFlatNormalize.c \ 8 8 pmFringeStats.c \ 9 pmMaskBadPixels.c \ 9 10 pmNonLinear.c \ 10 11 pmSubtractBias.c 11 12 # pmSubtractSky.c 12 # pmMaskBadPixels.c13 13 14 14 psmoduleincludedir = $(includedir) … … 18 18 pmFlatNormalize.h \ 19 19 pmFringeStats.h \ 20 pmMaskBadPixelsErrors.h \ 21 pmMaskBadPixels.h \ 20 22 pmNonLinear.h \ 21 23 pmSubtractBias.h 22 24 # pmSubtractSky.c 23 # pmMaskBadPixelsErrors.h24 # pmMaskBadPixels.h25 25 26 26 EXTRA_DIST = \ -
trunk/psModules/src/detrend/pmFlatField.c
r7278 r7283 18 18 * @author Ross Harman, MHPCC 19 19 * 20 * @version $Revision: 1. 7$ $Name: not supported by cvs2svn $21 * @date $Date: 2006-06-02 0 0:55:23$20 * @version $Revision: 1.8 $ $Name: not supported by cvs2svn $ 21 * @date $Date: 2006-06-02 02:16:05 $ 22 22 * 23 23 * Copyright 2004 Maui High Performance Computing Center, University of Hawaii … … 34 34 #include "pslib.h" 35 35 #include "pmFlatField.h" 36 #include "pm MaskBadPixels.h"36 #include "pmFPAMaskWeight.h" 37 37 #include "pmFlatFieldErrors.h" 38 38 -
trunk/psModules/src/detrend/pmMaskBadPixels.c
r6910 r7283 1 //////////////////////////////////////////////////////////////////////////////////////////////////////////////2 // XXX WARNING: I have completely replaced this file with an OLD VERSION (that works) instead of the3 // one that was being worked on.4 //////////////////////////////////////////////////////////////////////////////////////////////////////////////5 6 1 /** @file pmMaskBadPixels.c 7 2 * … … 24 19 * @author Ross Harman, MHPCC 25 20 * 26 * @version $Revision: 1. 6$ $Name: not supported by cvs2svn $27 * @date $Date: 2006-0 4-19 20:37:35 $21 * @version $Revision: 1.7 $ $Name: not supported by cvs2svn $ 22 * @date $Date: 2006-06-02 02:16:05 $ 28 23 * 29 24 * Copyright 2004 Maui High Performance Computing Center, University of Hawaii … … 34 29 #endif 35 30 36 #include <stdio.h>37 #include <math.h>38 #include <strings.h>31 #include <stdio.h> 32 #include <math.h> 33 #include <strings.h> 39 34 35 #include "pmFPAMaskWeight.h" 40 36 #include "pmMaskBadPixels.h" 41 37 #include "pmMaskBadPixelsErrors.h" … … 148 144 /* Pixels which satisfy growVal and within the grow radius shall be masked */ \ 149 145 if(mask->data.PS_TYPE_MASK_DATA[j][i] & growVal) { \ 150 rowMin = PS_MAX(j-grow, 0); 151 rowMax = PS_MIN(j+grow+1, inImage->numRows); 152 colMin = PS_MAX(i-grow, 0); 153 colMax = PS_MIN(i+grow+1, inImage->numCols); 146 rowMin = PS_MAX(j-grow, 0); \ 147 rowMax = PS_MIN(j+grow+1, inImage->numRows); \ 148 colMin = PS_MAX(i-grow, 0); \ 149 colMax = PS_MIN(i+grow+1, inImage->numCols); \ 154 150 for(jj=rowMin; jj<rowMax; jj++) { \ 155 151 for(ii=colMin; ii<colMax; ii++) { \ -
trunk/psModules/src/detrend/pmMaskBadPixels.h
r7060 r7283 1 //////////////////////////////////////////////////////////////////////////////////////////////////////////////2 // XXX WARNING: I have completely replaced this file with an OLD VERSION (that works) instead of the3 // one that was being worked on.4 //////////////////////////////////////////////////////////////////////////////////////////////////////////////5 6 1 /** @file pmMaskBadPixels.h 7 2 * … … 24 19 * @author Ross Harman, MHPCC 25 20 * 26 * @version $Revision: 1. 5$ $Name: not supported by cvs2svn $27 * @date $Date: 2006-0 5-04 03:57:32$21 * @version $Revision: 1.6 $ $Name: not supported by cvs2svn $ 22 * @date $Date: 2006-06-02 02:16:05 $ 28 23 * 29 24 * Copyright 2004 Maui High Performance Computing Center, University of Hawaii 30 25 */ 26 #ifndef PM_MASK_BAD_PIXELS_H 27 #define PM_MASK_BAD_PIXELS_H 31 28 32 29 #include "pslib.h" 33 30 #include "pmFPA.h" 34 35 // these defines are necessary to yield 8-bit results (use instead of ~)36 # define NOT_U8(A)(UCHAR_MAX-(A))37 # define NOT_U16(A)(USHORT_MAX-(A))38 39 /** Mask values */40 typedef enum {41 PM_MASK_CLEAR = 0x00, ///< The pixel is not masked42 PM_MASK_TRAP = 0x01, ///< The pixel is a charge trap.43 PM_MASK_BADCOL = 0x02, ///< The pixel is a bad column.44 PM_MASK_SAT = 0x04, ///< The pixel is saturated.45 PM_MASK_BAD = 0x08, ///< The pixel is low46 PM_MASK_FLAT = 0x10, ///< The pixel is non-positive in the flat-field.47 PM_MASK_MARK = 0x20, ///< The pixel is marked as temporarily ignored48 PM_MASK_EXT1 = 0x40, ///< This mask value is not used49 PM_MASK_EXT2 = 0x80, ///< This mask value is not used50 } pmMaskValue;51 52 bool pmReadoutSetMask(pmReadout *readout // Readout for which to set mask53 );54 bool pmReadoutSetWeight(pmReadout *readout // Readout for which to set weight55 );56 bool pmCellSetMaskWeight(pmCell *cell // Cell for which to set weights57 );58 31 59 32 /** Execute bad pixels module. … … 74 47 ); 75 48 49 50 #endif -
trunk/psModules/src/imcombine/pmReadoutCombine.c
r7278 r7283 5 5 * @author GLG, MHPCC 6 6 * 7 * @version $Revision: 1.1 4$ $Name: not supported by cvs2svn $8 * @date $Date: 2006-06-02 0 0:55:23$7 * @version $Revision: 1.15 $ $Name: not supported by cvs2svn $ 8 * @date $Date: 2006-06-02 02:16:05 $ 9 9 * 10 10 * Copyright 2004 Maui High Performance Computing Center, University of Hawaii … … 17 17 18 18 #include "pmFPA.h" 19 #include "pm MaskBadPixels.h"19 #include "pmFPAMaskWeight.h" 20 20 21 21 #include "pmReadoutCombine.h" -
trunk/psModules/src/objects/pmPSFtry.c
r6960 r7283 5 5 * @author EAM, IfA 6 6 * 7 * @version $Revision: 1. 9$ $Name: not supported by cvs2svn $8 * @date $Date: 2006-0 4-23 01:07:51$7 * @version $Revision: 1.10 $ $Name: not supported by cvs2svn $ 8 * @date $Date: 2006-06-02 02:16:05 $ 9 9 * 10 10 * Copyright 2004 Maui High Performance Computing Center, University of Hawaii … … 15 15 #include "pmHDU.h" 16 16 #include "pmFPA.h" 17 #include "pm MaskBadPixels.h"17 #include "pmFPAMaskWeight.h" 18 18 #include "pmPeaks.h" 19 19 #include "pmMoments.h" -
trunk/psModules/src/objects/pmSource.c
r6944 r7283 6 6 * @author EAM, IfA: significant modifications. 7 7 * 8 * @version $Revision: 1. 4$ $Name: not supported by cvs2svn $9 * @date $Date: 2006-0 4-21 21:29:01$8 * @version $Revision: 1.5 $ $Name: not supported by cvs2svn $ 9 * @date $Date: 2006-06-02 02:16:05 $ 10 10 * 11 11 * Copyright 2004 Maui High Performance Computing Center, University of Hawaii … … 19 19 #include "pmHDU.h" 20 20 #include "pmFPA.h" 21 #include "pm MaskBadPixels.h"21 #include "pmFPAMaskWeight.h" 22 22 #include "pmPeaks.h" 23 23 #include "pmMoments.h" … … 133 133 134 134 /****************************************************************************** 135 pmSourcePSFClump(source, metadata): Find the likely PSF clump in the 136 sigma-x, sigma-y plane. return 0,0 clump in case of error. 135 pmSourcePSFClump(source, metadata): Find the likely PSF clump in the 136 sigma-x, sigma-y plane. return 0,0 clump in case of error. 137 137 *****************************************************************************/ 138 138 … … 310 310 pmSourceRoughClass(source, metadata): make a guess at the source 311 311 classification. 312 312 313 313 XXX: push the clump info into the metadata? 314 314 315 315 XXX: How can this function ever return FALSE? 316 316 317 317 EAM: I moved S/N calculation to pmSourceMoments, using weight image 318 318 *****************************************************************************/ -
trunk/psModules/src/objects/pmSourcePhotometry.c
r6960 r7283 3 3 * @author EAM, IfA; GLG, MHPCC 4 4 * 5 * @version $Revision: 1. 5$ $Name: not supported by cvs2svn $6 * @date $Date: 2006-0 4-23 01:07:51$5 * @version $Revision: 1.6 $ $Name: not supported by cvs2svn $ 6 * @date $Date: 2006-06-02 02:16:05 $ 7 7 * 8 8 * Copyright 2004 Maui High Performance Computing Center, University of Hawaii … … 16 16 #include "pmHDU.h" 17 17 #include "pmFPA.h" 18 #include "pm MaskBadPixels.h"18 #include "pmFPAMaskWeight.h" 19 19 #include "pmPeaks.h" 20 20 #include "pmMoments.h" … … 52 52 - the source is a STAR (PSF) 53 53 - the option is selected (how??) 54 55 - extMag : all sources with non-NULL modelEXT 54 55 - extMag : all sources with non-NULL modelEXT 56 56 **/ 57 57 -
trunk/psModules/src/objects/pmSourceSky.c
r6910 r7283 6 6 * @author EAM, IfA: significant modifications. 7 7 * 8 * @version $Revision: 1. 3$ $Name: not supported by cvs2svn $9 * @date $Date: 2006-0 4-19 20:37:35 $8 * @version $Revision: 1.4 $ $Name: not supported by cvs2svn $ 9 * @date $Date: 2006-06-02 02:16:05 $ 10 10 * 11 11 * Copyright 2004 Maui High Performance Computing Center, University of Hawaii … … 19 19 #include "pmHDU.h" 20 20 #include "pmFPA.h" 21 #include "pm MaskBadPixels.h"21 #include "pmFPAMaskWeight.h" 22 22 #include "pmPeaks.h" 23 23 #include "pmMoments.h"
Note:
See TracChangeset
for help on using the changeset viewer.
