Index: /trunk/ippconfig/cfh12k/camera.config =================================================================== --- /trunk/ippconfig/cfh12k/camera.config (revision 16842) +++ /trunk/ippconfig/cfh12k/camera.config (revision 16843) @@ -278,5 +278,5 @@ PPIMAGE.MASK INPUT @DETDB CHIP IMAGE PPIMAGE.BIAS INPUT @DETDB CHIP IMAGE - PPIMAGE.DARK INPUT @DETDB CHIP IMAGE + PPIMAGE.DARK INPUT @DETDB CHIP DARK PPIMAGE.FLAT INPUT @DETDB CHIP IMAGE PPIMAGE.FRINGE INPUT @DETDB CHIP FRINGE Index: /trunk/ippconfig/ctio_mosaic2/camera.config =================================================================== --- /trunk/ippconfig/ctio_mosaic2/camera.config (revision 16842) +++ /trunk/ippconfig/ctio_mosaic2/camera.config (revision 16843) @@ -251,5 +251,5 @@ PPIMAGE.MASK INPUT @DETDB CHIP IMAGE PPIMAGE.BIAS INPUT @DETDB CHIP IMAGE - PPIMAGE.DARK INPUT @DETDB CHIP IMAGE + PPIMAGE.DARK INPUT @DETDB CHIP DARK PPIMAGE.FLAT INPUT @DETDB CHIP IMAGE PPIMAGE.FRINGE INPUT @DETDB CHIP FRINGE Index: /trunk/ippconfig/esowfi/camera.config =================================================================== --- /trunk/ippconfig/esowfi/camera.config (revision 16842) +++ /trunk/ippconfig/esowfi/camera.config (revision 16843) @@ -238,5 +238,5 @@ PPIMAGE.MASK INPUT @DETDB CHIP IMAGE PPIMAGE.BIAS INPUT @DETDB CHIP IMAGE - PPIMAGE.DARK INPUT @DETDB CHIP IMAGE + PPIMAGE.DARK INPUT @DETDB CHIP DARK PPIMAGE.FLAT INPUT @DETDB CHIP IMAGE PPIMAGE.FRINGE INPUT @DETDB CHIP FRINGE Index: /trunk/ippconfig/gpc1/ppMerge.config =================================================================== --- /trunk/ippconfig/gpc1/ppMerge.config (revision 16842) +++ /trunk/ippconfig/gpc1/ppMerge.config (revision 16843) @@ -12,2 +12,14 @@ SAMPLE S32 500 # Sampling factor for measuring the background END + + +# Ordinates for fitting dark current +DARK.ORDINATES METADATA + CELL.DARKTIME S32 1 + CHIP.TEMP METADATA + ORDER S32 1 + SCALE BOOL TRUE + MIN F32 -110 + MAX F32 -70 + END +END Index: /trunk/ippconfig/isp/camera.config =================================================================== --- /trunk/ippconfig/isp/camera.config (revision 16842) +++ /trunk/ippconfig/isp/camera.config (revision 16843) @@ -209,5 +209,5 @@ PPIMAGE.MASK INPUT mask.fits FPA IMAGE PPIMAGE.BIAS INPUT @DETDB FPA IMAGE - PPIMAGE.DARK INPUT @DETDB FPA IMAGE + PPIMAGE.DARK INPUT @DETDB FPA DARK PPIMAGE.FLAT INPUT @DETDB FPA IMAGE PPIMAGE.FRINGE INPUT @DETDB FPA FRINGE Index: /trunk/ippconfig/megacam/filerules-mef.mdc =================================================================== --- /trunk/ippconfig/megacam/filerules-mef.mdc (revision 16842) +++ /trunk/ippconfig/megacam/filerules-mef.mdc (revision 16843) @@ -32,5 +32,5 @@ PPIMAGE.MASK INPUT @DETDB CHIP MASK PPIMAGE.BIAS INPUT @DETDB CHIP IMAGE -PPIMAGE.DARK INPUT @DETDB CHIP IMAGE +PPIMAGE.DARK INPUT @DETDB CHIP DARK PPIMAGE.FLAT INPUT @DETDB CHIP IMAGE PPIMAGE.FRINGE INPUT @DETDB CHIP FRINGE Index: /trunk/ippconfig/recipes/ppMerge.config =================================================================== --- /trunk/ippconfig/recipes/ppMerge.config (revision 16842) +++ /trunk/ippconfig/recipes/ppMerge.config (revision 16843) @@ -1,9 +1,9 @@ # Recipe configuration for ppMerge -ROWS S32 512 # Number of rows to read at once +ROWS S32 128 # Number of rows to read at once ELECTRONS F32 100.0 # Minimum number of electrons for useful signal SAMPLE S32 100 # Sampling factor for measuring the background REJ F32 3.0 # Rejection threshold (sigma) -ITER S32 1 # Number of rejection iterations +ITER S32 0 # Number of rejection iterations FRACHIGH F32 0.0 # Fraction of high pixels to reject immediately FRACLOW F32 0.0 # Fraction of low pixels to reject immediately @@ -26,4 +26,9 @@ MEAN STR ROBUST_MEDIAN # Statistic to use to measure the mean STDEV STR ROBUST_STDEV # Statistic to use to measure the stdev + +# Ordinates for fitting dark current +DARK.ORDINATES METADATA + CELL.DARKTIME S32 1 # Traditional dark current term +END Index: /trunk/ippconfig/sdss/camera.config =================================================================== --- /trunk/ippconfig/sdss/camera.config (revision 16842) +++ /trunk/ippconfig/sdss/camera.config (revision 16843) @@ -150,5 +150,5 @@ PPIMAGE.MASK INPUT @FILES FPA IMAGE PPIMAGE.BIAS INPUT @DETDB FPA IMAGE - PPIMAGE.DARK INPUT @DETDB FPA IMAGE + PPIMAGE.DARK INPUT @DETDB FPA DARK PPIMAGE.FLAT INPUT @DETDB FPA IMAGE PPIMAGE.FRINGE INPUT @DETDB FPA FRINGE Index: /trunk/ippconfig/simmosaic/camera.config =================================================================== --- /trunk/ippconfig/simmosaic/camera.config (revision 16842) +++ /trunk/ippconfig/simmosaic/camera.config (revision 16843) @@ -231,5 +231,5 @@ PPIMAGE.MASK INPUT @DETDB CELL IMAGE PPIMAGE.BIAS INPUT @DETDB CELL IMAGE - PPIMAGE.DARK INPUT @DETDB CELL IMAGE + PPIMAGE.DARK INPUT @DETDB CELL DARK PPIMAGE.FLAT INPUT @DETDB CELL IMAGE PPIMAGE.FRINGE INPUT @DETDB CHIP FRINGE Index: /trunk/ippconfig/simple/filerules.mdc =================================================================== --- /trunk/ippconfig/simple/filerules.mdc (revision 16842) +++ /trunk/ippconfig/simple/filerules.mdc (revision 16843) @@ -9,5 +9,5 @@ INPUT.WEIGHT INPUT none.fits FPA WEIGHT PPIMAGE.BIAS INPUT @DETDB CHIP IMAGE -PPIMAGE.DARK INPUT @DETDB CHIP IMAGE +PPIMAGE.DARK INPUT @DETDB CHIP DARK PPIMAGE.FLAT INPUT @DETDB CHIP IMAGE PPIMAGE.MASK INPUT @DETDB CHIP IMAGE Index: /trunk/ippconfig/simtest/filerules.mdc =================================================================== --- /trunk/ippconfig/simtest/filerules.mdc (revision 16842) +++ /trunk/ippconfig/simtest/filerules.mdc (revision 16843) @@ -15,5 +15,5 @@ INPUT.SRC INPUT none.fits READOUT CMF PPIMAGE.BIAS INPUT @DETDB CHIP IMAGE -PPIMAGE.DARK INPUT @DETDB CHIP IMAGE +PPIMAGE.DARK INPUT @DETDB CHIP DARK PPIMAGE.SHUTTER INPUT @DETDB CHIP IMAGE PPIMAGE.FLAT INPUT @DETDB CHIP IMAGE