Changeset 40412 for trunk

Timestamp:

Apr 30, 2018, 3:10:59 PM (8 years ago)

Author:

watersc1

Message:

Switch FPA.FILTER concept to use FILTERID and get the full filter name, matching gpc1 configuration.

Location:

trunk/ippconfig/gpc2

Files:

• format_20180131.config (modified) (1 diff)
• format_default.config (modified) (1 diff)
• ppImage.config (modified) (1 diff)
• psastro.config (modified) (3 diffs)

trunk/ippconfig/gpc2/format_20180131.config

@@ -243 +243 @@
 TRANSLATION     METADATA
         FPA.FILTERID    STR     FILTERID
-#        FPA.FILTER      STR     FILTERID
-        FPA.FILTER      STR     FILTER
+        FPA.FILTER      STR     FILTERID
+#       FPA.FILTER      STR     FILTER
         FPA.RA          STR     RA
         FPA.DEC         STR     DEC

trunk/ippconfig/gpc2/format_default.config

@@ -245 +245 @@
 TRANSLATION     METADATA
         FPA.FILTERID    STR     FILTERID
-#        FPA.FILTER      STR     FILTERID
-        FPA.FILTER      STR     FILTER
+        FPA.FILTER      STR     FILTERID
+#       FPA.FILTER      STR     FILTER
         FPA.RA          STR     RA
         FPA.DEC         STR     DEC

trunk/ippconfig/gpc2/ppImage.config

@@ -1822 +1822 @@
 END
 
+PPIMAGE_BKGCONT    METADATA
+  OVERSCAN         BOOL    FALSE           # 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
+  MASK.BUILD       BOOL    FALSE           # Build internal mask?
+  FRINGE           BOOL    FALSE           # Fringe subtraction
+  PHOTOM           BOOL    FALSE           # Source identification and photometry
+  ASTROM.CHIP      BOOL    FALSE           # Astrometry per chip?
+  ASTROM.MOSAIC    BOOL    FALSE           # Astrometry for mosaic?
+  BASE.FITS        BOOL    FALSE           # Save base image?
+  BASE.MASK.FITS   BOOL    FALSE           # Save base detrended image?
+  BASE.VARIANCE.FITS BOOL    FALSE           # Save base detrended image?
+  CHIP.FITS        BOOL    FALSE           # Save chip-mosaic-ed image? 
+  CHIP.MASK.FITS   BOOL    FALSE           # Save chip-mosaic-ed image? 
+  CHIP.VARIANCE.FITS BOOL    FALSE           # Save chip-mosaic-ed image? 
+  BIN1.FITS        BOOL    FALSE           # Save 1st binned chip image?
+  BIN2.FITS        BOOL    FALSE           # Save 2nd binned chip image?
+  BIN1.JPEG        BOOL    FALSE           # Save 1st binned jpeg?
+  BIN2.JPEG        BOOL    FALSE           # Save 2nd binned jpeg?
+  BIN1.XBIN        S32     1               # Image is already binned
+  BIN1.YBIN        S32     1               # Image is already binned
+  BIN2.XBIN        S32     1               # Image is already binned
+  BIN2.YBIN        S32     1               # Image is already binned
+  MASK.SATURATED   BOOL    FALSE           # DO NOT Mask the saturated pixels
+  MASK.LOW         BOOL    FALSE           # DO NOT Mask the saturated pixels
+  BACKGROUND.CONTINUITY BOOL FALSE
+  PATTERN.CONTINUITY.WIDTH S32 2
+END

trunk/ippconfig/gpc2/psastro.config

@@ -113 +113 @@
 
 # maximum accepted fwhm_major (moved from camera.config
-PSASTRO.MAX.ALLOWED.FWHM              F32       12
+PSASTRO.MAX.ALLOWED.FWHM              F32       100
 
 # *** make sure the choice of CATDIR (dvo database) contains the photcodes desired below
 # PSASTRO.CATDIR              STR      SYNTH.GRIZY 
 # PSASTRO.CATDIR                STR     PS1.REF.20120503
-PSASTRO.CATDIR               STR     PS1.REF.20120524
+PSASTRO.CATDIR               STR     PS1.REF.20170919
 
 
@@ -209 +209 @@
 
 # ghost model file is relative to PATH (eg, ippconfig directory)
-GHOST_MODEL                     STR  gpc1/ghost.model.mdc
+#GHOST_MODEL                     STR  gpc1/ghost.model.mdc
 # GHOST_MAX_MAG                   F32 -20.0
 
@@ -359 +359 @@
 DEFAULT_RECIPE METADATA
 #   PSASTRO.CATDIR               STR     PS1.REF.20120503
-   PSASTRO.CATDIR               STR     PS1.REF.20120524
+   PSASTRO.CATDIR               STR     PS1.REF.20170919
    ZERO.POINT.USE.MEAN          BOOL    TRUE  
 END