Changeset 15441 for trunk/FACT++/src

Timestamp:

04/25/13 19:49:57 (12 years ago)

Author:

tbretz

Message:

Fixed a problem when flushing buffers, events still in use could be deleted; RunUsec should not be set to the same value than RunTime

File:

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

trunk/FACT++/src/EventBuilder.c

@@ -1770 +1770 @@
 
       //and clear all buffers (might have to wait until all others are done)
+      // If minclear is 0, an event could be deleted while writing is still ongoing
+      /*
       int minclear;
       if (gi_resetR == 1) {
@@ -1777 +1779 @@
          minclear = 0;
          factPrintf(kInfo, -1, "Flush all buffers ...");
-      }
+      }*/
+      const int minclear = 900;
 
       int numclear = 1;
@@ -1991 +1994 @@
                if (j >= MAX_RUN) {
                    factPrintf(kFatal, 901, "procEvt: Can not find run %d for event %d in %d", irun, ievt, id);
+                   // FIXME: The event has to be flagged such that it will be deleted! Although that should never happen
+                   continue;
                }
                lastRun = j;
@@ -2018 +2023 @@
                //                     actRun.NroiTM = 0;
                actRun.RunTime = runCtrl[j].firstTime;
-               actRun.RunUsec = runCtrl[j].firstTime;
+               actRun.RunUsec = runCtrl[j].firstUsec;
                actRun.NBoard  = NBOARDS;
                actRun.NPix    = NPIX;
@@ -2334 +2339 @@
                //                     actRun.NroiTM = 0;
                actRun.RunTime = runCtrl[j].firstTime;
-               actRun.RunUsec = runCtrl[j].firstTime;
+               actRun.RunUsec = runCtrl[j].firstUsec;
                actRun.NBoard = NBOARDS;
                actRun.NPix = NPIX;