Index: /trunk/psModules/test/objects/tap_pmModel.c =================================================================== --- /trunk/psModules/test/objects/tap_pmModel.c (revision 21470) +++ /trunk/psModules/test/objects/tap_pmModel.c (revision 21471) @@ -33,5 +33,5 @@ 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); Index: /trunk/psModules/test/objects/tap_pmModelClass.c =================================================================== --- /trunk/psModules/test/objects/tap_pmModelClass.c (revision 21470) +++ /trunk/psModules/test/objects/tap_pmModelClass.c (revision 21471) @@ -30,5 +30,5 @@ 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); Index: /trunk/psModules/test/objects/tap_pmPSF_IO.c =================================================================== --- /trunk/psModules/test/objects/tap_pmPSF_IO.c (revision 21470) +++ /trunk/psModules/test/objects/tap_pmPSF_IO.c (revision 21471) @@ -55,5 +55,5 @@ 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); @@ -93,12 +93,12 @@ 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)); } Index: /trunk/psModules/test/objects/tap_pmResiduals.c =================================================================== --- /trunk/psModules/test/objects/tap_pmResiduals.c (revision 21470) +++ /trunk/psModules/test/objects/tap_pmResiduals.c (revision 21471) @@ -29,5 +29,5 @@ ok(resid->Rx && psMemCheckImage(resid->Rx), "pmResidualsAlloc() allocated the resid->Rx image"); ok(resid->Ry && psMemCheckImage(resid->Ry), "pmResidualsAlloc() allocated the resid->Ry image"); - ok(resid->weight && psMemCheckImage(resid->weight), "pmResidualsAlloc() allocated the resid->weight image"); + ok(resid->variance && psMemCheckImage(resid->variance ), "pmResidualsAlloc() allocated the resid->variance image"); ok(resid->mask && psMemCheckImage(resid->mask), "pmResidualsAlloc() allocated the resid->mask image"); Index: /trunk/psModules/test/objects/tap_pmSource.c =================================================================== --- /trunk/psModules/test/objects/tap_pmSource.c (revision 21470) +++ /trunk/psModules/test/objects/tap_pmSource.c (revision 21471) @@ -48,5 +48,5 @@ 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); @@ -77,5 +77,5 @@ ok(src->peak == NULL, "pmSourceAlloc() pmSource->peak correctly"); ok(src->pixels == NULL, "pmSourceAlloc() pmSource->pixels correctly"); - ok(src->weight == NULL, "pmSourceAlloc() pmSource->weight correctly"); + ok(src->variance == NULL, "pmSourceAlloc() pmSource->variance correctly"); ok(src->maskObj == NULL, "pmSourceAlloc() pmSource->maskObj correctly"); ok(src->maskView == NULL, "pmSourceAlloc() pmSource->maskView correctly"); @@ -169,5 +169,5 @@ src->pixels = psImageAlloc(2, 4, PS_TYPE_F32); - src->weight = psImageAlloc(6, 8, PS_TYPE_F32); + src->variance = psImageAlloc(6, 8, PS_TYPE_F32); src->maskView = psImageAlloc(10, 12, PS_TYPE_U8); pmSource *dst = pmSourceCopy(src); @@ -207,7 +207,7 @@ ok(dst->pixels->numCols == src->pixels->numCols && dst->pixels->numRows == src->pixels->numRows, "pmSourceCopy() generated correct size pmSource->pixels"); - ok(dst->weight != NULL, "pmSourceCopy() allocated a new pmSource->weight"); - ok(dst->weight->numCols == src->weight->numCols && dst->weight->numRows == src->weight->numRows, - "pmSourceCopy() generated correct size pmSource->weight"); + ok(dst->variance != NULL, "pmSourceCopy() allocated a new pmSource->variance"); + ok(dst->variance->numCols == src->variance->numCols && dst->variance->numRows == src->variance->numRows, + "pmSourceCopy() generated correct size pmSource->variance"); ok(dst->maskView != NULL, "pmSourceCopy() allocated a new pmSource->maskView"); ok(dst->maskView->numCols == src->maskView->numCols && dst->maskView->numRows == src->maskView->numRows, @@ -290,11 +290,11 @@ int expectedNumCols = 1 + (TEST_NUM_COLS/2); int expectedNumRows = 1 + (TEST_NUM_COLS/2); - // XX: We only verify the size of the pixels, weight, maskView, and maskObj + // XX: We only verify the size of the pixels, variance, maskView, and maskObj // images. A better test would verify that the actual data is set correctly. // We don't do that here since it basically duplicated psLib function tests. ok(src->pixels->numCols == expectedNumCols && src->pixels->numRows == expectedNumRows, "pmSourceDefinePixels() set the size of pmSource->pixels correctly"); - ok(src->weight->numCols == expectedNumCols && src->weight->numRows == expectedNumRows, - "pmSourceDefinePixels() set the size of pmSource->weight correctly"); + ok(src->variance->numCols == expectedNumCols && src->variance->numRows == expectedNumRows, + "pmSourceDefinePixels() set the size of pmSource->variance correctly"); ok(src->maskView->numCols == expectedNumCols && src->maskView->numRows == expectedNumRows, "pmSourceDefinePixels() set the size of pmSource->maskView correctly"); @@ -396,11 +396,11 @@ int expectedNumCols = 1 + (TEST_NUM_COLS/2); int expectedNumRows = 1 + (TEST_NUM_COLS/2); - // XX: We only verify the size of the pixels, weight, maskView, and maskObj + // XX: We only verify the size of the pixels, variance, maskView, and maskObj // images. A better test would verify that the actual data is set correctly. // We don't do that here since it basically duplicated psLib function tests. ok(src->pixels->numCols == expectedNumCols && src->pixels->numRows == expectedNumRows, "pmSourceRedefinePixels() set the size of pmSource->pixels correctly"); - ok(src->weight->numCols == expectedNumCols && src->weight->numRows == expectedNumRows, - "pmSourceRedefinePixels() set the size of pmSource->weight correctly"); + ok(src->variance->numCols == expectedNumCols && src->variance->numRows == expectedNumRows, + "pmSourceRedefinePixels() set the size of pmSource->variance correctly"); ok(src->maskView->numCols == expectedNumCols && src->maskView->numRows == expectedNumRows, "pmSourceRedefinePixels() set the size of pmSource->maskView correctly"); @@ -584,5 +584,5 @@ // We only test with a single Gaussian model, with no residuals or masks. // For completeness, additional tests should be added. - // We should also set mode &= PM_MODEL_OP_NOISE to test that the src->weights are added. + // We should also set mode &= PM_MODEL_OP_NOISE to test that the src->variances are added. { psMemId id = psMemGetId(); @@ -632,5 +632,5 @@ // call pmSourceOp() with acceptable parameters // Test source->modelFlux - // We should also set mode &= PM_MODEL_OP_NOISE to test that the src->weights are added. + // We should also set mode &= PM_MODEL_OP_NOISE to test that the src->variances are added. { psMemId id = psMemGetId(); Index: /trunk/psModules/test/objects/tap_pmSourceExtendedPars.c =================================================================== --- /trunk/psModules/test/objects/tap_pmSourceExtendedPars.c (revision 21470) +++ /trunk/psModules/test/objects/tap_pmSourceExtendedPars.c (revision 21471) @@ -46,5 +46,5 @@ ok(tmp->radius == NULL, "pmSourceRadialProfileAlloc() set the ->radius member to NULL"); ok(tmp->flux == NULL, "pmSourceRadialProfileAlloc() set the ->flux member to NULL"); - ok(tmp->weight == NULL, "pmSourceRadialProfileAlloc() set the ->weight member to NULL"); + ok(tmp->variance == NULL, "pmSourceRadialProfileAlloc() set the ->variance member to NULL"); psFree(tmp); Index: /trunk/psModules/test/objects/tap_pmSourceFitSet.c =================================================================== --- /trunk/psModules/test/objects/tap_pmSourceFitSet.c (revision 21470) +++ /trunk/psModules/test/objects/tap_pmSourceFitSet.c (revision 21471) @@ -30,5 +30,5 @@ if (1) { src->pixels = psImageAlloc(TEST_NUM_COLS, TEST_NUM_ROWS, PS_TYPE_F32); - src->weight = psImageAlloc(TEST_NUM_COLS, TEST_NUM_ROWS, PS_TYPE_F32); + src->variance = psImageAlloc(TEST_NUM_COLS, TEST_NUM_ROWS, PS_TYPE_F32); src->maskObj = psImageAlloc(TEST_NUM_COLS, TEST_NUM_ROWS, PS_TYPE_U8); if (1) { @@ -36,5 +36,5 @@ for (int j = 0 ; j < TEST_NUM_COLS ; j++) { src->pixels->data.F32[i][j] = 0.0; - src->weight->data.F32[i][j] = 1.0; + src->variance->data.F32[i][j] = 1.0; src->maskObj->data.U8[i][j] = 0; } @@ -663,5 +663,5 @@ - // Call pmSourceFitSet() with NULL psSource pixels, weight, maskObj input parameters + // Call pmSourceFitSet() with NULL psSource pixels, variance, maskObj input parameters { psMemId id = psMemGetId(); @@ -677,9 +677,9 @@ src->pixels = tmpImg; - tmpImg = src->weight; - src->weight = NULL; + tmpImg = src->variance; + src->variance = NULL; rc = pmSourceFitSet(src, modelSet, PM_SOURCE_FIT_PSF, 1); - ok(rc == false, "pmSourceFitSet() returned FALSE with NULL src->weight input parameter"); - src->weight = tmpImg; + ok(rc == false, "pmSourceFitSet() returned FALSE with NULL src->variance input parameter"); + src->variance = tmpImg; tmpImg = src->maskObj; Index: /trunk/psModules/test/objects/tap_pmSourceSky.c =================================================================== --- /trunk/psModules/test/objects/tap_pmSourceSky.c (revision 21470) +++ /trunk/psModules/test/objects/tap_pmSourceSky.c (revision 21471) @@ -153,8 +153,8 @@ psMemId id = psMemGetId(); pmSource *src = pmSourceAlloc(); - src->weight = psImageAlloc(TEST_NUM_COLS, TEST_NUM_ROWS, PS_TYPE_F32); - for (int i =0 ; i < src->weight->numRows ; i++) { - for (int j = 0 ; j < src->weight->numCols ; j++) { - src->weight->data.F32[i][j] = (float) (i + j); + src->variance = psImageAlloc(TEST_NUM_COLS, TEST_NUM_ROWS, PS_TYPE_F32); + for (int i =0 ; i < src->variance->numRows ; i++) { + for (int j = 0 ; j < src->variance->numCols ; j++) { + src->variance->data.F32[i][j] = (float) (i + j); } } @@ -168,5 +168,5 @@ - // Call pmSourceLocalSkyVariance() with NULL pmSource->weight input parameter + // Call pmSourceLocalSkyVariance() with NULL pmSource->variance input parameter { psMemId id = psMemGetId(); @@ -175,5 +175,5 @@ src->peak = pmPeakAlloc(1, 2, 3.0, PM_PEAK_LONE); bool rc = pmSourceLocalSkyVariance(src, PS_STAT_SAMPLE_MEAN, 10.0, 1, 2); - ok(rc == false, "pmSourceLocalSkyVariance() returned FALSE with NULL pmSource->weight input parameter"); + ok(rc == false, "pmSourceLocalSkyVariance() returned FALSE with NULL pmSource->variance input parameter"); psFree(src); ok(!psMemCheckLeaks (id, NULL, NULL, false), "no memory leaks"); @@ -185,8 +185,8 @@ psMemId id = psMemGetId(); pmSource *src = pmSourceAlloc(); - src->weight = psImageAlloc(TEST_NUM_COLS, TEST_NUM_ROWS, PS_TYPE_F32); - for (int i =0 ; i < src->weight->numRows ; i++) { - for (int j = 0 ; j < src->weight->numCols ; j++) { - src->weight->data.F32[i][j] = (float) (i + j); + src->variance = psImageAlloc(TEST_NUM_COLS, TEST_NUM_ROWS, PS_TYPE_F32); + for (int i =0 ; i < src->variance->numRows ; i++) { + for (int j = 0 ; j < src->variance->numCols ; j++) { + src->variance->data.F32[i][j] = (float) (i + j); } } @@ -203,8 +203,8 @@ psMemId id = psMemGetId(); pmSource *src = pmSourceAlloc(); - src->weight = psImageAlloc(TEST_NUM_COLS, TEST_NUM_ROWS, PS_TYPE_F32); - for (int i =0 ; i < src->weight->numRows ; i++) { - for (int j = 0 ; j < src->weight->numCols ; j++) { - src->weight->data.F32[i][j] = (float) (i + j); + src->variance = psImageAlloc(TEST_NUM_COLS, TEST_NUM_ROWS, PS_TYPE_F32); + for (int i =0 ; i < src->variance->numRows ; i++) { + for (int j = 0 ; j < src->variance->numCols ; j++) { + src->variance->data.F32[i][j] = (float) (i + j); } } @@ -221,8 +221,8 @@ psMemId id = psMemGetId(); pmSource *src = pmSourceAlloc(); - src->weight = psImageAlloc(TEST_NUM_COLS, TEST_NUM_ROWS, PS_TYPE_F32); - for (int i =0 ; i < src->weight->numRows ; i++) { - for (int j = 0 ; j < src->weight->numCols ; j++) { - src->weight->data.F32[i][j] = (float) (i + j); + src->variance = psImageAlloc(TEST_NUM_COLS, TEST_NUM_ROWS, PS_TYPE_F32); + for (int i =0 ; i < src->variance->numRows ; i++) { + for (int j = 0 ; j < src->variance->numCols ; j++) { + src->variance->data.F32[i][j] = (float) (i + j); } } @@ -245,10 +245,10 @@ psMemId id = psMemGetId(); pmSource *src = pmSourceAlloc(); - src->weight = psImageAlloc(TEST_NUM_COLS, TEST_NUM_ROWS, PS_TYPE_F32); + src->variance = psImageAlloc(TEST_NUM_COLS, TEST_NUM_ROWS, PS_TYPE_F32); src->maskObj = psImageAlloc(TEST_NUM_COLS, TEST_NUM_ROWS, PS_TYPE_MASK); psF32 mean = 0.0; - for (int i = 0 ; i < src->weight->numRows ; i++) { - for (int j = 0 ; j < src->weight->numCols ; j++) { - src->weight->data.F32[i][j] = (float) (i + j); + for (int i = 0 ; i < src->variance->numRows ; i++) { + for (int j = 0 ; j < src->variance->numCols ; j++) { + src->variance->data.F32[i][j] = (float) (i + j); mean+= (float) (i + j); src->maskObj->data.U8[i][j] = 0; Index: /trunk/psModules/test/objects/tap_pmSourceUtils.c =================================================================== --- /trunk/psModules/test/objects/tap_pmSourceUtils.c (revision 21470) +++ /trunk/psModules/test/objects/tap_pmSourceUtils.c (revision 21471) @@ -39,5 +39,5 @@ 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); @@ -77,12 +77,12 @@ 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)); }