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

Timestamp:

Aug 13, 2007, 3:42:04 PM (19 years ago)

Author:

Paul Price

Message:

Fixing up the skycell header keywords.

File:

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

trunk/psModules/src/config/pmConfigCamera.c

@@ -91 +91 @@
 const static char *skycellConceptsFPA[] = { "FPA.EXPOSURE", "FPA.TIME", 0 };
 
-// Do we update a particular concept for a skycell?
-static bool updateConcept(const char *name, // Name of concept
-                          const char **concepts // List of concepts NOT to update
-                          )
+// What do we call the skycell concept in the FITS header?
+static const char *skycellConceptName(const char *name, // Name of concept
+                                      const char **concepts, // List of concepts NOT to update
+                                      const psMetadata *site // Site configuration
+                                      )
 {
     for (int i = 0; concepts[i]; i++) {
         if (strcmp(name, concepts[i]) == 0) {
-            return false;
-        }
-    }
-    return true;
-}
-
-// What do we call the skycell concept in the FITS header?
-static const char* skycellConceptName(const char *name, // Name of concept
-                                      const psMetadata *site // Site configuration
-                                      )
-{
+            return NULL;
+        }
+    }
+
     if (!site) {
         return name;
@@ -224 +218 @@
         iter = psListIteratorAlloc(concepts, PS_LIST_HEAD, false);
         while ((name = psListGetAndIncrement(iter))) {
-            psMetadataAddStr(translation, PS_LIST_TAIL, name, 0, NULL, name);
-            if (updateConcept(name, skycellConceptsFPA)) {
-                psMetadataAddStr(translation, PS_LIST_TAIL, name, 0, NULL, skycellConceptName(name, site));
+            const char *new = skycellConceptName(name, skycellConceptsFPA, site); // Name for skycell
+            if (new) {
+                psMetadataAddStr(translation, PS_LIST_TAIL, name, 0, NULL, new);
             }
         }
@@ -235 +229 @@
         iter = psListIteratorAlloc(concepts, PS_LIST_HEAD, false);
         while ((name = psListGetAndIncrement(iter))) {
-            if (updateConcept(name, skycellConceptsChip)) {
-                psMetadataAddStr(translation, PS_LIST_TAIL, name, 0, NULL, skycellConceptName(name, site));
+            const char *new = skycellConceptName(name, skycellConceptsChip, site); // Name for skycell
+            if (new) {
+                psMetadataAddStr(translation, PS_LIST_TAIL, name, 0, NULL, new);
             }
         }
@@ -245 +240 @@
         iter = psListIteratorAlloc(concepts, PS_LIST_HEAD, false);
         while ((name = psListGetAndIncrement(iter))) {
-            if (updateConcept(name, skycellConceptsCell)) {
-                psMetadataAddStr(translation, PS_LIST_TAIL, name, 0, NULL, skycellConceptName(name, site));
+            const char *new = skycellConceptName(name, skycellConceptsCell, site); // Name for skycell
+            if (new) {
+                psMetadataAddStr(translation, PS_LIST_TAIL, name, 0, NULL, new);
             }
         }