Changeset 24951 for branches/czw_branch/cleanup/ppMerge/src/ppMergeScaleZero.c

Timestamp:

Jul 30, 2009, 5:20:29 PM (17 years ago)

Author:

watersc1

Message:

Finished up my edits to the detrend cleanup, and some changes to my
copy of burntool and the pslib astrometry. Detrend cleanup has not
been tested yet. That's up next.

Location:

branches/czw_branch/cleanup

Files:

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

branches/czw_branch/cleanup/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