IPP Software Navigation Tools IPP Links Communication Pan-STARRS Links

Changeset 6511


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
Files:
19 edited

Legend:

Unmodified
Added
Removed

  • trunk/psModules/psmodule.kdevses

    r5845 r6511  
    22<!DOCTYPE KDevPrjSession>
    33<KDevPrjSession>
    4  <DocsAndViews NumberOfDocuments="5" >
    5   <Doc0 NumberOfViews="1" URL="file:/home/desonia/panstarrs/psModule/configure.ac" >
    6    <View0 line="21" Type="Source" />
     4 <DocsAndViews NumberOfDocuments="10" >
     5  <Doc0 NumberOfViews="1" URL="file:///home/drobbin/panstarrs/temp/psModule/src/astrom/pmAstrometry.h" >
     6   <View0 line="101" Type="Source" />
    77  </Doc0>
    8   <Doc1 NumberOfViews="1" URL="file:/home/desonia/panstarrs/psLib/configure.ac" >
    9    <View0 line="53" Type="Source" />
     8  <Doc1 NumberOfViews="1" URL="file:///home/drobbin/panstarrs/temp/psModule/src/astrom/pmAstrometryObjects.c" >
     9   <View0 line="254" Type="Source" />
    1010  </Doc1>
    11   <Doc2 NumberOfViews="1" URL="file:/home/desonia/panstarrs/psModule/src/imsubtract/pmSubtractBias.c" >
    12    <View0 line="893" Type="Source" />
     11  <Doc2 NumberOfViews="1" URL="file:///home/drobbin/panstarrs/temp/psModule/src/imcombine/pmImageCombine.c" >
     12   <View0 line="114" Type="Source" />
    1313  </Doc2>
    14   <Doc3 NumberOfViews="1" URL="file:/home/desonia/panstarrs/psModule/test/imsubtract/tst_pmSubtractBias.c" >
    15    <View0 line="628" Type="Source" />
     14  <Doc3 NumberOfViews="1" URL="file:///home/drobbin/panstarrs/temp/psModule/test/astrom/tst_pmAstrometry01.c" >
     15   <View0 line="342" Type="Source" />
    1616  </Doc3>
    17   <Doc4 NumberOfViews="1" URL="file:/home/desonia/panstarrs/psModule/src/astrom/pmAstrometryObjects.c" >
    18    <View0 line="560" Type="Source" />
     17  <Doc4 NumberOfViews="1" URL="file:///home/drobbin/panstarrs/temp/psModule/src/astrom/pmAstrometry.c" >
     18   <View0 line="356" Type="Source" />
    1919  </Doc4>
     20  <Doc5 NumberOfViews="1" URL="file:///home/drobbin/panstarrs/temp/psModule/src/imsubtract/pmImageSubtract.c" >
     21   <View0 line="359" Type="Source" />
     22  </Doc5>
     23  <Doc6 NumberOfViews="1" URL="file:///home/drobbin/panstarrs/temp/psModule/src/objects/pmPSF.c" >
     24   <View0 line="92" Type="Source" />
     25  </Doc6>
     26  <Doc7 NumberOfViews="1" URL="file:///home/drobbin/panstarrs/temp/psModule/src/objects/pmObjects.c" >
     27   <View0 line="1912" Type="Source" />
     28  </Doc7>
     29  <Doc8 NumberOfViews="1" URL="file:///home/drobbin/panstarrs/temp/psModule/src/objects/pmObjects.h" >
     30   <View0 line="77" Type="Source" />
     31  </Doc8>
     32  <Doc9 NumberOfViews="1" URL="file:///home/drobbin/panstarrs/temp/psModule/src/objects/pmPSFtry.c" >
     33   <View0 line="60" Type="Source" />
     34  </Doc9>
    2035 </DocsAndViews>
    2136 <pluginList>
     37  <kdevdebugger>
     38   <breakpointList/>
     39  </kdevdebugger>
    2240  <kdevbookmarks>
    2341   <bookmarks/>
    2442  </kdevbookmarks>
    25   <kdevsubversion>
    26    <subversion recurseresolve="1" recurserelocate="1" recursemerge="1" recursecommit="1" base="" recursepropget="1" recurseswitch="1" recurseupdate="1" recursepropset="1" recursediff="1" recurserevert="1" forcemove="1" recursecheckout="1" forceremove="1" recurseadd="1" recurseproplist="1" forcemerge="1" />
    27   </kdevsubversion>
    28   <kdevdebugger>
    29    <breakpointList/>
    30   </kdevdebugger>
     43  <kdevvalgrind>
     44   <executable path="" params="" />
     45   <valgrind path="" params="" />
     46   <calltree path="" params="" />
     47   <kcachegrind path="" />
     48  </kdevvalgrind>
    3149 </pluginList>
    3250</KDevPrjSession>

  • trunk/psModules/src/astrom/pmAstrometryObjects.c

    r5674 r6511  
    88*  @author EAM, IfA
    99*
    10 *  @version $Revision: 1.1 $ $Name: not supported by cvs2svn $
    11 *  @date $Date: 2005-12-05 20:49:30 $
     10*  @version $Revision: 1.2 $ $Name: not supported by cvs2svn $
     11*  @date $Date: 2006-03-04 01:01:33 $
    1212*
    1313*  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
    … …  
    201201    psVector *y = psVectorAlloc (match->n, PS_TYPE_F32);
    202202    psVector *wt = psVectorAlloc (match->n, PS_TYPE_F32);
    203 
     203    X->n = X->nalloc;
     204    Y->n = Y->nalloc;
     205    x->n = x->nalloc;
     206    y->n = y->nalloc;
     207    wt->n = wt->nalloc;
    204208    // take the matched stars, first fit
    205209    for (int i = 0; i < match->n; i++) {
    … …  
    249253
    250254    psArray *new = psArrayAlloc (old->n);
    251 
     255    new->n = new->nalloc;
    252256    double cs = cos(angle);
    253257    double sn = sin(angle);

  • trunk/psModules/src/imcombine/pmImageCombine.c

    r5741 r6511  
    88 *  @author GLG, MHPCC
    99 *
    10  *  @version $Revision: 1.2 $ $Name: not supported by cvs2svn $
    11  *  @date $Date: 2005-12-08 00:29:53 $
     10 *  @version $Revision: 1.3 $ $Name: not supported by cvs2svn $
     11 *  @date $Date: 2006-03-04 01:01:33 $
    1212 *
    1313 *  XXX: pmRejectPixels() has a known bug with the pmImageTransform() call.
    … …  
    113113    if (*questionablePixels == NULL) {
    114114        *questionablePixels = psArrayAlloc(numImages);
     115        (*questionablePixels)->n = numImages;
    115116    } else if ((*questionablePixels)->n != numImages) {
    116117        *questionablePixels = psArrayRealloc(*questionablePixels, numImages);
    … …  
    118119    for (psS32 im = 0 ; im < numImages ; im++) {
    119120        psFree((*questionablePixels)->data[im]);
    120         ((*questionablePixels)->data[im]) = (psPtr *) psPixelsAlloc(PS_COMBINE_IMAGE_INITIAL_PIXEL_LIST_LENGTH);
     121        ((*questionablePixels)->data[im]) =
     122            (psPtr *) psPixelsAlloc(PS_COMBINE_IMAGE_INITIAL_PIXEL_LIST_LENGTH);
    121123        ((psPixels *) ((*questionablePixels)->data[im]))->n = 0;
    122124    }
    … …  
    126128    psVector *qpPtr = psVectorAlloc(numImages, PS_TYPE_S32);
    127129    PS_VECTOR_SET_S32(qpPtr, 0);
    128 
     130    qpPtr->n = numImages;
    129131    //
    130132    // Allocate the necessary psVectors for the call to psVectorStats().
    … …  
    133135    //
    134136    psVector *pixelData = psVectorAlloc(numImages, PS_TYPE_F32);
    135 
     137    pixelData->n = pixelData->nalloc;
    136138    psVector *pixelMask = NULL;
    137139    if (masks != NULL) {
    138140        pixelMask = psVectorAlloc(numImages, PS_TYPE_U8);
    139141        PS_VECTOR_SET_U8(pixelMask, 0);
     142        pixelMask->n = numImages;
    140143    }
    141144
    … …  
    144147        pixelErrors = psVectorAlloc(numImages, PS_TYPE_F32);
    145148        PS_VECTOR_SET_F32(pixelErrors, 1.0);
     149        pixelErrors->n = numImages;
    146150    }
    147151
    … …  
    320324    psVector *pixels = psVectorAlloc(8, PS_TYPE_F32); // Array of pixels
    321325    psVector *mask = psVectorAlloc(8, PS_TYPE_U8); // Corresponding mask
     326    pixels->n = 8;
     327    mask->n = 8;
    322328
    323329    // Get limits
    … …  
    536542    //
    537543    psArray *rejects = psArrayAlloc(numImages);
     544    rejects->n = numImages;
    538545    for (psS32 im = 0 ; im < numImages ; im++) {
    539546        rejects->data[im] = (psPtr *) psPixelsAlloc(PS_REJECT_PIXEL_INITIAL_PIXEL_LIST_LENGTH);
     547        ((psPixels *)(rejects->data[im]))->n = ((psPixels *)(rejects->data[im]))->nalloc;
    540548        psPixels *pixels = (psPixels *) rejects->data[im];
    541549        pixels->n = 0;
    … …  
    546554    psVector *rPtr = psVectorAlloc(numImages, PS_TYPE_S32);
    547555    PS_VECTOR_SET_S32(rPtr, 0);
     556    rPtr->n = numImages;
    548557
    549558    psS32 numCols = ((psImage *) images->data[0])->numCols;

  • trunk/psModules/src/imcombine/pmReadoutCombine.c

    r6325 r6511  
    55 *  @author GLG, MHPCC
    66 *
    7  *  @version $Revision: 1.5 $ $Name: not supported by cvs2svn $
    8  *  @date $Date: 2006-02-06 21:03:25 $
     7 *  @version $Revision: 1.6 $ $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
    … …  
    176176
    177177    psVector *tmpPixels = psVectorAlloc(numInputs, PS_TYPE_F32);
     178    tmpPixels->n = tmpPixels->nalloc;
    178179    psVector *tmpPixelErrors = psVectorAlloc(numInputs, PS_TYPE_F32);
     180    tmpPixelErrors->n = tmpPixelErrors->nalloc;
    179181    psVector *tmpPixelMask = psVectorAlloc(numInputs, PS_TYPE_U8);
     182    tmpPixelMask->n = tmpPixelMask->nalloc;
    180183    psVector *tmpPixelMaskNKeep = psVectorAlloc(numInputs, PS_TYPE_U8);
     184    tmpPixelMaskNKeep->n = tmpPixelMaskNKeep->nalloc;
    181185    psVector *outRowLower = psVectorAlloc(numInputs, PS_TYPE_U32);
     186    outRowLower->n = outRowLower->nalloc;
    182187    psVector *outRowUpper = psVectorAlloc(numInputs, PS_TYPE_U32);
     188    outRowUpper->n = outRowUpper->nalloc;
    183189    psVector *outColLower = psVectorAlloc(numInputs, PS_TYPE_U32);
     190    outColLower->n = outColLower->nalloc;
    184191    psVector *outColUpper = psVectorAlloc(numInputs, PS_TYPE_U32);
     192    outColUpper->n = outColUpper->nalloc;
    185193    pmReadout **tmpReadouts = (pmReadout **) psAlloc(numInputs * sizeof(pmReadout *));
    186194
    … …  
    414422    psStats *diffStats = psStatsAlloc(PS_STAT_ROBUST_MEDIAN);
    415423    psVector *diffs = psVectorAlloc(fringePoints->n, PS_TYPE_F32);
     424    diffs->n = diffs->nalloc;
    416425
    417426    //
    … …  
    517526    psVector *localChipGains = chipGains;
    518527    if (numChips != chipGains->n) {
    519         psLogMsg(__func__, PS_LOG_WARN, "WARNING: the chipGains vector length does not match the number of chips.\n");
     528        psLogMsg(__func__, PS_LOG_WARN,
     529                 "WARNING: the chipGains vector length does not match the number of chips.\n");
    520530        localChipGains = psVectorAlloc(numChips, PS_TYPE_F64);
     531        localChipGains->n = localChipGains->nalloc;
    521532        psBool rc = psVectorInit(localChipGains, 1.0);
    522533        if (rc == false) {
    … …  
    531542    psBool meanFlag = false;
    532543    psVector *chipGainsMask = psVectorAlloc(chipGains->n, PS_TYPE_U8);
     544    chipGainsMask->n = chipGainsMask->nalloc;
    533545    for (psS32 i = 0 ; i < chipGains->n ; i++) {
    534546        if ((fabs(chipGains->data.F64[i]) < FLT_EPSILON) ||

  • trunk/psModules/src/imsubtract/pmImageSubtract.c

    r5170 r6511  
    77 *  @author GLG, MHPCC
    88 *
    9  *  @version $Revision: 1.1 $ $Name: not supported by cvs2svn $
    10  *  @date $Date: 2005-09-28 20:43:52 $
     9 *  @version $Revision: 1.2 $ $Name: not supported by cvs2svn $
     10 *  @date $Date: 2006-03-04 01:01:33 $
    1111 *
    1212 *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
    … …  
    119119    tmp->u = psVectorAlloc(nBF, PS_TYPE_F32);
    120120    tmp->v = psVectorAlloc(nBF, PS_TYPE_F32);
     121    tmp->u->n = tmp->u->nalloc;
     122    tmp->v->n = tmp->v->nalloc;
    121123    tmp->sigma = NULL;
    122124    tmp->xOrder = psVectorAlloc(nBF, PS_TYPE_F32);
     125    tmp->xOrder->n = tmp->xOrder->nalloc;
    123126    tmp->yOrder = psVectorAlloc(nBF, PS_TYPE_F32);
     127    tmp->yOrder->n = tmp->yOrder->nalloc;
    124128    tmp->subIndex = 0;
    125129    tmp->preCalc = NULL;
    … …  
    216220    tmp->u = psVectorAlloc(nBF, PS_TYPE_F32);
    217221    tmp->v = psVectorAlloc(nBF, PS_TYPE_F32);
     222    tmp->u->n = tmp->u->nalloc;
     223    tmp->v->n = tmp->v->nalloc;
    218224    tmp->sigma = psVectorAlloc(nBF, PS_TYPE_F32);
    219225    tmp->xOrder = psVectorAlloc(nBF, PS_TYPE_F32);
    … …  
    223229    tmp->spatialOrder = spatialOrder;
    224230    tmp->preCalc = psArrayAlloc(nBF);
     231    tmp->u->n = tmp->u->nalloc;
     232    tmp->v->n = tmp->v->nalloc;
     233    tmp->sigma->n = tmp->sigma->nalloc;
     234    tmp->xOrder->n = tmp->xOrder->nalloc;
     235    tmp->yOrder->n = tmp->yOrder->nalloc;
     236    tmp->preCalc->n = tmp->preCalc->nalloc;
    225237
    226238    //
    … …  
    352364    } else {
    353365        stamps = (psArray *) psArrayAlloc(xNum * yNum);
     366        stamps->n = stamps->nalloc;
    354367        for (psS32 s = 0 ; s < (xNum * yNum) ; s++) {
    355368            stamps->data[s] = (psPtr *) p_pmStampAlloc(PM_STAMP_REJECTED);
    … …  
    810823            if (stampVector == NULL) {
    811824                stampVector = psVectorAlloc(numSolveParams, PS_TYPE_F64);
     825                stampVector->n = stampVector->nalloc;
    812826                stamp->vector = stampVector;
    813827            } else {
    … …  
    10281042    } else {
    10291043        solution = psVectorAlloc(size, PS_TYPE_F64);
     1044        solution->n = solution->nalloc;
    10301045    }
    10311046
    … …  
    10391054    psImage *sumMatrix = psImageAlloc(size, size, PS_TYPE_F64);
    10401055    psVector *sumVector = psVectorAlloc(size, PS_TYPE_F64);
     1056    sumVector->n = sumVector->nalloc;
    10411057    PS_VECTOR_SET_F64(sumVector, 0.0);
    10421058    PS_IMAGE_SET_F64(sumMatrix, 0.0);
    … …  
    11311147    } else {
    11321148        deviations = psVectorAlloc(stamps->n, PS_TYPE_F32);
     1149        deviations->n = deviations->nalloc;
    11331150        // XXX: Probably not necessary.
    11341151        PS_VECTOR_SET_F32(deviations, 0.0);

  • trunk/psModules/src/imsubtract/pmSubtractBias.c

    r6506 r6511  
    66 *  @author GLG, MHPCC
    77 *
    8  *  @version $Revision: 1.10 $ $Name: not supported by cvs2svn $
    9  *  @date $Date: 2006-03-02 23:16:05 $
     8 *  @version $Revision: 1.11 $ $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
    … …  
    307307    // XXX: use psVectorCopy if they get it working.
    308308    out->knots = psVectorAlloc(in->knots->n, in->knots->type.type);
     309    out->knots->n = out->knots->nalloc;
    309310    for (psS32 i = 0 ; i < in->knots->n ; i++) {
    310311        out->knots->data.F32[i] = in->knots->data.F32[i];
    … …  
    346347    // Allocate the new vector.
    347348    psVector *newVec = psVectorAlloc(n, PS_TYPE_F32);
    348 
     349    newVec->n = newVec->nalloc;
    349350    //
    350351    // If the new vector is the same size as the old, simply copy the data.
    … …  
    491492    psS32 numOverscanImages = my_psListLength(bias);
    492493    psVector *statsAll = psVectorAlloc(numOverscanImages, PS_TYPE_F32);
     494    statsAll->n = statsAll->nalloc;
    493495    psListElem *tmpOverscan = (psListElem *) bias->head;
    494496    psS32 i = 0;
    … …  
    554556    psVector *tmpRow = psVectorAlloc(overscanImage->numCols, PS_TYPE_F32);
    555557    psVector *tmpCol = psVectorAlloc(overscanImage->numRows, PS_TYPE_F32);
     558    tmpRow->n = tmpRow->nalloc;
     559    tmpCol->n = tmpCol->nalloc;
    556560
    557561    //
    … …  
    594598    psVector *tmpRow = psVectorAlloc(overscanImage->numCols, PS_TYPE_F32);
    595599    psVector *tmpCol = psVectorAlloc(overscanImage->numRows, PS_TYPE_F32);
     600    tmpRow->n = tmpRow->nalloc;
     601    tmpCol->n = tmpCol->nalloc;
    596602
    597603    //
    … …  
    649655    psS32 vecSize = GetOverscanSize(inImg, overScanAxis);
    650656    psVector *overscanVector = psVectorAlloc(vecSize, PS_TYPE_F32);
     657    overscanVector->n = overscanVector->nalloc;
    651658
    652659    //
    … …  
    658665    psS32 numOverscanImages = my_psListLength(bias);
    659666    psVector **overscanVectors = (psVector **) psAlloc(numOverscanImages * sizeof(psVector *));
     667    //    (*overscanVectors)->n = (*overscanVectors)->nalloc;
    660668    for (psS32 i = 0 ; i < numOverscanImages ; i++) {
    661669        overscanVectors[i] = NULL;
    … …  
    711719    //
    712720    psVector *tmpVec = psVectorAlloc(numOverscanImages, PS_TYPE_F32);
     721    tmpVec->n = tmpVec->nalloc;
    713722    psF64 statValue;
    714723    for (psS32 i = 0 ; i < vecSize ; i++) {
    … …  
    772781        psVector *myBin = psVectorAlloc(numBins, PS_TYPE_F32);
    773782        psVector *binVec = psVectorAlloc(nBinOrig, PS_TYPE_F32);
     783        myBin->n = myBin->nalloc;
     784        binVec->n = binVec->nalloc;
    774785
    775786        for (psS32 i=0;i<numBins;i++) {
    … …  
    859870    psS32 vecSize = GetOverscanSize(inImg, overScanAxis);
    860871    psVector *newVec = psVectorAlloc(vecSize, PS_TYPE_F32);
     872    newVec->n = newVec->nalloc;
    861873    if ((nBin > 1) && (nBin < overscanVector->n)) {
    862874        for (psS32 i = 0 ; i < vecSize ; i++) {
    … …  
    905917
    906918    psVector *newVec = psVectorAlloc(vecSize, PS_TYPE_F32);
     919    newVec->n = newVec->nalloc;
    907920    for (psS32 i = 0 ; i < vecSize ; i++) {
    908921        newVec->data.F32[i] = overscanVector->data.F32[i/nBin];

  • trunk/psModules/src/imsubtract/pmSubtractSky.c

    r6325 r6511  
    66 *  @author GLG, MHPCC
    77 *
    8  *  @version $Revision: 1.4 $ $Name: not supported by cvs2svn $
    9  *  @date $Date: 2006-02-06 21:03:25 $
     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
    1212 *
    13  *     
     13 *
    1414 *
    1515 */
    … …  
    341341    psImage *Aout = psImageAlloc(localPolyTerms, localPolyTerms, PS_TYPE_F64);
    342342    psVector *B = psVectorAlloc(localPolyTerms, PS_TYPE_F64);
     343    B->n = B->nalloc;
    343344    psVector *outPerm = NULL;
    344345
    … …  
    407408    PS_ASSERT_IMAGE_NON_EMPTY(Aout, NULL);
    408409    psVector *C = psVectorAlloc(localPolyTerms, PS_TYPE_F64);
     410    C->n = C->nalloc;
    409411    psMatrixLUSolve(C, Aout, B, outPerm);
    410412

  • 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++) {

  • trunk/psModules/test/astrom/tst_pmAstrometry01.c

    r5739 r6511  
    55*  @author GLG, MHPCC
    66*
    7 *  @version $Revision: 1.3 $ $Name: not supported by cvs2svn $
    8 *  @date $Date: 2005-12-08 00:00:57 $
     7*  @version $Revision: 1.4 $ $Name: not supported by cvs2svn $
     8*  @date $Date: 2006-03-04 01:01:33 $
    99*
    1010* XXX: Add tests were the coordinate does not transform to any legitimate cell
    … …  
    2828
    2929testDescription tests[] = {
    30                               {test3, -3, "pmAstrometry focal plane transformations", 0, false},
    31                               {test4, -3, "pmCheckParents()", 0, false},
    32                               {test5, -3, "pmFPASelectChip() and pmFPAExcludeChip()", 0, false},
     30                              {test3, 666, "pmAstrometry focal plane transformations", 0, false},
     31                              {test4, 667, "pmCheckParents()", 0, false},
     32                              {test5, 668, "pmFPASelectChip() and pmFPAExcludeChip()", 0, false},
    3333                              {NULL}
    3434                          };
    … …  
    229229 
    230230    pmCoordFPAToTP()  yes
    231     pmCoordTPToFPA()  yes 
     231    pmCoordTPToFPA()  yes
    232232 
    233233    pmCoordTPToSky()  yes

  • trunk/psModules/test/imcombine/tst_pmImageCombine.c

    r5258 r6511  
    1010 *  XXX: Must test masks with pmRejectPixels()
    1111 *
    12  *  @version $Revision: 1.2 $ $Name: not supported by cvs2svn $
    13  *  @date $Date: 2005-10-10 21:58:34 $
     12 *  @version $Revision: 1.3 $ $Name: not supported by cvs2svn $
     13 *  @date $Date: 2006-03-04 01:01:34 $
    1414 *
    1515 *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
    … …  
    6767    psArray *errors = psArrayAlloc(numImages);
    6868    psArray *masks = psArrayAlloc(numImages);
     69    images->n = images->nalloc;
     70    errors->n = errors->nalloc;
     71    masks->n = masks->nalloc;
    6972    for (psS32 i = 0 ; i < numImages ; i++) {
    7073        images->data[i] = (psPtr *) psImageAlloc(numCols, numRows, PS_TYPE_F32);
    … …  
    9497    psArray *errorsLong = psArrayAlloc(numImages+1);
    9598    psArray *masksLong = psArrayAlloc(numImages+1);
     99    imagesLong->n = imagesLong->nalloc;
     100    errorsLong->n = errorsLong->nalloc;
     101    masksLong->n = masksLong->nalloc;
    96102    for (psS32 i = 0 ; i < numImages+1 ; i++) {
    97103        imagesLong->data[i] = (psPtr *) psImageAlloc(numCols, numRows, PS_TYPE_F32);
    … …  
    121127    psArray *errorsBadType = psArrayAlloc(numImages);
    122128    psArray *masksBadType = psArrayAlloc(numImages);
     129    imagesBadType->n = imagesBadType->nalloc;
     130    errorsBadType->n = errorsBadType->nalloc;
     131    masksBadType->n = masksBadType->nalloc;
    123132    for (psS32 i = 0 ; i < numImages ; i++) {
    124133        imagesBadType->data[i] = (psPtr *) psImageAlloc(numCols, numRows, PS_TYPE_F64);
    … …  
    143152
    144153    psPixels *pixels = psPixelsAlloc(TST00_NUM_PIXELS);
     154    pixels->n = pixels->nalloc;
    145155    for (psS32 p = 0 ; p < TST00_NUM_PIXELS ; p++) {
    146156        psS32 col =  genRanInt(0, numCols);
    … …  
    284294    psArray *expandTransforms = psArrayAlloc(numImages);
    285295    psArray *contractTransforms = psArrayAlloc(numImages);
     296    expandTransforms->n = expandTransforms->nalloc;
     297    contractTransforms->n = contractTransforms->nalloc;
    286298    for (psS32 im = 0 ; im < numImages ; im++) {
    287299        psPlaneTransform *ptExpand = psPlaneTransformAlloc(2, 2);

  • trunk/psModules/test/imcombine/tst_pmReadoutCombine.c

    r5169 r6511  
    55 *  @author GLG, MHPCC
    66 *
    7  *  @version $Revision: 1.1 $ $Name: not supported by cvs2svn $
    8  *  @date $Date: 2005-09-28 20:42:52 $
     7 *  @version $Revision: 1.2 $ $Name: not supported by cvs2svn $
     8 *  @date $Date: 2006-03-04 01:01:34 $
    99 *
    1010 *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
    … …  
    8383    psVector *zero = psVectorAlloc(NUM_READOUTS, PS_TYPE_F32);
    8484    psVector *scale = psVectorAlloc(NUM_READOUTS, PS_TYPE_F32);
     85    zero->n = zero->nalloc;
     86    scale->n = scale->nalloc;
    8587    printPositiveTestHeader(stdout, "pmReadoutCombine", "simpleCombineNoOverlap");
    8688
    … …  
    207209    psVector *scaleBig = psVectorAlloc(NUM_READOUTS*2, PS_TYPE_F32);
    208210    psVector *scaleF64 = psVectorAlloc(NUM_READOUTS, PS_TYPE_F64);
     211    zero->n = zero->nalloc;
     212    zeroHalf->n = zeroHalf->nalloc;
     213    zeroBig->n = zeroBig->nalloc;
     214    zeroF64->n = zeroF64->nalloc;
     215    scale->n = scale->nalloc;
     216    scaleHalf->n = scaleHalf->nalloc;
     217    scaleBig->n = scaleBig->nalloc;
     218    scaleF64->n = scaleF64->nalloc;
    209219    for (i=0;i<NUM_READOUTS;i++) {
    210220        zero->data.F32[i] = 3.0;

  • trunk/psModules/test/imsubtract/tst_pmImageSubtract.c

    r5169 r6511  
    1010 *  data.  More work need to be done to verify the results.
    1111 *
    12  *  @version $Revision: 1.1 $ $Name: not supported by cvs2svn $
    13  *  @date $Date: 2005-09-28 20:42:52 $
     12 *  @version $Revision: 1.2 $ $Name: not supported by cvs2svn $
     13 *  @date $Date: 2006-03-04 01:01:34 $
    1414 *
    1515 *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
    … …  
    161161
    162162    psVector *sigmas = psVectorAlloc(sigmaLength, PS_TYPE_F32);
     163    sigmas->n = sigmas->nalloc;
    163164    for (psS32 i = 0 ; i < sigmas->n ; i++) {
    164165        sigmas->data.F32[i] = 1.0 + (psF32) i;
    165166    }
    166167    psVector *orders = psVectorAlloc(orderLength, PS_TYPE_S32);
     168    orders->n = orders->nalloc;
    167169    for (psS32 i = 0 ; i < orders->n ; i++) {
    168170        orders->data.S32[i] = i + 2;
    … …  
    617619    //
    618620    psVector *sigmas = psVectorAlloc(TST03_SIGMA_LENGTH, PS_TYPE_F32);
     621    sigmas->n = sigmas->nalloc;
    619622    for (psS32 i = 0 ; i < sigmas->n ; i++) {
    620623        sigmas->data.F32[i] = 1.0 + (psF32) i;
    621624    }
    622625    psVector *orders = psVectorAlloc(TST03_ORDER_LENGTH, PS_TYPE_S32);
     626    orders->n = orders->nalloc;
    623627    for (psS32 i = 0 ; i < orders->n ; i++) {
    624628        orders->data.S32[i] = i + 2;

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

    r6326 r6511  
    3131    most of psObjects.c is not tested
    3232 *
    33  *  @version $Revision: 1.7 $ $Name: not supported by cvs2svn $
    34  *  @date $Date: 2006-02-06 21:23:46 $
     33 *  @version $Revision: 1.8 $ $Name: not supported by cvs2svn $
     34 *  @date $Date: 2006-03-04 01:01:34 $
    3535 *
    3636 *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
    … …  
    234234    bool testStatus = true;
    235235    psVector *inData = psVectorAlloc(n, PS_TYPE_F32);
     236    inData->n = inData->nalloc;
    236237    psVector *outData = NULL;
    237238
    … …  
    401402    psVector *tmpVecF64 = psVectorAlloc(TST01_VECTOR_LENGTH, PS_TYPE_F64);
    402403    psVector *tmpVecEmpty = psVectorAlloc(0, PS_TYPE_F32);
     404    tmpVecF64->n = tmpVecF64->nalloc;
     405    tmpVecEmpty->n = tmpVecEmpty->nalloc;
    403406
    404407    psTraceSetLevel(".", 0);
Note: See TracChangeset for help on using the changeset viewer.