Index: /trunk/psModules/psmodule.kdevses =================================================================== --- /trunk/psModules/psmodule.kdevses (revision 6510) +++ /trunk/psModules/psmodule.kdevses (revision 6511) @@ -2,31 +2,49 @@ - - - + + + - - + + - - + + - - + + - - + + + + + + + + + + + + + + + + + + + + - - - - - - + + + + + + Index: /trunk/psModules/src/astrom/pmAstrometryObjects.c =================================================================== --- /trunk/psModules/src/astrom/pmAstrometryObjects.c (revision 6510) +++ /trunk/psModules/src/astrom/pmAstrometryObjects.c (revision 6511) @@ -8,6 +8,6 @@ * @author EAM, IfA * -* @version $Revision: 1.1 $ $Name: not supported by cvs2svn $ -* @date $Date: 2005-12-05 20:49:30 $ +* @version $Revision: 1.2 $ $Name: not supported by cvs2svn $ +* @date $Date: 2006-03-04 01:01:33 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii @@ -201,5 +201,9 @@ psVector *y = psVectorAlloc (match->n, PS_TYPE_F32); psVector *wt = psVectorAlloc (match->n, PS_TYPE_F32); - + X->n = X->nalloc; + Y->n = Y->nalloc; + x->n = x->nalloc; + y->n = y->nalloc; + wt->n = wt->nalloc; // take the matched stars, first fit for (int i = 0; i < match->n; i++) { @@ -249,5 +253,5 @@ psArray *new = psArrayAlloc (old->n); - + new->n = new->nalloc; double cs = cos(angle); double sn = sin(angle); Index: /trunk/psModules/src/imcombine/pmImageCombine.c =================================================================== --- /trunk/psModules/src/imcombine/pmImageCombine.c (revision 6510) +++ /trunk/psModules/src/imcombine/pmImageCombine.c (revision 6511) @@ -8,6 +8,6 @@ * @author GLG, MHPCC * - * @version $Revision: 1.2 $ $Name: not supported by cvs2svn $ - * @date $Date: 2005-12-08 00:29:53 $ + * @version $Revision: 1.3 $ $Name: not supported by cvs2svn $ + * @date $Date: 2006-03-04 01:01:33 $ * * XXX: pmRejectPixels() has a known bug with the pmImageTransform() call. @@ -113,4 +113,5 @@ if (*questionablePixels == NULL) { *questionablePixels = psArrayAlloc(numImages); + (*questionablePixels)->n = numImages; } else if ((*questionablePixels)->n != numImages) { *questionablePixels = psArrayRealloc(*questionablePixels, numImages); @@ -118,5 +119,6 @@ for (psS32 im = 0 ; im < numImages ; im++) { psFree((*questionablePixels)->data[im]); - ((*questionablePixels)->data[im]) = (psPtr *) psPixelsAlloc(PS_COMBINE_IMAGE_INITIAL_PIXEL_LIST_LENGTH); + ((*questionablePixels)->data[im]) = + (psPtr *) psPixelsAlloc(PS_COMBINE_IMAGE_INITIAL_PIXEL_LIST_LENGTH); ((psPixels *) ((*questionablePixels)->data[im]))->n = 0; } @@ -126,5 +128,5 @@ psVector *qpPtr = psVectorAlloc(numImages, PS_TYPE_S32); PS_VECTOR_SET_S32(qpPtr, 0); - + qpPtr->n = numImages; // // Allocate the necessary psVectors for the call to psVectorStats(). @@ -133,9 +135,10 @@ // psVector *pixelData = psVectorAlloc(numImages, PS_TYPE_F32); - + pixelData->n = pixelData->nalloc; psVector *pixelMask = NULL; if (masks != NULL) { pixelMask = psVectorAlloc(numImages, PS_TYPE_U8); PS_VECTOR_SET_U8(pixelMask, 0); + pixelMask->n = numImages; } @@ -144,4 +147,5 @@ pixelErrors = psVectorAlloc(numImages, PS_TYPE_F32); PS_VECTOR_SET_F32(pixelErrors, 1.0); + pixelErrors->n = numImages; } @@ -320,4 +324,6 @@ psVector *pixels = psVectorAlloc(8, PS_TYPE_F32); // Array of pixels psVector *mask = psVectorAlloc(8, PS_TYPE_U8); // Corresponding mask + pixels->n = 8; + mask->n = 8; // Get limits @@ -536,6 +542,8 @@ // psArray *rejects = psArrayAlloc(numImages); + rejects->n = numImages; for (psS32 im = 0 ; im < numImages ; im++) { rejects->data[im] = (psPtr *) psPixelsAlloc(PS_REJECT_PIXEL_INITIAL_PIXEL_LIST_LENGTH); + ((psPixels *)(rejects->data[im]))->n = ((psPixels *)(rejects->data[im]))->nalloc; psPixels *pixels = (psPixels *) rejects->data[im]; pixels->n = 0; @@ -546,4 +554,5 @@ psVector *rPtr = psVectorAlloc(numImages, PS_TYPE_S32); PS_VECTOR_SET_S32(rPtr, 0); + rPtr->n = numImages; psS32 numCols = ((psImage *) images->data[0])->numCols; Index: /trunk/psModules/src/imcombine/pmReadoutCombine.c =================================================================== --- /trunk/psModules/src/imcombine/pmReadoutCombine.c (revision 6510) +++ /trunk/psModules/src/imcombine/pmReadoutCombine.c (revision 6511) @@ -5,6 +5,6 @@ * @author GLG, MHPCC * - * @version $Revision: 1.5 $ $Name: not supported by cvs2svn $ - * @date $Date: 2006-02-06 21:03:25 $ + * @version $Revision: 1.6 $ $Name: not supported by cvs2svn $ + * @date $Date: 2006-03-04 01:01:33 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii @@ -176,11 +176,19 @@ psVector *tmpPixels = psVectorAlloc(numInputs, PS_TYPE_F32); + tmpPixels->n = tmpPixels->nalloc; psVector *tmpPixelErrors = psVectorAlloc(numInputs, PS_TYPE_F32); + tmpPixelErrors->n = tmpPixelErrors->nalloc; psVector *tmpPixelMask = psVectorAlloc(numInputs, PS_TYPE_U8); + tmpPixelMask->n = tmpPixelMask->nalloc; psVector *tmpPixelMaskNKeep = psVectorAlloc(numInputs, PS_TYPE_U8); + tmpPixelMaskNKeep->n = tmpPixelMaskNKeep->nalloc; psVector *outRowLower = psVectorAlloc(numInputs, PS_TYPE_U32); + outRowLower->n = outRowLower->nalloc; psVector *outRowUpper = psVectorAlloc(numInputs, PS_TYPE_U32); + outRowUpper->n = outRowUpper->nalloc; psVector *outColLower = psVectorAlloc(numInputs, PS_TYPE_U32); + outColLower->n = outColLower->nalloc; psVector *outColUpper = psVectorAlloc(numInputs, PS_TYPE_U32); + outColUpper->n = outColUpper->nalloc; pmReadout **tmpReadouts = (pmReadout **) psAlloc(numInputs * sizeof(pmReadout *)); @@ -414,4 +422,5 @@ psStats *diffStats = psStatsAlloc(PS_STAT_ROBUST_MEDIAN); psVector *diffs = psVectorAlloc(fringePoints->n, PS_TYPE_F32); + diffs->n = diffs->nalloc; // @@ -517,6 +526,8 @@ psVector *localChipGains = chipGains; if (numChips != chipGains->n) { - psLogMsg(__func__, PS_LOG_WARN, "WARNING: the chipGains vector length does not match the number of chips.\n"); + psLogMsg(__func__, PS_LOG_WARN, + "WARNING: the chipGains vector length does not match the number of chips.\n"); localChipGains = psVectorAlloc(numChips, PS_TYPE_F64); + localChipGains->n = localChipGains->nalloc; psBool rc = psVectorInit(localChipGains, 1.0); if (rc == false) { @@ -531,4 +542,5 @@ psBool meanFlag = false; psVector *chipGainsMask = psVectorAlloc(chipGains->n, PS_TYPE_U8); + chipGainsMask->n = chipGainsMask->nalloc; for (psS32 i = 0 ; i < chipGains->n ; i++) { if ((fabs(chipGains->data.F64[i]) < FLT_EPSILON) || Index: /trunk/psModules/src/imsubtract/pmImageSubtract.c =================================================================== --- /trunk/psModules/src/imsubtract/pmImageSubtract.c (revision 6510) +++ /trunk/psModules/src/imsubtract/pmImageSubtract.c (revision 6511) @@ -7,6 +7,6 @@ * @author GLG, MHPCC * - * @version $Revision: 1.1 $ $Name: not supported by cvs2svn $ - * @date $Date: 2005-09-28 20:43:52 $ + * @version $Revision: 1.2 $ $Name: not supported by cvs2svn $ + * @date $Date: 2006-03-04 01:01:33 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii @@ -119,7 +119,11 @@ tmp->u = psVectorAlloc(nBF, PS_TYPE_F32); tmp->v = psVectorAlloc(nBF, PS_TYPE_F32); + tmp->u->n = tmp->u->nalloc; + tmp->v->n = tmp->v->nalloc; tmp->sigma = NULL; tmp->xOrder = psVectorAlloc(nBF, PS_TYPE_F32); + tmp->xOrder->n = tmp->xOrder->nalloc; tmp->yOrder = psVectorAlloc(nBF, PS_TYPE_F32); + tmp->yOrder->n = tmp->yOrder->nalloc; tmp->subIndex = 0; tmp->preCalc = NULL; @@ -216,4 +220,6 @@ tmp->u = psVectorAlloc(nBF, PS_TYPE_F32); tmp->v = psVectorAlloc(nBF, PS_TYPE_F32); + tmp->u->n = tmp->u->nalloc; + tmp->v->n = tmp->v->nalloc; tmp->sigma = psVectorAlloc(nBF, PS_TYPE_F32); tmp->xOrder = psVectorAlloc(nBF, PS_TYPE_F32); @@ -223,4 +229,10 @@ tmp->spatialOrder = spatialOrder; tmp->preCalc = psArrayAlloc(nBF); + tmp->u->n = tmp->u->nalloc; + tmp->v->n = tmp->v->nalloc; + tmp->sigma->n = tmp->sigma->nalloc; + tmp->xOrder->n = tmp->xOrder->nalloc; + tmp->yOrder->n = tmp->yOrder->nalloc; + tmp->preCalc->n = tmp->preCalc->nalloc; // @@ -352,4 +364,5 @@ } else { stamps = (psArray *) psArrayAlloc(xNum * yNum); + stamps->n = stamps->nalloc; for (psS32 s = 0 ; s < (xNum * yNum) ; s++) { stamps->data[s] = (psPtr *) p_pmStampAlloc(PM_STAMP_REJECTED); @@ -810,4 +823,5 @@ if (stampVector == NULL) { stampVector = psVectorAlloc(numSolveParams, PS_TYPE_F64); + stampVector->n = stampVector->nalloc; stamp->vector = stampVector; } else { @@ -1028,4 +1042,5 @@ } else { solution = psVectorAlloc(size, PS_TYPE_F64); + solution->n = solution->nalloc; } @@ -1039,4 +1054,5 @@ psImage *sumMatrix = psImageAlloc(size, size, PS_TYPE_F64); psVector *sumVector = psVectorAlloc(size, PS_TYPE_F64); + sumVector->n = sumVector->nalloc; PS_VECTOR_SET_F64(sumVector, 0.0); PS_IMAGE_SET_F64(sumMatrix, 0.0); @@ -1131,4 +1147,5 @@ } else { deviations = psVectorAlloc(stamps->n, PS_TYPE_F32); + deviations->n = deviations->nalloc; // XXX: Probably not necessary. PS_VECTOR_SET_F32(deviations, 0.0); Index: /trunk/psModules/src/imsubtract/pmSubtractBias.c =================================================================== --- /trunk/psModules/src/imsubtract/pmSubtractBias.c (revision 6510) +++ /trunk/psModules/src/imsubtract/pmSubtractBias.c (revision 6511) @@ -6,6 +6,6 @@ * @author GLG, MHPCC * - * @version $Revision: 1.10 $ $Name: not supported by cvs2svn $ - * @date $Date: 2006-03-02 23:16:05 $ + * @version $Revision: 1.11 $ $Name: not supported by cvs2svn $ + * @date $Date: 2006-03-04 01:01:33 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii @@ -307,4 +307,5 @@ // XXX: use psVectorCopy if they get it working. out->knots = psVectorAlloc(in->knots->n, in->knots->type.type); + out->knots->n = out->knots->nalloc; for (psS32 i = 0 ; i < in->knots->n ; i++) { out->knots->data.F32[i] = in->knots->data.F32[i]; @@ -346,5 +347,5 @@ // Allocate the new vector. psVector *newVec = psVectorAlloc(n, PS_TYPE_F32); - + newVec->n = newVec->nalloc; // // If the new vector is the same size as the old, simply copy the data. @@ -491,4 +492,5 @@ psS32 numOverscanImages = my_psListLength(bias); psVector *statsAll = psVectorAlloc(numOverscanImages, PS_TYPE_F32); + statsAll->n = statsAll->nalloc; psListElem *tmpOverscan = (psListElem *) bias->head; psS32 i = 0; @@ -554,4 +556,6 @@ psVector *tmpRow = psVectorAlloc(overscanImage->numCols, PS_TYPE_F32); psVector *tmpCol = psVectorAlloc(overscanImage->numRows, PS_TYPE_F32); + tmpRow->n = tmpRow->nalloc; + tmpCol->n = tmpCol->nalloc; // @@ -594,4 +598,6 @@ psVector *tmpRow = psVectorAlloc(overscanImage->numCols, PS_TYPE_F32); psVector *tmpCol = psVectorAlloc(overscanImage->numRows, PS_TYPE_F32); + tmpRow->n = tmpRow->nalloc; + tmpCol->n = tmpCol->nalloc; // @@ -649,4 +655,5 @@ psS32 vecSize = GetOverscanSize(inImg, overScanAxis); psVector *overscanVector = psVectorAlloc(vecSize, PS_TYPE_F32); + overscanVector->n = overscanVector->nalloc; // @@ -658,4 +665,5 @@ psS32 numOverscanImages = my_psListLength(bias); psVector **overscanVectors = (psVector **) psAlloc(numOverscanImages * sizeof(psVector *)); + // (*overscanVectors)->n = (*overscanVectors)->nalloc; for (psS32 i = 0 ; i < numOverscanImages ; i++) { overscanVectors[i] = NULL; @@ -711,4 +719,5 @@ // psVector *tmpVec = psVectorAlloc(numOverscanImages, PS_TYPE_F32); + tmpVec->n = tmpVec->nalloc; psF64 statValue; for (psS32 i = 0 ; i < vecSize ; i++) { @@ -772,4 +781,6 @@ psVector *myBin = psVectorAlloc(numBins, PS_TYPE_F32); psVector *binVec = psVectorAlloc(nBinOrig, PS_TYPE_F32); + myBin->n = myBin->nalloc; + binVec->n = binVec->nalloc; for (psS32 i=0;in = newVec->nalloc; if ((nBin > 1) && (nBin < overscanVector->n)) { for (psS32 i = 0 ; i < vecSize ; i++) { @@ -905,4 +917,5 @@ psVector *newVec = psVectorAlloc(vecSize, PS_TYPE_F32); + newVec->n = newVec->nalloc; for (psS32 i = 0 ; i < vecSize ; i++) { newVec->data.F32[i] = overscanVector->data.F32[i/nBin]; Index: /trunk/psModules/src/imsubtract/pmSubtractSky.c =================================================================== --- /trunk/psModules/src/imsubtract/pmSubtractSky.c (revision 6510) +++ /trunk/psModules/src/imsubtract/pmSubtractSky.c (revision 6511) @@ -6,10 +6,10 @@ * @author GLG, MHPCC * - * @version $Revision: 1.4 $ $Name: not supported by cvs2svn $ - * @date $Date: 2006-02-06 21:03:25 $ + * @version $Revision: 1.5 $ $Name: not supported by cvs2svn $ + * @date $Date: 2006-03-04 01:01:33 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii * - * + * * */ @@ -341,4 +341,5 @@ psImage *Aout = psImageAlloc(localPolyTerms, localPolyTerms, PS_TYPE_F64); psVector *B = psVectorAlloc(localPolyTerms, PS_TYPE_F64); + B->n = B->nalloc; psVector *outPerm = NULL; @@ -407,4 +408,5 @@ PS_ASSERT_IMAGE_NON_EMPTY(Aout, NULL); psVector *C = psVectorAlloc(localPolyTerms, PS_TYPE_F64); + C->n = C->nalloc; psMatrixLUSolve(C, Aout, B, outPerm); Index: /trunk/psModules/src/objects/models/pmModel_GAUSS.c =================================================================== --- /trunk/psModules/src/objects/models/pmModel_GAUSS.c (revision 6510) +++ /trunk/psModules/src/objects/models/pmModel_GAUSS.c (revision 6511) @@ -71,4 +71,7 @@ *params_min = psVectorAlloc (7, PS_TYPE_F32); *params_max = psVectorAlloc (7, PS_TYPE_F32); + (*beta_lim)->n = (*beta_lim)->nalloc; + (*params_min)->n = (*params_min)->nalloc; + (*params_max)->n = (*params_max)->nalloc; beta_lim[0][0].data.F32[0] = 1000; Index: /trunk/psModules/src/objects/models/pmModel_PGAUSS.c =================================================================== --- /trunk/psModules/src/objects/models/pmModel_PGAUSS.c (revision 6510) +++ /trunk/psModules/src/objects/models/pmModel_PGAUSS.c (revision 6511) @@ -45,4 +45,7 @@ *params_min = psVectorAlloc (7, PS_TYPE_F32); *params_max = psVectorAlloc (7, PS_TYPE_F32); + (*beta_lim)->n = (*beta_lim)->nalloc; + (*params_min)->n = (*params_min)->nalloc; + (*params_max)->n = (*params_max)->nalloc; beta_lim[0][0].data.F32[0] = 1000; Index: /trunk/psModules/src/objects/models/pmModel_QGAUSS.c =================================================================== --- /trunk/psModules/src/objects/models/pmModel_QGAUSS.c (revision 6510) +++ /trunk/psModules/src/objects/models/pmModel_QGAUSS.c (revision 6511) @@ -11,6 +11,6 @@ params->data.F32[5] = sqrt(2.0) / SigmaY; params->data.F32[6] = Sxy; - params->data.F32[7] = - params->data.F32[8] = + params->data.F32[7] = + params->data.F32[8] = *****************************************************************************/ @@ -53,4 +53,7 @@ *params_min = psVectorAlloc (8, PS_TYPE_F32); *params_max = psVectorAlloc (8, PS_TYPE_F32); + (*beta_lim)->n = (*beta_lim)->nalloc; + (*params_min)->n = (*params_min)->nalloc; + (*params_max)->n = (*params_max)->nalloc; beta_lim[0][0].data.F32[0] = 1000; Index: /trunk/psModules/src/objects/models/pmModel_SGAUSS.c =================================================================== --- /trunk/psModules/src/objects/models/pmModel_SGAUSS.c (revision 6510) +++ /trunk/psModules/src/objects/models/pmModel_SGAUSS.c (revision 6511) @@ -64,4 +64,7 @@ *params_min = psVectorAlloc (9, PS_TYPE_F32); *params_max = psVectorAlloc (9, PS_TYPE_F32); + (*beta_lim)->n = (*beta_lim)->nalloc; + (*params_min)->n = (*params_min)->nalloc; + (*params_max)->n = (*params_max)->nalloc; beta_lim[0][0].data.F32[0] = 1000; @@ -116,4 +119,5 @@ psVector *contour = psVectorAlloc (Nt, PS_TYPE_F32); + contour->n = contour->nalloc; for (t = 0, N = 0; (t < 2*M_PI) && (N < Nt); t += dt) { x = ct*axes.major*cos(t) + st*axes.minor*sin(t) + xo; Index: /trunk/psModules/src/objects/pmObjects.c =================================================================== --- /trunk/psModules/src/objects/pmObjects.c (revision 6510) +++ /trunk/psModules/src/objects/pmObjects.c (revision 6511) @@ -6,6 +6,6 @@ * @author EAM, IfA: significant modifications. * - * @version $Revision: 1.9 $ $Name: not supported by cvs2svn $ - * @date $Date: 2006-02-06 22:17:54 $ + * @version $Revision: 1.10 $ $Name: not supported by cvs2svn $ + * @date $Date: 2006-03-04 01:01:33 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii @@ -96,4 +96,5 @@ psVector *tmpVector = psVectorAlloc(image->numCols, PS_TYPE_F32); + tmpVector->n = tmpVector->nalloc; for (psU32 col = 0; col < image->numCols ; col++) { tmpVector->data.F32[col] = image->data.F32[row][col]; @@ -282,4 +283,6 @@ tmp->params = psVectorAlloc(Nparams, PS_TYPE_F32); tmp->dparams = psVectorAlloc(Nparams, PS_TYPE_F32); + tmp->params->n = tmp->params->nalloc; + tmp->dparams->n = tmp->dparams->nalloc; for (psS32 i = 0; i < tmp->params->n; i++) { @@ -348,4 +351,5 @@ if (vector->data.F32[0] > threshold) { tmpVector = psVectorAlloc(1, PS_TYPE_U32); + tmpVector->n = 1; tmpVector->data.U32[0] = 0; } else { @@ -388,4 +392,5 @@ // psVector *tmpVector = psVectorAlloc(count, PS_TYPE_U32); + tmpVector->n = tmpVector->nalloc; count = 0; @@ -1428,4 +1433,5 @@ // psVector *x = psVectorAlloc(2, PS_TYPE_F32); + x->n = x->nalloc; x->data.F32[0] = (psF32) (col + image->col0); x->data.F32[1] = (psF32) (row + image->row0); @@ -1472,5 +1478,6 @@ psVector *xVec = psVectorAlloc(2 * source->pixels->numRows, PS_TYPE_F32); psVector *yVec = psVectorAlloc(2 * source->pixels->numRows, PS_TYPE_F32); - + xVec->n = xVec->nalloc; + yVec->n = yVec->nalloc; // // Start at the row with peak pixel, then decrement. @@ -1552,4 +1559,5 @@ // psArray *tmpArray = psArrayAlloc(2); + tmpArray->n = 2; tmpArray->data[0] = (psPtr *) yVec; tmpArray->data[1] = (psPtr *) xVec; @@ -1616,4 +1624,7 @@ psVector *y = psVectorAlloc(count, PS_TYPE_F32); psVector *yErr = psVectorAlloc(count, PS_TYPE_F32); + x->n = x->nalloc; + y->n = y->nalloc; + yErr->n = yErr->nalloc; psS32 tmpCnt = 0; for (psS32 i = 0; i < source->pixels->numRows; i++) { @@ -1621,4 +1632,5 @@ if (source->mask->data.U8[i][j] == 0) { psVector *coord = psVectorAlloc(2, PS_TYPE_F32); + coord->n = 2; // XXX: Convert i/j to image space: // XXX EAM: coord order is (x,y) == (col,row) @@ -1641,4 +1653,5 @@ if (PSF) { paramMask = psVectorAlloc (params->n, PS_TYPE_U8); + paramMask->n = paramMask->nalloc; for (int i = 0; i < 4; i++) { paramMask->data.U8[i] = 0; @@ -1673,4 +1686,5 @@ if (paramMask != NULL) { psVector *delta = psVectorAlloc (params->n, PS_TYPE_F64); + delta->n = delta->nalloc; psMinimizeGaussNewtonDelta (delta, params, NULL, x, y, yErr, modelFunc); for (int i = 0; i < dparams->n; i++) { @@ -1763,4 +1777,7 @@ psVector *y = psVectorAlloc(count, PS_TYPE_F32); psVector *yErr = psVectorAlloc(count, PS_TYPE_F32); + x->n = x->nalloc; + y->n = y->nalloc; + yErr->n = yErr->nalloc; psS32 tmpCnt = 0; for (psS32 i = 0; i < source->pixels->numRows; i++) { @@ -1768,4 +1785,5 @@ if (source->mask->data.U8[i][j] == 0) { psVector *coord = psVectorAlloc(2, PS_TYPE_F32); + coord->n = 2; // XXX: Convert i/j to image space: // XXX EAM: coord order is (x,y) == (col,row) @@ -1779,5 +1797,6 @@ // this test enhances the weight based on deviation from the model flux - Ro = 1.0 + fabs (y->data.F32[tmpCnt] - ymodel) / sqrt(PS_SQR(ymodel - So) + PS_SQR(So)); + Ro = 1.0 + fabs (y->data.F32[tmpCnt] - ymodel) / sqrt(PS_SQR(ymodel - So) + + PS_SQR(So)); // psMinimizeLMChi2_EAM takes wt = 1/dY^2 @@ -1798,4 +1817,5 @@ if (PSF) { paramMask = psVectorAlloc (params->n, PS_TYPE_U8); + paramMask->n = paramMask->nalloc; for (int i = 0; i < 4; i++) { paramMask->data.U8[i] = 0; @@ -1846,4 +1866,5 @@ if (paramMask != NULL) { psVector *delta = psVectorAlloc (params->n, PS_TYPE_F64); + delta->n = delta->nalloc; psMinimizeGaussNewtonDelta(delta, params, NULL, x, y, yErr, modelFunc); for (int i = 0; i < dparams->n; i++) { @@ -1897,4 +1918,5 @@ psVector *x = psVectorAlloc(2, PS_TYPE_F32); + x->n = 2; psVector *params = model->params; pmModelFunc modelFunc = pmModelFunc_GetFunction (model->type); Index: /trunk/psModules/src/objects/pmPSF.c =================================================================== --- /trunk/psModules/src/objects/pmPSF.c (revision 6510) +++ /trunk/psModules/src/objects/pmPSF.c (revision 6511) @@ -6,6 +6,6 @@ * @author EAM, IfA * - * @version $Revision: 1.4 $ $Name: not supported by cvs2svn $ - * @date $Date: 2005-12-24 01:24:32 $ + * @version $Revision: 1.5 $ $Name: not supported by cvs2svn $ + * @date $Date: 2006-03-04 01:01:33 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii @@ -91,4 +91,5 @@ psf->params = psArrayAlloc(Nparams - 4); + psf->params->n = psf->params->nalloc; for (int i = 0; i < psf->params->n; i++) { // XXX EAM : make this a user-defined value? @@ -119,4 +120,8 @@ psVector *z = psVectorAlloc (models->n, PS_TYPE_F64); psVector *dz = psVectorAlloc (models->n, PS_TYPE_F64); + x->n = x->nalloc; + y->n = y->nalloc; + z->n = z->nalloc; + dz->n = dz->nalloc; for (int i = 0; i < models->n; i++) { Index: /trunk/psModules/src/objects/pmPSFtry.c =================================================================== --- /trunk/psModules/src/objects/pmPSFtry.c (revision 6510) +++ /trunk/psModules/src/objects/pmPSFtry.c (revision 6511) @@ -5,6 +5,6 @@ * @author EAM, IfA * - * @version $Revision: 1.4 $ $Name: not supported by cvs2svn $ - * @date $Date: 2005-12-24 01:24:32 $ + * @version $Revision: 1.5 $ $Name: not supported by cvs2svn $ + * @date $Date: 2006-03-04 01:01:33 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii @@ -59,4 +59,10 @@ test->mask = psVectorAlloc (sources->n, PS_TYPE_U8); + test->modelFLT->n = test->modelFLT->nalloc; + test->modelPSF->n = test->modelPSF->nalloc; + test->metric->n = test->metric->nalloc; + test->fitMag->n = test->fitMag->nalloc; + test->mask->n = test->mask->nalloc; + for (int i = 0; i < test->modelFLT->n; i++) { test->mask->data.U8[i] = 0; @@ -204,4 +210,5 @@ // rflux = ten(0.4*fitMag); psVector *rflux = psVectorAlloc (psfTry->sources->n, PS_TYPE_F64); + rflux->n = rflux->nalloc; for (int i = 0; i < psfTry->sources->n; i++) { if (psfTry->mask->data.U8[i] & PSFTRY_MASK_ALL) @@ -219,4 +226,6 @@ psVector *daBin = psVectorAlloc (rfBin->n, PS_TYPE_F64); psVector *maskB = psVectorAlloc (rfBin->n, PS_TYPE_U8); + daBin->n = daBin->nalloc; + maskB->n = maskB->nalloc; psFree (stats); @@ -272,4 +281,5 @@ psVector *tmp2 = psVectorAlloc (nKeep, PS_TYPE_F64); + tmp2->n = tmp2->nalloc; for (int j = 0; j < tmp2->n; j++) { tmp2->data.F64[j] = tmp->data.F64[j + nSkip]; @@ -337,4 +347,5 @@ psVector *rflux = psVectorAlloc (try ->sources->n, PS_TYPE_F64); + rflux->n = rflux->nalloc; for (int i = 0; i < try ->sources->n; i++) { Index: /trunk/psModules/test/astrom/tst_pmAstrometry01.c =================================================================== --- /trunk/psModules/test/astrom/tst_pmAstrometry01.c (revision 6510) +++ /trunk/psModules/test/astrom/tst_pmAstrometry01.c (revision 6511) @@ -5,6 +5,6 @@ * @author GLG, MHPCC * -* @version $Revision: 1.3 $ $Name: not supported by cvs2svn $ -* @date $Date: 2005-12-08 00:00:57 $ +* @version $Revision: 1.4 $ $Name: not supported by cvs2svn $ +* @date $Date: 2006-03-04 01:01:33 $ * * XXX: Add tests were the coordinate does not transform to any legitimate cell @@ -28,7 +28,7 @@ testDescription tests[] = { - {test3, -3, "pmAstrometry focal plane transformations", 0, false}, - {test4, -3, "pmCheckParents()", 0, false}, - {test5, -3, "pmFPASelectChip() and pmFPAExcludeChip()", 0, false}, + {test3, 666, "pmAstrometry focal plane transformations", 0, false}, + {test4, 667, "pmCheckParents()", 0, false}, + {test5, 668, "pmFPASelectChip() and pmFPAExcludeChip()", 0, false}, {NULL} }; @@ -229,5 +229,5 @@ pmCoordFPAToTP() yes - pmCoordTPToFPA() yes + pmCoordTPToFPA() yes pmCoordTPToSky() yes Index: /trunk/psModules/test/imcombine/tst_pmImageCombine.c =================================================================== --- /trunk/psModules/test/imcombine/tst_pmImageCombine.c (revision 6510) +++ /trunk/psModules/test/imcombine/tst_pmImageCombine.c (revision 6511) @@ -10,6 +10,6 @@ * XXX: Must test masks with pmRejectPixels() * - * @version $Revision: 1.2 $ $Name: not supported by cvs2svn $ - * @date $Date: 2005-10-10 21:58:34 $ + * @version $Revision: 1.3 $ $Name: not supported by cvs2svn $ + * @date $Date: 2006-03-04 01:01:34 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii @@ -67,4 +67,7 @@ psArray *errors = psArrayAlloc(numImages); psArray *masks = psArrayAlloc(numImages); + images->n = images->nalloc; + errors->n = errors->nalloc; + masks->n = masks->nalloc; for (psS32 i = 0 ; i < numImages ; i++) { images->data[i] = (psPtr *) psImageAlloc(numCols, numRows, PS_TYPE_F32); @@ -94,4 +97,7 @@ psArray *errorsLong = psArrayAlloc(numImages+1); psArray *masksLong = psArrayAlloc(numImages+1); + imagesLong->n = imagesLong->nalloc; + errorsLong->n = errorsLong->nalloc; + masksLong->n = masksLong->nalloc; for (psS32 i = 0 ; i < numImages+1 ; i++) { imagesLong->data[i] = (psPtr *) psImageAlloc(numCols, numRows, PS_TYPE_F32); @@ -121,4 +127,7 @@ psArray *errorsBadType = psArrayAlloc(numImages); psArray *masksBadType = psArrayAlloc(numImages); + imagesBadType->n = imagesBadType->nalloc; + errorsBadType->n = errorsBadType->nalloc; + masksBadType->n = masksBadType->nalloc; for (psS32 i = 0 ; i < numImages ; i++) { imagesBadType->data[i] = (psPtr *) psImageAlloc(numCols, numRows, PS_TYPE_F64); @@ -143,4 +152,5 @@ psPixels *pixels = psPixelsAlloc(TST00_NUM_PIXELS); + pixels->n = pixels->nalloc; for (psS32 p = 0 ; p < TST00_NUM_PIXELS ; p++) { psS32 col = genRanInt(0, numCols); @@ -284,4 +294,6 @@ psArray *expandTransforms = psArrayAlloc(numImages); psArray *contractTransforms = psArrayAlloc(numImages); + expandTransforms->n = expandTransforms->nalloc; + contractTransforms->n = contractTransforms->nalloc; for (psS32 im = 0 ; im < numImages ; im++) { psPlaneTransform *ptExpand = psPlaneTransformAlloc(2, 2); Index: /trunk/psModules/test/imcombine/tst_pmReadoutCombine.c =================================================================== --- /trunk/psModules/test/imcombine/tst_pmReadoutCombine.c (revision 6510) +++ /trunk/psModules/test/imcombine/tst_pmReadoutCombine.c (revision 6511) @@ -5,6 +5,6 @@ * @author GLG, MHPCC * - * @version $Revision: 1.1 $ $Name: not supported by cvs2svn $ - * @date $Date: 2005-09-28 20:42:52 $ + * @version $Revision: 1.2 $ $Name: not supported by cvs2svn $ + * @date $Date: 2006-03-04 01:01:34 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii @@ -83,4 +83,6 @@ psVector *zero = psVectorAlloc(NUM_READOUTS, PS_TYPE_F32); psVector *scale = psVectorAlloc(NUM_READOUTS, PS_TYPE_F32); + zero->n = zero->nalloc; + scale->n = scale->nalloc; printPositiveTestHeader(stdout, "pmReadoutCombine", "simpleCombineNoOverlap"); @@ -207,4 +209,12 @@ psVector *scaleBig = psVectorAlloc(NUM_READOUTS*2, PS_TYPE_F32); psVector *scaleF64 = psVectorAlloc(NUM_READOUTS, PS_TYPE_F64); + zero->n = zero->nalloc; + zeroHalf->n = zeroHalf->nalloc; + zeroBig->n = zeroBig->nalloc; + zeroF64->n = zeroF64->nalloc; + scale->n = scale->nalloc; + scaleHalf->n = scaleHalf->nalloc; + scaleBig->n = scaleBig->nalloc; + scaleF64->n = scaleF64->nalloc; for (i=0;idata.F32[i] = 3.0; Index: /trunk/psModules/test/imsubtract/tst_pmImageSubtract.c =================================================================== --- /trunk/psModules/test/imsubtract/tst_pmImageSubtract.c (revision 6510) +++ /trunk/psModules/test/imsubtract/tst_pmImageSubtract.c (revision 6511) @@ -10,6 +10,6 @@ * data. More work need to be done to verify the results. * - * @version $Revision: 1.1 $ $Name: not supported by cvs2svn $ - * @date $Date: 2005-09-28 20:42:52 $ + * @version $Revision: 1.2 $ $Name: not supported by cvs2svn $ + * @date $Date: 2006-03-04 01:01:34 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii @@ -161,8 +161,10 @@ psVector *sigmas = psVectorAlloc(sigmaLength, PS_TYPE_F32); + sigmas->n = sigmas->nalloc; for (psS32 i = 0 ; i < sigmas->n ; i++) { sigmas->data.F32[i] = 1.0 + (psF32) i; } psVector *orders = psVectorAlloc(orderLength, PS_TYPE_S32); + orders->n = orders->nalloc; for (psS32 i = 0 ; i < orders->n ; i++) { orders->data.S32[i] = i + 2; @@ -617,8 +619,10 @@ // psVector *sigmas = psVectorAlloc(TST03_SIGMA_LENGTH, PS_TYPE_F32); + sigmas->n = sigmas->nalloc; for (psS32 i = 0 ; i < sigmas->n ; i++) { sigmas->data.F32[i] = 1.0 + (psF32) i; } psVector *orders = psVectorAlloc(TST03_ORDER_LENGTH, PS_TYPE_S32); + orders->n = orders->nalloc; for (psS32 i = 0 ; i < orders->n ; i++) { orders->data.S32[i] = i + 2; Index: /trunk/psModules/test/objects/tst_pmObjects01.c =================================================================== --- /trunk/psModules/test/objects/tst_pmObjects01.c (revision 6510) +++ /trunk/psModules/test/objects/tst_pmObjects01.c (revision 6511) @@ -31,6 +31,6 @@ most of psObjects.c is not tested * - * @version $Revision: 1.7 $ $Name: not supported by cvs2svn $ - * @date $Date: 2006-02-06 21:23:46 $ + * @version $Revision: 1.8 $ $Name: not supported by cvs2svn $ + * @date $Date: 2006-03-04 01:01:34 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii @@ -234,4 +234,5 @@ bool testStatus = true; psVector *inData = psVectorAlloc(n, PS_TYPE_F32); + inData->n = inData->nalloc; psVector *outData = NULL; @@ -401,4 +402,6 @@ psVector *tmpVecF64 = psVectorAlloc(TST01_VECTOR_LENGTH, PS_TYPE_F64); psVector *tmpVecEmpty = psVectorAlloc(0, PS_TYPE_F32); + tmpVecF64->n = tmpVecF64->nalloc; + tmpVecEmpty->n = tmpVecEmpty->nalloc; psTraceSetLevel(".", 0);