Changeset 14482 for trunk/ppSub/src/ppSubReadout.c

Timestamp:

Aug 13, 2007, 4:37:47 PM (19 years ago)

Author:

Paul Price

Message:

Adapting for API changes to pmSubtraction* --- stamps now include
'kernels' that are the postage stamps for calculating the
least-squares equation. This change is necessary in order to support
the ability for the image subtraction code to convolve to a target
PSF.

File:

• trunk/ppSub/src/ppSubReadout.c (modified) (2 diffs)

trunk/ppSub/src/ppSubReadout.c

@@ -123 +123 @@
     float xRegionSize = 0, yRegionSize = 0; // Size of iso-kernel regions
     psRegion *region = NULL;            // Iso-kernel region
-    if (isfinite(regionSize)) {
+    if (isfinite(regionSize) || regionSize == 0.0) {
         xRegions = numCols / regionSize + 1;
         yRegions = numRows / regionSize + 1;
@@ -158 +158 @@
                 memCheck("  find stamps");
 
+                psTrace("ppSub", 3, "Extracting stamps...\n");
+                if (!pmSubtractionExtractStamps(stamps, refRO->image, inRO->image, inRO->weight,
+                                                footprint, kernels)) {
+                    psError(PS_ERR_UNKNOWN, false, "Unable to extract stamps.");
+                    goto ERROR;
+                }
+
+                memCheck("   extract stamps");
+
                 psTrace("ppSub", 3, "Calculating equation...\n");
-                if (!pmSubtractionCalculateEquation(stamps, refRO->image, inRO->image, inRO->weight,
-                                                    kernels, footprint)) {
+                if (!pmSubtractionCalculateEquation(stamps, kernels, footprint)) {
                     psError(PS_ERR_UNKNOWN, false, "Unable to calculate least-squares equation.");
                     goto ERROR;