IPP Software Navigation Tools IPP Links Communication Pan-STARRS Links

Changeset 31360


Ignore:
Timestamp:
Apr 24, 2011, 9:47:48 PM (15 years ago)
Author:
eugene
Message:

rename source->errMag to source->psfMagErr, and only use it for the psf model mag error

Location:
branches/eam_branches/ipp-20110404/psModules
Files:
22 edited

Legend:

Unmodified
Added
Removed

  • branches/eam_branches/ipp-20110404/psModules/src/imcombine/pmSubtractionStamps.c

    r31153 r31360  
    11971197       
    11981198        // fprintf (stderr, "%f,%f : %f %f : %f %f\n", source->peak->xf, source->peak->yf,
    1199         // source->psfMag, source->apMag, source->psfMag - source->apMag, source->errMag);
     1199        // source->psfMag, source->apMag, source->psfMag - source->apMag, source->psfMagErr);
    12001200
    12011201        // XXX this is somewhat arbitrary...
    1202         if (source->errMag > 0.05) continue;
     1202        if (source->psfMagErr > 0.05) continue;
    12031203        if (fabs(source->psfMag - source->apMag) > 0.5) continue;
    12041204

  • branches/eam_branches/ipp-20110404/psModules/src/objects/pmPSFtryFitPSF.c

    r31153 r31360  
    122122        psfTry->fitMag->data.F32[i] = source->psfMag;
    123123        psfTry->metric->data.F32[i] = source->apMag - source->psfMag;
    124         psfTry->metricErr->data.F32[i] = source->errMag;
     124        psfTry->metricErr->data.F32[i] = source->psfMagErr;
    125125
    126126        // XXX this did not work: modifies shape of psf too much
    … …  
    131131                 source->peak->xf, source->peak->yf,
    132132                 source->modelPSF->params->data.F32[PM_PAR_XPOS], source->modelPSF->params->data.F32[PM_PAR_YPOS],
    133                  source->psfMag, source->apMag, source->errMag,
     133                 source->psfMag, source->apMag, source->psfMagErr,
    134134                 source->modelPSF->params->data.F32[PM_PAR_I0],
    135135                 source->modelPSF->params->data.F32[PM_PAR_SXX], source->modelPSF->params->data.F32[PM_PAR_SXY],

  • branches/eam_branches/ipp-20110404/psModules/src/objects/pmSource.c

    r31312 r31360  
    137137    source->psfFluxErr       = NAN;
    138138    source->extMag           = NAN;   
    139     source->errMag           = NAN;
     139    source->psfMagErr        = NAN;
    140140    source->apMag            = NAN;
    141141    source->apMagRaw         = NAN;
    … …  
    207207    source->psfFluxErr         = in->psfFluxErr;
    208208    source->extMag             = in->extMag;
    209     source->errMag             = in->errMag;
     209    source->psfMagErr          = in->psfMagErr;
    210210    source->apMag              = in->apMag;
    211211    source->apMagRaw           = in->apMagRaw;

  • branches/eam_branches/ipp-20110404/psModules/src/objects/pmSourceIO_CMF_PS1_DV1.c

    r31153 r31360  
    125125        psMetadataAdd (row, PS_LIST_TAIL, "PLTSCALE",         PS_DATA_F32, "plate scale at source (arcsec/pixel)",       outputs.pltScale);
    126126        psMetadataAdd (row, PS_LIST_TAIL, "PSF_INST_MAG",     PS_DATA_F32, "PSF fit instrumental magnitude",             source->psfMag);
    127         psMetadataAdd (row, PS_LIST_TAIL, "PSF_INST_MAG_SIG", PS_DATA_F32, "Sigma of PSF instrumental magnitude",        source->errMag);
     127        psMetadataAdd (row, PS_LIST_TAIL, "PSF_INST_MAG_SIG", PS_DATA_F32, "Sigma of PSF instrumental magnitude",        source->psfMagErr);
    128128        psMetadataAdd (row, PS_LIST_TAIL, "PSF_INST_FLUX",    PS_DATA_F32, "PSF fit instrumental magnitude",             source->psfFlux);
    129129        psMetadataAdd (row, PS_LIST_TAIL, "PSF_INST_FLUX_SIG",PS_DATA_F32, "Sigma of PSF instrumental magnitude",        source->psfFluxErr);
    … …  
    256256
    257257        source->psfMag    = psMetadataLookupF32 (&status, row, "PSF_INST_MAG");
    258         source->errMag    = psMetadataLookupF32 (&status, row, "PSF_INST_MAG_SIG");
     258        source->psfMagErr    = psMetadataLookupF32 (&status, row, "PSF_INST_MAG_SIG");
    259259        source->apMag     = psMetadataLookupF32 (&status, row, "AP_MAG");
    260260
    261261        // XXX this scaling is incorrect: does not include the 2 \pi AREA factor
    262262        PAR[PM_PAR_I0]    = (isfinite(source->psfMag)) ? pow(10.0, -0.4*source->psfMag) : NAN;
    263         dPAR[PM_PAR_I0]   = (isfinite(source->psfMag)) ? PAR[PM_PAR_I0] * source->errMag : NAN;
     263        dPAR[PM_PAR_I0]   = (isfinite(source->psfMag)) ? PAR[PM_PAR_I0] * source->psfMagErr : NAN;
    264264
    265265        pmPSF_AxesToModel (PAR, axes);

  • branches/eam_branches/ipp-20110404/psModules/src/objects/pmSourceIO_CMF_PS1_DV2.c

    r31153 r31360  
    124124        psMetadataAdd (row, PS_LIST_TAIL, "PLTSCALE",         PS_DATA_F32, "plate scale at source (arcsec/pixel)",       outputs.pltScale);
    125125        psMetadataAdd (row, PS_LIST_TAIL, "PSF_INST_MAG",     PS_DATA_F32, "PSF fit instrumental magnitude",             source->psfMag);
    126         psMetadataAdd (row, PS_LIST_TAIL, "PSF_INST_MAG_SIG", PS_DATA_F32, "Sigma of PSF instrumental magnitude",        source->errMag);
     126        psMetadataAdd (row, PS_LIST_TAIL, "PSF_INST_MAG_SIG", PS_DATA_F32, "Sigma of PSF instrumental magnitude",        source->psfMagErr);
    127127        psMetadataAdd (row, PS_LIST_TAIL, "PSF_INST_FLUX",    PS_DATA_F32, "PSF fit instrumental magnitude",             source->psfFlux);
    128128        psMetadataAdd (row, PS_LIST_TAIL, "PSF_INST_FLUX_SIG",PS_DATA_F32, "Sigma of PSF instrumental magnitude",        source->psfFluxErr);
    … …  
    274274
    275275        source->psfMag    = psMetadataLookupF32 (&status, row, "PSF_INST_MAG");
    276         source->errMag    = psMetadataLookupF32 (&status, row, "PSF_INST_MAG_SIG");
     276        source->psfMagErr    = psMetadataLookupF32 (&status, row, "PSF_INST_MAG_SIG");
    277277        source->apMag     = psMetadataLookupF32 (&status, row, "AP_MAG");
    278278
    279279        // XXX this scaling is incorrect: does not include the 2 \pi AREA factor
    280280        PAR[PM_PAR_I0]    = (isfinite(source->psfMag)) ? pow(10.0, -0.4*source->psfMag) : NAN;
    281         dPAR[PM_PAR_I0]   = (isfinite(source->psfMag)) ? PAR[PM_PAR_I0] * source->errMag : NAN;
     281        dPAR[PM_PAR_I0]   = (isfinite(source->psfMag)) ? PAR[PM_PAR_I0] * source->psfMagErr : NAN;
    282282
    283283        pmPSF_AxesToModel (PAR, axes);

  • branches/eam_branches/ipp-20110404/psModules/src/objects/pmSourceIO_CMF_PS1_SV1.c

    r31153 r31360  
    125125        psMetadataAdd (row, PS_LIST_TAIL, "PLTSCALE",         PS_DATA_F32, "plate scale at source (arcsec/pixel)",       outputs.pltScale);
    126126        psMetadataAdd (row, PS_LIST_TAIL, "PSF_INST_MAG",     PS_DATA_F32, "PSF fit instrumental magnitude",             source->psfMag);
    127         psMetadataAdd (row, PS_LIST_TAIL, "PSF_INST_MAG_SIG", PS_DATA_F32, "Sigma of PSF instrumental magnitude",        source->errMag);
     127        psMetadataAdd (row, PS_LIST_TAIL, "PSF_INST_MAG_SIG", PS_DATA_F32, "Sigma of PSF instrumental magnitude",        source->psfMagErr);
    128128        psMetadataAdd (row, PS_LIST_TAIL, "PSF_INST_FLUX",    PS_DATA_F32, "PSF fit instrumental flux (counts)",         source->psfFlux);
    129129        psMetadataAdd (row, PS_LIST_TAIL, "PSF_INST_FLUX_SIG",PS_DATA_F32, "Sigma of PSF instrumental flux",             source->psfFluxErr);
    … …  
    273273        // XXX use these to determine PAR[PM_PAR_I0]?
    274274        source->psfMag    = psMetadataLookupF32 (&status, row, "PSF_INST_MAG");
    275         source->errMag    = psMetadataLookupF32 (&status, row, "PSF_INST_MAG_SIG");
     275        source->psfMagErr    = psMetadataLookupF32 (&status, row, "PSF_INST_MAG_SIG");
    276276        source->apMag     = psMetadataLookupF32 (&status, row, "AP_MAG");
    277277
    278278        // XXX this scaling is incorrect: does not include the 2 \pi AREA factor
    279279        PAR[PM_PAR_I0]    = (isfinite(source->psfMag)) ? pow(10.0, -0.4*source->psfMag) : NAN;
    280         dPAR[PM_PAR_I0]   = (isfinite(source->psfMag)) ? PAR[PM_PAR_I0] * source->errMag : NAN;
     280        dPAR[PM_PAR_I0]   = (isfinite(source->psfMag)) ? PAR[PM_PAR_I0] * source->psfMagErr : NAN;
    281281
    282282        pmPSF_AxesToModel (PAR, axes);

  • branches/eam_branches/ipp-20110404/psModules/src/objects/pmSourceIO_CMF_PS1_V1.c

    r31153 r31360  
    118118        psMetadataAdd (row, PS_LIST_TAIL, "PLTSCALE",         PS_DATA_F32, "plate scale at source (arcsec/pixel)",       outputs.pltScale);
    119119        psMetadataAdd (row, PS_LIST_TAIL, "PSF_INST_MAG",     PS_DATA_F32, "PSF fit instrumental magnitude",             source->psfMag);
    120         psMetadataAdd (row, PS_LIST_TAIL, "PSF_INST_MAG_SIG", PS_DATA_F32, "Sigma of PSF instrumental magnitude",        source->errMag);
     120        psMetadataAdd (row, PS_LIST_TAIL, "PSF_INST_MAG_SIG", PS_DATA_F32, "Sigma of PSF instrumental magnitude",        source->psfMagErr);
    121121        psMetadataAdd (row, PS_LIST_TAIL, "AP_MAG",           PS_DATA_F32, "magnitude in standard aperture",             source->apMag);
    122122        psMetadataAdd (row, PS_LIST_TAIL, "AP_MAG_RADIUS",    PS_DATA_F32, "radius used for aperture mags",              outputs.apRadius);
    … …  
    241241        // XXX use these to determine PAR[PM_PAR_I0]?
    242242        source->psfMag    = psMetadataLookupF32 (&status, row, "PSF_INST_MAG");
    243         source->errMag    = psMetadataLookupF32 (&status, row, "PSF_INST_MAG_SIG");
     243        source->psfMagErr    = psMetadataLookupF32 (&status, row, "PSF_INST_MAG_SIG");
    244244        source->apMag     = psMetadataLookupF32 (&status, row, "AP_MAG");
    245245
    246246        // XXX this scaling is incorrect: does not include the 2 \pi AREA factor
    247247        PAR[PM_PAR_I0]    = (isfinite(source->psfMag)) ? pow(10.0, -0.4*source->psfMag) : NAN;
    248         dPAR[PM_PAR_I0]   = (isfinite(source->psfMag)) ? PAR[PM_PAR_I0] * source->errMag : NAN;
     248        dPAR[PM_PAR_I0]   = (isfinite(source->psfMag)) ? PAR[PM_PAR_I0] * source->psfMagErr : NAN;
    249249
    250250        pmPSF_AxesToModel (PAR, axes);

  • branches/eam_branches/ipp-20110404/psModules/src/objects/pmSourceIO_CMF_PS1_V2.c

    r31153 r31360  
    116116        psMetadataAdd (row, PS_LIST_TAIL, "PLTSCALE",         PS_DATA_F32, "plate scale at source (arcsec/pixel)",       outputs.pltScale);
    117117        psMetadataAdd (row, PS_LIST_TAIL, "PSF_INST_MAG",     PS_DATA_F32, "PSF fit instrumental magnitude",             source->psfMag);
    118         psMetadataAdd (row, PS_LIST_TAIL, "PSF_INST_MAG_SIG", PS_DATA_F32, "Sigma of PSF instrumental magnitude",        source->errMag);
     118        psMetadataAdd (row, PS_LIST_TAIL, "PSF_INST_MAG_SIG", PS_DATA_F32, "Sigma of PSF instrumental magnitude",        source->psfMagErr);
    119119        psMetadataAdd (row, PS_LIST_TAIL, "AP_MAG",           PS_DATA_F32, "magnitude in standard aperture",             source->apMag);
    120120        psMetadataAdd (row, PS_LIST_TAIL, "AP_MAG_RADIUS",    PS_DATA_F32, "radius used for aperture mags",              outputs.apRadius);
    … …  
    247247        // XXX use these to determine PAR[PM_PAR_I0]?
    248248        source->psfMag    = psMetadataLookupF32 (&status, row, "PSF_INST_MAG");
    249         source->errMag    = psMetadataLookupF32 (&status, row, "PSF_INST_MAG_SIG");
     249        source->psfMagErr    = psMetadataLookupF32 (&status, row, "PSF_INST_MAG_SIG");
    250250        source->apMag     = psMetadataLookupF32 (&status, row, "AP_MAG");
    251251
    252252        // XXX this scaling is incorrect: does not include the 2 \pi AREA factor
    253253        PAR[PM_PAR_I0]    = (isfinite(source->psfMag)) ? pow(10.0, -0.4*source->psfMag) : NAN;
    254         dPAR[PM_PAR_I0]   = (isfinite(source->psfMag)) ? PAR[PM_PAR_I0] * source->errMag : NAN;
     254        dPAR[PM_PAR_I0]   = (isfinite(source->psfMag)) ? PAR[PM_PAR_I0] * source->psfMagErr : NAN;
    255255
    256256        pmPSF_AxesToModel (PAR, axes);

  • branches/eam_branches/ipp-20110404/psModules/src/objects/pmSourceIO_CMP.c

    r29004 r31360  
    137137        axes = pmPSF_ModelToAxes (PAR, 20.0);
    138138
    139         float errMag = isfinite(source->errMag) ? source->errMag : 999;
     139        float psfMagErr = isfinite(source->psfMagErr) ? source->psfMagErr : 999;
    140140
    141141        psLineInit (line);
    … …  
    143143        psLineAdd (line, "%6.1f ",  PAR[PM_PAR_YPOS]);
    144144        psLineAdd (line, "%6.3f ",  PS_MIN (99.0, source->psfMag + ZERO_POINT));
    145         psLineAdd (line, "%03d ",   PS_MIN (999, (int)errMag));
     145        psLineAdd (line, "%03d ",   PS_MIN (999, (int)psfMagErr));
    146146        psLineAdd (line, "%2d ",    type);
    147147        psLineAdd (line, "%3.1f ",  lsky);
    … …  
    280280            source->psfMag = atof (array->data[2]);
    281281            source->extMag = atof (array->data[6]);
    282             source->errMag = atof (array->data[3]) / 1000.0;
     282            source->psfMagErr = atof (array->data[3]) / 1000.0;
    283283            source->apMag  = atof (array->data[7]);
    284284            axes.major     = atof (array->data[8]);

  • branches/eam_branches/ipp-20110404/psModules/src/objects/pmSourceIO_PS1_CAL_0.c

    r31153 r31360  
    7171    psF32 xPos, yPos;
    7272    psF32 xErr, yErr;
    73     psF32 errMag, chisq;
     73    psF32 psfMagErr, chisq;
    7474
    7575    pmChip *chip = readout->parent->parent;
    … …  
    121121            chisq = model->chisq;
    122122
    123             // need to determine the PSF photometry error: source->errMag is the error on the 'best' model mag.
    124             errMag = model->dparams->data.F32[PM_PAR_I0] / model->params->data.F32[PM_PAR_I0];
     123            // need to determine the PSF photometry error: source->psfMagErr is the error on the 'best' model mag.
     124            psfMagErr = model->dparams->data.F32[PM_PAR_I0] / model->params->data.F32[PM_PAR_I0];
    125125        } else {
    126126            xPos = source->peak->xf;
    … …  
    132132            axes.theta = NAN;
    133133            chisq = NAN;
    134             errMag = NAN;
     134            psfMagErr = NAN;
    135135        }
    136136
    … …  
    167167        psMetadataAdd (row, PS_LIST_TAIL, "Y_PSF_SIG",        PS_DATA_F32, "Sigma in PSF y coordinate",                  yErr);
    168168        psMetadataAdd (row, PS_LIST_TAIL, "CAL_PSF_MAG",      PS_DATA_F32, "Calibrated Magnitude from PSF Fit",          calMag);
    169         psMetadataAdd (row, PS_LIST_TAIL, "CAL_PSF_MAG_SIG",  PS_DATA_F32, "Calibrated Magnitude Error",                 errMag);
     169        psMetadataAdd (row, PS_LIST_TAIL, "CAL_PSF_MAG_SIG",  PS_DATA_F32, "Calibrated Magnitude Error",                 psfMagErr);
    170170        psMetadataAdd (row, PS_LIST_TAIL, "PSF_INST_MAG",     PS_DATA_F32, "PSF fit instrumental magnitude",             source->psfMag);
    171         psMetadataAdd (row, PS_LIST_TAIL, "PSF_INST_MAG_SIG", PS_DATA_F32, "Sigma of PSF instrumental magnitude",        errMag);
     171        psMetadataAdd (row, PS_LIST_TAIL, "PSF_INST_MAG_SIG", PS_DATA_F32, "Sigma of PSF instrumental magnitude",        psfMagErr);
    172172        psMetadataAdd (row, PS_LIST_TAIL, "PEAK_FLUX_AS_MAG", PS_DATA_F32, "Peak flux expressed as magnitude",           peakMag);
    173173        psMetadataAdd (row, PS_LIST_TAIL, "SKY",              PS_DATA_F32, "Sky level",                                  source->sky);
    … …  
    284284        // XXX use these to determine PAR[PM_PAR_I0]?
    285285        source->psfMag    = psMetadataLookupF32 (&status, row, "PSF_INST_MAG");
    286         source->errMag    = psMetadataLookupF32 (&status, row, "PSF_INST_MAG_SIG");
     286        source->psfMagErr    = psMetadataLookupF32 (&status, row, "PSF_INST_MAG_SIG");
    287287        PAR[PM_PAR_I0]    = (isfinite(source->psfMag)) ? pow(10.0, -0.4*source->psfMag) : NAN;
    288         dPAR[PM_PAR_I0]   = (isfinite(source->psfMag)) ? PAR[PM_PAR_I0] * source->errMag : NAN;
     288        dPAR[PM_PAR_I0]   = (isfinite(source->psfMag)) ? PAR[PM_PAR_I0] * source->psfMagErr : NAN;
    289289
    290290        pmPSF_AxesToModel (PAR, axes);

  • branches/eam_branches/ipp-20110404/psModules/src/objects/pmSourceIO_PS1_DEV_0.c

    r31153 r31360  
    113113        psMetadataAdd (row, PS_LIST_TAIL, "Y_PSF_SIG",        PS_DATA_F32, "Sigma in PSF y coordinate",                  yErr);
    114114        psMetadataAdd (row, PS_LIST_TAIL, "PSF_INST_MAG",     PS_DATA_F32, "PSF fit instrumental magnitude",             PS_MIN (99.0, source->psfMag));
    115         psMetadataAdd (row, PS_LIST_TAIL, "PSF_INST_MAG_SIG", PS_DATA_F32, "Sigma of PSF instrumental magnitude",        PS_MIN (99.0, source->errMag));
     115        psMetadataAdd (row, PS_LIST_TAIL, "PSF_INST_MAG_SIG", PS_DATA_F32, "Sigma of PSF instrumental magnitude",        PS_MIN (99.0, source->psfMagErr));
    116116        psMetadataAdd (row, PS_LIST_TAIL, "PEAK_FLUX_AS_MAG", PS_DATA_F32, "Peak flux expressed as magnitude",           PS_MIN (99.0, peakMag));
    117117        psMetadataAdd (row, PS_LIST_TAIL, "SKY",              PS_DATA_F32, "Sky level",                                  source->sky);
    … …  
    212212        // XXX use these to determine PAR[PM_PAR_I0]?
    213213        source->psfMag    = psMetadataLookupF32 (&status, row, "PSF_INST_MAG");
    214         source->errMag    = psMetadataLookupF32 (&status, row, "PSF_INST_MAG_SIG");
     214        source->psfMagErr    = psMetadataLookupF32 (&status, row, "PSF_INST_MAG_SIG");
    215215
    216216        pmPSF_AxesToModel (PAR, axes);

  • branches/eam_branches/ipp-20110404/psModules/src/objects/pmSourceIO_PS1_DEV_1.c

    r31153 r31360  
    7070    psF32 xPos, yPos;
    7171    psF32 xErr, yErr;
    72     psF32 errMag, chisq;
     72    psF32 psfMagErr, chisq;
    7373
    7474    // let's write these out in S/N order
    … …  
    103103            chisq = model->chisq;
    104104
    105             // need to determine the PSF photometry error: source->errMag is the error on the 'best' model mag.
    106             errMag = model->dparams->data.F32[PM_PAR_I0] / model->params->data.F32[PM_PAR_I0];
     105            // need to determine the PSF photometry error: source->psfMagErr is the error on the 'best' model mag.
     106            psfMagErr = model->dparams->data.F32[PM_PAR_I0] / model->params->data.F32[PM_PAR_I0];
    107107        } else {
    108108            xPos = source->peak->xf;
    … …  
    114114            axes.theta = NAN;
    115115            chisq = NAN;
    116             errMag = NAN;
     116            psfMagErr = NAN;
    117117        }
    118118
    … …  
    128128        psMetadataAdd (row, PS_LIST_TAIL, "Y_PSF_SIG",        PS_DATA_F32, "Sigma in PSF y coordinate",                  yErr);
    129129        psMetadataAdd (row, PS_LIST_TAIL, "PSF_INST_MAG",     PS_DATA_F32, "PSF fit instrumental magnitude",             source->psfMag);
    130         psMetadataAdd (row, PS_LIST_TAIL, "PSF_INST_MAG_SIG", PS_DATA_F32, "Sigma of PSF instrumental magnitude",        errMag);
     130        psMetadataAdd (row, PS_LIST_TAIL, "PSF_INST_MAG_SIG", PS_DATA_F32, "Sigma of PSF instrumental magnitude",        psfMagErr);
    131131        psMetadataAdd (row, PS_LIST_TAIL, "PEAK_FLUX_AS_MAG", PS_DATA_F32, "Peak flux expressed as magnitude",           peakMag);
    132132        psMetadataAdd (row, PS_LIST_TAIL, "SKY",              PS_DATA_F32, "Sky level",                                  source->sky);
    … …  
    253253        // XXX use these to determine PAR[PM_PAR_I0]?
    254254        source->psfMag    = psMetadataLookupF32 (&status, row, "PSF_INST_MAG");
    255         source->errMag    = psMetadataLookupF32 (&status, row, "PSF_INST_MAG_SIG");
     255        source->psfMagErr    = psMetadataLookupF32 (&status, row, "PSF_INST_MAG_SIG");
    256256        PAR[PM_PAR_I0]    = (isfinite(source->psfMag)) ? pow(10.0, -0.4*source->psfMag) : NAN;
    257         dPAR[PM_PAR_I0]   = (isfinite(source->psfMag)) ? PAR[PM_PAR_I0] * source->errMag : NAN;
     257        dPAR[PM_PAR_I0]   = (isfinite(source->psfMag)) ? PAR[PM_PAR_I0] * source->psfMagErr : NAN;
    258258
    259259        pmPSF_AxesToModel (PAR, axes);

  • branches/eam_branches/ipp-20110404/psModules/src/objects/pmSourceIO_RAW.c

    r31153 r31360  
    110110        fprintf (f, "%7.1f %7.1f  %7.1f %8.4f  %7.4f %7.4f  ",
    111111                 PAR[PM_PAR_XPOS], PAR[PM_PAR_YPOS], source->sky,
    112                  source->psfMag, source->errMag, dPos);
     112                 source->psfMag, source->psfMagErr, dPos);
    113113
    114114        for (j = 4; j < model->params->n; j++) {
    … …  
    174174        fprintf (f, "%7.1f %7.1f  %7.1f %8.4f  %7.4f %7.4f  ",
    175175                 PAR[PM_PAR_XPOS], PAR[PM_PAR_YPOS], source->sky,
    176                  source->extMag, source->errMag, dPos);
     176                 source->extMag, source->psfMagErr, dPos);
    177177
    178178        for (j = 4; j < model->params->n; j++) {

  • branches/eam_branches/ipp-20110404/psModules/src/objects/pmSourceIO_SMPDATA.c

    r31153 r31360  
    106106        psMetadataAdd (row, PS_LIST_TAIL, "Y_PIX",   PS_DATA_F32, "", yPos);
    107107        psMetadataAdd (row, PS_LIST_TAIL, "MAG_RAW", PS_DATA_F32, "", PS_MIN (99.0, source->psfMag + ZERO_POINT));
    108         psMetadataAdd (row, PS_LIST_TAIL, "MAG_ERR", PS_DATA_F32, "", PS_MIN (999, 1000*source->errMag));
     108        psMetadataAdd (row, PS_LIST_TAIL, "MAG_ERR", PS_DATA_F32, "", PS_MIN (999, 1000*source->psfMagErr));
    109109        psMetadataAdd (row, PS_LIST_TAIL, "MAG_GAL", PS_DATA_F32, "", PS_MIN (99.0, source->extMag + ZERO_POINT));
    110110        psMetadataAdd (row, PS_LIST_TAIL, "MAG_AP",  PS_DATA_F32, "", PS_MIN (99.0, source->apMag + ZERO_POINT));
    … …  
    194194        source->psfMag = psMetadataLookupF32 (&status, row, "MAG_RAW") - ZERO_POINT;
    195195        source->extMag = psMetadataLookupF32 (&status, row, "MAG_GAL") - ZERO_POINT;
    196         source->errMag = psMetadataLookupF32 (&status, row, "MAG_ERR") * 0.001;
     196        source->psfMagErr = psMetadataLookupF32 (&status, row, "MAG_ERR") * 0.001;
    197197        source->apMag  = psMetadataLookupF32 (&status, row, "MAG_AP")  - ZERO_POINT;
    198198

  • branches/eam_branches/ipp-20110404/psModules/src/objects/pmSourceIO_SX.c

    r29004 r31360  
    8888        psLineAdd (line, "%11.3f", PAR[PM_PAR_YPOS]);
    8989        psLineAdd (line, "%9.4f",  source->psfMag);
    90         psLineAdd (line, "%9.4f",  source->errMag);
     90        psLineAdd (line, "%9.4f",  source->psfMagErr);
    9191        psLineAdd (line, "%13.4f", source->sky);
    9292        psLineAdd (line, "%9.2f",  axes.major);

  • branches/eam_branches/ipp-20110404/psModules/src/objects/pmSourceMatch.c

    r29004 r31360  
    8888        pmSource *source = sources->data[i]; // Source of interest
    8989        if (!source || (source->mode & SOURCE_MASK) || !isfinite(source->psfMag) ||
    90             !isfinite(source->errMag) || source->psfMag > SOURCE_FAINTEST) {
     90            !isfinite(source->psfMagErr) || source->psfMag > SOURCE_FAINTEST) {
    9191            continue;
    9292        }
    … …  
    102102        (*y)->data.F32[num] = ySrc;
    103103        (*mag)->data.F32[num] = source->psfMag;
    104         (*magErr)->data.F32[num] = source->errMag;
     104        (*magErr)->data.F32[num] = source->psfMagErr;
    105105        (*indices)->data.S32[num] = i;
    106106        num++;

  • branches/eam_branches/ipp-20110404/psModules/src/objects/pmSourceOutputs.c

    r31312 r31360  
    103103            outputs->yErr = dPAR[PM_PAR_YPOS];
    104104        } else {
    105             outputs->xErr = fwhmMajor * source->errMag / 2.35;
    106             outputs->yErr = fwhmMinor * source->errMag / 2.35;
     105            outputs->xErr = fwhmMajor * source->psfMagErr / 2.35;
     106            outputs->yErr = fwhmMinor * source->psfMagErr / 2.35;
    107107        }
    108108        if (isfinite(PAR[PM_PAR_SXX]) && isfinite(PAR[PM_PAR_SXY]) && isfinite(PAR[PM_PAR_SYY])) {
    … …  
    126126            outputs->xPos = source->moments->Mx;
    127127            outputs->yPos = source->moments->My;
    128             outputs->xErr = fwhmMajor * source->errMag / 2.35;
    129             outputs->yErr = fwhmMinor * source->errMag / 2.35;
     128            outputs->xErr = fwhmMajor * source->psfMagErr / 2.35;
     129            outputs->yErr = fwhmMinor * source->psfMagErr / 2.35;
    130130        } else {
    131131            outputs->xPos = source->peak->xf;

  • branches/eam_branches/ipp-20110404/psModules/test/objects/tap_pmSource.c

    r31153 r31360  
    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");

  • branches/eam_branches/ipp-20110404/psModules/test/objects/tap_pmSourceIO_PS1_DEV_0.c

    r21223 r31360  
    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?

  • branches/eam_branches/ipp-20110404/psModules/test/objects/tap_pmSourceIO_PS1_DEV_1.c

    r24852 r31360  
    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?

  • branches/eam_branches/ipp-20110404/psModules/test/objects/tap_pmSourceIO_SMPDATA.c

    r21223 r31360  
    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)",

  • branches/eam_branches/ipp-20110404/psModules/test/objects/tap_pmSourcePhotometry.c

    r25754 r31360  
    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.