Changeset 11282

Timestamp:

07/07/11 19:52:05 (13 years ago)

Author:

tbretz

Message:

Mainly new statistics.

File:

• trunk/FACT++/src/EventBuilder.c (modified) (60 diffs)

trunk/FACT++/src/EventBuilder.c

@@ -35 +35 @@
 
 #define MIN_LEN  32        // min #bytes needed to interpret FADheader
-#define MAX_LEN  64*1024   // size of read-buffer per socket
+#define MAX_LEN 256*1024   // size of read-buffer per socket
    
 extern FileHandle_t  runOpen(uint32_t irun, RUN_HEAD *runhd, size_t len ) ;
@@ -41 +41 @@
 extern int  runClose(FileHandle_t fileHd ,  RUN_TAIL *runth, size_t len ) ;
 extern void factOut(int severity, int err, char* message ) ;
-extern void factStat(int64_t *array , int len ) ;
+
+extern void factStat(GUI_STAT gj) ;
+
+extern void factStatNew(EVT_STAT gi) ;
 
 extern int  eventCheck( PEVNT_HEADER *fadhd, EVENT *event) ;
 
-
-extern void debugHead(int i, void *buf); 
-
-extern void debugRead(int isock, int ibyte, int32_t event,int32_t ftmevt, int32_t runnr, int state, 
-                      uint32_t tsec, uint32_t tusec ) ;
+extern void debugHead(int i, int j, void *buf); 
+
+extern void debugRead(int isock, int ibyte, int32_t event,int32_t ftmevt, 
+                      int32_t runnr, int state, uint32_t tsec, uint32_t tusec ) ;
 extern void debugStream(int isock, void *buf, int len) ;
 
 
 
-int g_actTime   =  0 ;
-int g_runStat   = 40 ;
+int g_actTime   ;
+int g_runStat   ;
 size_t g_maxMem  ;  //maximum memory allowed for buffer
 
@@ -66 +68 @@
 
 
-int gi_runStat ;
-int gp_runStat ;
-int gw_runStat ;
-
-
-uint gi_SecRate[MAX_SOCK] ;
-uint gi_S10Rate[MAX_SOCK] ;
-uint gi_MinRate[MAX_SOCK] ;
-uint gi_ErrCnt[MAX_SOCK] ;
+ int gi_runStat ;
+ int gp_runStat ;
+ int gw_runStat ;
+ int32_t gi_myRun ;
+
+
 
 uint gi_NumConnect[NBOARDS];   //4 crates * 10 boards
 
-uint gi_SecTime, gi_S10Time, gi_MinTime ;
-uint gi_EvtStart= 0 ;
-uint gi_EvtRead = 0 ;
-uint gi_EvtBad  = 0 ;
-uint gi_EvtTot  = 0 ;
-size_t gi_usedMem = 0 ;
-
-uint gw_EvtTot  = 0 ;
-uint gp_EvtTot  = 0 ;
+//uint gi_EvtStart= 0 ;
+//uint gi_EvtRead = 0 ;
+//uint gi_EvtBad  = 0 ;
+//uint gi_EvtTot  = 0 ;
+//size_t gi_usedMem = 0 ;
+
+//uint gw_EvtTot  = 0 ;
+//uint gp_EvtTot  = 0 ;
 
 PIX_MAP g_pixMap[NPIX] ;
+
+EVT_STAT    gi ;
+GUI_STAT    gj ;
 
 EVT_CTRL    evtCtrl ;       //control of events during processing
@@ -305 +306 @@
    headmem = NBOARDS* sizeof(PEVNT_HEADER) ;
 
