Changeset 24782 for trunk/ppMerge/src/ppMergeScaleZero.c

Timestamp:

Jul 12, 2009, 5:44:35 PM (17 years ago)

Author:

eugene

Message:

various fringe fixes

File:

• trunk/ppMerge/src/ppMergeScaleZero.c (modified) (1 diff)

trunk/ppMerge/src/ppMergeScaleZero.c

@@ -87 +87 @@
                 }
 
+                // skip cells with video data
                 if (cell->readouts->n > 1) {
-                    psError(PS_ERR_BAD_PARAMETER_VALUE, true,
-                            "File %d chip %d cell %d contains more than one readout (%ld)",
-                            i, view->chip, view->cell, cell->readouts->n);
-                    goto ERROR;
+                  // psError(PS_ERR_BAD_PARAMETER_VALUE, true, "File %d chip %d cell %d contains more than one readout (%ld)", i, view->chip, view->cell, cell->readouts->n);
+                  // goto ERROR;
+                  psWarning("File %d chip %d cell %d contains more than one readout (%ld), skipping", i, view->chip, view->cell, cell->readouts->n);
+                  continue;
                 }
                 pmReadout *readout = cell->readouts->data[0]; ///< Readout of interest