Changeset 21474 for trunk/psModules/test/concepts

Timestamp:

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

Author:

giebink

Message:

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

Location:

trunk/psModules/test/concepts

Files:

• tap_pmConceptsAverage.c (modified) (2 diffs)
• tap_pmConceptsUpdate.c (modified) (2 diffs)

trunk/psModules/test/concepts/tap_pmConceptsAverage.c

@@ -58 +58 @@
     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);
@@ -96 +96 @@
     cell->hdu->images = psArrayAlloc(NUM_HDUS);
     cell->hdu->masks = psArrayAlloc(NUM_HDUS);
-    cell->hdu->weights = psArrayAlloc(NUM_HDUS);
+    cell->hdu->variances = psArrayAlloc(NUM_HDUS);
     for (int k = 0 ; k < NUM_HDUS ; k++) {
         cell->hdu->images->data[k]  = psImageAlloc(TEST_NUM_COLS, TEST_NUM_ROWS, PS_TYPE_F32);
         cell->hdu->masks->data[k]   = psImageAlloc(TEST_NUM_COLS, TEST_NUM_ROWS, PS_TYPE_MASK);
-        cell->hdu->weights->data[k] = psImageAlloc(TEST_NUM_COLS, TEST_NUM_ROWS, PS_TYPE_F32);
+        cell->hdu->variances->data[k] = psImageAlloc(TEST_NUM_COLS, TEST_NUM_ROWS, PS_TYPE_F32);
         psImageInit(cell->hdu->images->data[k], (float) (BASE_IMAGE+k));
         psImageInit(cell->hdu->masks->data[k], (psU8) (BASE_MASK+k));
-        psImageInit(cell->hdu->weights->data[k], (float) (BASE_WEIGHT+k));
+        psImageInit(cell->hdu->variances->data[k], (float) (BASE_WEIGHT+k));
     }
 

trunk/psModules/test/concepts/tap_pmConceptsUpdate.c

@@ -57 +57 @@
     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);
@@ -95 +95 @@
     cell->hdu->images = psArrayAlloc(NUM_HDUS);
     cell->hdu->masks = psArrayAlloc(NUM_HDUS);
-    cell->hdu->weights = psArrayAlloc(NUM_HDUS);
+    cell->hdu->variances= psArrayAlloc(NUM_HDUS);
     for (int k = 0 ; k < NUM_HDUS ; k++) {
         cell->hdu->images->data[k]  = psImageAlloc(TEST_NUM_COLS, TEST_NUM_ROWS, PS_TYPE_F32);
         cell->hdu->masks->data[k]   = psImageAlloc(TEST_NUM_COLS, TEST_NUM_ROWS, PS_TYPE_MASK);
-        cell->hdu->weights->data[k] = psImageAlloc(TEST_NUM_COLS, TEST_NUM_ROWS, PS_TYPE_F32);
+        cell->hdu->variances->data[k] = psImageAlloc(TEST_NUM_COLS, TEST_NUM_ROWS, PS_TYPE_F32);
         psImageInit(cell->hdu->images->data[k], (float) (BASE_IMAGE+k));
         psImageInit(cell->hdu->masks->data[k], (psU8) (BASE_MASK+k));
-        psImageInit(cell->hdu->weights->data[k], (float) (BASE_WEIGHT+k));
+        psImageInit(cell->hdu->variances->data[k], (float) (BASE_WEIGHT+k));
     }