Changeset 19086

Timestamp:

Aug 16, 2008, 12:35:47 PM (18 years ago)

Author:

eugene

Message:

test for valid image on each readout

File:

• trunk/psModules/src/imcombine/pmReadoutCombine.c (modified) (2 diffs)

trunk/psModules/src/imcombine/pmReadoutCombine.c

@@ -63 +63 @@
                 "ROBUST_MEDIAN, FITTED_MEAN or CLIPPED_MEAN.\n");
         return false;
-    }
-
-    // weights exist if weights desired?
-    for (int i = 0; i < inputs->n; i++) {
-        pmReadout *readout = inputs->data[i]; // Readout of interest
-        if (params->weights && !readout->weight) {
-            psError(PS_ERR_UNEXPECTED_NULL, true,
-                    "Rejection based on weights requested, but no weights supplied for image %d.\n", i);
-            return false;
-        }
     }
 
@@ -179 +169 @@
     PS_ASSERT_FLOAT_WITHIN_RANGE(params->fracLow, 0.0, 1.0, false);
     PS_ASSERT_FLOAT_WITHIN_RANGE(params->fracHigh, 0.0, 1.0, false);
+
+    // does required/desired data exist?
+    for (int i = 0; i < inputs->n; i++) {
+        pmReadout *readout = inputs->data[i]; // Readout of interest
+        if (!readout->image) {
+            psError(PS_ERR_UNEXPECTED_NULL, true, "Image data is missing for image %d.\n", i);
+            return false;
+        }
+        if (params->weights && !readout->weight) {
+            psError(PS_ERR_UNEXPECTED_NULL, true,
+                    "Rejection based on weights requested, but no weights supplied for image %d.\n", i);
+            return false;
+        }
+    }
 
     pmHDU *hdu = pmHDUFromReadout(output); // Output HDU