Changeset 42662

Timestamp:

Apr 13, 2024, 12:14:19 PM (2 years ago)

Author:

eugene

Message:

add OVERSCAN.2D options, example format for OVERSCAN.2D

Location:

branches/eam_branches/ippconfig.20240412

Files:

• gpc1/format_20100723.config (modified) (1 diff)
• recipes/ppImage.config (modified) (5 diffs)

branches/eam_branches/ippconfig.20240412/gpc1/format_20100723.config

@@ -161 +161 @@
                 CELL.TRIMSEC.SOURCE     STR     HEADER
                 CELL.TRIMSEC            STR     DATASEC
-                CELL.BIASSEC.SOURCE     STR     HEADER
-                CELL.BIASSEC            STR     BIASSEC
+#                CELL.BIASSEC.SOURCE     STR     HEADER
+#                CELL.BIASSEC            STR     BIASSEC
+# two regions are needed for 2D bias subtraction. the first is the read-dir (y), the second is the cross-dir (x)
+# 2D bias subtraction requires ppImage.config OVERSCAN.2D to be TRUE
+               CELL.BIASSEC.SOURCE     STR     VALUE
+               CELL.BIASSEC            STR     [591:624,1:598],[1:590,598:608]
+#
+# a single region will be used for constant and 1D bias subtraction
+#               CELL.BIASSEC.SOURCE     STR     VALUE
+#               CELL.BIASSEC            STR     [591:624,1:608]
         END
 END

branches/eam_branches/ippconfig.20240412/recipes/ppImage.config

@@ -97 +97 @@
 # Overscan subtraction
 OVERSCAN.SINGLE         BOOL    TRUE            # Reduce overscan to a single value?
+OVERSCAN.CONSTANT       BOOL    FALSE           # Apply a known, fixed value?
+OVERSCAN.VALUE          F32     0.0             # value to apply, if requested
+OVERSCAN.MIN.VALID      F32     0.0             # minimum valid overscan value 
+OVERSCAN.MAX.VALID      F32     65536.0         # maximum valid overscan value 
+
+# statistics to use to convert overscan region to a vector
 OVERSCAN.FIT            STR     NONE            # NONE | POLYNOMIAL | SPLINE
 OVERSCAN.ORDER          S32     5               # Order of polynomial fit
@@ -102 +108 @@
 OVERSCAN.BOXCAR         S32     0               # Boxcar smoothing radius
 OVERSCAN.GAUSS          F32     0.0             # Gaussian smoothing sigma
-OVERSCAN.CONSTANT       BOOL    FALSE           # Apply a known, fixed value?
-OVERSCAN.VALUE          F32     0.0             # value to apply, if requested
-OVERSCAN.MIN.VALID      F32     0.0             # minimum valid overscan value 
-OVERSCAN.MAX.VALID      F32     65536.0         # maximum valid overscan value 
+
+OVERSCAN.2D             BOOL    FALSE           # use a 2D model for the overscan subtraction?
+
+# statistics to use to convert 2D top-overscan region to a vector
+OVERSCAN.2D.FIT         STR     NONE            # NONE | POLYNOMIAL | SPLINE
+OVERSCAN.2D.ORDER       S32     5               # Order of polynomial fit
+OVERSCAN.2D.STAT        STR     MEAN            # MEAN | MEDIAN
+OVERSCAN.2D.BOXCAR      S32     0               # Boxcar smoothing radius
+OVERSCAN.2D.GAUSS       F32     0.0             # Gaussian smoothing sigma
 
 # Pattern Row subtraction options
@@ -2626 +2637 @@
   FLAT               BOOL    TRUE            # Flat-field normalisation
   MASK               BOOL    TRUE            # Mask bad pixels
-  MASK.BUILD         BOOL    TRUE            # Build internal mask?
+  MASK.BUILD         BOOL    TRUE            # Build internal mask?
   MASK.BURNTOOL      BOOL    FALSE           # Mask potential burntool trails
   PATTERN.ROW        BOOL    FALSE           # Row pattern correction
@@ -2633 +2644 @@
   BIN1.FITS          BOOL    TRUE            # Save 1st binned chip image?
   BIN2.FITS          BOOL    TRUE            # Save 2nd binned chip image?
+  BIN1.JPEG          BOOL    TRUE            # Save 1st binned jpeg?
+  BIN2.JPEG          BOOL    TRUE            # Save 2nd binned jpeg?
   PHOTOM             BOOL    FALSE           # Source identification and photometry
   ASTROM.CHIP        BOOL    FALSE           # Astrometry per chip?
@@ -2639 +2652 @@
   CROSSTALK.MEASURE  BOOL    FALSE           # Subtract model background?
 
-  BACKGROUND         BOOL    TRUE            # Subtract background?
-  PATTERN.DEAD.CELLS BOOL    TRUE            # continuity corrections (see options below)
+  BACKGROUND         BOOL    FALSE           # Subtract background?
+  PATTERN.DEAD.CELLS BOOL    FALSE           # continuity corrections (see options below)
   OVERSCAN.MIN.VALID F32     100.0           # Overscan subtraction
   OVERSCAN.MAX.VALID F32   64000.0           # Overscan subtraction