Changeset 12341 for trunk

Timestamp:

10/31/11 00:11:01 (13 years ago)

Author:

tbretz

Message:

Fixed tha calculation of the average ethernet rate; removed min and max and removed the obsolete widgets from the Event builder tab.

File:

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

trunk/FACT++/gui/FactGui.h

@@ -1852 +1852 @@
 
         uint32_t sum = 0;
-        int32_t  min = 0x7fffff;
-        int32_t  max = 0;
+        //int32_t  min = 0x7fffff;
+        //int32_t  max = 0;
 
         int cnt = 0;
@@ -1860 +1860 @@
         for (int i=0; i<40; i++)
         {
-            if (stat.numConn[i]!=7)
+            if (stat.numConn[i]!=1)
                 continue;
 
@@ -1868 +1868 @@
             err += stat.errConn[i];
 
-            if (stat.rateBytes[i]<min)
-                min = stat.rateBytes[i];
-            if (stat.rateBytes[i]>max)
-                max = stat.rateBytes[i];
+            //if (stat.rateBytes[i]<min)
+            //    min = stat.rateBytes[i];
+            //if (stat.rateBytes[i]>max)
+            //    max = stat.rateBytes[i];
         }
 
@@ -1887 +1887 @@
             return;
 
-        fFadEthernetRateMin->setValue(min/stat.deltaT);
-        fFadEthernetRateMax->setValue(max/stat.deltaT);
+        //fFadEthernetRateMin->setValue(min/stat.deltaT);
+        //fFadEthernetRateMax->setValue(max/stat.deltaT);
         fFadEthernetRateTot->setValue(sum/stat.deltaT);
         fFadEthernetRateAvg->setValue(cnt==0 ? 0 : sum/cnt/stat.deltaT);
-        fFadEvtRateNew->setValue(1000*stat.rateNew/stat.deltaT);
-        fFadEvtRateWrite->setValue(1000*stat.rateWrite/stat.deltaT);
-
-        fFadTransmission->setValue(fFadEvtRateNew->value());
-        fFadEthernet->setValue(fFadEthernetRateTot->value());
-        fFadWriteRate->setValue(fFadEvtRateWrite->value());
+
+        fFadTransmission->setValue(1000*stat.rateNew/stat.deltaT);
+        fFadWriteRate->setValue(1000*stat.rateWrite/stat.deltaT);
     }