IPP Software Navigation Tools IPP Links Communication Pan-STARRS Links

Changeset 14491


Ignore:
Timestamp:
Aug 14, 2007, 12:25:45 PM (19 years ago)
Author:
Paul Price
Message:

Was checking to see if photometry was turned on before actually turning it on.

File:
1 edited

Legend:

Unmodified
Added
Removed

  • trunk/ppImage/src/ppImageOptions.c

    r14223 r14491  
    1818
    1919    // actions which ppImage should perform
    20     options->doMaskBuild     = false;   // Build internal mask
    21     options->doWeightBuild   = false;   // Build internal weight
    22     options->doMask          = false;   // Mask bad pixels
    23     options->doNonLin        = false;   // Non-linearity correction
    24     options->doOverscan      = false;   // Overscan subtraction
    25     options->doBias          = false;   // Bias subtraction
    26     options->doDark          = false;   // Dark subtraction
    27     options->doShutter       = false;   // Shutter correction
    28     options->doFlat          = false;   // Flat-field normalisation
    29     options->doFringe        = false;   // Fringe subtraction
    30     options->doPhotom        = false;   // Source identification and photometry
    31     options->doAstromChip    = false;   // Astrometry (per-chip)
    32     options->doAstromMosaic  = false;   // Astrometry (full-mosaic)
    33     options->doStats         = false;   // Measure and save image statistics
     20    options->doMaskBuild     = false;   // Build internal mask
     21    options->doWeightBuild   = false;   // Build internal weight
     22    options->doMask          = false;   // Mask bad pixels
     23    options->doNonLin        = false;   // Non-linearity correction
     24    options->doOverscan      = false;   // Overscan subtraction
     25    options->doBias          = false;   // Bias subtraction
     26    options->doDark          = false;   // Dark subtraction
     27    options->doShutter       = false;   // Shutter correction
     28    options->doFlat          = false;   // Flat-field normalisation
     29    options->doFringe        = false;   // Fringe subtraction
     30    options->doPhotom        = false;   // Source identification and photometry
     31    options->doAstromChip    = false;   // Astrometry (per-chip)
     32    options->doAstromMosaic  = false;   // Astrometry (full-mosaic)
     33    options->doStats         = false;   // Measure and save image statistics
    3434
    3535    // output files requested
    36     options->BaseFITS        = false;   // create output image
    37     options->BaseMaskFITS    = false;   // create output mask image
    38     options->BaseWeightFITS  = false;   // create output weight image
    39 
    40     options->ChipFITS        = false;   // create output chip-mosaic image
    41     options->ChipMaskFITS    = false;   // create output chip-mosaic mask image
    42     options->ChipWeightFITS  = false;   // create output chip-mosaic weight image
    43 
    44     options->FPA1FITS        = false;   // create fpa-mosaic binned image (scale 1)
    45     options->FPA2FITS        = false;   // create fpa-mosaic binned image (scale 2)
    46     options->Bin1FITS        = false;   // create binned image (scale 1)
    47     options->Bin2FITS        = false;   // create binned image (scale 2)
    48     options->Bin1JPEG        = false;   // create jpeg of binned image (scale 1)
    49     options->Bin2JPEG        = false;   // create jpeg of binned image (scale 2)
     36    options->BaseFITS        = false;   // create output image
     37    options->BaseMaskFITS    = false;   // create output mask image
     38    options->BaseWeightFITS  = false;   // create output weight image
     39
     40    options->ChipFITS        = false;   // create output chip-mosaic image
     41    options->ChipMaskFITS    = false;   // create output chip-mosaic mask image
     42    options->ChipWeightFITS  = false;   // create output chip-mosaic weight image
     43
     44    options->FPA1FITS        = false;   // create fpa-mosaic binned image (scale 1)
     45    options->FPA2FITS        = false;   // create fpa-mosaic binned image (scale 2)
     46    options->Bin1FITS        = false;   // create binned image (scale 1)
     47    options->Bin2FITS        = false;   // create binned image (scale 2)
     48    options->Bin1JPEG        = false;   // create jpeg of binned image (scale 1)
     49    options->Bin2JPEG        = false;   // create jpeg of binned image (scale 2)
    5050
    5151    // default flags for various activities
    52     options->maskValue       = 0x00;    // Default mask value
    53     options->satMask         = 0x00;    // Saturated pixels
    54     options->badMask         = 0x00;    // Bad pixels
    55     options->flatMask        = 0x00;    // Bad flat pixels
    56     options->blankMask       = 0x00;    // Blank (no data, cell gap) pixels
     52    options->maskValue       = 0x00;    // Default mask value
     53    options->satMask         = 0x00;    // Saturated pixels
     54    options->badMask         = 0x00;    // Bad pixels
     55    options->flatMask        = 0x00;    // Bad flat pixels
     56    options->blankMask       = 0x00;    // Blank (no data, cell gap) pixels
    5757
    5858    // Non-linearity default options
    … …  
    6262
    6363    // Overscan defaults
    64     options->overscan        = NULL;    // Overscan options
     64    options->overscan        = NULL;    // Overscan options
    6565
    6666    // binning parameters
    67     options->xBin1           = 16;      // x-binning, scale 1
    68     options->yBin1           = 16;      // y-binning, scale 1
    69     options->xBin2           = 16;      // x-binning, scale 2
    70     options->yBin2           = 16;      // y-binning, scale 2
     67    options->xBin1           = 16;      // x-binning, scale 1
     68    options->yBin1           = 16;      // y-binning, scale 1
     69    options->xBin2           = 16;      // x-binning, scale 2
     70    options->yBin2           = 16;      // y-binning, scale 2
    7171
    7272    // Fringe defaults
    73     options->fringeRej       = NAN;     // Fringe rejection limit
    74     options->fringeIter      = 0;       // Fringe iterations
    75     options->fringeKeep      = 1.0;     // Fringe keep fraction
     73    options->fringeRej       = NAN;     // Fringe rejection limit
     74    options->fringeIter      = 0;       // Fringe iterations
     75    options->fringeKeep      = 1.0;     // Fringe keep fraction
    7676
    7777    return options;
    … …  
    207207    char *statsName = psMetadataLookupStr(&status, config->arguments, "STATS"); // Filename for statistics
    208208    if (statsName) {
    209         options->doStats = true;
     209        options->doStats = true;
    210210    }
    211211
    … …  
    230230        psWarning("BIN2.YBIN not found in recipe: setting to default value.\n");
    231231        options->yBin1 = 16;
    232     }
    233 
    234     // even if not requested explicitly, if any of these are set, build an internal mask and weight:
    235     if (options->doMask || options->doShutter || options->doFlat || options->doPhotom) {
    236         options->doMaskBuild = true;
    237         options->doWeightBuild = true;
    238232    }
    239233
    … …  
    246240    options->ChipWeightFITS = psMetadataLookupBool(NULL, recipe, "CHIP.WEIGHT.FITS");
    247241
    248     options->FPA1FITS       = psMetadataLookupBool(NULL, recipe, "FPA1.FITS");
    249     options->FPA2FITS       = psMetadataLookupBool(NULL, recipe, "FPA2.FITS");
    250 
    251     options->Bin1FITS       = psMetadataLookupBool(NULL, recipe, "BIN1.FITS");
    252     options->Bin1JPEG       = psMetadataLookupBool(NULL, recipe, "BIN1.JPEG");
    253     options->Bin2FITS       = psMetadataLookupBool(NULL, recipe, "BIN2.FITS");
    254     options->Bin2JPEG       = psMetadataLookupBool(NULL, recipe, "BIN2.JPEG");
     242    options->FPA1FITS       = psMetadataLookupBool(NULL, recipe, "FPA1.FITS");
     243    options->FPA2FITS       = psMetadataLookupBool(NULL, recipe, "FPA2.FITS");
     244
     245    options->Bin1FITS       = psMetadataLookupBool(NULL, recipe, "BIN1.FITS");
     246    options->Bin1JPEG       = psMetadataLookupBool(NULL, recipe, "BIN1.JPEG");
     247    options->Bin2FITS       = psMetadataLookupBool(NULL, recipe, "BIN2.FITS");
     248    options->Bin2JPEG       = psMetadataLookupBool(NULL, recipe, "BIN2.JPEG");
    255249
    256250    options->doPhotom       = psMetadataLookupBool(NULL, recipe, "PHOTOM");
    257251    options->doAstromChip   = psMetadataLookupBool(NULL, recipe, "ASTROM.CHIP");
    258252    options->doAstromMosaic = psMetadataLookupBool(NULL, recipe, "ASTROM.MOSAIC");
     253
     254    // even if not requested explicitly, if any of these are set, build an internal mask and weight:
     255    if (options->doMask || options->doShutter || options->doFlat || options->doPhotom) {
     256        options->doMaskBuild = true;
     257        options->doWeightBuild = true;
     258    }
    259259
    260260    if ((options->doAstromChip || options->doAstromMosaic) && !options->doPhotom) {
Note: See TracChangeset for help on using the changeset viewer.