Changeset 25950

Timestamp:

Oct 27, 2009, 11:44:05 AM (17 years ago)

Author:

Paul Price

Message:

Committing work in progress. TESTING is turned on in several files --- this is not intended for regular use yet!

Location:

branches/pap/ppStack/src

Files:

• ppStackCombineFinal.c (modified) (2 diffs)
• ppStackCombineInitial.c (modified) (2 diffs)
• ppStackLoop.c (modified) (1 diff)
• ppStackMatch.c (modified) (2 diffs)
• ppStackReject.c (modified) (1 diff)

branches/pap/ppStack/src/ppStackCombineFinal.c

@@ -9 +9 @@
 #include "ppStack.h"
 #include "ppStackLoop.h"
+
+#define TESTING                         // Enable test output
 
 bool ppStackCombineFinal(pmReadout *target, ppStackThreadData *stack, psArray *covariances,
@@ -84 +86 @@
 
 #ifdef TESTING
-    pmStackVisualPlotTestImage(target->image, "combined_initial.fits");
-    ppStackWriteImage("combined_final.fits", NULL, target->image, config);
+    static int pass = 0;                // Pass through
+    psString name = NULL;               // Name of file
+    psStringAppend(&name, "combined_image_final_%d.fits", pass);
+    pass++;
+    ppStackWriteImage(name, NULL, target->image, config);
+    psStringSubstitute(&name, "mask", "image");
+    ppStackWriteImage(name, NULL, target->mask, config);
+    psStringSubstitute(&name, "variance", "mask");
+    ppStackWriteImage(name, NULL, target->variance, config);
+    psFree(name);
+
+    pmStackVisualPlotTestImage(target->image, "combined_image_final.fits");
 #endif
 

branches/pap/ppStack/src/ppStackCombineInitial.c

@@ -9 +9 @@
 #include "ppStack.h"
 #include "ppStackLoop.h"
+
+#define TESTING                         // Enable test output
 
 bool ppStackCombineInitial(ppStackThreadData *stack, ppStackOptions *options, pmConfig *config)
@@ -83 +85 @@
 
 #ifdef TESTING
-    ppStackWriteImage("combined_initial.fits", NULL, outRO->image, config);
-    pmStackVisualPlotTestImage(outRO->image, "combined_initial.fits");
+    ppStackWriteImage("combined_image_initial.fits", NULL, options->outRO->image, config);
+    ppStackWriteImage("combined_mask_initial.fits", NULL, options->outRO->mask, config);
+    ppStackWriteImage("combined_variance_initial.fits", NULL, options->outRO->variance, config);
+
+    pmStackVisualPlotTestImage(options->outRO->image, "combined_image_initial.fits");
 #endif
-
-    psFree(options->matchChi2); options->matchChi2 = NULL;
-
 
     if (options->stats) {

branches/pap/ppStack/src/ppStackLoop.c

@@ -98 +98 @@
     psTrace("ppStack", 2, "Final stack of convolved images....\n");
     if (!ppStackCombineFinal(options->outRO, stack, options->convCovars, options, config,
-                             false, false, false)) {
+                             true, false, false)) {
         psError(PS_ERR_UNKNOWN, false, "Unable to perform final combination.");
         psFree(stack);

branches/pap/ppStack/src/ppStackMatch.c

@@ -18 +18 @@
 #define COVAR_FRAC 0.01                 // Truncation fraction for covariance matrix
 
-//#define TESTING                         // Enable debugging output
+#define TESTING                         // Enable debugging output
 
 #ifdef TESTING
@@ -257 +257 @@
             psFitsClose(fits);
 
-            if (!readImage(&readout->image, options->imageNames->data[index], config) ||
-                !readImage(&readout->mask, options->maskNames->data[index], config) ||
-                !readImage(&readout->variance, options->varianceNames->data[index], config)) {
+            if (!readImage(&readout->image, options->convImages->data[index], config) ||
+                !readImage(&readout->mask, options->convMasks->data[index], config) ||
+                !readImage(&readout->variance, options->convVariances->data[index], config)) {
                 psError(PS_ERR_IO, false, "Unable to read previously produced image.");
                 return false;

branches/pap/ppStack/src/ppStackReject.c

@@ -10 +10 @@
 #include "ppStackLoop.h"
 
-//#define TESTING
+#define TESTING
 
 bool ppStackReject(ppStackOptions *options, pmConfig *config)