Index: trunk/psModules/src/camera/pmFPAMaskWeight.c
===================================================================
--- trunk/psModules/src/camera/pmFPAMaskWeight.c	(revision 8815)
+++ trunk/psModules/src/camera/pmFPAMaskWeight.c	(revision 9594)
@@ -94,6 +94,5 @@
 //////////////////////////////////////////////////////////////////////////////////////////////////////////////
 
-bool pmReadoutSetMask(pmReadout *readout// Readout for which to set mask
-                     )
+bool pmReadoutSetMask(pmReadout *readout)
 {
     PS_ASSERT_PTR_NON_NULL(readout, false);
@@ -143,6 +142,5 @@
 }
 
-bool pmReadoutGenerateMask(pmReadout *readout // Readout for which to generate mask
-                          )
+bool pmReadoutGenerateMask(pmReadout *readout)
 {
     PS_ASSERT_PTR_NON_NULL(readout, false);
@@ -190,6 +188,5 @@
 }
 
-bool pmReadoutSetWeight(pmReadout *readout // Readout for which to set weight
-                       )
+bool pmReadoutSetWeight(pmReadout *readout)
 {
     PS_ASSERT_PTR_NON_NULL(readout, false);
@@ -219,6 +216,5 @@
 }
 
-bool pmReadoutGenerateWeight(pmReadout *readout // Readout for which to generate weight
-                            )
+bool pmReadoutGenerateWeight(pmReadout *readout)
 {
     PS_ASSERT_PTR_NON_NULL(readout, false);
@@ -266,6 +262,17 @@
 }
 
-bool pmCellGenerateMaskWeight(pmCell *cell // Cell for which to set weights
-                             )
+bool pmReadoutGenerateMaskWeight(pmReadout *readout)
+{
+    PS_ASSERT_PTR_NON_NULL(readout, false);
+
+    bool success = true;                // Was everything successful?
+
+    success |= pmReadoutGenerateMask(readout);
+    success |= pmReadoutGenerateWeight(readout);
+
+    return success;
+}
+
+bool pmCellGenerateMaskWeight(pmCell *cell)
 {
     PS_ASSERT_PTR_NON_NULL(cell, false);
@@ -275,6 +282,5 @@
     for (int i = 0; i < readouts->n; i++) {
         pmReadout *readout = readouts->data[i]; // The readout
-        success |= pmReadoutGenerateMask(readout);
-        success |= pmReadoutGenerateWeight(readout);
+        pmReadoutGenerateMaskWeight(readout);
     }
 
@@ -282,14 +288,2 @@
 }
 
-bool pmReadoutGenerateMaskWeight(pmReadout *readout // Readout for which to set mask and weights
-                                )
-{
-    PS_ASSERT_PTR_NON_NULL(readout, false);
-
-    bool success = true;                // Was everything successful?
-
-    success |= pmReadoutGenerateMask(readout);
-    success |= pmReadoutGenerateWeight(readout);
-
-    return success;
-}