IPP Software Navigation Tools IPP Links Communication Pan-STARRS Links

Changeset 6910


Ignore:
Timestamp:
Apr 19, 2006, 10:37:35 AM (20 years ago)
Author:
magnier
Message:

merged PM_SOURCE_MASK with PM_MASK_xxx, merged pmFPAMaskWeight with pmMaskBadPixels

Location:
trunk/psModules/src
Files:
7 edited

Legend:

Unmodified
Added
Removed

  • trunk/psModules/src/astrom/Makefile.am

    r6872 r6910  
    77        pmFPAConstruct.c \
    88        pmFPACopy.c \
    9         pmFPAMaskWeight.c \
    109        pmFPARead.c \
    1110        pmFPAUtils.c \
    … …  
    2221        pmFPAfile.c
    2322
     23#       pmFPAMaskWeight.c \
    2424#       pmFPAAstrometry.c
    2525#       pmAstrometryObjects.c
    … …  
    3131        pmFPAConstruct.h \
    3232        pmFPACopy.h \
    33         pmFPAMaskWeight.h \
    3433        pmFPARead.h \
    3534        pmFPAUtils.h \
    … …  
    4645        pmFPAfile.h
    4746
     47#       pmFPAMaskWeight.h \
    4848#       pmFPAAstrometry.h
    4949#       pmAstrometryObjects.h

  • trunk/psModules/src/astrom/pmReadout.c

    r6889 r6910  
    22#include "pslib.h"
    33#include "pmFPA.h"
     4#include "pmMaskBadPixels.h"
    45#include "pmHDUUtils.h"
    5 #include "pmFPAMaskWeight.h"
    66
    77// Get the bias images for a readout, using the CELL.BIASSEC

  • trunk/psModules/src/detrend/pmMaskBadPixels.c

    r6873 r6910  
    2424 *  @author Ross Harman, MHPCC
    2525 *
    26  *  @version $Revision: 1.5 $ $Name: not supported by cvs2svn $
    27  *  @date $Date: 2006-04-17 18:10:08 $
     26 *  @version $Revision: 1.6 $ $Name: not supported by cvs2svn $
     27 *  @date $Date: 2006-04-19 20:37:35 $
    2828 *
    2929 *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
    … …  
    148148            /* Pixels which satisfy growVal and within the grow radius shall be masked */                    \
    149149            if(mask->data.PS_TYPE_MASK_DATA[j][i] & growVal) {                                               \
    150                 rowMin = MAX(j-grow, 0);                                                                     \
    151                 rowMax = MIN(j+grow+1, inImage->numRows);                                                    \
    152                 colMin = MAX(i-grow, 0);                                                                     \
    153                 colMax = MIN(i+grow+1, inImage->numCols);                                                    \
     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);                                                    \
    154154                for(jj=rowMin; jj<rowMax; jj++) {                                                            \
    155155                    for(ii=colMin; ii<colMax; ii++) {                                                        \

  • trunk/psModules/src/detrend/pmMaskBadPixels.h

    r6872 r6910  
    2424 *  @author Ross Harman, MHPCC
    2525 *
    26  *  @version $Revision: 1.3 $ $Name: not supported by cvs2svn $
    27  *  @date $Date: 2006-04-17 18:01:05 $
     26 *  @version $Revision: 1.4 $ $Name: not supported by cvs2svn $
     27 *  @date $Date: 2006-04-19 20:37:35 $
    2828 *
    2929 *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
    … …  
    3333#include "pmFPA.h"
    3434
     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
    3539/** Mask values */
    3640typedef enum {
    37     PM_MASK_TRAP    = 0x0001,   ///< The pixel is a charge trap.
    38     PM_MASK_BADCOL  = 0x0002,   ///< The pixel is a bad column.
    39     PM_MASK_SAT     = 0x0004,   ///< The pixel is saturated.
    40     PM_MASK_BAD     = 0x0008,   ///< The pixel is low
    41     PM_MASK_FLAT    = 0x0010    ///< The pixel is non-positive in the flat-field.
     41    PM_MASK_CLEAR   = 0x00,   ///< The pixel is a charge trap.
     42    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 low
     46    PM_MASK_FLAT    = 0x10,   ///< The pixel is non-positive in the flat-field.
     47    PM_MASK_MARK    = 0x20,   ///< The pixel is marked as temporarily ignored
     48    PM_MASK_EXT1    = 0x40,   ///< This mask value is not used
     49    PM_MASK_EXT2    = 0x80,   ///< This mask value is not used
    4250} pmMaskValue;
    4351
    44 /** Macro to find maximum of two numbers */
    45 #define MAX(A,B)((A)>=(B)?(A):(B))
    46 
    47 /** Macro to find minimum of two numbers */
    48 #define MIN(A,B)((A)<=(B)?(A):(B))
    49 
     52bool pmReadoutSetMask(pmReadout *readout // Readout for which to set mask
     53                     );
     54bool pmReadoutSetWeight(pmReadout *readout // Readout for which to set weight
     55                       );
     56bool pmCellSetMaskWeight(pmCell *cell // Cell for which to set weights
     57                        );
    5058
    5159/** Execute bad pixels module.

  • trunk/psModules/src/objects/pmPSFtry.c

    r6873 r6910  
    55 *  @author EAM, IfA
    66 *
    7  *  @version $Revision: 1.6 $ $Name: not supported by cvs2svn $
    8  *  @date $Date: 2006-04-17 18:10:08 $
     7 *  @version $Revision: 1.7 $ $Name: not supported by cvs2svn $
     8 *  @date $Date: 2006-04-19 20:37:35 $
    99 *
    1010 *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
    … …  
    1515#include "pmHDU.h"
    1616#include "pmFPA.h"
     17#include "pmMaskBadPixels.h"
    1718#include "pmPeaks.h"
    1819#include "pmMoments.h"
    … …  
    112113        // fit model as EXT, not PSF
    113114
    114         psImageKeepCircle (source->mask, x, y, RADIUS, "OR", PM_SOURCE_MASK_MARKED);
     115        psImageKeepCircle (source->mask, x, y, RADIUS, "OR", PM_MASK_MARK);
    115116        status = pmSourceFitModel (source, model, PM_SOURCE_FIT_EXT);
    116         psImageKeepCircle (source->mask, x, y, RADIUS, "AND", ~PM_SOURCE_MASK_MARKED);
     117        psImageKeepCircle (source->mask, x, y, RADIUS, "AND", NOT_U8(PM_MASK_MARK));
    117118
    118119        // exclude the poor fits
    … …  
    146147        y = source->peak->y;
    147148
    148         psImageKeepCircle (source->mask, x, y, RADIUS, "OR", PM_SOURCE_MASK_MARKED);
     149        psImageKeepCircle (source->mask, x, y, RADIUS, "OR", PM_MASK_MARK);
    149150        status = pmSourceFitModel (source, modelPSF, PM_SOURCE_FIT_PSF);
    150151
    … …  
    176177
    177178next_source:
    178         psImageKeepCircle (source->mask, x, y, RADIUS, "AND", ~PM_SOURCE_MASK_MARKED);
     179        psImageKeepCircle (source->mask, x, y, RADIUS, "AND", NOT_U8(PM_MASK_MARK));
    179180
    180181    }

  • trunk/psModules/src/objects/pmSourcePhotometry.c

    r6872 r6910  
    33 *  @author EAM, IfA; GLG, MHPCC
    44 *
    5  *  @version $Revision: 1.2 $ $Name: not supported by cvs2svn $
    6  *  @date $Date: 2006-04-17 18:01:05 $
     5 *  @version $Revision: 1.3 $ $Name: not supported by cvs2svn $
     6 *  @date $Date: 2006-04-19 20:37:35 $
    77 *
    88 *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
    … …  
    1616#include "pmHDU.h"
    1717#include "pmFPA.h"
     18#include "pmMaskBadPixels.h"
    1819#include "pmPeaks.h"
    1920#include "pmMoments.h"
    … …  
    117118
    118119    // set aperture mask circle to model radius
    119     psImageKeepCircle (source->mask, x, y, model->radiusTMP, "OR", PM_SOURCE_MASK_MARKED);
     120    psImageKeepCircle (source->mask, x, y, model->radiusTMP, "OR", PM_MASK_MARK);
    120121
    121122    // measure the weight of included pixels
    … …  
    139140
    140141    // unmask aperture
    141     psImageKeepCircle (source->mask, x, y, model->radiusTMP, "AND", ~PM_SOURCE_MASK_MARKED);
     142    psImageKeepCircle (source->mask, x, y, model->radiusTMP, "AND", NOT_U8(PM_MASK_MARK));
    142143
    143144    // subtract object, leave local sky

  • trunk/psModules/src/objects/pmSourceSky.c

    r6872 r6910  
    66 *  @author EAM, IfA: significant modifications.
    77 *
    8  *  @version $Revision: 1.2 $ $Name: not supported by cvs2svn $
    9  *  @date $Date: 2006-04-17 18:01:05 $
     8 *  @version $Revision: 1.3 $ $Name: not supported by cvs2svn $
     9 *  @date $Date: 2006-04-19 20:37:35 $
    1010 *
    1111 *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
    … …  
    1919#include "pmHDU.h"
    2020#include "pmFPA.h"
     21#include "pmMaskBadPixels.h"
    2122#include "pmPeaks.h"
    2223#include "pmMoments.h"
    … …  
    5657    srcRegion = psRegionForImage(mask, srcRegion);
    5758
    58     psImageMaskRegion(mask, srcRegion, "OR", PM_SOURCE_MASK_MARKED);
     59    psImageMaskRegion(mask, srcRegion, "OR", PM_MASK_MARK);
    5960    psStats *myStats = psStatsAlloc(statsOptions);
    6061    myStats = psImageStats(myStats, image, mask, 0xff);
    61     psImageMaskRegion(mask, srcRegion, "AND", ~PM_SOURCE_MASK_MARKED);
     62    psImageMaskRegion(mask, srcRegion, "AND", NOT_U8(PM_MASK_MARK));
    6263
    6364    psF64 tmpF64;
    … …  
    99100    srcRegion = psRegionForImage(mask, srcRegion);
    100101
    101     psImageMaskRegion(mask, srcRegion, "OR", PM_SOURCE_MASK_MARKED);
     102    psImageMaskRegion(mask, srcRegion, "OR", PM_MASK_MARK);
    102103    psStats *myStats = psStatsAlloc(statsOptions);
    103104    myStats = psImageStats(myStats, image, mask, 0xff);
    104     psImageMaskRegion(mask, srcRegion, "AND", ~PM_SOURCE_MASK_MARKED);
     105    psImageMaskRegion(mask, srcRegion, "AND", NOT_U8(PM_MASK_MARK));
    105106
    106107    psF64 tmpF64;
Note: See TracChangeset for help on using the changeset viewer.