Changeset 24797

Timestamp:

Jul 14, 2009, 6:39:45 PM (17 years ago)

Author:

eugene

Message:

check for rows == 0 and threads non-zero

File:

• trunk/ppMerge/src/ppMergeLoop.c (modified) (2 diffs)

trunk/ppMerge/src/ppMergeLoop.c

@@ -204 +204 @@
             }
 
+            int rows = psMetadataLookupS32(NULL, config->arguments, "ROWS"); // Number of rows to read per chunk
+            if (!rows && nThreads) {
+              psError(PS_ERR_UNKNOWN, false, "Invalid combination of threads > 0 and ROWS == 0 (ie, multiple threads working on the full array...)");
+              goto ERROR;
+            }
+
             ppMergeFileGroup *fileGroup = NULL;
             psArray *fileGroups = psArrayAlloc(nThreads + 1);
@@ -213 +219 @@
                     pmFPAfile *input = pmFPAfileSelectSingle(config->files, "PPMERGE.INPUT", j);
                     pmCell *inCell = pmFPAviewThisCell(view, input->fpa); ///< Input cell
-                    readouts->data[j] = pmReadoutAlloc(inCell);
+                    pmReadout *readout = pmReadoutAlloc(inCell);
+                    readout->process = true; // until proven otherwise, attempt to process this readout
+                    readouts->data[j] = readout;
                 }