Changeset 22706

Timestamp:

Feb 26, 2009, 4:48:09 PM (17 years ago)

Author:

Paul Price

Message:

Convert time to desired time system after averaging, since psTimeFromMJD produces TAI.

File:

• trunk/psModules/src/concepts/pmConceptsAverage.c (modified) (4 diffs)

trunk/psModules/src/concepts/pmConceptsAverage.c

@@ -61 +61 @@
 
         psTime *fpaTime = psMetadataLookupPtr(NULL, fpa->concepts, "FPA.TIME");
+        psTimeConvert(fpaTime, PS_TIME_TAI);
         time       += psTimeToMJD(fpaTime);
         if (num == 1) {
@@ -96 +97 @@
         psMetadataItem *timeItem = psMetadataLookup(target->concepts, "FPA.TIME");
         psFree(timeItem->data.V);
-        timeItem->data.V = psTimeFromMJD(time);
+        psTime *new = psTimeFromMJD(time);
+        psTimeConvert(new, timeSys);
+        timeItem->data.V = new;
     }
 
@@ -115 +118 @@
         }
 
-        float value = psMetadataLookupF32(&status, cell->concepts, name);
-        if (!status) continue;
-        if (!isfinite(value)) continue;
+        float value = psMetadataLookupF32(&status, cell->concepts, name);
+        if (!status) continue;
+        if (!isfinite(value)) continue;
 
         sum += value;
@@ -246 +249 @@
         psMetadataItem *timeItem = psMetadataLookup(target->concepts, "CELL.TIME");
         psFree(timeItem->data.V);
-        timeItem->data.V = psTimeFromMJD(time);
+        psTime *new = psTimeFromMJD(time);
+        psTimeConvert(new, timeSys);
+        timeItem->data.V = new;
     }