Changeset 33098 for branches/meh_branches/ppsub_test/ippconfig/gpc1/format_20090120.config

Timestamp:

Jan 11, 2012, 11:19:21 PM (15 years ago)

Author:

mhuber

Message:

merged latest r33093 trunk changes to meh_branches/ppsub_test

Location:

branches/meh_branches/ppsub_test

Files:

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

branches/meh_branches/ppsub_test/ippconfig/gpc1/format_20090120.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   
@@ -505 +505 @@
 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