Changeset 25027 for branches/pap/ppMerge/src/ppMergeScaleZero.c

Timestamp:

Aug 7, 2009, 4:08:25 PM (17 years ago)

Author:

Paul Price

Message:

Merging trunk (r25026) to get up-to-date on old branch.

Location:

branches/pap

Files:

• . (modified) (1 prop)
• ppMerge/src/ppMergeScaleZero.c (modified) (3 diffs)

branches/pap/ppMerge/src/ppMergeScaleZero.c

@@ -67 +67 @@
         pmChip *chip;                   ///< Chip of interest
         while ((chip = pmFPAviewNextChip(view, fpa, 1))) {
-            if (!chip->file_exists) {
-                continue;
-            }
+            if (!chip->process || !chip->file_exists) {
+                continue;
+            }
             if (!pmFPAfileIOChecks(config, view, PM_FPA_BEFORE)) {
                 goto ERROR;
@@ -76 +76 @@
             pmCell *cell;               ///< Cell of interest
             while ((cell = pmFPAviewNextCell(view, fpa, 1))) {
-                if (!cell->file_exists) {
-                    continue;
-                }
+                if (!cell->process || !cell->file_exists) {
+                    continue;
+                }
                 if (!pmFPAfileIOChecks(config, view, PM_FPA_BEFORE)) {
                     goto ERROR;
@@ -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