Changeset 17911 for trunk/psModules/src/camera/pmFPA.c

Timestamp:

Jun 4, 2008, 3:32:28 PM (18 years ago)

Author:

Paul Price

Message:

I've implemented the chip-dependent concepts. It uses a generalised version of the dependent DEFAULT concepts, which can, unfortunately, make the camera format configuration a bit longer, but it consolidates code and keeps things simple both for the code and the configuration.

In the process, I took care of a couple of other concept bugs that have been sitting in my inbox for nearly a year:

• FPA.NAME has been replaced with FPA.OBS, which is intended to be an observation identifier (bug 885). You're welcome to change the name, so long as you also volunteer to fix all the camera formats.
• FPA.CAMERA is automatically set (on construction of the FPA) to the camera name as used by the configuration files (bug 931). I've changed the ppStats REGISTER recipe to use FPA.CAMERA instead of FPA.INSTRUMENT (which is retained in the concepts as the instrument's name according to the instrument, whereas FPA.CAMERA is the instrument's name according to our configuration).

File:

• trunk/psModules/src/camera/pmFPA.c (modified) (4 diffs)

trunk/psModules/src/camera/pmFPA.c

@@ -305 +305 @@
     tmpCell->conceptsRead = PM_CONCEPT_SOURCE_NONE;
     if (!psMetadataAddStr(tmpCell->concepts, PS_LIST_HEAD, "CELL.NAME", 0, NULL, name)) {
-        psLogMsg(__func__, PS_LOG_WARN, "WARNING: Could not add CELL.NAME to metadata.\n");
+        psErrorClear();
+        psWarning("Could not add CELL.NAME to metadata.");
     }
     pmConceptsBlankCell(tmpCell);
@@ -343 +344 @@
     tmpChip->conceptsRead = PM_CONCEPT_SOURCE_NONE;
     if (!psMetadataAddStr(tmpChip->concepts, PS_LIST_HEAD, "CHIP.NAME", 0, NULL, name)) {
-        psLogMsg(__func__, PS_LOG_WARN, "WARNING: Could not add CHIP.NAME %s to concepts.\n", name);
+        psErrorClear();
+        psWarning("Could not add CHIP.NAME %s to concepts.", name);
     }
     pmConceptsBlankChip(tmpChip);
@@ -355 +357 @@
 }
 
-pmFPA *pmFPAAlloc(const psMetadata *camera)
+pmFPA *pmFPAAlloc(const psMetadata *camera, const char *cameraName)
 {
     pmFPA *tmpFPA = (pmFPA *) psAlloc(sizeof(pmFPA));
@@ -373 +375 @@
     pmConceptsBlankFPA(tmpFPA);
 
+    if (!psMetadataAddStr(tmpFPA->concepts, PS_LIST_TAIL, "FPA.CAMERA", PS_META_REPLACE,
+                          "Camera name (according to configuration)", cameraName)) {
+        psErrorClear();
+        psWarning("Could not add FPA.CAMERA %s to concepts.", cameraName);
+    }
+
     return tmpFPA;
 }