Index: trunk/psModules/src/camera/pmFPAview.c
===================================================================
--- trunk/psModules/src/camera/pmFPAview.c	(revision 7017)
+++ trunk/psModules/src/camera/pmFPAview.c	(revision 7278)
@@ -3,6 +3,6 @@
  *  @author EAM, IfA
  *
- *  @version $Revision: 1.1 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2006-05-01 01:55:43 $
+ *  @version $Revision: 1.2 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2006-06-02 00:55:22 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -19,15 +19,14 @@
 #include "pmFPAview.h"
 
-static void pmFPAviewFree (pmFPAview *view)
-{
-    if (view == NULL)
-        return;
+static void pmFPAviewFree(pmFPAview *view)
+{
+    // No reason to keep this function, apart from the fact that it allows us to type the memBlock
     return;
 }
 
-pmFPAview *pmFPAviewAlloc (int nRows)
-{
-    pmFPAview *view = psAlloc (sizeof(pmFPAview));
-    psMemSetDeallocator (view, (psFreeFunc) pmFPAviewFree);
+pmFPAview *pmFPAviewAlloc(int nRows)
+{
+    pmFPAview *view = psAlloc(sizeof(pmFPAview));
+    psMemSetDeallocator(view, (psFreeFunc) pmFPAviewFree);
 
     view->chip    = -1;
@@ -36,9 +35,10 @@
     view->iRows   =  0;
     view->nRows   = nRows;
-    return (view);
-}
-
-pmFPAdepth pmFPAviewDepth (const pmFPAview *view)
-{
+    return view;
+}
+
+pmFPAdepth pmFPAviewDepth(const pmFPAview *view)
+{
+    PS_ASSERT_PTR_NON_NULL(view, PM_FPA_DEPTH_NONE);
 
     if (view->chip < 0) {
@@ -54,6 +54,8 @@
 }
 
-pmChip *pmFPAviewThisChip (const pmFPAview *view, pmFPA *fpa)
-{
+pmChip *pmFPAviewThisChip(const pmFPAview *view, pmFPA *fpa)
+{
+    PS_ASSERT_PTR_NON_NULL(view, NULL);
+    PS_ASSERT_PTR_NON_NULL(fpa, NULL);
 
     if (view->chip < 0) {
@@ -69,6 +71,9 @@
 }
 
-pmChip *pmFPAviewNextChip (pmFPAview *view, pmFPA *fpa, int nStep)
-{
+pmChip *pmFPAviewNextChip(pmFPAview *view, pmFPA *fpa, int nStep)
+{
+    PS_ASSERT_PTR_NON_NULL(view, NULL);
+    PS_ASSERT_PTR_NON_NULL(fpa, NULL);
+
     view->cell = -1;
     view->readout = -1;
@@ -100,6 +105,8 @@
 }
 
-pmCell *pmFPAviewThisCell (const pmFPAview *view, pmFPA *fpa)
-{
+pmCell *pmFPAviewThisCell(const pmFPAview *view, pmFPA *fpa)
+{
+    PS_ASSERT_PTR_NON_NULL(view, NULL);
+    PS_ASSERT_PTR_NON_NULL(fpa, NULL);
 
     if (view->cell < 0) {
@@ -108,7 +115,5 @@
 
     pmChip *chip = pmFPAviewThisChip (view, fpa);
-    if (chip == NULL) {
-        return NULL;
-    }
+    PS_ASSERT_PTR_NON_NULL(chip, NULL);
 
     if (view->cell >= chip->cells->n) {
@@ -122,9 +127,9 @@
 pmCell *pmFPAviewNextCell (pmFPAview *view, pmFPA *fpa, int nStep)
 {
+    PS_ASSERT_PTR_NON_NULL(view, NULL);
+    PS_ASSERT_PTR_NON_NULL(fpa, NULL);
 
     pmChip *chip = pmFPAviewThisChip (view, fpa);
-    if (chip == NULL) {
-        return NULL;
-    }
+    PS_ASSERT_PTR_NON_NULL(chip, NULL);
 
     view->readout = -1;
@@ -158,4 +163,6 @@
 pmReadout *pmFPAviewThisReadout (const pmFPAview *view, pmFPA *fpa)
 {
+    PS_ASSERT_PTR_NON_NULL(view, NULL);
+    PS_ASSERT_PTR_NON_NULL(fpa, NULL);
 
     if (view->readout < 0) {
@@ -164,7 +171,5 @@
 
     pmCell *cell = pmFPAviewThisCell (view, fpa);
-    if (cell == NULL) {
-        return NULL;
-    }
+    PS_ASSERT_PTR_NON_NULL(cell, NULL);
 
     if (view->readout >= cell->readouts->n) {
@@ -178,9 +183,9 @@
 pmReadout *pmFPAviewNextReadout (pmFPAview *view, pmFPA *fpa, int nStep)
 {
+    PS_ASSERT_PTR_NON_NULL(view, NULL);
+    PS_ASSERT_PTR_NON_NULL(fpa, NULL);
 
     pmCell *cell = pmFPAviewThisCell (view, fpa);
-    if (cell == NULL) {
-        return NULL;
-    }
+    PS_ASSERT_PTR_NON_NULL(cell, NULL);
 
     view->iRows = 0;
@@ -211,6 +216,9 @@
 }
 
-pmHDU *pmFPAviewThisHDU (const pmFPAview *view, pmFPA *fpa)
-{
+pmHDU *pmFPAviewThisHDU(const pmFPAview *view, pmFPA *fpa)
+{
+    PS_ASSERT_PTR_NON_NULL(view, NULL);
+    PS_ASSERT_PTR_NON_NULL(fpa, NULL);
+
     // the HDU is attached to a cell, chip or fpa
     // if this view has a -1 for the level which contains the hdu,
@@ -229,6 +237,9 @@
 }
 
-pmHDU *pmFPAviewThisPHU (const pmFPAview *view, pmFPA *fpa)
-{
+pmHDU *pmFPAviewThisPHU(const pmFPAview *view, pmFPA *fpa)
+{
+    PS_ASSERT_PTR_NON_NULL(view, NULL);
+    PS_ASSERT_PTR_NON_NULL(fpa, NULL);
+
     // select the HDU which corresponds to the PHU containing this view