Index: /trunk/ippconfig/gpc1/format_mef.config =================================================================== --- /trunk/ippconfig/gpc1/format_mef.config (revision 43048) +++ /trunk/ippconfig/gpc1/format_mef.config (revision 43049) @@ -20,64 +20,64 @@ CONTENTS METADATA # CONTENT = chip name : type - CCID58-2-15a1 STR XY01:GPCChip - CCID58-2-18a1 STR XY02:GPCChip - CCID58-1-13a1 STR XY03:GPCChip - CCID58-1-09a1 STR XY04:GPCChip - CCID58-2-16b1 STR XY05:GPCChip - CCID58-2-09b1 STR XY06:GPCChip - CCID58-2-22a1 STR XY10:GPCChip - CCID58-2-13a2 STR XY11:GPCChip - CCID58-1-17a2 STR XY12:GPCChip - CCID58-1-14a2 STR XY13:GPCChip - CCID58-1-09a2 STR XY14:GPCChip - CCID58-2-13b1 STR XY15:GPCChip - CCID58-1-09b1 STR XY16:GPCChip - CCID58-2-10b2 STR XY17:GPCChip - CCID58-1-19a1 STR XY20:GPCChip - CCID58-1-04a1 STR XY21:GPCChip - CCID58-2-09a2 STR XY22:GPCChip - CCID58-1-02a1 STR XY23:GPCChip - CCID58-1-04a2 STR XY24:GPCChip - CCID58-1-01b1 STR XY25:GPCChip - CCID58-2-07b2 STR XY26:GPCChip - CCID58-1-18b1 STR XY27:GPCChip - CCID58-1-12a1 STR XY30:GPCChip - CCID58-2-01a1 STR XY31:GPCChip - CCID58-2-01a2 STR XY32:GPCChip - CCID58-1-02a2 STR XY33:GPCChip - CCID58-2-04a1 STR XY34:GPCChip - CCID58-1-01b2 STR XY35:GPCChip - CCID58-1-02b1 STR XY36:GPCChip - CCID58-2-16b2 STR XY37:GPCChip - CCID58-2-18b2 STR XY40:GPCChip - CCID58-1-03b2 STR XY41:GPCChip - CCID58-1-07b1 STR XY42:GPCChip - CCID58-2-11b2 STR XY43:GPCChip - CCID58-1-05a2 STR XY44:GPCChip - CCID58-1-21a2 STR XY45:GPCChip - CCID58-2-07a2 STR XY46:GPCChip - CCID58-1-21a1 STR XY47:GPCChip - CCID58-1-17b1 STR XY50:GPCChip - CCID58-2-09b2 STR XY51:GPCChip - CCID58-1-04b1 STR XY52:GPCChip - CCID58-1-05b2 STR XY53:GPCChip - CCID58-2-09a1 STR XY54:GPCChip - CCID58-2-12a2 STR XY55:GPCChip - CCID58-1-10a2 STR XY56:GPCChip - CCID58-2-12a1 STR XY57:GPCChip - CCID58-2-22b2 STR XY60:GPCChip - CCID58-1-03b1 STR XY61:GPCChip - CCID58-2-23b2 STR XY62:GPCChip - CCID58-1-02b2 STR XY63:GPCChip - CCID58-1-07a1 STR XY64:GPCChip - CCID58-2-17a2 STR XY65:GPCChip - CCID58-2-14a1 STR XY66:GPCChip - CCID58-2-16a2 STR XY67:GPCChip - CCID58-2-04b2 STR XY71:GPCChip - CCID58-1-14b1 STR XY72:GPCChip - CCID58-1-25b1 STR XY73:GPCChip - CCID58-1-18a1 STR XY74:GPCChip - CCID58-2-16a1 STR XY75:GPCChip - CCID58-2-05a1 STR XY76:GPCChip + CCID58-2-15a1 STR XY01:GPCChip # chip 00 + CCID58-2-18a1 STR XY02:GPCChip # chip 01 + CCID58-1-13a1 STR XY03:GPCChip # chip 02 + CCID58-1-09a1 STR XY04:GPCChip # chip 03 + CCID58-2-16b1 STR XY05:GPCChip # chip 04 + CCID58-2-09b1 STR XY06:GPCChip # chip 05 + CCID58-2-22a1 STR XY10:GPCChip # chip 06 + CCID58-2-13a2 STR XY11:GPCChip # chip 07 + CCID58-1-17a2 STR XY12:GPCChip # chip 08 + CCID58-1-14a2 STR XY13:GPCChip # chip 09 + CCID58-1-09a2 STR XY14:GPCChip # chip 10 + CCID58-2-13b1 STR XY15:GPCChip # chip 11 + CCID58-1-09b1 STR XY16:GPCChip # chip 12 + CCID58-2-10b2 STR XY17:GPCChip # chip 13 + CCID58-1-19a1 STR XY20:GPCChip # chip 14 + CCID58-1-04a1 STR XY21:GPCChip # chip 15 + CCID58-2-09a2 STR XY22:GPCChip # chip 16 + CCID58-1-02a1 STR XY23:GPCChip # chip 17 + CCID58-1-04a2 STR XY24:GPCChip # chip 18 + CCID58-1-01b1 STR XY25:GPCChip # chip 19 + CCID58-2-07b2 STR XY26:GPCChip # chip 20 + CCID58-1-18b1 STR XY27:GPCChip # chip 21 + CCID58-1-12a1 STR XY30:GPCChip # chip 22 + CCID58-2-01a1 STR XY31:GPCChip # chip 23 + CCID58-2-01a2 STR XY32:GPCChip # chip 24 + CCID58-1-02a2 STR XY33:GPCChip # chip 25 + CCID58-2-04a1 STR XY34:GPCChip # chip 26 + CCID58-1-01b2 STR XY35:GPCChip # chip 27 + CCID58-1-02b1 STR XY36:GPCChip # chip 28 + CCID58-2-16b2 STR XY37:GPCChip # chip 29 + CCID58-2-18b2 STR XY40:GPCChip # chip 30 + CCID58-1-03b2 STR XY41:GPCChip # chip 31 + CCID58-1-07b1 STR XY42:GPCChip # chip 32 + CCID58-2-11b2 STR XY43:GPCChip # chip 33 + CCID58-1-05a2 STR XY44:GPCChip # chip 34 + CCID58-1-21a2 STR XY45:GPCChip # chip 35 + CCID58-2-07a2 STR XY46:GPCChip # chip 36 + CCID58-1-21a1 STR XY47:GPCChip # chip 37 + CCID58-1-17b1 STR XY50:GPCChip # chip 38 + CCID58-2-09b2 STR XY51:GPCChip # chip 39 + CCID58-1-04b1 STR XY52:GPCChip # chip 40 + CCID58-1-05b2 STR XY53:GPCChip # chip 41 + CCID58-2-09a1 STR XY54:GPCChip # chip 42 + CCID58-2-12a2 STR XY55:GPCChip # chip 43 + CCID58-1-10a2 STR XY56:GPCChip # chip 44 + CCID58-2-12a1 STR XY57:GPCChip # chip 45 + CCID58-2-22b2 STR XY60:GPCChip # chip 46 + CCID58-1-03b1 STR XY61:GPCChip # chip 47 + CCID58-2-23b2 STR XY62:GPCChip # chip 48 + CCID58-1-02b2 STR XY63:GPCChip # chip 49 + CCID58-1-07a1 STR XY64:GPCChip # chip 50 + CCID58-2-17a2 STR XY65:GPCChip # chip 51 + CCID58-2-14a1 STR XY66:GPCChip # chip 52 + CCID58-2-16a2 STR XY67:GPCChip # chip 53 + CCID58-2-04b2 STR XY71:GPCChip # chip 54 + CCID58-1-14b1 STR XY72:GPCChip # chip 55 + CCID58-1-25b1 STR XY73:GPCChip # chip 56 + CCID58-1-18a1 STR XY74:GPCChip # chip 57 + CCID58-2-16a1 STR XY75:GPCChip # chip 58 + CCID58-2-05a1 STR XY76:GPCChip # chip 59 END Index: /trunk/ippconfig/gpc2/ppImage.config =================================================================== --- /trunk/ippconfig/gpc2/ppImage.config (revision 43048) +++ /trunk/ippconfig/gpc2/ppImage.config (revision 43049) @@ -2154,4 +2154,44 @@ OVERSCAN.MIN.VALID F32 1.0 # minimum valid overscan value - OVERSCAN.MAX.VALID F32 60000.0 # maximum valid overscan value -END + OVERSCAN.MAX.VALID F32 50000.0 # maximum valid overscan value +END + +# chip processing with only overscan +CHIP_OVERSCAN_MASK METADATA + BASE.FITS BOOL FALSE # Save base detrended image? + BASE.MASK.FITS BOOL FALSE # Save base detrended image? + BASE.VARIANCE.FITS BOOL FALSE # Save base detrended image? + CHIP.FITS BOOL TRUE # Save chip-mosaic-ed image? + CHIP.MASK.FITS BOOL TRUE # Save chip-mosaic-ed image? + CHIP.VARIANCE.FITS BOOL TRUE # Save chip-mosaic-ed image? + OVERSCAN BOOL TRUE # Overscan subtraction + NONLIN BOOL FALSE # apply non-linearity correction + BIAS BOOL FALSE # Bias subtraction + DARK BOOL FALSE # Dark subtraction + NOISEMAP BOOL FALSE # Apply noise read map + REMNANCE BOOL FALSE # Remnance masking + SHUTTER BOOL FALSE # Shutter correction + FLAT BOOL FALSE # Flat-field normalisation + MASK BOOL FALSE # Mask bad pixels + MASK.BUILD BOOL TRUE # Build internal mask? + MASK.BURNTOOL BOOL FALSE # Mask potential burntool trails + MASK.AUXMASK BOOL FALSE # augment mask with more restrictive auxiliary mask + PATTERN.ROW BOOL FALSE # Row pattern correction + PATTERN.CELL BOOL FALSE # Cell pattern correction + PATTERN.CONTINUITY BOOL FALSE # Cell pattern correction using edge continuity + FRINGE BOOL FALSE # Fringe subtraction + BIN1.FITS BOOL TRUE # Save 1st binned chip image? + BIN2.FITS BOOL TRUE # Save 2nd binned chip image? + PHOTOM BOOL FALSE # Source identification and photometry + ASTROM.CHIP BOOL FALSE # Astrometry per chip? + ASTROM.MOSAIC BOOL FALSE # Astrometry for mosaic? + BACKGROUND BOOL FALSE # Subtract background? + CROSSTALK.MEASURE BOOL FALSE # Subtract model background? + APPLY.BURNTOOL BOOL FALSE # apply burntool correction in ppImage + USE.DEBURNED.IMAGE BOOL FALSE # use burntool-repaired image? + USE.BEST.BURNTOOL BOOL FALSE # require the best burntooled data + MASK.BAD.OVERSCAN BOOL TRUE + + OVERSCAN.MIN.VALID F32 1.0 # minimum valid overscan value + OVERSCAN.MAX.VALID F32 50000.0 # maximum valid overscan value +END Index: /trunk/ippconfig/recipes/filerules-mef.mdc =================================================================== --- /trunk/ippconfig/recipes/filerules-mef.mdc (revision 43048) +++ /trunk/ippconfig/recipes/filerules-mef.mdc (revision 43049) @@ -72,5 +72,5 @@ PPIMAGE.PATTERN.DEAD.CELLS INPUT @DETDB FPA PATTERN.DEAD.CELLS PPIMAGE.NEWNONLIN INPUT @DETDB CHIP NEWNONLIN -PPIMAGE.VALID.OVERSCAN INPUT @DETDB FPA VALID.OVERSCAN +PPIMAGE.VALID.OVERSCAN INPUT @DETDB FPA VALID_OVERSCAN ## Files used by ppMerge Index: /trunk/ippconfig/recipes/filerules-simple.mdc =================================================================== --- /trunk/ippconfig/recipes/filerules-simple.mdc (revision 43048) +++ /trunk/ippconfig/recipes/filerules-simple.mdc (revision 43049) @@ -32,5 +32,5 @@ PPIMAGE.LINEARITY INPUT @DETDB CHIP LINEARITY PPIMAGE.NEWNONLIN INPUT @DETDB CHIP NEWNONLIN -PPIMAGE.VALID.OVERSCAN INPUT @DETDB FPA VALID.OVERSCAN +PPIMAGE.VALID.OVERSCAN INPUT @DETDB FPA VALID_OVERSCAN FPCAMERA.OUTPUT STR FPCAMERA.OUT.CMF Index: /trunk/ippconfig/recipes/filerules-split.mdc =================================================================== --- /trunk/ippconfig/recipes/filerules-split.mdc (revision 43048) +++ /trunk/ippconfig/recipes/filerules-split.mdc (revision 43049) @@ -56,5 +56,5 @@ PPIMAGE.PATTERN.ROW.AMP INPUT @DETDB FPA PATTERN.ROW.AMP PPIMAGE.PATTERN.DEAD.CELLS INPUT @DETDB FPA PATTERN.DEAD.CELLS -PPIMAGE.VALID.OVERSCAN INPUT @DETDB FPA VALID.OVERSCAN +PPIMAGE.VALID.OVERSCAN INPUT @DETDB FPA VALID_OVERSCAN ## Files used by psvideophot Index: /trunk/ippconfig/recipes/jpeg.mdc =================================================================== --- /trunk/ippconfig/recipes/jpeg.mdc (revision 43048) +++ /trunk/ippconfig/recipes/jpeg.mdc (revision 43049) @@ -331,5 +331,5 @@ CHECK_LOW_CELLS METADATA PPIMAGE.JPEG1 METADATA - COLORMAP STR rainbow + COLORMAP STR -greyscale SCALE.MODE STR RANGE SCALE.MIN F32 -5.0 @@ -339,5 +339,5 @@ PPIMAGE.JPEG2 METADATA - COLORMAP STR rainbow + COLORMAP STR -greyscale SCALE.MODE STR RANGE SCALE.MIN F32 -5.0 Index: /trunk/ippconfig/recipes/ppImage.config =================================================================== --- /trunk/ippconfig/recipes/ppImage.config (revision 43048) +++ /trunk/ippconfig/recipes/ppImage.config (revision 43049) @@ -3067,2 +3067,28 @@ FPA1.FITS BOOL TRUE # Save mosaiced FITS image? END + +# Standard chip processing +CHIP_OVERSCAN_MASK METADATA + BASE.FITS BOOL FALSE # Save base detrended image? + BASE.MASK.FITS BOOL FALSE # Save base detrended image? + BASE.VARIANCE.FITS BOOL FALSE # Save base detrended image? + CHIP.FITS BOOL TRUE # Save chip-mosaic-ed image? + CHIP.MASK.FITS BOOL TRUE # Save chip-mosaic-ed image? + CHIP.VARIANCE.FITS BOOL TRUE # Save chip-mosaic-ed image? + OVERSCAN BOOL TRUE # Overscan subtraction + NONLIN BOOL FALSE # Non-linearity correction; not implemented + BIAS BOOL FALSE # Bias subtraction + DARK BOOL FALSE # Dark subtraction + SHUTTER BOOL FALSE # Shutter correction + FLAT BOOL FALSE # Flat-field normalisation + MASK BOOL FALSE # Mask bad pixels + FRINGE BOOL FALSE # Fringe subtraction + BIN1.FITS BOOL TRUE # Save 1st binned chip image? + BIN2.FITS BOOL TRUE # Save 2nd binned chip image? + PHOTOM BOOL FALSE # Source identification and photometry + ASTROM.CHIP BOOL FALSE # Astrometry per chip? + ASTROM.MOSAIC BOOL FALSE # Astrometry for mosaic? + BACKGROUND BOOL FALSE # Subtract background? + MASK.STATS BOOL FALSE # Calculate Mask statistics. + MASK.BAD.OVERSCAN BOOL FALSE +END Index: /trunk/ippconfig/recipes/reductionClasses.mdc =================================================================== --- /trunk/ippconfig/recipes/reductionClasses.mdc (revision 43048) +++ /trunk/ippconfig/recipes/reductionClasses.mdc (revision 43049) @@ -2276,2 +2276,12 @@ JPEG STR CHECK_LOW_CELLS END + +# only overscan correction and internal masks +JPEG_OVERSCAN_MASK METADATA + CHIP_PPIMAGE STR CHIP_OVERSCAN_MASK + CHIP_PSPHOT STR CHIP + JPEG_BIN1 STR PPIMAGE_J1_FITS + JPEG_BIN2 STR PPIMAGE_J2 + PSASTRO STR NO_BACKGROUND + JPEG STR CHECK_LOW_CELLS +END Index: /trunk/ppImage/src/ppImageArguments.c =================================================================== --- /trunk/ppImage/src/ppImageArguments.c (revision 43048) +++ /trunk/ppImage/src/ppImageArguments.c (revision 43049) @@ -119,5 +119,5 @@ pmConfigFileSetsMD (config->arguments, &argc, argv, "LINEARITY", "-linearity", "-linearlist"); pmConfigFileSetsMD (config->arguments, &argc, argv, "NEWNONLIN", "-newnonlin", "-newnonlinlist"); - pmConfigFileSetsMD (config->arguments, &argc, argv, "VALID.OVERSCAN", "-valid-overscan", "-valid-overscan-list"); + pmConfigFileSetsMD (config->arguments, &argc, argv, "VALID_OVERSCAN", "-valid-overscan", "-valid-overscan-list"); pmConfigFileSetsMD (config->arguments, &argc, argv, "PATTERN.ROW.AMP", "-pattern-row-amplitude", "-not-defined"); pmConfigFileSetsMD (config->arguments, &argc, argv, "PATTERN.DEAD.CELLS", "-pattern-dead-cells", "-not-defined"); Index: /trunk/ppImage/src/ppImageParseCamera.c =================================================================== --- /trunk/ppImage/src/ppImageParseCamera.c (revision 43048) +++ /trunk/ppImage/src/ppImageParseCamera.c (revision 43049) @@ -124,7 +124,7 @@ if (options->doMaskBadOverscan) { // if the file has been specified on the command-line (-valid-overscan file), then the file - // is identified by the VALID.OVERSCAN entry in config->arguments. otherwise, load from the - // detrend system as type VALID.OVERSCAN - if (!ppImageDefineFile(config, input->fpa, "PPIMAGE.VALID.OVERSCAN", "VALID.OVERSCAN", + // is identified by the VALID_OVERSCAN entry in config->arguments. otherwise, load from the + // detrend system as type VALID_OVERSCAN + if (!ppImageDefineFile(config, input->fpa, "PPIMAGE.VALID.OVERSCAN", "VALID_OVERSCAN", PM_FPA_FILE_VALID_OVERSCAN, PM_DETREND_TYPE_VALID_OVERSCAN)) { psError(PS_ERR_IO, false, "Can't find a new non-linearity correction source"); Index: /trunk/psModules/src/camera/pmFPAfile.c =================================================================== --- /trunk/psModules/src/camera/pmFPAfile.c (revision 43048) +++ /trunk/psModules/src/camera/pmFPAfile.c (revision 43049) @@ -543,5 +543,5 @@ return PM_FPA_FILE_NEWNONLIN; } - if (!strcasecmp(type, "VALID.OVERSCAN")) { + if (!strcasecmp(type, "VALID_OVERSCAN")) { return PM_FPA_FILE_VALID_OVERSCAN; } Index: /trunk/psModules/src/detrend/pmDetrendDB.c =================================================================== --- /trunk/psModules/src/detrend/pmDetrendDB.c (revision 43048) +++ /trunk/psModules/src/detrend/pmDetrendDB.c (revision 43049) @@ -113,4 +113,5 @@ DETREND_STRING_CASE(AUXMASK); DETREND_STRING_CASE(KH_CORRECT); + DETREND_STRING_CASE(VALID_OVERSCAN); DETREND_STRING_CASE(PATTERN_ROW_AMP); DETREND_STRING_CASE(PATTERN_DEAD_CELLS); Index: /trunk/psModules/src/detrend/pmMaskBadOverscan.c =================================================================== --- /trunk/psModules/src/detrend/pmMaskBadOverscan.c (revision 43048) +++ /trunk/psModules/src/detrend/pmMaskBadOverscan.c (revision 43049) @@ -32,7 +32,7 @@ // completely mask the readout - for (int i = 0; i < mask->numRows; i++) { // Loop over rows : note: problem with discontinuity here - for (int j = 0; j < mask->numCols; j++) { // Loop over columns - mask->data.PS_TYPE_IMAGE_MASK_DATA[j][i] |= maskValue; + for (int iy = 0; iy < mask->numRows; iy++) { // Loop over rows : note: problem with discontinuity here + for (int ix = 0; ix < mask->numCols; ix++) { // Loop over columns + mask->data.PS_TYPE_IMAGE_MASK_DATA[iy][ix] |= maskValue; } }