-   if ( gi_usedMem + needmem + headmem > g_maxMem) {
+   if ( gj.usdMem + needmem + headmem > g_maxMem) {
         snprintf(str,MXSTR,"no memory left to keep event %d",evID) ;
         factOut(kError,882, str ) ;
@@ -349 +350 @@
    mBuffer[i].evtLen  = needmem ;
 
-   gi_usedMem += needmem + headmem;
+   gj.usdMem += needmem + headmem;
+   if (gj.usdMem > gj.maxMem ) gj.maxMem = gj.usdMem ; 
 
    //register event in 'active list (reading)'
@@ -357 +359 @@
    evtCtrl.pcTime[  evtCtrl.lastPtr] = g_actTime ;
    evtIdx[i] = evtCtrl.lastPtr ;
+
+   gj.readEvt++ ;           //#events read
+   gj.evtBuf++ ;
+
+
 snprintf(str,MXSTR,"%5d start new evt  %8d %8d %2d",evID,i,evtCtrl.lastPtr,0);
 factOut(kDebug,-11, str ) ;
@@ -363 +370 @@
 
 
-
-
-   gi_EvtStart++ ;
+   gi.evtGet++ ;
 
    //check if runId already registered in runCtrl
@@ -379 +384 @@
    } else {
       runCtrl[evFree].runId = runID ;
+      runCtrl[evFree].fileId = -2 ;
+      runCtrl[evFree].nextEvt= 0;
+      runCtrl[evFree].actEvt = 0;
+      runCtrl[evFree].maxEvt = 999999999 ; //max number events allowed
+      runCtrl[evFree].lastTime=g_actTime ;
+      runCtrl[evFree].closeTime=g_actTime + 3600*24 ; //max time allowed
+      runCtrl[evFree].lastTime = 0 ;
+
+      runTail[evFree].nEventsOk =
+      runTail[evFree].nEventsRej =
+      runTail[evFree].nEventsBad =
+      runTail[evFree].PCtime0 =
+      runTail[evFree].PCtimeX = 0 ;
    }
 
@@ -384 +402 @@
  
 } /*-----------------------------------------------------------------*/
+
+
 
 
@@ -405 +425 @@
    mBuffer[i].evNum   = mBuffer[i].runNum = mBuffer[i].nRoi= -1;
 
-   gi_usedMem = gi_usedMem - freemem - headmem;
-
+   gj.usdMem = gj.usdMem - freemem - headmem;
+   gj.evtBuf-- ;
 
    return 0 ;
@@ -413 +433 @@
 
 
-  /*-----------------------------------------------------------------*/
+void resetEvtStat() {
+  int i ;
+
+  for (i=0; i<MAX_SOCK; i++) gi.numRead[i] = 0 ;
+
+  for (i=0; i<NBOARDS; i++ ) {
+     gi.gotByte[i] = 0 ;
+     gi.gotErr[i]  = 0 ;
+  }
+
+  gi.evtGet  = 0 ;             //#new Start of Events read
+  gi.evtTot  = 0 ;             //#complete Events read
+  gi.evtErr  = 0 ;             //#Events with Errors
+  gi.evtSkp  = 0 ;             //#Events incomplete (timeout)
+
+  gi.procTot = 0 ;             //#Events processed
+  gi.procErr = 0 ;             //#Events showed problem in processing
+  gi.procTrg = 0 ;             //#Events accepted by SW trigger
+  gi.procSkp = 0 ;             //#Events rejected by SW trigger
+
+  gi.feedTot = 0 ;             //#Events used for feedBack system
+  gi.feedErr = 0 ;             //#Events rejected by feedBack
+
+  gi.wrtTot  = 0 ;             //#Events written to disk
+  gi.wrtErr  = 0 ;             //#Events with write-error
+
+  gi.runOpen = 0 ;             //#Runs opened
+  gi.runClose= 0 ;             //#Runs closed
+  gi.runErr  = 0 ;             //#Runs with open/close errors
+
+return ;
+} /*-----------------------------------------------------------------*/
 
 
@@ -428 +479 @@
   int actBoards = 0, minLen ;
   int32_t jrd ;
-  int32_t myRun ;
+  int64_t stat[9] ;
   int boardId, roi,drs,px,src,pixS,pixH,pixC,pixR,tmS ;
   uint qtot = 0, qread = 0, qconn = 0 ;
+
+  int goodhed = 0 ;
   int errcnt0 = 0 ;
 
-  int goodhed=0;
-
   struct timespec xwait ;
 
-  int nokCnt[MAX_SOCK],loopCnt=0;
-  int sokCnt[MAX_SOCK];
-  int sockDef[NBOARDS];
 
   struct timeval  *tv, atv;
@@ -470 +518 @@
      rd[i].sockStat = 99 ;
   }
+
+  int sockDef[NBOARDS];    //internal state of sockets
   for (i=0; i<NBOARDS; i++) sockDef[i]= 0 ; 
 
 
