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

trunk/psModules/src/imcombine/pmSubtractionMatch.c

@@ -370 +370 @@
             memCheck("kernels");
 
-            float rmsStamps = NAN;      // RMS for stamps
-            int numStamps = 0;          // Number of good stamps
             int numRejected = -1;       // Number of rejected stamps in each iteration
             for (int k = 0; k < iter && numRejected != 0; k++) {
@@ -407 +405 @@
 
                 psTrace("psModules.imcombine", 3, "Rejecting stamps...\n");
-                numRejected = pmSubtractionRejectStamps(&rmsStamps, &numStamps, stamps, deviations,
-                                                        subMask, rej, footprint);
+                numRejected = pmSubtractionRejectStamps(kernels, stamps, deviations, subMask, rej, footprint);
                 if (numRejected < 0) {
                     psError(PS_ERR_UNKNOWN, false, "Unable to reject stamps.");
@@ -430 +427 @@
                     goto MATCH_ERROR;
                 }
-                pmSubtractionRejectStamps(&rmsStamps, &numStamps, stamps, deviations,
-                                          subMask, NAN, footprint);
+                pmSubtractionRejectStamps(kernels, stamps, deviations, subMask, NAN, footprint);
                 psFree(deviations);
             }
             psFree(stamps);
             stamps = NULL;
-
-            if (subMode == PM_SUBTRACTION_MODE_1 || subMode == PM_SUBTRACTION_MODE_DUAL) {
-                psMetadataAddS32(conv1->analysis, PS_LIST_TAIL, PM_SUBTRACTION_ANALYSIS_STAMPS_NUM,
-                                 PS_META_DUPLICATE_OK, "Number of good stamps", numStamps);
-                psMetadataAddF32(conv1->analysis, PS_LIST_TAIL, PM_SUBTRACTION_ANALYSIS_STAMPS_RMS,
-                                 PS_META_DUPLICATE_OK, "RMS deviation of stamps", rmsStamps);
-            }
-            if (subMode == PM_SUBTRACTION_MODE_2 || subMode == PM_SUBTRACTION_MODE_DUAL) {
-                psMetadataAddS32(conv2->analysis, PS_LIST_TAIL, PM_SUBTRACTION_ANALYSIS_STAMPS_NUM,
-                                 PS_META_DUPLICATE_OK, "Number of good stamps", numStamps);
-                psMetadataAddF32(conv2->analysis, PS_LIST_TAIL, PM_SUBTRACTION_ANALYSIS_STAMPS_RMS,
-                                 PS_META_DUPLICATE_OK, "RMS deviation of stamps", rmsStamps);
-            }
 
             memCheck("solution");