Index: trunk/psModules/src/concepts/pmConceptsStandard.c
===================================================================
--- trunk/psModules/src/concepts/pmConceptsStandard.c	(revision 23378)
+++ trunk/psModules/src/concepts/pmConceptsStandard.c	(revision 23404)
@@ -670,4 +670,38 @@
     return timeSys;
 }
+
+// Set the corresponding TIMESYS for one of the TIME concepts
+static bool conceptSetTimesysForTime(const char *name, // Concept name ("CELL.TIME" or "FPA.TIME")
+                                     const pmFPA *fpa, // FPA of interest
+                                     const pmChip *chip, // Chip of interest, or NULL
+                                     const pmCell *cell, // Cell of interest, or NULL
+                                     psTimeType timeSys // The time system value
+                                     )
+{
+    assert(name);
+
+    psString timesysName = psStringCopy(name); // e.g., "CELL.TIME" --> "CELL.TIMESYS"
+    psStringSubstitute(&timesysName, "TIMESYS", "TIME");
+    psMetadataItem *item = NULL;        // Item with time system
+    if (cell) {
+        item = psMetadataLookup(cell->concepts, timesysName);
+    }
+    if (!item && chip) {
+        item = psMetadataLookup(chip->concepts, timesysName);
+    }
+    if (!item && fpa) {
+        item = psMetadataLookup(fpa->concepts, timesysName);
+    }
+    if (!item) {
+        psError(PS_ERR_UNEXPECTED_NULL, true, "Unable to find %s in concepts when setting %s\n",
+                timesysName, name);
+        return false;
+    }
+
+    item->data.S32 = timeSys;
+
+    return true;
+}
+
 
 psMetadataItem *p_pmConceptParse_TIME(const psMetadataItem *concept,
@@ -896,5 +930,9 @@
     }
 
-    time->type = timeSys;
+    if (jdTime || mjdTime) {
+        conceptSetTimesysForTime(pattern->name, fpa, chip, cell, PS_TIME_TAI);
+    } else {
+        time->type = timeSys;
+    }
 
     psMetadataItem *item = psMetadataItemAllocPtr(pattern->name, PS_DATA_TIME, pattern->comment, time);