Changeset 41898 for trunk/ippconfig/recipes

Timestamp:

Nov 4, 2021, 6:14:00 PM (5 years ago)

Author:

eugene

Message:

merge changes from eam_branches/ipp-dev-20210817 (turn on PATTERN.ROW for all chips & cells, new PATTERN.ROW thresholds, add config values to reject based on CERSTD)

Location:

trunk/ippconfig

Files:

• . (modified) (1 prop)
• recipes/filerules-mef.mdc (modified) (1 diff)
• recipes/filerules-split.mdc (modified) (1 diff)
• recipes/ppImage.config (modified) (2 diffs)
• recipes/ppStack.config (modified) (1 diff)
• recipes/psastro.config (modified) (2 diffs)
• recipes/pswarp.config (modified) (1 diff)

trunk/ippconfig/recipes/filerules-mef.mdc

@@ -67 +67 @@
 PPIMAGE.SHUTTER         INPUT    @DETDB        CHIP       IMAGE     
 PPIMAGE.LINEARITY       INPUT    @DETDB        CHIP       LINEARITY
+PPIMAGE.PATTERN.ROW.AMP INPUT    @DETDB        FPA       PATTERN.ROW.AMP
 
 ## Files used by ppMerge

trunk/ippconfig/recipes/filerules-split.mdc

@@ -51 +51 @@
 PPIMAGE.SHUTTER           INPUT    @DETDB        CHIP       IMAGE
 PPIMAGE.LINEARITY         INPUT    @DETDB        CHIP       LINEARITY
+PPIMAGE.PATTERN.ROW.AMP   INPUT    @DETDB        FPA        PATTERN.ROW.AMP
 
 ## Files used by psvideophot

trunk/ippconfig/recipes/ppImage.config

@@ -23 +23 @@
 VARIANCE.BUILD     BOOL    FALSE           # Build internal variance image
 ADDNOISE           BOOL    FALSE           # Add noise to degrade an MD image to a 3pi image?
-PATTERN.ROW        BOOL    FALSE           # Row pattern correction
-PATTERN.ROW.SUBSET METADATA                # Menu of chips and/or cells for row pattern correction
-END
-PATTERN.CELL       BOOL    FALSE           # Cell pattern correction
-PATTERN.CELL.SUBSET METADATA               # Menu of chips and/or cells for cell pattern correction
-END
-PATTERN.SUBSET     METADATA
-END
-PATTERN.CONTINUITY BOOL    FALSE
-PATTERN.CONTINUITY.WIDTH S32  50
-PATTERN.CONTINUITY.SUBSET METADATA         # Menu of chips and/or cells for cell pattern continuity correction
-END
+PATTERN.ROW        BOOL    FALSE           # Row pattern correction (see options below)
+PATTERN.CELL       BOOL    FALSE           # Cell pattern correction (see options below)
+PATTERN.CONTINUITY BOOL    FALSE           # continuity corrections (see options below)
 FRINGE             BOOL    FALSE           # Fringe subtraction
 PHOTOM             BOOL    FALSE           # Source identification and photometry
@@ -111 +102 @@
 OVERSCAN.VALUE          F32     0.0             # value to apply, if requested
 
-# Pattern subtraction options
+# Pattern Row subtraction options
 PATTERN.ROW.ORDER      S32     2               # Polynomial order for row pattern
-PATTERN.ROW.ITER       S32     4               # Rejection iterations for row pattern
+PATTERN.ROW.ITER       S32     3               # Rejection iterations for row pattern
 PATTERN.ROW.REJ        F32     2.5             # Rejection threshold for row pattern
-PATTERN.ROW.THRESH     F32     20.0            # Ignore threshold for row pattern
+PATTERN.ROW.THRESH     F32     3.0             # Ignore threshold for row pattern
 PATTERN.ROW.MEAN       STR     SAMPLE_MEAN     # Statistic for mean for row pattern
 PATTERN.ROW.STDEV      STR     SAMPLE_STDEV    # Statistic for standard deviation for row pattern
+PATTERN.ROW.USE.BINNED BOOL    TRUE            # pre-bin along the row before calculating (NOT yet respected r41656)
+PATTERN.ROW.POISSON    BOOL    TRUE            # use Poisson stats on the sky to set threshold (NOT yet respected r41656)
+
+PATTERN.ROW.SUBSET     METADATA                # Menu of chips and/or cells for row pattern correction
+END
+
+# NOTE: PATTERN.ROW.SUBSET is defined in the format_DATE.config files because
+# in different periods, the camera had different amounts of row-by-row bias drift
+# for a given cell.  It is necessary to make the choice of whether to correct the 
+# pattern based on the epoch the exposure was taken.
+
+# NOTE: if PATTERN.ROW.SUBSET entries are missing for a given chip, the default 
+# behavior is to NOT correct for the effect. (This makes sense since most camera
+# are not GPC1 and thus do not need the correction).
+
+# Pattern Cell options
 PATTERN.CELL.BG        STR     FITTED_MEAN     # Statistic for background for cell pattern
 PATTERN.CELL.MEAN      STR     SAMPLE_MEDIAN   # Statistic for mean for cell pattern
