IPP Software Navigation Tools IPP Links Communication Pan-STARRS Links

Ignore:
Timestamp:
Oct 3, 2008, 10:59:16 AM (18 years ago)
Author:
eugene
Message:

converted pmMoments elements to Mxx, Myy, Mxxx, etc

Location:
trunk/psModules/src/objects/models
Files:
5 edited

Legend:

Unmodified
Added
Removed

  • trunk/psModules/src/objects/models/pmModel_GAUSS.c

    r15834 r19879  
    193193{
    194194    pmMoments *moments = source->moments;
     195    pmPeak    *peak    = source->peak;
    195196    psF32     *PAR  = model->params->data.F32;
    196197
    197198    psEllipseMoments emoments;
    198     emoments.x2 = moments->Sx;
    199     emoments.y2 = moments->Sy;
    200     emoments.xy = moments->Sxy;
     199    emoments.x2 = moments->Mxx;
     200    emoments.y2 = moments->Myy;
     201    emoments.xy = moments->Mxy;
    201202
    202203    // force the axis ratio to be < 20.0
    … …  
    205206
    206207    PAR[PM_PAR_SKY]  = moments->Sky;
    207     PAR[PM_PAR_I0]   = moments->Peak - moments->Sky;
    208     PAR[PM_PAR_XPOS] = moments->x;
    209     PAR[PM_PAR_YPOS] = moments->y;
     208    PAR[PM_PAR_I0]   = peak->flux;
     209    PAR[PM_PAR_XPOS] = peak->xf;
     210    PAR[PM_PAR_YPOS] = peak->yf;
    210211    PAR[PM_PAR_SXX] = PS_MAX(0.5, M_SQRT2*shape.sx);
    211212    PAR[PM_PAR_SYY] = PS_MAX(0.5, M_SQRT2*shape.sy);

  • trunk/psModules/src/objects/models/pmModel_PGAUSS.c

    r15982 r19879  
    194194{
    195195    pmMoments *moments = source->moments;
     196    pmPeak    *peak    = source->peak;
    196197    psF32     *PAR     = model->params->data.F32;
    197198
    198199    psEllipseMoments emoments;
    199     emoments.x2 = moments->Sx;
    200     emoments.y2 = moments->Sx;
    201     emoments.xy = moments->Sxy;
     200    emoments.x2 = moments->Mxx;
     201    emoments.xy = moments->Mxy;
     202    emoments.y2 = moments->Myy;
    202203
    203204    psEllipseAxes axes = psEllipseMomentsToAxes (emoments, 20.0);
    … …  
    205206
    206207    PAR[PM_PAR_SKY]  = moments->Sky;
    207     PAR[PM_PAR_I0]   = moments->Peak - moments->Sky;
    208     PAR[PM_PAR_XPOS] = moments->x; // XXX use peak->xf, peak->yf?
    209     PAR[PM_PAR_YPOS] = moments->y;
     208    PAR[PM_PAR_I0]   = peak->flux;
     209    PAR[PM_PAR_XPOS] = peak->xf;
     210    PAR[PM_PAR_YPOS] = peak->yf;
    210211    PAR[PM_PAR_SXX] = PS_MAX(0.5, M_SQRT2*shape.sx);
    211212    PAR[PM_PAR_SYY] = PS_MAX(0.5, M_SQRT2*shape.sy);

  • trunk/psModules/src/objects/models/pmModel_QGAUSS.c

    r17805 r19879  
    220220
    221221    psEllipseMoments emoments;
    222     emoments.x2 = moments->Sx;
    223     emoments.y2 = moments->Sy;
    224     emoments.xy = moments->Sxy;
     222    emoments.x2 = moments->Mxx;
     223    emoments.xy = moments->Mxy;
     224    emoments.y2 = moments->Myy;
    225225
    226226    // force the axis ratio to be < 20.0
    … …  
    239239    // XXX turn this off here for now PAR[PM_PAR_SKY]  = moments->Sky;
    240240    PAR[PM_PAR_SKY]  = 0.0;
    241     PAR[PM_PAR_I0]   = moments->Peak;
    242     PAR[PM_PAR_XPOS] = peak->x;
    243     PAR[PM_PAR_YPOS] = peak->y;
     241    PAR[PM_PAR_I0]   = peak->flux;
     242    PAR[PM_PAR_XPOS] = peak->xf;
     243    PAR[PM_PAR_YPOS] = peak->yf;
    244244    PAR[PM_PAR_SXX]  = PS_MAX(0.5, M_SQRT2*shape.sx);
    245245    PAR[PM_PAR_SYY]  = PS_MAX(0.5, M_SQRT2*shape.sy);

  • trunk/psModules/src/objects/models/pmModel_RGAUSS.c

    r15834 r19879  
    213213
    214214    psEllipseMoments emoments;
    215     emoments.x2 = moments->Sx;
    216     emoments.y2 = moments->Sy;
    217     emoments.xy = moments->Sxy;
     215    emoments.x2 = moments->Mxx;
     216    emoments.xy = moments->Mxy;
     217    emoments.y2 = moments->Myy;
    218218
    219219    // force the axis ratio to be < 20.0
    … …  
    231231
    232232    PAR[PM_PAR_SKY]  = moments->Sky;
    233     PAR[PM_PAR_I0]   = moments->Peak - moments->Sky;
    234     PAR[PM_PAR_XPOS] = peak->x;
    235     PAR[PM_PAR_YPOS] = peak->y;
     233    PAR[PM_PAR_I0]   = peak->flux;
     234    PAR[PM_PAR_XPOS] = peak->xf;
     235    PAR[PM_PAR_YPOS] = peak->yf;
    236236    PAR[PM_PAR_SXX]  = PS_MAX(0.5, M_SQRT2*shape.sx);
    237237    PAR[PM_PAR_SYY]  = PS_MAX(0.5, M_SQRT2*shape.sy);

  • trunk/psModules/src/objects/models/pmModel_SERSIC.c

    r17396 r19879  
    230230
    231231    psEllipseMoments emoments;
    232     emoments.x2 = moments->Sx;
    233     emoments.y2 = moments->Sy;
    234     emoments.xy = moments->Sxy;
     232    emoments.x2 = moments->Mxx;
     233    emoments.xy = moments->Mxy;
     234    emoments.y2 = moments->Myy;
    235235
    236236    // force the axis ratio to be < 20.0
    … …  
    249249    // XXX PAR[PM_PAR_SKY]  = moments->Sky;
    250250    PAR[PM_PAR_SKY]  = 0.0;
    251     PAR[PM_PAR_I0]   = moments->Peak;
    252     PAR[PM_PAR_XPOS] = peak->x;
    253     PAR[PM_PAR_YPOS] = peak->y;
     251    PAR[PM_PAR_I0]   = peak->flux;
     252    PAR[PM_PAR_XPOS] = peak->xf;
     253    PAR[PM_PAR_YPOS] = peak->yf;
    254254    PAR[PM_PAR_SXX]  = PS_MAX(0.5, M_SQRT2*shape.sx);
    255255    PAR[PM_PAR_SYY]  = PS_MAX(0.5, M_SQRT2*shape.sy);
Note: See TracChangeset for help on using the changeset viewer.