Changeset 16907 for trunk/ppMerge/src/ppMergeCombine.c

Timestamp:

Mar 10, 2008, 9:11:57 AM (18 years ago)

Author:

Paul Price

Message:

Fixing logic error in iterating, which caused ppMerge to jump over all the chips in a MOSAIC2 camera.

File:

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

trunk/ppMerge/src/ppMergeCombine.c

@@ -124 +124 @@
     }
     while ((chip = pmFPAviewNextChip(view, fpa, 1))) {
-        if (!chip->hdu) {
-            continue;
-        }
-        // Data will exist soon
-        pmFPAUpdateNames(data->out, chip, NULL);
-        chip->data_exists = true;
+        if (chip->hdu) {
+            // Data will exist soon
+            pmFPAUpdateNames(data->out, chip, NULL);
+            chip->data_exists = true;
+        }
         pmChipWrite(chip, data->outFile, config->database, true, false); // Write header only
         pmCell *cell;                   // Cell of interest
         while ((cell = pmFPAviewNextCell(view, fpa, 1))) {
             cellNum++;
-            if (!cell->hdu) {
-                continue;
-            }
-            // Data will exist soon
-            pmFPAUpdateNames(data->out, chip, cell);
-            chip->data_exists = cell->data_exists = true;
+            if (cell->hdu) {
+                // Data will exist soon
+                pmFPAUpdateNames(data->out, chip, cell);
+                chip->data_exists = cell->data_exists = true;
+            }
             pmCellWrite(cell, data->outFile, config->database, true); // Write header only
             pmReadout *readout = pmReadoutAlloc(cell); // Output readout of interest