Changeset 19993

Timestamp:

Oct 8, 2008, 11:23:59 AM (18 years ago)

Author:

Paul Price

Message:

Working towards controlling formats in an operational mode. Renamed format_raw.config to format_orig.config. Renamed format_new.config to format_20080929.config. From now on, will name formats by the date (around) when they cut on. The actual cut on is implemented by the RULEs. The original format now contains a correction to the temperature search for OTA24: the search is based on the date, but the dates were off by 1 month due to a bug in the shutter controller; the database was fixed but the headers have not been, so need to account for this when searching. The new format is intended for use after the shutter controller bug was fixed.

Location:

trunk/ippconfig/gpc1

Files:

• Makefile.am (modified) (1 diff)
• camera.config (modified) (1 diff)
• format_20080929.config (added)
• format_mef.config (modified) (4 diffs)
• format_new.config (deleted)
• format_orig.config (added)
• format_raw.config (deleted)

trunk/ippconfig/gpc1/Makefile.am

@@ -6 +6 @@
         dvo.layout \
         camera.config \
-        format_raw.config \
-        format_new.config \
+        format_20080929.config \
+        format_orig.config \
         format_mef.config \
         ppImage.config \

trunk/ippconfig/gpc1/camera.config

@@ -3 +3 @@
 # File formats that we know about
 FORMATS         METADATA
-        MEF     STR     gpc1/format_mef.config
-#       NEW     STR     gpc1/format_new.config
-        RAW     STR     gpc1/format_raw.config
+        MEF             STR     gpc1/format_mef.config
+        RAW_20080929    STR     gpc1/format_20080929.config
+        ORIG            STR     gpc1/format_orig.config
 END
 

trunk/ippconfig/gpc1/format_mef.config

@@ -168 +168 @@
         FPA.RA          STR     RA
         FPA.DEC         STR     DEC
-        # FPA.RA          STR     CRVAL1
-        # FPA.DEC         STR     CRVAL2
         FPA.RADECSYS    STR     RADECSYS
         FPA.OBSTYPE     STR     OBSTYPE
@@ -460 +458 @@
         CELL.READDIR    S32     1
         CELL.BAD        S32     0
-        CELL.XSIZE              S32     590
-        CELL.YSIZE              S32     598
+        CELL.XSIZE      S32     590
+        CELL.YSIZE      S32     598
 #       CELL.TIME       STR     MJD-OBS
 #       CELL.TIMESYS    STR     TIMESYS
@@ -469 +467 @@
 # How to translation PS concepts into database lookups
 DATABASE        METADATA
-        TYPE            dbEntry         TABLE           COLUMN          GIVENDBCOL      GIVENPS
-#       CELL.GAIN       dbEntry         Camera          gain            chipId,cellId   CHIP,CELL
-#       CELL.READNOISE  dbEntry         Camera          readNoise       chipId,cellId   CHIP,CELL
-
-# A database entry refers to a particular column (COLUMN) in a
-# particular table (TABLE), given certain PS concepts (GIVENPS) that
-# match certain database columns (GIVENDBCOL).
-
 END
 
@@ -491 +481 @@
 END
  
-# Recipe options
-RECIPES         METADATA
-END
- 
-# How to get the supplementary stuff: mask and weight
-SUPPLEMENTARY   METADATA
-        MASK.SOURCE     STR     FILE            # Source type for mask: EXT | FILE
-        MASK.NAME       STR     %a_mask.fits    # Name for mask extension or filename
-        WEIGHT.SOURCE   STR     FILE            # Source type for weight: EXT | FILE
-        WEIGHT.NAME     STR     %a_weight.fits  # Name for weight extension or filename
-END