Changeset 33415 for branches/meh_branches/ppstack_test/ppStack/src/ppStackMatch.c

Timestamp:

Mar 5, 2012, 5:19:48 PM (14 years ago)

Author:

mhuber

Message:

merging latest r33407 trunk changes to meh_branches/ppstack_test

Location:

branches/meh_branches/ppstack_test

Files:

• . (modified) (1 prop)
• ppStack/src/ppStackMatch.c (modified) (8 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
+//#define TESTING                         // Enable debugging output -- this needs cleaning up 
 
 #ifdef TESTING
@@ -259 +259 @@
             fake->image = psImageCopy(NULL, target, PS_TYPE_F32);
             fake->mask = psImageCopy(NULL, readout->mask, PS_TYPE_IMAGE_MASK);
+            //MEH add fake->variance just as fake->image for testing passing along fully make difference in soln
+            //fake->variance = psImageCopy(NULL, target, PS_TYPE_F32);
 
 #if 1
@@ -267 +269 @@
 #endif
 
-#ifdef TESTING
+            //#ifdef TESTING
+#if 1
             {
                 pmHDU *hdu = pmHDUFromCell(readout->parent);
@@ -313 +316 @@
                 // we need to register the FWHM values for use downstream 
                 pmSubtractionSetFWHMs(options->targetSeeing, options->inputSeeing->data.F32[index]);
+                //MEH -- seems to not be used now that kron R is in pmSubtractionMatch
+                psLogMsg("ppStack", PS_LOG_INFO, "TESTING:: FWHM %f %f\n",options->targetSeeing,options->inputSeeing->data.F32[index]);
 
                 // Scale the input parameters
@@ -334 +339 @@
                 // }
 
-                if (!pmSubtractionMatch(NULL, conv, fake, readout, footprint, stride, regionSize, spacing,
+                if (!pmSubtractionMatch(NULL, conv, fake, readout, footprint, stride, regionSize, spacing,
                                         threshold, options->sources, stampsName, type, size, order, widthsCopy,
                                         orders, inner, ringsOrder, binning, penalty,
@@ -354 +359 @@
 
 
-#ifdef TESTING
+            //#ifdef TESTING
+#if 1
             {
                 pmHDU *hdu = pmHDUFromCell(readout->parent);
@@ -441 +447 @@
                 assert(item->type == PS_DATA_UNKNOWN);
                 pmSubtractionKernels *kernels = item->data.V; // Convolution kernels
-                // EAM/MEH sum the RMS instead of the mean now 
+                // EAM/MEH sum the RMS instead of the mean now  
                 sum += kernels->rms;
                 num++;
@@ -534 +540 @@
     psFree(bg);
 
-#ifdef TESTING
+    //#ifdef TESTING
+#if 1
     {
         pmHDU *hdu = pmHDUFromCell(readout->parent);