Changeset 35687 for trunk/ppMerge/src

Timestamp:

Jun 20, 2013, 1:06:55 PM (13 years ago)

Author:

watersc1

Message:

Changes to ppMerge to allow it to gracefully skip a cell if there are no valid inputs for it.

Location:

trunk/ppMerge/src

Files:

• ppMergeLoop.c (modified) (1 diff)
• ppMergeReadChunk.c (modified) (5 diffs)

trunk/ppMerge/src/ppMergeLoop.c

@@ -355 +355 @@
                       // call: pmDarkCombine(outCell, fileGroup->readouts, iter, rej, maskVal);
                       if (!psThreadJobAddPending(job)) {
-                          goto ERROR;
+                        //                          goto ERROR;
+                        // continue; // I don't care.
                       }
                       break;

trunk/ppMerge/src/ppMergeReadChunk.c

@@ -24 +24 @@
                                               "INPUTS.VARIANCES");// Do we have variances?
     int rows = psMetadataLookupS32(NULL, config->arguments, "ROWS"); // Number of rows to read per chunk
-
+    int rejectedInputs = 0;
     // select an available fileGroup
     while (1) {
@@ -73 +73 @@
                         psWarning ("skipping video cell (1: %ld)", (long) pthread_self());
                         inRO->process = false;
+                        rejectedInputs++;
                         continue;
                     }
@@ -86 +87 @@
                         psWarning ("skipping video cell (2: %ld)", (long) pthread_self());
                         inRO->process = false;
+                        rejectedInputs++;
                         continue;
                     }
@@ -94 +96 @@
                     psWarning ("skipping video cell (3: %ld)", (long) pthread_self());
                     inRO->process = false;
+                    rejectedInputs++;
                     continue;
                 }
@@ -119 +122 @@
                     }
                 }
-
+                
                 // fprintf (stderr, "%lx, %lx, %lx\n", (long int) inRO->image, (long int) inRO->mask, (long int) inRO->variance);
-
-                if (!keepReading) {
-                    return NULL;
-                }
+                if (!keepReading) {
+                  return NULL;
+                }
+                
+                
             }
-
+            psLogMsg("ppMerge",PS_LOG_INFO,"%d %ld %d %d %d",
+                     j,readouts->n,rejectedInputs,fileGroup->read,fileGroup->busy);
+            if (rejectedInputs >= readouts->n) {
+              fileGroup->read = false;
+              fileGroup->busy = false;
+              return NULL;
+            }
+            
             fileGroup->read = fileGroup->busy = true;
             return fileGroup;