Changeset 26703 for branches/eam_branches/20091201/ppStack/src/ppStackMatch.c

Timestamp:

Jan 28, 2010, 4:16:19 AM (16 years ago)

Author:

Paul Price

Message:

Solve for the normalisation of the convolution kernel completely separately from that of the other kernel terms. We use a 'normalisation window', basically an aperture in which we measure the flux of the stamps to determine the normalisation value. This introduces a new recipe parameter, NORM.FRAC, which is the fraction of the total in the window at which we set the normalisation window/aperture. The quality of the result seems to be rather sensitive to this value. Also found a bug in the imposition of the penalty function in dual convolution mode: it wasn't being set for the second solution part. This seems to produce decent dual convolution subtractions.

File:

• branches/eam_branches/20091201/ppStack/src/ppStackMatch.c (modified) (2 diffs)

branches/eam_branches/20091201/ppStack/src/ppStackMatch.c

@@ -298 +298 @@
             float rej = psMetadataLookupF32(NULL, ppsub, "REJ"); // Rejection threshold
             float kernelError = psMetadataLookupF32(NULL, ppsub, "KERNEL.ERR"); // Relative systematic error in kernel
+            float normFrac = psMetadataLookupF32(NULL, recipe, "NORM.FRAC"); // Fraction of window for normalisn windw
             float sysError = psMetadataLookupF32(NULL, ppsub, "SYS.ERR"); // Relative systematic error in images
             float skyErr = psMetadataLookupF32(NULL, ppsub, "SKY.ERR"); // Additional error in sky
@@ -444 +445 @@
                                         threshold, stampSources, stampsName, type, size, order, widthsCopy,
                                         orders, inner, ringsOrder, binning, penalty,
-                                        optimum, optWidths, optOrder, optThresh, iter, rej, sysError, skyErr,
-                                        kernelError, maskVal, maskBad, maskPoor, poorFrac, badFrac,
-                                        PM_SUBTRACTION_MODE_2)) {
+                                        optimum, optWidths, optOrder, optThresh, iter, rej, normFrac,
+                                        sysError, skyErr, kernelError, maskVal, maskBad, maskPoor,
+                                        poorFrac, badFrac, PM_SUBTRACTION_MODE_2)) {
                     psError(PS_ERR_UNKNOWN, false, "Unable to match images.");
                     psFree(fake);