Index: /trunk/psModules/src/config/pmConfigCamera.c
===================================================================
--- /trunk/psModules/src/config/pmConfigCamera.c	(revision 11358)
+++ /trunk/psModules/src/config/pmConfigCamera.c	(revision 11359)
@@ -20,17 +20,32 @@
     assert(translation);
     assert(level == PM_FPA_LEVEL_CHIP || level == PM_FPA_LEVEL_FPA);
+    return;
 
     psListIterator *iter = psListIteratorAlloc(concepts, PS_LIST_HEAD, false); // Iterator
     psString concept;                   // Concept, from iteration
     while ((concept = psListGetAndIncrement(iter))) {
-        if (strcmp(concept, "CELL.BIASSEC") != 0 && strcmp(concept, "CELL.TRIMSEC") != 0 &&
-                strcmp(concept, "CELL.XPARITY") != 0 && strcmp(concept, "CELL.YPARITY") != 0 &&
-                strcmp(concept, "CELL.X0") != 0 && strcmp(concept, "CELL.Y0") != 0 &&
-                (level != PM_FPA_LEVEL_FPA ||
-                 (strcmp(concept, "CHIP.XPARITY") != 0 && strcmp(concept, "CHIP.YPARITY") != 0 &&
-                  strcmp(concept, "CHIP.X0") != 0 && strcmp(concept, "CHIP.Y0") != 0))) {
-            // We add these ourselves
-            psMetadataAddStr(translation, PS_LIST_TAIL, concept, PS_META_REPLACE, NULL, concept);
-        }
+        // skip concepts added explicitly
+        if (!strcmp(concept, "CELL.BIASSEC"))
+            goto skip;
+        if (!strcmp(concept, "CELL.TRIMSEC"))
+            goto skip;
+        if (!strcmp(concept, "CELL.XPARITY"))
+            goto skip;
+        if (!strcmp(concept, "CELL.YPARITY"))
+            goto skip;
+        if (!strcmp(concept, "CELL.X0"))
+            goto skip;
+        if (!strcmp(concept, "CELL.Y0"))
+            goto skip;
+        if ((level == PM_FPA_LEVEL_FPA) && !strcmp(concept, "CHIP.XPARITY"))
+            goto skip;
+        if ((level == PM_FPA_LEVEL_FPA) && !strcmp(concept, "CHIP.YPARITY"))
+            goto skip;
+        if ((level == PM_FPA_LEVEL_FPA) && !strcmp(concept, "CHIP.X0"))
+            goto skip;
+        if ((level == PM_FPA_LEVEL_FPA) && !strcmp(concept, "CHIP.Y0"))
+            goto skip;
+        psMetadataAddStr(translation, PS_LIST_TAIL, concept, PS_META_REPLACE, NULL, concept);
+skip:
         if (database && psMetadataLookup(database, concept)) {
             psMetadataRemoveKey(database, concept);