-  g_actTime = time(NULL) ;
-  for (k=0; k<MAX_SOCK; k++)
-     gi_SecRate[k]=gi_S10Rate[k]=gi_MinRate[k]=gi_ErrCnt[k] = 0 ;
-
-  for (k=0; k<NBOARDS; k++)
+  resetEvtStat(); 
+  gj.usdMem = gj.maxMem = 0 ;
+  gj.evtBuf = 0 ;
+
+  for (k=0; k<NBOARDS; k++) {
      gi_NumConnect[k]=0;
-
-
-  gi_SecTime= gi_S10Time= gi_MinTime= g_actTime ;
+     gi.numConn[k]   =0;
+  }
+
+
+  uint gi_SecTime ;        //time in seconds
+  gi_SecTime= g_actTime ;
 
   mBufInit() ;    //initialize buffers
@@ -489 +542 @@
 
 
-  for (k=0; k<MAX_SOCK; k++) sokCnt[k]=nokCnt[k]=0 ;
 
   head_len = sizeof(PEVNT_HEADER) ;
@@ -503 +555 @@
   stop.S= 0x04FE;
 
-  myRun = g_actTime ;
-
+  gi_myRun = g_actTime ;
   gi_runStat = g_runStat ;
+  gj.readStat= g_runStat ;
 
 
   while (g_runStat >=0) {           //loop until global variable g_runStat claims stop
 
-    gi_runStat = g_runStat ;
+    gi_runStat = g_runStat;
+    gj.readStat= g_runStat;
+    gj.totMem  = g_maxMem ;
+//  if (gi.totMem < 50000000 ) gi.totMem = 500000000 ;
 
     int b,p,p0,s0,nch; 
@@ -519 +574 @@
           nch++ ;
           gi_NumConnect[ b ] = 0 ;                  //must close all connections
+          gi.numConn[ b ] = 0; 
           if (            sockDef[b] == 0) s0= 0 ;  //sockets to be defined and opened   
           else if (g_port[b].sockDef == 0) s0=-1 ;  //sockets to be destroyed
@@ -542 +598 @@
 
 
-    g_actTime = time(NULL) ;
-    nokCnt[numok]++;
-
-    loopCnt++ ;
+
 
     numok = 0 ;                       //count number of succesfull actions
@@ -555 +608 @@
 
       gettimeofday( tv, NULL);
-      tsec = atv.tv_sec ;
+      g_actTime = tsec = atv.tv_sec ;
       tusec= atv.tv_usec ; 
 
@@ -572 +625 @@
           rd[i].skip   = 0 ;            //  start empty
           gi_NumConnect[ b ]++ ;
-          numok++ ;                     //make sure next round will execute
-          snprintf(str,MXSTR,"+++connect %d %d",b,gi_NumConnect[ b ]);
+          gi.numConn[ b ]++ ;
+          snprintf(str,MXSTR,"+++connect %d %d",b,gi.numConn[ b ]);
           factOut(kInfo,-1, str ) ;
         }
@@ -581 +634 @@
         if (rd[i].bufLen > 0) {      //might be nothing to read [buffer full]
           numok++ ;
-          sokCnt[i]++;
           jrd=recv(rd[i].socket,&rd[i].rBuf->B[ rd[i].bufPos], rd[i].bufLen, MSG_DONTWAIT);
 
@@ -593 +645 @@
              factOut(kInfo,441, str ) ;
              GenSock(s0, i, 0,NULL, &rd[i]) ;
-             gi_ErrCnt[i]++ ;
+             gi.gotErr[ b ]++ ;
              gi_NumConnect[ b ]-- ;
+             gi.numConn[ b ]-- ;
 
           } else if ( jrd<0 ) {           //did not read anything
@@ -600 +653 @@
                 snprintf(str,MXSTR,"Error Reading from %d | %m",i);
                 factOut(kError,442, str ) ;
-                gi_ErrCnt[i]++ ;
+                gi.gotErr[ b ]++ ;
              } else  numok-- ;            //else nothing waiting to be read
              jrd = 0 ;
           }
         } else jrd = 0 ;                //did read nothing as requested
