Changeset 11545 for trunk/FACT++/src

Timestamp:

07/22/11 23:01:26 (13 years ago)

Author:

tbretz

Message:

Added new maxEvt support.

Location:

trunk/FACT++/src

Files:

• EventBuilder.c (modified) (5 diffs)
• EventBuilderWrapper.h (modified) (2 diffs)

trunk/FACT++/src/EventBuilder.c

@@ -467 +467 @@
    if (gj.usdMem > gj.maxMem ) gj.maxMem = gj.usdMem ; 
 
+   gj.bufTot++ ;
+   if (gj.bufTot > gj.maxEvt ) gj.maxEvt = gj.bufTot ;
+
    gj.rateNew++ ;
 
@@ -514 +517 @@
 
    gj.usdMem = gj.usdMem - freemem - headmem;
+   gj.bufTot-- ;
 
    if (gi_memStat < 0 ) {
@@ -657 +661 @@
   if ( gi_resetR > 0) {
      resetEvtStat(); 
+     gj.bufTot = gj.maxEvt = gj.xxxEvt = 0 ;
      gj.usdMem = gj.maxMem = gj.xxxMem = 0 ;
      gj.totMem = g_maxMem ;
@@ -1083 +1088 @@
        for ( b=0; b<NBOARDS; b++) gj.totBytes[b] +=gj.rateBytes[b] ;
        gj.totMem  = g_maxMem ;
-       if (gj.maxMem >= gj.xxxMem) gj.xxxMem = gj.maxMem ;
+       if (gj.maxMem > gj.xxxMem) gj.xxxMem = gj.maxMem ;
+       if (gj.maxEvt > gj.xxxEvt) gj.xxxEvt = gj.maxEvt ;
 
        factStat(gj);
@@ -1089 +1095 @@
        gj.rateNew = gj.rateWrite = 0 ;
        gj.maxMem  = gj.usdMem ; 
+       gj.maxEvt  = gj.bufTot ;
        for ( b=0; b<NBOARDS; b++) gj.rateBytes[b] =0 ;
     }

trunk/FACT++/src/EventBuilderWrapper.h

@@ -840 +840 @@
         fDimPrescaler   ("FAD_CONTROL/PRESCALER",        "S:42", ""),
         fDimRefClock    ("FAD_CONTROL/REFERENCE_CLOCK",  "I:42", ""),
-        fDimStatistics1 ("FAD_CONTROL/STATISTICS1",      "I:3;I:2;X:4;I:3;I:3;I:40;I:1;I:2;C:40;I:40;I:40;X:40", ""),
+        fDimStatistics1 ("FAD_CONTROL/STATISTICS1",      "I:3;I:5;X:4;I:3;I:3;I:40;I:1;I:2;C:40;I:40;I:40;X:40", ""),
         fDimStatistics2 ("FAD_CONTROL/STATISTICS2",      "I:1;I:280;X:40;I:40;I:4;I:4;I:2;I:2;I:3;C:40",  ""),
         fDebugStream(false), fDebugRead(false), fDebugLog(false)
@@ -1707 +1707 @@
         if (old.fStatus != h.fStatus || changed)
         {
-            cout << "Send" << endl;
             const array<uint16_t,42> sts = CompareBits(&h, &h.fStatus);
             Update(fDimStatus, sts);