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

branches/pap_branch_20090128/ppStack/src/ppStackThread.c

@@ -38 +38 @@
         psFitsClose(stack->imageFits->data[i]);
         psFitsClose(stack->maskFits->data[i]);
-        psFitsClose(stack->weightFits->data[i]);
-        stack->imageFits->data[i] = stack->maskFits->data[i] = stack->weightFits->data[i] = NULL;
+        psFitsClose(stack->varianceFits->data[i]);
+        stack->imageFits->data[i] = stack->maskFits->data[i] = stack->varianceFits->data[i] = NULL;
     }
     psFree(stack->imageFits);
     psFree(stack->maskFits);
-    psFree(stack->weightFits);
+    psFree(stack->varianceFits);
     return;
 }
 
 ppStackThreadData *ppStackThreadDataSetup(const psArray *cells, const psArray *imageNames,
-                                          const psArray *maskNames, const psArray *weightNames,
+                                          const psArray *maskNames, const psArray *varianceNames,
                                           const pmConfig *config)
 {
@@ -54 +54 @@
     PS_ASSERT_ARRAYS_SIZE_EQUAL(cells, imageNames, NULL);
     PS_ASSERT_ARRAYS_SIZE_EQUAL(cells, maskNames, NULL);
-    PS_ASSERT_ARRAYS_SIZE_EQUAL(cells, weightNames, NULL);
+    PS_ASSERT_ARRAYS_SIZE_EQUAL(cells, varianceNames, NULL);
 
     ppStackThreadData *stack = psAlloc(sizeof(ppStackThreadData)); // Thread data, to return
@@ -64 +64 @@
     stack->imageFits  = psArrayAlloc(numInputs);
     stack->maskFits   = psArrayAlloc(numInputs);
-    stack->weightFits = psArrayAlloc(numInputs);
+    stack->varianceFits = psArrayAlloc(numInputs);
     for (int i = 0; i < numInputs; i++) {
         if (!cells->data[i]) {
@@ -73 +73 @@
         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);
         stack->imageFits->data[i] = psFitsOpen(imageResolved, "r");
         stack->maskFits->data[i] = psFitsOpen(maskResolved, "r");
-        stack->weightFits->data[i] = psFitsOpen(weightResolved, "r");
+        stack->varianceFits->data[i] = psFitsOpen(varianceResolved, "r");
         psFree(imageResolved);
         psFree(maskResolved);
-        psFree(weightResolved);
-        if (!stack->imageFits->data[i] || !stack->maskFits->data[i] || !stack->weightFits->data[i]) {
+        psFree(varianceResolved);
+        if (!stack->imageFits->data[i] || !stack->maskFits->data[i] || !stack->varianceFits->data[i]) {
             psError(PS_ERR_UNKNOWN, false, "Unable to open convolved files %s, %s, %s",
-                    (char*)imageNames->data[i], (char*)maskNames->data[i], (char*)weightNames->data[i]);
+                    (char*)imageNames->data[i], (char*)maskNames->data[i], (char*)varianceNames->data[i]);
             return false;
         }
@@ -156 +156 @@
                 // override the recorded last scan
                 ro->thisImageScan  = thread->firstScan;
-                ro->thisWeightScan = thread->firstScan;
+                ro->thisVarianceScan = thread->firstScan;
                 ro->thisMaskScan   = thread->firstScan;
                 ro->lastImageScan  = thread->lastScan;
                 ro->lastMaskScan   = thread->lastScan;
-                ro->lastWeightScan = thread->lastScan;
+                ro->lastVarianceScan = thread->lastScan;
                 ro->forceScan      = true;
 
                 psFits *imageFits  = stack->imageFits->data[i]; // FITS file for image
                 psFits *maskFits   = stack->maskFits->data[i]; // FITS file for mask
-                psFits *weightFits = stack->weightFits->data[i]; // FITS file for weight
+                psFits *varianceFits = stack->varianceFits->data[i]; // FITS file for variance
 
 
@@ -189 +189 @@
                 }
 
-                if (pmReadoutMoreWeight(ro, weightFits, 0, rows, config)) {
+                if (pmReadoutMoreVariance(ro, varianceFits, 0, rows, config)) {
                     keepReading = true;
-                    if (!pmReadoutReadChunkWeight(ro, weightFits, 0, rows, overlap, config)) {
-                        psError(PS_ERR_IO, false, "Unable to read chunk %d for file PPSTACK.INPUT.WEIGHT %d",
+                    if (!pmReadoutReadChunkVariance(ro, varianceFits, 0, rows, overlap, config)) {
+                        psError(PS_ERR_IO, false,
+                                "Unable to read chunk %d for file PPSTACK.INPUT.VARIANCE %d",
                                 numChunk, i);
                         *status = false;