Index: trunk/FACT++/src/EventBuilderWrapper.h
===================================================================
--- trunk/FACT++/src/EventBuilderWrapper.h	(revision 12218)
+++ trunk/FACT++/src/EventBuilderWrapper.h	(revision 12219)
@@ -868,5 +868,4 @@
             return;
 
-/*
         // Workaround to find a valid header.....
         const FAD::EventHeader *beg = reinterpret_cast<FAD::EventHeader*>(fadhd);
@@ -875,27 +874,17 @@
         // FIMXE: Compare with target configuration
 
-        for (const FAD::EventHeader *ptr=beg; ptr!=end; ptr++, beg++)
-            if (ptr->fStartDelimiter!=0)
-                break;
+        for (const FAD::EventHeader *ptr=beg; ptr!=end; ptr++)
+        {
+            if (ptr->fStartDelimiter==0)
+                continue;
+
+            if (!ptr->HasTriggerLPext() && !ptr->HasTriggerLPint())
+                return;
+        }
 
         if (ptr->fStartDelimiter==0)
             return;
-*/
-        /*
-        // FIXME: Time limit?!
-        static Time oldt(boost::date_time::neg_infin);
-        Time newt;
-
-        // FIXME: Only send events if the have newer run-numbers
-        if (newt<oldt+boost::posix_time::milliseconds(100))
-            return;
-
-        oldt = newt;
-        */
-
-        // FIXME: Check event type here
 
         vector<float> data(event->Roi*1440);
-
         DataCalib::Apply(data.data(), event->Adc_Data, event->StartPix, event->Roi);