IPP Software Navigation Tools IPP Links Communication Pan-STARRS Links

Ignore:
Timestamp:
May 5, 2011, 11:02:53 AM (15 years ago)
Author:
eugene
Message:

merge updates from eam branch 20110404

Location:
trunk/psModules/test/objects
Files:
5 edited

Legend:

Unmodified
Added
Removed

  • trunk/psModules/test/objects/tap_pmSource.c

    r31153 r31451  
    9191        ok(isnan(src->psfMag), "pmSourceAlloc() pmSource->psfMag correctly");
    9292        ok(isnan(src->extMag), "pmSourceAlloc() pmSource->extMag correctly");
    93         ok(isnan(src->errMag), "pmSourceAlloc() pmSource->errMag correctly");
     93        ok(isnan(src->psfMagErr), "pmSourceAlloc() pmSource->psfMagErr correctly");
    9494        ok(isnan(src->apMag), "pmSourceAlloc() pmSource->apMag correctly");
    9595        ok(isnan(src->sky), "pmSourceAlloc() pmSource->sky correctly");

  • trunk/psModules/test/objects/tap_pmSourceIO_PS1_DEV_0.c

    r21223 r31451  
    167167            model->dparams->data.F32[PM_PAR_YPOS] = TEST_BASE_Y_ERR + (float) i;
    168168            src->psfMag = TEST_BASE_PSF_MAG + (float) i;
    169             src->errMag = TEST_BASE_ERR_MAG + (float) i;
     169            src->psfMagErr = TEST_BASE_ERR_MAG + (float) i;
    170170            src->peak->flux = TEST_BASE_PEAK_FLUX + (float) i;
    171171            src->sky = TEST_BASE_SKY + (float) i;
    … …  
    215215             ok(src->psfMag == (TEST_BASE_PSF_MAG + (float) i), "pmSourcesRead_PS1_DEV_0() set src->psfMag correctly (is %.2f, should be %.2f)",
    216216                src->psfMag, (TEST_BASE_PSF_MAG + (float) i));
    217              ok(src->errMag == (TEST_BASE_ERR_MAG + (float) i), "pmSourcesRead_PS1_DEV_0() set src->errMag correctly (is %.2f, should be %.2f)",
    218                 src->errMag, (TEST_BASE_ERR_MAG + (float) i));
     217             ok(src->psfMagErr == (TEST_BASE_ERR_MAG + (float) i), "pmSourcesRead_PS1_DEV_0() set src->psfMagErr correctly (is %.2f, should be %.2f)",
     218                src->psfMagErr, (TEST_BASE_ERR_MAG + (float) i));
    219219
    220220             // XXX: Source code always sets src->modelPSF.  Is that right?

  • trunk/psModules/test/objects/tap_pmSourceIO_PS1_DEV_1.c

    r24852 r31451  
    196196            model->dparams->data.F32[PM_PAR_YPOS] = TEST_BASE_Y_ERR + (float) i;
    197197            src->psfMag = TEST_BASE_PSF_MAG + (float) i;
    198             src->errMag = TEST_BASE_ERR_MAG + (float) i;
     198            src->psfMagErr = TEST_BASE_ERR_MAG + (float) i;
    199199            src->peak->flux = TEST_BASE_PEAK_FLUX + (float) i;
    200200            src->sky = TEST_BASE_SKY + (float) i;
    … …  
    203203            sources->data[i] = (psPtr *) src;
    204204            src->psfMag = TEST_BASE_PSF_MAG + (float) i;
    205             src->errMag = TEST_BASE_ERR_MAG + (float) i;
     205            src->psfMagErr = TEST_BASE_ERR_MAG + (float) i;
    206206            src->sky = TEST_BASE_SKY + (float) i;
    207207            src->skyErr = TEST_BASE_SKY_ERR + (float) i;
    … …  
    280280             ok(src->psfMag == (TEST_BASE_PSF_MAG + (float) i), "pmSourcesRead_PS1_DEV_1() set src->psfMag correctly (is %.2f, should be %.2f)",
    281281                src->psfMag, (TEST_BASE_PSF_MAG + (float) i));
    282              ok(src->errMag == (TEST_BASE_ERR_MAG + (float) i), "pmSourcesRead_PS1_DEV_1() set src->errMag correctly (is %.2f, should be %.2f)",
    283                 src->errMag, (TEST_BASE_ERR_MAG + (float) i));
     282             ok(src->psfMagErr == (TEST_BASE_ERR_MAG + (float) i), "pmSourcesRead_PS1_DEV_1() set src->psfMagErr correctly (is %.2f, should be %.2f)",
     283                src->psfMagErr, (TEST_BASE_ERR_MAG + (float) i));
    284284
    285285             // XXX: Source code always sets src->modelPSF.  Is that right?

  • trunk/psModules/test/objects/tap_pmSourceIO_SMPDATA.c

    r21223 r31451  
    167167            model->dparams->data.F32[PM_PAR_YPOS] = TEST_BASE_Y_ERR + (float) i;
    168168            src->psfMag = TEST_BASE_PSF_MAG + (float) i;
    169             src->errMag = TEST_BASE_ERR_MAG + (float) i;
     169            src->psfMagErr = TEST_BASE_ERR_MAG + (float) i;
    170170            src->peak->flux = TEST_BASE_PEAK_FLUX + (float) i;
    171171            src->sky = TEST_BASE_SKY + (float) i;
    … …  
    226226                src->psfMag, (TEST_BASE_PSF_MAG + (float) i));
    227227             float tmpF =  0.001 * PS_MIN(999, (1000 * (TEST_BASE_ERR_MAG + (float) i)));
    228              ok(src->errMag == tmpF, "pmSourcesRead_SMPDATA() set src->errMag correctly (is %.2f, should be %.2f)",
    229                 src->errMag, tmpF);
     228             ok(src->psfMagErr == tmpF, "pmSourcesRead_SMPDATA() set src->psfMagErr correctly (is %.2f, should be %.2f)",
     229                src->psfMagErr, tmpF);
    230230             tmpF = PS_MIN(99.0, (TEST_BASE_EXT_MAG + ZERO_POINT)) - ZERO_POINT;
    231231             ok(src->extMag == tmpF, "pmSourcesRead_SMPDATA() set src->extMag correctly (is %.2f, should be %.2f)",

  • trunk/psModules/test/objects/tap_pmSourcePhotometry.c

    r25754 r31451  
    103103    ok_float_tol(source->psfMag, fitMag, 0.0002, "source fitMag is %f", source->psfMag);
    104104    ok_float_tol(source->apMag,  apMag, 0.0002, "source apMag is %f", source->apMag);
    105     ok_float(source->errMag,   0.001, "source errMag is %f", source->errMag);
     105    ok_float(source->psfMagErr,   0.001, "source psfMagErr is %f", source->psfMagErr);
    106106    float refMag = source->apMag;
    107107
Note: See TracChangeset for help on using the changeset viewer.