IPP Software Navigation Tools IPP Links Communication Pan-STARRS Links

Ignore:
Timestamp:
Mar 3, 2006, 3:01:34 PM (20 years ago)
Author:
drobbin
Message:

Updated files to reflect psArray, psVector, & psPixels changes in psLib that set n=0 upon allocation.

Location:
trunk/psModules/src/objects
Files:
7 edited

Legend:

Unmodified
Added
Removed

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

    r5257 r6511  
    7171    *params_min = psVectorAlloc (7, PS_TYPE_F32);
    7272    *params_max = psVectorAlloc (7, PS_TYPE_F32);
     73    (*beta_lim)->n = (*beta_lim)->nalloc;
     74    (*params_min)->n = (*params_min)->nalloc;
     75    (*params_max)->n = (*params_max)->nalloc;
    7376
    7477    beta_lim[0][0].data.F32[0] = 1000;

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

    r5257 r6511  
    4545    *params_min = psVectorAlloc (7, PS_TYPE_F32);
    4646    *params_max = psVectorAlloc (7, PS_TYPE_F32);
     47    (*beta_lim)->n = (*beta_lim)->nalloc;
     48    (*params_min)->n = (*params_min)->nalloc;
     49    (*params_max)->n = (*params_max)->nalloc;
    4750
    4851    beta_lim[0][0].data.F32[0] = 1000;

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

    r5257 r6511  
    1111    params->data.F32[5] = sqrt(2.0) / SigmaY;
    1212    params->data.F32[6] = Sxy;
    13     params->data.F32[7] = 
    14     params->data.F32[8] = 
     13    params->data.F32[7] =
     14    params->data.F32[8] =
    1515*****************************************************************************/
    1616
    … …  
    5353    *params_min = psVectorAlloc (8, PS_TYPE_F32);
    5454    *params_max = psVectorAlloc (8, PS_TYPE_F32);
     55    (*beta_lim)->n = (*beta_lim)->nalloc;
     56    (*params_min)->n = (*params_min)->nalloc;
     57    (*params_max)->n = (*params_max)->nalloc;
    5558
    5659    beta_lim[0][0].data.F32[0] = 1000;

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

    r5257 r6511  
    6464    *params_min = psVectorAlloc (9, PS_TYPE_F32);
    6565    *params_max = psVectorAlloc (9, PS_TYPE_F32);
     66    (*beta_lim)->n = (*beta_lim)->nalloc;
     67    (*params_min)->n = (*params_min)->nalloc;
     68    (*params_max)->n = (*params_max)->nalloc;
    6669
    6770    beta_lim[0][0].data.F32[0] = 1000;
    … …  
    116119
    117120    psVector *contour = psVectorAlloc (Nt, PS_TYPE_F32);
     121    contour->n = contour->nalloc;
    118122    for (t = 0, N = 0; (t < 2*M_PI) && (N < Nt); t += dt) {
    119123        x = ct*axes.major*cos(t) + st*axes.minor*sin(t) + xo;

  • trunk/psModules/src/objects/pmObjects.c

    r6329 r6511  
    66 *  @author EAM, IfA: significant modifications.
    77 *
    8  *  @version $Revision: 1.9 $ $Name: not supported by cvs2svn $
    9  *  @date $Date: 2006-02-06 22:17:54 $
     8 *  @version $Revision: 1.10 $ $Name: not supported by cvs2svn $
     9 *  @date $Date: 2006-03-04 01:01:33 $
    1010 *
    1111 *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
    … …  
    9696
    9797    psVector *tmpVector = psVectorAlloc(image->numCols, PS_TYPE_F32);
     98    tmpVector->n = tmpVector->nalloc;
    9899    for (psU32 col = 0; col < image->numCols ; col++) {
    99100        tmpVector->data.F32[col] = image->data.F32[row][col];
    … …  
    282283    tmp->params  = psVectorAlloc(Nparams, PS_TYPE_F32);
    283284    tmp->dparams = psVectorAlloc(Nparams, PS_TYPE_F32);
     285    tmp->params->n = tmp->params->nalloc;
     286    tmp->dparams->n = tmp->dparams->nalloc;
    284287
    285288    for (psS32 i = 0; i < tmp->params->n; i++) {
    … …  
    348351        if (vector->data.F32[0] > threshold) {
    349352            tmpVector = psVectorAlloc(1, PS_TYPE_U32);
     353            tmpVector->n = 1;
    350354            tmpVector->data.U32[0] = 0;
    351355        } else {
    … …  
    388392    //
    389393    psVector *tmpVector = psVectorAlloc(count, PS_TYPE_U32);
     394    tmpVector->n = tmpVector->nalloc;
    390395    count = 0;
    391396
    … …  
    14281433    //
    14291434    psVector *x = psVectorAlloc(2, PS_TYPE_F32);
     1435    x->n = x->nalloc;
    14301436    x->data.F32[0] = (psF32) (col + image->col0);
    14311437    x->data.F32[1] = (psF32) (row + image->row0);
    … …  
    14721478    psVector *xVec = psVectorAlloc(2 * source->pixels->numRows, PS_TYPE_F32);
    14731479    psVector *yVec = psVectorAlloc(2 * source->pixels->numRows, PS_TYPE_F32);
    1474 
     1480    xVec->n = xVec->nalloc;
     1481    yVec->n = yVec->nalloc;
    14751482    //
    14761483    // Start at the row with peak pixel, then decrement.
    … …  
    15521559    //
    15531560    psArray *tmpArray = psArrayAlloc(2);
     1561    tmpArray->n = 2;
    15541562    tmpArray->data[0] = (psPtr *) yVec;
    15551563    tmpArray->data[1] = (psPtr *) xVec;
    … …  
    16161624    psVector *y = psVectorAlloc(count, PS_TYPE_F32);
    16171625    psVector *yErr = psVectorAlloc(count, PS_TYPE_F32);
     1626    x->n = x->nalloc;
     1627    y->n = y->nalloc;
     1628    yErr->n = yErr->nalloc;
    16181629    psS32 tmpCnt = 0;
    16191630    for (psS32 i = 0; i < source->pixels->numRows; i++) {
    … …  
    16211632            if (source->mask->data.U8[i][j] == 0) {
    16221633                psVector *coord = psVectorAlloc(2, PS_TYPE_F32);
     1634                coord->n = 2;
    16231635                // XXX: Convert i/j to image space:
    16241636                // XXX EAM: coord order is (x,y) == (col,row)
    … …  
    16411653    if (PSF) {
    16421654        paramMask = psVectorAlloc (params->n, PS_TYPE_U8);
     1655        paramMask->n = paramMask->nalloc;
    16431656        for (int i = 0; i < 4; i++) {
    16441657            paramMask->data.U8[i] = 0;
    … …  
    16731686    if (paramMask != NULL) {
    16741687        psVector *delta = psVectorAlloc (params->n, PS_TYPE_F64);
     1688        delta->n = delta->nalloc;
    16751689        psMinimizeGaussNewtonDelta (delta, params, NULL, x, y, yErr, modelFunc);
    16761690        for (int i = 0; i < dparams->n; i++) {
    … …  
    17631777    psVector *y = psVectorAlloc(count, PS_TYPE_F32);
    17641778    psVector *yErr = psVectorAlloc(count, PS_TYPE_F32);
     1779    x->n = x->nalloc;
     1780    y->n = y->nalloc;
     1781    yErr->n = yErr->nalloc;
    17651782    psS32 tmpCnt = 0;
    17661783    for (psS32 i = 0; i < source->pixels->numRows; i++) {
    … …  
    17681785            if (source->mask->data.U8[i][j] == 0) {
    17691786                psVector *coord = psVectorAlloc(2, PS_TYPE_F32);
     1787                coord->n = 2;
    17701788                // XXX: Convert i/j to image space:
    17711789                // XXX EAM: coord order is (x,y) == (col,row)
    … …  
    17791797
    17801798                // this test enhances the weight based on deviation from the model flux
    1781                 Ro = 1.0 + fabs (y->data.F32[tmpCnt] - ymodel) / sqrt(PS_SQR(ymodel - So) + PS_SQR(So));
     1799                Ro = 1.0 + fabs (y->data.F32[tmpCnt] - ymodel) / sqrt(PS_SQR(ymodel - So)
     1800                        + PS_SQR(So));
    17821801
    17831802                // psMinimizeLMChi2_EAM takes wt = 1/dY^2
    … …  
    17981817    if (PSF) {
    17991818        paramMask = psVectorAlloc (params->n, PS_TYPE_U8);
     1819        paramMask->n = paramMask->nalloc;
    18001820        for (int i = 0; i < 4; i++) {
    18011821            paramMask->data.U8[i] = 0;
    … …  
    18461866    if (paramMask != NULL) {
    18471867        psVector *delta = psVectorAlloc (params->n, PS_TYPE_F64);
     1868        delta->n = delta->nalloc;
    18481869        psMinimizeGaussNewtonDelta(delta, params, NULL, x, y, yErr, modelFunc);
    18491870        for (int i = 0; i < dparams->n; i++) {
    … …  
    18971918
    18981919    psVector *x = psVectorAlloc(2, PS_TYPE_F32);
     1920    x->n = 2;
    18991921    psVector *params = model->params;
    19001922    pmModelFunc modelFunc = pmModelFunc_GetFunction (model->type);

  • trunk/psModules/src/objects/pmPSF.c

    r5844 r6511  
    66 *  @author EAM, IfA
    77 *
    8  *  @version $Revision: 1.4 $ $Name: not supported by cvs2svn $
    9  *  @date $Date: 2005-12-24 01:24:32 $
     8 *  @version $Revision: 1.5 $ $Name: not supported by cvs2svn $
     9 *  @date $Date: 2006-03-04 01:01:33 $
    1010 *
    1111 *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
    … …  
    9191
    9292    psf->params = psArrayAlloc(Nparams - 4);
     93    psf->params->n = psf->params->nalloc;
    9394    for (int i = 0; i < psf->params->n; i++) {
    9495        // XXX EAM : make this a user-defined value?
    … …  
    119120    psVector *z  = psVectorAlloc (models->n, PS_TYPE_F64);
    120121    psVector *dz = psVectorAlloc (models->n, PS_TYPE_F64);
     122    x->n = x->nalloc;
     123    y->n = y->nalloc;
     124    z->n = z->nalloc;
     125    dz->n = dz->nalloc;
    121126
    122127    for (int i = 0; i < models->n; i++) {

  • trunk/psModules/src/objects/pmPSFtry.c

    r5844 r6511  
    55 *  @author EAM, IfA
    66 *
    7  *  @version $Revision: 1.4 $ $Name: not supported by cvs2svn $
    8  *  @date $Date: 2005-12-24 01:24:32 $
     7 *  @version $Revision: 1.5 $ $Name: not supported by cvs2svn $
     8 *  @date $Date: 2006-03-04 01:01:33 $
    99 *
    1010 *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
    … …  
    5959    test->mask     = psVectorAlloc (sources->n, PS_TYPE_U8);
    6060
     61    test->modelFLT->n = test->modelFLT->nalloc;
     62    test->modelPSF->n = test->modelPSF->nalloc;
     63    test->metric->n   = test->metric->nalloc;
     64    test->fitMag->n   = test->fitMag->nalloc;
     65    test->mask->n     = test->mask->nalloc;
     66
    6167    for (int i = 0; i < test->modelFLT->n; i++) {
    6268        test->mask->data.U8[i]  = 0;
    … …  
    204210    // rflux = ten(0.4*fitMag);
    205211    psVector *rflux = psVectorAlloc (psfTry->sources->n, PS_TYPE_F64);
     212    rflux->n = rflux->nalloc;
    206213    for (int i = 0; i < psfTry->sources->n; i++) {
    207214        if (psfTry->mask->data.U8[i] & PSFTRY_MASK_ALL)
    … …  
    219226    psVector *daBin = psVectorAlloc (rfBin->n, PS_TYPE_F64);
    220227    psVector *maskB = psVectorAlloc (rfBin->n, PS_TYPE_U8);
     228    daBin->n = daBin->nalloc;
     229    maskB->n = maskB->nalloc;
    221230    psFree (stats);
    222231
    … …  
    272281
    273282        psVector *tmp2 = psVectorAlloc (nKeep, PS_TYPE_F64);
     283        tmp2->n = tmp2->nalloc;
    274284        for (int j = 0; j < tmp2->n; j++) {
    275285            tmp2->data.F64[j] = tmp->data.F64[j + nSkip];
    … …  
    337347    psVector *rflux = psVectorAlloc (try
    338348                                     ->sources->n, PS_TYPE_F64);
     349    rflux->n = rflux->nalloc;
    339350    for (int i = 0; i < try
    340351                ->sources->n; i++) {
Note: See TracChangeset for help on using the changeset viewer.