Changeset 16584 for trunk

Timestamp:

06/02/13 15:50:15 (11 years ago)

Author:

tbretz

Message:

Removed Errors and SoftTrig; let the runClose access the RUN_CTRL (to update the calibration constants); the whole memory is now reset in initMemory at once.

File:

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

trunk/FACT++/src/EventBuilder.cc

@@ -57 +57 @@
 bool runOpen(const EVT_CTRL2 &evt);
 bool runWrite(const EVT_CTRL2 &evt);
-void runClose();
+void runClose(RUN_CTRL2 &run);
 void applyCalib(const EVT_CTRL2 &evt, const size_t &size);
 void factOut(int severity, const char *message);
@@ -104 +104 @@
             max_inuse = inuse;
 
-        void *mem = NULL;
-
         if (memory.empty())
         {
             // No free slot available, allocate a new one
             allocated += MAX_TOT_MEM;
-            mem = new char[MAX_TOT_MEM];
-        }
-        else
-        {
-            // Get the next free slot from the stack and return it
-            const std::lock_guard<std::mutex> lock(mtx);
-            mem = memory.front();
-            memory.pop_front();
-        }
-
-        memset(mem, 0, MAX_HEAD_MEM);
+            return  new char[MAX_TOT_MEM];
+        }
+
+        // Get the next free slot from the stack and return it
+        const std::lock_guard<std::mutex> lock(mtx);
+
+        void *mem = memory.front();
+        memory.pop_front();
         return mem;
     };
@@ -595 +590 @@
         }
 
-        // count for inconsistencies
-        if (evt->trgNum != rd.H.trigger_id)
-            evt->Errors[0]++;
-        if (evt->trgTyp != rd.H.trigger_type)
-            evt->Errors[2]++;
-
         // It is maybe not likely, but the header of this board might have
         // arrived earlier. (We could also update the run-info, but
@@ -852 +841 @@
         return;
 
-    runClose();
+    runClose(run);
     run.fileStat = kFileClosed;
 
@@ -892 +881 @@
         event->NumBoards = evt->nBoard;
 
-        event->Errors[0] = evt->Errors[0];
-        event->Errors[1] = evt->Errors[1];
-        event->Errors[2] = evt->Errors[2];
-        event->Errors[3] = evt->Errors[3];
-
-        event->PCTime    = evt->time.tv_sec;
-        event->PCUsec    = evt->time.tv_usec;
+        event->PCTime = evt->time.tv_sec;
+        event->PCUsec = evt->time.tv_usec;
 
         for (int ib=0; ib<NBOARDS; ib++)