Changeset 22699 for trunk/psModules/src/config/pmConfigCamera.c

Timestamp:

Feb 26, 2009, 2:45:31 PM (17 years ago)

Author:

Paul Price

Message:

Reorganised the concepts files, moving the Write functions into pmConceptsWrite, and the Read functions into pmConceptsRead, which sort of makes sense. Added new type of concept property: copy. Most concepts use the default copy method (which is to simply copy the item), but for the TIMESYS concepts, we want to ensure that the target is of the correct type --- if it's already set (e.g., via the DEFAULTS), then we don't copy it. This will allow us to set the target TIMESYS using the DEFAULTS in the camera format, and have the output time be adjusted appropriately. Without this, the TIMESYS is simply copied, and specifying the TIMESYS in the DEFAULTS results in a warning ('values don't match'). Removed pmFPACopyConcepts, since it is pretty much the same as pmConceptsCopyFPA.

File:

• trunk/psModules/src/config/pmConfigCamera.c (modified) (3 diffs)

trunk/psModules/src/config/pmConfigCamera.c

@@ -280 +280 @@
         psMetadata *translation = psMetadataAlloc(); // The TRANSLATION --- how to read the FITS headers
 
-        psList *concepts;               // List of concepts for each level
-        psListIterator *iter;           // Iterator for concepts
-        psString name;                  // Concept name, from iteration
-
-        concepts = pmConceptsList(PM_FPA_LEVEL_FPA); // FPA-level concepts
-        iter = psListIteratorAlloc(concepts, PS_LIST_HEAD, false);
-        while ((name = psListGetAndIncrement(iter))) {
-            const char *new = skycellConceptName(name, skycellConceptsFPA, system); // Name for skycell
+        psMetadata *concepts;           // List of concepts for each level
+        psMetadataIterator *iter;       // Iterator for concepts
+        psMetadataItem *item;           // Concept specification item, from iteration
+
+        concepts = pmConceptsSpecs(PM_FPA_LEVEL_FPA); // FPA-level concepts
+        iter = psMetadataIteratorAlloc(concepts, PS_LIST_HEAD, NULL);
+        while ((item = psMetadataGetAndIncrement(iter))) {
+            const char *new = skycellConceptName(item->name, skycellConceptsFPA, system); // Name for skycell
             if (new) {
-                psMetadataAddStr(translation, PS_LIST_TAIL, name, 0, NULL, new);
+                psMetadataAddStr(translation, PS_LIST_TAIL, item->name, 0, NULL, new);
             }
         }
@@ -295 +295 @@
         psFree(concepts);
 
-        concepts = pmConceptsList(PM_FPA_LEVEL_CHIP);
-        iter = psListIteratorAlloc(concepts, PS_LIST_HEAD, false);
-        while ((name = psListGetAndIncrement(iter))) {
-            const char *new = skycellConceptName(name, skycellConceptsChip, system); // Name for skycell
+        concepts = pmConceptsSpecs(PM_FPA_LEVEL_CHIP);
+        iter = psMetadataIteratorAlloc(concepts, PS_LIST_HEAD, NULL);
+        while ((item = psMetadataGetAndIncrement(iter))) {
+            const char *new = skycellConceptName(item->name, skycellConceptsChip, system); // Name for skycell
             if (new) {
-                psMetadataAddStr(translation, PS_LIST_TAIL, name, 0, NULL, new);
+                psMetadataAddStr(translation, PS_LIST_TAIL, item->name, 0, NULL, new);
             }
         }
@@ -306 +306 @@
         psFree(concepts);
 
-        concepts = pmConceptsList(PM_FPA_LEVEL_CELL);
-        iter = psListIteratorAlloc(concepts, PS_LIST_HEAD, false);
-        while ((name = psListGetAndIncrement(iter))) {
-            const char *new = skycellConceptName(name, skycellConceptsCell, system); // Name for skycell
+        concepts = pmConceptsSpecs(PM_FPA_LEVEL_CELL);
+        iter = psMetadataIteratorAlloc(concepts, PS_LIST_HEAD, false);
+        while ((item = psMetadataGetAndIncrement(iter))) {
+            const char *new = skycellConceptName(item->name, skycellConceptsCell, system); // Name for skycell
             if (new) {
-                psMetadataAddStr(translation, PS_LIST_TAIL, name, 0, NULL, new);
+                psMetadataAddStr(translation, PS_LIST_TAIL, item->name, 0, NULL, new);
             }
         }