Changeset 15762

Timestamp:

Dec 7, 2007, 11:46:29 AM (18 years ago)

Author:

Paul Price

Message:

Adding experimental code to generate the envelope PSF of multiple PSFs (for stacking).

Location:

trunk/psModules/src/imcombine

Files:

• pmPSFEnvelope.c (added)
• pmPSFEnvelope.h (added)
• pmSubtractionEquation.c (modified) (4 diffs)

trunk/psModules/src/imcombine/pmSubtractionEquation.c

@@ -704 +704 @@
         double diff = NAN;              // Difference between iterations
         psVector *vector = NULL;        // RHS for equations
+        int iter = 0;                   // Iteration number
         do {
             if (!vector) {
@@ -765 +766 @@
             // Get difference produced by iteration
             diff = 0.0;
+#if 0
             psVector *sol2 = kernels->solution2; // Solution of second equation
             for (int i = 0; i < numParams2; i++) {
-                diff += fabs(sol2->data.F64[i] - lastSol2->data.F64[i]) / sol2->data.F64[i];
+                diff += fabs(sol2->data.F64[i] - lastSol2->data.F64[i]);
             }
             lastSol2 = psVectorCopy(lastSol2, sol2, PS_TYPE_F64);
+            psTrace("psModules.imcombine", 4, "Solution iteration %d: %lf\n", iter, diff);
+#endif
+
+            psVectorInit(kernels->solution2, 0.0);
+
+            iter++;
         } while (diff > tolerance);
 
@@ -877 +885 @@
             }
 
-#ifdef TESTING
-            psImageInit(residual->image, 0.0);
-#endif
-
             for (int j = 0; j < numKernels; j++) {
                 psKernel *conv1 = convolutions1->data[j]; // Convolution of first image
@@ -890 +894 @@
                 for (int y = - footprint; y <= footprint; y++) {
                     for (int x = - footprint; x <= footprint; x++) {
-                        residual->kernel[y][x] += conv1->kernel[y][x] * coefficient1 -
+                        residual->kernel[y][x] += conv1->kernel[y][x] * coefficient1 +
                             conv2->kernel[y][x] * coefficient2;
                     }