Changeset 20225

Timestamp:

Oct 17, 2008, 9:49:32 AM (18 years ago)

Author:

bills

Message:

in ppStatsFromMetadata fix problem handing dateobs

Location:

trunk

Files:

• ippconfig/recipes/ppStatsFromMetadata.config (modified) (2 diffs)
• ppStats/src/ppStatsFromMetadataEntries.c (modified) (1 diff)
• ppStats/src/ppStatsFromMetadataPrint.c (modified) (1 diff)

trunk/ippconfig/recipes/ppStatsFromMetadata.config

@@ -17 +17 @@
   ENTRY  VAL  FPA.AZ              F64  CONSTANT          -az                  # Azimuth
   ENTRY  VAL  FPA.POSANGLE        F32  CONSTANT          -posang              # Position angle
-  ENTRY  VAL  FPA.TIME            STR  CONSTANT          -dateobs             # Date of observation (UTC)
+  ENTRY  VAL  FPA.TIME            UTC   CONSTANT          -dateobs             # Date of observation (UTC)
   ENTRY  VAL  FPA.TELESCOPE       STR  CONSTANT          -telescope           # Telescope
   ENTRY  VAL  FPA.CAMERA          STR  CONSTANT          -inst                # Instrument
@@ -65 +65 @@
   ENTRY  VAL  obs_mode            STR  CONSTANT          -obs_mode            # Obs Mode (eg, survey ID)
   ENTRY  VAL  obs_group           STR  CONSTANT          -obs_group           # Obs Group (image sequence)
-  ENTRY  VAL  dateobs             TIME CONSTANT          -dateobs             # File level
+  ENTRY  VAL  dateobs             UTC  CONSTANT          -dateobs             # File level
   ENTRY  VAL  ccd_temp            F32  SAMPLE_MEAN       -ccd_temp            # CCD temperature
   ENTRY  VAL  exp_time            F32  SAMPLE_MEAN       -exp_time            # Exposure time

trunk/ppStats/src/ppStatsFromMetadataEntries.c

@@ -107 +107 @@
     if (!strcmp (typename, "STR")) return PS_DATA_STRING;
     if (!strcmp (typename, "TIME")) return PS_DATA_TIME;
+    if (!strcmp (typename, "UTC")) return PS_DATA_TIME;
+    if (!strcmp (typename, "TAI")) return PS_DATA_TIME;
 
     return 0;

trunk/ppStats/src/ppStatsFromMetadataPrint.c

@@ -28 +28 @@
             fprintf (f, "%s %f ", entry->flag, entry->value->data.F32);
         }
+        if (entry->value->type == PS_DATA_TIME) {
+            psTime *t = (psTime *)  entry->value->data.V;
+            psString str = psTimeToISO(t);
+            fprintf (f, "%s %.19sZ ", entry->flag, str);
+            psFree(str);
+        }
     }
     fprintf (f, "\n");