Changeset 33415 for branches/meh_branches/ppstack_test/psModules/src/imcombine/pmSubtractionMatch.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)
• psModules (modified) (1 prop)
• psModules/src/imcombine/pmSubtractionMatch.c (modified) (8 diffs)

branches/meh_branches/ppstack_test/psModules/src/imcombine/pmSubtractionMatch.c

@@ -29 +29 @@
 static bool useFFT = true;              // Do convolutions using FFT
 
-//#define TESTING
-//#define TESTING_MEMORY
+#define TESTING
+#define TESTING_MEMORY
 
 // Output memory usage information
@@ -538 +538 @@
     // Where does our variance map come from?
     // Getting the variance exactly right is not necessary --- it's just used for weighting.
+    // MEH - helpful to have one used output to log -- at some level want log output for most every step
+
     psImage *variance = NULL;             // Variance image to use
     if (ro1->variance && ro2->variance) {
         variance = (psImage*)psBinaryOp(NULL, ro1->variance, "+", ro2->variance);
+        psLogMsg("psModules.imcombine", PS_LOG_DETAIL, "TESTING:SubMatch variance avail: var1+var2");
     } else if (ro1->variance) {
         variance = psMemIncrRefCounter(ro1->variance);
+        psLogMsg("psModules.imcombine", PS_LOG_DETAIL, "TESTING:SubMatch variance avail: var1");
     } else if (ro2->variance) {
         variance = psMemIncrRefCounter(ro2->variance);
+        psLogMsg("psModules.imcombine", PS_LOG_DETAIL, "TESTING:SubMatch variance avail: var2");
     } else {
         variance = (psImage*)psBinaryOp(NULL, ro1->image, "+", ro2->image);
-    }
+        psLogMsg("psModules.imcombine", PS_LOG_DETAIL, "TESTING:SubMatch variance avail: none ro1+ro2");
+    }
+
 
     // Putting important variable declarations here, since they are freed after a "goto" if there is an error.
@@ -726 +733 @@
                 float radMoment1 = stamps->normWindow1 / 2.75;
                 float radMoment2 = stamps->normWindow2 / 2.75;
+                //MEH - FWHM vs radialMoment need *2? may mess up other parts
+                //float radMoment1 = stamps->normWindow1 / 2.75*2;
+                //float radMoment2 = stamps->normWindow2 / 2.75*2;
                 pmSubtractionParamsScale(NULL, NULL, isisWidths, radMoment1, radMoment2);
 
@@ -810 +820 @@
                     }
                 }
-
+                //MEH probably should comment out but should be ok?
                 // step 0 : calculate the normalizations, pass along to the next steps via stamps->normValue
                 psTrace("psModules.imcombine", 3, "Calculating normalization...\n");
@@ -825 +835 @@
                 for (int order = 0; order <= N_TEST_ORDER; order++) {
                     for (int j = 0; j < N_TEST_MODES; j++) {
+                        //MEH: thinking pmSubtractionCalculateNormalization needs to be called here for conv source
+                        // per mode
+                        //psTrace("psModules.imcombine", 3, "Calculating normalization...order: %d  mode: %d\n",order,j);
+                        //                        if (!pmSubtractionCalculateNormalization(stamps, TestModes[j])) {
+                        //    psError(psErrorCodeLast(), false, "Unable to calculate least-squares equation.");
+                        //    goto MATCH_ERROR;
+                        //}
+                        //
                         if (!pmSubtractionMatchAttempt(&bestMatch, kernels, stamps, TestModes[j], order, false)) {
                             goto MATCH_ERROR;
@@ -843 +861 @@
             // apply the best fit so we are ready to roll
             psLogMsg("psModules.imcombine", PS_LOG_INFO, "applying order: %d, mode: %d\n", bestMatch->spatialOrder, bestMatch->mode);
+            //MEH need to call normalization one more time for final/best run - 
+            // but what if dual - already checked for in pmSubtractionCalculateNormalization
+            //if (!pmSubtractionCalculateNormalization(stamps, bestMatch->mode)) {
+            //    psError(psErrorCodeLast(), false, "Unable to calculate least-squares equation.");
+            //    goto MATCH_ERROR;
+            //}
+            // 
             if (!pmSubtractionMatchAttempt(NULL, kernels, stamps, bestMatch->mode, bestMatch->spatialOrder, true)) {
                 goto MATCH_ERROR;
@@ -1091 +1116 @@
     }
 
-    if (!psThreadPoolWait(true)) {
+    if (!psThreadPoolWait(true, true)) {
         psError(psErrorCodeLast(), false, "Error waiting for threads.");
         psFree(models);
@@ -1331 +1356 @@
         *stampSize = *stampSize * scale + 0.5;
     }
-
+    //MEH
+    psLogMsg("psModules.imcombine", PS_LOG_INFO, "TESTING Scaling kernel parameters fwhm1,2,refscale/min/max: %f %f %f %f %f", fwhm1,fwhm2,scaleRefOption,scaleMinOption,scaleMaxOption);
     psLogMsg("psModules.imcombine", PS_LOG_INFO, "Scaling kernel parameters by %f", scale);
     if (kernelSize) psLogMsg("psModules.imcombine", PS_LOG_INFO, " modified kernel size %d", *kernelSize);