+PATTERN.CELL.SUBSET    METADATA                # Menu of chips and/or cells for cell pattern correction
+END
+
+# Pattern Continuity options
+PATTERN.CONTINUITY.WIDTH S32  50
+PATTERN.CONTINUITY.SUBSET METADATA         # Menu of chips and/or cells for cell pattern continuity correction
+END
+
+# r41656 : this does not appear to be used any more: superceded by PATTERN.ROW, .CELL, .CONTINUITY
+PATTERN.SUBSET     METADATA
+END
 
 # Fringe subtraction options

trunk/ippconfig/recipes/ppStack.config

@@ -8 +8 @@
 COMBINE.SYS     F32     0.1             # Relative systematic error in combination
 COMBINE.DISCARD F32     0.2             # Discard fraction for Olympic weighted mean
+
+COMBINE.PERCENT   BOOL  FALSE           # Use a single percentile clipping?
+COMBINE.MIN.RANGE F32   0.16            # Minimum fraction for percentile clipping
+COMBINE.MAX.RANGE F32   0.84            # Maximum fraction for percentile clipping
 
 MASK.VAL        STR     MASK.VALUE,CONV.BAD,GHOST # Mask value of input bad pixels

trunk/ippconfig/recipes/psastro.config

@@ -91 +91 @@
 PSASTRO.CHIP.NSIGMA    F32      3  # fit clipping sigmas
 
-PSASTRO.MAX.ERROR      F32      1.5 # max allow error for valid solution (UNITS?)
+PSASTRO.MAX.ERROR      F32      1.5 # max allowed error for valid solution (arcsec)
+PSASTRO.MAX.STDEV      F32      1.0 # max allowed stdev for valid solution (arcsec)
 PSASTRO.MIN.NSTAR      S32      3   # min fitted stars in solution
 PSASTRO.MAX.NSTAR      S32      300   # max fitted stars in solution
@@ -135 +136 @@
 PSASTRO.MOSAIC.CHIP.NSIGMA    F32      3  # fit clipping sigmas
 
-PSASTRO.MOSAIC.MAX.ERROR.N0   F32      1.5 # max allow error for valid solution (UNITS?)
-PSASTRO.MOSAIC.MAX.ERROR.N1   F32      1.5 # max allow error for valid solution (UNITS?)
-PSASTRO.MOSAIC.MAX.ERROR.N2   F32      1.5 # max allow error for valid solution (UNITS?)
-PSASTRO.MOSAIC.MAX.ERROR.N3   F32      1.5 # max allow error for valid solution (UNITS?)
-PSASTRO.MOSAIC.MAX.ERROR.N4   F32      1.5 # max allow error for valid solution (UNITS?)
-PSASTRO.MOSAIC.MAX.ERROR.N5   F32      1.5 # max allow error for valid solution (UNITS?)
+PSASTRO.MOSAIC.MAX.ERROR.N0   F32      1.5 # max allowed error for valid solution (arcsec)
+PSASTRO.MOSAIC.MAX.ERROR.N1   F32      1.5 # max allowed error for valid solution (arcsec)
+PSASTRO.MOSAIC.MAX.ERROR.N2   F32      1.5 # max allowed error for valid solution (arcsec)
+PSASTRO.MOSAIC.MAX.ERROR.N3   F32      1.5 # max allowed error for valid solution (arcsec)
+PSASTRO.MOSAIC.MAX.ERROR.N4   F32      1.5 # max allowed error for valid solution (arcsec)
+PSASTRO.MOSAIC.MAX.ERROR.N5   F32      1.5 # max allowed error for valid solution (arcsec)
+
+PSASTRO.MOSAIC.MAX.STDEV.N0   F32      1.5 # max allowed stdev for valid solution (arcsec)
+PSASTRO.MOSAIC.MAX.STDEV.N1   F32      1.5 # max allowed stdev for valid solution (arcsec)
+PSASTRO.MOSAIC.MAX.STDEV.N2   F32      1.5 # max allowed stdev for valid solution (arcsec)
+PSASTRO.MOSAIC.MAX.STDEV.N3   F32      1.5 # max allowed stdev for valid solution (arcsec)
+PSASTRO.MOSAIC.MAX.STDEV.N4   F32      1.5 # max allowed stdev for valid solution (arcsec)
+PSASTRO.MOSAIC.MAX.STDEV.N5   F32      1.5 # max allowed stdev for valid solution (arcsec)
 
 # need at least this fraction of chips to pass for exposure to be considered acceptable

trunk/ippconfig/recipes/pswarp.config

@@ -14 +14 @@
 APPLY.PIXELNAN          BOOL    FALSE           # Apply NAN'ing of pixels underneath masks
 
-MAX.CERROR              F32     0.1             # Maximum allowed CERROR value (astrometric error in arcsec)
+MAX.CERROR              F32     0.30            # Maximum allowed CERROR value (astrometric error in arcsec)
+MAX.CERSTD              F32     0.15            # Maximum allowed CERSTD value (astrometric error in arcsec)
 
 NO.COMPRESS             BOOL    FALSE           # turn off image compression (if enabled)