Changeset 41805 for branches/eam_branches/ipp-dev-20210817/ppImage/src/ppImageDetrendPattern.c

Timestamp:

Sep 6, 2021, 10:24:58 AM (5 years ago)

Author:

eugene

Message:

add threading to pattern detrending

File:

• branches/eam_branches/ipp-dev-20210817/ppImage/src/ppImageDetrendPattern.c (modified) (3 diffs)

branches/eam_branches/ipp-dev-20210817/ppImage/src/ppImageDetrendPattern.c

@@ -52 +52 @@
 
         pmFPAfile *input = psMetadataLookupPtr(&status, config->files, "PPIMAGE.INPUT");
+
         pmFPAview *view = pmFPAviewAlloc(0); // View for local processing
         *view = *inputView;
@@ -79 +80 @@
                 ESCAPE(false, "Unable to determine whether row pattern matching should be applied.");
             }
-            //psWarning ("Row: %d\n", doPattern);
             if (!doPattern) continue;
 
-            // A very detailed log message. 
-            const char *chipName = psMetadataLookupStr(NULL, chip->concepts, "CHIP.NAME");
-            const char *cellName = psMetadataLookupStr(NULL, cell->concepts, "CELL.NAME");
-            psLogMsg("ppImage", PS_LOG_INFO, "Performing row pattern correction for %s, %s\n", chipName, cellName);
-
-            // process each of the readouts
-            pmReadout *readout;         // Readout from cell
-            while ((readout = pmFPAviewNextReadout (view, input->fpa, 1)) != NULL) {
-                if (!pmFPAfileIOChecks(config, view, PM_FPA_BEFORE)) {
-                    ESCAPE(false, "load failure for Readout");
-                }
-                if (!readout->data_exists) {
-                    continue;
-                }
-
-                // Perform pattern correction
-                if (!pmPatternRow(readout, options->patternRowOrder, options->patternRowIter,
-                                  options->patternRowRej, options->patternRowThresh, options->patternRowMean,
-                                  options->patternRowStdev, options->maskValue, options->darkMask)) {
-                    psFree(view);
-                    return(false);
-                }
-            }
-
-        }
+            // switch to test threaded version
+            if (true) {
+                // I need to allocate a view here to be freed by the
+                // called function below.  
+                pmFPAview *myView = pmFPAviewAlloc(0); // View for local processing
+                *myView = *view;
+
+                // allocate a job, construct the arguments for this job
+                psThreadJob *job = psThreadJobAlloc("PPIMAGE_PATTERN_ROW_CELL");
+                psArrayAdd(job->args, 1, config);
+                psArrayAdd(job->args, 1, input->fpa);
+                psArrayAdd(job->args, 1, chip);
+                psArrayAdd(job->args, 1, cell);
+                psArrayAdd(job->args, 1, myView);
+                psArrayAdd(job->args, 1, options);
+                if (!psThreadJobAddPending(job)) {
+                    return false;
+                }
+            } else {
+                // bump the counter since it must be freed by the function below.  
+                psMemIncrRefCounter (view); // View for local processing
+                if (!ppImageDetrendPatternApplyCell (config, input->fpa, chip, cell, view, options)) {
+                    return false;
+                }
+            }
+
+        }
+
+        // wait here for the threaded jobs to finish
+        // if no threads are allocated, this 
+        if (!psThreadPoolWait(true, true)) {
+            psError(PS_ERR_UNKNOWN, false, "Unable to apply bias correction.");
+            return false;
+        }
+
         psMetadataAddBool(hdu->header, PS_LIST_TAIL, "PTRN_ROW",PS_META_REPLACE,"PATTERN.ROW correction applied",true);
         psFree(view);
@@ -266 +276 @@
     return false;
 }
+
+bool ppImageDetrendPatternApplyCell (pmConfig *config, pmFPA *fpa, pmChip *chip, pmCell *cell, const pmFPAview *view, const ppImageOptions *options) {
+  
+    // A very detailed log message. 
+    const char *chipName = psMetadataLookupStr(NULL, chip->concepts, "CHIP.NAME");
+    const char *cellName = psMetadataLookupStr(NULL, cell->concepts, "CELL.NAME");
+    psLogMsg("ppImage", PS_LOG_INFO, "Performing row pattern correction for %s, %s\n", chipName, cellName);
+
+    // process each of the readouts
+    pmReadout *readout;         // Readout from cell
+    while ((readout = pmFPAviewNextReadout (view, fpa, 1)) != NULL) {
+        if (!pmFPAfileIOChecks(config, view, PM_FPA_BEFORE)) {
+            ESCAPE(false, "load failure for Readout");
+        }
+        if (!readout->data_exists) {
+            continue;
+        }
+
+        // Perform pattern correction
+        if (!pmPatternRow(readout, options->patternRowOrder, options->patternRowIter,
+                          options->patternRowRej, options->patternRowThresh, options->patternRowMean,
+                          options->patternRowStdev, options->maskValue, options->darkMask)) {
+            psFree (view);
+            return(false);
+        }
+    }
+    psFree (view); // supplied view must be freeable
+}