Changeset 23197 for branches/cnb_branches/cnb_branch_20090215/psModules/src/concepts/pmConceptsStandard.c

Timestamp:

Mar 5, 2009, 11:13:29 AM (17 years ago)

Author:

beaumont

Message:

Finished ppStack visualization. Unified the way in which visualizations are invoked, plotting windows are closed, etc

Location:

branches/cnb_branches/cnb_branch_20090215

Files:

• . (modified) (1 prop)
• psModules/src/concepts/pmConceptsStandard.c (modified) (7 diffs)

branches/cnb_branches/cnb_branch_20090215/psModules/src/concepts/pmConceptsStandard.c

@@ -116 +116 @@
                         if (!isfinite(gain)) {
                             psWarning("CELL.READNOISE is supposed to be in ADU, but CELL.GAIN isn't set -- forcing to 1.0");
-                            gain = 1.0;
+                            gain = 1.0;
                         }
                         rn /= gain;
@@ -639 +639 @@
 }
 
+// Determine the corresponding TIMESYS for one of the TIME concepts
+static psTimeType conceptGetTimesysForTime(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
+                                           )
+{
+    assert(name);
+
+    psString timesysName = psStringCopy(name); // e.g., "CELL.TIME" --> "CELL.TIMESYS"
+    psStringSubstitute(&timesysName, "TIMESYS", "TIME");
+    bool mdok = false;                  // Result of MD lookup
+    psTimeType timeSys = 0xFFFFFFFF;    // The time system
+    if (cell) {
+        timeSys = psMetadataLookupS32(&mdok, cell->concepts, timesysName);
+    }
+    if (!mdok && chip) {
+        timeSys = psMetadataLookupS32(&mdok, chip->concepts, timesysName);
+    }
+    if (!mdok && fpa) {
+        timeSys = psMetadataLookupS32(&mdok, fpa->concepts, timesysName);
+    }
+    if (!mdok || (timeSys == 0xFFFFFFFF)) {
+        psWarning("Unable to find %s in concepts when parsing %s --- assuming UTC.\n",
+                  timesysName, name);
+        timeSys = PS_TIME_UTC;
+    }
+    psFree(timesysName);
+
+    return timeSys;
+}
+
 psMetadataItem *p_pmConceptParse_TIME(const psMetadataItem *concept,
                                       const psMetadataItem *pattern,
@@ -650 +682 @@
     assert(cameraFormat);
 
-    // Need TIMESYS first
-    psString timesysName = psStringCopy(pattern->name); // e.g., "CELL.TIME" --> "CELL.TIMESYS"
-    psStringSubstitute(&timesysName, "TIMESYS", "TIME");
-    bool mdok = false;                  // Result of MD lookup
-    psTimeType timeSys = PS_TIME_UTC; // The time system
-    if (cell) {
-        timeSys = psMetadataLookupS32(&mdok, cell->concepts, timesysName);
-    }
-    if (!mdok && chip) {
-        timeSys = psMetadataLookupS32(&mdok, chip->concepts, timesysName);
-    }
-    if (!mdok && fpa) {
-        timeSys = psMetadataLookupS32(&mdok, fpa->concepts, timesysName);
-    }
-    if (!mdok || (timeSys == 0xffffffff)) {
-        psWarning("Unable to find %s in concepts when parsing %s --- assuming UTC.\n",
-                  timesysName, pattern->name);
-        timeSys = PS_TIME_UTC;
-    }
-    psFree(timesysName);
+    psTimeType timeSys = conceptGetTimesysForTime(pattern->name, fpa, chip, cell); // Time system
 
     // Work out how the time is represented
@@ -681 +694 @@
 
     // Get format
+    bool mdok;                          // Status of MD lookup
     psMetadata *formats = psMetadataLookupMetadata(&mdok, cameraFormat, "FORMATS");
     if (!mdok || !formats) {
@@ -877 +891 @@
     }
 
+    time->type = timeSys;
+
     psMetadataItem *item = psMetadataItemAllocPtr(pattern->name, PS_DATA_TIME, pattern->comment, time);
     psFree(time);                       // Drop reference
@@ -1132 +1148 @@
 {
     psTime *time = concept->data.V;     // The time
+
+    psTimeType timeSys = conceptGetTimesysForTime(concept->name, fpa, chip, cell); // Time system
+    psTimeConvert(time, timeSys);
 
     // Work out the format
@@ -1331 +1350 @@
 
 
+psMetadataItem *p_pmConceptCopy_TIMESYS(const psMetadataItem *target,
+                                        const psMetadataItem *source,
+                                        const psMetadata *cameraFormat,
+                                        const pmFPA *fpa,
+                                        const pmChip *chip,
+                                        const pmCell *cell)
+{
+    if (!target || target->data.S32 == -1) {
+        // Replace
+        return psMetadataItemCopy(source);
+    }
+    // Keep what we've got --- it's been mandated by use of the DEFAULTS
+    return psMemIncrRefCounter((psMetadataItem*)target);
+}