Changeset 32630 for branches/eam_branches/ipp-20110906/ippconfig/gpc1/format_20100122.config

Timestamp:

Nov 8, 2011, 2:44:12 PM (15 years ago)

Author:

eugene

Message:

merge changes from trunk

Location:

branches/eam_branches/ipp-20110906

Files:

• . (modified) (1 prop)
• ippconfig (modified) (1 prop)
• ippconfig/gpc1/format_20100122.config (modified) (2 diffs)

branches/eam_branches/ipp-20110906/ippconfig/gpc1/format_20100122.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   
@@ -506 +506 @@
 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
+#        FPA.TEMP        STR     SELECT ccd_temp FROM rawExp WHERE dateobs >= '{FPA.DATE}' and abs(timediff(dateobs, cast('{FPA.TIME}' as datetime))) < 2
 END