Changeset 9730 for trunk/psModules/src/imcombine

Timestamp:

Oct 24, 2006, 12:55:05 PM (20 years ago)

Author:

Paul Price

Message:

Following today's meeting, we agreed that psVectorAlloc (and therefore
psArrayAlloc also) shall set the number of elements in use to equal the
number of elements allocated. We introduce new functions,
psVectorAllocEmpty and psArrayAllocEmpty, that allocate a vector and set
the length to zero.

Location:

trunk/psModules/src/imcombine

Files:

• pmImageCombine.c (modified) (8 diffs)
• pmImageSubtract.c (modified) (9 diffs)
• pmReadoutCombine.c (modified) (2 diffs)

trunk/psModules/src/imcombine/pmImageCombine.c

@@ -8 +8 @@
  *  @author GLG, MHPCC
  *
- *  @version $Revision: 1.8 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2006-09-15 09:49:01 $
+ *  @version $Revision: 1.9 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2006-10-24 22:55:05 $
  *
  *  XXX: pmRejectPixels() has a known bug with the pmImageTransform() call.
@@ -122 +122 @@
     if (*questionablePixels == NULL) {
         *questionablePixels = psArrayAlloc(numImages);
-        (*questionablePixels)->n = numImages;
     } else if ((*questionablePixels)->n != numImages) {
         *questionablePixels = psArrayRealloc(*questionablePixels, numImages);
@@ -137 +136 @@
     psVector *qpPtr = psVectorAlloc(numImages, PS_TYPE_S32);
     psVectorInit(qpPtr, 0);
-    qpPtr->n = numImages;
     //
     // Allocate the necessary psVectors for the call to psVectorStats().
@@ -144 +142 @@
     //
     psVector *pixelData = psVectorAlloc(numImages, PS_TYPE_F32);
-    pixelData->n = pixelData->nalloc;
     psVector *pixelMask = NULL;
     if (masks != NULL) {
         pixelMask = psVectorAlloc(numImages, PS_TYPE_U8);
         psVectorInit(pixelMask, 0);
-        pixelMask->n = numImages;
     }
 
@@ -156 +152 @@
         pixelErrors = psVectorAlloc(numImages, PS_TYPE_F32);
         psVectorInit(pixelErrors, 1.0);
-        pixelErrors->n = numImages;
     }
 
@@ -320 +315 @@
     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
@@ -538 +531 @@
     //
     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);
@@ -550 +542 @@
     psVector *rPtr = psVectorAlloc(numImages, PS_TYPE_S32);
     psVectorInit(rPtr, 0);
-    rPtr->n = numImages;
 
     psS32 numCols = ((psImage *) images->data[0])->numCols;

trunk/psModules/src/imcombine/pmImageSubtract.c

@@ -7 +7 @@
  *  @author GLG, MHPCC
  *
- *  @version $Revision: 1.6 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2006-09-15 09:49:01 $
+ *  @version $Revision: 1.7 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2006-10-24 22:55:05 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -122 +122 @@
     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;
@@ -223 +219 @@
     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);
@@ -232 +226 @@
     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;
 
     //
@@ -367 +355 @@
     } 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);
@@ -826 +813 @@
             if (stampVector == NULL) {
                 stampVector = psVectorAlloc(numSolveParams, PS_TYPE_F64);
-                stampVector->n = stampVector->nalloc;
                 stamp->vector = stampVector;
             } else {
@@ -1045 +1031 @@
     } else {
         solution = psVectorAlloc(size, PS_TYPE_F64);
-        solution->n = solution->nalloc;
     }
 
@@ -1057 +1042 @@
     psImage *sumMatrix = psImageAlloc(size, size, PS_TYPE_F64);
     psVector *sumVector = psVectorAlloc(size, PS_TYPE_F64);
-    sumVector->n = sumVector->nalloc;
     psVectorInit(sumVector, 0.0);
     psImageInit(sumMatrix, 0.0);
@@ -1150 +1134 @@
     } else {
         deviations = psVectorAlloc(stamps->n, PS_TYPE_F32);
-        deviations->n = deviations->nalloc;
         // XXX: Probably not necessary.
         psVectorInit(deviations, 0.0);

trunk/psModules/src/imcombine/pmReadoutCombine.c

@@ -201 +201 @@
 
     psVector *pixels = psVectorAlloc(inputs->n, PS_TYPE_F32); // Stack of pixels
-    pixels->n = inputs->n;
     psF32 *pixelsData = pixels->data.F32; // Dereference pixels
 
     psVector *mask   = psVectorAlloc(inputs->n, PS_TYPE_U8); // Mask for stack
-    mask->n = inputs->n;
     psU8 *maskData = mask->data.U8;     // Dereference mask
 
@@ -212 +210 @@
     if (haveWeights) {
         weights = psVectorAlloc(inputs->n, PS_TYPE_F32); // Stack of weights
-        weights->n = inputs->n;
         weightsData = weights->data.F32;
     }