IPP Software Navigation Tools IPP Links Communication Pan-STARRS Links

Ignore:
Timestamp:
Feb 5, 2009, 4:36:52 PM (17 years ago)
Author:
Paul Price
Message:

Merging pap_branch_20090128. Resolved a small number of conflicts. Compiles, but not tested in detail.

File:
1 edited

Legend:

Unmodified
Added
Removed

  • trunk/ppImage/src/ppImage.h

    r21183 r21364  
    2525    // actions which ppImage should perform
    2626    bool doMaskBuild;                   // Build internal mask
    27     bool doWeightBuild;                   // Build internal mask
     27    bool doVarianceBuild;               // Build internal variance map
    2828    bool doMask;                        // Mask bad pixels
    2929    bool doNonLin;                      // Non-linearity correction
    … …  
    4444    bool BaseFITS;
    4545    bool BaseMaskFITS;
    46     bool BaseWeightFITS;
     46    bool BaseVarianceFITS;
    4747
    4848    bool ChipFITS;
    4949    bool ChipMaskFITS;
    50     bool ChipWeightFITS;
     50    bool ChipVarianceFITS;
    5151
    5252    bool FPA1FITS;
    … …  
    5858
    5959    // make values for abstract concepts of masking
    60     psImageMaskType maskValue;               // apply this bit-mask to choose masked bits
    61     psImageMaskType markValue;               // apply this bit-mask to choose masked bits
    62     psImageMaskType satMask;                 // Mask value to give saturated pixels
    63     psImageMaskType badMask;                 // Mask value to give bad pixels
    64     psImageMaskType flatMask;                // Mask value to give bad flat pixels
    65     psImageMaskType blankMask;               // Mask value to give blank pixels
     60    psImageMaskType maskValue;          // apply this bit-mask to choose masked bits
     61    psImageMaskType markValue;          // apply this bit-mask to choose masked bits
     62    psImageMaskType satMask;            // Mask value to give saturated pixels
     63    psImageMaskType badMask;            // Mask value to give bad pixels
     64    psImageMaskType flatMask;           // Mask value to give bad flat pixels
     65    psImageMaskType blankMask;          // Mask value to give blank pixels
    6666
    6767    // non-linear correction parameters
Note: See TracChangeset for help on using the changeset viewer.