Changeset 11312

Timestamp:

07/10/11 14:05:36 (13 years ago)

Author:

tbretz

Message:

Adapted datalogger STATS service; fixed the case of null bytes in handleFadRuns

File:

• trunk/FACT++/gui/FactGui.h (modified) (3 diffs)

trunk/FACT++/gui/FactGui.h

@@ -752 +752 @@
         const uint64_t *vals = d.ptr<uint64_t>();
 
-        const size_t written = vals[0];
-        const size_t space   = vals[1];
-        const size_t rate    = vals[2];
+        const size_t space   = vals[0];
+        const size_t written = vals[1];
+        const size_t rate    = float(vals[2])/vals[3];
 
         fLoggerFreeSpace->setSuffix(" MB");
@@ -785 +785 @@
         fLoggerRate->setSuffix(" kB/s");
         fLoggerRate->setDecimals(2);
-        fLoggerRate->setValue(rate*1e-3);
-        if (rate>   2000)  // > 2kB/s
+        fLoggerRate->setValue(rate);
+        if (rate>   2)  // > 2kB/s
         {
             fLoggerRate->setSuffix(" kB/s");
             fLoggerRate->setDecimals(1);
-            fLoggerRate->setValue(rate*1e-3);
-        }
-        if (rate>=100000)  // >100kB/s
+            fLoggerRate->setValue(rate);
+        }
+        if (rate>=100)  // >100kB/s
         {
             fLoggerRate->setSuffix(" kB/s");
             fLoggerRate->setDecimals(0);
-            fLoggerRate->setValue(rate*1e-3);
-        }
-        if (rate>=1000000)  // >100kB/s
+            fLoggerRate->setValue(rate);
+        }
+        if (rate>=1000)  // >100kB/s
         {
             fLoggerRate->setSuffix(" MB/s");
             fLoggerRate->setDecimals(2);
-            fLoggerRate->setValue(rate*1e-6);
-        }
-        if (rate>=10000000)  // >1MB/s
+            fLoggerRate->setValue(rate*1e-3);
+        }
+        if (rate>=10000)  // >1MB/s
         {
             fLoggerRate->setSuffix(" MB/s");
             fLoggerRate->setDecimals(1);
-            fLoggerRate->setValue(rate*1e-6);
-        }
-        if (rate>=100000000)  // >10MB/s
+            fLoggerRate->setValue(rate*1e-3);
+        }
+        if (rate>=100000)  // >10MB/s
         {
             fLoggerRate->setSuffix(" MB/s");
             fLoggerRate->setDecimals(0);
-            fLoggerRate->setValue(rate*1e-6);
+            fLoggerRate->setValue(rate*1e-3);
         }
 
@@ -893 +893 @@
     void handleFadRuns(const DimData &d)
     {
+        if (d.size()==0)
+            return;
+
         if (d.size()<20)
         {