Changeset 12091 for trunk/FACT++/src/EventBuilderWrapper.h

Timestamp:

09/13/11 14:45:19 (13 years ago)

Author:

tbretz

Message:

Updated to the latest event builder version which includes runEnd and runStart to control the memory of the processing threads.

File:

• trunk/FACT++/src/EventBuilderWrapper.h (modified) (5 diffs)

trunk/FACT++/src/EventBuilderWrapper.h

@@ -735 +735 @@
     array<uint16_t,2> fVecRoi;
 
-    int eventCheck(uint32_t runNr, PEVNT_HEADER *fadhd, EVENT *event)
+    int eventCheck(uint32_t runNr, PEVNT_HEADER *fadhd, EVENT *event, int iboard)
     {
         /*
@@ -908 +908 @@
     }
 
-    int subProcEvt(int threadID, PEVNT_HEADER *fadhd, EVENT *event, int8_t */*buffer*/)
+    int subProcEvt(int threadID, PEVNT_HEADER *fadhd, EVENT *event, int16_t iboard, void */*buffer*/)
     {
         switch (threadID)
@@ -1292 +1292 @@
     }
 
+    // -----
+
+    void *runStart(uint32_t irun, RUN_HEAD *runhd, size_t len)
+    {
+        return NULL;
+    }
+
+    int subProcEvt(int threadID, PEVNT_HEADER *fadhd, EVENT *event, int16_t mboard, void *runPtr)
+    {
+        return EventBuilderWrapper::This->subProcEvt(threadID, fadhd, event, mboard, runPtr);
+    }
+
+    int runEnd(uint32_t, void *runPtr)
+    {
+        return 0;
+    }
+
+    // -----
+
+    int eventCheck(uint32_t runNr, PEVNT_HEADER *fadhd, EVENT *event, int mboard)
+    {
+        return EventBuilderWrapper::This->eventCheck(runNr, fadhd, event, mboard);
+    }
+
+    void gotNewRun(int runnr, PEVNT_HEADER *headers)
+    {
+        return EventBuilderWrapper::This->gotNewRun(runnr, headers);
+    }
+
+    // -----
+
     void factOut(int severity, int err, const char *message)
     {
@@ -1307 +1338 @@
     }
 
+    // ------
+
     void debugHead(int socket, int/*board*/, void *buf)
     {
@@ -1323 +1356 @@
         EventBuilderWrapper::This->debugRead(isock, ibyte, event, ftmevt, runno, state, tsec, tusec);
     }
-
-    int eventCheck(uint32_t runNr, PEVNT_HEADER *fadhd, EVENT *event)
-    {
-        return EventBuilderWrapper::This->eventCheck(runNr, fadhd, event);
-    }
-
-    void gotNewRun(int runnr, PEVNT_HEADER *headers)
-    {
-        return EventBuilderWrapper::This->gotNewRun(runnr, headers);
-    }
-
-    int subProcEvt(int threadID, PEVNT_HEADER *fadhd, EVENT *event, int8_t *buffer)
-    {
-        return EventBuilderWrapper::This->subProcEvt(threadID, fadhd, event, buffer);
-    }
-
 }