+
+        gi.gotByte[ b ] += jrd ;
 
         if ( rd[i].bufTyp <0 ) { // we are skipping this board ...
@@ -619 +674 @@
              if ( rd[i].rBuf->B[ rd[i].bufPos-1] != stop.B[0]
                && rd[i].rBuf->B[ rd[i].bufPos  ] != stop.B[1]) {
-                gi_ErrCnt[i]++ ;
+                gi.evtErr++ ;
                 snprintf(str,MXSTR,"wrong end of buffer found %d",rd[i].bufPos);
                 factOut(kError,301, str ) ;
@@ -628 +683 @@
 
              //we have a complete buffer, copy to WORK area
-             gi_SecRate[i]++ ;
-
              roi = ntohs(rd[i].rBuf->S[ head_len/2 + 2 ]) ; 
              //get index into mBuffer for this event (create if needed)
@@ -651 +704 @@
                 snprintf(str,MXSTR,"wrong Board ID %d %d %d",fadCrate,fadBoard%256,boardId) ;
                 if (errcnt0++ < 99 ) factOut(kWarn,301, str ) ;  //print only few times
-//           } else {
-//              snprintf(str,MXSTR,"correct Board ID %d %d %d",fadCrate,fadBoard%256,boardId) ;
-//              if (errcnt0++ < 99 ) factOut(kWarn,301, str ) ;  //print only few times
              }
              if ( mBuffer[evID].board[ boardId ] != -1) {   
@@ -703 +753 @@
                    } else {
                       snprintf(str,MXSTR,"wrong roi %d %d %d %d",px,pixR,roi,src-2);
+                      gi.evtErr++ ;
                       factOut(kError,202, str ) ;
                       goto EndBuf ;
@@ -708 +759 @@
                 }
              }// now we have stored a new board contents into Event structure
+
              mBuffer[evID].board[ boardId ] = boardId ;
              evtCtrl.evtStat[ iDx ]++ ;
@@ -717 +769 @@
                 //complete event read ---> flag for next processing
                 evtCtrl.evtStat[ iDx ] = 99;
-                gi_EvtRead++ ;
-                gi_EvtTot++ ;    
+                gi.evtTot++ ;
              }
 
@@ -763 +814 @@
                  rd[i].ftmID  = ntohl(rd[i].rBuf->I[5]) ; //(FTMevt)
                  rd[i].runID  = ntohl(rd[i].rBuf->I[11]) ;
-                 if (rd[i].runID ==0 ) rd[i].runID = myRun ;
+                 if (rd[i].runID ==0 ) rd[i].runID = gi_myRun ;
                  rd[i].bufTyp = 1 ;       //ready to read full record
                  rd[i].bufLen = rd[i].fadLen - rd[i].bufPos ;
                  if (rd[i].bufLen <=0 ) rd[i].bufLen = 100000 ;    //?
-                 debugHead(i,rd[i].rBuf); 
+                 int fadBoard = ntohs(rd[i].rBuf->S[12] ) ;
+                 debugHead(i,fadBoard,rd[i].rBuf); 
                  debugRead(i,jrd,rd[i].evtID,rd[i].ftmID,rd[i].runID,-1,tsec,tusec) ; // i=socket; jrd=#bytes; ievt=eventid;-1=start event
               } else {
@@ -780 +832 @@
     } //finished trying to read all sockets
 
+    gi.numRead[ numok ] ++ ;
+
     int qwait=0, qdel=0, qskip=0 ;
     g_actTime = time(NULL) ;
@@ -806 +860 @@
              factOut(kWarn,601, str ) ;
              evtCtrl.evtStat[k0] = 91 ;      //timeout for incomplete events
-             gi_EvtBad++ ;
-             gi_EvtTot++ ;    
+             gi.evtSkp++ ;
+             gi.evtTot++ ;    
+             gj.skipEvt++; 
              qskip++; 
            } 
@@ -831 +886 @@
 int ib ;
 for (ib=0; ib<NBOARDS; ib++) qconn+=gi_NumConnect[ib] ;
-int64_t stat[9] ;
         stat[0]= qwait;
         stat[1]= qskip;
         stat[2]= qdel ;
         stat[3]= qtot ;
-        stat[4]= gi_usedMem ;
+        stat[4]= gj.usdMem ;
         stat[5]= qread;
         stat[6]= qconn;
 
-factStat(stat,7);
 qread=0 ;
+       gj.deltaT = 1000 ;   //temporary, must be improved
+
+       factStat(gj);
+       factStatNew(gi) ;
+
+       gj.readEvt = gj.procEvt = gj.writEvt = gj.skipEvt = 0 ;
     }
 
@@ -876 +935 @@
      && evtCtrl.evtStat[k0] < 90 ) {
        evtCtrl.evtStat[k0] = 91 ;    
-       gi_EvtBad++ ;
-       gi_EvtTot++ ;    
+       gi.evtSkp++ ;
+       gi.evtTot++ ;    
     }
  }
