Changeset 29449 for branches/eam_branches/ipp-20100823/psModules/src/imcombine/pmSubtractionEquation.c

Timestamp:

Oct 17, 2010, 9:10:35 AM (16 years ago)

Author:

eugene

Message:

generate a weight window based on the fwhms; pass around fwhm to ensure the window can be calculated; plug some leaks; better test outputs

File:

• branches/eam_branches/ipp-20100823/psModules/src/imcombine/pmSubtractionEquation.c (modified) (6 diffs)

branches/eam_branches/ipp-20100823/psModules/src/imcombine/pmSubtractionEquation.c

@@ -19 +19 @@
 
 //#define USE_WEIGHT                      // Include weight (1/variance) in equation?
-//#define USE_WINDOW                      // Include weight (1/variance) in equation?
+
+// XXX TEST:
+# define USE_WINDOW                      // window to avoid neighbor contamination
 
 # define PENALTY false
@@ -752 +754 @@
     stamps->normValue2 = stats->robustMedian;
 
-    fprintf (stderr, "norm (1): %f (%f)\n", stamps->normValue, stamps->normValue2);
+    psLogMsg ("psModules.imcombine", PS_LOG_INFO, "norm (1): %f (%f)\n", stamps->normValue, stamps->normValue2);
 
     psFree(stats);
@@ -797 +799 @@
     stamp->normSquare2 = normSquare2;
 
-    fprintf (stderr, "normValue: %f %f %f  (%f %f)\n", normI1, normI2, stamp->norm, normSquare1, normSquare2);
+    psLogMsg ("psModules.imcombine", PS_LOG_DETAIL, "normValue: %f %f %f  (%f %f)\n", normI1, normI2, stamp->norm, normSquare1, normSquare2);
 
     return true;
@@ -1089 +1091 @@
         }
 
+#if 1
+        psImage *save = psImageCopy(NULL, sumMatrix, PS_TYPE_F32);
+        psFitsWriteImageSimple ("sumMatrix.fits", save, NULL);
+        psVectorWriteFile("sumVector.dat", sumVector);
+        psFree (save);
+#endif
+
         psVector *solution = NULL;                       // Solution to equation!
         solution = psVectorAlloc(numParams, PS_TYPE_F64);
         psVectorInit(solution, 0);
 
+        // XXX TEST: try some constraint on the svd solution
+        // solution = psMatrixSolveSVD(solution, sumMatrix, sumVector, NAN);
         solution = psMatrixSolveSVD(solution, sumMatrix, sumVector, NAN);
 
@@ -1149 +1160 @@
         }
 
-#if 0
+#if 1
         psImage *save = psImageCopy(NULL, sumMatrix, PS_TYPE_F32);
         psFitsWriteImageSimple ("sumMatrix.fits", save, NULL);
@@ -1264 +1275 @@
     if (!isfinite(dTotal)) return false;
 
-    fprintf (stderr, "sum: %f, peak: %f, sigma: %f, fsigma: %f, fmax: %f, fmin: %f\n", sum, peak, sigma, sigma/sum, dOuter/sum, dTotal/sum);
+    // fprintf (stderr, "sum: %f, peak: %f, sigma: %f, fsigma: %f, fmax: %f, fmin: %f\n", sum, peak, sigma, sigma/sum, dOuter/sum, dTotal/sum);
     psVectorAppend(fResSigma, sigma/sum);
     psVectorAppend(fResOuter, dOuter/sum);