Changeset 25157

Timestamp:

Aug 20, 2009, 12:02:08 PM (17 years ago)

Author:

watersc1

Message:

Finished merges

Location:

branches/czw_branch/cleanup

Files:

• . (modified) (1 prop)
• console (modified) (1 prop)
• ippconfig/gpc1/format_20090220.config (modified) (2 diffs)
• psconfig (modified) (1 prop)

branches/czw_branch/cleanup/ippconfig/gpc1/format_20090220.config

@@ -185 +185 @@
         FPA.ALT         STR     ALT
         FPA.AZ          STR     AZ
-        FPA.TEMP        STR     DETTEM
+        # FPA.TEMP        STR     DETTEM
         FPA.M1X         STR     M1X
         FPA.M1Y         STR     M1Y   
@@ -501 +501 @@
 # How to translation PS concepts into database lookups
 DATABASE        METADATA
+        # this rule is fragile : does not match the camera
+        FPA.TEMP        STR     SELECT ccd_temp FROM rawExp WHERE dateobs >= '{FPA.DATE}' and abs(timediff(dateobs, cast('{FPA.TIME}' as datetime))) < 2
 END
 

branches/czw_branch/cleanup/psconfig

@@ -2 +2 @@
 psconfig.csh
 psconfig.bash
+build.log

@@ -2 +2 @@
 psconfig.csh
 psconfig.bash
+build.log

@@ -2 +2 @@
 psconfig.csh
 psconfig.bash
+build.log