Changeset 17911 for trunk/ippconfig/gpc1/format_raw.config

Timestamp:

Jun 4, 2008, 3:32:28 PM (18 years ago)

Author:

Paul Price

Message:

I've implemented the chip-dependent concepts. It uses a generalised version of the dependent DEFAULT concepts, which can, unfortunately, make the camera format configuration a bit longer, but it consolidates code and keeps things simple both for the code and the configuration.

In the process, I took care of a couple of other concept bugs that have been sitting in my inbox for nearly a year:

• FPA.NAME has been replaced with FPA.OBS, which is intended to be an observation identifier (bug 885). You're welcome to change the name, so long as you also volunteer to fix all the camera formats.
• FPA.CAMERA is automatically set (on construction of the FPA) to the camera name as used by the configuration files (bug 931). I've changed the ppStats REGISTER recipe to use FPA.CAMERA instead of FPA.INSTRUMENT (which is retained in the concepts as the instrument's name according to the instrument, whereas FPA.CAMERA is the instrument's name according to our configuration).

File:

• trunk/ippconfig/gpc1/format_raw.config (modified) (4 diffs)

trunk/ippconfig/gpc1/format_raw.config

@@ -14 +14 @@
         PHU             STR     CHIP       # The FITS file represents a single chip
         EXTENSIONS      STR     CELL       # The extensions represent cells
-        FPA.NAME        STR     CONTROLR   # A PHU keyword for unique identifier within the hierarchy level
+        FPA.OBS         STR     CONTROLR   # A PHU keyword for unique identifier within the hierarchy level
         CONTENT         STR     DETECTOR   # How to determine content of FITS file
         CONTENT.RULE    STR     {CHIP.ID}  # How to derive the CONTENT when writing
@@ -214 +214 @@
         CELL.YPARITY    STR     LTM2_2
 #       CELL.SATURATION STR     SATURATE
-        CHIP.TEMP       STR     DETTEM
+
+#        CHIP.TEMP       STR     DETTEM # XY24 is bad, so get it from the database; all others from header
+        CHIP.TEMP.DEPEND        STR     CHIP.NAME
+        CHIP.TEMP       METADATA
+                XY01    STR     DETTEM
+                XY02    STR     DETTEM
+                XY03    STR     DETTEM
+                XY04    STR     DETTEM
+                XY05    STR     DETTEM
+                XY06    STR     DETTEM
+                XY10    STR     DETTEM
+                XY11    STR     DETTEM
+                XY12    STR     DETTEM
+                XY13    STR     DETTEM
+                XY14    STR     DETTEM
+                XY15    STR     DETTEM
+                XY16    STR     DETTEM
+                XY17    STR     DETTEM
+                XY20    STR     DETTEM
+                XY21    STR     DETTEM
+                XY22    STR     DETTEM
+                XY23    STR     DETTEM
+#               XY24    STR     DETTEM  # This is currently bad --- get it from the database
+                XY25    STR     DETTEM
+                XY26    STR     DETTEM
+                XY27    STR     DETTEM
+                XY30    STR     DETTEM
+                XY31    STR     DETTEM
+                XY32    STR     DETTEM
+                XY33    STR     DETTEM
+                XY34    STR     DETTEM
+                XY35    STR     DETTEM
+                XY36    STR     DETTEM
+                XY37    STR     DETTEM
+                XY40    STR     DETTEM
+                XY41    STR     DETTEM
+                XY42    STR     DETTEM
+                XY43    STR     DETTEM
+                XY44    STR     DETTEM
+                XY45    STR     DETTEM
+                XY46    STR     DETTEM
+                XY47    STR     DETTEM
+                XY50    STR     DETTEM
+                XY51    STR     DETTEM
+                XY52    STR     DETTEM
+                XY53    STR     DETTEM
+                XY54    STR     DETTEM
+                XY55    STR     DETTEM
+                XY56    STR     DETTEM
+                XY57    STR     DETTEM
+                XY60    STR     DETTEM
+                XY61    STR     DETTEM
+                XY62    STR     DETTEM
+                XY63    STR     DETTEM
+                XY64    STR     DETTEM
+                XY65    STR     DETTEM
+                XY66    STR     DETTEM
+                XY67    STR     DETTEM
+                XY71    STR     DETTEM
+                XY72    STR     DETTEM
+                XY73    STR     DETTEM
+                XY74    STR     DETTEM
+                XY75    STR     DETTEM
+                XY76    STR     DETTEM
+        END
+
         FPA.EXPOSURE    STR     EXPREQ          # Requested exposure time, presumably camera exposure time
         CELL.EXPOSURE   STR     EXPTIME         # Exposure time measured by shutter
@@ -225 +290 @@
         FPA.INSTRUMENT  STR     GPC1
         FPA.DETECTOR    STR     GPC1
-        FPA.NAME        S32     12345
         FPA.TIMESYS     STR     UTC
         CHIP.XPARITY    S32     1
@@ -492 +556 @@
 # 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).
-
+        CHIP.TEMP.DEPEND        STR     CHIP.NAME
+        CHIP.TEMP               METADATA
+                XY24    STR     SELECT AVG(ccd_temp) FROM rawImfile WHERE dateobs = '{FPA.TIME}' AND class_id != 'XY24'
+        END
 END