Changeset 18978

Timestamp:

Aug 8, 2008, 3:14:06 PM (18 years ago)

Author:

Paul Price

Message:

Merging Sebastian's tree: config file changes to recipes/ppImage.config and config files in sdssmosaic, to bring cvs in synch with what I'm using.

Location:

trunk/ippconfig

Files:

• recipes/ppImage.config (modified) (1 diff)
• sdssmosaic/camera.config (modified) (1 diff)
• sdssmosaic/format.config (modified) (2 diffs)
• sdssmosaic/ppImage.config (modified) (1 diff)
• sdssmosaic/psastro.config (modified) (1 diff)

trunk/ippconfig/recipes/ppImage.config

@@ -1307 +1307 @@
 END
 
+# For SDSS cameras
+PPIMAGE_OA_SOFT   METADATA
+END
+
+PPIMAGE_OP_SOFT   METADATA
+END

trunk/ippconfig/sdssmosaic/camera.config

@@ -68 +68 @@
                 JPEG_BIN2       STR     PPIMAGE_J2
         END
-        # photometry only for pre-detrended images
+        # photometry and astrometry for pre-detrended images
         SDSSphotast     METADATA
                 CHIP            STR     PPIMAGE_OA_SOFT

trunk/ippconfig/sdssmosaic/format.config

@@ -20 +20 @@
         CHIP.NAME       STR     CAMCOL  # Distinguishes chip name
         CONTENT         STR     CAMCOL
+ # Is the following line the origin of the weirdly named output files?
         CONTENT.RULE    STR     {CHIP.NUM} # How to derive the CONTENT when writing
 END
@@ -98 +99 @@
 # Default PS concepts that may be specified by value
 DEFAULTS        METADATA
-        FPA.INSTRUMENT  STR     SDSSmosaic
+# FPA.CAMERA contains the name of the camera according to the config system (i.e. SDSSmosaic)
+# FPA.INSTRUMENT contains the name of the camera according to the fits headers (i.e. itself)
+# Normally, this will be in the header keyword INSTRUME but for this one, we override it to 
+# SDSSmosaic to avoid confusion between this and the non-mosaic SDSS configuration.
+        INSTRUME        STR     SDSSmosaic
+        FPA.INSTRUMENT  STR     INSTRUME
 # The gain is only roughly correct...
         CELL.GAIN       F32     5.0

trunk/ippconfig/sdssmosaic/ppImage.config

@@ -99 +99 @@
 END
 
+# SDSS Softbias and photometry
+PPIMAGE_OP_SOFT   METADATA
+  BASE.FITS       BOOL    FALSE           # Save base detrended image?
+  BASE.MASK.FITS   BOOL   FALSE           # Save base detrended image?
+  BASE.WEIGHT.FITS BOOL   FALSE           # Save base detrended image?
+  CHIP.FITS       BOOL    TRUE            # Save chip-mosaic-ed image? 
+  CHIP.MASK.FITS   BOOL   TRUE            # Save base detrended image?
+  CHIP.WEIGHT.FITS BOOL   TRUE            # Save base detrended image?
+  OVERSCAN        BOOL    TRUE            # Overscan subtraction
+  OVERSCAN.CONSTANT BOOL  TRUE
+  OVERSCAN.VALUE  F32     1000.0
+  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
+# To turn on masking, use the following lines:
+#  MASK            BOOL    TRUE            # Mask bad pixels
+#  MASK.VALUE     U8      1               # Bad-pixel value in my SDSS masks (see IPPwiki/stripe82)
+  FRINGE          BOOL    FALSE           # Fringe subtraction
+  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    TRUE            # Source identification and photometry
+  ASTROM.CHIP     BOOL    FALSE            # Astrometry per chip?
+  ASTROM.MOSAIC   BOOL    FALSE           # Astrometry for mosaic?
+END
+
+# SDSS Softbias, photometry, astrometry
+PPIMAGE_OA_SOFT   METADATA
+  BASE.FITS       BOOL    FALSE           # Save base detrended image?
+  BASE.MASK.FITS   BOOL   FALSE           # Save base detrended image?
+  BASE.WEIGHT.FITS BOOL   FALSE           # Save base detrended image?
+  CHIP.FITS       BOOL    TRUE            # Save chip-mosaic-ed image? 
+  CHIP.MASK.FITS   BOOL   TRUE            # Save base detrended image?
+  CHIP.WEIGHT.FITS BOOL   TRUE            # Save base detrended image?
+  OVERSCAN        BOOL    TRUE            # Overscan subtraction
+  OVERSCAN.CONSTANT BOOL  TRUE
+  OVERSCAN.VALUE  F32     1000.0
+  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
+# To turn on masking, use the following lines:
+#  MASK            BOOL    TRUE            # Mask bad pixels
+#  MASK.VALUE     U8      1               # Bad-pixel value in my SDSS masks (see IPPwiki/stripe82)
+  FRINGE          BOOL    FALSE           # Fringe subtraction
+  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    TRUE            # Source identification and photometry
+  ASTROM.CHIP     BOOL    TRUE            # Astrometry per chip?
+  ASTROM.MOSAIC   BOOL    FALSE           # Astrometry for mosaic?
+END

trunk/ippconfig/sdssmosaic/psastro.config

@@ -67 +67 @@
 PSASTRO.ANGLE.TOLERANCE       F32      1.0
 
-PSASTRO.CATDIR STR /IPP/ippRefs/catdir.2mass
+# now use PSASTRO.CATDIR, it seems - and probably should only use it
+# once anyway - used to have both synth.grizy and 2mass listed here...
+# 2MASS is a symbolic name that needs to be defined in site.config
+# in the PSASTRO.CATDIRS METADATA section. SYNTH.GRIZY is currently
+# the other option.
+PSASTRO.CATDIR STR 2MASS
 
 # Mosaic Astrometry options