@@ -885 +944 @@
  factOut(kInfo,-1, str ) ;
  for (i=0; i<MAX_SOCK; i++) {  
-     GenSock(-1, i, 0, NULL, &rd[i]) ; //close and destroy socket
-     if (gi_NumConnect[ i/7 ]>0)
-         gi_NumConnect[ i/7 ]-- ;
+    if (rd[i].sockStat ==0 ) {
+       GenSock(-1, i, 0, NULL, &rd[i]) ; //close and destroy socket   
+       gi_NumConnect[ i/7 ]-- ;
+       gi.numConn[ i/7 ]-- ;
+    }
  }
 
@@ -894 +955 @@
  nanosleep( &xwait , NULL ) ;
  gi_runStat = -11 ;  //inform all that no update to happen any more
+ gj.readStat= -11 ;  //inform all that no update to happen any more
 
 
@@ -930 +992 @@
  factOut(kInfo,-1, str ) ;
  gi_runStat = -99 ;
+ gj.readStat= -99 ;
+ factStat(gj);
+ factStatNew(gi) ;
  return 0;
 
@@ -1009 +1074 @@
 
            int i=eventCheck(mBuffer[id].FADhead,mBuffer[id].fEvent) ;
-           
-           if (i<0) evtCtrl.evtStat[k0] = 999 ; //flag event to be skipped
-
+           gj.procEvt++ ;
+           gi.procTot++ ;
            numProc++ ;
            evtCtrl.evtStat[k0] = 520 ;
-           gp_EvtTot++ ;
+           
+           if (i<0) {
+              evtCtrl.evtStat[k0] = 999 ; //flag event to be skipped
+              gi.procErr++ ;
+           }
         } else if ( evtCtrl.evtStat[k0] >=0 && evtCtrl.evtStat[k0] < 90 ) {
            numWait++ ;
@@ -1020 +1088 @@
      }
 
-     if ( gi_runStat < -10 && numWait == 0) {  //nothing left to do
+     if ( gj.readStat < -10 && numWait == 0) {  //nothing left to do
         snprintf(str,MXSTR,"Exit Processing Process ...");
         factOut(kInfo,-1, str ) ;
         gp_runStat = -22 ;                     //==> we should exit
+        gj.procStat= -22 ;                     //==> we should exit
         return 0 ;
      }
@@ -1034 +1103 @@
      }
      gp_runStat = gi_runStat ;
+     gj.procStat= gj.readStat ;
 
   }
@@ -1054 +1124 @@
 
   gp_runStat = -99 ;
+  gj.procStat= -99 ;
 
   return 0;
@@ -1059 +1130 @@
 } /*-----------------------------------------------------------------*/
 
