Changeset 19532 for trunk/psModules/src/imcombine/pmSubtraction.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/psModules/src/imcombine/pmSubtraction.c (modified) (3 diffs)

trunk/psModules/src/imcombine/pmSubtraction.c

@@ -665 +665 @@
 
 
-int pmSubtractionRejectStamps(float *rmsPtr, int *numPtr, pmSubtractionStampList *stamps,
-                              const psVector *deviations, psImage *subMask, float sigmaRej,
-                              int footprint)
-{
+int pmSubtractionRejectStamps(pmSubtractionKernels *kernels, pmSubtractionStampList *stamps,
+                              const psVector *deviations, psImage *subMask, float sigmaRej, int footprint)
+{
+    PM_ASSERT_SUBTRACTION_KERNELS_NON_NULL(kernels, false);
     PM_ASSERT_SUBTRACTION_STAMP_LIST_NON_NULL(stamps, -1);
     PS_ASSERT_VECTOR_NON_NULL(deviations, -1);
@@ -678 +678 @@
     // the distribution is actually something like a chi^2 or Student's t, both of which become Gaussian-like
     // with large N.  Therefore, let's just treat this as a Gaussian distribution.
+
+    kernels->mean = NAN;
+    kernels->rms = NAN;
+    kernels->numStamps = -1;
 
     int numStamps = 0;                  // Number of used stamps
@@ -721 +725 @@
     psTrace("psModules.imcombine", 1, "RMS deviation: %f\n", rms);
 
-    if (rmsPtr) {
-        *rmsPtr = rms;
-    }
-    if (numPtr) {
-        *numPtr = numStamps;
-    }
-
-    psLogMsg("psModules.imcombine", PS_LOG_INFO, "RMS deviation from %d stamps: %lf", numStamps, rms);
+    kernels->mean = mean;
+    kernels->rms = rms;
+    kernels->numStamps = numStamps;
+
+    psLogMsg("psModules.imcombine", PS_LOG_INFO, "Mean deviation from %d stamps: %lf +/- %lf",
+             numStamps, mean, rms);
 
     if (!isfinite(sigmaRej) || sigmaRej <= 0.0) {
-        // User just wanted to calculate and record the RMS for posterity
+        // User just wanted to calculate and record the deviation for posterity
         return 0;
     }