CMake: removing qpythia from the depedencies

[u/mrichter/AliRoot.git] / HLT / BASE / AliHLTComponent.cxx

diff --git a/HLT/BASE/AliHLTComponent.cxx b/HLT/BASE/AliHLTComponent.cxx
index 3617a3e0d6fead46e00199fe4d08181cbb0d96c7..dc0eedf82954e48b41aa263c5a67890021739f39 100644 (file)
--- a/HLT/BASE/AliHLTComponent.cxx
+++ b/HLT/BASE/AliHLTComponent.cxx
@@ -2698,9 +2698,10 @@ int AliHLTComponent::ExtractTriggerData(
   
   // Check that the trigger data pointer points to data of a size we can handle.
   // Either it is the size of AliHLTEventTriggerData or the size of the old
-  // version of AliHLTEventTriggerData using AliHLTEventDDLV0.
+  // version of AliHLTEventTriggerData using AliHLTEventDDLV0 or V1.
   if (trigData.fDataSize != sizeof(AliHLTEventTriggerData) and
-      trigData.fDataSize != sizeWithoutReadout + sizeof(AliHLTEventDDLV0)
+      trigData.fDataSize != sizeWithoutReadout + sizeof(AliHLTEventDDLV0) and
+      trigData.fDataSize != sizeWithoutReadout + sizeof(AliHLTEventDDLV1)
      )
   {
     if (printErrors)
@@ -2717,7 +2718,10 @@ int AliHLTComponent::ExtractTriggerData(
   assert(evtData != NULL);
   
   // Check that the CDH has the right number of words.
-  if (cdh != NULL and evtData->fCommonHeaderWordCnt != gkAliHLTCommonHeaderCount)
+  if ( cdh != NULL and 
+       evtData->fCommonHeaderWordCnt != gkAliHLTCommonHeaderCount and
+       evtData->fCommonHeaderWordCnt != gkAliHLTCommonHeaderCountV2
+     )
   {
     if (printErrors)
     {