Changeset 15471

Timestamp:

05/01/13 11:22:54 (12 years ago)

Author:

tbretz

Message:

Make sure that if processing is terminated, also empty buffers (events without any data) are treated.

File:

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

trunk/FACT++/src/EventBuilder.c

@@ -1340 +1340 @@
           evtCtrl[idx].board[board] = board;
           evtCtrl[idx].nBoard++;
-          evtCtrl[idx].evtStat  = evtCtrl[idx].nBoard;
+          evtCtrl[idx].evtStat = evtCtrl[idx].nBoard;
 
           // have we already reported first (partial) event of this run ???
@@ -1424 +1424 @@
 
           // Check the less likely case: 'useless' or 'delete'
+          // evtState==0 can happen if the event was initialized (some data received)
+          // but the data did not make sense (e.g. inconsistent rois)
           if (evtCtrl[k0].evtStat==0 || evtCtrl[k0].evtStat >= 9000)
           {
@@ -1430 +1432 @@
 
               if (k0==evtCtrl_frstPtr)
-              {
-                  evtCtrl_frstPtr++;
-                  evtCtrl_frstPtr %= MAX_EVT * MAX_RUN;
-              }
+                  evtCtrl_frstPtr = (evtCtrl_frstPtr+1) % MAX_EVT * MAX_RUN;
               else
-                  factPrintf(kDebug, -1, "Freed a non-first slot");
+                  factPrintf(kError, -1, "Freed a non-first slot");
 
               gj.evtWrite++;
@@ -1546 +1545 @@
          for (int k0=evtCtrl_frstPtr; k0!=evtCtrl_lastPtr; k0++, k0 %= MAX_EVT*MAX_RUN)
          {
-             if (evtCtrl[k0].evtStat > minclear)
+             if (evtCtrl[k0].evtStat==0 || evtCtrl[k0].evtStat > minclear)
              {
                  mBufFree(k0);   //event written--> free memory
@@ -1552 +1551 @@
 
                  if (k0==evtCtrl_frstPtr)
-                 {
-                     evtCtrl_frstPtr++;
-                     evtCtrl_frstPtr %= MAX_EVT * MAX_RUN;
-                 }
+                     evtCtrl_frstPtr = (evtCtrl_frstPtr+1) % MAX_EVT * MAX_RUN;
                  else
-                     factPrintf(kDebug, -1, "Freed a non-first slot");
+                     factPrintf(kError, -1, "Freed a non-first slot");
+
+                 continue;
              }
-             else
-                 if (evtCtrl[k0].evtStat > 0)
-                     numclear++;      //writing is still ongoing...
+
+             if (evtCtrl[k0].evtStat > 0)
+                 numclear++;      //writing is still ongoing...
          }