Changeset 21236 for branches/pap_branch_20090128/ppStack/src/ppStackLoop.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/ppStackLoop.c (modified) (7 diffs)

branches/pap_branch_20090128/ppStack/src/ppStackLoop.c

@@ -24 +24 @@
 
 // Files required for the convolution
-static char *convolveFiles[] = { "PPSTACK.INPUT", "PPSTACK.INPUT.MASK", "PPSTACK.INPUT.WEIGHT", NULL };
+static char *convolveFiles[] = { "PPSTACK.INPUT", "PPSTACK.INPUT.MASK", "PPSTACK.INPUT.VARIANCE", NULL };
 
 // Output files for the combination
-static char *combineFiles[] = { "PPSTACK.OUTPUT", "PPSTACK.OUTPUT.MASK", "PPSTACK.OUTPUT.WEIGHT",
+static char *combineFiles[] = { "PPSTACK.OUTPUT", "PPSTACK.OUTPUT.MASK", "PPSTACK.OUTPUT.VARIANCE",
                                 "PPSTACK.OUTPUT.JPEG1", "PPSTACK.OUTPUT.JPEG2", NULL };
 
@@ -204 +204 @@
     const char *tempImage = psMetadataLookupStr(NULL, recipe, "TEMP.IMAGE"); // Suffix for temporary images
     const char *tempMask = psMetadataLookupStr(NULL, recipe, "TEMP.MASK"); // Suffix for temporary masks
-    const char *tempWeight = psMetadataLookupStr(NULL, recipe, "TEMP.WEIGHT"); // Suffix for temp weight maps
-    if (!tempImage || !tempMask || !tempWeight) {
+    const char *tempVariance = psMetadataLookupStr(NULL, recipe, "TEMP.VARIANCE"); // Suffix for temp variance maps
+    if (!tempImage || !tempMask || !tempVariance) {
         psError(PS_ERR_BAD_PARAMETER_VALUE, false,
-                "Unable to find TEMP.IMAGE, TEMP.MASK and TEMP.WEIGHT in recipe");
+                "Unable to find TEMP.IMAGE, TEMP.MASK and TEMP.VARIANCE in recipe");
         return false;
     }
@@ -381 +381 @@
     psArray *imageNames = psArrayAlloc(num);
     psArray *maskNames = psArrayAlloc(num);
-    psArray *weightNames = psArrayAlloc(num);
+    psArray *varianceNames = psArrayAlloc(num);
     for (int i = 0; i < num; i++) {
-        psString imageName = NULL, maskName = NULL, weightName = NULL; // Names for convolved images
+        psString imageName = NULL, maskName = NULL, varianceName = NULL; // Names for convolved images
         psStringAppend(&imageName, "%s/%s.%d.%s", tempDir, tempName, i, tempImage);
         psStringAppend(&maskName, "%s/%s.%d.%s", tempDir, tempName, i, tempMask);
-        psStringAppend(&weightName, "%s/%s.%d.%s", tempDir, tempName, i, tempWeight);
-        psTrace("ppStack", 5, "Temporary files: %s %s %s\n", imageName, maskName, weightName);
+        psStringAppend(&varianceName, "%s/%s.%d.%s", tempDir, tempName, i, tempVariance);
+        psTrace("ppStack", 5, "Temporary files: %s %s %s\n", imageName, maskName, varianceName);
         imageNames->data[i] = imageName;
         maskNames->data[i] = maskName;
-        weightNames->data[i] = weightName;
+        varianceNames->data[i] = varianceName;
     }
     // Free the outputName that we grabbed above to set up tempName.
@@ -481 +481 @@
         writeImage(imageNames->data[i],  hdu->header, readout->image, config);
         writeImage(maskNames->data[i],   hdu->header, readout->mask, config);
-        writeImage(weightNames->data[i], hdu->header, readout->weight, config);
+        writeImage(varianceNames->data[i], hdu->header, readout->variance, config);
 
         pmCell *inCell = readout->parent; // Input cell
@@ -609 +609 @@
     // Start threading
     ppStackThreadInit();
-    ppStackThreadData *stack = ppStackThreadDataSetup(cells, imageNames, maskNames, weightNames, config);
+    ppStackThreadData *stack = ppStackThreadDataSetup(cells, imageNames, maskNames, varianceNames, config);
 
     psTimerStart("PPSTACK_INITIAL");
@@ -1023 +1023 @@
             psString imageResolved = pmConfigConvertFilename(imageNames->data[i], config, false, false);
             psString maskResolved = pmConfigConvertFilename(maskNames->data[i], config, false, false);
-            psString weightResolved = pmConfigConvertFilename(weightNames->data[i], config, false, false);
+            psString varianceResolved = pmConfigConvertFilename(varianceNames->data[i], config, false, false);
             if (unlink(imageResolved) == -1 || unlink(maskResolved) == -1 ||
-                unlink(weightResolved) == -1) {
+                unlink(varianceResolved) == -1) {
                 psWarning("Unable to delete temporary files for image %d", i);
             }
             psFree(imageResolved);
             psFree(maskResolved);
-            psFree(weightResolved);
+            psFree(varianceResolved);
         }
     }
     psFree(imageNames);
     psFree(maskNames);
-    psFree(weightNames);
+    psFree(varianceNames);
 
     psFree(inputMask);
@@ -1073 +1073 @@
         float renormWidth = psMetadataLookupS32(&mdok, recipe, "RENORM.WIDTH"); // Width of Gaussian phot
         psMaskType maskValue = pmConfigMaskGet("BLANK", config); // Bits to mask
-        if (!pmReadoutWeightRenormPhot(outRO, maskValue, renormNum, renormWidth,
-                                       renormMean, renormStdev, NULL)) {
+        if (!pmReadoutVarianceRenormPhot(outRO, maskValue, renormNum, renormWidth,
+                                         renormMean, renormStdev, NULL)) {
             psError(PS_ERR_UNKNOWN, false, "Unable to renormalise variances.");
             psFree(outRO);