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

trunk/psModules/src/detrend/pmBias.c

@@ -14 +14 @@
 #include "pmFPAview.h"
 #include "pmFPACalibration.h"
+#include "pmDetrendThreads.h"
 
 #include "pmOverscan.h"
 #include "pmBias.h"
+
+bool pmBiasSubtractScan_Threaded (psThreadJob *job) {
+    pmReadout *in = job->args->data[0];
+    pmReadout *sub = job->args->data[1];
+    float scale  = PS_SCALAR_VALUE(job->args->data[2],F32);
+    int xOffset  = PS_SCALAR_VALUE(job->args->data[3],S32);
+    int yOffset  = PS_SCALAR_VALUE(job->args->data[4],S32);
+    int rowStart = PS_SCALAR_VALUE(job->args->data[5],S32);
+    int rowStop  = PS_SCALAR_VALUE(job->args->data[6],S32);
+    bool status = pmBiasSubtractScan (in, sub, scale, xOffset, yOffset, rowStart, rowStop);
+    return status;
+}
+
+bool pmBiasSubtractScan (pmReadout *in, pmReadout *sub, float scale, int xOffset, int yOffset, int rowStart, int rowStop) {
+
+    psImage *inImage  = in->image;      // The input image
+    psImage *inMask   = in->mask;       // The input mask
+    psImage *subImage = sub->image;     // The image to be subtracted
+    psImage *subMask  = sub->mask;      // The mask for the subtraction image
+
+    if (scale == 1.0) {
+        for (int i = rowStart; i < rowStop; i++) {
+            for (int j = 0; j < inImage->numCols; j++) {
+                inImage->data.F32[i][j] -= subImage->data.F32[i+yOffset][j+xOffset];
+                if (inMask && subMask) {
+                    inMask->data.U8[i][j] |= subMask->data.U8[i+yOffset][j+xOffset];
+                }
+            }
+        }
+    } else {
+        for (int i = rowStart; i < rowStop; i++) {
+            for (int j = 0; j < inImage->numCols; j++) {
+                inImage->data.F32[i][j] -= subImage->data.F32[i+yOffset][j+xOffset] * scale;
+                if (inMask && subMask) {
+                    inMask->data.U8[i][j] |= subMask->data.U8[i+yOffset][j+xOffset];
+                }
+            }
+        }
+    }
+    return true;
+}
 
 // pmBiasSubtractFrame(): this routine will take as input a readout for the input image and a readout for the bias
 // image.  The bias image is subtracted in place from the input image.
 bool pmBiasSubtractFrame(pmReadout *in, // Input readout
-                          const pmReadout *sub, // Readout to be subtracted from input
-                          float scale   // Scale to apply before subtracting
-                         )
+                         pmReadout *sub, // Readout to be subtracted from input
+                         float scale   // Scale to apply before subtracting
+    )
 {
     PS_ASSERT_PTR_NON_NULL(in, false);
@@ -36 +78 @@
 
     psImage *inImage  = in->image;      // The input image
-    psImage *inMask   = in->mask;       // The input mask
     psImage *subImage = sub->image;     // The image to be subtracted
-    psImage *subMask  = sub->mask;      // The mask for the subtraction image
 
     // Check parities
@@ -76 +116 @@
     }
 
-    if (scale == 1.0) {
-        for (int i = 0; i < inImage->numRows; i++) {
-            for (int j = 0; j < inImage->numCols; j++) {
-                inImage->data.F32[i][j] -= subImage->data.F32[i+y0in-y0sub][j+x0in-x0sub];
-                if (inMask && subMask) {
-                    inMask->data.U8[i][j] |= subMask->data.U8[i+y0in-y0sub][j+x0in-x0sub];
-                }
-            }
-        }
-    } else {
-        for (int i = 0; i < inImage->numRows; i++) {
-            for (int j = 0; j < inImage->numCols; j++) {
-                inImage->data.F32[i][j] -= subImage->data.F32[i+y0in-y0sub][j+x0in-x0sub] * scale;
-                if (inMask && subMask) {
-                    inMask->data.U8[i][j] |= subMask->data.U8[i+y0in-y0sub][j+x0in-x0sub];
-                }
-            }
-        }
+    int xOffset = x0in - x0sub;
+    int yOffset = y0in - y0sub;
+
+    bool threaded = true;
+    int scanRows = pmDetrendGetScanRows();
+    if (scanRows == 0) { 
+        threaded = false;
+        scanRows = inImage->numRows;
+    }
+
+    for (int rowStart = 0; rowStart < inImage->numRows; rowStart += scanRows) {
+      int rowStop = PS_MIN (rowStart + scanRows, inImage->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_BIAS");
+          psArrayAdd (job->args, 1, in);
+          psArrayAdd (job->args, 1, sub);
+          PS_ARRAY_ADD_SCALAR (job->args, scale, PS_TYPE_F32);
+          PS_ARRAY_ADD_SCALAR (job->args, xOffset, PS_TYPE_S32);
+          PS_ARRAY_ADD_SCALAR (job->args, yOffset, PS_TYPE_S32);
+          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 {
+          pmBiasSubtractScan (in, sub, scale, xOffset, yOffset, 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");
+
+        // each job records its own goodPixel values; sum them here
+        // we have only supplied one type of job, so we can assume the types here
+        psThreadJob *job = NULL;
+        while ((job = psThreadJobGetDone()) != NULL) {
+            psFree (job);
+        }
     }
 
@@ -100 +174 @@
 
 bool pmBiasSubtract(pmReadout *in, pmOverscanOptions *overscanOpts,
-                    const pmReadout *bias, const pmReadout *dark, const pmFPAview *view)
+                    pmReadout *bias, pmReadout *dark, const pmFPAview *view)
 {
     psTrace("psModules.detrend", 4,