Changeset 11091 for trunk/FACT++/src/EventBuilder.c

Timestamp:

06/21/11 20:54:18 (13 years ago)

Author:

tbretz

Message:

Added new connection/disconnection scheme; added eventCheck stub

File:

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

trunk/FACT++/src/EventBuilder.c

@@ -43 +43 @@
 extern void factStat(int severity, int err, char* message ) ;
 
+extern int  eventCheck( PEVNT_HEADER *fadhd, EVENT *event) ;
 
 extern void debugRead(int isock, int ibyte, int32_t event, int state, 
@@ -295 +296 @@
 
    
-   needmem = sizeof(EVENT) + NPIX*nRoi*2 + NTMARK*nRoi*2 ;
+   needmem = sizeof(EVENT) + NPIX*nRoi*2 + NTMARK*nRoi*2; //
 
    headmem = NBOARDS* sizeof(PEVNT_HEADER) ;
@@ -576 +577 @@
            snprintf(str,MXSTR,"Socket %d closed by FAD",i);
            factOut(kInfo,441, str ) ;
-           j = GenSock(1, i, 0,NULL, &rd[i]) ;
+           GenSock(1, i, 0,NULL, &rd[i]) ;
            gi_ErrCnt[i]++ ;
            gi_NumConnect[ b ]-- ;
@@ -852 +853 @@
  snprintf(str,MXSTR,"close all sockets ...");
  factOut(kInfo,-1, str ) ;
- for (i=0; i<MAX_SOCK; i++)    
-    if (rd[i].sockStat ==0 ) {  
-       j=close(rd[i].socket) ;
-       if (j>0) {
-          snprintf(str,MXSTR,"Error closing socket %d | %m",i);
-          factOut(kFatal,771, str ) ;
-       }
-       rd[i].sockStat = -1 ;        //flag (try to reopen next round)
-       gi_NumConnect[ i/7 ]-- ;
-    }
+ for (i=0; i<MAX_SOCK; i++) {  
+    GenSock(-1, i, 0, NULL, &rd[i]) ; //close and destroy socket   
+    gi_NumConnect[ i/7 ]-- ;
+ }
 
  xwait.tv_sec = 0;
@@ -944 +939 @@
         if (evtCtrl.evtStat[k0] > 90 && evtCtrl.evtStat[k0] <500) {
            int      id   = evtCtrl.evtBuf[k0] ;
-           uint32_t irun = mBuffer[id].runNum ;
            int      ievt = mBuffer[id].evNum ;
            int      roi  = mBuffer[id].nRoi ;
+//         uint32_t irun = mBuffer[id].runNum ;
 //snprintf(str,MXSTR,"P processing %d %d %d %d",ievt,k,id,evtCtrl.evtStat[k0]) ;
 //factOut(kDebug,-1, str ) ;
@@ -964 +959 @@
              }
            }
-//and set correct event header ; also check for consistency in event
-          mBuffer[id].fEvent->Roi = roi ;
-          mBuffer[id].fEvent->EventNum = ievt ;
-          mBuffer[id].fEvent->TriggerType = 0 ; // TBD
-          mBuffer[id].fEvent->SoftTrig = 0 ;
-          for (ib=0; ib<NBOARDS; ib++) {
-             mBuffer[id].fEvent->BoardTime[ib] = 123 ;
-
-
-
-
+
+
+//and set correct event header ; also check for consistency in event (not yet)
+           mBuffer[id].fEvent->Roi = roi ;
+           mBuffer[id].fEvent->EventNum = ievt ;
+           mBuffer[id].fEvent->TriggerType = 0 ; // TBD
+           mBuffer[id].fEvent->SoftTrig = 0 ;
+           for (ib=0; ib<NBOARDS; ib++) {
+              if (mBuffer[id].board[ib] == -1 ) {  //board is not read
+                 mBuffer[id].FADhead[ib].start_package_flag = 0 ;
+                 mBuffer[id].fEvent->BoardTime[ib] = 0 ;
+              } else {
+                 mBuffer[id].fEvent->BoardTime[ib] = 
+                 ntohl(mBuffer[id].FADhead[ib].time) ;
+              }
            }
+
+           int i=eventCheck(mBuffer[id].FADhead,mBuffer[id].fEvent) ;
+           
+           if (i<0) evtCtrl.evtStat[k0] = 999 ; //flag event to be skipped
+
            numProc++ ;
            evtCtrl.evtStat[k0] = 520 ;
@@ -1306 +1310 @@
 
 
-
+/*
      xwait.tv_sec = 20;;
      xwait.tv_nsec= 0 ;  // sleep for ~20sec
@@ -1324 +1328 @@
 
      g_runStat = -1 ;
-
+*/
 
 
@@ -1371 +1375 @@
 
 
+
+int  eventCheck( PEVNT_HEADER *fadhd, EVENT *event) 
+{
+   int i=0;
+
+   printf("------------%d\n",ntohl(fadhd[7].fad_evt_counter) );
+   for (i=0; i<NBOARDS; i++) {
+      printf("b=%2d,=%5d\n",i,fadhd[i].board_id);
+   }
+   return 0;
+}
+
+
 void factStat(int severity, int err, char* message ) {
   printf("%3d %3d : %s\n",severity,err,message) ;
@@ -1377 +1394 @@
 
 void debugRead(int isock, int ibyte, int32_t event, int state, uint32_t tsec, uint32_t tusec ) {
-  printf("%3d %5d %9d %3d %12d\n",isock, ibyte, event, state, tusec) ;
+//  printf("%3d %5d %9d %3d %12d\n",isock, ibyte, event, state, tusec) ;
 }