Changeset 15809 for trunk/psModules/src/imcombine/pmSubtractionKernels.c

Timestamp:

Dec 13, 2007, 11:32:44 AM (18 years ago)

Author:

Paul Price

Message:

Updates trying to get dual-convolution to work. It doesn't yet.

File:

• trunk/psModules/src/imcombine/pmSubtractionKernels.c (modified) (4 diffs)

trunk/psModules/src/imcombine/pmSubtractionKernels.c

@@ -136 +136 @@
                         }
                     }
+                    preCalc->kernel[0][0] -= 1.0;
                 }
 
@@ -216 +217 @@
     }
 
-    // Subtract normalisation from all the others to maintain flux scaling
-    if (spatialOrder > 0) {
-        int numGaussians = fwhms->n;       // Number of Gaussians
-        for (int i = 0, index = 0; i < numGaussians; i++) {
-            for (int uOrder = 0; uOrder <= orders->data.S32[i]; uOrder++) {
-                for (int vOrder = 0; vOrder <= orders->data.S32[i] - uOrder; vOrder++, index++) {
-                    if (uOrder % 2 == 0 && vOrder % 2 == 0) {
-                        psKernel *kernel = kernels->preCalc->data[index]; // Kernel to subtract
-                        kernel->kernel[0][0] -= 1.0;
-                    }
-                }
-            }
-        }
-    }
-
     if (psTraceGetLevel("psModules.imcombine.kernel") >= 10) {
         for (int i = 0; i < kernels->num; i++) {
@@ -246 +232 @@
                 }
             }
-            psTrace("psModules.imcombine.kernel", 10, "Kernel %d sum: %lf\n", i, sum);
+            psTrace("psModules.imcombine.kernel", 10, "Kernel %d sum: %le\n", i, sum);
         }
     }
@@ -447 +433 @@
     psStringPrepend(&kernels->description, "GUNK=");
     psStringAppend(&kernels->description, "+POIS(%d,%d)", inner, spatialOrder);
-
-    // Subtract unity from the kernels to maintain photometric flux scaling
-    int numGaussians = fwhms->n;       // Number of Gaussians
-    if (spatialOrder > 0) {
-        for (int i = 0, index = 0; i < numGaussians; i++) {
-            for (int uOrder = 0; uOrder <= orders->data.S32[i]; uOrder++) {
-                for (int vOrder = 0; vOrder <= orders->data.S32[i] - uOrder; vOrder++, index++) {
-                    if (uOrder % 2 == 0 && vOrder % 2 == 0) {
-                        psKernel *kernel = kernels->preCalc->data[index]; // Kernel to subtract
-                        kernel->kernel[0][0] -= 1.0;
-                    }
-                }
-            }
-        }
-    }
 
     int numISIS = kernels->num;         // Number of ISIS kernels