Changeset 42630

Timestamp:

Feb 20, 2024, 2:33:17 PM (2 years ago)

Author:

eugene

Message:

merge changes from trunk: deactivate burntool v15 as default until raw images have been processed; add time-specific dark option for gpc1

Location:

branches/eam_branches/ipp-20230313/ippconfig

Files:

• . (modified) (1 prop)
• gpc1/camera.config (modified) (1 diff)
• gpc1/ppImage.config (modified) (2 diffs)
• gpc2/ppImage.config (modified) (4 diffs)

branches/eam_branches/ipp-20230313/ippconfig/gpc1/camera.config

@@ -157 +157 @@
 PHOTCODE.RULE           STR     {DETECTOR}.{FILTER.ID}.{CHIP.NAME}      # Rule for generating photcode
 
+# EAM 20240209 : until v15 burntools have been generated for all raw data, keep v14 for the
+# default value (modify in checked out test code)
+# BURNTOOL.STATE.GOOD        S16  15  # Value for burntool_state with the most recent bt version.
 BURNTOOL.STATE.GOOD        S16  14  # Value for burntool_state with the most recent bt version.
 BURNTOOL.STATE.GOOD.UPDATE S16  13  # for upddate processing accept earlier version

branches/eam_branches/ipp-20230313/ippconfig/gpc1/ppImage.config

@@ -1095 +1095 @@
     DARK METADATA
       EXPTIME STR FPA.EXPOSURE
+      DETTYPE STR TIMEDARK
     END
     FLAT METADATA
@@ -1870 +1871 @@
   MASK.BURNTOOL      BOOL    TRUE            # Mask potential burntool trails
   PATTERN.ROW        BOOL    TRUE            # Row pattern correction
-  PATTERN.CELL       BOOL    TRUE            # Cell pattern correction
+  PATTERN.CELL       BOOL    FALSE           # Cell pattern correction
   FRINGE             BOOL    TRUE            # Fringe subtraction
   BIN1.FITS          BOOL    TRUE            # Save 1st binned chip image?

branches/eam_branches/ipp-20230313/ippconfig/gpc2/ppImage.config

@@ -1026 +1026 @@
 END
 
-# identical to the default CHIP, but iwht FLATTEST
+# identical to the default CHIP, but with FLATTEST
 PPIMAGE_FLATTEST    METADATA
   BASE.FITS          BOOL    FALSE           # Save base detrended image?
@@ -1063 +1063 @@
     DARK METADATA
       EXPTIME STR FPA.EXPOSURE
+      DETTYPE STR TIMEDARK
     END
     FLAT METADATA
@@ -1612 +1613 @@
   BIAS               BOOL    FALSE           # Bias subtraction
   DARK               BOOL    TRUE            # Dark subtraction
-  NOISEMAP           BOOL    TRUE
+  NOISEMAP           BOOL    FALSE
   REMNANCE           BOOL    FALSE           # Remnance masking
   SHUTTER            BOOL    FALSE           # Shutter correction
@@ -1618 +1619 @@
   MASK               BOOL    TRUE            # Mask bad pixels
   MASK.BUILD         BOOL    TRUE            # Build internal mask?
-  MASK.BURNTOOL      BOOL    TRUE            # Mask potential burntool trails
+  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    TRUE            # Cell pattern coorection using edge continuity
-  FRINGE             BOOL    TRUE            # Fringe subtraction
+  PATTERN.CONTINUITY BOOL    FALSE           # Cell pattern coorection 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?