Changeset 17169 for trunk

Timestamp:

09/16/13 18:41:44 (11 years ago)

Author:

tbretz

Message:

Improved the median calculation; added a sanity check for the rms calculation.

File:

• trunk/FACT++/src/smartfact.cc (modified) (2 diffs)

trunk/FACT++/src/smartfact.cc

@@ -685 +685 @@
 
             const size_t p = t.size()/2;
-
-            med = copy[p];
+            med = p%2 ? copy[p] : (copy[p-1]+copy[p])/2.;
         }
     };
@@ -1697 +1696 @@
 
         avg /= num;
-        rms = sqrt(rms/num-avg*avg);
+        rms /= num;
+        rms += avg*avg;
+        rms = rms<0 ? 0 : sqrt(rms);
 
         if (!fMagicWeatherHist[kTemp].empty())