Changeset 23357 for trunk/ppStack/src/ppStackMatch.c

Timestamp:

Mar 17, 2009, 1:36:01 PM (17 years ago)

Author:

Paul Price

Message:

First attempt (untested) at reading input files from the RUN metadata, and using the precalculated PSF-matching kernel.

File:

• trunk/ppStack/src/ppStackMatch.c (modified) (1 diff)

trunk/ppStack/src/ppStackMatch.c

@@ -381 +381 @@
 
             // Do the image matching
-            if (!pmSubtractionMatch(output, NULL, readout, fake, footprint, stride, regionSize, spacing,
-                                    threshold, stampSources, stampsName, type, size, order, widths, orders,
-                                    inner, ringsOrder, binning, penalty, optimum, optWidths, optOrder,
-                                    optThresh, iter, rej, sysError, maskVal, maskBad, maskPoor, poorFrac,
-                                    badFrac, PM_SUBTRACTION_MODE_1)) {
-                psError(PS_ERR_UNKNOWN, false, "Unable to match images.");
-                psFree(fake);
-                psFree(optWidths);
-                psFree(stampSources);
-                psFree(output);
-                return false;
+            pmSubtractionKernels *kernel = psMetadataLookupPtr(&mdok, readout->analysis,
+                                                               PM_SUBTRACTION_ANALYSIS_KERNEL); // Conv kernel
+            if (kernel) {
+                if (!pmSubtractionMatchPrecalc(output, NULL, readout, fake, output->analysis,
+                                               stride, sysError, maskVal, maskBad, maskPoor,
+                                               poorFrac, badFrac)) {
+                    psError(PS_ERR_UNKNOWN, false, "Unable to convolve images.");
+                    psFree(fake);
+                    psFree(optWidths);
+                    psFree(stampSources);
+                    psFree(output);
+                    return false;
+                }
+            } else {
+                if (!pmSubtractionMatch(output, NULL, readout, fake, footprint, stride, regionSize, spacing,
+                                        threshold, stampSources, stampsName, type, size, order, widths,
+                                        orders, inner, ringsOrder, binning, penalty,
+                                        optimum, optWidths, optOrder, optThresh, iter, rej, sysError,
+                                        maskVal, maskBad, maskPoor, poorFrac, badFrac,
+                                        PM_SUBTRACTION_MODE_1)) {
+                    psError(PS_ERR_UNKNOWN, false, "Unable to match images.");
+                    psFree(fake);
+                    psFree(optWidths);
+                    psFree(stampSources);
+                    psFree(output);
+                    return false;
+                }
             }