Changeset 20021

Timestamp:

Oct 9, 2008, 10:49:45 AM (18 years ago)

Author:

eugene

Message:

adding format_20080925 to handle mismatch between SHUTOUTC and db times; format_orig needs to use MJD-OBS

Location:

trunk/ippconfig/gpc1

Files:

• Makefile.am (modified) (1 diff)
• camera.config (modified) (2 diffs)
• format_20080925.config (added)
• format_20080929.config (modified) (1 diff)
• format_orig.config (modified) (5 diffs)
• ppImage.config (modified) (1 diff)

trunk/ippconfig/gpc1/Makefile.am

@@ -6 +6 @@
         dvo.layout \
         camera.config \
+        format_20080925.config \
         format_20080929.config \
         format_orig.config \

trunk/ippconfig/gpc1/camera.config

@@ -5 +5 @@
         MEF             STR     gpc1/format_mef.config
         RAW_20080929    STR     gpc1/format_20080929.config
+        RAW_20080925    STR     gpc1/format_20080925.config
         ORIG            STR     gpc1/format_orig.config
 END
@@ -80 +81 @@
    z        STR   z.00000
    y        STR   y.00000
+   w        STR   w.00000
    OPEN     STR   OPEN
 END

trunk/ippconfig/gpc1/format_20080929.config

@@ -10 +10 @@
         CONTROLR        STR     STARGRASP
         NAMPS           S32     64
-        SHUTDAVR        F32     1.21            # OP: >=
+        MJD-OBS         F64     54739.0  # OP: >=
+#       SHUTDAVR        F32     1.21            # OP: >=
+
+#       The most accurate keyword for the time/date is SHUTOUTC, but
+#       until 2009/9/30, there was a bug which set the month off by 1.
+#       The prior formats use MJD-OBS for time/date, and this is set
+#       in the db.  SHUTDAVR is supposed to be the key to the new
+#       shutter driver, but there were earlier periods where the value
+#       was 1.21, so we are keying on the MJD of the change.  Also
+#       note that historically (early 2008), SHUTOUTC was not
+#       available, forcing MJD-OBS in those periods.
 END
 

trunk/ippconfig/gpc1/format_orig.config

@@ -9 +9 @@
         NAMPS           S32     64
 END
+
+#       The most accurate keyword for the time/date is SHUTOUTC, but
+#       until 2009/9/30, there was a bug which set the month off by 1.
+#       The prior formats use MJD-OBS for time/date, and this is set
+#       in the db.  SHUTDAVR is supposed to be the key to the new
+#       shutter driver, but there were earlier periods where the value
+#       was 1.21, so we are keying on the MJD of the change.  Also
+#       note that historically (early 2008), SHUTOUTC was not
+#       available, forcing MJD-OBS in those periods.
 
 # How to read this data
@@ -180 +189 @@
         FPA.POSANGLE    STR     POSANGLE
         FPA.FOCUS       STR     M2Z
-        FPA.TIME        STR     SHUTOUTC
+        FPA.TIME        STR     MJD-OBS
         FPA.ALT         STR     ALT
         FPA.AZ          STR     AZ
@@ -285 +294 @@
         CELL.EXPOSURE   STR     EXPTIME         # Exposure time measured by shutter
         CELL.DARKTIME   STR     DARKTIME        # Exposure time for camera
-        CELL.TIME       STR     SHUTOUTC                # Observation time
+        CELL.TIME       STR     MJD-OBS         # Observation time
 END
 
@@ -569 +578 @@
         CHIP.TEMP.DEPEND        STR     CHIP.NAME
         CHIP.TEMP               METADATA
-                # Need to apply correction of 1 month since header still contains bug but database corrected.
-                XY24    STR     SELECT AVG(ccd_temp) FROM rawImfile WHERE (dateobs - INTERVAL 1 MONTH BETWEEN '{FPA.TIME}' - INTERVAL 2 SECOND AND '{FPA.TIME}' + INTERVAL 2 SECOND) AND class_id != 'XY24'
+                XY24    STR     SELECT AVG(ccd_temp) FROM rawImfile WHERE dateobs = '{FPA.TIME}' AND class_id != 'XY24'
         END
 END
@@ -581 +589 @@
         FPA.LONGITUDE   STR     HOURS
         FPA.LATITUDE    STR     DEGREES
-        FPA.TIME        STR     YEAR.FIRST
-        CELL.TIME       STR     YEAR.FIRST
+        FPA.TIME        STR     MJD
+        CELL.TIME       STR     MJD
         CELL.BINNING    STR     TOGETHER
         CELL.X0         STR     FORTRAN

trunk/ippconfig/gpc1/ppImage.config

@@ -219 +219 @@
   ASTROM.CHIP      BOOL    FALSE           # Astrometry per chip?
   ASTROM.MOSAIC    BOOL    FALSE           # Astrometry for mosaic?
+END
+
+# Overscan, bias, dark, shutter, flat-field, fringe, photom
+PPIMAGE_FLATCORR    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 chip-mosaic-ed image? 
+  CHIP.WEIGHT.FITS BOOL    TRUE            # Save chip-mosaic-ed image? 
+  OVERSCAN         BOOL    TRUE            # Overscan subtraction
+  BIAS             BOOL    FALSE           # 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    FALSE           # 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?
+
+  DETREND.CONSTRAINTS  METADATA
+    FLAT METADATA
+      DETTYPE STR FLAT_RAW
+    END
+  END   
 END