Changeset 19432 for trunk/psModules/src/detrend/pmShutterCorrection.c

Timestamp:

Sep 8, 2008, 6:10:14 PM (18 years ago)

Author:

Paul Price

Message:

Discovered a problem with threaded implementation of pmDarkApply --- the polynomial is altered within pmDarkApplyScan, so it should not be global across threads. Checked and cleaned up the other threaded detrending functions.

File:

• trunk/psModules/src/detrend/pmShutterCorrection.c (modified) (6 diffs)

trunk/psModules/src/detrend/pmShutterCorrection.c

@@ -661 +661 @@
 
     psImage *image        = job->args->data[0];
-    psImage *shutterImage = job->args->data[1];
+    const psImage *shutterImage = job->args->data[1];
     psImage *mask         = job->args->data[2];
 
@@ -668 +668 @@
     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)
+    return pmShutterCorrectionApplyScan (image, shutterImage, mask, exptime, blank, rowStart, rowStop);
+}
+
+bool pmShutterCorrectionApplyScan(psImage *image, const psImage *shutterImage, psImage *mask, float exptime,
+                                  psMaskType blank, int rowStart, int rowStop)
 {
     for (int y = rowStart; y < rowStop; y++) {
@@ -753 +753 @@
             }
         }
-        psMetadataAddF32 (cell->concepts, PS_LIST_TAIL, "CELL.EXPOSURE", PS_META_REPLACE, "exposure time re-normalized to 1.0", 1.0); // Exposure time
+        psMetadataAddF32(cell->concepts, PS_LIST_TAIL, "CELL.EXPOSURE", PS_META_REPLACE,
+                         "exposure time re-normalized to 1.0", 1.0); // Exposure time
         psString line = NULL;
-        psStringAppend (&line, "extreme exposure time %f, re-normalized to 1.0", exptime);
+        psStringAppend(&line, "extreme exposure time %f, re-normalized to 1.0", exptime);
         psMetadataAddStr(hdu->header, PS_LIST_TAIL, "HISTORY", PS_META_DUPLICATE_OK, line, "");
-        psFree (line);
+        psFree(line);
     } else {
         for (int rowStart = 0; rowStart < image->numRows; rowStart += scanRows) {
@@ -764 +765 @@
             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)) {
+                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);
+
+                if (!psThreadJobAddPending(job)) {
                     psFree(job);
                     return false;
                 }
                 psFree(job);
-            } else {
-                pmShutterCorrectionApplyScan (image, shutterImage, mask, exptime, blank, rowStart, rowStop);
+            } else if (!pmShutterCorrectionApplyScan(image, shutterImage, mask, exptime, blank,
+                                                     rowStart, rowStop)) {
+                psError(PS_ERR_UNKNOWN, false, "Unable to apply shutter correction.");
+                psFree(shutterImage);
+                return false;
             }
         }
         if (threaded) {
             // wait here for the threaded jobs to finish
-            if (!psThreadPoolWait(false)) {
-                psError(PS_ERR_UNKNOWN, false, "Unable to interpolate image.");
+            if (!psThreadPoolWait(true)) {
+                psError(PS_ERR_UNKNOWN, false, "Unable to apply shutter correction.");
+                psFree(shutterImage);
                 return false;
-            }
-            fprintf (stderr, "success for threaded jobs\n");
-
-            // free the done jobs
-            psThreadJob *job = NULL;
-            while ((job = psThreadJobGetDone()) != NULL) {
-                psFree (job);
             }
         }
@@ -1024 +1021 @@
 }
 
-bool pmShutterCorrectionGeneratePrepare(pmReadout *shutter, pmReadout *pattern, const psArray *inputs, psMaskType maskVal)
+bool pmShutterCorrectionGeneratePrepare(pmReadout *shutter, pmReadout *pattern, const psArray *inputs,
+                                        psMaskType maskVal)
 {
     PS_ASSERT_PTR_NON_NULL(shutter, false);
@@ -1043 +1041 @@
     }
 
-    psImage *nums = pmReadoutSetAnalysisImage(shutter, PM_READOUT_STACK_ANALYSIS_COUNT, numCols, numRows, PS_TYPE_U16, 0); // Image with number fitted per pixel
+    psImage *nums = pmReadoutSetAnalysisImage(shutter, PM_READOUT_STACK_ANALYSIS_COUNT, numCols, numRows,
+                                              PS_TYPE_U16, 0); // Image with number fitted per pixel
     if (!nums) {
         return false;
     }
-    psImage *sigma = pmReadoutSetAnalysisImage(shutter, PM_READOUT_STACK_ANALYSIS_SIGMA, numCols, numRows, PS_TYPE_F32, NAN); // Image with stdev per pixel
+    psImage *sigma = pmReadoutSetAnalysisImage(shutter, PM_READOUT_STACK_ANALYSIS_SIGMA, numCols, numRows,
+                                               PS_TYPE_F32, NAN); // Image with stdev per pixel
     if (!sigma) {
         return false;