Changeset 21236 for branches/pap_branch_20090128/ppStack/src/ppStackMatch.c

Timestamp:

Jan 29, 2009, 5:31:30 PM (17 years ago)

Author:

Paul Price

Message:

Changing 'weight' to 'variance'. Mostly propagating psModules changes.

File:

• branches/pap_branch_20090128/ppStack/src/ppStackMatch.c (modified) (4 diffs)

branches/pap_branch_20090128/ppStack/src/ppStackMatch.c

@@ -225 +225 @@
         }
 
-        // Read image, mask, weight
+        // Read image, mask, variance
         const char *tempImage = psMetadataLookupStr(NULL, recipe, "TEMP.IMAGE"); // Suffix for image
         const char *tempMask = psMetadataLookupStr(NULL, recipe, "TEMP.MASK"); // Suffix for mask
-        const char *tempWeight = psMetadataLookupStr(NULL, recipe, "TEMP.WEIGHT"); // Suffix for weight map
-        psString imageName = NULL, maskName = NULL, weightName = NULL; // Names for convolved images
+        const char *tempVariance = psMetadataLookupStr(NULL, recipe, "TEMP.VARIANCE"); // Suffix for variance map
+        psString imageName = NULL, maskName = NULL, varianceName = NULL; // Names for convolved images
         psStringAppend(&imageName, "%s.%d.%s", outName, numInput, tempImage);
         psStringAppend(&maskName, "%s.%d.%s", outName, numInput, tempMask);
-        psStringAppend(&weightName, "%s.%d.%s", outName, numInput, tempWeight);
+        psStringAppend(&varianceName, "%s.%d.%s", outName, numInput, tempVariance);
 
         if (!readImage(&readout->image, imageName, config) || !readImage(&readout->mask, maskName, config) ||
-            !readImage(&readout->weight, weightName, config)) {
+            !readImage(&readout->variance, varianceName, config)) {
             psError(PS_ERR_IO, false, "Unable to read previously produced image.");
             psFree(imageName);
             psFree(maskName);
-            psFree(weightName);
+            psFree(varianceName);
             return false;
         }
         psFree(imageName);
         psFree(maskName);
-        psFree(weightName);
+        psFree(varianceName);
     } else {
 #endif
@@ -383 +383 @@
                                                                                          "RENORM.STDEV"));
 
-                if (!pmReadoutWeightRenormPixels(readout, maskBad, renormMean, renormStdev, rng)) {
+                if (!pmReadoutVarianceRenormPixels(readout, maskBad, renormMean, renormStdev, rng)) {
                     psError(PS_ERR_UNKNOWN, false, "Unable to renormalise variances.");
                     psFree(output);
@@ -451 +451 @@
             psFree(readout->image);
             psFree(readout->mask);
-            psFree(readout->weight);
+            psFree(readout->variance);
             readout->image  = psMemIncrRefCounter(output->image);
             readout->mask   = psMemIncrRefCounter(output->mask);
-            readout->weight = psMemIncrRefCounter(output->weight);
+            readout->variance = psMemIncrRefCounter(output->variance);
         } else {
             // Fake the convolution
@@ -556 +556 @@
                                                                                  "RENORM.STDEV"));
 
-        if (!pmReadoutWeightRenormPixels(readout, maskBad, renormMean, renormStdev, rng)) {
+        if (!pmReadoutVarianceRenormPixels(readout, maskBad, renormMean, renormStdev, rng)) {
             psError(PS_ERR_UNKNOWN, false, "Unable to renormalise variances.");
             psFree(output);