Changeset 26332 for branches/eam_branches/20091201/psModules/src/imcombine/pmSubtractionVisual.c

Timestamp:

Dec 3, 2009, 12:20:59 PM (17 years ago)

Author:

eugene

Message:

add code to calculate norm separately from kernel coeffs

File:

• branches/eam_branches/20091201/psModules/src/imcombine/pmSubtractionVisual.c (modified) (7 diffs)

branches/eam_branches/20091201/psModules/src/imcombine/pmSubtractionVisual.c

@@ -263 +263 @@
 static psImage *targetImage      = NULL;
 static psImage *residualImage    = NULL;
+static psImage *fresidualImage   = NULL;
 static psImage *differenceImage  = NULL;
 static psImage *convolutionImage = NULL;
@@ -289 +290 @@
     targetImage      = psImageAlloc (NXpix, NYpix, PS_TYPE_F32);
     residualImage    = psImageAlloc (NXpix, NYpix, PS_TYPE_F32);
+    fresidualImage   = psImageAlloc (NXpix, NYpix, PS_TYPE_F32);
     differenceImage  = psImageAlloc (NXpix, NYpix, PS_TYPE_F32);
     convolutionImage = psImageAlloc (NXpix, NYpix, PS_TYPE_F32);
@@ -295 +297 @@
     psImageInit (targetImage,      0.0);
     psImageInit (residualImage,    0.0);
+    psImageInit (fresidualImage,   0.0);
     psImageInit (differenceImage,  0.0);
     psImageInit (convolutionImage, 0.0);
@@ -343 +346 @@
         for (int x = -footprint; x <= footprint; x++) {
             residualImage->data.F32[y + NYpix][x + NXpix] = target->kernel[y][x] - background - source->kernel[y][x] * norm + convolution->kernel[y][x];
+        }
+    }
+
+    // insert the (fresidual) kernel into the (fresidual) image:
+    for (int y = -footprint; y <= footprint; y++) {
+        for (int x = -footprint; x <= footprint; x++) {
+            fresidualImage->data.F32[y + NYpix][x + NXpix] = residualImage->data.F32[y + NYpix][x + NXpix] / target->kernel[y][x];
         }
     }
@@ -358 +368 @@
     pmVisualScaleImage(kapa1, convolutionImage, "Convolution Stamps", 2, true);
 
+    // pmVisualScaleImage(kapa2, fresidualImage, "Frac Residual Stamps", 2, true);
+    pmVisualScaleImage(kapa2, residualImage, "Residual Stamps", 1, true);
     pmVisualScaleImage(kapa2, differenceImage, "Difference Stamps", 0, true);
-    pmVisualScaleImage(kapa2, residualImage, "Residual Stamps", 1, true);
     pmVisualAskUser(NULL);
 
@@ -367 +378 @@
     psFree(differenceImage);
     psFree(residualImage);
+    psFree(fresidualImage);
 
     targetImage = NULL;
@@ -373 +385 @@
     differenceImage = NULL;
     residualImage = NULL;
+    fresidualImage = NULL;
 
     return true;