Changeset 25022 for branches/eam_branches/20090715/psModules/test/camera/tap_pmFPAMaskW.c

Timestamp:

Aug 7, 2009, 12:45:24 PM (17 years ago)

Author:

eugene

Message:

update from mainline

Location:

branches/eam_branches/20090715

Files:

• . (modified) (1 prop)
• psModules/test/camera/tap_pmFPAMaskW.c (modified) (4 diffs)

branches/eam_branches/20090715/psModules/test/camera/tap_pmFPAMaskW.c

@@ -356 +356 @@
     // ----------------------------------------------------------------------
     // pmReadoutSetVariance() tests: NULL inputs
-    // bool pmReadoutSetVariance(pmReadout *readout, bool poisson)
+    // bool pmReadoutSetVariance(pmReadout *readout, const psImage *noiseMap, bool poisson)
     if (1) {
         psMemId id = psMemGetId();
@@ -367 +367 @@
 
         // Set readout == NULL, ensure pmReadoutSetVariance() returnes FALSE, with no seg faults, memory leaks
-        rc = pmReadoutSetVariance(NULL, false);
-        ok(!rc, "pmReadoutSetVariance(NULL, false) returned FALSE with null pmReadout input");
+        rc = pmReadoutSetVariance(NULL, NULL, false);
+        ok(!rc, "pmReadoutSetVariance(NULL, NULL, false) returned FALSE with null pmReadout input");
 
 
@@ -375 +375 @@
         rc|= psMetadataAddF32(readout->parent->concepts, PS_LIST_HEAD, "CELL.READNOISE", PS_META_REPLACE, NULL, CELL_READNOISE);
         ok(rc, "Set GAIN and READNOISE in cell->concepts successfully");
-
+/*
+ * Getting the section below to run requires generating a noiseMap
+ *
         // Call pmReadoutSetVariance() and then verify that the mask data was set correctly
         rc = pmReadoutSetVariance(readout, false);
@@ -419 +421 @@
 
         ok(!errorFlag, "pmReadoutSetWeight() set the weight values correctly (Poisson)");
+*/      
         psFree(fpa);    
         psFree(camera);