Changeset 9737

Timestamp:

Oct 24, 2006, 2:16:45 PM (20 years ago)

Author:

Paul Price

Message:

Changed definition of psVectorAlloc and psArrayAlloc.

Location:

trunk/ppMerge/src

Files:

• ppMergeCheckInputs.c (modified) (1 diff)
• ppMergeCombine.c (modified) (2 diffs)
• ppMergeConfig.c (modified) (1 diff)
• ppMergeScaleZero.c (modified) (2 diffs)

trunk/ppMerge/src/ppMergeCheckInputs.c

@@ -44 +44 @@
     if (!data->in) {
         data->in = psArrayAlloc(filenames->n);
-        data->in->n = filenames->n;
     }
     if (!data->files) {
         data->files = psArrayAlloc(filenames->n);
-        data->files->n = filenames->n;
     }
     int numGood = 0;                    // Number of good files

trunk/ppMerge/src/ppMergeCombine.c

@@ -113 +113 @@
             pmReadout *readout = pmReadoutAlloc(cell); // Output readout of interest
             psArray *stack = psArrayAlloc(filenames->n); // Stack of readouts to combine
-            stack->n = filenames->n;
             psVector *cellScales = NULL; // Scales for this cell
             if (scales) {
@@ -128 +127 @@
                 int numRead = 0;  // Number of inputs read
                 psVector *exptimes = psVectorAlloc(filenames->n, PS_TYPE_F32);  // Reference measurements
-                exptimes->n = filenames->n;
                 psVectorInit(exptimes, 0);
                 psArray *images = psArrayAlloc(filenames->n); // Array of images
                 psArray *weights = psArrayAlloc(filenames->n); // Array of weights
                 psArray *masks = psArrayAlloc(filenames->n); // Array of masks
-                images->n = masks->n = weights->n = filenames->n;
                 for (int i = 0; i < filenames->n; i++) {
                     if (! filenames->data[i] || strlen(filenames->data[i]) == 0) {

trunk/ppMerge/src/ppMergeConfig.c

@@ -62 +62 @@
         files->data[i - 2] = psStringCopy(argv[i]);
     }
-    files->n = argc - 2;
     psMetadataAddPtr(config->arguments, PS_LIST_TAIL, "INPUT", PS_DATA_ARRAY,
                      "Array of inputs images", files);

trunk/ppMerge/src/ppMergeScaleZero.c

@@ -164 +164 @@
     if (options->scale) {
         gains = psVectorAlloc(data->numCells, PS_TYPE_F32);
-        gains->n = data->numCells;
     }
     if (options->darktime) {
@@ -246 +245 @@
                     int sampleSize = (image->numCols * image->numRows) / options->sample; // Size of sample
                     psVector *sample = psVectorAlloc(sampleSize, PS_TYPE_F32); // Sample of the image
-                    sample->n = sampleSize;
                     psVector *sampleMask = NULL; // Mask for sample
                     if (readout->mask) {
                         sampleMask = psVectorAlloc(sampleSize, PS_TYPE_U8);
-                        sampleMask->n = sampleSize;
                     }
                     psImage *mask = readout->mask; // The mask image