Changeset 33415 for branches/meh_branches/ppstack_test/psModules/src/imcombine/pmSubtraction.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/pmSubtraction.c (modified) (6 diffs)

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

@@ -905 +905 @@
         }
     }
-    if (!psThreadPoolWait(true)) {
+    if (!psThreadPoolWait(true, true)) {
         psError(psErrorCodeLast(), false, "Error waiting for threads.");
         return false;
@@ -1019 +1019 @@
                 }
             }
-            pmSubtractionStampPrint(ds9, stamp->x, stamp->y, stamps->footprint, "red");
+
+            psString ds9text = NULL;
+
+            psStringAppend(&ds9text, "flux: %.0f ", match->fluxes->data.F32[i]);
+            psStringAppend(&ds9text, "chi2: %.0f ", match->chisq->data.F32[i]);
+
+            pmSubtractionStampPrint(ds9, stamp->x, stamp->y, stamps->footprint, "red", ds9text);
+
+            psFree(ds9text);       
 
             // Set stamp for replacement
@@ -1041 +1049 @@
         } else {
             numGood++;
-            pmSubtractionStampPrint(ds9, stamp->x, stamp->y, stamps->footprint, "green");
+
+            //MEH bad way to do this - should also add to rej/red one as well
+            // -- is match from subQuality what want?
+            psString ds9text = NULL;
+
+            psStringAppend(&ds9text, "flux: %.0f ", match->fluxes->data.F32[i]);
+            psStringAppend(&ds9text, "chi2: %.0f ", match->chisq->data.F32[i]);
+
+            pmSubtractionStampPrint(ds9, stamp->x, stamp->y, stamps->footprint, "green", ds9text);
+
+            psFree(ds9text);       
         }
     }
@@ -1427 +1445 @@
     }
 
-    if (!psThreadPoolWait(false)) {
+    if (!psThreadPoolWait(false, true)) {
         psError(psErrorCodeLast(), false, "Error waiting for threads.");
         return false;
@@ -1487 +1505 @@
             }
         }
+        psFree(out1->covariance);
         out1->covariance = psImageCovarianceAverage(covars);
         psFree(covars);
@@ -1527 +1546 @@
             }
         }
+        psFree(out2->covariance);
         out2->covariance = psImageCovarianceAverage(covars);
         psFree(covars);