Index: trunk/psModules/src/camera/pmFPAMaskWeight.h
===================================================================
--- trunk/psModules/src/camera/pmFPAMaskWeight.h	(revision 7309)
+++ trunk/psModules/src/camera/pmFPAMaskWeight.h	(revision 7715)
@@ -21,12 +21,23 @@
 } pmMaskValue;
 
+// These functions set an extant mask/weight (or create a throwaway one).
+// The throwaway case is intended for when the user is iterating using pmReadoutReadNext, in which case
+// the HDU can't be generated
 bool pmReadoutSetMask(pmReadout *readout // Readout for which to set mask
                      );
 bool pmReadoutSetWeight(pmReadout *readout // Readout for which to set weight
                        );
-bool pmCellSetMaskWeight(pmCell *cell // Cell for which to set weights
-                        );
-bool pmReadoutSetMaskWeight(pmReadout *readout // Readout for which to set weights
-                           );
+
+// These functions generate a mask/weight suitable for output (complete with HDU entry) and then set them.
+bool pmReadoutGenerateMask(pmReadout *readout // Readout for which to generate mask
+                          );
+bool pmReadoutGenerateWeight(pmReadout *readout // Readout for which to generate weight
+                            );
+
+// These functions are conveniences for pmReadoutGenerateMask and pmReadoutGenerateWeight.
+bool pmCellGenerateMaskWeight(pmCell *cell // Cell for which to generate mask and weights
+                             );
+bool pmReadoutGenerateMaskWeight(pmReadout *readout // Readout for which to generate mask and weights
+                                );