-int CloseRunFile(uint32_t runId, uint32_t closeTime) {
+int CloseRunFile(uint32_t runId, uint32_t closeTime, uint32_t maxEvt) {
 /* close run runId (all all runs if runId=0) */
 /* return: 0=close scheduled / >0 already closed / <0 does not exist */
-  int i, j ;
-
-  if (runId == 0 ) {
+  int j ;
+
+
+  if ( runId == 0 ) {
      for ( j=0; j<MAX_RUN; j++) {
         if ( runCtrl[j].fileId == 0 ) {  //run is open
-           i=runClose(runCtrl[j].fileHd, &runTail[j], sizeof(runTail[j]) );
-           if (i<0) {
-              snprintf(str,MXSTR,"error closing run %d %d",runCtrl[j].runId,i) ;
-              factOut(kError,506, str ) ;
-              runCtrl[j].fileId = 888 ;
-           } else {
-              snprintf(str,MXSTR,"closing run %d ok  AAA",runCtrl[j].runId);
-              factOut(kInfo,507, str ) ;
-              runCtrl[j].fileId = 7777 ;
-           }
            runCtrl[j].closeTime = closeTime ;
+           runCtrl[j].maxEvt = maxEvt ;
         }
      }
-     return 0 ;
-  }
-
+     return 0;
+  } 
 
   for ( j=0; j<MAX_RUN; j++) {
      if ( runCtrl[j].runId == runId ) {
         if ( runCtrl[j].fileId == 0 ) {  //run is open
-           i=runClose(runCtrl[j].fileHd, &runTail[j], sizeof(runTail[j]) );
-           if (i<0) {
-              snprintf(str,MXSTR,"error closing run %d %d",runCtrl[j].runId,i) ;
-              factOut(kError,506, str ) ;
-              runCtrl[j].fileId = 888 ;
-           } else {
-              snprintf(str,MXSTR,"closing run %d ok  AAA",runCtrl[j].runId);
-              factOut(kInfo,507, str ) ;
-              runCtrl[j].fileId = 7777 ;
-           }
            runCtrl[j].closeTime = closeTime ;
+           runCtrl[j].maxEvt = maxEvt ;
            return 0;
         } else if ( runCtrl[j].fileId <0 ) { //run not yet opened
            runCtrl[j].closeTime = closeTime ;
+           runCtrl[j].maxEvt = maxEvt ;
            return +1;
         } else {     // run already closed
@@ -1116 +1170 @@
 
   int  numWrite, numWait ;
-  int k,j ;
+  int k,j,i ;
   struct timespec xwait ;
   char str[MXSTR] ;
@@ -1152 +1206 @@
            int      ievt = mBuffer[id].evNum ;
 
+           gi.wrtTot++ ; 
            if (runCtrl[lastRun].runId == irun ) {
               j = lastRun ;
@@ -1162 +1217 @@
                  snprintf(str,MXSTR,"W error: can not find run %d for event %d in %d", irun,ievt,id);
                  factOut(kFatal,901, str ) ;
+                 gi.wrtErr++ ;
 for ( j=0; j<MAX_RUN; j++) printf("j %d   run.j %d   run %d\n",j,runCtrl[j].runId,irun );
 exit(111);
@@ -1176 +1232 @@
               actRun.Nroi    = mBuffer[id].nRoi ;
 //            actRun.FADhead = mBuffer[id].FADhead ;  //to be corrected
-              runCtrl[j].nextEvt= 0;
-              runCtrl[j].lastTime=g_actTime ;
+
               runCtrl[j].fileHd = runOpen(irun,  &actRun, sizeof(actRun) ) ;
               if (runCtrl[j].fileHd == NULL ) {
@@ -1191 +1246 @@
            }
 
-           if (runCtrl[j].fileId > 0 ) {
+           if (runCtrl[j].fileId != 0 ) {
               snprintf(str,MXSTR,"W no open file for this run %d",irun) ;
-              factOut(kDebug,123,str) ;
+              factOut(kWarn,123,str) ;
               evtCtrl.evtStat[k0] = 902 ;
+              gi.wrtErr++ ;
            } else {
-              int i=runWrite(runCtrl[j].fileHd, mBuffer[id].fEvent, sizeof(mBuffer[id]) );
-              if (i<0) {
+              i=runWrite(runCtrl[j].fileHd, mBuffer[id].fEvent, sizeof(mBuffer[id]) );
+              if ( i>=0 ) {
+                 runCtrl[j].lastTime = g_actTime; 
+                 runCtrl[j].actEvt++ ;
+                 evtCtrl.evtStat[k0] = 901 ;
+                 snprintf(str,MXSTR,"%5d successfully wrote for run %d id %5d",ievt,irun,k0);
+                 factOut(kDebug,504, str ) ;
+                 gj.writEvt++ ;
+              } else {
                  snprintf(str,MXSTR,"W error writing event for run %d",irun) ;
                  factOut(kError,503, str ) ;
                  evtCtrl.evtStat[k0] = 901 ;
-                 //close run
+                 gi.wrtErr++ ;
+              }
+
+              if ( i < 0
+                || runCtrl[j].closeTime < g_actTime 
+                || runCtrl[j].lastTime  < g_actTime-300
+                || runCtrl[j].maxEvt    < runCtrl[j].actEvt )  {
+int ii =0 ;
+if ( i < 0 ) ii=1 ;
+else if (runCtrl[j].closeTime < g_actTime ) ii=2 ; 
+else if (runCtrl[j].lastTime  < g_actTime-300 ) ii=3 ;
+else if (runCtrl[j].maxEvt    < runCtrl[j].actEvt ) ii=4 ; 
+
+
+
+                 //close run for whatever reason
+                 if (runCtrl[j].runId == gi_myRun) gi_myRun = g_actTime ;
                  i=runClose(runCtrl[j].fileHd, &runTail[j], sizeof(runTail[j]) );
                  if (i<0) {
-                    snprintf(str,MXSTR,"W error closing run %d",irun) ;
+                    snprintf(str,MXSTR,"error closing run %d %d AAA",runCtrl[j].runId,i) ;
                     factOut(kError,503, str ) ;
+                    runCtrl[j].fileId = 9001 ;
                  } else {
-                    snprintf(str,MXSTR,"W closed run %d because of write error",irun) ;
+                    snprintf(str,MXSTR,"W closed run %d AAA %d",irun,ii) ;
                     factOut(kInfo,503, str ) ;
+                    runCtrl[j].fileId = 901 ;
                  }
-                 runCtrl[j].fileId = 9999 ;
-              } else {
-                 runCtrl[j].lastTime = g_actTime; 
-                 evtCtrl.evtStat[k0] = 901 ;
-                 snprintf(str,MXSTR,"%5d successfully wrote for run %d id %5d",ievt,irun,k0);
-                 factOut(kDebug,504, str ) ;
               }
            }
@@ -1221 +1296 @@
      }
 
-     //check if we should close a run ...
+     //check if we should close a run (mainly when no event pending)
      for ( j=0; j<MAX_RUN; j++) {
         if ( runCtrl[j].fileId==0    
           && (  runCtrl[j].closeTime < g_actTime  
-              ||runCtrl[j].lastTime  < g_actTime-120) ) {
-           int i=runClose(runCtrl[j].fileHd, &runTail[j], sizeof(runTail[j]) );
+              ||runCtrl[j].lastTime  < g_actTime-300
+              ||runCtrl[j].maxEvt    < runCtrl[j].actEvt ) ) {
+           if (runCtrl[j].runId == gi_myRun) gi_myRun = g_actTime ;
+int ii =0 ;
+if ( i < 0 ) ii=1 ;
+else if (runCtrl[j].closeTime < g_actTime ) ii=2 ; 
+else if (runCtrl[j].lastTime  < g_actTime-300 ) ii=3 ;
+else if (runCtrl[j].maxEvt    < runCtrl[j].actEvt ) ii=4 ; 
+
+
+           i=runClose(runCtrl[j].fileHd, &runTail[j], sizeof(runTail[j]) );
            if (i<0) {
-              snprintf(str,MXSTR,"error closing run %d %d",runCtrl[j].runId,i) ;
+              snprintf(str,MXSTR,"error closing run %d %d BBB",runCtrl[j].runId,i) ;
               factOut(kError,506, str ) ;
-              runCtrl[j].fileId = 888 ;
+              runCtrl[j].fileId = 9011 ;
            } else {
-              snprintf(str,MXSTR,"closing run %d ok  BBB",runCtrl[j].runId);
+              snprintf(str,MXSTR,"W closed run %d BBB %d",runCtrl[j].runId,ii) ;
               factOut(kInfo,507, str ) ;
-              runCtrl[j].fileId = 7777 ;
+              runCtrl[j].fileId = 911 ;
            }
         }
@@ -1246 +1330 @@
      }
 
-     if ( gi_runStat < -10 && numWait == 0) {  //nothing left to do
+     if ( gj.readStat < -10 && numWait == 0) {  //nothing left to do
         snprintf(str,MXSTR,"Finish Write Process ...");
         factOut(kInfo,-1, str ) ;
         gw_runStat = -22 ;                     //==> we should exit
+        gj.writStat= -22 ;                     //==> we should exit
         goto closerun ;
      }
      gw_runStat = gi_runStat ;
+     gj.writStat= gj.readStat ;
 
   }
@@ -1264 +1350 @@
   for ( j=0; j<MAX_RUN; j++) 
      if ( runCtrl[j].fileId ==0 ) {
-        int i=runClose(runCtrl[j].fileHd, &runTail[j], sizeof(runTail[j]) );
+        if (runCtrl[j].runId == gi_myRun) gi_myRun = g_actTime ;
+        i=runClose(runCtrl[j].fileHd, &runTail[j], sizeof(runTail[j]) );
+int ii =0 ;
+if ( i < 0 ) ii=1 ;
+else if (runCtrl[j].closeTime < g_actTime ) ii=2 ; 
+else if (runCtrl[j].lastTime  < g_actTime-300 ) ii=3 ;
+else if (runCtrl[j].maxEvt    < runCtrl[j].actEvt ) ii=4 ; 
         if (i<0) {
-           snprintf(str,MXSTR,"error closing run %d %d",runCtrl[j].runId,i) ;
+           snprintf(str,MXSTR,"error closing run %d %d CCC",runCtrl[j].runId,i) ;
            factOut(kError,506, str ) ;
-           runCtrl[j].fileId = 888 ;
+           runCtrl[j].fileId = 9021 ;
         } else {
-           snprintf(str,MXSTR,"closing run %d ok  AAA",runCtrl[j].runId);
+           snprintf(str,MXSTR,"W closed run %d CCC %d",runCtrl[j].runId,ii) ;
            factOut(kInfo,507, str ) ;
-           runCtrl[j].fileId = 7777 ;
+           runCtrl[j].fileId = 921 ;
         }
      }
 
   gw_runStat = -99; 
+  gj.writStat= -99; 
   snprintf(str,MXSTR,"Exit Writing Process ...");
   factOut(kInfo,-1, str ) ;
@@ -1297 +1390 @@
 
   gi_runStat = gp_runStat = gw_runStat = 0 ;
+  gj.readStat= gj.procStat= gj.writStat= 0 ;
+
 
   snprintf(str,MXSTR,"Starting EventBuilder");
@@ -1309 +1404 @@
    for (i=0; i<MAX_RUN; i++) {
       runCtrl[i].runId = 0 ;
-      runCtrl[i].lastTime = 0 ;
-      runCtrl[i].closeTime = time(NULL) + 3600*24*7; 
-
-      runCtrl[i].nextEvt = 0 ;
       runCtrl[i].fileId = -2 ;
-
-      runTail[i].nEventsOk =
-      runTail[i].nEventsRej =
-      runTail[i].nEventsBad =
-      runTail[i].PCtime0 =
-      runTail[i].PCtimeX = 0 ;
-   }
+   }
+
+   gj.evtBuf  =
+   gj.readEvt =
+   gj.procEvt =
+   gj.writEvt =
+   gj.skipEvt = 0 ;
 
 //start all threads (more to come) when we are allowed to ....
@@ -1338 +1429 @@
   imax=i ;
 
-
-
-
-
-/*
+#ifdef BILAND
      xwait.tv_sec = 20;;
      xwait.tv_nsec= 0 ;  // sleep for ~20sec
      nanosleep( &xwait , NULL ) ;
 
-
      printf("close all runs in 2 seconds\n");
 
-
-     CloseRunFile( 0, time(NULL)+2) ;
+     CloseRunFile( 0, time(NULL)+2, 0) ;
 
      xwait.tv_sec = 5;;
@@ -1360 +1445 @@
 
      g_runStat = -1 ;
-*/
-
-
-
-
-
-
-
-
-
+#endif
 
 
@@ -1378 +1454 @@
 
 } /*-----------------------------------------------------------------*/
+
+
+
+
+
+
+
+
+
+
 
 
@@ -1388 +1474 @@
   /*-----------------------------------------------------------------*/
   /*-----------------------------------------------------------------*/
+
+
+#ifdef BILAND
+
+
   /*-----------------------------------------------------------------*/
   /*-----------------------------------------------------------------*/
@@ -1395 +1486 @@
 
   
-/*
+
 
 FileHandle_t  runOpen(uint32_t irun, RUN_HEAD *runhd, size_t len ) 
@@ -1420 +1511 @@
 
 
-void factStat(int64_t *array, int len ) {
-  printf("stat: bfr%5lu skp%4lu free%4lu (tot%7lu) mem%12lu rd%12lu %3lu\n",
-    array[0],array[1],array[2],array[3],array[4],array[5],array[6]);
+void factStatNew(EVT_STAT gi) {
+  int i ;
+
+  for (i=0;i<MAX_SOCK;i++) {
+     printf("%4d",gi.numRead[i]);
+     if (i%20 == 0 ) printf("\n");
+  }
+}
+
+
+void factStat(GUI_STAT gj) {
+//  printf("stat: bfr%5lu skp%4lu free%4lu (tot%7lu) mem%12lu rd%12lu %3lu\n",
+//    array[0],array[1],array[2],array[3],array[4],array[5],array[6]);
 }
 
@@ -1435 +1536 @@
 }
 
-void debugHead(int i, void *buf) { 
+void debugHead(int i, int j, void *buf) { 
 }
 
@@ -1485 +1586 @@
 //}
 //
-//version for PC-test 
+//version for PC-test * 
   for (c=0; c<4; c++) {
      for (b=0; b<10; b++) {
@@ -1513 +1614 @@
 
 }
-*/ 
+#endif