Changeset 16108 for trunk/FACT++/src

Timestamp:

05/24/13 14:04:48 (12 years ago)

Author:

tbretz

Message:

Added a new run-close condition for the case an invalid event was received.

Location:

trunk/FACT++/src

Files:

• EventBuilder.cc (modified) (3 diffs)
• EventBuilder.h (modified) (1 diff)
• EventBuilderWrapper.h (modified) (10 diffs)

trunk/FACT++/src/EventBuilder.cc

@@ -36 +36 @@
 void runFinished();
 void factStat(GUI_STAT gj);
-int  eventCheck(const shared_ptr<EVT_CTRL2> &evt);
+bool eventCheck(const shared_ptr<EVT_CTRL2> &evt);
 void debugHead(void *buf);
 
@@ -806 +806 @@
         if (run->closeRequest&kRequestConnectionChange)
             reason.push_back("connection changed");
+        if (run->closeRequest&kRequestEventCheckFailed)
+            reason.push_back("event check failed");
     }
     if (!cond4)
@@ -828 +830 @@
             evt->fEvent->BoardTime[ib] = evt->FADhead.get()[ib].time;
 
-        const int rc = eventCheck(evt);
-        if (rc < 0)
+        if (!eventCheck(evt))
+        {
+            evt->runCtrl->closeRequest = kRequestEventCheckFailed;
             return;
+        }
     }
 

trunk/FACT++/src/EventBuilder.h

@@ -35 +35 @@
     kRequestManual = 1,
     kRequestTimeout = 2,
-    kRequestConnectionChange = 4
+    kRequestConnectionChange = 4,
+    kRequestEventCheckFailed = 8
 };
 

trunk/FACT++/src/EventBuilderWrapper.h

@@ -609 +609 @@
     }
 
-    int eventCheck(const shared_ptr<EVT_CTRL2> &evt)
+    bool eventCheck(const shared_ptr<EVT_CTRL2> &evt)
     {
         const PEVNT_HEADER *fadhd = evt->FADhead.get();
@@ -640 +640 @@
             {
                 fMsg.Error("Inconsistency in FAD status detected.... closing run.");
-                evt->runCtrl->maxEvt = 0;
-                return -1;
+                return false;
             }
 
@@ -647 +646 @@
             {
                 fMsg.Error("Inconsistent run number detected.... closing run.");
-                evt->runCtrl->maxEvt = 0;
-                return -1;
+                return false;
             }
 
@@ -662 +660 @@
             {
                 fMsg.Error("Inconsistent FAD event number detected.... closing run.");
-                evt->runCtrl->maxEvt = 0;
-                return -1;
+                return false;
             }
 
@@ -669 +666 @@
             {
                 fMsg.Error("Inconsistent FTM trigger number detected.... closing run.");
-                evt->runCtrl->maxEvt = 0;
-                return -1;
+                return false;
             }
 
@@ -676 +672 @@
             {
                 fMsg.Error("Inconsistent phase shift detected.... closing run.");
-                evt->runCtrl->maxEvt = 0;
-                return -1;
+                return false;
             }
 
@@ -683 +678 @@
             {
                 fMsg.Error("Inconsistent DAC values detected.... closing run.");
-                evt->runCtrl->maxEvt = 0;
-                return -1;
+                return false;
             }
 
@@ -690 +684 @@
             {
                 fMsg.Error("Inconsistent trigger type detected.... closing run.");
-                evt->runCtrl->maxEvt = 0;
-                return -1;
+                return false;
             }
         }
@@ -700 +693 @@
         // need gotNewRun/closedRun to know it is finished
 
-        return 0;
+        return true;
     }
 
@@ -1241 +1234 @@
 }
 
-int eventCheck(const shared_ptr<EVT_CTRL2> &evt)
+bool eventCheck(const shared_ptr<EVT_CTRL2> &evt)
 {
     return EventBuilderWrapper::This->eventCheck(evt);