Changeset 20752 for trunk/ppStack/src/ppStackMatch.c

Timestamp:

Nov 13, 2008, 10:25:27 PM (17 years ago)

Author:

Paul Price

Message:

Renormalise the weights before matching chi^{2, so that the chi}2 values are meaningful.

File:

• trunk/ppStack/src/ppStackMatch.c (modified) (2 diffs)

trunk/ppStack/src/ppStackMatch.c

@@ -222 +222 @@
                 psFitsClose(fits);
             }
-#endif
+            {
+                psString name = NULL;
+                psStringAppend(&name, "real_%03d.fits", numInput);
+                psFits *fits = psFitsOpen(name, "w");
+                psFree(name);
+                psFitsWriteImage(fits, NULL, readout->image, 0, NULL);
+                psFitsClose(fits);
+            }
+#endif
+
+            // Renormalise the variances if desired
+            if (renorm) {
+                // Statistics for renormalisation
+                psStatsOptions renormMean = psStatsOptionFromString(psMetadataLookupStr(&mdok, recipe,
+                                                                                        "RENORM.MEAN"));
+                psStatsOptions renormStdev = psStatsOptionFromString(psMetadataLookupStr(&mdok, recipe,
+                                                                                         "RENORM.STDEV"));
+
+                if (!pmReadoutWeightRenormPixels(readout, maskBad, renormMean, renormStdev, rng)) {
+                    psError(PS_ERR_UNKNOWN, false, "Unable to renormalise variances.");
+                    psFree(output);
+                    return false;
+                }
+            }
 
             if (threads > 0) {
@@ -240 +263 @@
                 return false;
             }
+
+#ifdef TESTING
+            {
+                psString name = NULL;
+                psStringAppend(&name, "conv_%03d.fits", numInput);
+                psFits *fits = psFitsOpen(name, "w");
+                psFree(name);
+                psFitsWriteImage(fits, NULL, output->image, 0, NULL);
+                psFitsClose(fits);
+            }
+            {
+                psString name = NULL;
+                psStringAppend(&name, "diff_%03d.fits", numInput);
+                psFits *fits = psFitsOpen(name, "w");
+                psFree(name);
+                psBinaryOp(fake->image, output->image, "-", fake->image);
+                psFitsWriteImage(fits, NULL, fake->image, 0, NULL);
+                psFitsClose(fits);
+            }
+#endif
+
             psFree(fake);
             psFree(optWidths);