Changeset 17166 for trunk/FACT++

Timestamp:

09/15/13 22:08:28 (11 years ago)

Author:

tbretz

Message:

There must be a cast to size -- I missed that last time; fixed a bug in DumpStats which effected files with less rows than columns; added a sanity check for the calculation of the rms.

File:

• trunk/FACT++/src/fitsdump.cc (modified) (4 diffs)

trunk/FACT++/src/fitsdump.cc

@@ -764 +764 @@
 
         avg /= num;
-        rms  = sqrt(rms/num - avg*avg);
+        rms /= num;
+        rms += avg*avg;
+        rms  = rms<0 ? 0 : sqrt(rms);
 
         fout << "Min: " << statsIt->min << '\n';
@@ -805 +807 @@
 
     avg /= numElems;
-    rms  = sqrt(rms/numElems - avg*avg);
+    rms /= numElems;
+    rms -= avg*avg;
+    rms  = rms<0 ? 0 : sqrt(rms);
+
 
     out << "Avg: " << avg << '\n';
     out << "Rms: " << rms << endl;
-
 }
 
@@ -823 +827 @@
     vector<vector<char>> statData;
 
-    const size_t num = limit==0 || GetNumRows()<limit ? GetNumRows() : limit;
+    const size_t rows = limit==0 || GetNumRows()<limit ? GetNumRows() : limit;
 
     for (auto it=cols.begin(); it!=cols.end(); it++)
-        statData.emplace_back(vector<char>(it->col.size*num*(it->last-it->first+1)));
-
-#ifdef HAVE_ROOT
+        statData.emplace_back(vector<char>(it->col.size*rows*(it->last-it->first+1)));
+
+#ifdef HAVE_ROOT
+    size_t num = 0;
+    for (auto it=cols.begin(); it!=cols.end(); it++)
+        num += it->last-it->first+1;
+
     vector<Double_t> data(num+1);
 #endif
@@ -1099 +1107 @@
         ("%,%",         vars<string>(),         "Format for the output (currently not available in root-mode)")
         ("force",       po_switch(),            "Force reading the fits file even if END key is missing")
-        ("first",       var<size_t>(0),         "First number of row to read")
-        ("limit",       var<size_t>(0),         "Limit for the maximum number of rows to read (0=unlimited)")
+        ("first",       var<size_t>(size_t(0)), "First number of row to read")
+        ("limit",       var<size_t>(size_t(0)), "Limit for the maximum number of rows to read (0=unlimited)")
         ("tablename,t", var<string>(""),        "Name of the table to open. If not specified, first binary table is opened")
 #ifdef HAVE_ROOT