Changeset 30400

Timestamp:

Jan 27, 2011, 4:47:32 PM (15 years ago)

Author:

eugene

Message:

add option to generate sum of matched images (not diff); straight average of covars, not weighted

File:

• branches/eam_branches/ipp-20101205/ppSub/src/ppSubReadoutSubtract.c (modified) (4 diffs)

branches/eam_branches/ipp-20101205/ppSub/src/ppSubReadoutSubtract.c

@@ -31 +31 @@
 
     bool reverse = psMetadataLookupBool(&mdok, config->arguments, "REVERSE"); // Reverse sense of subtraction?
+    bool addPair = psMetadataLookupBool(&mdok, recipe, "ADD.NOT.SUBTRACT"); // add instead of subtracting
 
     pmFPAview *view = ppSubViewReadout(); // View to readout
@@ -47 +48 @@
     // Do the actual subtraction
     pmReadout *outRO = pmFPAfileThisReadout(config->files, view, "PPSUB.OUTPUT");
-    outRO->image = (psImage*)psBinaryOp(outRO->image, minuend->image, "-", subtrahend->image);
+
+    if (addPair) {
+        outRO->image = (psImage*)psBinaryOp(outRO->image, minuend->image, "+", subtrahend->image);
+    } else {
+        outRO->image = (psImage*)psBinaryOp(outRO->image, minuend->image, "-", subtrahend->image);
+    }
     outRO->mask = (psImage*)psBinaryOp(outRO->mask, minuend->mask, "|", subtrahend->mask);
     outRO->variance = (psImage*)psBinaryOp(outRO->variance, minuend->variance, "+", subtrahend->variance);
@@ -70 +76 @@
     psFree(rng);
 
+    // XXX EAM : I suspect that the weighted averaging is giving the wrong answer for
+    // single-direction PSF matching (and maybe DUAL as well).  I am testing the difference by
+    // generating A+B images instead of A-B images and then checking the significance of the
+    // sources in the image
+
     // Combine the covariances
     // These are weighted by the appropriate mean variance.  This is probably not perfectly correct, but it
@@ -79 +90 @@
     covarWeights->data.F32[0] = minuendVar;
     covarWeights->data.F32[1] = subtrahendVar;
+# if (0)    
     outRO->covariance = psImageCovarianceAverageWeighted(covars, covarWeights);
+# else
+    outRO->covariance = psImageCovarianceAverage(covars);
+# endif
     psFree(covars);
     psFree(covarWeights);