Changeset 14149 for trunk/ppStats/src/ppStatsCell.c

Timestamp:

Jul 11, 2007, 4:28:22 PM (19 years ago)

Author:

Paul Price

Message:

Don't complain if there's no data (hdu or readouts).

File:

• trunk/ppStats/src/ppStatsCell.c (modified) (5 diffs)

trunk/ppStats/src/ppStatsCell.c

@@ -2 +2 @@
 
 psExit ppStatsCell(psMetadata *chipResults, // Metadata holding the chip results
-                   pmCell *cell,        // Cell for which to get statistics
-                   psFits *fits,        // FITS file handle
-                   pmFPAview *view,  // View for analysis
-                   ppStatsData *data,   // The data
-                   const pmConfig *config // Configuration
+                   pmCell *cell,        // Cell for which to get statistics
+                   psFits *fits,        // FITS file handle
+                   pmFPAview *view,  // View for analysis
+                   ppStatsData *data,   // The data
+                   const pmConfig *config // Configuration
     )
 {
@@ -21 +21 @@
     }
 
+#if 0
     // select the header unit for this cell
     // XXX why is this needed for Cell but not Chip?
@@ -33 +34 @@
         }
     }
+#endif
 
     // Extract Header and Concept values from the Cell and Readout->analysis level
@@ -45 +47 @@
     // Extract Header values
     if (psListLength(data->headers)) {
-        // extract from existing headers
-        if (cell->hdu) {
-            if (fits && !pmCellReadHeader(cell, fits)) {
-                psError (PS_ERR_IO, false, "trouble reading cell header\n");
-                psFree(cellResults);
-                return PS_EXIT_DATA_ERROR;
-            }
-            pmHDU *hdu = cell->hdu;     // HDU for headers
-            p_ppStatsGetMetadata(cellResults, hdu->header, data->headers);
-        }
-        // extract from data->analysis output MD entries
-        if (psListLength(data->analysis)) {
-            p_ppStatsGetAnalysis (cellResults, data->headers, cell->analysis, data->analysis);
-        }
+        // extract from existing headers
+        if (cell->hdu) {
+            if (fits && !pmCellReadHeader(cell, fits)) {
+                psError (PS_ERR_IO, false, "trouble reading cell header\n");
+                psFree(cellResults);
+                return PS_EXIT_DATA_ERROR;
+            }
+            pmHDU *hdu = cell->hdu;     // HDU for headers
+            p_ppStatsGetMetadata(cellResults, hdu->header, data->headers);
+        }
+        // extract from data->analysis output MD entries
+        if (psListLength(data->analysis)) {
+            p_ppStatsGetAnalysis (cellResults, data->headers, cell->analysis, data->analysis);
+        }
     }
 
@@ -74 +76 @@
     // If we want to measure pixel statistics, we must read (or have) the pixel data
     if (data->doStats || psListLength(data->summary)) {
-        // Read the image pixel data
-        if (fits && !pmCellRead(cell, fits, config->database)) {
-            psError (PS_ERR_IO, false, "trouble reading cell data\n");
-            psFree(cellResults);
-            return PS_EXIT_DATA_ERROR;
-        }
+        // Read the image pixel data
+        if (fits && !pmCellRead(cell, fits, config->database)) {
+            psError (PS_ERR_IO, false, "trouble reading cell data\n");
+            psFree(cellResults);
+            return PS_EXIT_DATA_ERROR;
+        }
     }
 
     // check if we can legitimately iterate to the readout level
     psArray *readouts = cell->readouts; // Array of component readouts
-    if (readouts->n == 0) {
-        psLogMsg(__func__, PS_LOG_WARN, "No readouts present in cell %s --- skipping\n", cellName);
-    }
     if (view->readout >= readouts->n) {
-        psError(PS_ERR_BAD_PARAMETER_VALUE, true, "Desired readout view (%d) doesn't match "
-                "number of readouts (%ld)\n", view->readout, readouts->n);
-        return PS_EXIT_CONFIG_ERROR;
+        psError(PS_ERR_BAD_PARAMETER_VALUE, true, "Desired readout view (%d) doesn't match "
+                "number of readouts (%ld)\n", view->readout, readouts->n);
+        return PS_EXIT_CONFIG_ERROR;
     }
     if ((view->readout == -1) && (readouts->n > 1)) {
-        psLogMsg(__func__, PS_LOG_WARN, "Multiple readouts (%ld) present in cell %s\n", readouts->n, cellName);
+        psWarning("Multiple readouts (%ld) present in cell %s\n", readouts->n, cellName);
     }
 
     // Iterate over readouts
     for (int i = 0; i < readouts->n; i++) {
-        if ((view->readout >= 0) && (i != view->readout)) continue; 
+        if ((view->readout >= 0) && (i != view->readout)) continue;
         pmReadout *readout = readouts->data[i];  // Cell of interest
         psExit result = ppStatsReadout(cellResults, readout, i, data, config);