IPP Software Navigation Tools IPP Links Communication Pan-STARRS Links

Changeset 7275


Ignore:
Timestamp:
Jun 1, 2006, 12:44:47 PM (20 years ago)
Author:
Paul Price
Message:

Adding pmFPAMaskWeight.h to psmodules.h, small changes to pmReadoutSetMask, removing pmMaskBadPixels from build (mostly achieved by simpler pmReadoutSetMask)

Location:
trunk/psModules/src
Files:
4 edited

Legend:

Unmodified
Added
Removed

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

    r7215 r7275  
    88        pmFPACopy.c \
    99        pmFPAHeader.c \
     10        pmFPAMaskWeight.c \
    1011        pmFPARead.c \
    1112        pmFPAUtils.c \
    … …  
    2930        pmFPACopy.h \
    3031        pmFPAHeader.h \
     32        pmFPAMaskWeight.h \
    3133        pmFPARead.h \
    3234        pmFPAUtils.h \

  • trunk/psModules/src/camera/pmFPAMaskWeight.c

    r7017 r7275  
    1818        return false;
    1919    }
    20     float bad = psMetadataLookupF32(NULL, cell->concepts, "CELL.BAD"); // Bad level
     20    float bad = psMetadataLookupF32(&mdok, cell->concepts, "CELL.BAD"); // Bad level
    2121    if (!mdok || isnan(bad)) {
    2222        psError(PS_ERR_IO, true, "CELL.BAD is not set --- unable to set mask.\n");
    2323        return false;
    2424    }
     25    psTrace(__func__, 5, "Saturation: %f, bad: %f\n", saturation, bad);
    2526
    2627    psImage *image = readout->image;    // The image pixels
    … …  
    3536    for (int i = 0; i < image->numRows; i++) {
    3637        for (int j = 0; j < image->numCols; j++) {
    37             if (image->data.F32[i][j] > saturation) {
     38            if (image->data.F32[i][j] >= saturation) {
    3839                mask->data.U8[i][j] |= PM_MASK_SAT;
    3940            }
    40             if (image->data.F32[i][j] < bad) {
     41            if (image->data.F32[i][j] <= bad) {
    4142                mask->data.U8[i][j] |= PM_MASK_BAD;
    4243            }

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

    r7215 r7275  
    77        pmFlatNormalize.c \
    88        pmFringeStats.c \
    9         pmMaskBadPixels.c \
    109        pmNonLinear.c \
    11         pmSubtractBias.c
    12 #        pmSubtractSky.c
     10        pmSubtractBias.c
     11#       pmSubtractSky.c
     12#       pmMaskBadPixels.c
    1313
    1414psmoduleincludedir = $(includedir)
    … …  
    1818        pmFlatNormalize.h \
    1919        pmFringeStats.h \
    20         pmMaskBadPixelsErrors.h \
    21         pmMaskBadPixels.h \
    2220        pmNonLinear.h \
    23         pmSubtractBias.h
    24 #        pmSubtractSky.c
     21        pmSubtractBias.h
     22#       pmSubtractSky.c
     23#       pmMaskBadPixelsErrors.h
     24#       pmMaskBadPixels.h
    2525
    26 EXTRA_DIST = pmFlatFieldErrors.dat pmMaskBadPixelsErrors.dat
     26EXTRA_DIST = \
     27        pmFlatFieldErrors.dat
     28#       pmMaskBadPixelsErrors.dat
    2729
    2830CLEANFILES = *~

  • trunk/psModules/src/psmodules.h

    r7169 r7275  
    3838#include <pmFPACopy.h>
    3939#include <pmFPAHeader.h>
     40#include <pmFPAMaskWeight.h>
    4041#include <pmFPARead.h>
    4142#include <pmFPAWrite.h>
    … …  
    5354#include <pmFlatNormalize.h>
    5455#include <pmFringeStats.h>
    55 #include <pmMaskBadPixels.h>
    56 #include <pmMaskBadPixelsErrors.h>
     56//#include <pmMaskBadPixels.h>
     57//#include <pmMaskBadPixelsErrors.h>
    5758#include <pmNonLinear.h>
    5859#include <pmSubtractBias.h>
Note: See TracChangeset for help on using the changeset viewer.