Changeset 11181 for trunk

Timestamp:

06/24/11 16:14:49 (13 years ago)

Author:

tbretz

Message:

Added more infos to debugRead; some fixed to CompareBit

Location:

trunk/FACT++/src

Files:

• EventBuilder.c (modified) (9 diffs)
• EventBuilderWrapper.h (modified) (8 diffs)

trunk/FACT++/src/EventBuilder.c

@@ -48 +48 @@
 extern void debugHead(int i, void *buf); 
 
-extern void debugRead(int isock, int ibyte, int32_t event, int state, 
+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) ;
@@ -129 +129 @@
   int  evtID  ;          // event ID of event currently read
   int  runID  ;          // run       "
-  uint  fadLen ;          // FADlength of event currently read
+  int  ftmID  ;          // event ID from FTM
+  uint  fadLen ;         // FADlength of event currently read
   int  fadVers ;         // Version of FAD
   int  board ;           // boardID (softwareID: 0..40 )
@@ -612 +613 @@
              rd[i].bufPos += jrd ;        //==> prepare for continuation
              rd[i].bufLen -= jrd ;
-             debugRead(i,jrd,rd[i].evtID, 0,tsec,tusec) ; // i=socket; jrd=#bytes; ievt=eventid; 0=reading data
+             debugRead(i,jrd,rd[i].evtID,rd[i].ftmID,rd[i].runID, 0,tsec,tusec) ; // i=socket; jrd=#bytes; ievt=eventid; 0=reading data
            } else {                     //full dataset read
              rd[i].bufLen  = 0 ;
@@ -624 +625 @@
 
              } 
-             debugRead(i,jrd,rd[i].evtID, 1,tsec,tusec) ; // i=socket; jrd=#bytes; ievt=eventid; 1=finished event
+             debugRead(i,jrd,rd[i].evtID,rd[i].ftmID,rd[i].runID, 1,tsec,tusec) ; // i=socket; jrd=#bytes; ievt=eventid; 1=finished event
 
              //we have a complete buffer, copy to WORK area
@@ -760 +761 @@
                  rd[i].fadVers= ntohs(rd[i].rBuf->S[2]) ;
                  rd[i].evtID  = ntohl(rd[i].rBuf->I[4]) ; //(FADevt)
+                 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 ;
@@ -766 +768 @@
                  if (rd[i].bufLen <=0 ) rd[i].bufLen = 100000 ;    //?
                  debugHead(i,rd[i].rBuf); 
-                 debugRead(i,jrd,rd[i].evtID,-1,tsec,tusec) ; // i=socket; jrd=#bytes; ievt=eventid;-1=start event
+                 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 {
-                 debugRead(i,jrd,0,-2,tsec,tusec) ; // i=socket; jrd=#bytes; ievt=eventid; -2=start event, unknown id yet
+                 debugRead(i,jrd,0,0,0,-2,tsec,tusec) ; // i=socket; jrd=#bytes; ievt=eventid; -2=start event, unknown id yet
               }
            } else {
-              debugRead(i,jrd,0,-2,tsec,tusec) ; // i=socket; jrd=#bytes; ievt=eventid; -2=start event, unknown id yet
+              debugRead(i,jrd,0,0,0,-2,tsec,tusec) ; // i=socket; jrd=#bytes; ievt=eventid; -2=start event, unknown id yet
            }
 
@@ -1339 +1341 @@
 
 
-/*
+
      xwait.tv_sec = 20;;
      xwait.tv_nsec= 0 ;  // sleep for ~20sec
@@ -1357 +1359 @@
 
      g_runStat = -1 ;
-*/
+
 
 
@@ -1423 +1425 @@
 
 
-void debugRead(int isock, int ibyte, int32_t event, int state, uint32_t tsec, uint32_t tusec ) {
+void debugRead(int isock, int ibyte, int32_t event, int32_t ftmevt, int32_t runnr, int state, uint32_t tsec, uint32_t tusec ) {
 //  printf("%3d %5d %9d %3d %12d\n",isock, ibyte, event, state, tusec) ;
 }

trunk/FACT++/src/EventBuilderWrapper.h

@@ -1075 +1075 @@
     ofstream fDumpRead; // Stream to possibly dump docket events
 
-    void debugRead(int isock, int ibyte, int32_t event, int state, uint32_t tsec, uint32_t tusec)
+    void debugRead(int isock, int ibyte, uint32_t event, uint32_t ftmevt, uint32_t runno, int state, uint32_t tsec, uint32_t tusec)
     {
         //   isock = socketID (0-279)
@@ -1103 +1103 @@
 
             fMsg.Message("Opened file 'socket_events.txt' for writing.");
+
+            fDumpRead << "# START: " << Time().GetAsStr() << endl;
+            fDumpRead << "# state time_sec time_usec socket slot runno event_id trigger_id bytes_received" << endl;
         }
 
@@ -1111 +1114 @@
             << setw(3) << isock   << " "
             << setw(2) << isock/7 << " "
-            << event << " "
+            << runno  << " "
+            << event  << " "
+            << ftmevt << " "
             << ibyte << endl;
     }
@@ -1358 +1363 @@
 
             if (gi_NumConnect[i/7]!=7)
+            {
+                vec[i+3] = -1;
                 continue;
+            }
 
             if (!val)
@@ -1407 +1415 @@
 
             if (gi_NumConnect[i/7]!=7)
+            {
+                vec[i+2] = 0;
                 continue;
+            }
 
             if (first)
@@ -1413 +1424 @@
                 first = false;
                 val = *ref;
-                rc = ~0;
+                rc = 0;
             }
 
@@ -1419 +1430 @@
         }
 
-        vec[0] = rc;
+        vec[0] = ~rc;
         vec[1] = val;
 
@@ -1552 +1563 @@
     }
 
-    void debugRead(int isock, int ibyte, int32_t event, int state, uint32_t tsec, uint32_t tusec)
-    {
-        return EventBuilderWrapper::This->debugRead(isock, ibyte, event, state, tsec, tusec);
+    void debugRead(int isock, int ibyte, int32_t event, int32_t ftmevt, int32_t runno, int state, uint32_t tsec, uint32_t tusec)
+    {
+        return EventBuilderWrapper::This->debugRead(isock, ibyte, event, ftmevt, runno, state, tsec, tusec);
     }