Index: trunk/psModules/test/tst_pmAstrometry.c
===================================================================
--- trunk/psModules/test/tst_pmAstrometry.c	(revision 5036)
+++ trunk/psModules/test/tst_pmAstrometry.c	(revision 5052)
@@ -5,6 +5,6 @@
  *  @author George Gusciora, MHPCC
  *
- *  @version $Revision: 1.1 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2005-09-13 20:54:04 $
+ *  @version $Revision: 1.2 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2005-09-14 19:21:41 $
  *
  *  XXX: The meory dereferencing is not quite right with these functions.
@@ -110,14 +110,12 @@
 {
     // XXX: Do something more with these arguments.
-    /*
-        const psMetadata *camera = psMetadataAlloc();
-        psDB *db = NULL;
-        pmFPA* fpa = pmFPAAlloc(camera, db);
-        if (fpa == NULL) {
-            psLogMsg(__func__,PS_LOG_ERROR, "pmFPAAlloc returned a NULL.");
-            return 1;
-        }
-    */
-    pmFPA* fpa = NULL;
+    const psMetadata *camera = psMetadataAlloc();
+    psDB *db = NULL;
+    pmFPA* fpa = pmFPAAlloc(camera, db);
+    if (fpa == NULL) {
+        psLogMsg(__func__,PS_LOG_ERROR, "pmFPAAlloc returned a NULL.");
+        return 1;
+    }
+
     pmChip *chip = pmChipAlloc(fpa);
     if (chip == NULL) {
@@ -186,32 +184,28 @@
     }
 
-    //    psFree(camera);
+    psFree(fpa);
     psFree(chip);
-    psFree(fpa);
+    psFree(camera);
 
     return 0;
 }
 
-
 static psS32 testCellAlloc(void)
 {
     // XXX: Do something more with these arguments.
-    /*
-        const psMetadata *camera = psMetadataAlloc();
-        psDB *db = NULL;
-        pmFPA* fpa = pmFPAAlloc(camera, db);
-        if (fpa == NULL) {
-            psLogMsg(__func__,PS_LOG_ERROR, "pmFPAAlloc returned a NULL.n");
-            return 1;
-        }
-     
-        pmChip *chip = pmChipAlloc(fpa);
-        if (chip == NULL) {
-            psLogMsg(__func__,PS_LOG_ERROR, "pmChipAlloc returned a NULL.n");
-            return 2;
-        }
-    */
-    pmFPA* fpa = NULL;
-    pmChip *chip = NULL;
+    const psMetadata *camera = psMetadataAlloc();
+    psDB *db = NULL;
+    pmFPA* fpa = pmFPAAlloc(camera, db);
+    if (fpa == NULL) {
+        psLogMsg(__func__,PS_LOG_ERROR, "pmFPAAlloc returned a NULL.n");
+        return 1;
+    }
+
+    pmChip *chip = pmChipAlloc(fpa);
+    if (chip == NULL) {
+        psLogMsg(__func__,PS_LOG_ERROR, "pmChipAlloc returned a NULL.n");
+        return 2;
+    }
+
     pmCell *cell = pmCellAlloc(chip);
     if (cell == NULL) {
@@ -288,4 +282,5 @@
     psFree(chip);
     psFree(cell);
+    psFree(camera);
 
     return 0;
@@ -295,30 +290,25 @@
 {
     // XXX: Do something more with these arguments.
-    /*
-        const psMetadata *camera = psMetadataAlloc();
-        psDB *db = NULL;
-        pmFPA* fpa = pmFPAAlloc(camera, db);
-     
-        if (fpa == NULL) {
-            psLogMsg(__func__,PS_LOG_ERROR, "pmFPAAlloc returned a NULL.\n");
-            return 1;
-        }
-     
-        pmChip *chip = pmChipAlloc(fpa);
-        if (chip == NULL) {
-            psLogMsg(__func__,PS_LOG_ERROR, "pmChipAlloc returned a NULL.\n");
-            return 2;
-        }
-     
-        pmCell *cell = pmCellAlloc(chip);
-        if (cell == NULL) {
-            psLogMsg(__func__,PS_LOG_ERROR, "pmCellAlloc returned a NULL.\n");
-            return 3;
-        }
-    */
-
-    pmFPA* fpa = NULL;
-    pmChip *chip = NULL;
-    pmCell *cell = NULL;
+    const psMetadata *camera = psMetadataAlloc();
+    psDB *db = NULL;
+    pmFPA* fpa = pmFPAAlloc(camera, db);
+
+    if (fpa == NULL) {
+        psLogMsg(__func__,PS_LOG_ERROR, "pmFPAAlloc returned a NULL.\n");
+        return 1;
+    }
+
+    pmChip *chip = pmChipAlloc(fpa);
+    if (chip == NULL) {
+        psLogMsg(__func__,PS_LOG_ERROR, "pmChipAlloc returned a NULL.\n");
+        return 2;
+    }
+
+    pmCell *cell = pmCellAlloc(chip);
+    if (cell == NULL) {
+        psLogMsg(__func__,PS_LOG_ERROR, "pmCellAlloc returned a NULL.\n");
+        return 3;
+    }
+
     pmReadout *readout = pmReadoutAlloc(cell);
     if (readout == NULL) {
@@ -376,4 +366,5 @@
     psFree(cell);
     psFree(readout);
+    psFree(camera);
 
     return 0;