Changeset 43049 for trunk/ippconfig/recipes

Timestamp:

Jun 5, 2026, 10:55:58 AM (7 weeks ago)

Author:

eugene

Message:

use consistent names (VALID_OVERSCAN) for detrend type; fix a couple minor bugs in bad-overscan masking; use jpeg rules matching default chip

Location:

trunk/ippconfig/recipes

Files:

• filerules-mef.mdc (modified) (1 diff)
• filerules-simple.mdc (modified) (1 diff)
• filerules-split.mdc (modified) (1 diff)
• jpeg.mdc (modified) (2 diffs)
• ppImage.config (modified) (1 diff)
• reductionClasses.mdc (modified) (1 diff)

trunk/ippconfig/recipes/filerules-mef.mdc

@@ -72 +72 @@
 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

trunk/ippconfig/recipes/filerules-simple.mdc

@@ -32 +32 @@
 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

trunk/ippconfig/recipes/filerules-split.mdc

@@ -56 +56 @@
 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

trunk/ippconfig/recipes/jpeg.mdc

@@ -331 +331 @@
 CHECK_LOW_CELLS                 METADATA
   PPIMAGE.JPEG1                 METADATA
-        COLORMAP        STR     rainbow
+        COLORMAP        STR     -greyscale
         SCALE.MODE      STR     RANGE
         SCALE.MIN       F32      -5.0
@@ -339 +339 @@
   
   PPIMAGE.JPEG2 METADATA
-        COLORMAP        STR     rainbow
+        COLORMAP        STR     -greyscale
         SCALE.MODE      STR     RANGE
         SCALE.MIN       F32      -5.0

trunk/ippconfig/recipes/ppImage.config

@@ -3067 +3067 @@
   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

trunk/ippconfig/recipes/reductionClasses.mdc

@@ -2276 +2276 @@
     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