Changeset 41614 for trunk/ippconfig/recipes

Timestamp:

May 25, 2021, 2:36:46 PM (5 years ago)

Author:

fairlamb

Message:

added MASKTEST_DARKTEST config to clear up confusion of configs

Location:

trunk/ippconfig/recipes

Files:

• ppImage.config (modified) (2 diffs)
• reductionClasses.mdc (modified) (2 diffs)

trunk/ippconfig/recipes/ppImage.config

@@ -461 +461 @@
  
    DETREND.CONSTRAINTS  METADATA
+     MASK METADATA
+       DETTYPE STR MASKTEST
+     END
+     VIDEOMASK METADATA
+       DETTYPE STR VIDEOMASKTEST
+     END  
+   END   
+END
+
+CHIP_DARKTEST_MASKTEST 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    TRUE            # Bias subtraction
+  DARK               BOOL    TRUE            # Dark subtraction
+  SHUTTER            BOOL    FALSE           # Shutter correction
+  FLAT               BOOL    TRUE            # Flat-field normalisation
+  MASK               BOOL    TRUE            # Mask bad pixels
+  FRINGE             BOOL    TRUE            # Fringe subtraction
+  BIN1.FITS          BOOL    TRUE            # Save 1st binned chip image?
+  BIN2.FITS          BOOL    TRUE            # Save 2nd binned chip image?
+  PHOTOM             BOOL    TRUE            # Source identification and photometry
+  ASTROM.CHIP        BOOL    FALSE           # Astrometry per chip?
+  ASTROM.MOSAIC      BOOL    FALSE           # Astrometry for mosaic?
+  BACKGROUND         BOOL    TRUE            # Subtract background?
+  MASK.STATS         BOOL    TRUE            # Calculate Mask statistics.
+ 
+   DETREND.CONSTRAINTS  METADATA
      DARK METADATA
        DETTYPE STR DARKTEST
@@ -473 +506 @@
    END   
 END
- 
+
 CHIP_NOISEMAP   METADATA
   BASE.FITS          BOOL    FALSE           # Save base detrended image?

trunk/ippconfig/recipes/reductionClasses.mdc

@@ -490 +490 @@
 END
 
+# Sweetspot reduction class
+SWEETSPOT  METADATA
+    CHIP_PPIMAGE                STR     CHIP
+    CHIP_PSPHOT                 STR     CHIP
+    WARP_PSWARP                 STR     WARP
+    STACK_PPSTACK               STR     QUICKSTACK
+    STACK_PPSUB                 STR     STACK
+    STACK_PSPHOT                STR     STACK
+    DIFF_PPSUB                  STR     DIFF
+    DIFF_PSPHOT                 STR     SSTF_DIFF
+    JPEG_BIN1                   STR     PPIMAGE_J1
+    JPEG_BIN2                   STR     PPIMAGE_J2
+    FAKEPHOT                    STR     FAKEPHOT
+    ADDSTAR                     STR     ADDSTAR
+    PSASTRO                     STR     DEFAULT_RECIPE
+    STACKPHOT_PSPHOT            STR     STACKPHOT
+    STACKPHOT_PPSUB             STR     STACKPHOT
+    STACKPHOT_PPSTACK           STR     STACKPHOT
+    STACKPHOT_SINGLE_PSPHOT     STR     STACKPHOT_SINGLE
+    BACKGROUND_PPBACKGROUND     STR     BACKGROUND
+    BACKGROUND_PSWARP           STR     BACKGROUND
+    PSVIDEOPHOT                 STR     PSVIDEOPHOT
+END
 
 # Sweetspot reduction class
@@ -585 +608 @@
 END
 
-# Sweetspot reduction class
-SWEETSPOT  METADATA
-    CHIP_PPIMAGE                STR     CHIP
+# For use when both MASKTEST and DARKTEST are used
+# at the same time
+SWEETSPOT_DARKTEST_MASKTEST  METADATA
+    CHIP_PPIMAGE                STR     CHIP_DARKTEST_MASKTEST
     CHIP_PSPHOT                 STR     CHIP
     WARP_PSWARP                 STR     WARP