Changeset 6511 for trunk/psModules/src/imcombine/pmReadoutCombine.c

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.

File:

• trunk/psModules/src/imcombine/pmReadoutCombine.c (modified) (5 diffs)

trunk/psModules/src/imcombine/pmReadoutCombine.c

@@ -5 +5 @@
  *  @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 +176 @@
 
     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 +422 @@
     psStats *diffStats = psStatsAlloc(PS_STAT_ROBUST_MEDIAN);
     psVector *diffs = psVectorAlloc(fringePoints->n, PS_TYPE_F32);
+    diffs->n = diffs->nalloc;
 
     //
@@ -517 +526 @@
     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 +542 @@
     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) ||