Changeset 19532 for trunk/ppStack/src/ppStackReadout.c

Timestamp:

Sep 11, 2008, 6:12:42 PM (18 years ago)

Author:

Paul Price

Message:

Correcting stack variances for the imperfect convolution. Changed (again) the way the deviations are calculated; they're now straight chi^{2, which allows us to estimate how the variance factor needs to be changed in order to correct for it. Moving additional values into pmSubtractionKernels so that this can be calculated from a kernel that has been read in (very useful for debugging, also nice to have a record of the quality of the fit).}

File:

• trunk/ppStack/src/ppStackReadout.c (modified) (5 diffs)

trunk/ppStack/src/ppStackReadout.c

@@ -22 +22 @@
     psArray *subRegions = args->data[3]; // Regions for PSF-matching
     psArray *subKernels = args->data[4]; // Kernels for PSF-matching
-
-    psArray *inspect = ppStackReadoutInitial(config, outRO, thread->readouts, subRegions, subKernels);
+    psVector *addVariance = args->data[5]; // Additional variance when rejecting
+
+    psArray *inspect = ppStackReadoutInitial(config, outRO, thread->readouts,
+                                             subRegions, subKernels, addVariance);
 
     job->results = inspect;
@@ -75 +77 @@
 
 psArray *ppStackReadoutInitial(const pmConfig *config, pmReadout *outRO, const psArray *readouts,
-                               const psArray *regions, const psArray *kernels)
+                               const psArray *regions, const psArray *kernels, const psVector *addVariance)
 {
     assert(config);
@@ -84 +86 @@
     assert(readouts->n == regions->n);
     assert(regions->n == kernels->n);
+    assert(addVariance && addVariance->n == readouts->n && addVariance->type.type == PS_TYPE_F32);
     static int sectionNum = 0;          // Section number; for debugging outputs
 
@@ -127 +130 @@
         }
 
-        stack->data[i] = pmStackDataAlloc(ro, weighting);
+        stack->data[i] = pmStackDataAlloc(ro, weighting, addVariance->data.F32[i]);
     }
 
@@ -221 +224 @@
         }
 
-        pmStackData *data = pmStackDataAlloc(ro, weighting);
+        pmStackData *data = pmStackDataAlloc(ro, weighting, NAN);
         data->reject = psMemIncrRefCounter(rejected->data[i]);
         stack->data[i] = data;