Changeset 36238

Timestamp:

Oct 25, 2013, 3:49:50 PM (13 years ago)

Author:

watersc1

Message:

Fix final error in fitted stats: Ensure that the binsize does not become large relative to the sigma value.

File:

• trunk/psLib/src/math/psStats.c (modified) (5 diffs)

trunk/psLib/src/math/psStats.c

@@ -1048 +1048 @@
 
         
-#if (0)
+#if (CZW)
         printf("CZW: bad sigma?: %f %f  %f %f  %f %f  %f %f %f  %f\n",
                binH2F32,binL2F32,binHiF32,binLoF32,binH4F32,binL4F32,
@@ -1289 +1289 @@
         // XXX can we calculate the binMin, binMax **before** building this histogram?
         // if the range is too absurd, adjust numBins & binSize
+        // We no longer want to reset the binSize here, as it can cause odd things.  Better to select
+        // a number of bins, and then set the min/max values to put those bins sanely around the mean.
         long numBins = PS_MAX (50, PS_MIN (10000, (max - min) / binSize));
-        binSize = (max - min) / (float) numBins;
+        //        binSize = (max - min) / (float) numBins;
         psTrace(TRACE, 6, "The new min/max values are (%f, %f).\n", min, max);
         psTrace(TRACE, 6, "The new bin size is %f.\n", binSize);
@@ -1296 +1298 @@
 
 
+#define FITTED_CLIPPING_NUM 5.0
+        if (min < guessMean - FITTED_CLIPPING_NUM * guessStdev) {
+          min = guessMean - FITTED_CLIPPING_NUM * guessStdev;
+        }
+        if (max > guessMean + FITTED_CLIPPING_NUM * guessStdev) {
+          max = guessMean + FITTED_CLIPPING_NUM * guessStdev;
+        }
+        
         psHistogram *histogram = psHistogramAlloc(min, max, numBins); // A new histogram (without outliers)
         if (!psVectorHistogram(histogram, myVector, errors, mask, maskVal)) {
@@ -1330 +1340 @@
         PS_BIN_FOR_VALUE (binMin, histogram->bounds, guessMean - minFitSigma*guessStdev, 0);
         PS_BIN_FOR_VALUE (binMax, histogram->bounds, guessMean + maxFitSigma*guessStdev, 0);
+
         if (binMin == binMax) {
             COUNT_WARNING(10, 100, "Failed to calculate the min/max of the input vector.\n");
@@ -1356 +1367 @@
         psTrace(TRACE, 6, "The clipped peak value is %f\n", histogram->nums->data.F32[binPeak]);
 
+        
         float lowfitMean = NAN;
         float lowfitStdev = NAN;