Changeset 18969

Timestamp:

Aug 8, 2008, 9:00:55 AM (18 years ago)

Author:

eugene

Message:

skipping video cells

Files:

• branches/eam_branch_20080719/psModules/src/camera/pmFPAMosaic.c (modified) (2 diffs)
• trunk/ppImage/src/ppImageDetrendFringe.c (modified) (2 diffs)
• trunk/ppImage/src/ppImageLoop.c (modified) (1 diff)
• trunk/ppStats/src/ppStatsChip.c (modified) (1 diff)

branches/eam_branch_20080719/psModules/src/camera/pmFPAMosaic.c

@@ -580 +580 @@
     }
 
+    if (cell->readouts->n > 1) {
+        psWarning("Cell contains more than one readout (%ld) --- skipping.\n", cell->readouts->n);
+        return true;
+    }
+
     // Expand the arrays and vectors to handle new data
     long index = images->n;               // The index to use
@@ -703 +708 @@
     // Add the readout to the array of images to be mosaicked
     psArray *readouts = cell->readouts; // The array of readouts
-    if (readouts->n > 1) {
-        psWarning("Cell contains more than one readout (%ld) --- only the first will be mosaicked.\n",
-                  readouts->n);
-    }
     pmReadout *readout = readouts->data[0]; // The only readout we'll bother with
 

trunk/ppImage/src/ppImageDetrendFringe.c

@@ -93 +93 @@
     for (int i = 0; i < cells->n; i++) {
         pmCell *cell = cells->data[i];  // Cell of interest
+
+        // XXX for now, skip the video cells (cell->readouts->n > 1)
+        if (cell->readouts->n > 1) {
+          psWarning ("Skipping Video Cell for ppImageDetrendFringe.c:getFringes");
+          continue;
+        }
+
         fringes->data[i] = psMemIncrRefCounter(psMetadataLookupPtr(NULL, cell->analysis, source));
     }
@@ -320 +327 @@
         }
 
+        // XXX for now, skip the video cells (cell->readouts->n > 1)
+        if (cell->readouts->n > 1) {
+          psWarning ("Skipping Video Cell for ppImageDetrendFringeApply");
+          continue;
+        }
+
         if (!ppImageDetrendFringeGenerate(cell, fringeCell, options)) {
             psError(PS_ERR_UNKNOWN, false, "failed to apply fringe image.\n");

trunk/ppImage/src/ppImageLoop.c

@@ -64 +64 @@
             }
 
+            // XXX for now, skip the video cells (cell->readouts->n > 1)
+            if (cell->readouts->n > 1) {
+              psWarning ("Skipping Video Cell for ppImageDetrendReadout");
+              continue;
+            }
 
             // process each of the readouts

trunk/ppStats/src/ppStatsChip.c

@@ -75 +75 @@
         if ((view->cell >= 0) && (i != view->cell)) continue;
         pmCell *cell = cells->data[i];  // Cell of interest
+
+        // XXX for now, skip the video cells (cell->readouts->n > 1)
+        if (cell->readouts->n > 1) {
+          psWarning ("Skipping Video Cell for ppStatsCell");
+          continue;
+        }
+
         psExit result = ppStatsCell(chipResults, cell, fits, view, data, config);
         if (result != PS_EXIT_SUCCESS) {