Changeset 18893 for trunk/psModules/src/detrend/pmDark.c

Timestamp:

Aug 4, 2008, 3:24:47 PM (18 years ago)

Author:

eugene

Message:

adding threaded and unthreaded versions of the detrend application code; adding pmDetrendThreads functions for management

File:

• trunk/psModules/src/detrend/pmDark.c (modified) (3 diffs)

trunk/psModules/src/detrend/pmDark.c

@@ -11 +11 @@
 #include "pmFPAWrite.h"
 #include "pmReadoutStack.h"
+#include "pmDetrendThreads.h"
 
 #include "pmDark.h"
@@ -366 +367 @@
 }
 
-bool pmDarkApply(pmReadout *readout, const pmCell *dark, psMaskType bad)
+bool pmDarkApplyScan_Threaded (psThreadJob *job) {
+    pmReadout *readout   = job->args->data[0];
+    pmCell *dark         = job->args->data[1];
+    psPolynomialMD *poly = job->args->data[2];
+    psVector *values     = job->args->data[3];
+
+    psMaskType bad = PS_SCALAR_VALUE(job->args->data[4],U8);
+    bool doNorm    = PS_SCALAR_VALUE(job->args->data[5],U8);
+    float norm     = PS_SCALAR_VALUE(job->args->data[6],F32);
+    int rowStart   = PS_SCALAR_VALUE(job->args->data[7],S32);
+    int rowStop    = PS_SCALAR_VALUE(job->args->data[8],S32);
+    bool status = pmDarkApplyScan (readout, dark, poly, values, bad, doNorm, norm, rowStart, rowStop);
+    return status;
+}
+
+bool pmDarkApplyScan (pmReadout *readout, const pmCell *dark, psPolynomialMD *poly, psVector *values, psMaskType bad, bool doNorm, float norm, int rowStart, int rowStop) {
+
+    int numCols = readout->image->numCols;
+    int numTerms = dark->readouts->n;   // Number of polynomial terms
+
+    // thread here by scan
+    for (int y = rowStart; y < rowStop; y++) {
+        for (int x = 0; x < numCols; x++) {
+            for (int i = 0; i < numTerms; i++) {
+                pmReadout *ro = dark->readouts->data[i]; // Dark readout
+                poly->coeff->data.F64[i] = ro->image->data.F32[y][x];
+            }
+            float value = psPolynomialMDEval(poly, values); // Value of dark current
+            if (doNorm) {
+                value *= norm;
+            }
+            readout->image->data.F32[y][x] -= value;
+            if (readout->mask && !isfinite(value)) {
+                readout->mask->data.PS_TYPE_MASK_DATA[y][x] = bad;
+            }
+        }
+    }
+    return true;
+}
+
+bool pmDarkApply(pmReadout *readout, pmCell *dark, psMaskType bad)
 {
     PS_ASSERT_PTR_NON_NULL(readout, false);
@@ -433 +474 @@
     psFree(orders);
 
-    for (int y = 0; y < numRows; y++) {
-        for (int x = 0; x < numCols; x++) {
-            for (int i = 0; i < numTerms; i++) {
-                pmReadout *ro = dark->readouts->data[i]; // Dark readout
-                poly->coeff->data.F64[i] = ro->image->data.F32[y][x];
-            }
-            float value = psPolynomialMDEval(poly, values); // Value of dark current
-            if (doNorm) {
-                value *= norm;
-            }
-            readout->image->data.F32[y][x] -= value;
-            if (readout->mask && !isfinite(value)) {
-                readout->mask->data.PS_TYPE_MASK_DATA[y][x] = bad;
-            }
-        }
+    // thread here by scan
+
+    bool threaded = true;
+    int scanRows = pmDetrendGetScanRows();
+    if (scanRows == 0) { 
+        threaded = false;
+        scanRows = readout->image->numRows;
+    }
+
+    for (int rowStart = 0; rowStart < readout->image->numRows; rowStart += scanRows) {
+      int rowStop = PS_MIN (rowStart + scanRows, readout->image->numRows);
+
+# define PS_ARRAY_ADD_SCALAR(ARRAY, VALUE, TYPE) { \
+      psScalar *scalar = psScalarAlloc(VALUE, TYPE); \
+      psArrayAdd(ARRAY, 1, scalar); \
+      psFree (scalar); }
+      
+      if (threaded) {
+          // allocate a job, construct the arguments for this job
+          psThreadJob *job = psThreadJobAlloc ("PSMODULES_DETREND_DARK");
+          psArrayAdd (job->args, 1, readout);
+          psArrayAdd (job->args, 1, dark);
+          psArrayAdd (job->args, 1, poly);
+          psArrayAdd (job->args, 1, values);
+          PS_ARRAY_ADD_SCALAR (job->args, bad, PS_TYPE_MASK);
+          PS_ARRAY_ADD_SCALAR (job->args, doNorm, PS_TYPE_U8);
+          PS_ARRAY_ADD_SCALAR (job->args, norm, PS_TYPE_F32);
+          PS_ARRAY_ADD_SCALAR (job->args, rowStart, PS_TYPE_S32);
+          PS_ARRAY_ADD_SCALAR (job->args, rowStop, PS_TYPE_S32);
+
+          // ppImageDetrendReadout(config, options, view)
+          if (!psThreadJobAddPending (job)) {
+              return false;
+          }
+      } else {
+          pmDarkApplyScan (readout, dark, poly, values, bad, doNorm, norm, rowStart, rowStop);
+      }
+    }
+
+    if (threaded) {
+        // wait here for the threaded jobs to finish
+        if (!psThreadPoolWait ()) {
+            psError(PS_ERR_UNKNOWN, false, "Unable to interpolate image.");
+            return false;
+        }
+        fprintf (stderr, "success for threaded jobs\n");
+
+        // free the done jobs
+        psThreadJob *job = NULL;
+        while ((job = psThreadJobGetDone()) != NULL) {
+            psFree (job);
+        }
     }