Changeset 17626

Timestamp:

May 9, 2008, 5:03:50 PM (18 years ago)

Author:

Paul Price

Message:

Attempting to kick out an input if we have trouble convolving it.

File:

• trunk/ppStack/src/ppStackLoop.c (modified) (9 diffs)

trunk/ppStack/src/ppStackLoop.c

@@ -307 +307 @@
     psArray *subRegions = psArrayAlloc(num); // Subtraction regions --- required in the stacking
     psRandom *rng = psRandomAlloc(PS_RANDOM_TAUS, 0); // Random number generator
+    int numGood = 0;                    // Number of good frames
     for (int i = 0; i < num; i++) {
         psTrace("ppStack", 2, "Convolving input %d of %d to target PSF....\n", i, num);
@@ -326 +327 @@
         psArray *regions = NULL, *kernels = NULL; // Regions and kernels used in subtraction
         if (!ppStackMatch(readout, &regions, &kernels, sources, targetPSF, rng, config)) {
-            psError(PS_ERR_UNKNOWN, false, "Unable to match image %d --- ignoring.", i);
-            psFree(sources);
-            psFree(targetPSF);
-            psFree(rng);
-            return false;
+            psErrorStackPrint(stderr, "Unable to match image %d --- ignoring.", i);
+            psErrorClear();
+            continue;
         }
 
@@ -345 +344 @@
         cells->data[i] = psMemIncrRefCounter(readout->parent);
         filesIterateUp(config);
+        numGood++;
     }
     psFree(sources);
     psFree(targetPSF);
     psFree(rng);
+
+    if (numGood == 0) {
+        psError(PS_ERR_UNKNOWN, false, "No good images to combine.");
+        return false;
+    }
 
 
@@ -374 +379 @@
         for (int i = 0; i < num; i++) {
             pmCell *cell = cells->data[i]; // Cell of interest
+            if (!cell) {
+                // Bad image
+                continue;
+            }
             pmReadout *ro = cell->readouts->data[0]; // Readout of interest
             if (!ro) {
@@ -387 +396 @@
         psArray *weightFits = psArrayAlloc(num);
         for (int i = 0; i < num; i++) {
+            if (!readouts->data[i]) {
+                // Bad image
+                continue;
+            }
             // Resolved names
             psString imageResolved = pmConfigConvertFilename(imageNames->data[i], config, false);
@@ -412 +425 @@
             for (int i = 0; i < num; i++) {
                 pmReadout *readout = readouts->data[i];
-                assert(readout);
+                if (!readout) {
+                    // Bad image
+                    continue;
+                }
 
                 if (!pmReadoutReadChunk(readout, imageFits->data[i], 0, numScans, overlap) ||
@@ -447 +463 @@
             for (int i = 0; i < num && more; i++) {
                 pmReadout *readout = readouts->data[i];
-                assert(readout);
+                if (!readout) {
+                    // Bad image
+                    continue;
+                }
                 more &= pmReadoutMore(readout, imageFits->data[i], 0, numScans);
                 more &= pmReadoutMoreMask(readout, maskFits->data[i], 0, numScans);
@@ -460 +479 @@
         for (int i = 0; i < num; i++) {
             pmReadout *ro = readouts->data[i]; // Readout of interest
+            if (!readout) {
+                // Bad image
+                numRejected++;
+                continue;
+            }
             psPixels *inspect = NULL;   // Inspection list for this readout
             psMetadataIterator *iter = psMetadataIteratorAlloc(ro->analysis, PS_LIST_HEAD,
@@ -575 +599 @@
         // Close up
         for (int i = 0; i < num; i++) {
+            if (!readouts->data[i]) {
+                continue;
+            }
             psFitsClose(imageFits->data[i]);
             psFitsClose(maskFits->data[i]);