Changeset 27839 for branches/simmosaic_branches/pswarp/src/pswarpTransformReadout.c

Timestamp:

May 3, 2010, 8:45:22 AM (16 years ago)

Author:

eugene

Message:

updates from trunk

Location:

branches/simmosaic_branches

Files:

• . (modified) (1 prop)
• pswarp/src/pswarpTransformReadout.c (modified) (5 diffs)

branches/simmosaic_branches/pswarp/src/pswarpTransformReadout.c

@@ -89 +89 @@
 
     if (!pmReadoutMaskNonfinite(input, pmConfigMaskGet("SAT", config))) {
-        psError(PS_ERR_UNKNOWN, false, "Unable to mask non-finite pixels in input.");
+        psError(psErrorCodeLast(), false, "Unable to mask non-finite pixels in input.");
         return false;
     }
@@ -107 +107 @@
         psImageInit(output->mask, maskBad);
     }
+
+    // Ensure threading is off for the covariance calculation, since we are threading on a different level.
+    psImageCovarianceSetThreads(false);
 
     // create jobs and supply them to the threads
@@ -126 +129 @@
             psArrayAdd(job->args, 1, args);
             if (!psThreadJobAddPending(job)) {
-                psError(PS_ERR_UNKNOWN, false, "Unable to warp image.");
+                psError(psErrorCodeLast(), false, "Unable to warp image.");
                 return false;
             }
@@ -137 +140 @@
     // wait here for the threaded jobs to finish
     if (!psThreadPoolWait (false)) {
-        psError(PS_ERR_UNKNOWN, false, "Unable to interpolate image.");
+        psError(psErrorCodeLast(), false, "Unable to interpolate image.");
         return false;
     }
@@ -178 +181 @@
         psTrace("pswarp.transform", 1, "No overlap\n");
     }
-
-    // Store the variance factor and number of good pixels
-    if (goodPixels > 0) {
-        // Variance factor: large factor --> small scale
-        float varFactor = psImageInterpolateVarianceFactor(input->image->numCols / 2.0 + input->image->col0,
-                                                           input->image->numRows / 2.0 + input->image->row0,
-                                                           interp->mode);
-        psMetadataItem *vfItem = psMetadataLookup(output->analysis, PSWARP_ANALYSIS_VARFACTOR);
-        if (vfItem) {
-            psMetadataItem *goodpixItem = psMetadataLookup(output->analysis, PSWARP_ANALYSIS_GOODPIX);
-            psAssert(goodpixItem, "It should be where we left it!");
-            psAssert(vfItem->type == PS_TYPE_F32 && goodpixItem->type == PS_TYPE_S64,
-                     "Should be the type we said.");
-
-            vfItem->data.F32 += varFactor * goodPixels;
-            goodpixItem->data.S64 += goodPixels;
-        } else {
-            psMetadataAddF32(output->analysis, PS_LIST_TAIL, PSWARP_ANALYSIS_VARFACTOR, 0,
-                             "Variance factor weighted by the good pixels", varFactor * goodPixels);
-            psMetadataAddS64(output->analysis, PS_LIST_TAIL, PSWARP_ANALYSIS_GOODPIX, 0,
-                             "Number of good pixels", goodPixels);
-        }
-    }
     psFree(interp);
 
     if (goodPixels > 0) {
         if (!pswarpTransformSources(output, input, config)) {
-            psError(PS_ERR_UNKNOWN, false, "Unable to interpolate image.");
+            psError(psErrorCodeLast(), false, "Unable to interpolate image.");
             return false;
         }