Changeset 9730 for trunk/psModules/src/detrend/pmShutterCorrection.c

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.

File:

• trunk/psModules/src/detrend/pmShutterCorrection.c (modified) (6 diffs)

trunk/psModules/src/detrend/pmShutterCorrection.c

@@ -104 +104 @@
     psVector *tmpX = psVectorAlloc(2, PS_TYPE_F32);
     psVector *tmpY = psVectorAlloc(2, PS_TYPE_F32);
-    tmpX->n = tmpY->n = 2;
 
     long index;
@@ -210 +209 @@
     psVector *x = psVectorAlloc(exptime->n, PS_TYPE_F32);
     psVector *y = psVectorAlloc(exptime->n, PS_TYPE_F32);
-    x->n = y->n = exptime->n;
 
     for (long i = 0; i < exptime->n; i++) {
@@ -301 +299 @@
     params->data.F32[1] = guess->offset;
     params->data.F32[2] = guess->offref;
-    params->n = 3;
 
     // XXX for the moment, don't set any constraints
@@ -317 +314 @@
     // construct the coordinate and value entries (y is counts)
     psArray *x = psArrayAlloc(exptime->n); // Coordinates
-    x->n = exptime->n;
 
     for (long i = 0; i < exptime->n; i++) {
         psVector *coord = psVectorAlloc(1, PS_TYPE_F32);
-        coord->n = 1;
         coord->data.F32[0] = exptime->data.F32[i];
         x->data[i] = coord;
@@ -371 +366 @@
     psRegion refRegion;                 // Reference region
     psVector *refs = psVectorAlloc(num, PS_TYPE_F32); // Reference measurements
-    refs->n = num;
     psVectorInit(refs, 0);
     psArray *regions = psArrayAlloc(MEASURE_SAMPLES); // Array of sample regions, made on each image
-    regions->n = MEASURE_SAMPLES;
     psImage *samplesMean = psImageAlloc(num, MEASURE_SAMPLES, PS_TYPE_F32); // Measurements for each file
     psImage *samplesStdev = psImageAlloc(num, MEASURE_SAMPLES, PS_TYPE_F32); // Errors for each file
@@ -505 +498 @@
     psImage *pattern = psImageAlloc(numCols, numRows, PS_TYPE_F32); // Illumination pattern
     psVector *mask = psVectorAlloc(num, PS_TYPE_U8); // Mask for each image
-    mask->n = num;
     psVectorInit(mask, 0);
     psTrace("psModules.detrend", 2, "Performing linear fit on individual pixels...\n");