Changeset 14020 for trunk

Timestamp:

06/01/12 14:16:26 (13 years ago)

Author:

tbretz

Message:

Updated and fixed the event selection for the event display and the feedback

File:

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

trunk/FACT++/src/EventBuilderWrapper.h

@@ -926 +926 @@
 
         // FIXME: Only send events if the have newer run-numbers
-        if (newt<oldt+boost::posix_time::milliseconds(skip>0 ? 200 : 1000))
+        if (newt<oldt+boost::posix_time::milliseconds(skip>0 ? 100 : 1000))
             return;
         oldt = newt;
@@ -938 +938 @@
         for (; ptr!=end; ptr++)
         {
-            if (ptr->fStartDelimiter==0)
-                continue;
-        }
-        if (ptr==end || ptr->fStartDelimiter==0)
+            if (ptr->fStartDelimiter!=0)
+                break;
+        }
+        if (ptr==end)
             return;
 
@@ -957 +957 @@
 
         // Maximum above roughly 5pe
-        if (ptr->IsTriggerPhys() && max<50 && skip<5)
+        if (ptr->IsTriggerPhys() && max<100 && skip<10)
         {
             skip++;
@@ -986 +986 @@
         for (; ptr<end; ptr++)
         {
-            if (ptr->fStartDelimiter==0)
-                continue;
-
-            if (!ptr->HasTriggerLPext() && !ptr->HasTriggerLPint())
-                return;
-        }
-
-        if (ptr==end || ptr->fStartDelimiter==0)
+            if (ptr->fStartDelimiter!=0)
+                break;
+        }
+
+        if (ptr==end)
+            return;
+
+        if (!ptr->HasTriggerLPext() && !ptr->HasTriggerLPint())
             return;