Changeset 21474 for trunk/psModules/test/camera/tap_pmFPA.c

Timestamp:

Feb 13, 2009, 12:47:32 PM (17 years ago)

Author:

giebink

Message:

Account for weight(s) to variance(s) change

File:

• trunk/psModules/test/camera/tap_pmFPA.c (modified) (6 diffs)

trunk/psModules/test/camera/tap_pmFPA.c

@@ -46 +46 @@
     readout->image = psImageAlloc(TEST_NUM_COLS, TEST_NUM_ROWS, PS_TYPE_F32);
     readout->mask = psImageAlloc(TEST_NUM_COLS, TEST_NUM_ROWS, PS_TYPE_U8);
-    readout->weight = psImageAlloc(TEST_NUM_COLS, TEST_NUM_ROWS, PS_TYPE_F32);
+    readout->variance = psImageAlloc(TEST_NUM_COLS, TEST_NUM_ROWS, PS_TYPE_F32);
     for (psS32 i = 0 ; i < NUM_BIAS_DATA ; i++) {
         psImage *tmpImage = psImageAlloc(TEST_NUM_COLS, TEST_NUM_ROWS, PS_TYPE_F32);
@@ -183 +183 @@
         pmFPA* fpa = generateSimpleFPA(NULL);
         fpa->hdu->images = psArrayAlloc(10);
-        fpa->hdu->weights = psArrayAlloc(10);
+        fpa->hdu->variances = psArrayAlloc(10);
         fpa->hdu->masks = psArrayAlloc(10);
         pmFPAFreeData(fpa);
         ok(fpa->hdu->images == NULL, "pmFPAFreeData() correctly set fpa->hdu->images to NULL");
-        ok(fpa->hdu->weights == NULL, "pmFPAFreeData() correctly set fpa->hdu->weights to NULL");
+        ok(fpa->hdu->variances == NULL, "pmFPAFreeData() correctly set fpa->hdu->weights to NULL");
         ok(fpa->hdu->masks == NULL, "pmFPAFreeData() correctly set fpa->hdu->masks to NULL");
         psFree(fpa);
@@ -262 +262 @@
         pmChip* chip = generateSimpleChip(NULL);
         chip->hdu->images = psArrayAlloc(10);
-        chip->hdu->weights = psArrayAlloc(10);
+        chip->hdu->variances = psArrayAlloc(10);
         chip->hdu->masks = psArrayAlloc(10);
         pmChipFreeData(chip);
         ok(chip->hdu->images == NULL, "pmChipFreeData() correctly set chip->hdu->images to NULL");
-        ok(chip->hdu->weights == NULL, "pmChipFreeData() correctly set chip->hdu->weights to NULL");
+        ok(chip->hdu->variances == NULL, "pmChipFreeData() correctly set chip->hdu->weights to NULL");
         ok(chip->hdu->masks == NULL, "pmChipFreeData() correctly set chip->hdu->masks to NULL");
         psFree(chip);
@@ -367 +367 @@
         pmCell *cell = generateSimpleCell(NULL);
         cell->hdu->images = psArrayAlloc(10);
-        cell->hdu->weights = psArrayAlloc(10);
+        cell->hdu->variances = psArrayAlloc(10);
         cell->hdu->masks = psArrayAlloc(10);
         pmCellFreeData(cell);
         ok(cell->hdu->images == NULL, "pmCellFreeData() correctly set cell->hdu->images to NULL");
-        ok(cell->hdu->weights == NULL, "pmCellFreeData() correctly set cell->hdu->weights to NULL");
+        ok(cell->hdu->variances == NULL, "pmCellFreeData() correctly set cell->hdu->weights to NULL");
         ok(cell->hdu->masks == NULL, "pmCellFreeData() correctly set cell->hdu->masks to NULL");
         psFree(cell);
@@ -415 +415 @@
         ok(readout->image == NULL, "pmReadoutAlloc() set ->image correctly");
         ok(readout->mask == NULL, "pmReadoutAlloc() set ->mask correctly");
-        ok(readout->weight == NULL, "pmReadoutAlloc() set ->weight correctly");
+        ok(readout->variance == NULL, "pmReadoutAlloc() set ->weight correctly");
         ok(readout->bias != NULL &&
            psMemCheckList(readout->bias), "pmReadoutAlloc() set ->bias correctly");
@@ -460 +460 @@
         pmReadoutFreeData(readout);
         ok(readout->image == NULL, "pmReadoutFreeData() correctly set readout->image to NULL");
-        ok(readout->weight == NULL, "pmReadoutFreeData() correctly set readout->weight to NULL");
+        ok(readout->variance == NULL, "pmReadoutFreeData() correctly set readout->weight to NULL");
         ok(readout->mask == NULL, "pmReadoutFreeData() correctly set readout->mask to NULL");
         psFree(readout);