Changeset 21422 for trunk/psModules/src/imcombine

Timestamp:

Feb 9, 2009, 11:25:34 AM (17 years ago)

Author:

Paul Price

Message:

Merging cnb_branch_20090113. No major conflicts. Compiles, but not tested.

Location:

trunk/psModules/src/imcombine

Files:

• Makefile.am (modified) (2 diffs)
• pmSubtractionAnalysis.c (modified) (2 diffs)
• pmSubtractionEquation.c (modified) (3 diffs)
• pmSubtractionMatch.c (modified) (2 diffs)
• pmSubtractionVisual.c (added)
• pmSubtractionVisual.h (added)

trunk/psModules/src/imcombine/Makefile.am

@@ -18 +18 @@
         pmSubtractionStamps.c   \
         pmSubtractionThreads.c  \
-        pmPSFEnvelope.c
+        pmPSFEnvelope.c         \
+        pmSubtractionVisual.c
 
 pkginclude_HEADERS = \
@@ -35 +36 @@
         pmSubtractionStamps.h   \
         pmSubtractionThreads.h  \
-        pmPSFEnvelope.h
+        pmPSFEnvelope.h         \
+        pmSubtractionVisual.h
 
 CLEANFILES = *~

trunk/psModules/src/imcombine/pmSubtractionAnalysis.c

@@ -12 +12 @@
 
 #include "pmSubtractionAnalysis.h"
+#include "pmSubtractionVisual.h"
 
 #define KERNEL_MOSAIC 2                 // Half-number of kernel instances in the mosaic image
@@ -101 +102 @@
         }
 
+        pmSubtractionVisualPlotConvKernels(convKernels);
         psMetadataAddImage(analysis, PS_LIST_TAIL, "SUBTRACTION.KERNEL.IMAGE",
                            PS_META_DUPLICATE_OK, "Realisations of kernel", convKernels);

trunk/psModules/src/imcombine/pmSubtractionEquation.c

@@ -13 +13 @@
 
 #include "pmSubtractionEquation.h"
-
+#include "pmSubtractionVisual.h"
 
 //#define TESTING
@@ -695 +695 @@
     }
 
+    pmSubtractionVisualPlotLeastSquares(stamps);
+
     psLogMsg("psModules.imcombine", PS_LOG_INFO, "Calculate equation: %f sec",
              psTimerClear("pmSubtractionCalculateEquation"));
@@ -1001 +1003 @@
      }
 
+    pmSubtractionVisualPlotLeastSquares((pmSubtractionStampList *) stamps); //casting away const
     return true;
 }

trunk/psModules/src/imcombine/pmSubtractionMatch.c

@@ -19 +19 @@
 #include "pmSubtractionThreads.h"
 #include "pmSubtractionMatch.h"
-
+#include "pmSubtractionVisual.h"
 
 #define BG_STAT PS_STAT_ROBUST_MEDIAN   // Statistic to use for background
@@ -86 +86 @@
 
     memCheck("   extract stamps");
-
+    pmSubtractionVisualPlotStamps(*stamps, (pmReadout *) ro1);
     return true;
 }