Changeset 33429

Timestamp:

Mar 6, 2012, 1:52:55 PM (14 years ago)

Author:

mhuber

Message:

 

File:

• branches/meh_branches/ppstack_test/ppStack/src/ppStackMatch.c (modified) (6 diffs)

branches/meh_branches/ppstack_test/ppStack/src/ppStackMatch.c

@@ -6 +6 @@
 #define COVAR_FRAC 0.01                 // Truncation fraction for covariance matrix
 
-//#define TESTING                         // Enable debugging output -- this needs cleaning up 
-
-#ifdef TESTING
+#define TESTING                         // Enable debugging output -- this needs cleaning up 
+//MEH - modified TESTING to be outputs only, reuse convolved now own
+//#define TESTING_REUSE_CONV              // Enable debugging re-using convolved outputs from previous run
+
+#ifdef TESTING_REUSE_CONV
 // Read a FITS image
 static bool readImage(psImage **target, // Target for image
@@ -153 +155 @@
     if (options->convolve) {
         pmReadout *conv = pmReadoutAlloc(NULL); // Conv readout, for holding results temporarily
-#ifdef TESTING
+#ifdef TESTING_REUSE_CONV
         // This is a hack to use the temporary convolved images and kernel generated previously.
         // This makes the 'matching' operation much faster, allowing debugging of the stack process easier.
@@ -269 +271 @@
 #endif
 
-            //#ifdef TESTING
-#if 1
+#ifdef TESTING
             {
                 pmHDU *hdu = pmHDUFromCell(readout->parent);
@@ -359 +360 @@
 
 
-            //#ifdef TESTING
-#if 1
+#ifdef TESTING
             {
                 pmHDU *hdu = pmHDUFromCell(readout->parent);
@@ -400 +400 @@
             readout->variance = psMemIncrRefCounter(conv->variance);
             readout->covariance = psImageCovarianceTruncate(conv->covariance, COVAR_FRAC);
-#ifdef TESTING
+#ifdef TESTING_REUSE_CONV
         }
 #endif
@@ -540 +540 @@
     psFree(bg);
 
-    //#ifdef TESTING
-#if 1
+#ifdef TESTING
     {
         pmHDU *hdu = pmHDUFromCell(readout->parent);