Changeset 18893 for trunk/psModules/src/detrend/pmShutterCorrection.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/pmShutterCorrection.c (modified) (4 diffs)

trunk/psModules/src/detrend/pmShutterCorrection.c

@@ -14 +14 @@
 #include "pmConceptsAverage.h"
 #include "pmReadoutStack.h"
+#include "pmDetrendThreads.h"
 
 #include "pmShutterCorrection.h"
@@ -655 +656 @@
 
 
+bool pmShutterCorrectionApplyScan_Threaded (psThreadJob *job) {
+    psImage *image        = job->args->data[0];
+    psImage *shutterImage = job->args->data[1];
+    psImage *mask         = job->args->data[2];
+
+    float exptime    = PS_SCALAR_VALUE(job->args->data[3],F32);
+    psMaskType blank = PS_SCALAR_VALUE(job->args->data[4],U8);
+    int rowStart     = PS_SCALAR_VALUE(job->args->data[5],S32);
+    int rowStop      = PS_SCALAR_VALUE(job->args->data[6],S32);
+    bool status = pmShutterCorrectionApplyScan (image, shutterImage, mask, exptime, blank, rowStart, rowStop);
+    return status;
+}
+
+bool pmShutterCorrectionApplyScan(psImage *image, psImage *shutterImage, psImage *mask, float exptime, psMaskType blank, int rowStart, int rowStop)
+{
+    for (int y = rowStart; y < rowStop; y++) {
+        for (int x = 0; x < image->numCols; x++) {
+            if (mask && !isfinite(shutterImage->data.F32[y][x])) {
+                mask->data.PS_TYPE_MASK_DATA[y][x] |= blank;
+                image->data.F32[y][x] = NAN;
+                continue;
+            }
+            image->data.F32[y][x] *= exptime / (exptime + shutterImage->data.F32[y][x]);
+        }
+    }
+    return true;
+}
+
 bool pmShutterCorrectionApply(pmReadout *readout, const pmReadout *shutter, psMaskType blank)
 {
@@ -700 +729 @@
     psImage *image = readout->image;    // Image to correct
     psImage *mask = readout->mask;      // Corresponding mask
+
+    bool threaded = true;
+    int scanRows = pmDetrendGetScanRows();
+    if (scanRows == 0) { 
+        threaded = false;
+        scanRows = image->numRows;
+    }
 
     if (exptime <= 0.0) {
@@ -720 +756 @@
         psFree (line);
     } else {
-        for (int y = 0; y < image->numRows; y++) {
-            for (int x = 0; x < image->numCols; x++) {
-                if (mask && !isfinite(shutterImage->data.F32[y][x])) {
-                    mask->data.PS_TYPE_MASK_DATA[y][x] |= blank;
-                    image->data.F32[y][x] = NAN;
-                    continue;
-                }
-                image->data.F32[y][x] *= exptime / (exptime + shutterImage->data.F32[y][x]);
-            }
-        }
+        for (int rowStart = 0; rowStart < image->numRows; rowStart += scanRows) {
+            int rowStop = PS_MIN (rowStart + scanRows, 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_SHUTTER");
+                psArrayAdd (job->args, 1, image);
+                psArrayAdd (job->args, 1, shutterImage);
+                psArrayAdd (job->args, 1, mask);
+                PS_ARRAY_ADD_SCALAR (job->args, exptime, PS_TYPE_F32);
+                PS_ARRAY_ADD_SCALAR (job->args, blank, PS_TYPE_MASK);
+                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 {
+                pmShutterCorrectionApplyScan (image, shutterImage, mask, exptime, blank, 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);
+            }
+        }
     }
     psFree(shutterImage);