Index: trunk/psModules/src/camera/pmFPALevel.c
===================================================================
--- trunk/psModules/src/camera/pmFPALevel.c	(revision 12564)
+++ trunk/psModules/src/camera/pmFPALevel.c	(revision 16345)
@@ -9,9 +9,10 @@
 #include "pmFPALevel.h"
 
-static const char *NameNONE = "NONE";   ///< Name for PM_FPA_LEVEL_NONE
-static const char *NameFPA = "FPA";     ///< Name for PM_FPA_LEVEL_FPA
-static const char *NameCHIP = "CHIP";   ///< Name for PM_FPA_LEVEL_CHIP
-static const char *NameCELL = "CELL";   ///< Name for PM_FPA_LEVEL_CELL
-static const char *NameREADOUT = "READOUT"; ///< Name for PM_FPA_LEVEL_READOUT
+static const char *nameNONE = "NONE";   ///< Name for PM_FPA_LEVEL_NONE
+static const char *nameFPA = "FPA";     ///< Name for PM_FPA_LEVEL_FPA
+static const char *nameCHIP = "CHIP";   ///< Name for PM_FPA_LEVEL_CHIP
+static const char *nameCELL = "CELL";   ///< Name for PM_FPA_LEVEL_CELL
+static const char *nameREADOUT = "READOUT"; ///< Name for PM_FPA_LEVEL_READOUT
+static const char *nameCHUNK = "CHUNK"; ///< Name for PM_FPA_LEVEL_CHUNK
 
 const char *pmFPALevelToName(pmFPALevel level)
@@ -19,13 +20,15 @@
     switch (level) {
     case PM_FPA_LEVEL_NONE:
-        return NameNONE;
+        return nameNONE;
     case PM_FPA_LEVEL_FPA:
-        return NameFPA;
+        return nameFPA;
     case PM_FPA_LEVEL_CHIP:
-        return NameCHIP;
+        return nameCHIP;
     case PM_FPA_LEVEL_CELL:
-        return NameCELL;
+        return nameCELL;
     case PM_FPA_LEVEL_READOUT:
-        return NameREADOUT;
+        return nameREADOUT;
+    case PM_FPA_LEVEL_CHUNK:
+        return nameCHUNK;
     default:
         psAbort("You can't get here; level = %d", level);
@@ -36,24 +39,28 @@
 pmFPALevel pmFPALevelFromName(const char *name)
 {
-    pmFPALevel val;
-
     if (name == NULL) {
-        val = PM_FPA_LEVEL_NONE;
-    } else if (!strcasecmp(name, "FPA"))     {
-        val = PM_FPA_LEVEL_FPA;
-    } else if (!strcasecmp(name, "CHIP"))    {
-        val = PM_FPA_LEVEL_CHIP;
-    } else if (!strcasecmp(name, "CELL"))    {
-        val = PM_FPA_LEVEL_CELL;
-    } else if (!strcasecmp(name, "READOUT")) {
-        val = PM_FPA_LEVEL_READOUT;
-    } else if (!strcasecmp(name, "NONE")) {
-        val = PM_FPA_LEVEL_NONE;
-    } else {
-        psError(PS_ERR_BAD_PARAMETER_VALUE, true, "Unrecognised FPA level name: %s", name);
-        val = PM_FPA_LEVEL_NONE;
+        return PM_FPA_LEVEL_NONE;
+    }
+    if (!strcasecmp(name, nameFPA)) {
+        return PM_FPA_LEVEL_FPA;
+    }
+    if (!strcasecmp(name, nameCHIP)) {
+        return PM_FPA_LEVEL_CHIP;
+    }
+    if (!strcasecmp(name, nameCELL)) {
+        return PM_FPA_LEVEL_CELL;
+    }
+    if (!strcasecmp(name, nameREADOUT)) {
+        return PM_FPA_LEVEL_READOUT;
+    }
+    if (!strcasecmp(name, nameCHUNK)) {
+        return PM_FPA_LEVEL_CHUNK;
+    }
+    if (!strcasecmp(name, nameNONE)) {
+        return PM_FPA_LEVEL_NONE;
     }
 
-    return val;
+    psError(PS_ERR_BAD_PARAMETER_VALUE, true, "Unrecognised FPA level name: %s", name);
+    return PM_FPA_LEVEL_NONE;
 }